Add default value for Solid Choice control on Search bar

beda-software · Dec 3, 2024 · 11cf04b · 11cf04b
1 parent d643fcd
commit 11cf04b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/components/SearchBar/SearchBarColumn/SolidChoiceColumn/index.tsx b/src/components/SearchBar/SearchBarColumn/SolidChoiceColumn/index.tsx
@@ -5,15 +5,17 @@ import { SearchBarColumnSolidChoiceTypeProps } from '../types';
 
 export function SolidChoiceColumn(props: SearchBarColumnSolidChoiceTypeProps) {
     const { columnFilterValue } = props;
-    const { options, defaultValue } = columnFilterValue.column;
+    const { value } = columnFilterValue;
+    const { options } = columnFilterValue.column;
 
     const { onSelect } = useSolidChoiceColumn(props);
 
     return (
-        <Radio.Group defaultValue={defaultValue?.code} optionType="button" onChange={(e) => onSelect(e.target.value)}>
-            {options.map((c) => (
-                <Radio.Button key={c.code} value={c.code}>
-                    {c.display}
+        // NOTE: Radio.Button defaultChecked and checked cannot be applied properly to check Coding value.
+        <Radio.Group value={value?.[0]?.code} onChange={(e) => onSelect(e.target.value)}>
+            {options.map((coding) => (
+                <Radio.Button key={`radio-button-${coding.code}`} value={coding.code}>
+                    {coding.display}
                 </Radio.Button>
             ))}
         </Radio.Group>

diff --git a/src/components/SearchBar/hooks.ts b/src/components/SearchBar/hooks.ts
@@ -45,7 +45,7 @@ export function useSearchBar(props: SearchBarProps): SearchBarData {
             }
 
             if (isSolidChoiceColumn(column)) {
-                return { column, value: null };
+                return { column, value: column.defaultValue ? [column.defaultValue] : null };
             }
 
             throw new Error('Unsupported column type');