CardView: Normalize pageIndex on pageCount changed (DevExpress#29883)

Co-authored-by: Roman Semenov <[email protected]>

Author: Tucchhaa

packages/devextreme/js/__internal/grids/new/grid_core/data_controller/data_controller.test.ts

@@ -0,0 +1,71 @@
+import { describe, expect, it } from '@jest/globals';
+
+import { getContext } from '../di.test_utils';
+import type { Options } from '../options';
+import { OptionsControllerMock } from '../options_controller/options_controller.mock';
+import { DataController } from './data_controller';
+
+const getControllers = (options?: Options) => {
+  const context = getContext(options ?? {});
+
+  const optionsController = context.get(OptionsControllerMock);
+
+  return {
+    optionsController,
+    dataController: context.get(DataController),
+  };
+};
+
+const generateData = (length: number) => [...new Array(length)].map((_, index) => ({ field: `test_${index}` }));
+
+describe('DataController', () => {
+  describe('pageIndex', () => {
+    it('does not change after pageSize increased and pageIndex < pageCount', async () => {
+      const { optionsController, dataController } = getControllers({
+        dataSource: generateData(20),
+        paging: {
+          pageIndex: 1,
+          pageSize: 5,
+        },
+      });
+      await dataController.waitLoaded();
+
+      optionsController.option('paging.pageSize', 10);
+      await dataController.waitLoaded();
+
+      expect(optionsController.oneWay('paging.pageIndex').peek()).toEqual(1);
+    });
+
+    it('set to last page after pageSize increased and pageIndex >= pageCount', async () => {
+      const { optionsController, dataController } = getControllers({
+        dataSource: generateData(20),
+        paging: {
+          pageIndex: 3,
+          pageSize: 5,
+        },
+      });
+      await dataController.waitLoaded();
+
+      optionsController.option('paging.pageSize', 10);
+      await dataController.waitLoaded();
+
+      expect(optionsController.oneWay('paging.pageIndex').peek()).toEqual(1);
+    });
+
+    it('set to last and only page after pageSize increased and pageIndex >= pageCount == 1', async () => {
+      const { optionsController, dataController } = getControllers({
+        dataSource: generateData(20),
+        paging: {
+          pageIndex: 1,
+          pageSize: 5,
+        },
+      });
+      await dataController.waitLoaded();
+
+      optionsController.option('paging.pageSize', 20);
+      await dataController.waitLoaded();
+
+      expect(optionsController.oneWay('paging.pageIndex').peek()).toEqual(0);
+    });
+  });
+});

packages/devextreme/js/__internal/grids/new/grid_core/data_controller/data_controller.ts

@@ -223,6 +223,7 @@ export class DataController {
         const dataSource = this.dataSource.value;
         const pageIndex = this.pageIndex.value;
         const pageSize = this.pageSize.value;
+        const isLoaded = this.isLoaded.value;
         const displayFilter = this.filterController.displayFilter.value;
         const pagingEnabled = this.pagingEnabled.value;
         const sortParameters = this.sortingController.sortParameters.value;
@@ -234,7 +235,13 @@ export class DataController {
         }
 
         if (dataSource.pageSize() !== pageSize) {
+          const newPageIndex = isLoaded
+            ? Math.max(Math.min(this.pageCount.peek() - 1, pageIndex), 0)
+            : pageIndex;
+
           dataSource.pageSize(pageSize);
+          dataSource.pageIndex(newPageIndex);
+
           someParamChanged ||= true;
         }
 

packages/devextreme/js/__internal/grids/new/grid_core/data_controller/public_methods.test.ts

@@ -155,8 +155,8 @@ describe('PublicMethods', () => {
       });
       expect(gridCore.pageIndex()).toBe(0);
 
-      dataController.pageIndex.value = 3;
-      expect(gridCore.pageIndex()).toBe(3);
+      dataController.pageIndex.value = 1;
+      expect(gridCore.pageIndex()).toBe(1);
     });
   });