[FocusTrap] Guard focus restoration against non-focusable relatedTarget - #49164
Open
Dextheking1 wants to merge 2 commits into
Open
Dextheking1 wants to merge 2 commits into
Dextheking1 wants to merge 2 commits into
Conversation
Deploy previewBundle size
Check out the code infra dashboard for more information about this PR. |
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.
Closes #49159.
Problem
When a
FocusTrapunmounts (oropenflips), the cleanup restores focus tonodeToRestore.current, which is captured fromevent.relatedTarget:relatedTargetis typed asEventTarget | null, but nothing guarantees itexposes a
focusmethod. Since jsdom 30.1.0 it can resolve to a truthy valuewithout one (see #49159 for the full analysis), so unmounting a trap throws:
This previously had a defensive guard, removed in #48368 when the restore
logic was reworked.
Fix
Restore the guard, in
typeofform, before calling.focus():The ref is still cleared unconditionally so a subsequent focus event
re-captures a fresh target. No behavior change in real browsers, where the
target always has
.focus.Test
Added a regression test that dispatches a
focusinwhoserelatedTargetistruthy but has no
focusmethod, then unmounts the trap and asserts nothingis thrown. Verified it fails without the fix (
TypeError) and passes with it.pnpm test:unit FocusTrappasses