Skip to content

Commit a3950dc

Browse files
authored
🐞 T1268664: DataGrid focused row twitches when at least one column is fixed (#29113)
1 parent adaaf8c commit a3950dc

File tree

38 files changed

+27
-19
lines changed

38 files changed

+27
-19
lines changed

e2e/testcafe-devextreme/tests/dataGrid/stickyColumns/appearance.ts

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,31 @@ const DATA_GRID_SELECTOR = '#container';
1111
fixture.disablePageReloads`FixedColumns - appearance`
1212
.page(url(__dirname, '../../container.html'));
1313

14-
[
15-
Themes.genericLight,
16-
Themes.genericLightCompact,
17-
Themes.materialBlue,
18-
Themes.materialBlueCompact,
19-
Themes.fluentBlue,
20-
Themes.fluentBlueCompact,
21-
].forEach(
22-
(theme) => {
23-
test('Row height for selected, focus and edit state should not differ from the default one', async (t) => {
14+
([
15+
[Themes.genericLight, false],
16+
[Themes.genericLightCompact, false],
17+
[Themes.materialBlue, false],
18+
[Themes.materialBlueCompact, false],
19+
[Themes.fluentBlue, false],
20+
[Themes.fluentBlueCompact, false],
21+
[Themes.genericLight, true],
22+
[Themes.genericLightCompact, true],
23+
[Themes.materialBlue, true],
24+
[Themes.materialBlueCompact, true],
25+
[Themes.fluentBlue, true],
26+
[Themes.fluentBlueCompact, true],
27+
] as const).forEach(
28+
([theme, showRowLines]) => {
29+
// T1268664
30+
const showRowLinesState = `showRowLines=${showRowLines ? 'true' : 'false'}`;
31+
test(`Row height for selected, focus and edit state should not differ from the default one if ${showRowLinesState}`, async (t) => {
2432
const { takeScreenshot, compareResults } = createScreenshotsComparer(t);
2533

2634
const dataGrid = new DataGrid(DATA_GRID_SELECTOR);
2735

2836
await t.expect(dataGrid.isReady()).ok();
2937

30-
await takeScreenshot(`datagrid_default_state_(${theme}).png`, dataGrid.element);
38+
await takeScreenshot(`datagrid_default_state_with_${showRowLinesState}_(${theme}).png`, dataGrid.element);
3139

3240
await t
3341
.click(dataGrid.getDataRow(2).getCommandCell(41).getButton(0))
@@ -36,7 +44,7 @@ fixture.disablePageReloads`FixedColumns - appearance`
3644

3745
await t.debug();
3846

39-
await takeScreenshot(`datagrid_selected_focused_edit_state_(${theme}).png`, dataGrid.element);
47+
await takeScreenshot(`datagrid_selected_focused_edit_state_with_${showRowLinesState}_(${theme}).png`, dataGrid.element);
4048

4149
await t
4250
.expect(compareResults.isValid())
@@ -62,7 +70,7 @@ fixture.disablePageReloads`FixedColumns - appearance`
6270
allowColumnReordering: true,
6371
allowColumnResizing: true,
6472
focusedRowEnabled: true,
65-
showRowLines: false,
73+
showRowLines,
6674
selection: {
6775
mode: 'multiple',
6876
},

e2e/testcafe-devextreme/tests/dataGrid/stickyColumns/etalons/datagrid_default_state_(fluent.blue.light).png renamed to e2e/testcafe-devextreme/tests/dataGrid/stickyColumns/etalons/datagrid_default_state_with_showRowLines=false_(fluent.blue.light).png

File renamed without changes.
Loading

e2e/testcafe-devextreme/tests/dataGrid/stickyColumns/etalons/datagrid_default_state_(generic.light).png renamed to e2e/testcafe-devextreme/tests/dataGrid/stickyColumns/etalons/datagrid_default_state_with_showRowLines=false_(generic.light).png

File renamed without changes.
Loading

e2e/testcafe-devextreme/tests/dataGrid/stickyColumns/etalons/datagrid_default_state_(material.blue.light).png renamed to e2e/testcafe-devextreme/tests/dataGrid/stickyColumns/etalons/datagrid_default_state_with_showRowLines=false_(material.blue.light).png

File renamed without changes.
Loading

0 commit comments

Comments
 (0)