Visitar URL original
Fix Escape handling in language selector by arpitjain099 · Pull Request #6713 · uswds/uswds · GitHub
Skip to content

Fix Escape handling in language selector #6713

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
ethangardner merged 4 commits into from
Jul 28, 2026
Merged

Fix Escape handling in language selector #6713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0922917
Fix language selector Escape close handler
arpitjain099 Jun 16, 2026
9dcafc5
Merge branch 'develop' into chore/fix-language-selector-escape
ethangardner Jul 27, 2026
f66c2fc
test: drive the FocusTrap Escape callback in the language selector spec
arpitjain099 Jul 28, 2026
6a76feb
Merge branch 'develop' into chore/fix-language-selector-escape
ethangardner Jul 28, 2026
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
8 changes: 2 additions & 6 deletions packages/usa-language-selector/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,8 @@ const LANGUAGE_PRIMARY_ITEM = `.${PREFIX}-language__primary-item`;
const LANGUAGE_CONTROL = `button.${PREFIX}-language__link`;
const LANGUAGE_LINKS = `${LANGUAGE} a`;

let languageSelector;
let languageActive;

const onLanguageClose = () =>
languageSelector.toggleLanguage.call(languageSelector, false);

const hideActiveLanguageDropdown = () => {
if (!languageActive) {
return;
Expand All @@ -43,7 +39,7 @@ const handleEscape = (event) => {
focusLanguageButton(event);
};

languageSelector = behavior(
const languageSelector = behavior(
{
[CLICK]: {
[LANGUAGE_CONTROL]() {
Expand Down Expand Up @@ -91,7 +87,7 @@ languageSelector = behavior(

if (trapContainer) {
languageSelector.focusTrap = FocusTrap(trapContainer, {
Escape: onLanguageClose,
Escape: () => hideActiveLanguageDropdown(),
});
}
},
Expand Down
30 changes: 30 additions & 0 deletions packages/usa-language-selector/src/test/language-selector.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,36 @@ describe("language selector component", () => {
assert.strictEqual(languageButton.getAttribute("aria-expanded"), "false");
});

it("collapses dropdown via the FocusTrap Escape callback", () => {
languageButton.click();
// Activate the FocusTrap so its keydown/Escape binding is attached and
// fires when Escape is dispatched from within the submenu.
LanguageSelector.focusTrap.update(true);

// jsdom swallows errors thrown inside event listeners; use `window.onerror`
// to surface them so a broken Escape callback fails this test.
let listenerError = null;
const prevOnError = window.onerror;
window.onerror = (_msg, _src, _line, _col, err) => {
listenerError = err;
return true;
};

try {
EVENTS.escape(languageLink);
} finally {
window.onerror = prevOnError;
LanguageSelector.focusTrap.update(false);
}

assert.strictEqual(
listenerError,
null,
`FocusTrap Escape callback threw an error: ${listenerError}`,
);
assert.strictEqual(languageButton.getAttribute("aria-expanded"), "false");
});

it("contains a role of button", () => {
assert.strictEqual(languageButton.getAttribute("role"), "button");
});
Expand Down