Skip to content

Core-1436: Remove spaces from Tabs and tab panel ids #2806

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
RoyEJohnson merged 2 commits into from
Dec 18, 2025
Merged

Core-1436: Remove spaces from Tabs and tab panel ids #2806

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
64605b2
Core-1436: Remove spaces from Tabs and tab panel ids
RoyEJohnson Dec 17, 2025
16fa5a2
Merge branch 'main' into core-1436-fix-book-details-tab-and-panel-labels
RoyEJohnson Dec 18, 2025
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
2 changes: 1 addition & 1 deletion src/app/components/content-group/content-group.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export default function ContentGroup({
return (
<div className="content-group">
{React.Children.map(children, (child, i) => (
<Panel label={labels[i]} key={i} active={activeIndex === i}>
<Panel label={labels[i] ?? ''} key={i} active={activeIndex === i}>
{child}
</Panel>
))}
Expand Down
1 change: 1 addition & 0 deletions src/app/components/tab-group/tab-group.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

[role="tablist"] {
@include tab-group();
margin: 0;

[role="tab"] {
@extend %tab;
Expand Down
24 changes: 13 additions & 11 deletions src/app/components/tab-group/tab-group.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,10 @@ type TabArgs = {
label: string;
selectedLabel: string;
setSelectedLabel: (s: string) => void;
TabTag: keyof JSX.IntrinsicElements;
analytics: boolean;
}

function Tab({label, selectedLabel, setSelectedLabel, TabTag, analytics}: TabArgs) {
function Tab({label, selectedLabel, setSelectedLabel, analytics}: TabArgs) {
const blurAndSetLabel = React.useCallback(
(event: React.MouseEvent) => {
(event as React.MouseEvent<HTMLElement>).currentTarget.blur();
Expand All @@ -24,7 +23,7 @@ function Tab({label, selectedLabel, setSelectedLabel, TabTag, analytics}: TabArg
, [label, selectedLabel]);

return (
<TabTag
<li
role="tab"
id={ariaTabId(label)}
aria-controls={ariaPanelId(label)}
Expand All @@ -35,21 +34,24 @@ function Tab({label, selectedLabel, setSelectedLabel, TabTag, analytics}: TabArg
data-analytics-link={analytics && !isSelected ? '' : undefined}
>
{label}
</TabTag>
</li>
);
}

function removeSpaces(label: string) {
return label.replace(/\s/g, '_');
}

export function ariaTabId(label: string) {
return `${label}-tab`;
return `${removeSpaces(label)}-tab`;
}

export function ariaPanelId(label: string) {
return `${label}-panel`;
return `${removeSpaces(label)}-panel`;
}

type TabGroupArgs = React.PropsWithChildren<
Pick<TabArgs, 'selectedLabel' | 'setSelectedLabel'> &
Pick<Partial<TabArgs>, 'TabTag'> &
{
labels: TabArgs['label'][];
'data-analytics-nav'?: string;
Expand All @@ -58,25 +60,25 @@ type TabGroupArgs = React.PropsWithChildren<
>

export default function TabGroup({
labels, selectedLabel, setSelectedLabel, TabTag='div', children, ...props
labels, selectedLabel, setSelectedLabel, children, ...props
}: TabGroupArgs) {
const analyticsNav = props['data-analytics-nav'];
const listLabel = props.listLabel ?? 'Tabs';

return (
<div className="tab-heading">
<div className="tabs-and-extras">
<div
<ul
role="tablist"
aria-label={listLabel}
data-analytics-nav={analyticsNav}
>
{labels.map((label) => <Tab
key={label}
analytics={!!analyticsNav}
{...{label, selectedLabel, setSelectedLabel, TabTag}}
{...{label, selectedLabel, setSelectedLabel}}
/>)}
</div>
</ul>
{children}
</div>
<hr className="tab-baseline" />
Expand Down