Skip to content

Allow modal dialogs in useRovingTabIndex #4013

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

Merged
merged 2 commits into from
Dec 6, 2023
Merged

Allow modal dialogs in useRovingTabIndex #4013

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f0e3ad4
skip modal dialog elements in useRovingTabIndex
keithamus Dec 4, 2023
abe0e19
changeset
keithamus Dec 4, 2023
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
5 changes: 5 additions & 0 deletions .changeset/ten-tables-grin.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@primer/react': patch
---

Avoid error when using Modal Dialog within TreeView
11 changes: 11 additions & 0 deletions src/TreeView/useRovingTabIndex.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,17 @@ export function useRovingTabIndex({
getNextFocusable: (direction, from, event) => {
if (!(from instanceof HTMLElement)) return

// Skip elements within a modal dialog
// This need to be in a try/catch to avoid errors in
// non-supported browsers
try {
if (from.closest('dialog:modal')) {
return
}
} catch {
// Don't return
}

return getNextFocusableElement(from, event) ?? from
},
focusInStrategy: () => {
Expand Down