Fix combobox focus from being lost when filtering large collections (a…

…dobe#6913)
alecmev · Aug 20, 2024 · 64e4a40 · 64e4a40
1 parent 1067aff
commit 64e4a40
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/packages/@react-aria/selection/src/useSelectableCollection.ts b/packages/@react-aria/selection/src/useSelectableCollection.ts
@@ -424,7 +424,7 @@ export function useSelectableCollection(options: AriaSelectableCollectionOptions
     }
 
     // If the focused key becomes null (e.g. the last item is deleted), focus the whole collection.
-    if (manager.isFocused && manager.focusedKey == null && lastFocusedKey.current != null) {
+    if (!shouldUseVirtualFocus && manager.isFocused && manager.focusedKey == null && lastFocusedKey.current != null) {
       focusSafely(ref.current);
     }