Skip to content

Add ARIA Labels and tests #1262

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

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

Add ARIA Labels and tests #1262

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
36 changes: 36 additions & 0 deletions src/components/ProgressBar.cy.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,4 +90,40 @@ describe('ProgressBar', () => {

cy.findByRole('progressbar').should('have.attr', 'style').and('include', 'scaleX(0.7)');
});

it('should have ARIA attributes when controlled progress is used', () => {
cy.mount(
<Wrapper>
<ProgressBar {...getProps()} controlledProgress progress={0.7} />
</Wrapper>
);

cy.findByRole('progressbar')
.should('have.attr', 'aria-valuenow', '70')
.and('have.attr', 'aria-valuemin', '0')
.and('have.attr', 'aria-valuemax', '100');
});

it('should convert progress values correctly to percentage', () => {
cy.mount(
<Wrapper>
<ProgressBar {...getProps()} controlledProgress progress={0.35} />
</Wrapper>
);

cy.findByRole('progressbar')
.should('have.attr', 'aria-valuenow', '35');
});

it('should handle string progress values', () => {
cy.mount(
<Wrapper>
<ProgressBar {...getProps()} controlledProgress progress="0.85" />
</Wrapper>
);

cy.findByRole('progressbar')
.should('have.attr', 'aria-valuenow', '85');
});

});
13 changes: 11 additions & 2 deletions src/components/ProgressBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,11 @@ export function ProgressBar({
}
};

// TODO: add aria-valuenow, aria-valuemax, aria-valuemin
const shouldShowAria = controlledProgress && progress !== undefined;
const progressValue = shouldShowAria ? (typeof progress === 'number' ? progress : parseFloat(progress || '0')) : 0;
const ariaValueNow = Math.min(100, Math.max(0, Math.round(progressValue * 100)));
const ariaValueMin = 0;
const ariaValueMax = 100;

return (
<div className={`${Default.CSS_NAMESPACE}__progress-bar--wrp`} data-hidden={isHidden}>
Expand All @@ -122,7 +126,12 @@ export function ProgressBar({
<div
role="progressbar"
aria-hidden={isHidden ? 'true' : 'false'}
aria-label="notification timer"
aria-label={'Notification progress bar: ' + ariaValueNow + ' percent'}
{...(shouldShowAria && {
'aria-valuenow': ariaValueNow,
'aria-valuemin': ariaValueMin,
'aria-valuemax': ariaValueMax
})}
className={classNames}
style={style}
{...animationEvent}
Expand Down