fix: close Popover when focus escapes outside while trapFocus is enabled#35995
Open
petdud wants to merge 2 commits intomicrosoft:masterfrom
Open
fix: close Popover when focus escapes outside while trapFocus is enabled#35995petdud wants to merge 2 commits intomicrosoft:masterfrom
petdud wants to merge 2 commits intomicrosoft:masterfrom
Conversation
9ad4d97 to
20020e9
Compare
| @@ -0,0 +1,7 @@ | |||
| { | |||
There was a problem hiding this comment.
🕵🏾♀️ visual changes to review in the Visual Change Report
vr-tests-react-components/Avatar Converged 2 screenshots
| Image Name | Diff(in Pixels) | Image Type |
|---|---|---|
| vr-tests-react-components/Avatar Converged.badgeMask.normal.chromium.png | 4 | Changed |
| vr-tests-react-components/Avatar Converged.badgeMask - RTL.normal.chromium.png | 2 | Changed |
vr-tests-react-components/CalendarCompat 4 screenshots
| Image Name | Diff(in Pixels) | Image Type |
|---|---|---|
| vr-tests-react-components/CalendarCompat.multiDayView - High Contrast.default.chromium.png | 1214 | Changed |
| vr-tests-react-components/CalendarCompat.multiDayView.default.chromium_1.png | 489 | Changed |
| vr-tests-react-components/CalendarCompat.multiDayView - Dark Mode.default.chromium.png | 1101 | Changed |
| vr-tests-react-components/CalendarCompat.multiDayView - RTL.default.chromium.png | 488 | Changed |
vr-tests-react-components/Charts-DonutChart 2 screenshots
| Image Name | Diff(in Pixels) | Image Type |
|---|---|---|
| vr-tests-react-components/Charts-DonutChart.Dynamic - Dark Mode.default.chromium.png | 7530 | Changed |
| vr-tests-react-components/Charts-DonutChart.Dynamic - RTL.default.chromium.png | 5570 | Changed |
vr-tests-react-components/Menu 1 screenshots
| Image Name | Diff(in Pixels) | Image Type |
|---|---|---|
| vr-tests-react-components/Menu.Nested Submenus Small Viewport Flipped.nested menu.chromium.png | 743 | Changed |
vr-tests-react-components/Portal 1 screenshots
| Image Name | Diff(in Pixels) | Image Type |
|---|---|---|
| vr-tests-react-components/Portal.Apply Class Names.should have green border.chromium.png | 15 | Changed |
vr-tests-react-components/Positioning 2 screenshots
| Image Name | Diff(in Pixels) | Image Type |
|---|---|---|
| vr-tests-react-components/Positioning.Positioning end.chromium.png | 132 | Changed |
| vr-tests-react-components/Positioning.Positioning end.updated 2 times.chromium.png | 49 | Changed |
vr-tests-react-components/ProgressBar converged 3 screenshots
| Image Name | Diff(in Pixels) | Image Type |
|---|---|---|
| vr-tests-react-components/ProgressBar converged.Indeterminate + thickness - Dark Mode.default.chromium.png | 100 | Changed |
| vr-tests-react-components/ProgressBar converged.Indeterminate + thickness - High Contrast.default.chromium.png | 194 | Changed |
| vr-tests-react-components/ProgressBar converged.Indeterminate + thickness.default.chromium.png | 187 | Changed |
vr-tests-react-components/TagPicker 1 screenshots
| Image Name | Diff(in Pixels) | Image Type |
|---|---|---|
| vr-tests-react-components/TagPicker.disabled.disabled input hover.chromium.png | 677 | Changed |
There were 2 duplicate changes discarded. Check the build logs for more information.
20020e9 to
944f25a
Compare
944f25a to
998e1e3
Compare
998e1e3 to
31ceae1
Compare
📊 Bundle size reportUnchanged fixtures
|
|
Pull request demo site: URL |
bsunderhus
approved these changes
Apr 17, 2026
Contributor
There was a problem hiding this comment.
Won't this be better as an e2e test?
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.

Previous Behavior
When a Popover has
trapFocusenabled and focus is programmatically moved outside (e.g. viaelement.focus(), a keyboard shortcut, or OS-level focus changes), the popover remains open in a broken "zombie" state.This is especially problematic for popovers with interactive content like search inputs — once focus escapes, Tabster's focus trap fights the user: clicking back into the page outside the popover causes Tabster to redirect focus within ~100ms, making it impossible to type or interact. The popover is visually present but functionally dead, and the user has no recovery path other than pressing Escape (if they know about it).
New Behavior
When
trapFocusis enabled (both legacy andinertTrapFocus) and focus moves outside both the popover content and trigger, the popover automatically closes via a document-levelfocusinlistener. This fires before Tabster can redirect focus back, so the popover dismisses cleanly instead of entering the broken state.elementContains(virtual-parent-aware) so portaled content (nested menus, dropdowns, dialogs) opened from inside the popover is correctly treated as "inside"contentRefis not yet mounted)FocusEventtoOpenPopoverEventsunion type