@etsoo/react 1.8.53 → 1.8.54

package/lib/cjs/components/GridLoader.d.ts

@@ -88,12 +88,6 @@ export type GridLoader<T extends object, P extends GridJsonData = GridLoadDataPr
      * Load data
      */
     loadData: (props: P, lastItem?: T) => PromiseLike<T[] | null | undefined>;
-    /**
-     * Handler for init load
-     * @param ref Ref
-     * @returns Result
-     */
-    onInitLoad?: (ref: any) => [T[], GridLoaderPartialStates<T>?] | null | undefined;
     /**
      * Handler for updating rows
      * @param rows Rows

package/lib/cjs/components/ScrollerGrid.d.ts

@@ -1,12 +1,15 @@
 import { DataTypes } from "@etsoo/shared";
 import React from "react";
-import { GridProps } from "react-window";
-import { GridJsonData, GridLoadDataProps, GridLoader, GridLoaderStates } from "./GridLoader";
+import { GridImperativeAPI, GridProps } from "react-window";
+import { GridJsonData, GridLoadDataProps, GridLoader, GridLoaderPartialStates, GridLoaderStates } from "./GridLoader";
 import { GridMethodRef, ScrollToRowParam } from "./GridMethodRef";
 type ScrollerGridCellrops<T extends object> = {
     rows: T[];
     states: GridLoaderStates<T>;
 };
+/**
+ * Scroller grid forward params
+ */
 export type ScrollToCellParam = {
     behavior?: ScrollToRowParam["behavior"];
     columnAlign?: ScrollToRowParam["align"];
@@ -38,6 +41,12 @@ export type ScrollerGridProps<T extends object, P extends GridJsonData = GridLoa
      * Methods
      */
     mRef?: React.Ref<ScrollerGridForwardRef<T>>;
+    /**
+     * Handler for init load
+     * @param ref Ref
+     * @returns Result
+     */
+    onInitLoad?: (ref: GridImperativeAPI) => [T[], GridLoaderPartialStates<T>?] | null | undefined;
     /**
      * On items select change
      */

package/lib/cjs/components/ScrollerGrid.js

@@ -198,7 +198,9 @@ const ScrollerGrid = (props) => {
         // Auto load data when current page is 0
         if (stateRefs.current.queryPaging.currentPage === 0 &&
             stateRefs.current.autoLoad) {
-            const initItems = onInitLoad == null ? undefined : onInitLoad(stateRefs.current);
+            const initItems = onInitLoad == null || localRef.current == null
+                ? undefined
+                : onInitLoad(localRef.current);
             if (initItems)
                 reset(initItems[1], initItems[0]);
             else

package/lib/cjs/components/ScrollerList.d.ts

@@ -1,7 +1,7 @@
 import { DataTypes } from "@etsoo/shared";
 import React from "react";
-import { ListProps } from "react-window";
-import { GridLoader } from "./GridLoader";
+import { ListImperativeAPI, ListProps } from "react-window";
+import { GridLoader, GridLoaderPartialStates } from "./GridLoader";
 import { GridMethodRef } from "./GridMethodRef";
 type ScrollerListRowProps<T extends object> = {
     items: T[];
@@ -27,6 +27,12 @@ export type ScrollerListProps<T extends object> = GridLoader<T> & Omit<ListProps
      * Methods ref
      */
     mRef?: React.Ref<ScrollerListForwardRef<T>>;
+    /**
+     * Handler for init load
+     * @param ref Ref
+     * @returns Result
+     */
+    onInitLoad?: (ref: ListImperativeAPI) => [T[], GridLoaderPartialStates<T>?] | null | undefined;
     /**
      * Width of the list
      */

package/lib/cjs/components/ScrollerList.js

@@ -168,7 +168,9 @@ const ScrollerList = (props) => {
         // Auto load data when current page is 0
         if (stateRefs.current.queryPaging?.currentPage === 0 &&
             stateRefs.current.autoLoad) {
-            const initItems = onInitLoad == null ? undefined : onInitLoad(localRef.current);
+            const initItems = onInitLoad == null || localRef.current == null
+                ? undefined
+                : onInitLoad(localRef.current);
             if (initItems)
                 reset(initItems[1], initItems[0]);
             else

package/lib/mjs/components/GridLoader.d.ts

@@ -88,12 +88,6 @@ export type GridLoader<T extends object, P extends GridJsonData = GridLoadDataPr
      * Load data
      */
     loadData: (props: P, lastItem?: T) => PromiseLike<T[] | null | undefined>;
-    /**
-     * Handler for init load
-     * @param ref Ref
-     * @returns Result
-     */
-    onInitLoad?: (ref: any) => [T[], GridLoaderPartialStates<T>?] | null | undefined;
     /**
      * Handler for updating rows
      * @param rows Rows

package/lib/mjs/components/ScrollerGrid.d.ts

@@ -1,12 +1,15 @@
 import { DataTypes } from "@etsoo/shared";
 import React from "react";
-import { GridProps } from "react-window";
-import { GridJsonData, GridLoadDataProps, GridLoader, GridLoaderStates } from "./GridLoader";
+import { GridImperativeAPI, GridProps } from "react-window";
+import { GridJsonData, GridLoadDataProps, GridLoader, GridLoaderPartialStates, GridLoaderStates } from "./GridLoader";
 import { GridMethodRef, ScrollToRowParam } from "./GridMethodRef";
 type ScrollerGridCellrops<T extends object> = {
     rows: T[];
     states: GridLoaderStates<T>;
 };
+/**
+ * Scroller grid forward params
+ */
 export type ScrollToCellParam = {
     behavior?: ScrollToRowParam["behavior"];
     columnAlign?: ScrollToRowParam["align"];
@@ -38,6 +41,12 @@ export type ScrollerGridProps<T extends object, P extends GridJsonData = GridLoa
      * Methods
      */
     mRef?: React.Ref<ScrollerGridForwardRef<T>>;
+    /**
+     * Handler for init load
+     * @param ref Ref
+     * @returns Result
+     */
+    onInitLoad?: (ref: GridImperativeAPI) => [T[], GridLoaderPartialStates<T>?] | null | undefined;
     /**
      * On items select change
      */

package/lib/mjs/components/ScrollerGrid.js

@@ -192,7 +192,9 @@ export const ScrollerGrid = (props) => {
         // Auto load data when current page is 0
         if (stateRefs.current.queryPaging.currentPage === 0 &&
             stateRefs.current.autoLoad) {
-            const initItems = onInitLoad == null ? undefined : onInitLoad(stateRefs.current);
+            const initItems = onInitLoad == null || localRef.current == null
+                ? undefined
+                : onInitLoad(localRef.current);
             if (initItems)
                 reset(initItems[1], initItems[0]);
             else

package/lib/mjs/components/ScrollerList.d.ts

@@ -1,7 +1,7 @@
 import { DataTypes } from "@etsoo/shared";
 import React from "react";
-import { ListProps } from "react-window";
-import { GridLoader } from "./GridLoader";
+import { ListImperativeAPI, ListProps } from "react-window";
+import { GridLoader, GridLoaderPartialStates } from "./GridLoader";
 import { GridMethodRef } from "./GridMethodRef";
 type ScrollerListRowProps<T extends object> = {
     items: T[];
@@ -27,6 +27,12 @@ export type ScrollerListProps<T extends object> = GridLoader<T> & Omit<ListProps
      * Methods ref
      */
     mRef?: React.Ref<ScrollerListForwardRef<T>>;
+    /**
+     * Handler for init load
+     * @param ref Ref
+     * @returns Result
+     */
+    onInitLoad?: (ref: ListImperativeAPI) => [T[], GridLoaderPartialStates<T>?] | null | undefined;
     /**
      * Width of the list
      */

package/lib/mjs/components/ScrollerList.js

@@ -162,7 +162,9 @@ export const ScrollerList = (props) => {
         // Auto load data when current page is 0
         if (stateRefs.current.queryPaging?.currentPage === 0 &&
             stateRefs.current.autoLoad) {
-            const initItems = onInitLoad == null ? undefined : onInitLoad(localRef.current);
+            const initItems = onInitLoad == null || localRef.current == null
+                ? undefined
+                : onInitLoad(localRef.current);
             if (initItems)
                 reset(initItems[1], initItems[0]);
             else

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/react",
-  "version": "1.8.53",
+  "version": "1.8.54",
   "description": "TypeScript ReactJs UI Independent Framework",
   "main": "lib/cjs/index.js",
   "module": "lib/mjs/index.js",
@@ -43,8 +43,8 @@
     "@etsoo/shared": "^1.2.76",
     "react": "^19.1.1",
     "react-dom": "^19.1.1",
-    "react-router-dom": "^7.9.1",
-    "react-window": "^2.1.1"
+    "react-router-dom": "^7.9.3",
+    "react-window": "^2.1.2"
   },
   "devDependencies": {
     "@babel/cli": "^7.28.3",
@@ -54,10 +54,10 @@
     "@babel/runtime-corejs3": "^7.28.4",
     "@testing-library/jest-dom": "^6.8.0",
     "@testing-library/react": "^16.3.0",
-    "@types/react": "^19.1.13",
+    "@types/react": "^19.1.15",
     "@types/react-dom": "^19.1.9",
     "@types/react-window": "^2.0.0",
-    "@vitejs/plugin-react": "^5.0.3",
+    "@vitejs/plugin-react": "^5.0.4",
     "jsdom": "^27.0.0",
     "typescript": "^5.9.2",
     "vitest": "^3.2.4"

package/src/components/GridLoader.ts

@@ -141,15 +141,6 @@ export type GridLoader<
    */
   loadData: (props: P, lastItem?: T) => PromiseLike<T[] | null | undefined>;
 
-  /**
-   * Handler for init load
-   * @param ref Ref
-   * @returns Result
-   */
-  onInitLoad?: (
-    ref: any
-  ) => [T[], GridLoaderPartialStates<T>?] | null | undefined;
-
   /**
    * Handler for updating rows
    * @param rows Rows

package/src/components/ScrollerGrid.tsx

@@ -1,6 +1,6 @@
 import { DataTypes } from "@etsoo/shared";
 import React from "react";
-import { Grid, GridProps, useGridRef } from "react-window";
+import { Grid, GridImperativeAPI, GridProps, useGridRef } from "react-window";
 import {
   GridJsonData,
   GridLoadDataProps,
@@ -16,6 +16,9 @@ type ScrollerGridCellrops<T extends object> = {
   states: GridLoaderStates<T>;
 };
 
+/**
+ * Scroller grid forward params
+ */
 export type ScrollToCellParam = {
   behavior?: ScrollToRowParam["behavior"];
   columnAlign?: ScrollToRowParam["align"];
@@ -63,6 +66,15 @@ export type ScrollerGridProps<
      */
     mRef?: React.Ref<ScrollerGridForwardRef<T>>;
 
+    /**
+     * Handler for init load
+     * @param ref Ref
+     * @returns Result
+     */
+    onInitLoad?: (
+      ref: GridImperativeAPI
+    ) => [T[], GridLoaderPartialStates<T>?] | null | undefined;
+
     /**
      * On items select change
      */
@@ -352,7 +364,9 @@ export const ScrollerGrid = <T extends object>(props: ScrollerGridProps<T>) => {
       stateRefs.current.autoLoad
     ) {
       const initItems =
-        onInitLoad == null ? undefined : onInitLoad(stateRefs.current);
+        onInitLoad == null || localRef.current == null
+          ? undefined
+          : onInitLoad(localRef.current);
       if (initItems) reset(initItems[1], initItems[0]);
       else loadDataLocal();
     }

package/src/components/ScrollerList.tsx

@@ -1,6 +1,6 @@
 import { DataTypes, Utils } from "@etsoo/shared";
 import React from "react";
-import { List, ListProps, useListRef } from "react-window";
+import { List, ListImperativeAPI, ListProps, useListRef } from "react-window";
 import { useCombinedRefs } from "../uses/useCombinedRefs";
 import {
   GridLoadDataProps,
@@ -42,6 +42,15 @@ export type ScrollerListProps<T extends object> = GridLoader<T> &
      */
     mRef?: React.Ref<ScrollerListForwardRef<T>>;
 
+    /**
+     * Handler for init load
+     * @param ref Ref
+     * @returns Result
+     */
+    onInitLoad?: (
+      ref: ListImperativeAPI
+    ) => [T[], GridLoaderPartialStates<T>?] | null | undefined;
+
     /**
      * Width of the list
      */
@@ -262,7 +271,9 @@ export const ScrollerList = <T extends object>(props: ScrollerListProps<T>) => {
       stateRefs.current.autoLoad
     ) {
       const initItems =
-        onInitLoad == null ? undefined : onInitLoad(localRef.current);
+        onInitLoad == null || localRef.current == null
+          ? undefined
+          : onInitLoad(localRef.current);
       if (initItems) reset(initItems[1], initItems[0]);
       else loadDataLocal();
     }