@etsoo/materialui 1.5.71 → 1.5.73

package/src/pages/ListPage.tsx

@@ -1,9 +1,6 @@
 import {
   GridLoadDataProps,
-  GridLoaderStates,
-  ListOnScrollProps,
   ScrollerListForwardRef,
-  ScrollerListRef,
   useCombinedRefs,
   useDimensions,
   useSearchParamsWithCache
@@ -62,8 +59,6 @@ export function ListPage<T extends object, F>(props: ListPageProps<T, F>) {
     if (first) reset();
   });
 
-  const initLoadedRef = React.useRef<boolean>(null);
-
   const reset = () => {
     if (states.data == null || states.ref == null) return;
     states.ref.reset({ data: states.data });
@@ -89,41 +84,6 @@ export function ListPage<T extends object, F>(props: ListPageProps<T, F>) {
   // Search data
   const searchData = useSearchParamsWithCache(cacheKey);
 
-  const onInitLoad = (
-    ref: ScrollerListRef
-  ): [T[], Partial<GridLoaderStates<T>>?] | null | undefined => {
-    // Avoid repeatedly load from cache
-    if (initLoadedRef.current || !cacheKey) return undefined;
-
-    // Cache data
-    const cacheData = GridUtils.getCacheData<T>(cacheKey, cacheMinutes);
-    if (cacheData) {
-      const { rows, state } = cacheData;
-
-      GridUtils.mergeSearchData(state, searchData);
-
-      // Scroll position
-      const scrollData = sessionStorage.getItem(`${cacheKey}-scroll`);
-      if (scrollData) {
-        const { scrollOffset } = JSON.parse(scrollData) as ListOnScrollProps;
-        globalThis.setTimeout(() => ref.scrollTo(scrollOffset), 0);
-      }
-
-      // Update flag value
-      initLoadedRef.current = true;
-
-      // Return cached rows and state
-      return [rows, state];
-    }
-
-    return undefined;
-  };
-
-  const onListScroll = (props: ListOnScrollProps) => {
-    if (!cacheKey || !initLoadedRef.current) return;
-    sessionStorage.setItem(`${cacheKey}-scroll`, JSON.stringify(props));
-  };
-
   const f = typeof fields == "function" ? fields(searchData ?? {}) : fields;
 
   // Layout
@@ -148,9 +108,6 @@ export function ListPage<T extends object, F>(props: ListPageProps<T, F>) {
         <ScrollerListEx<T>
           autoLoad={false}
           loadData={localLoadData}
-          onUpdateRows={GridUtils.getUpdateRowsHandler<T>(cacheKey)}
-          onInitLoad={onInitLoad}
-          onScroll={onListScroll}
           mRef={refs}
           {...rest}
         />

package/src/pages/ResponsivePage.tsx

@@ -1,21 +1,23 @@
 import React from "react";
 import { MUGlobal } from "../MUGlobal";
-import { ResponsibleContainer } from "../ResponsibleContainer";
+import {
+  ResponsibleContainer,
+  ResponsibleContainerProps
+} from "../ResponsibleContainer";
 import { CommonPage } from "./CommonPage";
 import { OperationMessageContainer } from "../messages/OperationMessageContainer";
 import type { DataGridPageProps } from "./DataGridPageProps";
-import type {
-  ScrollerListExInnerItemRendererProps,
-  ScrollerListExItemSize
-} from "../ScrollerListEx";
-import { ListChildComponentProps } from "react-window";
+import type { ScrollerListExProps } from "../ScrollerListEx";
 import { GridMethodRef } from "@etsoo/react";
 import type { OperationMessageHandlerAll } from "../messages/OperationMessageHandler";
 
 /**
  * Response page props
  */
-export type ResponsePageProps<T extends object, F> = DataGridPageProps<T, F> & {
+export type ResponsePageProps<T extends object, F> = Omit<
+  DataGridPageProps<T, F>,
+  "mRef" | "rowHeight"
+> & {
   /**
    *
    * @param height Current height
@@ -29,27 +31,15 @@ export type ResponsePageProps<T extends object, F> = DataGridPageProps<T, F> & {
    */
   dataGridMinWidth?: number;
 
-  /**
-   * Inner item renderer
-   */
-  innerItemRenderer: (
-    props: ScrollerListExInnerItemRendererProps<T>
-  ) => React.ReactNode;
-
   /**
    * Item renderer
    */
-  itemRenderer?: (props: ListChildComponentProps<T>) => React.ReactElement;
-
-  /**
-   * Item size, a function indicates its a variable size list
-   */
-  itemSize: ScrollerListExItemSize;
+  itemRenderer?: ScrollerListExProps<T>["itemRenderer"];
 
   /**
    * Methods
    */
-  mRef?: React.MutableRefObject<GridMethodRef<T> | undefined>;
+  mRef?: React.RefObject<GridMethodRef<T> | undefined>;
 
   /**
    * Pull to refresh data
@@ -65,6 +55,11 @@ export type ResponsePageProps<T extends object, F> = DataGridPageProps<T, F> & {
    * Operation message handler
    */
   operationMessageHandler?: OperationMessageHandlerAll;
+
+  /**
+   * Row height
+   */
+  rowHeight?: ResponsibleContainerProps<T, F>["rowHeight"];
 };
 
 /**

package/src/uses/useGridCacheInitLoad.ts

@@ -0,0 +1,55 @@
+import {
+  GridImperativeAPI,
+  OnCellsRenderedData,
+  ScrollerGridProps,
+  useSearchParamsWithCache
+} from "@etsoo/react";
+import React from "react";
+import { GridUtils } from "../GridUtils";
+import { ExtendUtils } from "@etsoo/shared";
+
+export function useGridCacheInitLoad<T extends object>(
+  cacheKey: string | undefined,
+  cacheMinutes: number
+): ScrollerGridProps<T>["onInitLoad"] {
+  // Reference
+  const ref = React.useRef<boolean>(null);
+
+  // Search data
+  const searchData = useSearchParamsWithCache(cacheKey);
+
+  // Avoid repeatedly load from cache
+  if (ref.current || !cacheKey) return undefined;
+
+  // Cache data
+  const cacheData = GridUtils.getCacheData<T>(cacheKey, cacheMinutes);
+  if (cacheData) {
+    const { rows, state } = cacheData;
+
+    GridUtils.mergeSearchData(state, searchData);
+
+    // Update flag value
+    ref.current = true;
+
+    return (ref: GridImperativeAPI) => {
+      // Scroll position
+      const scrollData = sessionStorage.getItem(`${cacheKey}-scroll`);
+      if (scrollData) {
+        const data = JSON.parse(scrollData) as OnCellsRenderedData;
+        ExtendUtils.waitFor(
+          () =>
+            ref.scrollToCell({
+              rowIndex: data.rowStartIndex,
+              columnIndex: data.columnStartIndex
+            }),
+          100
+        );
+      }
+
+      // Return cached rows and state
+      return [rows, state];
+    };
+  }
+
+  return undefined;
+}

package/src/uses/useListCacheInitLoad.ts

@@ -0,0 +1,51 @@
+import {
+  ListImperativeAPI,
+  OnRowsRenderedData,
+  ScrollerListProps,
+  useSearchParamsWithCache
+} from "@etsoo/react";
+import React from "react";
+import { GridUtils } from "../GridUtils";
+import { ExtendUtils } from "@etsoo/shared";
+
+export function useListCacheInitLoad<T extends object>(
+  cacheKey: string | undefined,
+  cacheMinutes: number
+): ScrollerListProps<T>["onInitLoad"] {
+  // Reference
+  const ref = React.useRef<boolean>(null);
+
+  // Search data
+  const searchData = useSearchParamsWithCache(cacheKey);
+
+  // Avoid repeatedly load from cache
+  if (ref.current || !cacheKey) return undefined;
+
+  // Cache data
+  const cacheData = GridUtils.getCacheData<T>(cacheKey, cacheMinutes);
+  if (cacheData) {
+    const { rows, state } = cacheData;
+
+    GridUtils.mergeSearchData(state, searchData);
+
+    // Update flag value
+    ref.current = true;
+
+    return (ref: ListImperativeAPI) => {
+      // Scroll position
+      const scrollData = sessionStorage.getItem(`${cacheKey}-scroll`);
+      if (scrollData) {
+        const data = JSON.parse(scrollData) as OnRowsRenderedData;
+        ExtendUtils.waitFor(
+          () => ref.scrollToRow({ index: data.startIndex }),
+          100
+        );
+      }
+
+      // Return cached rows and state
+      return [rows, state];
+    };
+  }
+
+  return undefined;
+}