Update CategoryAutocomplete.tsx

actualbudget · Jan 10, 2024 · bbbcef1 · bbbcef1
1 parent e792afb
commit bbbcef1
Showing 1 changed file with 16 additions and 9 deletions.
diff --git a/packages/desktop-client/src/components/autocomplete/CategoryAutocomplete.tsx b/packages/desktop-client/src/components/autocomplete/CategoryAutocomplete.tsx
@@ -22,8 +22,10 @@ import { View } from '../common/View';
 
 import { Autocomplete, defaultFilterSuggestion } from './Autocomplete';
 
+type CategorySuggestion = CategoryEntity & { group?: CategoryGroupEntity };
+
 export type CategoryListProps = {
-  items: Array<CategoryEntity & { group?: CategoryGroupEntity }>;
+  items: Array<CategorySuggestion>;
   getItemProps?: (arg: { item }) => Partial<ComponentProps<typeof View>>;
   highlightedIndex: number;
   embedded: boolean;
@@ -150,14 +152,7 @@ export function CategoryAutocomplete({
         }
         return 0;
       }}
-      filterSuggestions={(suggestions, value) => {
-        return suggestions.filter(suggestion => {
-          return (
-            suggestion.id === 'split' ||
-            defaultFilterSuggestion(suggestion, value)
-          );
-        });
-      }}
+      filterSuggestions={filterCategorySuggestions}
       suggestions={categorySuggestions}
       renderItems={(items, getItemProps, highlightedIndex) => (
         <CategoryList
@@ -330,3 +325,15 @@ export function CategoryItem({
 function defaultRenderCategoryItem(props: CategoryItemProps) {
   return <CategoryItem {...props} />;
 }
+
+function filterCategorySuggestions(suggestions: CategorySuggestion[], value) {
+  return suggestions.filter(suggestion => {
+    return (
+      suggestion.id === 'split' ||
+      [suggestion.name, suggestion.group.name]
+        .join(' ')
+        .toLowerCase()
+        .includes(value.toLowerCase())
+    );
+  });
+}