Skip to content

Commit 42434ca

Browse files
cee-chencee-chen
committed
Removed data-gridcell-id from EuiDataGrid cells
- use separate `data-gridcell-column-id` & `data-gridcell-row-index` attributes instead
1 parent 0b09e59 commit 42434ca

5 files changed

Lines changed: 0 additions & 38 deletions

File tree

‎src/components/datagrid/__snapshots__/data_grid.test.tsx.snap‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1138,7 +1138,6 @@ Array [
11381138
class="euiDataGridRowCell euiDataGridRowCell--firstColumn"
11391139
data-gridcell-column-id="A"
11401140
data-gridcell-column-index="0"
1141-
data-gridcell-id="0,0"
11421141
data-gridcell-row-index="0"
11431142
data-gridcell-visible-row-index="0"
11441143
data-test-subj="dataGridRowCell"
@@ -1170,7 +1169,6 @@ Array [
11701169
class="euiDataGridRowCell euiDataGridRowCell--lastColumn"
11711170
data-gridcell-column-id="B"
11721171
data-gridcell-column-index="1"
1173-
data-gridcell-id="1,0"
11741172
data-gridcell-row-index="0"
11751173
data-gridcell-visible-row-index="0"
11761174
data-test-subj="dataGridRowCell"
@@ -1202,7 +1200,6 @@ Array [
12021200
class="euiDataGridRowCell euiDataGridRowCell--firstColumn"
12031201
data-gridcell-column-id="A"
12041202
data-gridcell-column-index="0"
1205-
data-gridcell-id="0,1"
12061203
data-gridcell-row-index="1"
12071204
data-gridcell-visible-row-index="1"
12081205
data-test-subj="dataGridRowCell"
@@ -1234,7 +1231,6 @@ Array [
12341231
class="euiDataGridRowCell euiDataGridRowCell--lastColumn"
12351232
data-gridcell-column-id="B"
12361233
data-gridcell-column-index="1"
1237-
data-gridcell-id="1,1"
12381234
data-gridcell-row-index="1"
12391235
data-gridcell-visible-row-index="1"
12401236
data-test-subj="dataGridRowCell"
@@ -1266,7 +1262,6 @@ Array [
12661262
class="euiDataGridRowCell euiDataGridRowCell--firstColumn"
12671263
data-gridcell-column-id="A"
12681264
data-gridcell-column-index="0"
1269-
data-gridcell-id="0,2"
12701265
data-gridcell-row-index="2"
12711266
data-gridcell-visible-row-index="2"
12721267
data-test-subj="dataGridRowCell"
@@ -1298,7 +1293,6 @@ Array [
12981293
class="euiDataGridRowCell euiDataGridRowCell--lastColumn"
12991294
data-gridcell-column-id="B"
13001295
data-gridcell-column-index="1"
1301-
data-gridcell-id="1,2"
13021296
data-gridcell-row-index="2"
13031297
data-gridcell-visible-row-index="2"
13041298
data-test-subj="dataGridRowCell"
@@ -1602,7 +1596,6 @@ Array [
16021596
class="euiDataGridRowCell euiDataGridRowCell--firstColumn euiDataGridRowCell--controlColumn"
16031597
data-gridcell-column-id="leading"
16041598
data-gridcell-column-index="0"
1605-
data-gridcell-id="0,0"
16061599
data-gridcell-row-index="0"
16071600
data-gridcell-visible-row-index="0"
16081601
data-test-subj="dataGridRowCell"
@@ -1653,7 +1646,6 @@ Array [
16531646
class="euiDataGridRowCell"
16541647
data-gridcell-column-id="A"
16551648
data-gridcell-column-index="1"
1656-
data-gridcell-id="1,0"
16571649
data-gridcell-row-index="0"
16581650
data-gridcell-visible-row-index="0"
16591651
data-test-subj="dataGridRowCell"
@@ -1685,7 +1677,6 @@ Array [
16851677
class="euiDataGridRowCell"
16861678
data-gridcell-column-id="B"
16871679
data-gridcell-column-index="2"
1688-
data-gridcell-id="2,0"
16891680
data-gridcell-row-index="0"
16901681
data-gridcell-visible-row-index="0"
16911682
data-test-subj="dataGridRowCell"
@@ -1717,7 +1708,6 @@ Array [
17171708
class="euiDataGridRowCell euiDataGridRowCell--lastColumn euiDataGridRowCell--controlColumn"
17181709
data-gridcell-column-id="trailing"
17191710
data-gridcell-column-index="3"
1720-
data-gridcell-id="3,0"
17211711
data-gridcell-row-index="0"
17221712
data-gridcell-visible-row-index="0"
17231713
data-test-subj="dataGridRowCell"
@@ -1768,7 +1758,6 @@ Array [
17681758
class="euiDataGridRowCell euiDataGridRowCell--firstColumn euiDataGridRowCell--controlColumn"
17691759
data-gridcell-column-id="leading"
17701760
data-gridcell-column-index="0"
1771-
data-gridcell-id="0,1"
17721761
data-gridcell-row-index="1"
17731762
data-gridcell-visible-row-index="1"
17741763
data-test-subj="dataGridRowCell"
@@ -1819,7 +1808,6 @@ Array [
18191808
class="euiDataGridRowCell"
18201809
data-gridcell-column-id="A"
18211810
data-gridcell-column-index="1"
1822-
data-gridcell-id="1,1"
18231811
data-gridcell-row-index="1"
18241812
data-gridcell-visible-row-index="1"
18251813
data-test-subj="dataGridRowCell"
@@ -1851,7 +1839,6 @@ Array [
18511839
class="euiDataGridRowCell"
18521840
data-gridcell-column-id="B"
18531841
data-gridcell-column-index="2"
1854-
data-gridcell-id="2,1"
18551842
data-gridcell-row-index="1"
18561843
data-gridcell-visible-row-index="1"
18571844
data-test-subj="dataGridRowCell"
@@ -1883,7 +1870,6 @@ Array [
18831870
class="euiDataGridRowCell euiDataGridRowCell--lastColumn euiDataGridRowCell--controlColumn"
18841871
data-gridcell-column-id="trailing"
18851872
data-gridcell-column-index="3"
1886-
data-gridcell-id="3,1"
18871873
data-gridcell-row-index="1"
18881874
data-gridcell-visible-row-index="1"
18891875
data-test-subj="dataGridRowCell"
@@ -1934,7 +1920,6 @@ Array [
19341920
class="euiDataGridRowCell euiDataGridRowCell--firstColumn euiDataGridRowCell--controlColumn"
19351921
data-gridcell-column-id="leading"
19361922
data-gridcell-column-index="0"
1937-
data-gridcell-id="0,2"
19381923
data-gridcell-row-index="2"
19391924
data-gridcell-visible-row-index="2"
19401925
data-test-subj="dataGridRowCell"
@@ -1985,7 +1970,6 @@ Array [
19851970
class="euiDataGridRowCell"
19861971
data-gridcell-column-id="A"
19871972
data-gridcell-column-index="1"
1988-
data-gridcell-id="1,2"
19891973
data-gridcell-row-index="2"
19901974
data-gridcell-visible-row-index="2"
19911975
data-test-subj="dataGridRowCell"
@@ -2017,7 +2001,6 @@ Array [
20172001
class="euiDataGridRowCell"
20182002
data-gridcell-column-id="B"
20192003
data-gridcell-column-index="2"
2020-
data-gridcell-id="2,2"
20212004
data-gridcell-row-index="2"
20222005
data-gridcell-visible-row-index="2"
20232006
data-test-subj="dataGridRowCell"
@@ -2049,7 +2032,6 @@ Array [
20492032
class="euiDataGridRowCell euiDataGridRowCell--lastColumn euiDataGridRowCell--controlColumn"
20502033
data-gridcell-column-id="trailing"
20512034
data-gridcell-column-index="3"
2052-
data-gridcell-id="3,2"
20532035
data-gridcell-row-index="2"
20542036
data-gridcell-visible-row-index="2"
20552037
data-test-subj="dataGridRowCell"
@@ -2333,7 +2315,6 @@ Array [
23332315
class="euiDataGridRowCell euiDataGridRowCell--firstColumn"
23342316
data-gridcell-column-id="A"
23352317
data-gridcell-column-index="0"
2336-
data-gridcell-id="0,0"
23372318
data-gridcell-row-index="0"
23382319
data-gridcell-visible-row-index="0"
23392320
data-test-subj="dataGridRowCell"
@@ -2365,7 +2346,6 @@ Array [
23652346
class="euiDataGridRowCell euiDataGridRowCell--lastColumn"
23662347
data-gridcell-column-id="B"
23672348
data-gridcell-column-index="1"
2368-
data-gridcell-id="1,0"
23692349
data-gridcell-row-index="0"
23702350
data-gridcell-visible-row-index="0"
23712351
data-test-subj="dataGridRowCell"
@@ -2397,7 +2377,6 @@ Array [
23972377
class="euiDataGridRowCell euiDataGridRowCell--firstColumn"
23982378
data-gridcell-column-id="A"
23992379
data-gridcell-column-index="0"
2400-
data-gridcell-id="0,1"
24012380
data-gridcell-row-index="1"
24022381
data-gridcell-visible-row-index="1"
24032382
data-test-subj="dataGridRowCell"
@@ -2429,7 +2408,6 @@ Array [
24292408
class="euiDataGridRowCell euiDataGridRowCell--lastColumn"
24302409
data-gridcell-column-id="B"
24312410
data-gridcell-column-index="1"
2432-
data-gridcell-id="1,1"
24332411
data-gridcell-row-index="1"
24342412
data-gridcell-visible-row-index="1"
24352413
data-test-subj="dataGridRowCell"
@@ -2461,7 +2439,6 @@ Array [
24612439
class="euiDataGridRowCell euiDataGridRowCell--firstColumn"
24622440
data-gridcell-column-id="A"
24632441
data-gridcell-column-index="0"
2464-
data-gridcell-id="0,2"
24652442
data-gridcell-row-index="2"
24662443
data-gridcell-visible-row-index="2"
24672444
data-test-subj="dataGridRowCell"
@@ -2493,7 +2470,6 @@ Array [
24932470
class="euiDataGridRowCell euiDataGridRowCell--lastColumn"
24942471
data-gridcell-column-id="B"
24952472
data-gridcell-column-index="1"
2496-
data-gridcell-id="1,2"
24972473
data-gridcell-row-index="2"
24982474
data-gridcell-visible-row-index="2"
24992475
data-test-subj="dataGridRowCell"
@@ -2756,7 +2732,6 @@ Array [
27562732
class="euiDataGridRowCell euiDataGridRowCell--firstColumn"
27572733
data-gridcell-column-id="A"
27582734
data-gridcell-column-index="0"
2759-
data-gridcell-id="0,0"
27602735
data-gridcell-row-index="0"
27612736
data-gridcell-visible-row-index="0"
27622737
data-test-subj="dataGridRowCell"
@@ -2788,7 +2763,6 @@ Array [
27882763
class="euiDataGridRowCell euiDataGridRowCell--lastColumn"
27892764
data-gridcell-column-id="B"
27902765
data-gridcell-column-index="1"
2791-
data-gridcell-id="1,0"
27922766
data-gridcell-row-index="0"
27932767
data-gridcell-visible-row-index="0"
27942768
data-test-subj="dataGridRowCell"
@@ -2820,7 +2794,6 @@ Array [
28202794
class="euiDataGridRowCell euiDataGridRowCell--firstColumn"
28212795
data-gridcell-column-id="A"
28222796
data-gridcell-column-index="0"
2823-
data-gridcell-id="0,1"
28242797
data-gridcell-row-index="1"
28252798
data-gridcell-visible-row-index="1"
28262799
data-test-subj="dataGridRowCell"
@@ -2852,7 +2825,6 @@ Array [
28522825
class="euiDataGridRowCell euiDataGridRowCell--lastColumn"
28532826
data-gridcell-column-id="B"
28542827
data-gridcell-column-index="1"
2855-
data-gridcell-id="1,1"
28562828
data-gridcell-row-index="1"
28572829
data-gridcell-visible-row-index="1"
28582830
data-test-subj="dataGridRowCell"
@@ -2884,7 +2856,6 @@ Array [
28842856
class="euiDataGridRowCell euiDataGridRowCell--firstColumn"
28852857
data-gridcell-column-id="A"
28862858
data-gridcell-column-index="0"
2887-
data-gridcell-id="0,2"
28882859
data-gridcell-row-index="2"
28892860
data-gridcell-visible-row-index="2"
28902861
data-test-subj="dataGridRowCell"
@@ -2916,7 +2887,6 @@ Array [
29162887
class="euiDataGridRowCell euiDataGridRowCell--lastColumn"
29172888
data-gridcell-column-id="B"
29182889
data-gridcell-column-index="1"
2919-
data-gridcell-id="1,2"
29202890
data-gridcell-row-index="2"
29212891
data-gridcell-visible-row-index="2"
29222892
data-test-subj="dataGridRowCell"

‎src/components/datagrid/body/__snapshots__/data_grid_body.test.tsx.snap‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ exports[`EuiDataGridBody renders 1`] = `
104104
class="euiDataGridRowCell euiDataGridRowCell--boolean euiDataGridRowCell--firstColumn"
105105
data-gridcell-column-id="columnA"
106106
data-gridcell-column-index="0"
107-
data-gridcell-id="0,0"
108107
data-gridcell-row-index="0"
109108
data-gridcell-visible-row-index="0"
110109
data-test-subj="dataGridRowCell"
@@ -138,7 +137,6 @@ exports[`EuiDataGridBody renders 1`] = `
138137
class="euiDataGridRowCell euiDataGridRowCell--string euiDataGridRowCell--lastColumn"
139138
data-gridcell-column-id="columnB"
140139
data-gridcell-column-index="1"
141-
data-gridcell-id="1,0"
142140
data-gridcell-row-index="0"
143141
data-gridcell-visible-row-index="0"
144142
data-test-subj="dataGridRowCell"

‎src/components/datagrid/body/__snapshots__/data_grid_cell.test.tsx.snap‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ exports[`EuiDataGridCell renders 1`] = `
9393
className="euiDataGridRowCell"
9494
data-gridcell-column-id="someColumn"
9595
data-gridcell-column-index={0}
96-
data-gridcell-id="0,0"
9796
data-gridcell-row-index={0}
9897
data-gridcell-visible-row-index={0}
9998
data-test-subj="dataGridRowCell"

‎src/components/datagrid/body/data_grid_cell.tsx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -697,7 +697,6 @@ export class EuiDataGridCell extends Component<
697697
data-gridcell-column-index={this.props.colIndex} // Affected by column reordering
698698
data-gridcell-row-index={this.props.rowIndex} // Index from data, not affected by sorting or pagination
699699
data-gridcell-visible-row-index={this.props.visibleRowIndex} // Affected by sorting & pagination
700-
data-gridcell-id={`${this.props.colIndex},${this.props.rowIndex}`} // TODO: Deprecate in favor of the above 4 data attrs
701700
onKeyDown={handleCellKeyDown}
702701
onFocus={this.onFocus}
703702
onMouseEnter={() => {

‎src/components/datagrid/data_grid.test.tsx‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -545,7 +545,6 @@ describe('EuiDataGrid', () => {
545545
"className": "euiDataGridRowCell euiDataGridRowCell--firstColumn customClass",
546546
"data-gridcell-column-id": "A",
547547
"data-gridcell-column-index": 0,
548-
"data-gridcell-id": "0,0",
549548
"data-gridcell-row-index": 0,
550549
"data-gridcell-visible-row-index": 0,
551550
"data-test-subj": "dataGridRowCell",
@@ -571,7 +570,6 @@ describe('EuiDataGrid', () => {
571570
"className": "euiDataGridRowCell euiDataGridRowCell--lastColumn customClass",
572571
"data-gridcell-column-id": "B",
573572
"data-gridcell-column-index": 1,
574-
"data-gridcell-id": "1,0",
575573
"data-gridcell-row-index": 0,
576574
"data-gridcell-visible-row-index": 0,
577575
"data-test-subj": "dataGridRowCell",
@@ -597,7 +595,6 @@ describe('EuiDataGrid', () => {
597595
"className": "euiDataGridRowCell euiDataGridRowCell--firstColumn customClass",
598596
"data-gridcell-column-id": "A",
599597
"data-gridcell-column-index": 0,
600-
"data-gridcell-id": "0,1",
601598
"data-gridcell-row-index": 1,
602599
"data-gridcell-visible-row-index": 1,
603600
"data-test-subj": "dataGridRowCell",
@@ -623,7 +620,6 @@ describe('EuiDataGrid', () => {
623620
"className": "euiDataGridRowCell euiDataGridRowCell--lastColumn customClass",
624621
"data-gridcell-column-id": "B",
625622
"data-gridcell-column-index": 1,
626-
"data-gridcell-id": "1,1",
627623
"data-gridcell-row-index": 1,
628624
"data-gridcell-visible-row-index": 1,
629625
"data-test-subj": "dataGridRowCell",

0 commit comments

Comments
 (0)