Skip to content
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

fix: incorrect focus setting when opening multiple terms sequentially #596

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

fix: incorrect focus setting when opening multiple terms sequentially #596

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
10 changes: 8 additions & 2 deletions src/js/term/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ export function openDefinition(target: HTMLElement) {

definitionElement.classList.toggle(openClass);

trapFocus(definitionElement);
trapFocus(definitionElement, target);
}

export function closeDefinition(definition: HTMLElement) {
Expand Down Expand Up @@ -210,13 +210,19 @@ function getCoords(elem: HTMLElement) {
return {top: Math.round(top), left: Math.round(left)};
}

export function trapFocus(element: HTMLElement) {
export function trapFocus(element: HTMLElement, termButton: HTMLElement) {
const focusableElements = element.querySelectorAll(
'button, [href], input, select, textarea, [tabindex]:not([tabindex="-1"])',
);
const firstFocusableElement = focusableElements[0] as HTMLElement;
const lastFocusableElement = focusableElements[focusableElements.length - 1] as HTMLElement;

// if another term was previously closed, the focus may still be on it
if (!firstFocusableElement && document.activeElement !== termButton) {
termButton.focus();
return;
}

if (firstFocusableElement) {
firstFocusableElement.focus();
}
Expand Down