Skip to content

fix(accordions): set inert for hidden Stepper content #1982

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
merged 1 commit into from
Dec 2, 2024
Merged

fix(accordions): set inert for hidden Stepper content #1982

Show file tree
Hide file tree
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
8 changes: 6 additions & 2 deletions packages/accordions/src/elements/stepper/components/Content.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,12 @@ describe('Content', () => {
</Stepper.Step>
</Stepper>
);
const visibleElement = queryByText('Blueberry');
const hiddenElement = queryByText('Strawberry');

expect(queryByText('Blueberry')).toHaveAttribute('aria-hidden', 'false');
expect(queryByText('Strawberry')).toHaveAttribute('aria-hidden', 'true');
expect(visibleElement).toHaveAttribute('aria-hidden', 'false');
expect(visibleElement).not.toHaveAttribute('inert');
expect(hiddenElement).toHaveAttribute('aria-hidden', 'true');
expect(hiddenElement).toHaveAttribute('inert');
});
});
4 changes: 3 additions & 1 deletion packages/accordions/src/elements/stepper/components/Content.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ const ContentComponent = forwardRef<HTMLDivElement, HTMLAttributes<HTMLDivElemen

return isHorizontal === false ? (
<StyledContent ref={ref} $isActive={isActive} {...props}>
<StyledInnerContent aria-hidden={!isActive}>{props.children}</StyledInnerContent>
<StyledInnerContent aria-hidden={!isActive} inert={isActive ? undefined : ''}>
{props.children}
</StyledInnerContent>
</StyledContent>
) : null;
}
Expand Down
8 changes: 6 additions & 2 deletions packages/accordions/src/styled/stepper/StyledInnerContent.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,14 @@ import { getLineHeight, retrieveComponentStyles, getColor } from '@zendeskgarden

const COMPONENT_ID = 'accordions.step_inner_content';

export const StyledInnerContent = styled.div.attrs<ThemeProps<DefaultTheme>>({
interface IStyledInnerContentProps extends ThemeProps<DefaultTheme> {
inert?: string;
}

export const StyledInnerContent = styled.div.attrs({
'data-garden-id': COMPONENT_ID,
'data-garden-version': PACKAGE_VERSION
})`
})<IStyledInnerContentProps>`
overflow: hidden;
line-height: ${props => getLineHeight(props.theme.space.base * 5, props.theme.fontSizes.md)};
color: ${({ theme }) => getColor({ theme, variable: 'foreground.default' })};
Expand Down
Loading