@etsoo/react 1.5.77 → 1.5.78

package/lib/mu/Tiplist.d.ts

@@ -4,15 +4,15 @@ import { AutocompleteExtendedProps } from './AutocompleteExtendedProps';
 /**
  * Tiplist props
  */
-export interface TiplistProps<T extends {}, D extends DataTypes.Keys<T>> extends Omit<AutocompleteExtendedProps<T, D>, 'open'> {
+export declare type TiplistProps<T extends object, D extends DataTypes.Keys<T>> = Omit<AutocompleteExtendedProps<T, D>, 'open'> & {
     /**
      * Load data callback
      */
     loadData: (keyword?: string, id?: T[D]) => PromiseLike<T[] | null | undefined>;
-}
+};
 /**
  * Tiplist
  * @param props Props
  * @returns Component
  */
-export declare function Tiplist<T extends {} = DataTypes.IdLabelItem, D extends DataTypes.Keys<T> = DataTypes.Keys<T>>(props: TiplistProps<T, D>): JSX.Element;
+export declare function Tiplist<T extends object = DataTypes.IdLabelItem, D extends DataTypes.Keys<T> = DataTypes.Keys<T>>(props: TiplistProps<T, D>): JSX.Element;

package/lib/mu/Tiplist.js

@@ -17,10 +17,8 @@ export function Tiplist(props) {
     const inputRef = React.createRef();
     // Local value
     let localValue = value !== null && value !== void 0 ? value : defaultValue;
-    if (localValue === undefined)
-        localValue = null;
     // One time calculation for input's default value (uncontrolled)
-    const localIdValue = idValue !== null && idValue !== void 0 ? idValue : DataTypes.getValue(localValue, idField !== null && idField !== void 0 ? idField : 'id');
+    const localIdValue = idValue !== null && idValue !== void 0 ? idValue : DataTypes.getValue(localValue, idField);
     // Changable states
     const [states, stateUpdate] = React.useReducer((currentState, newState) => {
         return { ...currentState, ...newState };

package/lib/mu/pages/CommonPageProps.d.ts

@@ -44,7 +44,7 @@ export interface CommonPageProps extends Omit<ContainerProps, 'id'> {
     /**
      * Paddings
      */
-    paddings?: {};
+    paddings?: Record<string, string | number>;
     /**
      * Scroll container
      */

package/lib/mu/pages/DataGridPage.d.ts

@@ -6,4 +6,4 @@ import { DataGridPageProps } from './DataGridPageProps';
  * @param props Props
  * @returns Component
  */
-export declare function DataGridPage<T, F extends DataTypes.BasicTemplate = DataTypes.BasicTemplate>(props: DataGridPageProps<T, F>): JSX.Element;
+export declare function DataGridPage<T extends object, F extends DataTypes.BasicTemplate = DataTypes.BasicTemplate, D extends DataTypes.Keys<T> = DataTypes.Keys<T>>(props: DataGridPageProps<T, F, D>): JSX.Element;

package/lib/mu/pages/DataGridPageProps.d.ts

@@ -4,7 +4,7 @@ import { SearchPageProps } from './SearchPageProps';
 /**
  * DataGrid page props
  */
-export interface DataGridPageProps<T, F extends DataTypes.BasicTemplate> extends SearchPageProps<T, F>, Omit<DataGridExProps<T>, 'loadData' | 'height'> {
+export declare type DataGridPageProps<T extends object, F extends DataTypes.BasicTemplate, D extends DataTypes.Keys<T> = DataTypes.Keys<T>> = SearchPageProps<T, F> & Omit<DataGridExProps<T, D>, 'loadData' | 'height'> & {
     /**
      * Height will be deducted
      * @param height Current calcuated height
@@ -14,4 +14,4 @@ export interface DataGridPageProps<T, F extends DataTypes.BasicTemplate> extends
      * Grid height
      */
     height?: number;
-}
+};

package/lib/mu/pages/FixedListPage.d.ts

@@ -6,7 +6,7 @@ import { ListPageProps } from './ListPageProps';
  * @param props Props
  * @returns Component
  */
-export declare function FixedListPage<T extends {}, F extends DataTypes.BasicTemplate = DataTypes.BasicTemplate>(props: ListPageProps<T, F> & {
+export declare function FixedListPage<T extends object, F extends DataTypes.BasicTemplate = DataTypes.BasicTemplate>(props: ListPageProps<T, F> & {
     /**
      * Height will be deducted
      * @param height Current calcuated height

package/lib/mu/pages/ListPage.d.ts

@@ -6,4 +6,4 @@ import { ListPageProps } from './ListPageProps';
  * @param props Props
  * @returns Component
  */
-export declare function ListPage<T extends {}, F extends DataTypes.BasicTemplate = DataTypes.BasicTemplate>(props: ListPageProps<T, F>): JSX.Element;
+export declare function ListPage<T extends object, F extends DataTypes.BasicTemplate = DataTypes.BasicTemplate>(props: ListPageProps<T, F>): JSX.Element;

package/lib/mu/pages/ListPageProps.d.ts

@@ -4,5 +4,4 @@ import { SearchPageProps } from './SearchPageProps';
 /**
  * List page props
  */
-export interface ListPageProps<T, F extends DataTypes.BasicTemplate> extends SearchPageProps<T, F>, Omit<ScrollerListExProps<T>, 'loadData'> {
-}
+export declare type ListPageProps<T extends object, F extends DataTypes.BasicTemplate> = SearchPageProps<T, F> & Omit<ScrollerListExProps<T>, 'loadData'>;

package/lib/mu/pages/ResponsivePage.d.ts

@@ -6,4 +6,4 @@ import { ResponsePageProps } from './ResponsivePageProps';
  * @param props Props
  * @returns Component
  */
-export declare function ResponsivePage<T extends {}, F extends DataTypes.BasicTemplate = DataTypes.BasicTemplate>(props: ResponsePageProps<T, F>): JSX.Element;
+export declare function ResponsivePage<T extends object, F extends DataTypes.BasicTemplate = DataTypes.BasicTemplate, D extends DataTypes.Keys<T> = DataTypes.Keys<T>>(props: ResponsePageProps<T, F, D>): JSX.Element;

package/lib/mu/pages/ResponsivePageProps.d.ts

@@ -7,7 +7,7 @@ import { DataGridPageProps } from './DataGridPageProps';
 /**
  * Response page props
  */
-export interface ResponsePageProps<T, F extends DataTypes.BasicTemplate> extends Omit<DataGridPageProps<T, F>, 'mRef' | 'itemKey' | 'onScroll' | 'onItemsRendered'> {
+export declare type ResponsePageProps<T extends object, F extends DataTypes.BasicTemplate, D extends DataTypes.Keys<T> = DataTypes.Keys<T>> = Omit<DataGridPageProps<T, F, D>, 'mRef' | 'itemKey' | 'onScroll' | 'onItemsRendered'> & {
     /**
      * Min width to show Datagrid
      */
@@ -36,4 +36,4 @@ export interface ResponsePageProps<T, F extends DataTypes.BasicTemplate> extends
      * Quick action for double click or click under mobile
      */
     quickAction?: (data: T) => void;
-}
+};

package/lib/mu/pages/SearchPageProps.d.ts

@@ -5,7 +5,7 @@ import { CommonPageProps } from './CommonPageProps';
 /**
  * Search page props
  */
-export interface SearchPageProps<T, F extends DataTypes.BasicTemplate> extends Omit<GridLoader<T>, 'loadData'> {
+export declare type SearchPageProps<T extends object, F extends DataTypes.BasicTemplate> = Omit<GridLoader<T>, 'loadData'> & {
     /**
      * Search fields
      */
@@ -27,4 +27,4 @@ export interface SearchPageProps<T, F extends DataTypes.BasicTemplate> extends O
      * @default 100
      */
     sizeReadyMiliseconds?: number;
-}
+};

package/lib/mu/pages/TablePage.d.ts

@@ -6,4 +6,4 @@ import { TablePageProps } from './TablePageProps';
  * @param props Props
  * @returns Component
  */
-export declare function TablePage<T extends {}, F extends DataTypes.BasicTemplate = DataTypes.BasicTemplate>(props: TablePageProps<T, F>): JSX.Element;
+export declare function TablePage<T extends object, F extends DataTypes.BasicTemplate = DataTypes.BasicTemplate>(props: TablePageProps<T, F>): JSX.Element;

package/lib/mu/pages/TablePageProps.d.ts

@@ -4,5 +4,4 @@ import { SearchPageProps } from './SearchPageProps';
 /**
  * Table page props
  */
-export interface TablePageProps<T, F extends DataTypes.BasicTemplate> extends SearchPageProps<T, F>, Omit<TableExProps<T>, 'loadData'> {
-}
+export declare type TablePageProps<T extends object, F extends DataTypes.BasicTemplate> = SearchPageProps<T, F> & Omit<TableExProps<T>, 'loadData'>;

package/lib/mu/pages/ViewPage.d.ts

@@ -1,3 +1,4 @@
+import { DataTypes } from '@etsoo/shared';
 import { GridProps } from '@mui/material';
 import React from 'react';
 import { GridColumnRenderProps, GridDataType } from '../../components/GridColumn';
@@ -5,7 +6,7 @@ import { CommonPageProps } from './CommonPageProps';
 /**
  * View page display field
  */
-export interface ViewPageField<T extends {}> extends GridProps {
+export interface ViewPageField<T extends object> extends GridProps {
     /**
      * Data field
      */
@@ -27,11 +28,11 @@ export interface ViewPageField<T extends {}> extends GridProps {
      */
     renderProps?: GridColumnRenderProps;
 }
-declare type ViewPageFieldType<T> = (string & keyof T) | [string & keyof T, GridDataType, GridColumnRenderProps?] | ViewPageField<T>;
+declare type ViewPageFieldType<T extends object> = (string & keyof T) | [string & keyof T, GridDataType, GridColumnRenderProps?] | ViewPageField<T>;
 /**
  * View page props
  */
-export interface ViewPageProps<T extends {}> extends Omit<CommonPageProps, 'children'> {
+export interface ViewPageProps<T extends DataTypes.StringRecord> extends Omit<CommonPageProps, 'children'> {
     /**
      * Actions
      */
@@ -61,5 +62,5 @@ export interface ViewPageProps<T extends {}> extends Omit<CommonPageProps, 'chil
  * View page
  * @param props Props
  */
-export declare function ViewPage<T extends {}>(props: ViewPageProps<T>): JSX.Element;
+export declare function ViewPage<T extends DataTypes.StringRecord>(props: ViewPageProps<T>): JSX.Element;
 export {};

package/lib/states/IState.d.ts

@@ -3,7 +3,7 @@ import React from 'react';
 /**
  * State UI creator
  */
-export interface IUICreator<S extends IState, A extends IAction, P = {}> {
+export interface IUICreator<S extends IState, A extends IAction, P = object> {
     (state: S, dispatch: React.Dispatch<A>, props: P): React.ReactElement;
 }
 /**

package/lib/uses/useCombinedRefs.d.ts

@@ -4,4 +4,4 @@
  * @param refs Refs
  * @returns Callback
  */
-export default function useCombinedRefs(...refs: (React.Ref<unknown> | undefined)[]): (target: unknown) => void;
+export default function useCombinedRefs<T>(...refs: (React.Ref<T> | undefined)[]): (target: T | null) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/react",
-    "version": "1.5.77",
+    "version": "1.5.78",
     "description": "TypeScript ReactJs framework",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
@@ -51,9 +51,9 @@
         "@emotion/css": "^11.10.0",
         "@emotion/react": "^11.10.0",
         "@emotion/styled": "^11.10.0",
-        "@etsoo/appscript": "^1.2.81",
-        "@etsoo/notificationbase": "^1.1.6",
-        "@etsoo/shared": "^1.1.47",
+        "@etsoo/appscript": "^1.2.82",
+        "@etsoo/notificationbase": "^1.1.7",
+        "@etsoo/shared": "^1.1.48",
         "@mui/icons-material": "^5.10.2",
         "@mui/material": "^5.10.2",
         "@types/pica": "^9.0.1",
@@ -79,18 +79,18 @@
         "@babel/plugin-transform-runtime": "^7.18.10",
         "@babel/preset-env": "^7.18.10",
         "@babel/runtime-corejs3": "^7.18.9",
-        "@types/jest": "^28.1.7",
+        "@types/jest": "^28.1.8",
         "@types/react-test-renderer": "^18.0.0",
-        "@typescript-eslint/eslint-plugin": "^5.34.0",
-        "@typescript-eslint/parser": "^5.34.0",
+        "@typescript-eslint/eslint-plugin": "^5.35.1",
+        "@typescript-eslint/parser": "^5.35.1",
         "eslint": "^8.22.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.26.0",
-        "eslint-plugin-react": "^7.30.1",
+        "eslint-plugin-react": "^7.31.0",
         "jest": "^28.1.3",
         "jest-environment-jsdom": "^28.1.3",
         "react-test-renderer": "^18.2.0",
         "ts-jest": "^28.0.8",
-        "typescript": "^4.7.4"
+        "typescript": "^4.8.2"
     }
 }

package/src/app/CommonApp.ts

@@ -57,7 +57,7 @@ export abstract class CommonApp<
      * Refresh token
      * @param props Props
      */
-    override async refreshToken<D = RefreshTokenRQ>(
+    override async refreshToken<D extends object = RefreshTokenRQ>(
         props?: RefreshTokenProps<D>
     ) {
         // Destruct
@@ -206,7 +206,7 @@ export abstract class CommonApp<
      * @param showLoading Show loading bar or not
      * @returns Result
      */
-    override async tryLogin<D = RefreshTokenRQ>(
+    override async tryLogin<D extends object = RefreshTokenRQ>(
         data?: D,
         showLoading?: boolean
     ) {

package/src/app/Labels.ts

@@ -67,7 +67,7 @@ export namespace Labels {
      * @param reference Key reference
      */
     export const setLabels = (
-        labels: {},
+        labels: DataTypes.StringRecord,
         reference: setLabelsReference = {}
     ) => {
         Utils.setLabels(CommonPage, labels, reference.commonPage);

package/src/app/ServiceApp.ts

@@ -101,7 +101,7 @@ export class ServiceApp<
      * Refresh token
      * @param props Props
      */
-    override async refreshToken<D = RefreshTokenRQ>(
+    override async refreshToken<D extends object = RefreshTokenRQ>(
         props?: RefreshTokenProps<D>
     ) {
         // Destruct
@@ -305,7 +305,7 @@ export class ServiceApp<
      * @param showLoading Show loading bar or not
      * @returns Result
      */
-    override async tryLogin<D extends {} = {}>(
+    override async tryLogin<D extends object = {}>(
         data?: D,
         showLoading?: boolean
     ) {

package/src/components/GridColumn.ts

@@ -40,7 +40,7 @@ export type GridCellValueType = string | number | Date | boolean | undefined;
 /**
  * Grid cell formatter props
  */
-export interface GridCellFormatterProps<T> {
+export type GridCellFormatterProps<T> = {
     /**
      * Current data
      */
@@ -60,13 +60,12 @@ export interface GridCellFormatterProps<T> {
      * Column index
      */
     columnIndex: number;
-}
+};
 
 /**
  * Grid cell renderer props
  */
-export interface GridCellRendererProps<T, P = any>
-    extends GridCellFormatterProps<T> {
+export type GridCellRendererProps<T, P = any> = GridCellFormatterProps<T> & {
     /**
      * Cell props
      */
@@ -91,12 +90,12 @@ export interface GridCellRendererProps<T, P = any>
      * Render props
      */
     renderProps?: GridColumnRenderProps;
-}
+};
 
 /**
  * Grid header cell renderer props
  */
-export interface GridHeaderCellRendererProps<T, P = any> {
+export type GridHeaderCellRendererProps<T, P = any> = {
     /**
      * Cell props
      */
@@ -116,12 +115,12 @@ export interface GridHeaderCellRendererProps<T, P = any> {
      * States
      */
     states: GridLoaderStates<T>;
-}
+};
 
 /**
  * Grid column render props
  */
-export interface GridColumnRenderProps {
+export type GridColumnRenderProps = {
     /**
      * Culture, like zh-CN
      */
@@ -151,12 +150,12 @@ export interface GridColumnRenderProps {
      * Additional data
      */
     readonly data?: Readonly<Record<string, any>>;
-}
+};
 
 /**
  * Grid column
  */
-export interface GridColumn<T> {
+export type GridColumn<T> = {
     /**
      * The column identifier. It's used to map with row data
      */
@@ -219,4 +218,4 @@ export interface GridColumn<T> {
     headerCellRenderer?: (
         props: GridHeaderCellRendererProps<T>
     ) => React.ReactNode;
-}
+};

package/src/components/GridLoader.ts

@@ -48,12 +48,12 @@ export function GridDataGet<F extends DataTypes.BasicTemplate>(
 /**
  * Grid Json data
  */
-export interface GridJsonData extends Omit<GridLoadDataProps, 'data'> {}
+export type GridJsonData = Omit<GridLoadDataProps, 'data'>;
 
 /**
  * Grid data load props
  */
-export interface GridLoadDataProps {
+export type GridLoadDataProps = {
     /**
      * Current page
      */
@@ -78,12 +78,12 @@ export interface GridLoadDataProps {
      * Data related
      */
     data?: GridData;
-}
+};
 
 /**
  * Grid data loader
  */
-export interface GridLoader<T> {
+export type GridLoader<T extends object> = {
     /**
      * Auto load data, otherwise call reset
      * @default true
@@ -109,12 +109,12 @@ export interface GridLoader<T> {
      * Threshold at which to pre-fetch data; default is half of loadBatchSize
      */
     threshold?: number | undefined;
-}
+};
 
 /**
  * Grid loader states
  */
-export interface GridLoaderStates<T> extends GridLoadDataProps {
+export type GridLoaderStates<T> = GridLoadDataProps & {
     /**
      * Auto load data, otherwise call reset
      * @default true
@@ -150,4 +150,4 @@ export interface GridLoaderStates<T> extends GridLoadDataProps {
      * Selected items of id
      */
     selectedItems: T[];
-}
+};

package/src/components/ScrollerGrid.tsx

@@ -10,8 +10,10 @@ import {
 import { GridMethodRef } from '../mu/GridMethodRef';
 import { GridLoadDataProps, GridLoader, GridLoaderStates } from './GridLoader';
 
-export interface ScrollerGridItemRendererProps<T>
-    extends Omit<GridChildComponentProps<T>, 'data'> {
+export type ScrollerGridItemRendererProps<T> = Omit<
+    GridChildComponentProps<T>,
+    'data'
+> & {
     /**
      * Selected items
      */
@@ -21,66 +23,65 @@ export interface ScrollerGridItemRendererProps<T>
      * Data
      */
     data?: T;
-}
+};
 
 /**
  * Scroller vertical grid props
  */
-export interface ScrollerGridProps<
-    T extends {},
+export type ScrollerGridProps<
+    T extends object,
     D extends DataTypes.Keys<T> = DataTypes.Keys<T>
-> extends GridLoader<T>,
-        Omit<
-            VariableSizeGridProps<T>,
-            'children' | 'rowCount' | 'rowHeight' | 'ref'
-        > {
-    /**
-     * Default order by asc
-     * @default true
-     */
-    defaultOrderByAsc?: boolean;
-
-    /**
-     * Footer renderer
-     */
-    footerRenderer?: (
-        rows: T[],
-        states: GridLoaderStates<T>
-    ) => React.ReactNode;
-
-    /**
-     * Header renderer
-     */
-    headerRenderer?: (states: GridLoaderStates<T>) => React.ReactNode;
-
-    /**
-     * Id field
-     * @default id
-     */
-    idField?: D;
-
-    /**
-     * Item renderer
-     */
-    itemRenderer: (
-        props: ScrollerGridItemRendererProps<T>
-    ) => React.ReactElement;
-
-    /**
-     * Methods
-     */
-    mRef?: React.Ref<ScrollerGridForwardRef>;
-
-    /**
-     * On items select change
-     */
-    onSelectChange?: (selectedItems: T[]) => void;
-
-    /**
-     * Returns the height of the specified row.
-     */
-    rowHeight?: ((index: number) => number) | number;
-}
+> = GridLoader<T> &
+    Omit<
+        VariableSizeGridProps<T>,
+        'children' | 'rowCount' | 'rowHeight' | 'ref'
+    > & {
+        /**
+         * Default order by asc
+         * @default true
+         */
+        defaultOrderByAsc?: boolean;
+
+        /**
+         * Footer renderer
+         */
+        footerRenderer?: (
+            rows: T[],
+            states: GridLoaderStates<T>
+        ) => React.ReactNode;
+
+        /**
+         * Header renderer
+         */
+        headerRenderer?: (states: GridLoaderStates<T>) => React.ReactNode;
+
+        /**
+         * Id field
+         */
+        idField?: D;
+
+        /**
+         * Item renderer
+         */
+        itemRenderer: (
+            props: ScrollerGridItemRendererProps<T>
+        ) => React.ReactElement;
+
+        /**
+         * Methods
+         */
+        mRef?: React.Ref<ScrollerGridForwardRef>;
+
+        /**
+         * On items select change
+         */
+        onSelectChange?: (selectedItems: T[]) => void;
+
+        /**
+         * Returns the height of the specified row.
+         */
+        rowHeight?: ((index: number) => number) | number;
+    };
 
 /**
  * Scroller grid forward ref
@@ -146,8 +147,11 @@ export interface ScrollerGridForwardRef extends GridMethodRef {
  * @param props Props
  * @returns Component
  */
-export const ScrollerGrid = <T extends Record<string, unknown>>(
-    props: ScrollerGridProps<T>
+export const ScrollerGrid = <
+    T extends object,
+    D extends DataTypes.Keys<T> = DataTypes.Keys<T>
+>(
+    props: ScrollerGridProps<T, D>
 ) => {
     // Destruct
     const {
@@ -157,7 +161,7 @@ export const ScrollerGrid = <T extends Record<string, unknown>>(
         footerRenderer,
         headerRenderer,
         itemRenderer,
-        idField = 'id',
+        idField = 'id' as D,
         loadBatchSize,
         loadData,
         mRef,

package/src/components/ScrollerList.tsx

@@ -20,7 +20,7 @@ import {
 /**
  * Scroller vertical list props
  */
-export interface ScrollerListProps<T>
+export interface ScrollerListProps<T extends object>
     extends GridLoader<T>,
         Omit<
             ListProps<T>,
@@ -98,7 +98,7 @@ const calculateBatchSize = (
  * @param props Props
  * @returns Component
  */
-export const ScrollerList = <T extends {}>(props: ScrollerListProps<T>) => {
+export const ScrollerList = <T extends object>(props: ScrollerListProps<T>) => {
     // Destruct
     const {
         autoLoad = true,

package/src/mu/AutocompleteExtendedProps.ts

@@ -5,18 +5,13 @@ import { ChangeEventHandler } from 'react';
 /**
  * Autocomplete extended props
  */
-export interface AutocompleteExtendedProps<
-    T extends {},
+export type AutocompleteExtendedProps<
+    T extends object,
     D extends DataTypes.Keys<T>
-> extends Omit<
-        AutocompleteProps<T, undefined, false, false>,
-        'renderInput' | 'options'
-    > {
-    /**
-     * Id field, default is id
-     */
-    idField: T extends DataTypes.IdLabelItem ? D | undefined : D;
-
+> = Omit<
+    AutocompleteProps<T, undefined, false, false>,
+    'renderInput' | 'options'
+> & {
     /**
      * Id value
      */
@@ -80,4 +75,10 @@ export interface AutocompleteExtendedProps<
      * Is search field?
      */
     search?: boolean;
-}
+} & (T extends { id: DataTypes.IdType }
+        ? {
+              idField?: D;
+          }
+        : {
+              idField: D;
+          });