Improve the reset feature

ETSOO · May 8, 2024 · a95cc55 · a95cc55
1 parent 21878e7
commit a95cc55
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 12 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/react",
-    "version": "1.7.36",
+    "version": "1.7.37",
     "description": "TypeScript ReactJs UI Independent Framework",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
@@ -65,7 +65,7 @@
         "@babel/preset-env": "^7.24.5",
         "@babel/runtime-corejs3": "^7.24.5",
         "@testing-library/jest-dom": "^6.4.5",
-        "@testing-library/react": "^15.0.6",
+        "@testing-library/react": "^15.0.7",
         "@types/jest": "^29.5.12",
         "@types/react": "^18.3.1",
         "@types/react-dom": "^18.3.0",

diff --git a/src/components/ScrollerGrid.tsx b/src/components/ScrollerGrid.tsx
@@ -318,17 +318,19 @@ export const ScrollerGrid = <T extends object>(props: ScrollerGridProps<T>) => {
 
     // Reset the state and load again
     const reset = (add?: Partial<GridLoaderStates<T>>, items: T[] = []) => {
+        const { queryPaging, ...rest } = add ?? {};
         const resetState: Partial<GridLoaderStates<T>> = {
             queryPaging: {
                 ...refs.current.queryPaging,
-                currentPage: 0
+                currentPage: 0,
+                ...queryPaging
             },
             autoLoad: true,
             loadedItems: 0,
             hasNextPage: true,
             isNextPageLoading: false,
             lastLoadedItems: undefined,
-            ...add
+            ...rest
         };
         Object.assign(refs.current, resetState);
 

diff --git a/src/components/ScrollerList.tsx b/src/components/ScrollerList.tsx
@@ -249,17 +249,19 @@ export const ScrollerList = <T extends object>(props: ScrollerListProps<T>) => {
 
     // Reset the state and load again
     const reset = (add?: Partial<GridLoaderStates<T>>, items: T[] = []) => {
+        const { queryPaging, ...rest } = add ?? {};
         const resetState: Partial<GridLoaderStates<T>> = {
             queryPaging: {
                 ...stateRefs.current.queryPaging,
-                currentPage: 0
+                currentPage: 0,
+                ...queryPaging
             },
             autoLoad: true,
             lastLoadedItems: undefined,
             loadedItems: 0,
             hasNextPage: true,
             isNextPageLoading: false,
-            ...add
+            ...rest
         };
         Object.assign(stateRefs.current, resetState);