Skip to content

fix how we handle empty values #2481

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Nov 10, 2025
Merged

fix how we handle empty values #2481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a059092
fix how we handle empty values when not in dynamic context (e.g. addi…
kchobantonov Aug 21, 2025
cc45d6a
allow defaulting the schema
kchobantonov Aug 22, 2025
1479a4d
Merge branch 'master' into fix-handle-empty-value
kchobantonov Sep 23, 2025
a8b7e7e
update the determineClearValue
kchobantonov Sep 23, 2025
a8cb7b2
remove unnecessary type
kchobantonov Sep 24, 2025
def55be
revert to the original expression
kchobantonov Sep 24, 2025
7022bd8
use :return-object="true"
kchobantonov Sep 27, 2025
ba454aa
use the same default format as react
kchobantonov Oct 7, 2025
e6fdffa
Merge branch 'master' into fix-handle-empty-value
kchobantonov Nov 7, 2025
44440e9
revert :return-object="true"
kchobantonov Nov 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion packages/vue-vuetify/dev/views/ExampleView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,8 @@ const reloadMonacoSchema = () => {
const saveMonacoSchema = () => {
saveMonacoModel(
schemaModel,
(modelValue) => (state.schema = JSON.parse(modelValue)),
(modelValue) =>
(state.schema = modelValue ? JSON.parse(modelValue) : undefined),
'New schema applied',
);

Expand Down Expand Up @@ -277,6 +278,10 @@ const handleAction = (action: Action) => {
if (action) {
const newState = action.apply(state);
if (newState) {
if (newState.renderers) {
newState.renderers = markRaw(newState.renderers);
}

Object.assign(state, newState);
}
}
Expand Down
5 changes: 3 additions & 2 deletions packages/vue-vuetify/src/controls/AnyOfStringOrEnumControlRenderer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,9 @@ const controlRenderer = defineComponent({
},
setup(props: RendererProps<ControlElement>) {
const clearValue = determineClearValue('');
return useVuetifyControl(useJsonFormsControl(props), (value) =>
value === null ? clearValue : value,
return useVuetifyControl(
useJsonFormsControl(props),
(value) => value || clearValue,
);
},
computed: {
Expand Down
2 changes: 1 addition & 1 deletion packages/vue-vuetify/src/controls/DateControlRenderer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ const controlRenderer = defineComponent({
const showMenu = ref(false);
const adaptValue = (value: any) => (value === null ? clearValue : value);
const adaptValue = (value: any) => value || clearValue;
const control = useVuetifyControl(useJsonFormsControl(props), adaptValue);
const dateFormat = computed<string>(
Expand Down
6 changes: 3 additions & 3 deletions packages/vue-vuetify/src/controls/DateTimeControlRenderer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ import {
VWindowItem,
} from 'vuetify/components';

import { vMaska, type MaskOptions, type MaskaDetail } from 'maska';
import { vMaska, type MaskOptions } from 'maska';
import { useDisplay, useLocale } from 'vuetify';
import type { IconValue } from '../icons';
import {
Expand Down Expand Up @@ -289,7 +289,7 @@ const controlRenderer = defineComponent({
const t = useTranslator();
const showMenu = ref(false);
const activeTab = ref<'date' | 'time'>('date');
const adaptValue = (value: any) => (value === null ? clearValue : value);
const adaptValue = (value: any) => value || clearValue;

const control = useVuetifyControl(useJsonFormsControl(props), adaptValue);
const { mobile } = useDisplay();
Expand All @@ -299,7 +299,7 @@ const controlRenderer = defineComponent({
typeof control.appliedOptions.value.dateTimeFormat == 'string'
? (expandLocaleFormat(control.appliedOptions.value.dateTimeFormat) ??
control.appliedOptions.value.dateTimeFormat)
: (expandLocaleFormat('L LT') ?? 'YYYY-MM-DD H:mm'),
: (expandLocaleFormat('L LT') ?? 'YYYY-MM-DD HH:mm'),
);

const useMask = control.appliedOptions.value.mask !== false;
Expand Down
2 changes: 1 addition & 1 deletion packages/vue-vuetify/src/controls/MultiStringControlRenderer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ const controlRenderer = defineComponent({
const clearValue = determineClearValue('');
return useVuetifyControl(
useJsonFormsControl(props),
(value) => (value === null ? clearValue : value),
(value) => value || clearValue,
300,
);
},
Expand Down
6 changes: 4 additions & 2 deletions packages/vue-vuetify/src/controls/OneOfEnumControlRenderer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ import {
} from '@jsonforms/vue';
import { defineComponent } from 'vue';
import { VSelect } from 'vuetify/components';
import { useVuetifyControl } from '../util';
import { determineClearValue, useVuetifyControl } from '../util';
import { default as ControlWrapper } from './ControlWrapper.vue';
import { DisabledIconFocus } from './directives';

Expand All @@ -56,8 +56,10 @@ const controlRenderer = defineComponent({
...rendererProps<ControlElement>(),
},
setup(props: RendererProps<ControlElement>) {
const clearValue = determineClearValue('');

return useVuetifyControl(useJsonFormsOneOfEnumControl(props), (value) =>
value !== null ? value : undefined,
value === null ? clearValue : value,
Copy link
Contributor

@lucas-koehler lucas-koehler Nov 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We still have the problem of this not working with values that are null but should not be cleared. However, as this was also the case before this PR, this is fine for me and could potentially be fixed in a follow up.

);
},
});
Expand Down
2 changes: 1 addition & 1 deletion packages/vue-vuetify/src/controls/StringControlRenderer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ const controlRenderer = defineComponent({
const clearValue = determineClearValue('');
return useVuetifyControl(
useJsonFormsControl(props),
(value) => (value === null ? clearValue : value),
(value) => value || clearValue,
300,
);
},
Expand Down
2 changes: 1 addition & 1 deletion packages/vue-vuetify/src/controls/StringMaskControlRenderer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ const controlRenderer = defineComponent({
},
setup(props: RendererProps<ControlElement>) {
const clearValue = determineClearValue('');
const adaptValue = (value: any) => (value === null ? clearValue : value);
const adaptValue = (value: any) => value || clearValue;
const control = useVuetifyControl(useJsonFormsControl(props), adaptValue);

const toTokens = (tokenParams: Record<string, any>): MaskTokens => {
Expand Down
2 changes: 1 addition & 1 deletion packages/vue-vuetify/src/controls/TimeControlRenderer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ const controlRenderer = defineComponent({

const showMenu = ref(false);

const adaptValue = (value: any) => (value === null ? clearValue : value);
const adaptValue = (value: any) => value || clearValue;
const control = useVuetifyControl(useJsonFormsControl(props), adaptValue);

const icons = useIcons();
Expand Down
7 changes: 1 addition & 6 deletions packages/vue-vuetify/src/util/composition.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,12 +484,7 @@ export const useIcons = () => {
};

export const determineClearValue = (defaultValue: any) => {
const jsonforms = useJsonForms();

const useDefaultValue = inject<boolean>(
IsDynamicPropertyContext,
jsonforms.core?.schema.type !== 'object',
);
const useDefaultValue = inject<boolean>(IsDynamicPropertyContext, false);

// undefined will clear the property from the object
return useDefaultValue ? defaultValue : undefined;
Expand Down