Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions packages/eui/changelogs/upcoming/8597.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
**Accessibility**

- Removed the `aria-label` attribute from the `ul` element in `EuiPagination` to avoid duplicate screen reader output
- Set a more specific `aria-current="page"` on list items in `EuiPagination`
Original file line number Diff line number Diff line change
Expand Up @@ -962,15 +962,14 @@ exports[`EuiBasicTable renders (kitchen sink) with pagination, selection, sortin
/>
</button>
<ul
aria-label="Pagination for table: "
class="euiPagination__list emotion-euiPagination__list"
>
<li
class="euiPagination__item"
>
<button
aria-controls="__table_generated-id"
aria-current="true"
aria-current="page"
aria-label="Page 1 of 2"
class="euiButtonEmpty euiPaginationButton emotion-euiButtonDisplay-euiButtonEmpty-s-empty-disabled-isDisabled-euiPaginationButton-isActive"
data-test-subj="pagination-button-0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ exports[`EuiInMemoryTable behavior pagination 1`] = `
/>
</a>
<ul
aria-label="Pagination for table: "
class="euiPagination__list emotion-euiPagination__list"
>
<li
Expand Down Expand Up @@ -119,7 +118,7 @@ exports[`EuiInMemoryTable behavior pagination 1`] = `
>
<button
aria-controls="__table_generated-id"
aria-current="true"
aria-current="page"
aria-label="Page 2 of 2"
class="euiButtonEmpty euiPaginationButton emotion-euiButtonDisplay-euiButtonEmpty-s-empty-disabled-isDisabled-euiPaginationButton-isActive"
data-test-subj="pagination-button-1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ describe('EuiBasicTable', () => {

expect(getByRole('list')).toBeTruthy();
expect(
container.querySelector('[aria-current="true"]')?.textContent
container.querySelector('[aria-current="page"]')?.textContent
).toEqual('1');
});

Expand All @@ -264,7 +264,7 @@ describe('EuiBasicTable', () => {
const { container } = render(<EuiBasicTable {...props} />);

expect(
container.querySelector('[aria-current="true"]')?.textContent
container.querySelector('[aria-current="page"]')?.textContent
).toEqual('2');
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ exports[`EuiDataGrid pagination renders 1`] = `
/>
</a>
<ul
aria-label="Pagination for preceding grid: test grid"
class="euiPagination__list emotion-euiPagination__list"
>
<li
Expand Down Expand Up @@ -93,7 +92,7 @@ exports[`EuiDataGrid pagination renders 1`] = `
>
<button
aria-controls="generated-id"
aria-current="true"
aria-current="page"
aria-label="Page 2 of 2"
class="euiButtonEmpty euiPaginationButton emotion-euiButtonDisplay-euiButtonEmpty-s-empty-disabled-isDisabled-euiPaginationButton-isActive"
data-test-subj="pagination-button-1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,13 @@ exports[`EuiPagination is rendered 1`] = `
/>
</button>
<ul
aria-label="aria-label"
class="euiPagination__list emotion-euiPagination__list"
>
<li
class="euiPagination__item"
>
<button
aria-current="true"
aria-current="page"
aria-label="Page 1 of 1"
class="euiButtonEmpty euiPaginationButton emotion-euiButtonDisplay-euiButtonEmpty-s-empty-disabled-isDisabled-euiPaginationButton-isActive"
data-test-subj="pagination-button-0"
Expand Down Expand Up @@ -242,7 +241,7 @@ exports[`EuiPagination props activePage is rendered 1`] = `
class="euiPagination__item"
>
<button
aria-current="true"
aria-current="page"
aria-label="Page 6 of 10"
class="euiButtonEmpty euiPaginationButton emotion-euiButtonDisplay-euiButtonEmpty-s-empty-disabled-isDisabled-euiPaginationButton-isActive"
data-test-subj="pagination-button-5"
Expand Down Expand Up @@ -392,7 +391,7 @@ exports[`EuiPagination props aria-controls is rendered 1`] = `
>
<button
aria-controls="idOfTable"
aria-current="true"
aria-current="page"
aria-label="Page 1 of 1"
class="euiButtonEmpty euiPaginationButton emotion-euiButtonDisplay-euiButtonEmpty-s-empty-disabled-isDisabled-euiPaginationButton-isActive"
data-test-subj="pagination-button-0"
Expand Down Expand Up @@ -614,7 +613,7 @@ exports[`EuiPagination props pageCount is rendered 1`] = `
class="euiPagination__item"
>
<button
aria-current="true"
aria-current="page"
aria-label="Page 1 of 10"
class="euiButtonEmpty euiPaginationButton emotion-euiButtonDisplay-euiButtonEmpty-s-empty-disabled-isDisabled-euiPaginationButton-isActive"
data-test-subj="pagination-button-0"
Expand Down Expand Up @@ -789,7 +788,7 @@ exports[`EuiPagination props responsive can be customized 1`] = `
class="euiPagination__item"
>
<button
aria-current="true"
aria-current="page"
aria-label="Page 1 of 1"
class="euiButtonEmpty euiPaginationButton emotion-euiButtonDisplay-euiButtonEmpty-s-empty-disabled-isDisabled-euiPaginationButton-isActive"
data-test-subj="pagination-button-0"
Expand Down Expand Up @@ -858,7 +857,7 @@ exports[`EuiPagination props responsive can be false 1`] = `
class="euiPagination__item"
>
<button
aria-current="true"
aria-current="page"
aria-label="Page 1 of 1"
class="euiButtonEmpty euiPaginationButton emotion-euiButtonDisplay-euiButtonEmpty-s-empty-disabled-isDisabled-euiPaginationButton-isActive"
data-test-subj="pagination-button-0"
Expand Down
13 changes: 1 addition & 12 deletions packages/eui/src/components/pagination/pagination.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -281,19 +281,8 @@ export const EuiPagination: FunctionComponent<Props> = ({

const selectablePages = pages;

const accessibleName = {
...(rest['aria-label'] && { 'aria-label': rest['aria-label'] }),
...(rest['aria-labelledby'] && {
'aria-labelledby': rest['aria-labelledby'],
}),
};

centerPageCount = (
<ul
className="euiPagination__list"
css={styles.euiPagination__list}
{...accessibleName}
>
<ul className="euiPagination__list" css={styles.euiPagination__list}>
{firstPageButtons}
{selectablePages}
{lastPageButtons}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ export const EuiPaginationButton: FunctionComponent<Props> = ({
color: 'text',
'data-test-subj': `pagination-button-${pageIndex}`,
isDisabled: isActive,
...(isActive && { 'aria-current': true }),
...(isActive && { 'aria-current': 'page' }),
...(rest['aria-controls'] && { href: `#${rest['aria-controls']}` }),
...rest,
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ exports[`EuiTablePagination renders 1`] = `
/>
</button>
<ul
aria-label="aria-label"
class="euiPagination__list emotion-euiPagination__list"
>
<li
Expand All @@ -93,7 +92,7 @@ exports[`EuiTablePagination renders 1`] = `
class="euiPagination__item"
>
<button
aria-current="true"
aria-current="page"
aria-label="Page 2 of 5"
class="euiButtonEmpty euiPaginationButton emotion-euiButtonDisplay-euiButtonEmpty-s-empty-disabled-isDisabled-euiPaginationButton-isActive"
data-test-subj="pagination-button-1"
Expand Down