@etsoo/react 1.7.38 → 1.7.39

package/lib/components/GridLoader.d.ts

@@ -82,7 +82,7 @@ export interface GridLoader<T extends object> {
      * @param ref Ref
      * @returns Result
      */
-    onInitLoad?: (ref: any) => [T[], Partial<GridLoaderStates<T>>?] | null | undefined;
+    onInitLoad?: (ref: any) => [T[], GridLoaderPartialStates<T>?] | null | undefined;
     /**
      * Handler for updating rows
      * @param rows Rows

package/lib/components/ScrollerGrid.js

@@ -122,7 +122,6 @@ export const ScrollerGrid = (props) => {
         const { queryPaging, ...rest } = add ?? {};
         const resetState = {
             queryPaging: {
-                ...refs.current.queryPaging,
                 currentPage: 0,
                 ...queryPaging
             },

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/react",
-    "version": "1.7.38",
+    "version": "1.7.39",
     "description": "TypeScript ReactJs UI Independent Framework",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",

package/src/components/GridLoader.ts

@@ -125,7 +125,7 @@ export interface GridLoader<T extends object> {
      */
     onInitLoad?: (
         ref: any
-    ) => [T[], Partial<GridLoaderStates<T>>?] | null | undefined;
+    ) => [T[], GridLoaderPartialStates<T>?] | null | undefined;
 
     /**
      * Handler for updating rows

package/src/components/ScrollerGrid.tsx

@@ -7,7 +7,12 @@ import {
     VariableSizeGrid,
     VariableSizeGridProps
 } from 'react-window';
-import { GridLoadDataProps, GridLoader, GridLoaderStates } from './GridLoader';
+import {
+    GridLoadDataProps,
+    GridLoader,
+    GridLoaderPartialStates,
+    GridLoaderStates
+} from './GridLoader';
 import { GridMethodRef } from './GridMethodRef';
 
 export type ScrollerGridItemRendererProps<T> = Omit<
@@ -317,11 +322,10 @@ export const ScrollerGrid = <T extends object>(props: ScrollerGridProps<T>) => {
     };
 
     // Reset the state and load again
-    const reset = (add?: Partial<GridLoaderStates<T>>, items: T[] = []) => {
+    const reset = (add?: GridLoaderPartialStates<T>, items: T[] = []) => {
         const { queryPaging, ...rest } = add ?? {};
-        const resetState: Partial<GridLoaderStates<T>> = {
+        const resetState: GridLoaderPartialStates<T> = {
             queryPaging: {
-                ...refs.current.queryPaging,
                 currentPage: 0,
                 ...queryPaging
             },

package/src/components/ScrollerList.tsx

@@ -12,6 +12,7 @@ import { useCombinedRefs } from '../uses/useCombinedRefs';
 import {
     GridLoadDataProps,
     GridLoader,
+    GridLoaderPartialStates,
     GridLoaderStates,
     GridSizeGet
 } from './GridLoader';
@@ -248,9 +249,9 @@ export const ScrollerList = <T extends object>(props: ScrollerListProps<T>) => {
     };
 
     // Reset the state and load again
-    const reset = (add?: Partial<GridLoaderStates<T>>, items: T[] = []) => {
+    const reset = (add?: GridLoaderPartialStates<T>, items: T[] = []) => {
         const { queryPaging, ...rest } = add ?? {};
-        const resetState: Partial<GridLoaderStates<T>> = {
+        const resetState: GridLoaderPartialStates<T> = {
             queryPaging: {
                 ...stateRefs.current.queryPaging,
                 currentPage: 0,