Skip to content
Merged
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
2 changes: 1 addition & 1 deletion e2e/testcafe-devextreme/tests/common/treeList/scrolling.ts
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ test.meta({ browserSize: [800, 800] })('All items should be selected after selec
await testScreenshot(t, takeScreenshot, 'T1189118-treelist-select-all-with-virtual-scrolling-1', { element: treeList.element });

// act
await treeList.scrollTo(t, { y: 300 });
await treeList.scrollTo(t, { top: 300 });

await testScreenshot(t, takeScreenshot, 'T1189118-treelist-select-all-with-virtual-scrolling-2', { element: treeList.element });

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,7 @@ test('The scroll position should not reset when the ai.prompt changes at runtime

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

await dataGrid.scrollTo(t, { x: scrollX });
await dataGrid.scrollTo(t, { left: scrollX });

await t.expect(scrollContainer.scrollLeft).eql(scrollX);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ test('DataGrid should send an AI request for rendered rows after scrolling witho
await checkAIColumnTexts(t, dataGrid, 11);

// act
await dataGrid.scrollTo(t, { y: 1000 });
await dataGrid.scrollTo(t, { top: 1000 });

// assert
await t
Expand Down Expand Up @@ -177,7 +177,7 @@ test('DataGrid should send an AI request for rendered rows after scrolling with
await checkAIColumnTexts(t, dataGrid, 11);

// act
await dataGrid.scrollTo(t, { y: 1000 });
await dataGrid.scrollTo(t, { top: 1000 });

// assert
await t
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ test('Column reordering should work correctly after scrolling right with fixed c
await t.expect(dataGrid.isReady()).ok();

// act
await dataGrid.scrollTo(t, { x: 10000 });
await dataGrid.scrollTo(t, { left: 10000 });

// assert
await t
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ test('DataGrid cell with checkbox should have outline on focused', async (t) =>
const headerPanel = dataGrid.getHeaderPanel();

const scrollTo = async (y) => {
await dataGrid.scrollTo(t, { y });
await dataGrid.scrollTo(t, { top: y });
// eslint-disable-next-line local/no-is-ready-without-expect
return dataGrid.isReady();
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ test('DataGrid - The `between` filter dropdown sticks to the viewport edge durin
.click(filterCell.menuButton)
.click(filterCell.menu.getItemByText('Between'));

await dataGrid.scrollBy(t, { x: 999 });
await dataGrid.scrollBy(t, { left: 999 });
await testScreenshot(t, takeScreenshot, 'filter-row-filter-range-hide-on-scroll.png');
await t
.expect(compareResults.isValid())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ test.meta({ browserSize: [800, 800] })('Fixed to the right columns should appear
// act
await testScreenshot(t, takeScreenshot, 'T1177143-right-fixed-column-with-no-width-columns-1.png', { element: dataGrid.element });

await dataGrid.scrollTo(t, { x: 5000 });
await dataGrid.scrollTo(t, { left: 5000 });

await testScreenshot(t, takeScreenshot, 'T1177143-right-fixed-column-with-no-width-columns-2.png', { element: dataGrid.element });

Expand Down Expand Up @@ -162,7 +162,7 @@ test('Hovering over a row should work correctly after scrolling when there is a
.ok();

// act
await dataGrid.scrollTo(t, { y: 300 });
await dataGrid.scrollTo(t, { top: 300 });
dataRow = dataGrid.getDataRow(10);
await t.hover(dataRow.element);

Expand Down Expand Up @@ -324,7 +324,7 @@ test('Expand columns headers offsets should be correct with fixed band columns a

await testScreenshot(t, takeScreenshot, 'T1317623-expand-columns-with-band-columns.png', { element: dataGrid.element });

await dataGrid.scrollTo(t, { x: 5000 });
await dataGrid.scrollTo(t, { left: 5000 });

await testScreenshot(t, takeScreenshot, 'T1317623-horizontal-scroll-with-fixed-band-columns.png', { element: dataGrid.element });

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -189,8 +189,8 @@ test('DataGrid - FilterRow cell loses focus when focusedRowEnabled is true and e
.ok();

// act
await grid.scrollBy(t, { y: 200 });
await grid.scrollBy(t, { y: 200 });
await grid.scrollBy(t, { top: 200 });
await grid.scrollBy(t, { top: 200 });
await grid.scrollTo(t, { top: 0 });
await t.wait(300);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -791,8 +791,8 @@ test('Scroll should not change focused row if focus method is called inside onCo
.expect(dataGrid.getDataRow(0).isFocusedRow).ok();

// act
await dataGrid.scrollTo(t, { y: 200 });
await dataGrid.scrollTo(t, { y: 0 });
await dataGrid.scrollTo(t, { top: 200 });
await dataGrid.scrollTo(t, { top: 0 });

// assert
await t
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ test('The header filter should fit inside the viewport if the grid is scrolled h
const filterIconElement = dataGrid.getHeaders().getHeaderRow(0).getHeaderCell(0).getFilterIcon();

// act
await dataGrid.scrollBy(t, { x: 100 });
await dataGrid.scrollBy(t, { left: 100 });
await t.click(filterIconElement);

// assert
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1443,7 +1443,7 @@ test('reorder column to left when adaptability is enabled and there are hidden c
const dataGrid = new DataGrid(DATA_GRID_SELECTOR);
const lastHeaderCell = dataGrid.getHeaders().getHeaderRow(0).getHeaderCell(9);

await dataGrid.scrollTo(t, { x: 1200 });
await dataGrid.scrollTo(t, { left: 1200 });

await t
.expect(dataGrid.getScrollLeft())
Expand Down Expand Up @@ -1516,7 +1516,7 @@ test('reorder column to left when adaptability is enabled and there are hidden c
const dataGrid = new DataGrid(DATA_GRID_SELECTOR);
const lastHeaderCell = dataGrid.getHeaders().getHeaderRow(0).getHeaderCell(29);

await dataGrid.scrollTo(t, { x: 2200 });
await dataGrid.scrollTo(t, { left: 2200 });

await t
.expect(dataGrid.getScrollLeft())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ test('Navigate to first cell in the row that contains focus when pressing the Ho
.expect(dataGrid.isReady())
.ok();

await dataGrid.scrollTo(t, { x: 700 });
await dataGrid.scrollTo(t, { left: 700 });

// assert
await t
Expand Down Expand Up @@ -175,7 +175,7 @@ test('Navigate to first cell in the row that contains focus when row dragging is
.expect(dataGrid.isReady())
.ok();

await dataGrid.scrollTo(t, { x: 700 });
await dataGrid.scrollTo(t, { left: 700 });

// assert
await t
Expand Down Expand Up @@ -282,7 +282,7 @@ test('Navigate to first cell in the row that contains focus when virtual columns
.expect(dataGrid.isReady())
.ok();

await dataGrid.scrollTo(t, { x: 4200 });
await dataGrid.scrollTo(t, { left: 4200 });

// assert
await t
Expand Down Expand Up @@ -355,7 +355,7 @@ test('Navigate to first cell in the row that contains focus when adaptivity is e
.expect(dataGrid.isReady())
.ok();

await dataGrid.scrollTo(t, { x: 4200 });
await dataGrid.scrollTo(t, { left: 4200 });

// assert
await t
Expand Down Expand Up @@ -482,7 +482,7 @@ test('Navigate to first cell in the first row when pressing the Ctrl + Home key'
.expect(dataGrid.isReady())
.ok();

await dataGrid.scrollTo(t, { x: 700, y: 1000 });
await dataGrid.scrollTo(t, { left: 700, top: 1000 });

// assert
await t
Expand Down Expand Up @@ -563,7 +563,7 @@ test('Navigate to first cell in the first row when virtual scrolling is enabled'
.ok();

await dataGrid
.scrollTo(t, { x: 700, y: 10000 });
.scrollTo(t, { left: 700, top: 10000 });

// assert
await t
Expand Down Expand Up @@ -652,7 +652,7 @@ test('Navigate to first cell in the first row when virtual scrolling and columns
.expect(dataGrid.isReady())
.ok();

await dataGrid.scrollTo(t, { x: 3000, y: 10000 });
await dataGrid.scrollTo(t, { left: 3000, top: 10000 });

// assert
await t
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ test('Editing should start by pressing enter after scrolling content with scroll

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

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

await t.click(dataGrid.getDataCell(49, 1).element);
await t.pressKey('enter');
Expand Down Expand Up @@ -44,7 +44,7 @@ test('editing.allowUpdating callback should receive correct row on tab key on fi

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

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

await t
.click(dataGrid.getDataCell(49, 0).element)
Expand Down Expand Up @@ -86,7 +86,7 @@ test('editing.allowUpdating callback should receive correct row on tab key on la

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

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

await t
.click(dataGrid.getDataCell(48, 1).element)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ test('DataGrid should scroll to the first cell of the next row and focus it when
.ok();

// act
await dataGrid.scrollTo(t, { x: 10000 });
await dataGrid.scrollTo(t, { left: 10000 });

// assert
await t
Expand Down Expand Up @@ -164,7 +164,7 @@ test('DataGrid should scroll to the last cell of the previous row and focus it w
.ok();

// act
await dataGrid.scrollTo(t, { x: rtlEnabled ? 0 : 10000 });
await dataGrid.scrollTo(t, { left: rtlEnabled ? 0 : 10000 });

// assert
await t
Expand Down Expand Up @@ -273,7 +273,7 @@ test('DataGrid should scroll to the last cell of the previous row and focus it w
.ok();

// act
await dataGrid.scrollTo(t, { x: rtlEnabled ? 0 : 10000 });
await dataGrid.scrollTo(t, { left: rtlEnabled ? 0 : 10000 });

// assert
await t
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ test('Detail grid should not reload data when the collapsed master row reenters
.eql(1);

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

// assert
await t
Expand All @@ -51,7 +51,7 @@ test('Detail grid should not reload data when the collapsed master row reenters
.ok();

// act
await dataGrid.scrollTo(t, { y: 0 });
await dataGrid.scrollTo(t, { top: 0 });

detailGrid = dataGrid.getMasterRow(0).getDataGrid();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ test.meta({ browserSize: [800, 800] })('The master detail row should display cor
// assert
await testScreenshot(t, takeScreenshot, 'T1159578-master-detail-with-renderAsync-1.png', { element: dataGrid.element });

await dataGrid.scrollTo(t, { y: 400 });
await dataGrid.scrollTo(t, { top: 400 });
await t.wait(300);

await t.click(dataGrid.getDataRow(16).getCommandCell(0).element);
Expand Down Expand Up @@ -161,7 +161,7 @@ test.meta({ browserSize: [800, 800] })('The master detail row should display cor
while (scrollTop > 0) {
scrollTop -= 25;

await dataGrid.scrollTo(t, { y: scrollTop });
await dataGrid.scrollTo(t, { top: scrollTop });
await triggerScrollEvent(dataGrid);
}
};
Expand All @@ -172,7 +172,7 @@ test.meta({ browserSize: [800, 800] })('The master detail row should display cor
await testScreenshot(t, takeScreenshot, `T1167889-master-detail-with-scrolling.useNative=${useNative}-1.png`, { element: dataGrid.element });

// act
await dataGrid.scrollTo(t, { y: 1000 });
await dataGrid.scrollTo(t, { top: 1000 });
await t.wait(100);

// assert
Expand Down
4 changes: 2 additions & 2 deletions e2e/testcafe-devextreme/tests/dataGrid/common/pager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ test('Changing pageSize to \'all\' with rowRenderingMode=\'virtual\' should work

await t.click(dataGrid.element()); // don't know why but test isn't reproduces without this click

await dataGrid.scrollBy(t, { y: 100 });
await dataGrid.scrollBy(t, { top: 100 });

await t.click(pager.getPageSizeSelectBox().element);
await t.click(pager.getPopupPageSizes().withText('All'));
Expand Down Expand Up @@ -213,7 +213,7 @@ test('Page index should not reset when scrolling while the grid is being refresh
.eql(2);

await dataGrid.apiRefresh();
await dataGrid.scrollBy(t, { y: 20 });
await dataGrid.scrollBy(t, { top: 20 });

await t
.expect(dataGrid.option('paging.pageIndex'))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -554,7 +554,7 @@ test('The draggable element should be displayed correctly after horizontal scrol
await t
.expect(dataGrid.isReady())
.ok();
await dataGrid.scrollTo(t, { x: 2500 });
await dataGrid.scrollTo(t, { left: 2500 });

await t
.expect(dataGrid.getScrollLeft())
Expand Down Expand Up @@ -713,7 +713,7 @@ test('toIndex should not be corrected when source item gets removed from DOM', a
await t.expect(dataGrid.isReady()).ok();

// act - scroll to the bottom to make the last row visible
await dataGrid.scrollTo(t, { y: 3000 });
await dataGrid.scrollTo(t, { top: 3000 });

// assert
await t
Expand Down
Loading
Loading