Repository navigation
[menu] Fix focus not returning to trigger on <kbd>Esc</kbd> while pointer rests on popup - #3482
Merged
Merged
Conversation
atomiks
added
component: menu
commit: |
Bundle size report
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
marked this pull request as ready for review
December 9, 2025 22:28
1 task done
LukasTy
changed the title
atomiks
force-pushed
the
fix/hover-focus-return
branch
from
December 10, 2025 12:29
54a513c to
d221083
Compare
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
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.
The
mouseleaveonScrollMouseLeavehandler fires after pressing Esc due to it closing withpointer-events: none. This ends up causing theFloatingFocusManagerto write topreventReturnFocusRefsince thetrigger-hoverreason gets emitted after theescape-keyreason, which blocks focus returning to the trigger.The fix here is to check the open state (
store.select('open')) before running the handler logic so it doesn't try to fire a new event.NB: regression test doesn't work without animations on the popup (this issue doesn't occur there) and would likely be flaky if it was attempted to be added