Skip to content

Initial focus trap issue in modals #5426

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
myovchev merged 1 commit into from
May 20, 2026
Merged

Initial focus trap issue in modals #5426

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
13 changes: 7 additions & 6 deletions packages/apostrophe/modules/@apostrophecms/modal/ui/apos/components/AposModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,12 @@ function onKeydownTab(event) {
if (event.target?.nodeName?.toLowerCase() === 'textarea') {
return;
}
const elements = getFocusableElements(modalEl.value);
// Skip visually hidden elements when cycling — but only here, not in
// trapFocus. Initial focus runs while `renderingElements` is still true,
// which puts the content under display:none and makes every candidate's
// offsetParent null.
const elements = getFocusableElements(modalEl.value)
.filter(el => el.offsetParent !== null);
// Keep the store snapshot consistent for other consumers.
store.updateModalData(props.modalData.id, { elementsToFocus: elements });
cycleElementsToFocus(event, elements);
Expand Down Expand Up @@ -556,11 +561,7 @@ function getFocusableElements(rootEl) {
if (!rootEl) {
return [];
}
return [ ...rootEl.querySelectorAll(focusableSelector) ]
// a cheap "visible and in the DOM" condition,
// false positive expected for position: fixed and
// visually hidden elements (visible: hidden, opacity: 0, etc.)
.filter(el => el.offsetParent !== null);
return [ ...rootEl.querySelectorAll(focusableSelector) ];
}

async function trapFocus() {
Expand Down
Loading