@etsoo/react 1.7.37 → 1.7.39

package/lib/components/GridLoader.d.ts

@@ -43,6 +43,19 @@ export type GridLoadDataProps = {
      */
     data?: GridData;
 };
+/**
+ * Grid data load partial props
+ */
+export type GridLoadDataPartialProps = {
+    /**
+     * Query paging data
+     */
+    queryPaging?: Partial<QueryPagingData>;
+    /**
+     * Data related
+     */
+    data?: GridData;
+};
 /**
  * Grid data loader
  */
@@ -69,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
@@ -81,10 +94,7 @@ export interface GridLoader<T extends object> {
      */
     threshold?: number | undefined;
 }
-/**
- * Grid loader states
- */
-export type GridLoaderStates<T> = GridLoadDataProps & {
+type GridLoaderProps<T> = {
     /**
      * Auto load data, otherwise call reset
      * @default true
@@ -119,3 +129,12 @@ export type GridLoaderStates<T> = GridLoadDataProps & {
      */
     idCache: Record<any, null>;
 };
+/**
+ * Grid loader states
+ */
+export type GridLoaderStates<T> = GridLoadDataProps & GridLoaderProps<T>;
+/**
+ * Grid loader states
+ */
+export type GridLoaderPartialStates<T> = GridLoadDataPartialProps & Partial<GridLoaderProps<T>>;
+export {};

package/lib/components/GridMethodRef.d.ts

@@ -1,5 +1,5 @@
 import { Align } from 'react-window';
-import { GridLoaderStates } from './GridLoader';
+import { GridLoaderPartialStates } from './GridLoader';
 /**
  * Grid method ref
  */
@@ -19,7 +19,7 @@ export interface GridMethodRef<T> {
      * Reset
      * @param add Additional data
      */
-    reset(add?: Partial<GridLoaderStates<T>>): void;
+    reset(add?: GridLoaderPartialStates<T>): void;
     /**
      * Scroll to the specified offset (scrollTop or scrollLeft, depending on the direction prop).
      */

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.37",
+    "version": "1.7.39",
     "description": "TypeScript ReactJs UI Independent Framework",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
@@ -50,7 +50,7 @@
         "@emotion/css": "^11.11.2",
         "@emotion/react": "^11.11.4",
         "@emotion/styled": "^11.11.5",
-        "@etsoo/appscript": "^1.4.85",
+        "@etsoo/appscript": "^1.4.86",
         "@etsoo/notificationbase": "^1.1.42",
         "@etsoo/shared": "^1.2.37",
         "react": "^18.3.1",

package/src/components/GridLoader.ts

@@ -78,6 +78,21 @@ export type GridLoadDataProps = {
     data?: GridData;
 };
 
+/**
+ * Grid data load partial props
+ */
+export type GridLoadDataPartialProps = {
+    /**
+     * Query paging data
+     */
+    queryPaging?: Partial<QueryPagingData>;
+
+    /**
+     * Data related
+     */
+    data?: GridData;
+};
+
 /**
  * Grid data loader
  */
@@ -110,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
@@ -125,10 +140,7 @@ export interface GridLoader<T extends object> {
     threshold?: number | undefined;
 }
 
-/**
- * Grid loader states
- */
-export type GridLoaderStates<T> = GridLoadDataProps & {
+type GridLoaderProps<T> = {
     /**
      * Auto load data, otherwise call reset
      * @default true
@@ -170,3 +182,14 @@ export type GridLoaderStates<T> = GridLoadDataProps & {
      */
     idCache: Record<any, null>;
 };
+
+/**
+ * Grid loader states
+ */
+export type GridLoaderStates<T> = GridLoadDataProps & GridLoaderProps<T>;
+
+/**
+ * Grid loader states
+ */
+export type GridLoaderPartialStates<T> = GridLoadDataPartialProps &
+    Partial<GridLoaderProps<T>>;

package/src/components/GridMethodRef.ts

@@ -1,5 +1,5 @@
 import { Align } from 'react-window';
-import { GridLoaderStates } from './GridLoader';
+import { GridLoaderPartialStates } from './GridLoader';
 
 /**
  * Grid method ref
@@ -22,7 +22,7 @@ export interface GridMethodRef<T> {
      * Reset
      * @param add Additional data
      */
-    reset(add?: Partial<GridLoaderStates<T>>): void;
+    reset(add?: GridLoaderPartialStates<T>): void;
 
     /**
      * Scroll to the specified offset (scrollTop or scrollLeft, depending on the direction prop).

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,