Skip to content

Fix combobox focus from being lost when filtering large collections #6913

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
devongovett merged 3 commits into from
Aug 20, 2024
Merged

Fix combobox focus from being lost when filtering large collections #6913

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4c0281c
Dont focus the collection if we are in virtual focus
LFDanLu Aug 20, 2024
8d364a4
merge if conditions
LFDanLu Aug 20, 2024
4297fce
Merge branch 'main' into fix_combobox_focus_6910
LFDanLu Aug 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/@react-aria/selection/src/useSelectableCollection.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Comment on lines +427 to 429

@LFDanLu LFDanLu Aug 20, 2024

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note that I've omitted a reset of the manager tracked focus key when the previously focused key of a virtual focus collection is removed from the collection. For the combobox, this would actually cause an option to be focused after the input is changed which historically has caused issues with the NVDA announcement. We can revisit that behavior but for this patch fix I've opted to go with the smallest change possible (should be fine for combobox that the tracked focusedkey isn't in the collection since we clear it in useComboBoxState when the input value changes)

@snowystinger snowystinger Aug 20, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

makes sense. I debated it for a little bit in my head and only included it because I was unsure


Expand Down