fix: roving tabindex in useSelectableCollection for virtualized collections (#9582)

snowystinger · web-flow · commit eaecb96ee7ec · 2026-02-03T15:33:03.000Z
diff --git a/packages/@react-aria/selection/src/useSelectableCollection.ts b/packages/@react-aria/selection/src/useSelectableCollection.ts
@@ -580,7 +580,7 @@ export function useSelectableCollection(options: AriaSelectableCollectionOptions
   // This will be marshalled to either the first or last item depending on where focus came from.
   let tabIndex: number | undefined = undefined;
   if (!shouldUseVirtualFocus) {
-    tabIndex = manager.isFocused ? -1 : 0;
+    tabIndex = manager.focusedKey == null ? 0 : -1;
   }
 
   let collectionId = useCollectionId(manager.collection);

Original file line number	Diff line number	Diff line change
`@@ -580,7 +580,7 @@ export function useSelectableCollection(options: AriaSelectableCollectionOptions`
`580`	`580`	`// This will be marshalled to either the first or last item depending on where focus came from.`
`581`	`581`	`let tabIndex: number \| undefined = undefined;`
`582`	`582`	`if (!shouldUseVirtualFocus) {`
`583`		`- tabIndex = manager.isFocused ? -1 : 0;`
	`583`	`+ tabIndex = manager.focusedKey == null ? 0 : -1;`
`584`	`584`	`}`
`585`	`585`
`586`	`586`	`let collectionId = useCollectionId(manager.collection);`