fix(CFormSelect): component does not respect initially selected value

mrholek · mrholek · commit cdef7aeb69cb · 2022-01-22T20:51:23.000+01:00
diff --git a/packages/coreui-vue/src/components/form/CFormSelect.ts b/packages/coreui-vue/src/components/form/CFormSelect.ts
@@ -3,6 +3,7 @@ import { defineComponent, h, PropType } from 'vue'
 type Option = {
   disabled?: boolean
   label?: string
+  selected?: boolean
   value?: string
 }
 
@@ -28,10 +29,14 @@ const CFormSelect = defineComponent({
      * The default name for a value passed using v-model.
      */
     modelValue: {
-      type: String,
+      type: [String, Array] as PropType<string | string[]>,
       default: undefined,
       require: false,
     },
+    multiple: {
+      type: Boolean,
+      required: false,
+    },
     /**
      * Options list of the select component. Available keys: `label`, `value`, `disabled`.
      * Examples:
@@ -80,9 +85,8 @@ const CFormSelect = defineComponent({
       const selected = Array.from(target.options)
         .filter((option) => option.selected)
         .map((option) => option.value)
-      const value = target.multiple ? selected : selected[0]
       emit('change', event)
-      emit('update:modelValue', value)
+      emit('update:modelValue', target.multiple ? selected : selected[0])
     }
 
     return () =>
@@ -97,17 +101,26 @@ const CFormSelect = defineComponent({
               'is-valid': props.valid,
             },
           ],
+          multiple: props.multiple,
           onChange: (event: InputEvent) => handleChange(event),
           size: props.htmlSize,
+          ...(props.modelValue && !props.multiple && { value: props.modelValue }),
         },
         props.options
           ? props.options.map((option: Option | string) => {
               return h(
                 'option',
                 {
-                  ...(typeof option === 'object' &&
-                    option.disabled && { disabled: option.disabled }),
-                  ...(typeof option === 'object' && option.value && { value: option.value }),
+                  ...(typeof option === 'object' && {
+                    ...(option.disabled && { disabled: option.disabled }),
+                    ...(option.selected && { selected: option.selected }),
+                    ...(option.value && {
+                      value: option.value,
+                      ...(props.modelValue &&
+                        props.multiple &&
+                        props.modelValue.includes(option.value) && { selected: true }),
+                    }),
+                  }),
                 },
                 typeof option === 'string' ? option : option.label,
               )
