Skip to content

Dev #55

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 2 commits into from
May 13, 2025
Merged

Dev #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5de56e5
fixing some quirks with validation and boolean type inputs
webdevnerdstuff May 13, 2025
27e4cde
Merge branch 'main' into dev
webdevnerdstuff May 13, 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
8 changes: 3 additions & 5 deletions src/plugin/components/fields/VSFCheckbox/VSFCheckbox.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,8 @@
:disabled="isValidating"
:error="errorMessage ? errorMessage?.length > 0 : false"
:error-messages="errorMessage"
@blur="fieldValidateOn === 'blur' ? onActions('blur') : undefined"
@change="fieldValidateOn === 'change' ? onActions('change') : undefined"
@click="fieldValidateOn === 'blur' || fieldValidateOn === 'change' ? onActions('click') : undefined"
@input="fieldValidateOn === 'input' ? onActions('input') : undefined"
@update:model-value="fieldValidateOn === 'blur' || fieldValidateOn === 'change' ? onActions('click') : undefined"
>
<template #label>
<FieldLabel
Expand Down Expand Up @@ -45,7 +43,7 @@
</v-label>

<div
:id="field?.id"
:id="fieldId"
:class="controlGroupClasses"
:style="checkboxContainerStyle"
>
Expand Down Expand Up @@ -112,14 +110,14 @@ const props = defineProps<VSFCheckboxProps>();
const { field } = toRefs(props);
const settings = inject<Ref<Settings>>('settings')!;

const fieldId = computed<string>(() => (field.value?.id ?? useId()) as string);
const fieldDensity = computed<VCheckbox['density']>(() => (field.value?.density ?? settings.value?.density) as VCheckbox['density']);
const fieldRequired = computed<FieldLabelProps['required']>(() => {
return field.value.required || false;
});
const fieldValidateOn = computed(() => field.value?.validateOn ?? settings.value.validateOn);
const originalValue = modelValue.value;


const { errorMessage, setValue, validate, value } = useField(
field.value.name,
undefined,
Expand Down
2 changes: 0 additions & 2 deletions src/plugin/components/fields/VSFRadio/VSFRadio.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,6 @@
:style="radioStyle"
:true-value="option.value || field.trueValue"
:value="option.value"
@blur="fieldValidateOn === 'blur' ? onActions('blur', option.value) : undefined"
@change="fieldValidateOn === 'change' ? onActions('change', option.value) : undefined"
@click="fieldValidateOn === 'blur' || fieldValidateOn === 'change' ? onActions('click', option.value) : undefined"
@input="fieldValidateOn === 'input' ? onActions('input', option.value) : undefined"
>
Expand Down
4 changes: 1 addition & 3 deletions src/plugin/components/fields/VSFSwitch/VSFSwitch.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,8 @@
:disabled="isValidating"
:error="props.errorMessage ? props.errorMessage?.length > 0 : false"
:error-messages="props.errorMessage"
@blur="fieldValidateOn === 'blur' ? onActions((props.validate as ValidateFieldResult), 'blur') : undefined"
@change="fieldValidateOn === 'change' ? onActions((props.validate as ValidateFieldResult), 'change') : undefined"
@click="fieldValidateOn === 'blur' || fieldValidateOn === 'change' ? onActions(props.validate, 'click') : undefined"
@input="fieldValidateOn === 'input' ? onActions((props.validate as ValidateFieldResult), 'input') : undefined"
@update:model-value="fieldValidateOn === 'blur' || fieldValidateOn === 'change' ? onActions(props.validate, 'click') : undefined"
>
<template #label>
<FieldLabel
Expand Down