Removed data-gridcell-id from EuiDataGrid cells

- use separate `data-gridcell-column-id` & `data-gridcell-row-index` attributes instead
elastic · May 4, 2022 · 42434ca · 42434ca
1 parent 0b09e59
commit 42434ca
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 38 deletions.
diff --git a/src/components/datagrid/__snapshots__/data_grid.test.tsx.snap b/src/components/datagrid/__snapshots__/data_grid.test.tsx.snap
@@ -1138,7 +1138,6 @@ Array [
               class="euiDataGridRowCell euiDataGridRowCell--firstColumn"
               data-gridcell-column-id="A"
               data-gridcell-column-index="0"
-              data-gridcell-id="0,0"
               data-gridcell-row-index="0"
               data-gridcell-visible-row-index="0"
               data-test-subj="dataGridRowCell"
@@ -1170,7 +1169,6 @@ Array [
               class="euiDataGridRowCell euiDataGridRowCell--lastColumn"
               data-gridcell-column-id="B"
               data-gridcell-column-index="1"
-              data-gridcell-id="1,0"
               data-gridcell-row-index="0"
               data-gridcell-visible-row-index="0"
               data-test-subj="dataGridRowCell"
@@ -1202,7 +1200,6 @@ Array [
               class="euiDataGridRowCell euiDataGridRowCell--firstColumn"
               data-gridcell-column-id="A"
               data-gridcell-column-index="0"
-              data-gridcell-id="0,1"
               data-gridcell-row-index="1"
               data-gridcell-visible-row-index="1"
               data-test-subj="dataGridRowCell"
@@ -1234,7 +1231,6 @@ Array [
               class="euiDataGridRowCell euiDataGridRowCell--lastColumn"
               data-gridcell-column-id="B"
               data-gridcell-column-index="1"
-              data-gridcell-id="1,1"
               data-gridcell-row-index="1"
               data-gridcell-visible-row-index="1"
               data-test-subj="dataGridRowCell"
@@ -1266,7 +1262,6 @@ Array [
               class="euiDataGridRowCell euiDataGridRowCell--firstColumn"
               data-gridcell-column-id="A"
               data-gridcell-column-index="0"
-              data-gridcell-id="0,2"
               data-gridcell-row-index="2"
               data-gridcell-visible-row-index="2"
               data-test-subj="dataGridRowCell"
@@ -1298,7 +1293,6 @@ Array [
               class="euiDataGridRowCell euiDataGridRowCell--lastColumn"
               data-gridcell-column-id="B"
               data-gridcell-column-index="1"
-              data-gridcell-id="1,2"
               data-gridcell-row-index="2"
               data-gridcell-visible-row-index="2"
               data-test-subj="dataGridRowCell"
@@ -1602,7 +1596,6 @@ Array [
               class="euiDataGridRowCell euiDataGridRowCell--firstColumn euiDataGridRowCell--controlColumn"
               data-gridcell-column-id="leading"
               data-gridcell-column-index="0"
-              data-gridcell-id="0,0"
               data-gridcell-row-index="0"
               data-gridcell-visible-row-index="0"
               data-test-subj="dataGridRowCell"
@@ -1653,7 +1646,6 @@ Array [
               class="euiDataGridRowCell"
               data-gridcell-column-id="A"
               data-gridcell-column-index="1"
-              data-gridcell-id="1,0"
               data-gridcell-row-index="0"
               data-gridcell-visible-row-index="0"
               data-test-subj="dataGridRowCell"
@@ -1685,7 +1677,6 @@ Array [
               class="euiDataGridRowCell"
               data-gridcell-column-id="B"
               data-gridcell-column-index="2"
-              data-gridcell-id="2,0"
               data-gridcell-row-index="0"
               data-gridcell-visible-row-index="0"
               data-test-subj="dataGridRowCell"
@@ -1717,7 +1708,6 @@ Array [
               class="euiDataGridRowCell euiDataGridRowCell--lastColumn euiDataGridRowCell--controlColumn"
               data-gridcell-column-id="trailing"
               data-gridcell-column-index="3"
-              data-gridcell-id="3,0"
               data-gridcell-row-index="0"
               data-gridcell-visible-row-index="0"
               data-test-subj="dataGridRowCell"
@@ -1768,7 +1758,6 @@ Array [
               class="euiDataGridRowCell euiDataGridRowCell--firstColumn euiDataGridRowCell--controlColumn"
               data-gridcell-column-id="leading"
               data-gridcell-column-index="0"
-              data-gridcell-id="0,1"
               data-gridcell-row-index="1"
               data-gridcell-visible-row-index="1"
               data-test-subj="dataGridRowCell"
@@ -1819,7 +1808,6 @@ Array [
               class="euiDataGridRowCell"
               data-gridcell-column-id="A"
               data-gridcell-column-index="1"
-              data-gridcell-id="1,1"
               data-gridcell-row-index="1"
               data-gridcell-visible-row-index="1"
               data-test-subj="dataGridRowCell"
@@ -1851,7 +1839,6 @@ Array [
               class="euiDataGridRowCell"
               data-gridcell-column-id="B"
               data-gridcell-column-index="2"
-              data-gridcell-id="2,1"
               data-gridcell-row-index="1"
               data-gridcell-visible-row-index="1"
               data-test-subj="dataGridRowCell"
@@ -1883,7 +1870,6 @@ Array [
               class="euiDataGridRowCell euiDataGridRowCell--lastColumn euiDataGridRowCell--controlColumn"
               data-gridcell-column-id="trailing"
               data-gridcell-column-index="3"
-              data-gridcell-id="3,1"
               data-gridcell-row-index="1"
               data-gridcell-visible-row-index="1"
               data-test-subj="dataGridRowCell"
@@ -1934,7 +1920,6 @@ Array [
               class="euiDataGridRowCell euiDataGridRowCell--firstColumn euiDataGridRowCell--controlColumn"
               data-gridcell-column-id="leading"
               data-gridcell-column-index="0"
-              data-gridcell-id="0,2"
               data-gridcell-row-index="2"
               data-gridcell-visible-row-index="2"
               data-test-subj="dataGridRowCell"
@@ -1985,7 +1970,6 @@ Array [
               class="euiDataGridRowCell"
               data-gridcell-column-id="A"
               data-gridcell-column-index="1"
-              data-gridcell-id="1,2"
               data-gridcell-row-index="2"
               data-gridcell-visible-row-index="2"
               data-test-subj="dataGridRowCell"
@@ -2017,7 +2001,6 @@ Array [
               class="euiDataGridRowCell"
               data-gridcell-column-id="B"
               data-gridcell-column-index="2"
-              data-gridcell-id="2,2"
               data-gridcell-row-index="2"
               data-gridcell-visible-row-index="2"
               data-test-subj="dataGridRowCell"
@@ -2049,7 +2032,6 @@ Array [
               class="euiDataGridRowCell euiDataGridRowCell--lastColumn euiDataGridRowCell--controlColumn"
               data-gridcell-column-id="trailing"
               data-gridcell-column-index="3"
-              data-gridcell-id="3,2"
               data-gridcell-row-index="2"
               data-gridcell-visible-row-index="2"
               data-test-subj="dataGridRowCell"
@@ -2333,7 +2315,6 @@ Array [
               class="euiDataGridRowCell euiDataGridRowCell--firstColumn"
               data-gridcell-column-id="A"
               data-gridcell-column-index="0"
-              data-gridcell-id="0,0"
               data-gridcell-row-index="0"
               data-gridcell-visible-row-index="0"
               data-test-subj="dataGridRowCell"
@@ -2365,7 +2346,6 @@ Array [
               class="euiDataGridRowCell euiDataGridRowCell--lastColumn"
               data-gridcell-column-id="B"
               data-gridcell-column-index="1"
-              data-gridcell-id="1,0"
               data-gridcell-row-index="0"
               data-gridcell-visible-row-index="0"
               data-test-subj="dataGridRowCell"
@@ -2397,7 +2377,6 @@ Array [
               class="euiDataGridRowCell euiDataGridRowCell--firstColumn"
               data-gridcell-column-id="A"
               data-gridcell-column-index="0"
-              data-gridcell-id="0,1"
               data-gridcell-row-index="1"
               data-gridcell-visible-row-index="1"
               data-test-subj="dataGridRowCell"
@@ -2429,7 +2408,6 @@ Array [
               class="euiDataGridRowCell euiDataGridRowCell--lastColumn"
               data-gridcell-column-id="B"
               data-gridcell-column-index="1"
-              data-gridcell-id="1,1"
               data-gridcell-row-index="1"
               data-gridcell-visible-row-index="1"
               data-test-subj="dataGridRowCell"
@@ -2461,7 +2439,6 @@ Array [
               class="euiDataGridRowCell euiDataGridRowCell--firstColumn"
               data-gridcell-column-id="A"
               data-gridcell-column-index="0"
-              data-gridcell-id="0,2"
               data-gridcell-row-index="2"
               data-gridcell-visible-row-index="2"
               data-test-subj="dataGridRowCell"
@@ -2493,7 +2470,6 @@ Array [
               class="euiDataGridRowCell euiDataGridRowCell--lastColumn"
               data-gridcell-column-id="B"
               data-gridcell-column-index="1"
-              data-gridcell-id="1,2"
               data-gridcell-row-index="2"
               data-gridcell-visible-row-index="2"
               data-test-subj="dataGridRowCell"
@@ -2756,7 +2732,6 @@ Array [
               class="euiDataGridRowCell euiDataGridRowCell--firstColumn"
               data-gridcell-column-id="A"
               data-gridcell-column-index="0"
-              data-gridcell-id="0,0"
               data-gridcell-row-index="0"
               data-gridcell-visible-row-index="0"
               data-test-subj="dataGridRowCell"
@@ -2788,7 +2763,6 @@ Array [
               class="euiDataGridRowCell euiDataGridRowCell--lastColumn"
               data-gridcell-column-id="B"
               data-gridcell-column-index="1"
-              data-gridcell-id="1,0"
               data-gridcell-row-index="0"
               data-gridcell-visible-row-index="0"
               data-test-subj="dataGridRowCell"
@@ -2820,7 +2794,6 @@ Array [
               class="euiDataGridRowCell euiDataGridRowCell--firstColumn"
               data-gridcell-column-id="A"
               data-gridcell-column-index="0"
-              data-gridcell-id="0,1"
               data-gridcell-row-index="1"
               data-gridcell-visible-row-index="1"
               data-test-subj="dataGridRowCell"
@@ -2852,7 +2825,6 @@ Array [
               class="euiDataGridRowCell euiDataGridRowCell--lastColumn"
               data-gridcell-column-id="B"
               data-gridcell-column-index="1"
-              data-gridcell-id="1,1"
               data-gridcell-row-index="1"
               data-gridcell-visible-row-index="1"
               data-test-subj="dataGridRowCell"
@@ -2884,7 +2856,6 @@ Array [
               class="euiDataGridRowCell euiDataGridRowCell--firstColumn"
               data-gridcell-column-id="A"
               data-gridcell-column-index="0"
-              data-gridcell-id="0,2"
               data-gridcell-row-index="2"
               data-gridcell-visible-row-index="2"
               data-test-subj="dataGridRowCell"
@@ -2916,7 +2887,6 @@ Array [
               class="euiDataGridRowCell euiDataGridRowCell--lastColumn"
               data-gridcell-column-id="B"
               data-gridcell-column-index="1"
-              data-gridcell-id="1,2"
               data-gridcell-row-index="2"
               data-gridcell-visible-row-index="2"
               data-test-subj="dataGridRowCell"

diff --git a/src/components/datagrid/body/__snapshots__/data_grid_body.test.tsx.snap b/src/components/datagrid/body/__snapshots__/data_grid_body.test.tsx.snap
@@ -104,7 +104,6 @@ exports[`EuiDataGridBody renders 1`] = `
       class="euiDataGridRowCell euiDataGridRowCell--boolean euiDataGridRowCell--firstColumn"
       data-gridcell-column-id="columnA"
       data-gridcell-column-index="0"
-      data-gridcell-id="0,0"
       data-gridcell-row-index="0"
       data-gridcell-visible-row-index="0"
       data-test-subj="dataGridRowCell"
@@ -138,7 +137,6 @@ exports[`EuiDataGridBody renders 1`] = `
       class="euiDataGridRowCell euiDataGridRowCell--string euiDataGridRowCell--lastColumn"
       data-gridcell-column-id="columnB"
       data-gridcell-column-index="1"
-      data-gridcell-id="1,0"
       data-gridcell-row-index="0"
       data-gridcell-visible-row-index="0"
       data-test-subj="dataGridRowCell"

diff --git a/src/components/datagrid/body/__snapshots__/data_grid_cell.test.tsx.snap b/src/components/datagrid/body/__snapshots__/data_grid_cell.test.tsx.snap
@@ -93,7 +93,6 @@ exports[`EuiDataGridCell renders 1`] = `
     className="euiDataGridRowCell"
     data-gridcell-column-id="someColumn"
     data-gridcell-column-index={0}
-    data-gridcell-id="0,0"
     data-gridcell-row-index={0}
     data-gridcell-visible-row-index={0}
     data-test-subj="dataGridRowCell"

diff --git a/src/components/datagrid/body/data_grid_cell.tsx b/src/components/datagrid/body/data_grid_cell.tsx
@@ -697,7 +697,6 @@ export class EuiDataGridCell extends Component<
         data-gridcell-column-index={this.props.colIndex} // Affected by column reordering
         data-gridcell-row-index={this.props.rowIndex} // Index from data, not affected by sorting or pagination
         data-gridcell-visible-row-index={this.props.visibleRowIndex} // Affected by sorting & pagination
-        data-gridcell-id={`${this.props.colIndex},${this.props.rowIndex}`} // TODO: Deprecate in favor of the above 4 data attrs
         onKeyDown={handleCellKeyDown}
         onFocus={this.onFocus}
         onMouseEnter={() => {

diff --git a/src/components/datagrid/data_grid.test.tsx b/src/components/datagrid/data_grid.test.tsx
@@ -545,7 +545,6 @@ describe('EuiDataGrid', () => {
             "className": "euiDataGridRowCell euiDataGridRowCell--firstColumn customClass",
             "data-gridcell-column-id": "A",
             "data-gridcell-column-index": 0,
-            "data-gridcell-id": "0,0",
             "data-gridcell-row-index": 0,
             "data-gridcell-visible-row-index": 0,
             "data-test-subj": "dataGridRowCell",
@@ -571,7 +570,6 @@ describe('EuiDataGrid', () => {
             "className": "euiDataGridRowCell euiDataGridRowCell--lastColumn customClass",
             "data-gridcell-column-id": "B",
             "data-gridcell-column-index": 1,
-            "data-gridcell-id": "1,0",
             "data-gridcell-row-index": 0,
             "data-gridcell-visible-row-index": 0,
             "data-test-subj": "dataGridRowCell",
@@ -597,7 +595,6 @@ describe('EuiDataGrid', () => {
             "className": "euiDataGridRowCell euiDataGridRowCell--firstColumn customClass",
             "data-gridcell-column-id": "A",
             "data-gridcell-column-index": 0,
-            "data-gridcell-id": "0,1",
             "data-gridcell-row-index": 1,
             "data-gridcell-visible-row-index": 1,
             "data-test-subj": "dataGridRowCell",
@@ -623,7 +620,6 @@ describe('EuiDataGrid', () => {
             "className": "euiDataGridRowCell euiDataGridRowCell--lastColumn customClass",
             "data-gridcell-column-id": "B",
             "data-gridcell-column-index": 1,
-            "data-gridcell-id": "1,1",
             "data-gridcell-row-index": 1,
             "data-gridcell-visible-row-index": 1,
             "data-test-subj": "dataGridRowCell",