diff --git a/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-scroll-total_summary-rtl=false (fluent.blue.light).png b/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-scroll-total_summary-rtl=false (fluent.blue.light).png index c4cc9a72b0b7..9d09a0658831 100644 Binary files a/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-scroll-total_summary-rtl=false (fluent.blue.light).png and b/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-scroll-total_summary-rtl=false (fluent.blue.light).png differ diff --git a/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-scroll-total_summary-rtl=true (fluent.blue.light).png b/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-scroll-total_summary-rtl=true (fluent.blue.light).png index 0246114199ae..a16df24c0db3 100644 Binary files a/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-scroll-total_summary-rtl=true (fluent.blue.light).png and b/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-scroll-total_summary-rtl=true (fluent.blue.light).png differ diff --git a/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-scroll-total_summary_intersection-rtl=false (fluent.blue.light).png b/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-scroll-total_summary_intersection-rtl=false (fluent.blue.light).png index 5829db62007c..8c5d80aaf505 100644 Binary files a/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-scroll-total_summary_intersection-rtl=false (fluent.blue.light).png and b/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-scroll-total_summary_intersection-rtl=false (fluent.blue.light).png differ diff --git a/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-scroll-total_summary_intersection-rtl=true (fluent.blue.light).png b/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-scroll-total_summary_intersection-rtl=true (fluent.blue.light).png index c16ff651e79f..23e703f5cae2 100644 Binary files a/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-scroll-total_summary_intersection-rtl=true (fluent.blue.light).png and b/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-scroll-total_summary_intersection-rtl=true (fluent.blue.light).png differ diff --git a/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/withGrouping.ts b/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/withGrouping.ts index 80fd9d9e4d1b..0ecee46af66f 100644 --- a/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/withGrouping.ts +++ b/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/withGrouping.ts @@ -289,33 +289,15 @@ test('DataGrid - Group row content is scrolled if repaintChangesOnly is enabled [false, true].forEach((rtlEnabled) => { // T1284612 - test.meta({ - browserSize: [900, 800], - unstable: true, - })(`DataGrid - Group summaries are shown over sticky columns on a horizontal scroll (rtl=${rtlEnabled})`, async (t) => { + test(`DataGrid - Group summaries are shown over sticky columns on a horizontal scroll - intersection (rtl=${rtlEnabled})`, async (t) => { const { takeScreenshot, compareResults } = createScreenshotsComparer(t); const dataGrid = new DataGrid(DATA_GRID_SELECTOR); await t.expect(dataGrid.isReady()).ok(); - await dataGrid.scrollTo(t, { x: rtlEnabled ? 100 : 250 }); - await t.wait(300); await testScreenshot(t, takeScreenshot, `grouping-scroll-total_summary_intersection-rtl=${rtlEnabled}.png`, { element: dataGrid.element }); - await dataGrid.apiOption('summary.totalItems', [{ - column: 'SaleAmount', - summaryType: 'max', - valueFormat: 'currency', - }]); - await t.wait(300); - await dataGrid.scrollTo(t, { x: 0 }); - await t.wait(200); - await dataGrid.scrollTo(t, { x: rtlEnabled ? 100 : 250 }); - await t.wait(300); - - await testScreenshot(t, takeScreenshot, `grouping-scroll-total_summary-rtl=${rtlEnabled}.png`, { element: dataGrid.element }); - await t .expect(compareResults.isValid()) .ok(compareResults.errorMessages()); @@ -324,6 +306,8 @@ test('DataGrid - Group row content is scrolled if repaintChangesOnly is enabled rtlEnabled, customizeColumns(columns) { columns[2].groupIndex = 0; + columns[1].visible = false; + columns[3].width = 200; }, summary: { groupItems: [{ @@ -370,3 +354,59 @@ test('DataGrid - Group row content is scrolled if repaintChangesOnly is enabled }, })); }); + +[false, true].forEach((rtlEnabled) => { + // T1284612 + test(`DataGrid - Group summaries are shown over sticky columns on a horizontal scroll (rtl=${rtlEnabled})`, async (t) => { + const { takeScreenshot, compareResults } = createScreenshotsComparer(t); + + const dataGrid = new DataGrid(DATA_GRID_SELECTOR); + + await t.expect(dataGrid.isReady()).ok(); + + await testScreenshot(t, takeScreenshot, `grouping-scroll-total_summary-rtl=${rtlEnabled}.png`, { element: dataGrid.element }); + + await t + .expect(compareResults.isValid()) + .ok(compareResults.errorMessages()); + }).before(async () => createWidget('dxDataGrid', { + ...defaultConfig, + rtlEnabled, + customizeColumns(columns) { + columns[2].groupIndex = 0; + columns[1].visible = false; + columns[4].width = 150; + }, + summary: { + groupItems: [{ + column: 'OrderNumber', + summaryType: 'count', + displayFormat: '{0} orders', + }, { + column: 'City', + summaryType: 'max', + valueFormat: 'currency', + showInGroupFooter: false, + alignByColumn: true, + }, { + column: 'TotalAmount', + summaryType: 'max', + valueFormat: 'currency', + showInGroupFooter: false, + alignByColumn: true, + }, { + column: 'TotalAmount', + summaryType: 'sum', + valueFormat: 'currency', + displayFormat: 'Total: {0}', + showInGroupFooter: true, + }], + totalItems: [{ + column: 'SaleAmount', + summaryType: 'max', + valueFormat: 'currency', + displayFormat: 'MAXMAXMAXMAX: {0}', + }], + }, + })); +});