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

Jump to bottom

[EuiDataGrid] Provide rows for datagrid cells to be owned by #5213

Closed
wants to merge 3 commits into from
Closed

[EuiDataGrid] Provide rows for datagrid cells to be owned by #5213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3de3ce9
Provide rows for datagrid cells to be owned by
chandlerprall Sep 23, 2021
4594779
Merge branch 'master' into bug/4474-datagrid-row-accessibility
chandlerprall Sep 27, 2021
04d3ab5
changelog
chandlerprall Sep 27, 2021
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

- Fixed logo icons with static SVG IDs causing accessibility errors when multiples of the same logo were present ([#5204](https://github.com/elastic/eui/pull/5204))
- Fixed several `EuiDataGrid` console errors that occur on column drag/drop reorder ([#5209](https://github.com/elastic/eui/pull/5209))
- Fixed an accessibility issue where `EuiDataGrid` cells weren't owned by `role=row` elements ([#5213](https://github.com/elastic/eui/pull/5213))

**Reverts**

Expand Down
9 changes: 0 additions & 9 deletions scripts/a11y-testing.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,6 @@ const docsPages = async (root, page) => {
`${root}#/forms/color-selection`,
`${root}#/forms/date-picker`,
`${root}#/forms/super-date-picker`,
`${root}#/tabular-content/data-grid`,
`${root}#/tabular-content/data-grid-in-memory-settings`,
`${root}#/tabular-content/data-grid-schemas-and-popovers`,
`${root}#/tabular-content/data-grid-focus`,
`${root}#/tabular-content/data-grid-styling-and-control`,
`${root}#/tabular-content/data-grid-control-columns`,
`${root}#/tabular-content/data-grid-footer-row`,
`${root}#/tabular-content/data-grid-virtualization`,
`${root}#/tabular-content/data-grid-row-heights-options`,
Comment on lines -16 to -24
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🎉 🎉 🎉

];

return [
Expand Down
50 changes: 50 additions & 0 deletions src/components/datagrid/__snapshots__/data_grid.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1039,6 +1039,11 @@ Array [
<div
style="width:100%;height:100%;overflow:hidden"
>
<div
aria-owns="datagrid-generated-id-cell--1,-1"
id="datagrid-generated-id-row--1}"
role="row"
/>
<div
class="euiDataGrid__virtualized"
style="position:relative;height:9007199254740991px;width:9007199254740991px;overflow:auto;-webkit-overflow-scrolling:touch;will-change:transform;direction:ltr"
Expand Down Expand Up @@ -1131,6 +1136,7 @@ Array [
<div
class="euiDataGridRowCell euiDataGridRowCell--firstColumn"
data-test-subj="dataGridRowCell"
id="datagrid-generated-id-cell-0,0"
role="gridcell"
style="position:absolute;left:0;top:0px;height:34px;width:100px"
tabindex="-1"
Expand Down Expand Up @@ -1158,6 +1164,7 @@ Array [
<div
class="euiDataGridRowCell euiDataGridRowCell--lastColumn"
data-test-subj="dataGridRowCell"
id="datagrid-generated-id-cell-0,1"
role="gridcell"
style="position:absolute;left:100px;top:0px;height:34px;width:100px"
tabindex="-1"
Expand Down Expand Up @@ -1185,6 +1192,7 @@ Array [
<div
class="euiDataGridRowCell euiDataGridRowCell--stripe euiDataGridRowCell--firstColumn"
data-test-subj="dataGridRowCell"
id="datagrid-generated-id-cell-1,0"
role="gridcell"
style="position:absolute;left:0;top:34px;height:34px;width:100px"
tabindex="-1"
Expand Down Expand Up @@ -1212,6 +1220,7 @@ Array [
<div
class="euiDataGridRowCell euiDataGridRowCell--stripe euiDataGridRowCell--lastColumn"
data-test-subj="dataGridRowCell"
id="datagrid-generated-id-cell-1,1"
role="gridcell"
style="position:absolute;left:100px;top:34px;height:34px;width:100px"
tabindex="-1"
Expand Down Expand Up @@ -1239,6 +1248,7 @@ Array [
<div
class="euiDataGridRowCell euiDataGridRowCell--firstColumn"
data-test-subj="dataGridRowCell"
id="datagrid-generated-id-cell-2,0"
role="gridcell"
style="position:absolute;left:0;top:68px;height:34px;width:100px"
tabindex="-1"
Expand Down Expand Up @@ -1266,6 +1276,7 @@ Array [
<div
class="euiDataGridRowCell euiDataGridRowCell--lastColumn"
data-test-subj="dataGridRowCell"
id="datagrid-generated-id-cell-2,1"
role="gridcell"
style="position:absolute;left:100px;top:68px;height:34px;width:100px"
tabindex="-1"
Expand Down Expand Up @@ -1435,6 +1446,11 @@ Array [
<div
style="width:100%;height:100%;overflow:hidden"
>
<div
aria-owns="datagrid-generated-id-cell--1,-1"
id="datagrid-generated-id-row--1}"
role="row"
/>
<div
class="euiDataGrid__virtualized"
style="position:relative;height:9007199254740991px;width:9007199254740991px;overflow:auto;-webkit-overflow-scrolling:touch;will-change:transform;direction:ltr"
Expand Down Expand Up @@ -1557,6 +1573,7 @@ Array [
<div
class="euiDataGridRowCell euiDataGridRowCell--firstColumn euiDataGridRowCell--controlColumn"
data-test-subj="dataGridRowCell"
id="datagrid-generated-id-cell-0,0"
role="gridcell"
style="position:absolute;left:0;top:0px;height:34px;width:50px"
tabindex="-1"
Expand Down Expand Up @@ -1603,6 +1620,7 @@ Array [
<div
class="euiDataGridRowCell"
data-test-subj="dataGridRowCell"
id="datagrid-generated-id-cell-0,1"
role="gridcell"
style="position:absolute;left:50px;top:0px;height:34px;width:100px"
tabindex="-1"
Expand Down Expand Up @@ -1630,6 +1648,7 @@ Array [
<div
class="euiDataGridRowCell"
data-test-subj="dataGridRowCell"
id="datagrid-generated-id-cell-0,2"
role="gridcell"
style="position:absolute;left:150px;top:0px;height:34px;width:100px"
tabindex="-1"
Expand Down Expand Up @@ -1657,6 +1676,7 @@ Array [
<div
class="euiDataGridRowCell euiDataGridRowCell--lastColumn euiDataGridRowCell--controlColumn"
data-test-subj="dataGridRowCell"
id="datagrid-generated-id-cell-0,3"
role="gridcell"
style="position:absolute;left:250px;top:0px;height:34px;width:50px"
tabindex="-1"
Expand Down Expand Up @@ -1703,6 +1723,7 @@ Array [
<div
class="euiDataGridRowCell euiDataGridRowCell--stripe euiDataGridRowCell--firstColumn euiDataGridRowCell--controlColumn"
data-test-subj="dataGridRowCell"
id="datagrid-generated-id-cell-1,0"
role="gridcell"
style="position:absolute;left:0;top:34px;height:34px;width:50px"
tabindex="-1"
Expand Down Expand Up @@ -1749,6 +1770,7 @@ Array [
<div
class="euiDataGridRowCell euiDataGridRowCell--stripe"
data-test-subj="dataGridRowCell"
id="datagrid-generated-id-cell-1,1"
role="gridcell"
style="position:absolute;left:50px;top:34px;height:34px;width:100px"
tabindex="-1"
Expand Down Expand Up @@ -1776,6 +1798,7 @@ Array [
<div
class="euiDataGridRowCell euiDataGridRowCell--stripe"
data-test-subj="dataGridRowCell"
id="datagrid-generated-id-cell-1,2"
role="gridcell"
style="position:absolute;left:150px;top:34px;height:34px;width:100px"
tabindex="-1"
Expand Down Expand Up @@ -1803,6 +1826,7 @@ Array [
<div
class="euiDataGridRowCell euiDataGridRowCell--stripe euiDataGridRowCell--lastColumn euiDataGridRowCell--controlColumn"
data-test-subj="dataGridRowCell"
id="datagrid-generated-id-cell-1,3"
role="gridcell"
style="position:absolute;left:250px;top:34px;height:34px;width:50px"
tabindex="-1"
Expand Down Expand Up @@ -1849,6 +1873,7 @@ Array [
<div
class="euiDataGridRowCell euiDataGridRowCell--firstColumn euiDataGridRowCell--controlColumn"
data-test-subj="dataGridRowCell"
id="datagrid-generated-id-cell-2,0"
role="gridcell"
style="position:absolute;left:0;top:68px;height:34px;width:50px"
tabindex="-1"
Expand Down Expand Up @@ -1895,6 +1920,7 @@ Array [
<div
class="euiDataGridRowCell"
data-test-subj="dataGridRowCell"
id="datagrid-generated-id-cell-2,1"
role="gridcell"
style="position:absolute;left:50px;top:68px;height:34px;width:100px"
tabindex="-1"
Expand Down Expand Up @@ -1922,6 +1948,7 @@ Array [
<div
class="euiDataGridRowCell"
data-test-subj="dataGridRowCell"
id="datagrid-generated-id-cell-2,2"
role="gridcell"
style="position:absolute;left:150px;top:68px;height:34px;width:100px"
tabindex="-1"
Expand Down Expand Up @@ -1949,6 +1976,7 @@ Array [
<div
class="euiDataGridRowCell euiDataGridRowCell--lastColumn euiDataGridRowCell--controlColumn"
data-test-subj="dataGridRowCell"
id="datagrid-generated-id-cell-2,3"
role="gridcell"
style="position:absolute;left:250px;top:68px;height:34px;width:50px"
tabindex="-1"
Expand Down Expand Up @@ -2134,6 +2162,11 @@ Array [
<div
style="width:100%;height:100%;overflow:hidden"
>
<div
aria-owns="datagrid-generated-id-cell--1,-1"
id="datagrid-generated-id-row--1}"
role="row"
/>
<div
class="euiDataGrid__virtualized"
style="position:relative;height:9007199254740991px;width:9007199254740991px;overflow:auto;-webkit-overflow-scrolling:touch;will-change:transform;direction:ltr"
Expand Down Expand Up @@ -2228,6 +2261,7 @@ Array [
<div
class="euiDataGridRowCell euiDataGridRowCell--firstColumn"
data-test-subj="dataGridRowCell"
id="datagrid-generated-id-cell-0,0"
role="gridcell"
style="position:absolute;left:0;top:0px;height:34px;width:100px"
tabindex="-1"
Expand Down Expand Up @@ -2255,6 +2289,7 @@ Array [
<div
class="euiDataGridRowCell euiDataGridRowCell--lastColumn"
data-test-subj="dataGridRowCell"
id="datagrid-generated-id-cell-0,1"
role="gridcell"
style="position:absolute;left:100px;top:0px;height:34px;width:100px"
tabindex="-1"
Expand Down Expand Up @@ -2282,6 +2317,7 @@ Array [
<div
class="euiDataGridRowCell euiDataGridRowCell--stripe euiDataGridRowCell--firstColumn"
data-test-subj="dataGridRowCell"
id="datagrid-generated-id-cell-1,0"
role="gridcell"
style="position:absolute;left:0;top:34px;height:34px;width:100px"
tabindex="-1"
Expand Down Expand Up @@ -2309,6 +2345,7 @@ Array [
<div
class="euiDataGridRowCell euiDataGridRowCell--stripe euiDataGridRowCell--lastColumn"
data-test-subj="dataGridRowCell"
id="datagrid-generated-id-cell-1,1"
role="gridcell"
style="position:absolute;left:100px;top:34px;height:34px;width:100px"
tabindex="-1"
Expand Down Expand Up @@ -2336,6 +2373,7 @@ Array [
<div
class="euiDataGridRowCell euiDataGridRowCell--firstColumn"
data-test-subj="dataGridRowCell"
id="datagrid-generated-id-cell-2,0"
role="gridcell"
style="position:absolute;left:0;top:68px;height:34px;width:100px"
tabindex="-1"
Expand Down Expand Up @@ -2363,6 +2401,7 @@ Array [
<div
class="euiDataGridRowCell euiDataGridRowCell--lastColumn"
data-test-subj="dataGridRowCell"
id="datagrid-generated-id-cell-2,1"
role="gridcell"
style="position:absolute;left:100px;top:68px;height:34px;width:100px"
tabindex="-1"
Expand Down Expand Up @@ -2529,6 +2568,11 @@ Array [
<div
style="width:100%;height:100%;overflow:hidden"
>
<div
aria-owns="datagrid-generated-id-cell--1,-1"
id="datagrid-generated-id-row--1}"
role="row"
/>
<div
class="euiDataGrid__virtualized"
style="position:relative;height:9007199254740991px;width:9007199254740991px;overflow:auto;-webkit-overflow-scrolling:touch;will-change:transform;direction:ltr"
Expand Down Expand Up @@ -2621,6 +2665,7 @@ Array [
<div
class="euiDataGridRowCell euiDataGridRowCell--firstColumn"
data-test-subj="dataGridRowCell"
id="datagrid-generated-id-cell-0,0"
role="gridcell"
style="position:absolute;left:0;top:0px;height:34px;width:100px"
tabindex="-1"
Expand Down Expand Up @@ -2648,6 +2693,7 @@ Array [
<div
class="euiDataGridRowCell euiDataGridRowCell--lastColumn"
data-test-subj="dataGridRowCell"
id="datagrid-generated-id-cell-0,1"
role="gridcell"
style="position:absolute;left:100px;top:0px;height:34px;width:100px"
tabindex="-1"
Expand Down Expand Up @@ -2675,6 +2721,7 @@ Array [
<div
class="euiDataGridRowCell euiDataGridRowCell--stripe euiDataGridRowCell--firstColumn"
data-test-subj="dataGridRowCell"
id="datagrid-generated-id-cell-1,0"
role="gridcell"
style="position:absolute;left:0;top:34px;height:34px;width:100px"
tabindex="-1"
Expand Down Expand Up @@ -2702,6 +2749,7 @@ Array [
<div
class="euiDataGridRowCell euiDataGridRowCell--stripe euiDataGridRowCell--lastColumn"
data-test-subj="dataGridRowCell"
id="datagrid-generated-id-cell-1,1"
role="gridcell"
style="position:absolute;left:100px;top:34px;height:34px;width:100px"
tabindex="-1"
Expand Down Expand Up @@ -2729,6 +2777,7 @@ Array [
<div
class="euiDataGridRowCell euiDataGridRowCell--firstColumn"
data-test-subj="dataGridRowCell"
id="datagrid-generated-id-cell-2,0"
role="gridcell"
style="position:absolute;left:0;top:68px;height:34px;width:100px"
tabindex="-1"
Expand Down Expand Up @@ -2756,6 +2805,7 @@ Array [
<div
class="euiDataGridRowCell euiDataGridRowCell--lastColumn"
data-test-subj="dataGridRowCell"
id="datagrid-generated-id-cell-2,1"
role="gridcell"
style="position:absolute;left:100px;top:68px;height:34px;width:100px"
tabindex="-1"
Expand Down
7 changes: 7 additions & 0 deletions src/components/datagrid/body/__snapshots__/data_grid_body.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ exports[`EuiDataGridBody renders 1`] = `
<div
style="width:100%;height:100%;overflow:hidden"
>
<div
aria-owns="datagrid-grid-cell--1,-1"
id="datagrid-grid-row--1}"
role="row"
/>
<div
class="euiDataGrid__virtualized"
style="position:relative;height:9007199254740991px;width:9007199254740991px;overflow:auto;-webkit-overflow-scrolling:touch;will-change:transform;direction:ltr"
Expand Down Expand Up @@ -90,6 +95,7 @@ exports[`EuiDataGridBody renders 1`] = `
<div
class="euiDataGridRowCell euiDataGridRowCell--boolean euiDataGridRowCell--firstColumn"
data-test-subj="dataGridRowCell"
id="datagrid-grid-cell-0,0"
role="gridcell"
style="position:absolute;left:0;top:0px;height:34px;width:20px"
tabindex="-1"
Expand Down Expand Up @@ -119,6 +125,7 @@ exports[`EuiDataGridBody renders 1`] = `
<div
class="euiDataGridRowCell euiDataGridRowCell--string euiDataGridRowCell--lastColumn"
data-test-subj="dataGridRowCell"
id="datagrid-grid-cell-0,1"
role="gridcell"
style="position:absolute;left:20px;top:0px;height:34px"
tabindex="-1"
Expand Down
2 changes: 2 additions & 0 deletions src/components/datagrid/body/__snapshots__/data_grid_cell.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ exports[`EuiDataGridCell renders 1`] = `
<EuiDataGridCell
colIndex={0}
columnId="someColumn"
id="cell"
interactiveCellId="someId"
isExpandable={true}
popoverContent={[Function]}
Expand All @@ -30,6 +31,7 @@ exports[`EuiDataGridCell renders 1`] = `
<div
className="euiDataGridRowCell"
data-test-subj="dataGridRowCell"
id="cell"
onBlur={[Function]}
onFocus={[Function]}
onKeyDown={[Function]}
Expand Down
1 change: 1 addition & 0 deletions src/components/datagrid/body/data_grid_body.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import { EuiDataGridBody, Cell, getParentCellContent } from './data_grid_body';

describe('EuiDataGridBody', () => {
const requiredProps = {
gridId: 'grid',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd like to see us add more to EuiDataGridBody for unit testing, something that helps devs understand what setRenderedRowIndices/onItemsRendered is doing and what accessibilityRows renders, e.g.:

describe('EuiDataGridBody', () => {
  // ...

  it('renders row elements for each visible/virtualized row of cells', () => {
    // I would expect an assertion for the # of row elements, e.g.
    const rows = component.find('[role="row"]');
    expect(rows).toHaveLength(10);
    // + one assertion/examination of any row's `aria-owns` prop to make sure it has the right ID(s)
    expect(rows[0].prop('aria-owns')).toContain('datagrid-grid-cell-0,0');
  });
});

isFullScreen: false,
headerIsInteractive: true,
rowCount: 1,
Expand Down
Loading