Skip to content

fix(TrapFocus): don't refocus when another component intentionally moves focus #597

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
egucciar wants to merge 1 commit into
base: canary
Choose a base branch
from
Open

fix(TrapFocus): don't refocus when another component intentionally moves focus #597

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions packages/utilities/src/a11y/TrapFocus.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,10 @@ class TrapFocus {
// Focus stayed inside the wrapper, no need to refocus
if (this.#root.contains(currentActiveElement)) return;

// Focus was intentionally moved to another component (e.g. a portal opened from inside the trap).
// Only refocus when focus was dropped (fell back to body), not when another component took it.
if (document.activeElement && document.activeElement !== document.body) return;

const focusable = getFocusableElements(this.#root, {
additionalElement: includeTrigger ? trigger : undefined,
});
Expand Down