@etsoo/react 1.7.94 → 1.7.95

package/lib/components/ScrollerList.js

@@ -1,9 +1,9 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { DataTypes, Utils } from '@etsoo/shared';
-import React from 'react';
-import { FixedSizeList, VariableSizeList } from 'react-window';
-import { useCombinedRefs } from '../uses/useCombinedRefs';
-import { GridSizeGet } from './GridLoader';
+import { DataTypes, Utils } from "@etsoo/shared";
+import React from "react";
+import { FixedSizeList, VariableSizeList } from "react-window";
+import { useCombinedRefs } from "../uses/useCombinedRefs";
+import { GridSizeGet } from "./GridLoader";
 // Calculate loadBatchSize
 const calculateBatchSize = (height, itemSize) => {
     const size = Utils.getResult(itemSize, 0);
@@ -16,12 +16,12 @@ const calculateBatchSize = (height, itemSize) => {
  */
 export const ScrollerList = (props) => {
     // Destruct
-    const { autoLoad = true, defaultOrderBy, defaultOrderByAsc, height = document.documentElement.clientHeight, width = '100%', mRef, oRef, style = {}, idField = 'id', itemRenderer, itemSize, loadBatchSize = calculateBatchSize(height, itemSize), loadData, threshold = GridSizeGet(loadBatchSize, height) / 2, onItemsRendered, onInitLoad, onUpdateRows, ...rest } = props;
+    const { autoLoad = true, defaultOrderBy, height = document.documentElement.clientHeight, width = "100%", mRef, oRef, style = {}, idField = "id", itemRenderer, itemSize, loadBatchSize = calculateBatchSize(height, itemSize), loadData, threshold = GridSizeGet(loadBatchSize, height) / 2, onItemsRendered, onInitLoad, onUpdateRows, ...rest } = props;
     // Style
     Object.assign(style, {
-        width: '100%',
-        height: '100%',
-        display: 'inline-block'
+        width: "100%",
+        height: "100%",
+        display: "inline-block"
     });
     // Refs
     const listRef = React.useRef();
@@ -41,7 +41,6 @@ export const ScrollerList = (props) => {
         queryPaging: {
             currentPage: 0,
             orderBy: defaultOrderBy,
-            orderByAsc: defaultOrderByAsc,
             batchSize
         },
         autoLoad,
@@ -54,8 +53,7 @@ export const ScrollerList = (props) => {
     // Load data
     const loadDataLocal = (pageAdd = 1) => {
         // Prevent multiple loadings
-        if (!stateRefs.current.hasNextPage ||
-            stateRefs.current.isNextPageLoading)
+        if (!stateRefs.current.hasNextPage || stateRefs.current.isNextPageLoading)
             return;
         // Update state
         stateRefs.current.isNextPageLoading = true;
@@ -90,7 +88,10 @@ export const ScrollerList = (props) => {
                 setRows(newRows);
             }
             else {
-                stateRefs.current.queryPaging.currentPage += pageAdd;
+                if (stateRefs.current.queryPaging.currentPage == null)
+                    stateRefs.current.queryPaging.currentPage = pageAdd;
+                else
+                    stateRefs.current.queryPaging.currentPage += pageAdd;
                 // Update rows, avoid duplicate items
                 const newRows = [...rows];
                 for (const item of result) {
@@ -191,5 +192,5 @@ export const ScrollerList = (props) => {
             loadDataLocal();
     }
     // Layout
-    return typeof itemSize === 'function' ? (_jsx(VariableSizeList, { height: height, width: width, itemCount: itemCount, itemKey: (index, data) => DataTypes.getIdValue1(data, idField) ?? index, itemSize: itemSize, outerRef: refs, ref: listRef, style: style, onItemsRendered: onItemsRenderedLocal, ...rest, children: itemRendererLocal })) : (_jsx(FixedSizeList, { height: height, width: width, itemCount: itemCount, itemKey: (index, data) => DataTypes.getIdValue1(data, idField) ?? index, itemSize: itemSize, outerRef: refs, ref: listRef, style: style, onItemsRendered: onItemsRenderedLocal, ...rest, children: itemRendererLocal }));
+    return typeof itemSize === "function" ? (_jsx(VariableSizeList, { height: height, width: width, itemCount: itemCount, itemKey: (index, data) => DataTypes.getIdValue1(data, idField) ?? index, itemSize: itemSize, outerRef: refs, ref: listRef, style: style, onItemsRendered: onItemsRenderedLocal, ...rest, children: itemRendererLocal })) : (_jsx(FixedSizeList, { height: height, width: width, itemCount: itemCount, itemKey: (index, data) => DataTypes.getIdValue1(data, idField) ?? index, itemSize: itemSize, outerRef: refs, ref: listRef, style: style, onItemsRendered: onItemsRenderedLocal, ...rest, children: itemRendererLocal }));
 };

package/lib/custom/CustomFieldReact.d.ts

@@ -1,4 +1,4 @@
-import { CustomFieldData, CustomFieldProps, CustomFieldRef, ICustomField } from '@etsoo/appscript';
+import { CustomFieldData, CustomFieldProps, CustomFieldRef, ICustomField } from "@etsoo/appscript";
 /**
  * React custom field interface
  * React自定义字段接口

package/lib/index.d.ts

@@ -1,32 +1,32 @@
-export * from './app/CoreConstants';
-export * from './app/EventWatcher';
-export * from './app/InputDialogProps';
-export * from './app/ReactUtils';
-export * from './components/DnDList';
-export * from './components/DynamicRouter';
-export * from './components/GridColumn';
-export * from './components/GridLoader';
-export * from './components/GridMethodRef';
-export * from './components/ListItemReact';
-export * from './components/ScrollerGrid';
-export * from './components/ScrollerList';
-export * from './components/ScrollRestoration';
-export type { ListOnScrollProps, GridOnScrollProps, VariableSizeGrid } from 'react-window';
-export * from './custom/CustomFieldReact';
-export * from './notifier/Notifier';
-export * from '@etsoo/notificationbase';
-export * from './states/CultureState';
-export * from './states/IState';
-export * from './states/PageState';
-export * from './states/State';
-export * from './states/UserState';
-export * from './uses/useAsyncState';
-export * from './uses/useCombinedRefs';
-export * from './uses/useDelayedExecutor';
-export * from './uses/useDimensions';
-export * from './uses/useParamsEx';
-export * from './uses/useRefs';
-export * from './uses/useSearchParamsEx';
-export * from './uses/useTimeout';
-export * from './uses/useWindowScroll';
-export * from './uses/useWindowSize';
+export * from "./app/CoreConstants";
+export * from "./app/EventWatcher";
+export * from "./app/InputDialogProps";
+export * from "./app/ReactUtils";
+export * from "./components/DnDList";
+export * from "./components/DynamicRouter";
+export * from "./components/GridColumn";
+export * from "./components/GridLoader";
+export * from "./components/GridMethodRef";
+export * from "./components/ListItemReact";
+export * from "./components/ScrollerGrid";
+export * from "./components/ScrollerList";
+export * from "./components/ScrollRestoration";
+export type { ListOnScrollProps, GridOnScrollProps, VariableSizeGrid } from "react-window";
+export * from "./custom/CustomFieldReact";
+export * from "./notifier/Notifier";
+export * from "@etsoo/notificationbase";
+export * from "./states/CultureState";
+export * from "./states/IState";
+export * from "./states/PageState";
+export * from "./states/State";
+export * from "./states/UserState";
+export * from "./uses/useAsyncState";
+export * from "./uses/useCombinedRefs";
+export * from "./uses/useDelayedExecutor";
+export * from "./uses/useDimensions";
+export * from "./uses/useParamsEx";
+export * from "./uses/useRefs";
+export * from "./uses/useSearchParamsEx";
+export * from "./uses/useTimeout";
+export * from "./uses/useWindowScroll";
+export * from "./uses/useWindowSize";

package/lib/index.js

@@ -1,37 +1,37 @@
 // app
-export * from './app/CoreConstants';
-export * from './app/EventWatcher';
-export * from './app/InputDialogProps';
-export * from './app/ReactUtils';
+export * from "./app/CoreConstants";
+export * from "./app/EventWatcher";
+export * from "./app/InputDialogProps";
+export * from "./app/ReactUtils";
 // components
-export * from './components/DnDList';
-export * from './components/DynamicRouter';
-export * from './components/GridColumn';
-export * from './components/GridLoader';
-export * from './components/GridMethodRef';
-export * from './components/ListItemReact';
-export * from './components/ScrollerGrid';
-export * from './components/ScrollerList';
-export * from './components/ScrollRestoration';
+export * from "./components/DnDList";
+export * from "./components/DynamicRouter";
+export * from "./components/GridColumn";
+export * from "./components/GridLoader";
+export * from "./components/GridMethodRef";
+export * from "./components/ListItemReact";
+export * from "./components/ScrollerGrid";
+export * from "./components/ScrollerList";
+export * from "./components/ScrollRestoration";
 // custom
-export * from './custom/CustomFieldReact';
+export * from "./custom/CustomFieldReact";
 // notifier
-export * from './notifier/Notifier';
-export * from '@etsoo/notificationbase';
+export * from "./notifier/Notifier";
+export * from "@etsoo/notificationbase";
 // states
-export * from './states/CultureState';
-export * from './states/IState';
-export * from './states/PageState';
-export * from './states/State';
-export * from './states/UserState';
+export * from "./states/CultureState";
+export * from "./states/IState";
+export * from "./states/PageState";
+export * from "./states/State";
+export * from "./states/UserState";
 // uses
-export * from './uses/useAsyncState';
-export * from './uses/useCombinedRefs';
-export * from './uses/useDelayedExecutor';
-export * from './uses/useDimensions';
-export * from './uses/useParamsEx';
-export * from './uses/useRefs';
-export * from './uses/useSearchParamsEx';
-export * from './uses/useTimeout';
-export * from './uses/useWindowScroll';
-export * from './uses/useWindowSize';
+export * from "./uses/useAsyncState";
+export * from "./uses/useCombinedRefs";
+export * from "./uses/useDelayedExecutor";
+export * from "./uses/useDimensions";
+export * from "./uses/useParamsEx";
+export * from "./uses/useRefs";
+export * from "./uses/useSearchParamsEx";
+export * from "./uses/useTimeout";
+export * from "./uses/useWindowScroll";
+export * from "./uses/useWindowSize";

package/lib/notifier/Notifier.d.ts

@@ -1,7 +1,7 @@
-import React from 'react';
-import { INotificaseBase, INotification, INotifier, Notification, NotificationAlign, NotificationCallProps, NotificationContainer, NotificationRenderProps } from '@etsoo/notificationbase';
-import { IAction } from '@etsoo/appscript';
-import { IProviderProps } from '../states/IState';
+import React from "react";
+import { INotificaseBase, INotification, INotifier, Notification, NotificationAlign, NotificationCallProps, NotificationContainer, NotificationRenderProps } from "@etsoo/notificationbase";
+import { IAction } from "@etsoo/appscript";
+import { IProviderProps } from "../states/IState";
 /**
  * React notification call props
  */
@@ -21,7 +21,7 @@ export interface NotificationReactCallProps extends NotificationCallProps {
     /**
      * Max width
      */
-    maxWidth?: 'xs' | 'sm' | 'md' | 'lg' | 'xl' | false;
+    maxWidth?: "xs" | "sm" | "md" | "lg" | "xl" | false;
     /**
      * OK label
      */

package/lib/notifier/Notifier.js

@@ -1,6 +1,6 @@
-import React from 'react';
-import { Notification, NotificationContainer } from '@etsoo/notificationbase';
-import { State } from '../states/State';
+import React from "react";
+import { Notification, NotificationContainer } from "@etsoo/notificationbase";
+import { State } from "../states/State";
 /**
  * React notification
  */
@@ -30,7 +30,7 @@ export class NotifierReact extends NotificationContainer {
         super((notification, dismiss) => {
             // Debug
             if (this.debug) {
-                console.debug('NotifierReact.updateCallback', notification, dismiss, this.loadingCount);
+                console.debug("NotifierReact.updateCallback", notification, dismiss, this.loadingCount);
             }
             // Make sure the state update is set
             if (this.stateUpdate)
@@ -53,16 +53,16 @@ export class NotifierReact extends NotificationContainer {
                 // Notifications under the align
                 const notifications = state[align];
                 // UI collections
-                const ui = notifications.map((notification) => notification.render(props, className ? className + '-item' : className));
+                const ui = notifications.map((notification) => notification.render(props, className ? className + "-item" : className));
                 // Add to the collection
                 aligns.push(this.createContainer(Number(align), ui));
             }
             // Debug
             if (debug) {
-                console.debug('NotifierReact.createProvider', className, state, aligns);
+                console.debug("NotifierReact.createProvider", className, state, aligns);
             }
             // Generate the component
-            return React.createElement('div', { className }, aligns);
+            return React.createElement("div", { className }, aligns);
         };
         // Create state
         const { provider } = State.create((state, _action) => {

package/lib/states/CultureState.d.ts

@@ -1,6 +1,6 @@
-import { IAction, ICulture } from '@etsoo/appscript';
-import { DataTypes } from '@etsoo/shared';
-import { IProviderProps, IUpdate } from './IState';
+import { IAction, ICulture } from "@etsoo/appscript";
+import { DataTypes } from "@etsoo/shared";
+import { IProviderProps, IUpdate } from "./IState";
 /**
  * Culture action to manage resources
  */

package/lib/states/CultureState.js

@@ -1,4 +1,4 @@
-import { State } from './State';
+import { State } from "./State";
 // Calls
 const calls = {
     /**
@@ -7,7 +7,7 @@ const calls = {
      */
     get(key) {
         const resources = this.state.resources;
-        const value = typeof resources === 'object' ? resources[key] : undefined;
+        const value = typeof resources === "object" ? resources[key] : undefined;
         if (value == null)
             return undefined;
         return value;
@@ -26,7 +26,7 @@ export class CultureState {
         // Default
         const defaultItem = item ?? {};
         // Load resources
-        if (item != null && typeof item.resources !== 'object')
+        if (item != null && typeof item.resources !== "object")
             item.resources().then((result) => (item.resources = result));
         // Act
         const { context, provider } = State.create((state, action) => {

package/lib/states/IState.d.ts

@@ -1,5 +1,5 @@
-import { IAction, IState, UserKey } from '@etsoo/appscript';
-import React from 'react';
+import { IAction, IState, UserKey } from "@etsoo/appscript";
+import React from "react";
 /**
  * State UI creator
  */

package/lib/states/PageState.d.ts

@@ -1,5 +1,5 @@
-import { IAction, IState } from '@etsoo/appscript';
-import { IProviderProps, IUpdate } from './IState';
+import { IAction, IState } from "@etsoo/appscript";
+import { IProviderProps, IUpdate } from "./IState";
 /**
  * Page data interface
  */

package/lib/states/PageState.js

@@ -1,4 +1,4 @@
-import { State } from './State';
+import { State } from "./State";
 /**
  * Page action type
  */
@@ -25,8 +25,7 @@ export class PageState {
                     return { ...state, ...data };
                 case PageActionType.Title:
                     // Same title
-                    if (state.title === data.title &&
-                        state.subtitle === data.subtitle)
+                    if (state.title === data.title && state.subtitle === data.subtitle)
                         return state;
                     // Set page title
                     return {

package/lib/states/State.d.ts

@@ -1,6 +1,6 @@
-import { IAction, IState } from '@etsoo/appscript';
-import React from 'react';
-import { IProviderProps, IUICreator, IUpdate } from './IState';
+import { IAction, IState } from "@etsoo/appscript";
+import React from "react";
+import { IProviderProps, IUICreator, IUpdate } from "./IState";
 /**
  * State
  */

package/lib/states/State.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import React from 'react';
+import React from "react";
 /**
  * State
  */
@@ -29,7 +29,7 @@ export class State {
             else {
                 // Context new value
                 const value = { ...calls, state, dispatch };
-                return (_jsx(context.Provider, { value: value, children: children }));
+                return _jsx(context.Provider, { value: value, children: children });
             }
         };
         // Return

package/lib/states/UserState.d.ts

@@ -1,5 +1,5 @@
-import { IAction, IUser, IUserData } from '@etsoo/appscript';
-import { IProviderProps, IUpdate } from './IState';
+import { IAction, IUser, IUserData } from "@etsoo/appscript";
+import { IProviderProps, IUpdate } from "./IState";
 /**
  * User action type
  * Style like 'const enum' will remove definition of the enum and cause module errors

package/lib/states/UserState.js

@@ -1,5 +1,5 @@
-import { Utils } from '@etsoo/shared';
-import { State } from './State';
+import { Utils } from "@etsoo/shared";
+import { State } from "./State";
 /**
  * User action type
  * Style like 'const enum' will remove definition of the enum and cause module errors
@@ -68,9 +68,9 @@ export class UserState {
     }
     getChangedFields(input, init) {
         return Utils.objectUpdated(input, init, [
-            'authorized',
-            'seconds',
-            'lastChangedFields'
+            "authorized",
+            "seconds",
+            "lastChangedFields"
         ]);
     }
 }

package/lib/uses/useAsyncState.d.ts

@@ -1,4 +1,4 @@
-import React from 'react';
+import React from "react";
 export declare function useAsyncState<S = undefined>(): [
     S | undefined,
     (newState: React.SetStateAction<S | undefined>) => Promise<S | undefined>

package/lib/uses/useAsyncState.js

@@ -1,4 +1,4 @@
-import React from 'react';
+import React from "react";
 /**
  * Returns a stateful value, and a async function to update it.
  * @param initialState initial stat

package/lib/uses/useCombinedRefs.js

@@ -14,12 +14,12 @@ export function useCombinedRefs(...refs) {
             if (!ref)
                 return;
             // Callback function
-            if (typeof ref === 'function') {
+            if (typeof ref === "function") {
                 ref(target);
             }
             else {
                 // as any to update readonly property
-                Reflect.set(ref, 'current', target);
+                Reflect.set(ref, "current", target);
             }
         });
     };

package/lib/uses/useDelayedExecutor.d.ts

@@ -1,4 +1,4 @@
-import { DelayedExecutorType } from '@etsoo/shared';
+import { DelayedExecutorType } from "@etsoo/shared";
 /**
  * Create delayed executor
  */

package/lib/uses/useDelayedExecutor.js

@@ -1,5 +1,5 @@
-import { ExtendUtils } from '@etsoo/shared';
-import React from 'react';
+import { ExtendUtils } from "@etsoo/shared";
+import React from "react";
 /**
  * Create delayed executor
  */

package/lib/uses/useDimensions.d.ts

@@ -1,4 +1,4 @@
-import React from 'react';
+import React from "react";
 interface states {
     count: number;
     indices: number[];

package/lib/uses/useDimensions.js

@@ -1,6 +1,6 @@
-import { DomUtils } from '@etsoo/shared';
-import React from 'react';
-import { useDelayedExecutor } from './useDelayedExecutor';
+import { DomUtils } from "@etsoo/shared";
+import React from "react";
+import { useDelayedExecutor } from "./useDelayedExecutor";
 /**
  * Calculate element(s) dimensions
  * @param elements Observed elments count

package/lib/uses/useParamsEx.d.ts

@@ -1,4 +1,4 @@
-import { DataTypes } from '@etsoo/shared';
+import { DataTypes } from "@etsoo/shared";
 /**
  * Extended useParams of react-router-dom
  * Provide exact type data

package/lib/uses/useParamsEx.js

@@ -1,5 +1,5 @@
-import { DomUtils } from '@etsoo/shared';
-import { useParams } from 'react-router-dom';
+import { DomUtils } from "@etsoo/shared";
+import { useParams } from "react-router-dom";
 /**
  * Extended useParams of react-router-dom
  * Provide exact type data

package/lib/uses/useRefs.d.ts

@@ -1,5 +1,5 @@
-import { DataTypes } from '@etsoo/shared';
-import React from 'react';
+import { DataTypes } from "@etsoo/shared";
+import React from "react";
 /**
  * Create multiple refs
  * @param fields Fields

package/lib/uses/useRefs.js

@@ -1,4 +1,4 @@
-import React from 'react';
+import React from "react";
 /**
  * Create multiple refs
  * @param fields Fields

package/lib/uses/useSearchParamsEx.d.ts

@@ -1,4 +1,4 @@
-import { DataTypes } from '@etsoo/shared';
+import { DataTypes } from "@etsoo/shared";
 /**
  * Extended useSearchParams of react-router-dom
  * Provide exact type data

package/lib/uses/useSearchParamsEx.js

@@ -1,5 +1,5 @@
-import { DomUtils } from '@etsoo/shared';
-import { useSearchParams } from 'react-router-dom';
+import { DomUtils } from "@etsoo/shared";
+import { useSearchParams } from "react-router-dom";
 /**
  * Extended useSearchParams of react-router-dom
  * Provide exact type data
@@ -9,7 +9,7 @@ export function useSearchParamsEx(template) {
     const [sp] = useSearchParams();
     const paras = Object.fromEntries(Object.keys(template).map((key) => {
         const type = template[key];
-        return [key, type.endsWith('[]') ? sp.getAll(key) : sp.get(key)];
+        return [key, type.endsWith("[]") ? sp.getAll(key) : sp.get(key)];
     }));
     // Return
     return DomUtils.dataAs(paras, template, false);

package/lib/uses/useTimeout.js

@@ -1,5 +1,5 @@
-import { ExtendUtils } from '@etsoo/shared';
-import React from 'react';
+import { ExtendUtils } from "@etsoo/shared";
+import React from "react";
 /**
  * For setTimeout to merge actions
  * @param action Action function

package/lib/uses/useWindowScroll.js

@@ -1,4 +1,4 @@
-import React from 'react';
+import React from "react";
 /**
  * Detect window scroll
  * @returns Scroll location
@@ -29,7 +29,7 @@ export const useWindowScroll = () => {
                 ticking = true;
             }
         };
-        window.addEventListener('scroll', scrollHandler, {
+        window.addEventListener("scroll", scrollHandler, {
             passive: true,
             capture: false
         });
@@ -38,7 +38,7 @@ export const useWindowScroll = () => {
             if (requestAnimationFrameSeed > 0)
                 window.cancelAnimationFrame(requestAnimationFrameSeed);
             // Remove scroll event
-            window.removeEventListener('scroll', scrollHandler);
+            window.removeEventListener("scroll", scrollHandler);
         };
     }, []);
     // Return

package/lib/uses/useWindowSize.js

@@ -1,4 +1,4 @@
-import React from 'react';
+import React from "react";
 /**
  * Detect window size
  * @returns Window size
@@ -22,15 +22,14 @@ export const useWindowSize = () => {
                 requestAnimationFrameSeed = window.requestAnimationFrame(() => {
                     ticking = false;
                     requestAnimationFrameSeed = 0;
-                    if (lastSize.width != size.width ||
-                        lastSize.height != size.height) {
+                    if (lastSize.width != size.width || lastSize.height != size.height) {
                         setSize(lastSize);
                     }
                 });
                 ticking = true;
             }
         };
-        window.addEventListener('resize', resizeHandler, {
+        window.addEventListener("resize", resizeHandler, {
             passive: true,
             capture: false
         });
@@ -39,7 +38,7 @@ export const useWindowSize = () => {
             if (requestAnimationFrameSeed > 0)
                 window.cancelAnimationFrame(requestAnimationFrameSeed);
             // Remove resize event
-            window.removeEventListener('resize', resizeHandler);
+            window.removeEventListener("resize", resizeHandler);
         };
     }, []);
     // Return