Merge branch 'develop' into anchored-overlay-focus-trap

dequelabs · Dec 19, 2024 · 80fd257 · 80fd257
2 parents 80fbbdd + 897963b
commit 80fd257
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/packages/react/src/components/Listbox/Listbox.tsx b/packages/react/src/components/Listbox/Listbox.tsx
@@ -104,15 +104,19 @@ const Listbox = forwardRef<
           )
         );
         setSelectedOptions(matchingOptions);
-        setActiveOption(matchingOptions[0] || null);
+        if (!activeOption) {
+          setActiveOption(matchingOptions[0] || null);
+        }
       } else {
         const matchingOption = options.find((option) =>
           optionMatchesValue(option, listboxValue)
         );
         setSelectedOptions(matchingOption ? [matchingOption] : []);
-        setActiveOption(matchingOption || null);
+        if (!activeOption) {
+          setActiveOption(matchingOption || null);
+        }
       }
-    }, [isControlled, options, value, defaultValue]);
+    }, [isControlled, options, value, defaultValue, activeOption]);
 
     useEffect(() => {
       if (activeOption) {