[menu][popover][combobox] Fix focus guard handling #3654
Conversation
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
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
force-pushed
the
fix/focus-guard-handling
branch
from
79b8d8c to
5ccff51
Compare
atomiks
commented
Jan 1, 2026
Comment on lines
+295
to
+297
| let nextTabbable = getTabbableAfterElement( | ||
| store.context.triggerFocusTargetRef.current || triggerElementRef.current, | ||
| ); |
Contributor
Author
There was a problem hiding this comment.
In Safari, aria-hidden={false} on the focus guard, so it should look for next tabbable starting from (after) the focus guard
atomiks
commented
Jan 1, 2026
|
|
||
| const focus = useFocus(floatingRootContext, { | ||
| enabled: !disabled && ((!isInMenubar && isOpenedByThisTrigger) || parentMenubarHasSubmenuOpen), | ||
| enabled: !disabled && parentMenubarHasSubmenuOpen, |
Contributor
Author
There was a problem hiding this comment.
This otherwise causes Shift + Tab not to close the popup when focus lands back on the trigger in Menu; seems to still pass all Menubar tests
atomiks
force-pushed
the
fix/focus-guard-handling
branch
from
fef44c4 to
5b5d512
Compare
atomiks
changed the title
1 task
LukasTy
approved these changes
Jan 7, 2026
Member
LukasTy
left a comment
LukasTy
left a comment
There was a problem hiding this comment.
Looks great. 👍
Very nice improvement when running on Safari.
However, have you checked Firefox? It is broken with tabbing to an after (Tab) element, only works with before (Shift+Tab). 🤷
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
Fixes a couple of issues with the focus guards:
https://deploy-preview-3654--base-ui.netlify.app/experiments/popup-tabbing