@etsoo/react 1.5.77 → 1.5.80

package/lib/mu/ScrollerListEx.d.ts

@@ -1,4 +1,4 @@
-import { DataTypes } from '@etsoo/shared';
+import { DataTypes, IdDefaultType } from '@etsoo/shared';
 import React from 'react';
 import { ListChildComponentProps } from 'react-window';
 import { ScrollerListProps } from '../components/ScrollerList';
@@ -22,7 +22,7 @@ export interface ScrollerListExInnerItemRendererProps<T> extends ListChildCompon
     /**
      * Default margins
      */
-    margins: {};
+    margins: object;
 }
 /**
  * Extended ScrollerList ItemSize type
@@ -30,19 +30,15 @@ export interface ScrollerListExInnerItemRendererProps<T> extends ListChildCompon
  * 2. Static sets
  * 3. Dynamic calculation
  */
-export declare type ScrollerListExItemSize = ((index: number) => [number, number] | [number, number, {}]) | [number, number] | [number, {}, boolean?];
+export declare type ScrollerListExItemSize = ((index: number) => [number, number] | [number, number, object]) | [number, number] | [number, object, boolean?];
 /**
  * Extended ScrollerList Props
  */
-export interface ScrollerListExProps<T extends {}, D extends DataTypes.Keys<T> = DataTypes.Keys<T>> extends Omit<ScrollerListProps<T>, 'itemRenderer' | 'itemSize'> {
+export declare type ScrollerListExProps<T extends object, D extends DataTypes.Keys<T>> = Omit<ScrollerListProps<T>, 'itemRenderer' | 'itemSize'> & {
     /**
      * Alternating colors for odd/even rows
      */
     alternatingColors?: [string?, string?];
-    /**
-     * Id field
-     */
-    idField?: D;
     /**
      * Inner item renderer
      */
@@ -51,6 +47,11 @@ export interface ScrollerListExProps<T extends {}, D extends DataTypes.Keys<T> =
      * Item renderer
      */
     itemRenderer?: (props: ListChildComponentProps<T>) => React.ReactElement;
+    /**
+     * Id field
+     * Failed: D extends { id: DataTypes.IdType } ? { idField?: D } : { idField: D }
+     */
+    idField?: D;
     /**
      * Item size, a function indicates its a variable size list
      */
@@ -71,10 +72,10 @@ export interface ScrollerListExProps<T extends {}, D extends DataTypes.Keys<T> =
      * Selected color
      */
     selectedColor?: string;
-}
+};
 /**
  * Extended ScrollerList
  * @param props Props
  * @returns Component
  */
-export declare function ScrollerListEx<T extends {}, D extends DataTypes.Keys<T> = DataTypes.Keys<T>>(props: ScrollerListExProps<T, D>): JSX.Element;
+export declare function ScrollerListEx<T extends object, D extends DataTypes.Keys<T> = IdDefaultType<T>>(props: ScrollerListExProps<T, D>): JSX.Element;

package/lib/mu/SearchOptionGroup.d.ts

@@ -1,9 +1,9 @@
 /// <reference types="react" />
-import { DataTypes } from '@etsoo/shared';
+import { DataTypes, IdDefaultType, LabelDefaultType, ListType } from '@etsoo/shared';
 import { OptionGroupProps } from './OptionGroup';
 /**
  * Search OptionGroup
  * @param props Props
  * @returns Component
  */
-export declare function SearchOptionGroup<T extends {} = DataTypes.IdLabelItem, D extends DataTypes.Keys<T> = DataTypes.Keys<T>>(props: OptionGroupProps<T, D>): JSX.Element;
+export declare function SearchOptionGroup<T extends object = ListType, D extends DataTypes.Keys<T> = IdDefaultType<T>, L extends DataTypes.Keys<T, string> = LabelDefaultType<T>>(props: OptionGroupProps<T, D, L>): JSX.Element;

package/lib/mu/SelectBool.d.ts

@@ -1,11 +1,10 @@
 /// <reference types="react" />
-import { DataTypes } from '@etsoo/shared';
+import { ListType1 } from '@etsoo/shared';
 import { SelectExProps } from './SelectEx';
 /**
  * SelectBool props
  */
-export interface SelectBoolProps extends Omit<SelectExProps<DataTypes.IdLabelItem<string>>, 'options' | 'loadData'> {
-}
+export declare type SelectBoolProps = Omit<SelectExProps<ListType1>, 'options' | 'loadData'>;
 /**
  * SelectBool (yes/no)
  * @param props Props

package/lib/mu/SelectBool.js

@@ -18,5 +18,5 @@ export function SelectBool(props) {
     if (autoAddBlankItem)
         Utils.addBlankItem(options);
     // Layout
-    return (React.createElement(SelectEx, { options: options, search: search, ...rest }));
+    return React.createElement(SelectEx, { options: options, search: search, ...rest });
 }

package/lib/mu/SelectEx.d.ts

@@ -1,10 +1,10 @@
 import { SelectProps } from '@mui/material';
 import React from 'react';
-import { DataTypes } from '@etsoo/shared';
+import { DataTypes, IdDefaultType, LabelDefaultType, ListType } from '@etsoo/shared';
 /**
  * Extended select component props
  */
-export interface SelectExProps<T extends {}, D extends DataTypes.Keys<T> = DataTypes.Keys<T>> extends Omit<SelectProps, 'labelId' | 'input' | 'native'> {
+export declare type SelectExProps<T extends object, D extends DataTypes.Keys<T> = IdDefaultType<T>, L extends DataTypes.Keys<T, string> = LabelDefaultType<T>> = Omit<SelectProps, 'labelId' | 'input' | 'native'> & {
     /**
      * Auto add blank item
      */
@@ -12,15 +12,15 @@ export interface SelectExProps<T extends {}, D extends DataTypes.Keys<T> = DataT
     /**
      * Id field
      */
-    idField: T extends DataTypes.IdLabelItem ? D | undefined : D;
+    idField?: D;
     /**
      * Item icon renderer
      */
-    itemIconRenderer?: (id: unknown) => React.ReactNode;
+    itemIconRenderer?: (id: T[D]) => React.ReactNode;
     /**
      * Label field
      */
-    labelField: ((option: T) => string) | (T extends DataTypes.IdLabelItem ? D | undefined : D);
+    labelField?: L | ((option: T) => string);
     /**
      * Load data callback
      */
@@ -28,7 +28,7 @@ export interface SelectExProps<T extends {}, D extends DataTypes.Keys<T> = DataT
     /**
      * Item click handler
      */
-    onItemClick?: (event: React.MouseEvent, id: unknown) => void;
+    onItemClick?: (event: React.MouseEvent, option: T) => void;
     /**
      * On load data handler
      */
@@ -41,10 +41,10 @@ export interface SelectExProps<T extends {}, D extends DataTypes.Keys<T> = DataT
      * Is search case?
      */
     search?: boolean;
-}
+};
 /**
  * Extended select component
  * @param props Props
  * @returns Component
  */
-export declare function SelectEx<T extends {} = DataTypes.IdLabelItem, D extends DataTypes.Keys<T> = DataTypes.Keys<T>>(props: SelectExProps<T, D>): JSX.Element;
+export declare function SelectEx<T extends object = ListType, D extends DataTypes.Keys<T> = IdDefaultType<T>, L extends DataTypes.Keys<T, string> = LabelDefaultType<T>>(props: SelectExProps<T, D, L>): JSX.Element;

package/lib/mu/SelectEx.js

@@ -77,7 +77,7 @@ export function SelectEx(props) {
     const getLabel = (option) => {
         return typeof labelField === 'function'
             ? labelField(option)
-            : new String(option[labelField]);
+            : option[labelField];
     };
     // Refs
     const divRef = React.useRef();
@@ -142,7 +142,7 @@ export function SelectEx(props) {
             // Option
             return (React.createElement(MenuItem, { key: id, value: id, onClick: (event) => {
                     if (onItemClick) {
-                        onItemClick(event, id);
+                        onItemClick(event, option);
                         if (event.defaultPrevented)
                             return;
                     }
@@ -151,6 +151,6 @@ export function SelectEx(props) {
                 } },
                 multiple && React.createElement(Checkbox, { checked: itemChecked(id) }),
                 React.createElement(ListItemText, { primary: label }),
-                itemIconRenderer && (React.createElement(ListItemRightIcon, null, itemIconRenderer(id)))));
+                itemIconRenderer && (React.createElement(ListItemRightIcon, null, itemIconRenderer(option[idField])))));
         }))));
 }

package/lib/mu/TableEx.d.ts

@@ -1,4 +1,4 @@
-import { DataTypes } from '@etsoo/shared';
+import { DataTypes, IdDefaultType } from '@etsoo/shared';
 import { TableProps } from '@mui/material';
 import React from 'react';
 import { GridColumn } from '../components/GridColumn';
@@ -20,7 +20,7 @@ export interface TableExMethodRef extends GridMethodRef {
 /**
  * Extended table props
  */
-export interface TableExProps<T extends {}, D extends DataTypes.Keys<T> = DataTypes.Keys<T>> extends TableProps, GridLoader<T> {
+export declare type TableExProps<T extends object, D extends DataTypes.Keys<T>> = TableProps & GridLoader<T> & {
     /**
      * Alternating colors for odd/even rows
      */
@@ -57,10 +57,10 @@ export interface TableExProps<T extends {}, D extends DataTypes.Keys<T> = DataTy
      * Header and bottom height
      */
     otherHeight?: number;
-}
+};
 /**
  * Extended Table
  * @param props Props
  * @returns Component
  */
-export declare function TableEx<T extends {}, D extends DataTypes.Keys<T> = DataTypes.Keys<T>>(props: TableExProps<T, D>): JSX.Element;
+export declare function TableEx<T extends object, D extends DataTypes.Keys<T> = IdDefaultType<T>>(props: TableExProps<T, D>): JSX.Element;

package/lib/mu/Tiplist.d.ts

@@ -1,18 +1,18 @@
 /// <reference types="react" />
-import { DataTypes } from '@etsoo/shared';
+import { DataTypes, IdDefaultType, ListType } from '@etsoo/shared';
 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 = ListType, D extends DataTypes.Keys<T> = IdDefaultType<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

@@ -1,9 +1,9 @@
 /// <reference types="react" />
-import { DataTypes } from '@etsoo/shared';
+import { DataTypes, IdDefaultType } from '@etsoo/shared';
 import { DataGridPageProps } from './DataGridPageProps';
 /**
  * DataGrid page
  * @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> = IdDefaultType<T>>(props: DataGridPageProps<T, F, D>): JSX.Element;

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

@@ -1,10 +1,10 @@
-import { DataTypes } from '@etsoo/shared';
+import { DataTypes, IdDefaultType } from '@etsoo/shared';
 import { DataGridExProps } from '../DataGridEx';
 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> = IdDefaultType<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

@@ -1,12 +1,12 @@
 /// <reference types="react" />
-import { DataTypes } from '@etsoo/shared';
+import { DataTypes, IdDefaultType } from '@etsoo/shared';
 import { ListPageProps } from './ListPageProps';
 /**
  * Fixed height list page
  * @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, D extends DataTypes.Keys<T> = IdDefaultType<T>>(props: ListPageProps<T, F, D> & {
     /**
      * Height will be deducted
      * @param height Current calcuated height

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

@@ -1,9 +1,9 @@
 /// <reference types="react" />
-import { DataTypes } from '@etsoo/shared';
+import { DataTypes, IdDefaultType } from '@etsoo/shared';
 import { ListPageProps } from './ListPageProps';
 /**
  * List page
  * @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, D extends DataTypes.Keys<T> = IdDefaultType<T>>(props: ListPageProps<T, F, D>): 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, D extends DataTypes.Keys<T>> = SearchPageProps<T, F> & Omit<ScrollerListExProps<T, D>, 'loadData'>;

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

@@ -1,9 +1,9 @@
 /// <reference types="react" />
-import { DataTypes } from '@etsoo/shared';
+import { DataTypes, IdDefaultType } from '@etsoo/shared';
 import { ResponsePageProps } from './ResponsivePageProps';
 /**
  * Fixed height list page
  * @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> = IdDefaultType<T>>(props: ResponsePageProps<T, F, D>): JSX.Element;

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

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import { DataTypes } from '@etsoo/shared';
+import { DataTypes, IdDefaultType } from '@etsoo/shared';
 import { ListChildComponentProps } from 'react-window';
 import { GridMethodRef } from '../GridMethodRef';
 import { ScrollerListExInnerItemRendererProps, ScrollerListExItemSize } from '../ScrollerListEx';
@@ -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> = IdDefaultType<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

@@ -1,9 +1,9 @@
 /// <reference types="react" />
-import { DataTypes } from '@etsoo/shared';
+import { DataTypes, IdDefaultType } from '@etsoo/shared';
 import { TablePageProps } from './TablePageProps';
 /**
  * Table page
  * @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, D extends DataTypes.Keys<T> = IdDefaultType<T>>(props: TablePageProps<T, F, D>): 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, D extends DataTypes.Keys<T>> = SearchPageProps<T, F> & Omit<TableExProps<T, D>, '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.80",
     "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.85",
+        "@etsoo/notificationbase": "^1.1.7",
+        "@etsoo/shared": "^1.1.51",
         "@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/react-test-renderer": "^18.0.0",
-        "@typescript-eslint/eslint-plugin": "^5.34.0",
-        "@typescript-eslint/parser": "^5.34.0",
-        "eslint": "^8.22.0",
+        "@testing-library/jest-dom": "^5.16.5",
+        "@testing-library/react": "^13.3.0",
+        "@types/jest": "^28.1.8",
+        "@typescript-eslint/eslint-plugin": "^5.35.1",
+        "@typescript-eslint/parser": "^5.35.1",
+        "eslint": "^8.23.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.1",
         "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;
-}
+};