@etsoo/materialui 1.2.42 → 1.2.43

package/lib/DataGridEx.d.ts

@@ -20,6 +20,14 @@ export type DataGridExProps<T extends object, D extends DataTypes.Keys<T>> = Omi
      * Alternating colors for odd/even rows
      */
     alternatingColors?: [string?, string?];
+    /**
+     * Cache key
+     */
+    cacheKey?: string;
+    /**
+     * Cache minutes
+     */
+    cacheMinutes?: number;
     /**
      * Checkable to choose multiple items
      * @default false

package/lib/GridDataCacheType.d.ts

@@ -0,0 +1,9 @@
+import { GridLoaderStates } from "@etsoo/react";
+/**
+ * Grid data cache type
+ */
+export type GridDataCacheType<T> = {
+    rows: T[];
+    state: GridLoaderStates<T>;
+    creation: number;
+};

package/lib/GridDataCacheType.js

@@ -0,0 +1 @@
+export {};

package/lib/ResponsibleContainer.d.ts

@@ -22,14 +22,6 @@ export type ResponsibleContainerProps<T extends object, F extends DataTypes.Basi
      * @returns Adjusted height
      */
     adjustFabHeight?: (height: number, isGrid: boolean) => number;
-    /**
-     * Cache key
-     */
-    cacheKey?: string;
-    /**
-     * Cache minutes
-     */
-    cacheMinutes?: number;
     /**
      * Columns
      */

package/lib/pages/DataGridPage.js

@@ -11,9 +11,9 @@ import { CommonPage } from "./CommonPage";
  * @returns Component
  */
 export function DataGridPage(props) {
-    var _a;
+    var _a, _b;
     // Destruct
-    const { adjustHeight, fields, fieldTemplate, height, loadData, mRef, sizeReadyMiliseconds = 100, pageProps = {}, ...rest } = props;
+    const { adjustHeight, fields, fieldTemplate, height, loadData, mRef, sizeReadyMiliseconds = 100, pageProps = {}, cacheKey, cacheMinutes = 120, ...rest } = props;
     (_a = pageProps.paddings) !== null && _a !== void 0 ? _a : (pageProps.paddings = MUGlobal.pagePaddings);
     // States
     const [states, setStates] = React.useReducer((currentState, newState) => {
@@ -27,14 +27,54 @@ export function DataGridPage(props) {
         states.ref = ref;
         //setStates({ ref });
     });
+    const initLoadedRef = React.useRef();
     // On submit callback
     const onSubmit = (data, _reset) => {
         setStates({ data });
     };
     const localLoadData = (props) => {
         const data = GridDataGet(props, fieldTemplate);
+        if (cacheKey)
+            sessionStorage.setItem(`${cacheKey}-searchbar`, JSON.stringify(data));
         return loadData(data);
     };
+    const onUpdateRows = (rows, state) => {
+        if (state.currentPage > 0 && cacheKey) {
+            const data = { rows, state, creation: new Date().valueOf() };
+            sessionStorage.setItem(cacheKey, JSON.stringify(data));
+        }
+    };
+    const onInitLoad = (ref) => {
+        // Avoid repeatedly load from cache
+        if (initLoadedRef.current || !cacheKey)
+            return undefined;
+        // Cache data
+        const cacheData = sessionStorage.getItem(cacheKey);
+        if (cacheData) {
+            const { rows, state, creation } = JSON.parse(cacheData);
+            // 120 minutes
+            if (new Date().valueOf() - creation > cacheMinutes * 60000) {
+                sessionStorage.removeItem(cacheKey);
+                return undefined;
+            }
+            // Scroll position
+            const scrollData = sessionStorage.getItem(`${cacheKey}-scroll`);
+            if (scrollData) {
+                const { scrollLeft, scrollTop } = JSON.parse(scrollData);
+                globalThis.setTimeout(() => ref.scrollTo({ scrollLeft, scrollTop }), 0);
+            }
+            // Update flag value
+            initLoadedRef.current = true;
+            // Return cached rows and state
+            return [rows, state];
+        }
+        return undefined;
+    };
+    const onGridScroll = (props) => {
+        if (!cacheKey || !initLoadedRef.current)
+            return;
+        sessionStorage.setItem(`${cacheKey}-scroll`, JSON.stringify(props));
+    };
     // Watch container
     const { dimensions } = useDimensions(1, undefined, sizeReadyMiliseconds);
     const rect = dimensions[0][2];
@@ -56,7 +96,7 @@ export function DataGridPage(props) {
         const gridHeight = states.height;
         if (gridHeight == null)
             return;
-        return (React.createElement(DataGridEx, { autoLoad: false, height: gridHeight, loadData: localLoadData, mRef: refs, outerRef: (element) => {
+        return (React.createElement(DataGridEx, { autoLoad: false, height: gridHeight, loadData: localLoadData, mRef: refs, onUpdateRows: onUpdateRows, onInitLoad: onInitLoad, onScroll: onGridScroll, outerRef: (element) => {
                 if (element != null)
                     setStates({ element });
             }, ...rest }));
@@ -67,12 +107,15 @@ export function DataGridPage(props) {
             return;
         ref.reset({ data });
     }, [ref, data]);
+    const f = typeof fields == "function"
+        ? fields(JSON.parse((_b = sessionStorage.getItem(`${cacheKey}-searchbar`)) !== null && _b !== void 0 ? _b : "{}"))
+        : fields;
     // Layout
     return (React.createElement(CommonPage, { ...pageProps, scrollContainer: states.element },
         React.createElement(Stack, null,
             React.createElement(Box, { ref: dimensions[0][0], sx: {
                     paddingBottom: pageProps.paddings
                 } },
-                React.createElement(SearchBar, { fields: fields, onSubmit: onSubmit })),
+                React.createElement(SearchBar, { fields: f, onSubmit: onSubmit })),
             list)));
 }

package/lib/pages/FixedListPage.js

@@ -11,12 +11,13 @@ import { CommonPage } from "./CommonPage";
  * @returns Component
  */
 export function FixedListPage(props) {
-    var _a;
+    var _a, _b;
     // Destruct
-    const { adjustHeight, fields, fieldTemplate, loadData, mRef, sizeReadyMiliseconds = 0, pageProps = {}, ...rest } = props;
+    const { adjustHeight, fields, fieldTemplate, loadData, mRef, sizeReadyMiliseconds = 0, pageProps = {}, cacheKey, cacheMinutes = 120, ...rest } = props;
     (_a = pageProps.paddings) !== null && _a !== void 0 ? _a : (pageProps.paddings = MUGlobal.pagePaddings);
     // States
     const [states] = React.useState({});
+    const initLoadedRef = React.useRef();
     // Scroll container
     const [scrollContainer, updateScrollContainer] = React.useState();
     const refs = useCombinedRefs(mRef, (ref) => {
@@ -39,8 +40,47 @@ export function FixedListPage(props) {
     };
     const localLoadData = (props) => {
         const data = GridDataGet(props, fieldTemplate);
+        if (cacheKey)
+            sessionStorage.setItem(`${cacheKey}-searchbar`, JSON.stringify(data));
         return loadData(data);
     };
+    const onUpdateRows = (rows, state) => {
+        if (state.currentPage > 0 && cacheKey) {
+            const data = { rows, state, creation: new Date().valueOf() };
+            sessionStorage.setItem(cacheKey, JSON.stringify(data));
+        }
+    };
+    const onInitLoad = (ref) => {
+        // Avoid repeatedly load from cache
+        if (initLoadedRef.current || !cacheKey)
+            return undefined;
+        // Cache data
+        const cacheData = sessionStorage.getItem(cacheKey);
+        if (cacheData) {
+            const { rows, state, creation } = JSON.parse(cacheData);
+            // 120 minutes
+            if (new Date().valueOf() - creation > cacheMinutes * 60000) {
+                sessionStorage.removeItem(cacheKey);
+                return undefined;
+            }
+            // Scroll position
+            const scrollData = sessionStorage.getItem(`${cacheKey}-scroll`);
+            if (scrollData) {
+                const { scrollOffset } = JSON.parse(scrollData);
+                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) => {
+        if (!cacheKey || !initLoadedRef.current)
+            return;
+        sessionStorage.setItem(`${cacheKey}-scroll`, JSON.stringify(props));
+    };
     // Watch container
     const { dimensions } = useDimensions(1, undefined, sizeReadyMiliseconds);
     const rect = dimensions[0][2];
@@ -53,17 +93,20 @@ export function FixedListPage(props) {
             return (React.createElement(Box, { id: "list-container", sx: {
                     height: height + "px"
                 } },
-                React.createElement(ScrollerListEx, { autoLoad: false, height: height, loadData: localLoadData, mRef: refs, oRef: (element) => {
+                React.createElement(ScrollerListEx, { autoLoad: false, height: height, loadData: localLoadData, mRef: refs, onUpdateRows: onUpdateRows, onInitLoad: onInitLoad, onScroll: onListScroll, oRef: (element) => {
                         if (element != null)
                             updateScrollContainer(element);
                     }, ...rest })));
         }
     }, [rect]);
+    const f = typeof fields == "function"
+        ? fields(JSON.parse((_b = sessionStorage.getItem(`${cacheKey}-searchbar`)) !== null && _b !== void 0 ? _b : "{}"))
+        : fields;
     const { paddings, ...pageRest } = pageProps;
     // Layout
     return (React.createElement(CommonPage, { ...pageRest, paddings: {}, scrollContainer: scrollContainer },
         React.createElement(Stack, null,
             React.createElement(Box, { ref: dimensions[0][0], sx: { padding: paddings } },
-                React.createElement(SearchBar, { fields: fields, onSubmit: onSubmit })),
+                React.createElement(SearchBar, { fields: f, onSubmit: onSubmit })),
             list)));
 }

package/lib/pages/ListPage.d.ts

@@ -1,6 +1,6 @@
-import { DataTypes, IdDefaultType } from '@etsoo/shared';
-import React from 'react';
-import { ListPageProps } from './ListPageProps';
+import { DataTypes, IdDefaultType } from "@etsoo/shared";
+import React from "react";
+import { ListPageProps } from "./ListPageProps";
 /**
  * List page
  * @param props Props

package/lib/pages/ListPage.js

@@ -1,19 +1,19 @@
-import { GridDataGet, useCombinedRefs } from '@etsoo/react';
-import { Box, Stack } from '@mui/material';
-import React from 'react';
-import { MUGlobal } from '../MUGlobal';
-import { ScrollerListEx } from '../ScrollerListEx';
-import { SearchBar } from '../SearchBar';
-import { CommonPage, CommonPageScrollContainer } from './CommonPage';
+import { GridDataGet, useCombinedRefs } from "@etsoo/react";
+import { Box, Stack } from "@mui/material";
+import React from "react";
+import { MUGlobal } from "../MUGlobal";
+import { ScrollerListEx } from "../ScrollerListEx";
+import { SearchBar } from "../SearchBar";
+import { CommonPage, CommonPageScrollContainer } from "./CommonPage";
 /**
  * List page
  * @param props Props
  * @returns Component
  */
 export function ListPage(props) {
-    var _a;
+    var _a, _b;
     // Destruct
-    const { fields, fieldTemplate, loadData, mRef, pageProps = {}, ...rest } = props;
+    const { fields, fieldTemplate, loadData, mRef, pageProps = {}, cacheKey, cacheMinutes = 120, ...rest } = props;
     (_a = pageProps.paddings) !== null && _a !== void 0 ? _a : (pageProps.paddings = MUGlobal.pagePaddings);
     // States
     const [states] = React.useState({});
@@ -25,6 +25,7 @@ export function ListPage(props) {
         if (first)
             reset();
     });
+    const initLoadedRef = React.useRef();
     const reset = () => {
         if (states.data == null || states.ref == null)
             return;
@@ -39,12 +40,52 @@ export function ListPage(props) {
         const data = GridDataGet(props, fieldTemplate);
         return loadData(data);
     };
+    const onUpdateRows = (rows, state) => {
+        if (state.currentPage > 0 && cacheKey) {
+            const data = { rows, state, creation: new Date().valueOf() };
+            sessionStorage.setItem(cacheKey, JSON.stringify(data));
+        }
+    };
+    const onInitLoad = (ref) => {
+        // Avoid repeatedly load from cache
+        if (initLoadedRef.current || !cacheKey)
+            return undefined;
+        // Cache data
+        const cacheData = sessionStorage.getItem(cacheKey);
+        if (cacheData) {
+            const { rows, state, creation } = JSON.parse(cacheData);
+            // 120 minutes
+            if (new Date().valueOf() - creation > cacheMinutes * 60000) {
+                sessionStorage.removeItem(cacheKey);
+                return undefined;
+            }
+            // Scroll position
+            const scrollData = sessionStorage.getItem(`${cacheKey}-scroll`);
+            if (scrollData) {
+                const { scrollOffset } = JSON.parse(scrollData);
+                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) => {
+        if (!cacheKey || !initLoadedRef.current)
+            return;
+        sessionStorage.setItem(`${cacheKey}-scroll`, JSON.stringify(props));
+    };
+    const f = typeof fields == "function"
+        ? fields(JSON.parse((_b = sessionStorage.getItem(`${cacheKey}-searchbar`)) !== null && _b !== void 0 ? _b : "{}"))
+        : fields;
     // Layout
     return (React.createElement(CommonPage, { ...pageProps, scrollContainer: CommonPageScrollContainer },
         React.createElement(Stack, null,
             React.createElement(Box, { sx: {
                     paddingBottom: pageProps.paddings
                 } },
-                React.createElement(SearchBar, { fields: fields, onSubmit: onSubmit })),
-            React.createElement(ScrollerListEx, { autoLoad: false, loadData: localLoadData, mRef: refs, ...rest }))));
+                React.createElement(SearchBar, { fields: f, onSubmit: onSubmit })),
+            React.createElement(ScrollerListEx, { autoLoad: false, loadData: localLoadData, onUpdateRows: onUpdateRows, onInitLoad: onInitLoad, onScroll: onListScroll, mRef: refs, ...rest }))));
 }

package/lib/pages/ListPageProps.d.ts

@@ -1,7 +1,7 @@
-import { DataTypes } from '@etsoo/shared';
-import { ScrollerListExProps } from '../ScrollerListEx';
-import { SearchPageProps } from './SearchPageProps';
+import { DataTypes } from "@etsoo/shared";
+import { ScrollerListExProps } from "../ScrollerListEx";
+import { SearchPageProps } from "./SearchPageProps";
 /**
  * List page props
  */
-export type ListPageProps<T extends object, F extends DataTypes.BasicTemplate, D extends DataTypes.Keys<T>> = SearchPageProps<T, F> & Omit<ScrollerListExProps<T, D>, 'loadData'>;
+export type ListPageProps<T extends object, F extends DataTypes.BasicTemplate, D extends DataTypes.Keys<T>> = SearchPageProps<T, F> & Omit<ScrollerListExProps<T, D>, "loadData">;

package/lib/pages/SearchPageProps.d.ts

@@ -6,10 +6,18 @@ import { CommonPageProps } from "./CommonPageProps";
  * Search page props
  */
 export type SearchPageProps<T extends object, F extends DataTypes.BasicTemplate> = Omit<GridLoader<T>, "loadData"> & {
+    /**
+     * Cache key
+     */
+    cacheKey?: string;
+    /**
+     * Cache minutes
+     */
+    cacheMinutes?: number;
     /**
      * Search fields
      */
-    fields: React.ReactElement[];
+    fields: React.ReactElement[] | ((data: DataTypes.BasicTemplateType<F>) => React.ReactElement[]);
     /**
      * Search field template
      */

package/lib/pages/TablePage.d.ts

@@ -1,6 +1,6 @@
-import { DataTypes, IdDefaultType } from '@etsoo/shared';
-import React from 'react';
-import { TablePageProps } from './TablePageProps';
+import { DataTypes, IdDefaultType } from "@etsoo/shared";
+import React from "react";
+import { TablePageProps } from "./TablePageProps";
 /**
  * Table page
  * @param props Props

package/lib/pages/TablePage.js

@@ -1,19 +1,19 @@
-import { GridDataGet, useCombinedRefs, useDimensions } from '@etsoo/react';
-import { Box, Stack } from '@mui/material';
-import React from 'react';
-import { MUGlobal } from '../MUGlobal';
-import { SearchBar } from '../SearchBar';
-import { TableEx, TableExMinWidth } from '../TableEx';
-import { CommonPage, CommonPageScrollContainer } from './CommonPage';
+import { GridDataGet, useCombinedRefs, useDimensions } from "@etsoo/react";
+import { Box, Stack } from "@mui/material";
+import React from "react";
+import { MUGlobal } from "../MUGlobal";
+import { SearchBar } from "../SearchBar";
+import { TableEx, TableExMinWidth } from "../TableEx";
+import { CommonPage, CommonPageScrollContainer } from "./CommonPage";
 /**
  * Table page
  * @param props Props
  * @returns Component
  */
 export function TablePage(props) {
-    var _a;
+    var _a, _b;
     // Destruct
-    const { columns, fields, fieldTemplate, loadData, mRef, sizeReadyMiliseconds = 0, pageProps = {}, ...rest } = props;
+    const { columns, fields, fieldTemplate, loadData, mRef, sizeReadyMiliseconds = 0, pageProps = {}, cacheKey, cacheMinutes = 120, ...rest } = props;
     (_a = pageProps.paddings) !== null && _a !== void 0 ? _a : (pageProps.paddings = MUGlobal.pagePaddings);
     // States
     const [states] = React.useState({});
@@ -37,6 +37,8 @@ export function TablePage(props) {
     };
     const localLoadData = (props) => {
         const data = GridDataGet(props, fieldTemplate);
+        if (cacheKey)
+            sessionStorage.setItem(`${cacheKey}-searchbar`, JSON.stringify(data));
         return loadData(data);
     };
     // Total width
@@ -49,8 +51,7 @@ export function TablePage(props) {
     const rect = dimensions[0][2];
     const list = React.useMemo(() => {
         if (rect != null && rect.height > 50 && rect.width >= totalWidth) {
-            let maxHeight = document.documentElement.clientHeight -
-                (rect.top + rect.height + 1);
+            let maxHeight = document.documentElement.clientHeight - (rect.top + rect.height + 1);
             const style = window.getComputedStyle(dimensions[0][1]);
             const paddingBottom = parseFloat(style.paddingBottom);
             if (!isNaN(paddingBottom))
@@ -58,12 +59,15 @@ export function TablePage(props) {
             return (React.createElement(TableEx, { autoLoad: false, columns: columns, loadData: localLoadData, maxHeight: maxHeight, mRef: refs, ...rest }));
         }
     }, [rect]);
+    const f = typeof fields == "function"
+        ? fields(JSON.parse((_b = sessionStorage.getItem(`${cacheKey}-searchbar`)) !== null && _b !== void 0 ? _b : "{}"))
+        : fields;
     // Layout
     return (React.createElement(CommonPage, { ...pageProps, scrollContainer: CommonPageScrollContainer },
         React.createElement(Stack, null,
             React.createElement(Box, { ref: dimensions[0][0], sx: {
                     paddingBottom: pageProps.paddings
                 } },
-                React.createElement(SearchBar, { fields: fields, onSubmit: onSubmit })),
+                React.createElement(SearchBar, { fields: f, onSubmit: onSubmit })),
             list)));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/materialui",
-  "version": "1.2.42",
+  "version": "1.2.43",
   "description": "TypeScript Material-UI Implementation",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

package/src/DataGridEx.tsx

@@ -51,6 +51,16 @@ export type DataGridExProps<
    */
   alternatingColors?: [string?, string?];
 
+  /**
+   * Cache key
+   */
+  cacheKey?: string;
+
+  /**
+   * Cache minutes
+   */
+  cacheMinutes?: number;
+
   /**
    * Checkable to choose multiple items
    * @default false

package/src/GridDataCacheType.ts

@@ -0,0 +1,10 @@
+import { GridLoaderStates } from "@etsoo/react";
+
+/**
+ * Grid data cache type
+ */
+export type GridDataCacheType<T> = {
+  rows: T[];
+  state: GridLoaderStates<T>;
+  creation: number;
+};

package/src/ResponsibleContainer.tsx

@@ -33,6 +33,7 @@ import {
 } from "./ScrollerListEx";
 import { SearchBar } from "./SearchBar";
 import { Labels } from "./app/Labels";
+import { GridDataCacheType } from "./GridDataCacheType";
 
 /**
  * ResponsibleContainer props
@@ -67,16 +68,6 @@ export type ResponsibleContainerProps<
    */
   adjustFabHeight?: (height: number, isGrid: boolean) => number;
 
-  /**
-   * Cache key
-   */
-  cacheKey?: string;
-
-  /**
-   * Cache minutes
-   */
-  cacheMinutes?: number;
-
   /**
    * Columns
    */
@@ -293,7 +284,7 @@ export function ResponsibleContainer<
     }
   );
 
-  type DataType = { rows: T[]; state: GridLoaderStates<T>; creation: number };
+  type DataType = GridDataCacheType<T>;
 
   const onUpdateRows = (rows: T[], state: GridLoaderStates<T>) => {
     if (state.currentPage > 0 && cacheKey) {

package/src/pages/DataGridPage.tsx

@@ -1,7 +1,10 @@
 import {
   GridDataGet,
   GridLoadDataProps,
+  GridLoaderStates,
+  GridOnScrollProps,
   ScrollerGridForwardRef,
+  VariableSizeGrid,
   useCombinedRefs,
   useDimensions
 } from "@etsoo/react";
@@ -13,6 +16,7 @@ import { MUGlobal } from "../MUGlobal";
 import { SearchBar } from "../SearchBar";
 import { CommonPage } from "./CommonPage";
 import { DataGridPageProps } from "./DataGridPageProps";
+import { GridDataCacheType } from "../GridDataCacheType";
 
 interface LocalStates<T> {
   data?: FormData;
@@ -41,6 +45,8 @@ export function DataGridPage<
     mRef,
     sizeReadyMiliseconds = 100,
     pageProps = {},
+    cacheKey,
+    cacheMinutes = 120,
     ...rest
   } = props;
 
@@ -65,6 +71,8 @@ export function DataGridPage<
     }
   );
 
+  const initLoadedRef = React.useRef<boolean>();
+
   // On submit callback
   const onSubmit = (data: FormData, _reset: boolean) => {
     setStates({ data });
@@ -72,9 +80,64 @@ export function DataGridPage<
 
   const localLoadData = (props: GridLoadDataProps) => {
     const data = GridDataGet(props, fieldTemplate);
+
+    if (cacheKey)
+      sessionStorage.setItem(`${cacheKey}-searchbar`, JSON.stringify(data));
+
     return loadData(data);
   };
 
+  type DataType = GridDataCacheType<T>;
+
+  const onUpdateRows = (rows: T[], state: GridLoaderStates<T>) => {
+    if (state.currentPage > 0 && cacheKey) {
+      const data: DataType = { rows, state, creation: new Date().valueOf() };
+      sessionStorage.setItem(cacheKey, JSON.stringify(data));
+    }
+  };
+
+  const onInitLoad = (
+    ref: VariableSizeGrid<T>
+  ): [T[], Partial<GridLoaderStates<T>>?] | null | undefined => {
+    // Avoid repeatedly load from cache
+    if (initLoadedRef.current || !cacheKey) return undefined;
+
+    // Cache data
+    const cacheData = sessionStorage.getItem(cacheKey);
+    if (cacheData) {
+      const { rows, state, creation } = JSON.parse(cacheData) as DataType;
+
+      // 120 minutes
+      if (new Date().valueOf() - creation > cacheMinutes * 60000) {
+        sessionStorage.removeItem(cacheKey);
+        return undefined;
+      }
+
+      // Scroll position
+      const scrollData = sessionStorage.getItem(`${cacheKey}-scroll`);
+      if (scrollData) {
+        const { scrollLeft, scrollTop } = JSON.parse(
+          scrollData
+        ) as GridOnScrollProps;
+
+        globalThis.setTimeout(() => ref.scrollTo({ scrollLeft, scrollTop }), 0);
+      }
+
+      // Update flag value
+      initLoadedRef.current = true;
+
+      // Return cached rows and state
+      return [rows, state];
+    }
+
+    return undefined;
+  };
+
+  const onGridScroll = (props: GridOnScrollProps) => {
+    if (!cacheKey || !initLoadedRef.current) return;
+    sessionStorage.setItem(`${cacheKey}-scroll`, JSON.stringify(props));
+  };
+
   // Watch container
   const { dimensions } = useDimensions(1, undefined, sizeReadyMiliseconds);
   const rect = dimensions[0][2];
@@ -105,6 +168,9 @@ export function DataGridPage<
         height={gridHeight}
         loadData={localLoadData}
         mRef={refs}
+        onUpdateRows={onUpdateRows}
+        onInitLoad={onInitLoad}
+        onScroll={onGridScroll}
         outerRef={(element?: HTMLDivElement) => {
           if (element != null) setStates({ element });
         }}
@@ -119,6 +185,15 @@ export function DataGridPage<
     ref.reset({ data });
   }, [ref, data]);
 
+  const f =
+    typeof fields == "function"
+      ? fields(
+          JSON.parse(
+            sessionStorage.getItem(`${cacheKey}-searchbar`) ?? "{}"
+          ) as DataTypes.BasicTemplateType<F>
+        )
+      : fields;
+
   // Layout
   return (
     <CommonPage {...pageProps} scrollContainer={states.element}>
@@ -129,7 +204,7 @@ export function DataGridPage<
             paddingBottom: pageProps.paddings
           }}
         >
-          <SearchBar fields={fields} onSubmit={onSubmit} />
+          <SearchBar fields={f} onSubmit={onSubmit} />
         </Box>
         {list}
       </Stack>