fixed multi select + simple value + disabled

osstotalsoft · Nov 30, 2024 · a492a51 · a492a51
1 parent 9054463
commit a492a51
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/src/components/inputs/Autocomplete/Autocomplete.tsx b/src/components/inputs/Autocomplete/Autocomplete.tsx
@@ -82,7 +82,7 @@ const Autocomplete: React.FC<
       const getValue = valueKey instanceof Function ? valueKey : prop(valueKey)
       const getLabel = labelKey instanceof Function ? labelKey : prop(labelKey)
 
-      const convertedOption = convertValueToOption(
+      const convertedOption: unknown = convertValueToOption(
         option,
         allOptions,
         extractFirstValue([getValue, internalValue, identity])
@@ -334,12 +334,19 @@ const Autocomplete: React.FC<
       >
     ) => {
       return value.map((option, index) => {
+        const getValue = valueKey instanceof Function ? valueKey : prop(valueKey)
+
+        const convertedOption = convertValueToOption(
+          option,
+          allOptions,
+          extractFirstValue([getValue, internalValue, identity])
+        )
         const { key, ...tagProps } = getTagProps({ index })
-        const isDisabled: boolean = has('isDisabled', option) && Boolean(option.isDisabled)
+        const isDisabled: boolean = has('isDisabled', convertedOption) && Boolean(convertedOption.isDisabled)
         return (
           <Chip
             key={key}
-            label={handleGetOptionLabel(option, true)}
+            label={handleGetOptionLabel(convertedOption, true)}
             {...tagProps}
             disabled={isDisabled || ownerState.disabled}
           />