Skip to content

DataGrid - Pager - Show correct pageIndex when virtualScrolling is enabled on pageSize change #33412

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Tucchhaa wants to merge 8 commits into
base: 26_1
Choose a base branch
from
+106 −32
Open

DataGrid - Pager - Show correct pageIndex when virtualScrolling is enabled on pageSize change #33412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
664a129
fix
Tucchhaa Apr 27, 2026
29f7c02
implement test
Tucchhaa Apr 28, 2026
eb5a17d
refix
Tucchhaa May 6, 2026
36a2cce
fix test
Tucchhaa May 8, 2026
36e4297
add another test + cover it
Tucchhaa May 8, 2026
bd3a6da
fix
Tucchhaa May 10, 2026
c1657fa
fix lint
Tucchhaa May 10, 2026
65b83c7
fix lint
Tucchhaa May 10, 2026
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
79 changes: 79 additions & 0 deletions e2e/testcafe-devextreme/tests/dataGrid/common/pager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,85 @@ test('Page index should not reset when scrolling while the grid is being refresh
height: 440,
}));

test('Pager info should show page 1 of 1 after changing pageSize to \'all\' with virtual scrolling (T1327238)', async (t) => {
const dataGrid = new DataGrid('#container');
const pager = dataGrid.getPager();

await t
.expect(pager.getInfoText().textContent)
.eql('Page 5 of 10 (100 items)');

await t
.click(pager.getPageSize(1).element)
.expect(pager.getInfoText().textContent)
.eql('Page 1 of 1 (100 items)');
}).before(async () => createWidget('dxDataGrid', {
dataSource: [...new Array(100).keys()].map((i) => ({ id: i })),
keyExpr: 'id',
showBorders: true,
scrolling: {
mode: 'virtual',
},
paging: {
pageSize: 10,
pageIndex: 4,
},
pager: {
visible: true,
allowedPageSizes: [10, 'all'],
showPageSizeSelector: true,
showInfo: true,
showNavigationButtons: true,
},
height: 400,
}));

test('Pager info should show page 1 of 1 after changing pageSize to \'all\' and enabling virtual scrolling (T1327238)', async (t) => {
const dataGrid = new DataGrid('#container');
const pager = dataGrid.getPager();

await t
.expect(pager.getInfoText().textContent)
.eql('Page 5 of 10 (100 items)');

await t
.click(pager.getPageSize(1).element)
.expect(pager.getInfoText().textContent)
.eql('Page 1 of 1 (100 items)');
}).before(async () => createWidget('dxDataGrid', {
dataSource: [...new Array(100).keys()].map((i) => ({ id: i })),
keyExpr: 'id',
showBorders: true,
scrolling: {
mode: 'standard',
},
paging: {
pageSize: 10,
pageIndex: 4,
},
pager: {
visible: true,
allowedPageSizes: [10, 'all'],
showPageSizeSelector: true,
showInfo: true,
showNavigationButtons: true,
},
height: 400,
onOptionChanged: (e) => {
if (e.fullName === 'paging.pageSize') {
const setVirtual = e.value === 0;
const targetRenderingMode = setVirtual ? 'virtual' : 'standard';
const currentRenderingMode = e.component.option('scrolling.mode');
if (currentRenderingMode !== targetRenderingMode) {
e.component.beginUpdate();
e.component.option('scrolling.mode', targetRenderingMode);
e.component.repaint();
e.component.endUpdate();
}
}
},
}));

test('No error should occur if dataSource is not defined and pageIndex is promise chained (T1256070)', async (t) => {
const dataGrid = new DataGrid('#container');

Expand Down
46 changes: 20 additions & 26 deletions packages/devextreme/js/__internal/grids/grid_core/data_controller/m_data_controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@ const changePaging = function (that, optionName, value) {

that._skipProcessingPagingChange = true;
that.option(`paging.${optionName}`, value);
if (optionName === 'pageSize' && value === 0) {
that.option('paging.pageIndex', 0);
}
Comment on lines +46 to +48
Copy link
Copy Markdown
Contributor Author

@Tucchhaa Tucchhaa May 10, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the main fix, synchronizes pageIndex between dataSource and dataController when pageSize is changed to 'all' .

that._skipProcessingPagingChange = false;
const pageIndex = dataSource.pageIndex();
that._isPaging = optionName === 'pageIndex';
Expand Down Expand Up @@ -213,11 +216,7 @@ export class DataController extends DataHelperMixin(modules.Controller) {

this._isPaging = false;
this._currentOperationTypes = null;
this._dataChangedHandler = (e) => {
this._currentOperationTypes = this._dataSource.operationTypes();
this._handleDataChanged(e);
this._currentOperationTypes = null;
};
Copy link
Copy Markdown
Contributor Author

@Tucchhaa Tucchhaa May 10, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

_currentOperationTypes was working incorrectly. It could be set to null before its value is applied to the next change, because of:

  1. There could be several changes that were merged into one. (In this case _fireChanged wouldn't be called because of this if-statement)
  2. Race condition here

P.S. this is related to the bug only indirectly. I noticed it while looking for the fix and fixed the bug in several cases

this._dataChangedHandler = this._handleDataChanged.bind(this);
this._columnsChangedHandler = this._handleColumnsChanged.bind(this);
this._loadingChangedHandler = this._handleLoadingChanged.bind(this);
this._loadErrorHandler = this._handleLoadError.bind(this);
Expand Down Expand Up @@ -588,6 +587,7 @@ export class DataController extends DataHelperMixin(modules.Controller) {
errors.log('W1005', that.component.NAME);
that._applyFilter();
} else {
this._currentOperationTypes = dataSource.operationTypes();
that.updateItems(e, true);
}
}).fail(() => {
Expand Down Expand Up @@ -1170,6 +1170,8 @@ export class DataController extends DataHelperMixin(modules.Controller) {
const changeType = change.changeType || 'refresh';

change.changeType = changeType;
change.operationTypes = this._currentOperationTypes;
this._currentOperationTypes = null;

if (dataSource) {
const cachedProcessedItems = this._cachedProcessedItems;
Expand Down Expand Up @@ -1231,36 +1233,32 @@ export class DataController extends DataHelperMixin(modules.Controller) {
}
}

public updateItems(change?, isDataChanged?) {
Copy link
Copy Markdown
Contributor Author

@Tucchhaa Tucchhaa May 10, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

code-style changes only

change = change || {};
const that = this;
change.isFirstRender = !that.changed.fired();
public updateItems(change: any = {}, isDataChanged?: boolean) {
change.isFirstRender = !this.changed.fired();

if (that._repaintChangesOnly !== undefined) {
change.repaintChangesOnly = change.repaintChangesOnly ?? that._repaintChangesOnly;
change.needUpdateDimensions = change.needUpdateDimensions || that._needUpdateDimensions;
if (this._repaintChangesOnly !== undefined) {
change.repaintChangesOnly ??= this._repaintChangesOnly;
change.needUpdateDimensions ??= this._needUpdateDimensions;
} else if (change.changes) {
change.repaintChangesOnly = that.option('repaintChangesOnly');
change.repaintChangesOnly = this.option('repaintChangesOnly');
} else if (isDataChanged) {
const operationTypes = that.dataSource().operationTypes();
const operationTypes = this.dataSource().operationTypes();

change.repaintChangesOnly = operationTypes && !operationTypes.grouping && !operationTypes.filtering && that.option('repaintChangesOnly');
change.isDataChanged = true;
if (operationTypes && (operationTypes.reload || operationTypes.paging || operationTypes.groupExpanding)) {
change.needUpdateDimensions = true;
}
change.repaintChangesOnly = operationTypes && !operationTypes.grouping && !operationTypes.filtering && this.option('repaintChangesOnly');
change.needUpdateDimensions = operationTypes && (operationTypes.reload || operationTypes.paging || operationTypes.groupExpanding);
}

if (that._updateLockCount && !change.cancel) {
that._changes.push(change);
if (this._updateLockCount && !change.cancel) {
this._changes.push(change);
return;
}

that._updateItemsCore(change);
this._updateItemsCore(change);

if (change.cancel) return;

that._fireChanged(change);
this._fireChanged(change);
}

public loadingOperationTypes() {
Expand All @@ -1273,10 +1271,6 @@ export class DataController extends DataHelperMixin(modules.Controller) {
* @extended: virtual_scrolling, focus
*/
protected _fireChanged(change) {
if (this._currentOperationTypes) {
change.operationTypes = this._currentOperationTypes;
this._currentOperationTypes = null;
}
deferRender(() => {
this.changed.fire(change);
});
Expand Down
11 changes: 6 additions & 5 deletions packages/devextreme/js/__internal/grids/grid_core/virtual_scrolling/m_virtual_scrolling.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1004,18 +1004,19 @@ export const data = (Base: ModuleType<DataController>) => class VirtualScrolling
};
}

private _updateVisiblePageIndex(currentPageIndex?) {
private _updateVisiblePageIndex(value?: number): void {
Copy link
Copy Markdown
Contributor Author

@Tucchhaa Tucchhaa May 10, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just code-style fixes

if (!this._rowsScrollController) {
return;
}
if (isDefined(currentPageIndex)) {
this._silentOption(VISIBLE_PAGE_INDEX, currentPageIndex);

if (isDefined(value)) {
this._silentOption(VISIBLE_PAGE_INDEX, value);
this.pageChanged.fire();
return;
}

const viewPortItemIndex = this._rowsScrollController.getViewportItemIndex();
const newPageIndex = Math.floor(viewPortItemIndex / this.pageSize());
const viewportItemIndex = this._rowsScrollController.getViewportItemIndex();
const newPageIndex = Math.floor(viewportItemIndex / this.pageSize());

if (this.pageIndex() !== newPageIndex) {
this._silentOption(VISIBLE_PAGE_INDEX, newPageIndex);
Expand Down
2 changes: 1 addition & 1 deletion .../testing/tests/DevExpress.ui.widgets.dataGrid/keyboardNavigation.realControllers.tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -671,7 +671,7 @@ QUnit.module('Real DataController and ColumnsController', {
this.cellValue(0, 2, '5');
this.saveEditData();
// assert
assert.equal(focusedRowChangedFiresCount, 2, 'onFocusedRowChanged fires count');
Copy link
Copy Markdown
Contributor Author

@Tucchhaa Tucchhaa May 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Name of the test suggest that focusedRowChangedFiresCount should increase after refresh, but current test doesn't check it.

Initial test did it, though: link

assert.equal(focusedRowChangedFiresCount, 1, 'onFocusedRowChanged fires count');

// act
this.refresh();
Expand Down
Loading