fix(Filter): add story and fixes

ynput · Jan 13, 2025 · a5b9f16 · a5b9f16
1 parent 82edff4
commit a5b9f16
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/src/SearchFilter/SearchFilter.stories.tsx b/src/SearchFilter/SearchFilter.stories.tsx
@@ -15,6 +15,13 @@ const options: Option[] = [
   {
     id: 'status',
     label: 'Status',
+    operator: 'OR',
+    allowExcludes: true,
+    allowHasValue: true,
+    allowNoValue: true,
+    allowsCustomValues: true,
+    operatorChangeable: true,
+
     values: [
       { id: 'waiting', label: 'Waiting', color: '#FFA500', icon: 'hourglass_empty' },
       { id: 'inProgress', label: 'In Progress', color: '#4CAF50', icon: 'play_circle' },

diff --git a/src/SearchFilter/SearchFilter.tsx b/src/SearchFilter/SearchFilter.tsx
@@ -121,9 +121,12 @@ export const SearchFilter: FC<SearchFilterProps> = ({
           )
         }
 
+        const operator = parentFilter.operator || 'OR'
+
         // Create a new parent filter with the updated values
         const updatedParentFilter = {
           ...parentFilter,
+          operator,
           values: updatedValues,
         }
 
@@ -332,6 +335,7 @@ export const SearchFilter: FC<SearchFilterProps> = ({
           isHasValueAllowed={!!parentOption?.allowHasValue}
           isNoValueAllowed={!!parentOption?.allowNoValue}
           isInvertedAllowed={!!parentOption?.allowExcludes}
+          operatorChangeable={!!parentOption?.operatorChangeable}
           preserveOrderFields={preserveOrderFields}
           onSelect={handleOptionSelect}
           onInvert={handleInvertFilter}