Skip to content

Commit 21fc936

Browse files
author
Illia Obukhau
committed
refactor(datagrid-web): change class semantics
1 parent 1658a1a commit 21fc936

File tree

3 files changed

+23
-24
lines changed

3 files changed

+23
-24
lines changed

packages/modules/data-widgets/src/themesource/datawidgets/web/_datagrid.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ $grid-selected-row-background: $brand-light;
351351

352352
.widget-datagrid {
353353
&.widget-datagrid-selection-method-click {
354-
.tr .td.td-selected {
354+
.tr.tr-selected .td {
355355
background-color: $grid-selected-row-background;
356356
}
357357
}

packages/pluggableWidgets/datagrid-web/src/components/Table.tsx

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -217,8 +217,7 @@ export function Table<T extends ObjectItem>(props: TableProps<T>): ReactElement
217217
key={`row_${value.id}_cell_${column.id}`}
218218
className={classNames("td", { "td-borders": rowIndex === 0 }, className, {
219219
clickable: !!onClick,
220-
"hidden-column-preview": preview && columnsHidable && column.hidden,
221-
"td-selected": isSelected(value)
220+
"hidden-column-preview": preview && columnsHidable && column.hidden
222221
})}
223222
onClick={onClick}
224223
onKeyDown={
@@ -242,7 +241,7 @@ export function Table<T extends ObjectItem>(props: TableProps<T>): ReactElement
242241
Number(column.id)
243242
)
244243
: null,
245-
[cellRenderer, columnsHidable, preview, visibleColumns, onSelect, rowClickSelectionOn, isSelected]
244+
[cellRenderer, columnsHidable, preview, visibleColumns, onSelect, rowClickSelectionOn]
246245
);
247246

248247
const rows = useMemo(() => data.map(item => ({ item })), [data]);
@@ -359,15 +358,16 @@ export function Table<T extends ObjectItem>(props: TableProps<T>): ReactElement
359358
return (
360359
<div
361360
key={`row_${row.item.id}`}
362-
className={classNames("tr", rowClass?.(row.item))}
361+
className={classNames("tr", rowClass?.(row.item), {
362+
"tr-selected": isSelected(row.item)
363+
})}
363364
role="row"
364365
>
365366
{checkboxSelectionOn && (
366367
<div
367368
key="cell_checkbox"
368369
className={classNames("td widget-datagrid-col-select", {
369-
"td-borders": rowIndex === 0,
370-
"td-selected": isSelected(row.item)
370+
"td-borders": rowIndex === 0
371371
})}
372372
>
373373
<input
@@ -384,8 +384,7 @@ export function Table<T extends ObjectItem>(props: TableProps<T>): ReactElement
384384
key="cell_column_dropdown"
385385
aria-hidden
386386
className={classNames("td column-selector", {
387-
"td-borders": rowIndex === 0,
388-
"td-selected": isSelected(row.item)
387+
"td-borders": rowIndex === 0
389388
})}
390389
/>
391390
)}

packages/pluggableWidgets/datagrid-web/src/components/__tests__/__snapshots__/Table.spec.tsx.snap

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1049,11 +1049,11 @@ exports[`Table with selection method checkbox render an extra column and add cla
10491049
</div>
10501050
</div>
10511051
<div
1052-
class="tr"
1052+
class="tr tr-selected"
10531053
role="row"
10541054
>
10551055
<div
1056-
class="td widget-datagrid-col-select td-borders td-selected"
1056+
class="td widget-datagrid-col-select td-borders"
10571057
>
10581058
<input
10591059
checked=""
@@ -1062,18 +1062,18 @@ exports[`Table with selection method checkbox render an extra column and add cla
10621062
/>
10631063
</div>
10641064
<div
1065-
class="td td-borders td-selected"
1065+
class="td td-borders"
10661066
role="cell"
10671067
>
10681068
Test
10691069
</div>
10701070
</div>
10711071
<div
1072-
class="tr"
1072+
class="tr tr-selected"
10731073
role="row"
10741074
>
10751075
<div
1076-
class="td widget-datagrid-col-select td-selected"
1076+
class="td widget-datagrid-col-select"
10771077
>
10781078
<input
10791079
checked=""
@@ -1082,18 +1082,18 @@ exports[`Table with selection method checkbox render an extra column and add cla
10821082
/>
10831083
</div>
10841084
<div
1085-
class="td td-selected"
1085+
class="td"
10861086
role="cell"
10871087
>
10881088
Test
10891089
</div>
10901090
</div>
10911091
<div
1092-
class="tr"
1092+
class="tr tr-selected"
10931093
role="row"
10941094
>
10951095
<div
1096-
class="td widget-datagrid-col-select td-selected"
1096+
class="td widget-datagrid-col-select"
10971097
>
10981098
<input
10991099
checked=""
@@ -1102,7 +1102,7 @@ exports[`Table with selection method checkbox render an extra column and add cla
11021102
/>
11031103
</div>
11041104
<div
1105-
class="td td-selected"
1105+
class="td"
11061106
role="cell"
11071107
>
11081108
Test
@@ -1208,35 +1208,35 @@ exports[`Table with selection method rowClick add class to each selected cell 1`
12081208
</div>
12091209
</div>
12101210
<div
1211-
class="tr"
1211+
class="tr tr-selected"
12121212
role="row"
12131213
>
12141214
<div
1215-
class="td td-borders clickable td-selected"
1215+
class="td td-borders clickable"
12161216
role="button"
12171217
tabindex="0"
12181218
>
12191219
Test
12201220
</div>
12211221
</div>
12221222
<div
1223-
class="tr"
1223+
class="tr tr-selected"
12241224
role="row"
12251225
>
12261226
<div
1227-
class="td clickable td-selected"
1227+
class="td clickable"
12281228
role="button"
12291229
tabindex="0"
12301230
>
12311231
Test
12321232
</div>
12331233
</div>
12341234
<div
1235-
class="tr"
1235+
class="tr tr-selected"
12361236
role="row"
12371237
>
12381238
<div
1239-
class="td clickable td-selected"
1239+
class="td clickable"
12401240
role="button"
12411241
tabindex="0"
12421242
>

0 commit comments

Comments
 (0)