Merge pull request #205 from asigloo/bugfix/add-optionvalue-and-optio…

…nkey-properties feat(select): optionValue and optionKey
asigloo · Dec 14, 2020 · bdce974 · bdce974
2 parents b7550af + b349b8b
commit bdce974
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 15 deletions.
diff --git a/dev/typescript/App.vue b/dev/typescript/App.vue
@@ -161,22 +161,23 @@ export default defineComponent({
           value: 'the-last-of-us',
           options: [
             {
-              key: 'the-last-of-us',
-              value: 'The Last of Us II',
+              value: 'the-last-of-us',
+              label: 'The Last of Us II',
             },
             {
-              key: 'death-stranding',
-              value: 'Death Stranding',
+              value: 'death-stranding',
+              label: 'Death Stranding',
             },
             {
-              key: 'nier-automata',
-              value: 'Nier Automata',
+              value: 'nier-automata',
+              label: 'Nier Automata',
             },
           ],
         }),
         console: SelectField({
           label: 'Console (Async Options)',
           customClass: 'w-1/2 pr-4',
+          optionValue: 'console',
           options: consoleOptions.value,
         }),
         steps: NumberField({
@@ -256,16 +257,16 @@ export default defineComponent({
       try {
         consoleOptions.value = await mockAsync(true, 4000, [
           {
-            key: 'playstation',
-            value: 'Playstation',
+            console: 'playstation',
+            label: 'Playstation',
           },
           {
-            key: 'nintendo',
-            value: 'Nintendo',
+            console: 'nintendo',
+            label: 'Nintendo',
           },
           {
-            key: 'xbox',
-            value: 'Xbox',
+            console: 'xbox',
+            label: 'Xbox',
           },
         ]);
       } catch (e) {

diff --git a/src/components/select-input/SelectInput.vue b/src/components/select-input/SelectInput.vue
@@ -32,8 +32,16 @@ export default defineComponent({
         return props?.control?.options;
       });
 
-      const options = formattedOptions.value.map(({ key, value, disabled }) =>
-        h('option', { key, value: key, disabled }, value),
+      const options = formattedOptions.value.map(option =>
+        h(
+          'option',
+          {
+            key: option[props.control.optionValue],
+            value: option[props.control.optionValue],
+            disabled: option.disabled,
+          },
+          option[props.control.optionLabel],
+        ),
       );
       return [
         h(

diff --git a/src/core/factories.ts b/src/core/factories.ts
@@ -127,11 +127,15 @@ export const NumberField = ({
 export const SelectField = ({
   options = [],
   value,
+  optionValue = 'value',
+  optionLabel = 'label',
   ...rest
 }: Partial<SelectInput>): SelectInput => ({
   ...FieldBase(rest),
   value,
   options,
+  optionValue,
+  optionLabel,
   type: FieldTypes.SELECT,
 });
 

diff --git a/src/core/models.ts b/src/core/models.ts
@@ -91,7 +91,9 @@ export type NumberInput = InputBase & {
 export type SelectInput<T = boolean | string> = InputBase & {
   type: FieldTypes.SELECT;
   value: T;
-  options?: { key: string; value: string; disabled?: boolean }[];
+  optionValue: string;
+  optionLabel: string;
+  options?: { label: string; value: string; disabled?: boolean }[];
 };
 
 export type TextAreaInput = InputBase & {