[focus] Don't steal initial focus if focus already moved inside the floating element#4775
Merged
Conversation
… has overwritten rafId
…loating element `FloatingFocusManager` schedules initial focus via `queueMicrotask` + RAF. Between when the microtask runs and when the RAF fires, something can legitimately move focus inside the floating element (e.g. a child popup opening in response to a click). The pending RAF would then override that focus, closing the child popup. Add a `guard` option to `enqueueFocus` that is evaluated inside the RAF callback before calling `.focus()`. Pass a guard in `FloatingFocusManager` that skips the initial focus if the active element is already inside the floating element.
stefee
requested review from
LukasTy,
atomiks,
colmtuite,
flaviendelangle and
michaldudak
as code owners
commit: |
Bundle size
PerformanceTotal duration: 1,130.80 ms -75.33 ms(-6.2%) | Renders: 50 (+0) | Paint: 1,726.52 ms -115.54 ms(-6.3%)
11 tests within noise — details Check out the code infra dashboard for more information about this PR. |
✅ Deploy Preview for base-ui ready!
To edit notification comments on pull requests, go to your Netlify project configuration. |
atomiks
added
type: bug
atomiks
approved these changes
May 12, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Alternative solution to #4721 (also includes the fix from that PR although it wasn't directly related).
FloatingFocusManagerschedules initial focus viaqueueMicrotask+ RAF. Between when the microtask runs and when the RAF fires, something can legitimately move focus inside the floating element (e.g. a child popup opening in response to a click). The pending RAF would then override that focus, closing the child popup.Add a
guardoption toenqueueFocusthat is evaluated inside the RAF callback before calling.focus(). Pass a guard inFloatingFocusManagerthat skips the initial focus if the active element is already inside the floating element.