Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { createScreenshotsComparer } from 'devextreme-screenshot-comparer';
import DataGrid from 'devextreme-testcafe-models/dataGrid';
import type { DataRenderMode } from 'devextreme/ui/data_grid';
import { createWidget } from '../../../../helpers/createWidget';
import url from '../../../../helpers/getPageUrl';
import { defaultConfig } from '../helpers/data';
Expand Down Expand Up @@ -333,31 +334,34 @@ test.meta({ browserSize: [800, 800] })('The cell edit mode: The validation messa
},
}));

test.meta({ browserSize: [800, 800] })('The cell edit mode: The focus overlay element should scroll vertically', async (t) => {
const { takeScreenshot, compareResults } = createScreenshotsComparer(t);
const dataGrid = new DataGrid(DATA_GRID_SELECTOR);

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

await t.click(dataGrid.getDataCell(5, 0).element);

await testScreenshot(t, takeScreenshot, 'vertical_scroll_and_focused_fixed_column_1.png', { element: dataGrid.element });

await dataGrid.scrollTo(t, { y: 10000 });

await testScreenshot(t, takeScreenshot, 'vertical_scroll_and_focused_fixed_column_2.png', { element: dataGrid.element });

await t
.expect(compareResults.isValid())
.ok(compareResults.errorMessages());
}).before(async () => createWidget('dxDataGrid', {
...defaultConfig,
editing: {
mode: 'cell',
allowUpdating: true,
},
scrolling: {
showScrollbar: 'never',
},
columnWidth: 200,
}));
(['standard', 'virtual'] as DataRenderMode[]).forEach((rowRenderingMode) => {
test.meta({ browserSize: [800, 800] })(`The cell edit mode: The focus overlay element should scroll vertically (rowRenderingMode=${rowRenderingMode})`, async (t) => {
const { takeScreenshot, compareResults } = createScreenshotsComparer(t);
const dataGrid = new DataGrid(DATA_GRID_SELECTOR);

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

await t.click(dataGrid.getDataCell(5, 0).element);

await testScreenshot(t, takeScreenshot, 'vertical_scroll_and_focused_fixed_column_1.png', { element: dataGrid.element });

await dataGrid.scrollTo(t, { y: 10000 });

await testScreenshot(t, takeScreenshot, 'vertical_scroll_and_focused_fixed_column_2.png', { element: dataGrid.element });

await t
.expect(compareResults.isValid())
.ok(compareResults.errorMessages());
}).before(async () => createWidget('dxDataGrid', {
...defaultConfig,
editing: {
mode: 'cell',
allowUpdating: true,
},
scrolling: {
showScrollbar: 'never',
rowRenderingMode,
},
columnWidth: 200,
}));
});
Original file line number Diff line number Diff line change
Expand Up @@ -746,11 +746,6 @@ const editorFactory = (Base: ModuleType<EditorFactory>) => class EditorFactorySt
return this.getOverlayContainerIfNeeded($cell) ?? super.getRevertButtonContainer($cell);
}

protected getFocusOverlayContainer($focusedElement: dxElementWrapper): dxElementWrapper {
return this.getOverlayContainerIfNeeded($focusedElement)
?? super.getFocusOverlayContainer($focusedElement);
}

protected overlayPositionedHandler(e, isOverlayVisible: boolean): void {
const columnHeaders = this.getView('columnHeadersView');
// @ts-expect-error
Expand Down
Loading