fix(cdk/a11y): move focus to root if there are no focusable elements in focus trap - #33654
Merged
Merged
Conversation
1 task
ok7sai
approved these changes
Aug 10, 2026
…in focus trap When focus lands on a focus trap anchor, it looks for focusable elements inside the root element, however if there are none, focus can escape the trap. These changes include additional logic that will move focus to the root element, if it is focusable, and focus trapping didn't find any focusable descendants. Fixes angular#33622.
crisbeto
force-pushed
the
33622/focus-trap-root
branch
from
August 10, 2026 12:05
c0875d6 to
38a0b84
Compare
Member
Author
crisbeto
added a commit
that referenced
this pull request
Aug 10, 2026
…in focus trap (#33654) When focus lands on a focus trap anchor, it looks for focusable elements inside the root element, however if there are none, focus can escape the trap. These changes include additional logic that will move focus to the root element, if it is focusable, and focus trapping didn't find any focusable descendants. Fixes #33622. (cherry picked from commit f3e6276)
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.
When focus lands on a focus trap anchor, it looks for focusable elements inside the root element, however if there are none, focus can escape the trap.
These changes include additional logic that will move focus to the root element, if it is focusable, and focus trapping didn't find any focusable descendants.
Fixes #33622.