Skip to content

fix(a11y): only set aria-controls on the active tab #752

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

Closed
yggdrasilworld wants to merge 1 commit into from
Closed

fix(a11y): only set aria-controls on the active tab #752

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
23 changes: 14 additions & 9 deletions src/components/ui/Tabs.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,9 @@ export function Tabs<T extends string>({
}) {
const tabRefs = useRef<Map<T, HTMLButtonElement>>(new Map());

const focusTab = useCallback(
(key: T) => {
tabRefs.current.get(key)?.focus();
},
[],
);
const focusTab = useCallback((key: T) => {
tabRefs.current.get(key)?.focus();
}, []);

const handleKeyDown = useCallback(
(e: React.KeyboardEvent, currentKey: T) => {
Expand All @@ -40,10 +37,14 @@ export function Tabs<T extends string>({

switch (e.key) {
case "ArrowRight":
nextIdx = rtl ? (idx - 1 + keys.length) % keys.length : (idx + 1) % keys.length;
nextIdx = rtl
? (idx - 1 + keys.length) % keys.length
: (idx + 1) % keys.length;
break;
case "ArrowLeft":
nextIdx = rtl ? (idx + 1) % keys.length : (idx - 1 + keys.length) % keys.length;
nextIdx = rtl
? (idx + 1) % keys.length
: (idx - 1 + keys.length) % keys.length;
break;
case "Home":
nextIdx = 0;
Expand Down Expand Up @@ -79,7 +80,11 @@ export function Tabs<T extends string>({
role="tab"
id={`tab-${tab.key}`}
aria-selected={isActive}
aria-controls={`tabpanel-${tab.key}`}
// Only the ACTIVE tab's panel is rendered (ContributorDashboard
// mounts one tabpanel). aria-controls on an inactive tab pointed
// at a tabpanel id that isn't in the DOM — an ARIA reference
// error. Omit it on inactive tabs (#710).
aria-controls={isActive ? `tabpanel-${tab.key}` : undefined}
tabIndex={isActive ? 0 : -1}
onClick={() => onChange(tab.key)}
onKeyDown={(e) => handleKeyDown(e, tab.key)}
Expand Down