Skip to content
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

[Select] Retain highlight while transitioning out #972

Merged
merged 10 commits into from
Dec 11, 2024
Merged

[Select] Retain highlight while transitioning out #972

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a3d38a9
[Select] Retain highlight while transitioning out
atomiks Dec 6, 2024
1cdc956
Reset to null on unmount
atomiks Dec 6, 2024
9e02b5e
Merge remote-tracking branch 'upstream/master' into fix/select-retain…
atomiks Dec 9, 2024
0fe8768
Update test
atomiks Dec 9, 2024
a3ea1a3
Update test
atomiks Dec 9, 2024
dcef5db
Remove unneeded effect
atomiks Dec 9, 2024
8deefa4
Re-add test
atomiks Dec 9, 2024
3c0eef6
Remove .only
atomiks Dec 9, 2024
9434349
Move workaround
atomiks Dec 9, 2024
3d88261
Merge
atomiks Dec 11, 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
Prev Previous commit
Next Next commit
Move workaround
  • Loading branch information
@atomiks
atomiks committed Dec 9, 2024
commit 94343496b7d8e2d6751f3ab46a431b423d3a42a4
13 changes: 13 additions & 0 deletions packages/react/src/select/root/useSelectRoot.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,19 @@ export function useSelectRoot<T>(params: useSelectRoot.Parameters<T>): useSelect
const setOpen = useEventCallback((nextOpen: boolean, event?: Event) => {
params.onOpenChange?.(nextOpen, event);
setOpenUnwrapped(nextOpen);

// Workaround `enableFocusInside` in Floating UI setting `tabindex=0` of a non-highlighted
// option upon close when tabbing out due to `keepMounted=true`:
// https://github.com/floating-ui/floating-ui/pull/3004/files#diff-962a7439cdeb09ea98d4b622a45d517bce07ad8c3f866e089bda05f4b0bbd875R194-R199
// This otherwise causes options to retain `tabindex=0` incorrectly when the popup is closed
// when tabbing outside.
if (!nextOpen && activeIndex !== null) {
const activeOption = listRef.current[activeIndex];
// Wait for Floating UI's focus effect to have fired
queueMicrotask(() => {
activeOption?.setAttribute('tabindex', '-1');
});
}
});

useAfterExitAnimation({
Expand Down
Loading