Merge pull request #265 from jwmann/fix/highlight-select

Pass filtered options to useHighlight instead of all options.
tbleckert · Oct 10, 2023 · 02429ad · 02429ad · vercel · Oct 10, 2023
2 parents 6639c27 + 2b52b6e
commit 02429ad
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/src/useSelect.js b/src/useSelect.js
@@ -58,15 +58,16 @@ export default function useSelect({
         }, 0);
     };
 
-    const [keyHandlers, highlighted, setHighlighted] = useHighlight(
-        options,
-        onSelect,
-        ref,
-    );
     const middleware = [
         useFuzzySearch ? fuzzySearch : null,
         ...(filterOptions ? filterOptions : []),
     ];
+    const filteredOptions = groupOptions(reduce(middleware, options, q));
+    const [keyHandlers, highlighted, setHighlighted] = useHighlight(
+        filteredOptions,
+        onSelect,
+        ref,
+    );
 
     const snapshot = {
         search: q,
@@ -75,7 +76,7 @@ export default function useSelect({
         value: getValue(option),
         fetching,
         highlighted,
-        options: groupOptions(reduce(middleware, options, q)),
+        options: filteredOptions,
         displayValue: getDisplayValue(option, options, placeholder),
     };