Skip to content
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

[material-ui][Select] Improve a11y by adding combobox role and aria-controls attribute #38785

Merged
merged 9 commits into from
Sep 27, 2023
Merged

[material-ui][Select] Improve a11y by adding combobox role and aria-controls attribute #38785

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
942de8f
Improve Select Component a11y by adding combobox role and aria-contro…
Sep 3, 2023
f47dcd2
replace button role with combobox role
Sep 14, 2023
5859dc3
address comments and fix tests
Sep 20, 2023
9f0e07d
Update table pagination tests
DiegoAndai Sep 22, 2023
7e3539c
Remove unnecessary hidden option in test queries
DiegoAndai Sep 22, 2023
88d5c68
Revert "Remove unnecessary hidden option in test queries"
DiegoAndai Sep 22, 2023
b233d35
Merge branch 'master' into xulingzhihou/fixSelectA11y
DiegoAndai Sep 22, 2023
1c43753
Update new test
DiegoAndai Sep 22, 2023
1acf350
Merge branch 'master' into xulingzhihou/fixSelectA11y
DiegoAndai Sep 25, 2023
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
31 changes: 15 additions & 16 deletions packages/mui-material-next/src/TablePagination/TablePagination.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ describe('<TablePagination />', () => {

describe('prop: labelRowsPerPage', () => {
it('labels the select for the current page', () => {
const { getAllByRole } = render(
const { getByRole } = render(
<table>
<TableFooter>
<TableRow>
Expand All @@ -100,13 +100,12 @@ describe('<TablePagination />', () => {
</table>,
);

// will be `getByRole('combobox')` in aria 1.2
const [combobox] = getAllByRole('button');
expect(combobox).toHaveAccessibleName('lines per page: 10');
const combobox = getByRole('combobox');
expect(combobox).toHaveAccessibleName('lines per page:');
});

it('accepts React nodes', () => {
const { getAllByRole } = render(
const { getByRole } = render(
<table>
<TableFooter>
<TableRow>
Expand All @@ -127,15 +126,14 @@ describe('<TablePagination />', () => {
</table>,
);

// will be `getByRole('combobox')` in aria 1.2
const [combobox] = getAllByRole('button');
expect(combobox).toHaveAccessibleName('lines per page: 10');
const combobox = getByRole('combobox');
expect(combobox).toHaveAccessibleName('lines per page:');
DiegoAndai marked this conversation as resolved.
Show resolved Hide resolved
});
});

describe('prop: page', () => {
it('should disable the back button on the first page', () => {
const { getAllByRole } = render(
const { getByRole } = render(
<table>
<TableFooter>
<TableRow>
Expand All @@ -151,13 +149,14 @@ describe('<TablePagination />', () => {
</table>,
);

const [, backButton, nextButton] = getAllByRole('button');
const backButton = getByRole('button', { name: 'Go to previous page' });
const nextButton = getByRole('button', { name: 'Go to next page' });
expect(backButton).to.have.property('disabled', true);
expect(nextButton).to.have.property('disabled', false);
});

it('should disable the next button on the last page', () => {
const { getAllByRole } = render(
const { getByRole } = render(
<table>
<TableFooter>
<TableRow>
Expand All @@ -173,7 +172,8 @@ describe('<TablePagination />', () => {
</table>,
);

const [, backButton, nextButton] = getAllByRole('button');
const backButton = getByRole('button', { name: 'Go to previous page' });
const nextButton = getByRole('button', { name: 'Go to next page' });
expect(backButton).to.have.property('disabled', false);
expect(nextButton).to.have.property('disabled', true);
});
Expand Down Expand Up @@ -380,7 +380,7 @@ describe('<TablePagination />', () => {

describe('prop: SelectProps', () => {
it('does allow manual label ids', () => {
const { getAllByRole } = render(
const { getByRole } = render(
<table>
<TableFooter>
<TableRow>
Expand All @@ -397,9 +397,8 @@ describe('<TablePagination />', () => {
</table>,
);

// will be `getByRole('combobox')` in aria 1.2
const [combobox] = getAllByRole('button');
expect(combobox).toHaveAccessibleName('Rows per page: 10');
const combobox = getByRole('combobox');
expect(combobox).toHaveAccessibleName('Rows per page:');
});
});

Expand Down
Loading