From dd8d4ecb7e18baf7a81ac43ab49f02d70359ca6e Mon Sep 17 00:00:00 2001 From: Danielle Huisman Date: Thu, 21 Dec 2023 16:56:40 +0100 Subject: [PATCH] Remove defaults for optionLabel and optionValue props --- src/formkit/PrimeDropdown.vue | 4 ++-- src/formkit/PrimeListbox.vue | 4 ++-- src/formkit/PrimeMultiSelect.vue | 4 ++-- src/formkit/PrimeSelectButton.vue | 4 ++-- src/pages/demo/Dropdown.vue | 6 ++++++ src/pages/demo/Listbox.vue | 6 ++++++ src/pages/demo/MultiSelect.vue | 6 ++++++ src/pages/demo/RadioButton.vue | 2 ++ src/pages/demo/SelectButton.vue | 4 ++++ 9 files changed, 32 insertions(+), 8 deletions(-) diff --git a/src/formkit/PrimeDropdown.vue b/src/formkit/PrimeDropdown.vue index 178e816a..6603d84f 100644 --- a/src/formkit/PrimeDropdown.vue +++ b/src/formkit/PrimeDropdown.vue @@ -31,8 +31,8 @@ const styleClass = computed(() => (context?.state.validationVisible && !context? :aria-label="attrs.ariaLabel" :aria-labelledby="attrs.ariaLabelledby" :options="attrs.options" - :option-label="attrs.optionLabel ?? 'label'" - :option-value="attrs.optionValue ?? 'value'" + :option-label="attrs.optionLabel" + :option-value="attrs.optionValue" :option-disabled="attrs.optionDisabled" :option-group-label="attrs.optionGroupLabel" :option-group-children="attrs.optionGroupChildren" diff --git a/src/formkit/PrimeListbox.vue b/src/formkit/PrimeListbox.vue index 2a320798..ed0ebb45 100644 --- a/src/formkit/PrimeListbox.vue +++ b/src/formkit/PrimeListbox.vue @@ -26,8 +26,8 @@ const styleClass = computed(() => (context?.state.validationVisible && !context? :aria-label="attrs.ariaLabel" :aria-labelledby="attrs.ariaLabelledby" :options="attrs?.options" - :option-label="attrs.optionLabel ?? 'label'" - :option-value="attrs.optionValue ?? 'value'" + :option-label="attrs.optionLabel" + :option-value="attrs.optionValue" :multiple="attrs.multiple ?? false" :filter="attrs.filter ?? false" :filter-icon="attrs.filterIcon" diff --git a/src/formkit/PrimeMultiSelect.vue b/src/formkit/PrimeMultiSelect.vue index a0573b39..6e86b8a6 100644 --- a/src/formkit/PrimeMultiSelect.vue +++ b/src/formkit/PrimeMultiSelect.vue @@ -27,8 +27,8 @@ const styleClass = computed(() => (context?.state.validationVisible && !context? :aria-labelledby="attrs.ariaLabelledby" :placeholder="attrs.placeholder" :options="attrs.options" - :option-label="attrs.optionLabel ?? 'label'" - :option-value="attrs.optionValue ?? 'value'" + :option-label="attrs.optionLabel" + :option-value="attrs.optionValue" :option-disabled="attrs.optionDisabled" :option-group-label="attrs.optionGroupLabel" :option-group-children="attrs.optionGroupChildren" diff --git a/src/formkit/PrimeSelectButton.vue b/src/formkit/PrimeSelectButton.vue index cc87779c..6a3a0f79 100644 --- a/src/formkit/PrimeSelectButton.vue +++ b/src/formkit/PrimeSelectButton.vue @@ -26,8 +26,8 @@ const styleClass = computed(() => (context?.state.validationVisible && !context? :aria-label="attrs.ariaLabel" :aria-labelledby="attrs.ariaLabelledby" :options="attrs.options" - :option-label="attrs.optionLabel ?? 'label'" - :option-value="attrs.optionValue ?? 'value'" + :option-label="attrs.optionLabel" + :option-value="attrs.optionValue" :option-disabled="attrs.optionDisabled" :multiple="attrs.multiple ?? false" :unselectable="attrs.unselectable ?? true" diff --git a/src/pages/demo/Dropdown.vue b/src/pages/demo/Dropdown.vue index 2071f86f..2c5b06a2 100644 --- a/src/pages/demo/Dropdown.vue +++ b/src/pages/demo/Dropdown.vue @@ -16,6 +16,8 @@ const schema name: 'cookie_notice', label: 'Cookie notice Dropdown', value: 'hourly', + optionLabel: 'label', + optionValue: 'value', options, help: 'Cookie notice frequency ?', }, @@ -26,6 +28,8 @@ const schema value: 'hourly', style: 'background:gray;', class: 'customClass', + optionLabel: 'label', + optionValue: 'value', options: [ { label: 'Every page load', value: 'refresh' }, { label: 'Every hour', value: 'hourly' }, @@ -40,6 +44,8 @@ const schema showClear: true, filter: true, placeholder: 'Please select', + optionLabel: 'label', + optionValue: 'value', options, validation: 'required', }, diff --git a/src/pages/demo/Listbox.vue b/src/pages/demo/Listbox.vue index 62cb9cc9..a1639b62 100644 --- a/src/pages/demo/Listbox.vue +++ b/src/pages/demo/Listbox.vue @@ -16,6 +16,8 @@ const schema name: 'cookie_notice', label: 'Cookie notice Dropdown', value: 'hourly', + optionLabel: 'label', + optionValue: 'value', options, help: 'Cookie notice frequency ?', }, @@ -26,6 +28,8 @@ const schema value: 'hourly', style: 'background:gray;', class: 'customClass', + optionLabel: 'label', + optionValue: 'value', options: [ { label: 'Every page load', value: 'refresh' }, { label: 'Every hour', value: 'hourly' }, @@ -40,6 +44,8 @@ const schema multiple: true, filter: true, placeholder: 'Please select', + optionLabel: 'label', + optionValue: 'value', options, validation: 'required', }, diff --git a/src/pages/demo/MultiSelect.vue b/src/pages/demo/MultiSelect.vue index 83c43c0f..bad02274 100644 --- a/src/pages/demo/MultiSelect.vue +++ b/src/pages/demo/MultiSelect.vue @@ -15,6 +15,8 @@ const schema $formkit: 'primeMultiSelect', name: 'cookie_notice', label: 'Cookie notice MultiSelect', + optionLabel: 'label', + optionValue: 'value', options, help: 'Cookie notice frequency ?', }, @@ -24,6 +26,8 @@ const schema label: 'Styled', style: 'background:gray;', class: 'customClass', + optionLabel: 'label', + optionValue: 'value', options: [ { label: 'Every page load', value: 'refresh' }, { label: 'Every hour', value: 'hourly' }, @@ -37,6 +41,8 @@ const schema label: 'With Multiple Select and Filter', filter: true, placeholder: 'Please select', + optionLabel: 'label', + optionValue: 'value', options, validation: 'required', }, diff --git a/src/pages/demo/RadioButton.vue b/src/pages/demo/RadioButton.vue index 8ff35b5d..ac4b6556 100644 --- a/src/pages/demo/RadioButton.vue +++ b/src/pages/demo/RadioButton.vue @@ -11,6 +11,8 @@ const schema name: 'basic', options_class: 'mt-1 flex flex-col space-y-2', option_class: 'flex space-x-2', + optionLabel: 'label', + optionValue: 'value', options: [ { label: 'Every page load', value: 'refresh' }, { label: 'Every hour', value: 'hourly' }, diff --git a/src/pages/demo/SelectButton.vue b/src/pages/demo/SelectButton.vue index c23422b3..c17a745d 100644 --- a/src/pages/demo/SelectButton.vue +++ b/src/pages/demo/SelectButton.vue @@ -22,6 +22,8 @@ const schema label: 'SelectButton', name: 'selectButton', options: selectOptions, + optionLabel: 'label', + optionValue: 'value', value: 'MAYBE', unselectable: false, }, @@ -29,6 +31,8 @@ const schema $formkit: 'primeSelectButton', label: 'Contact options', name: 'selectButtonMultiple', + optionLabel: 'label', + optionValue: 'value', options: selectOptions2, multiple: true, },