@etsoo/react 1.5.77 → 1.5.80

package/__tests__/mu/ComboBox.tsx

@@ -0,0 +1,30 @@
+import React from 'react';
+import { ComboBox } from '../../src';
+import { fireEvent, render, screen } from '@testing-library/react';
+import '@testing-library/jest-dom/extend-expect';
+
+it('Render ComboBox', async () => {
+    // Arrange
+    type T = { id: number; name: string };
+    const options: T[] = [
+        { id: 1, name: 'Name 1' },
+        { id: 2, name: 'Name 2' }
+    ];
+
+    render(
+        <ComboBox<T>
+            name="Test"
+            options={options}
+            labelField="name"
+            label="Test"
+        />
+    );
+
+    // Act, click the list
+    const clicked = fireEvent.click(screen.getByRole('button'));
+    expect(clicked).toBeTruthy();
+
+    // Get list item
+    const item = screen.getByText('Name 1');
+    expect(item.nodeName).toBe('LI');
+});

package/__tests__/mu/NotifierMUTests.tsx

@@ -14,7 +14,7 @@ root.append(container);
 
 // The state provider
 const Provider = NotifierMU.setup();
-const reactRoot = createRoot(container); // createRoot(container!) if you use TypeScript
+const reactRoot = createRoot(container);
 
 act(() => {
     // Concorrent renderer needs act block

package/__tests__/mu/SelectEx.tsx

@@ -0,0 +1,26 @@
+import React from 'react';
+import { SelectEx } from '../../src';
+import { findByText, fireEvent, render, screen } from '@testing-library/react';
+import '@testing-library/jest-dom/extend-expect';
+
+it('Render SelectEx', async () => {
+    // Arrange
+    type T = { id: number; name: string };
+    const options: T[] = [
+        { id: 1, name: 'Name 1' },
+        { id: 2, name: 'Name 2' }
+    ];
+
+    // Render component
+    const { baseElement } = render(
+        <SelectEx<T> options={options} name="test" search labelField="name" />
+    );
+
+    // Act, click to show the list
+    const button = screen.getByRole('button');
+    fireEvent.mouseDown(button); // Not click
+
+    // Get list item
+    const item = await findByText(baseElement, 'Name 2');
+    expect(item.nodeName).toBe('SPAN');
+});

package/lib/app/CommonApp.d.ts

@@ -28,12 +28,12 @@ export declare abstract class CommonApp<U extends IUser = IUser, P extends IPage
      * Refresh token
      * @param props Props
      */
-    refreshToken<D = RefreshTokenRQ>(props?: RefreshTokenProps<D>): Promise<boolean>;
+    refreshToken<D extends object = RefreshTokenRQ>(props?: RefreshTokenProps<D>): Promise<boolean>;
     /**
      * Try login
      * @param data Additional data
      * @param showLoading Show loading bar or not
      * @returns Result
      */
-    tryLogin<D = RefreshTokenRQ>(data?: D, showLoading?: boolean): Promise<boolean>;
+    tryLogin<D extends object = RefreshTokenRQ>(data?: D, showLoading?: boolean): Promise<boolean>;
 }

package/lib/app/Labels.d.ts

@@ -61,5 +61,5 @@ export declare namespace Labels {
      * @param labels Labels
      * @param reference Key reference
      */
-    const setLabels: (labels: {}, reference?: setLabelsReference) => void;
+    const setLabels: (labels: DataTypes.StringRecord, reference?: setLabelsReference) => void;
 }

package/lib/app/ServiceApp.d.ts

@@ -45,7 +45,7 @@ export declare class ServiceApp<U extends IServiceUser = IServiceUser, P extends
      * Refresh token
      * @param props Props
      */
-    refreshToken<D = RefreshTokenRQ>(props?: RefreshTokenProps<D>): Promise<boolean>;
+    refreshToken<D extends object = RefreshTokenRQ>(props?: RefreshTokenProps<D>): Promise<boolean>;
     /**
      * Service decrypt message
      * @param messageEncrypted Encrypted message
@@ -67,7 +67,7 @@ export declare class ServiceApp<U extends IServiceUser = IServiceUser, P extends
      * @param showLoading Show loading bar or not
      * @returns Result
      */
-    tryLogin<D extends {} = {}>(data?: D, showLoading?: boolean): Promise<boolean>;
+    tryLogin<D extends object = {}>(data?: D, showLoading?: boolean): Promise<boolean>;
     /**
      * User login extended
      * @param user Core system user

package/lib/components/GridColumn.d.ts

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

package/lib/components/GridLoader.d.ts

@@ -22,12 +22,11 @@ export declare function GridDataGet<F extends DataTypes.BasicTemplate>(props: Gr
 /**
  * Grid Json data
  */
-export interface GridJsonData extends Omit<GridLoadDataProps, 'data'> {
-}
+export declare type GridJsonData = Omit<GridLoadDataProps, 'data'>;
 /**
  * Grid data load props
  */
-export interface GridLoadDataProps {
+export declare type GridLoadDataProps = {
     /**
      * Current page
      */
@@ -48,11 +47,11 @@ export interface GridLoadDataProps {
      * Data related
      */
     data?: GridData;
-}
+};
 /**
  * Grid data loader
  */
-export interface GridLoader<T> {
+export declare type GridLoader<T extends object> = {
     /**
      * Auto load data, otherwise call reset
      * @default true
@@ -74,11 +73,11 @@ 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 declare type GridLoaderStates<T> = GridLoadDataProps & {
     /**
      * Auto load data, otherwise call reset
      * @default true
@@ -108,4 +107,4 @@ export interface GridLoaderStates<T> extends GridLoadDataProps {
      * Selected items of id
      */
     selectedItems: T[];
-}
+};

package/lib/components/ScrollerGrid.d.ts

@@ -1,9 +1,9 @@
-import { DataTypes } from '@etsoo/shared';
+import { DataTypes, IdDefaultType } from '@etsoo/shared';
 import React from 'react';
 import { Align, GridChildComponentProps, VariableSizeGridProps } from 'react-window';
 import { GridMethodRef } from '../mu/GridMethodRef';
 import { GridLoader, GridLoaderStates } from './GridLoader';
-export interface ScrollerGridItemRendererProps<T> extends Omit<GridChildComponentProps<T>, 'data'> {
+export declare type ScrollerGridItemRendererProps<T> = Omit<GridChildComponentProps<T>, 'data'> & {
     /**
      * Selected items
      */
@@ -12,11 +12,11 @@ export interface ScrollerGridItemRendererProps<T> extends Omit<GridChildComponen
      * Data
      */
     data?: T;
-}
+};
 /**
  * Scroller vertical grid props
  */
-export interface ScrollerGridProps<T extends {}, D extends DataTypes.Keys<T> = DataTypes.Keys<T>> extends GridLoader<T>, Omit<VariableSizeGridProps<T>, 'children' | 'rowCount' | 'rowHeight' | 'ref'> {
+export declare type ScrollerGridProps<T extends object, D extends DataTypes.Keys<T>> = GridLoader<T> & Omit<VariableSizeGridProps<T>, 'children' | 'rowCount' | 'rowHeight' | 'ref'> & {
     /**
      * Default order by asc
      * @default true
@@ -32,7 +32,6 @@ export interface ScrollerGridProps<T extends {}, D extends DataTypes.Keys<T> = D
     headerRenderer?: (states: GridLoaderStates<T>) => React.ReactNode;
     /**
      * Id field
-     * @default id
      */
     idField?: D;
     /**
@@ -51,7 +50,7 @@ export interface ScrollerGridProps<T extends {}, D extends DataTypes.Keys<T> = D
      * Returns the height of the specified row.
      */
     rowHeight?: ((index: number) => number) | number;
-}
+};
 /**
  * Scroller grid forward ref
  */
@@ -110,4 +109,4 @@ export interface ScrollerGridForwardRef extends GridMethodRef {
  * @param props Props
  * @returns Component
  */
-export declare const ScrollerGrid: <T extends Record<string, unknown>>(props: ScrollerGridProps<T, DataTypes.Keys<T, string | number>>) => JSX.Element;
+export declare const ScrollerGrid: <T extends object, D extends DataTypes.Keys<T, string | number> = IdDefaultType<T>>(props: ScrollerGridProps<T, D>) => JSX.Element;

package/lib/components/ScrollerList.d.ts

@@ -5,7 +5,7 @@ import { GridLoader } from './GridLoader';
 /**
  * Scroller vertical list props
  */
-export interface ScrollerListProps<T> extends GridLoader<T>, Omit<ListProps<T>, 'ref' | 'outerRef' | 'height' | 'width' | 'children' | 'itemCount'> {
+export interface ScrollerListProps<T extends object> extends GridLoader<T>, Omit<ListProps<T>, 'ref' | 'outerRef' | 'height' | 'width' | 'children' | 'itemCount'> {
     /**
      * Default order by asc/desc
      */
@@ -59,5 +59,5 @@ export interface ScrollerListForwardRef extends GridMethodRef, ScrollerListRef {
  * @param props Props
  * @returns Component
  */
-export declare const ScrollerList: <T extends {}>(props: ScrollerListProps<T>) => JSX.Element;
+export declare const ScrollerList: <T extends object>(props: ScrollerListProps<T>) => JSX.Element;
 export {};

package/lib/mu/AutocompleteExtendedProps.d.ts

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

package/lib/mu/ComboBox.d.ts

@@ -1,10 +1,10 @@
 /// <reference types="react" />
-import { DataTypes } from '@etsoo/shared';
+import { DataTypes, IdDefaultType, LabelDefaultType, ListType } from '@etsoo/shared';
 import { AutocompleteExtendedProps } from './AutocompleteExtendedProps';
 /**
  * ComboBox props
  */
-export interface ComboBoxProps<T extends {}, D extends DataTypes.Keys<T> = DataTypes.Keys<T>> extends AutocompleteExtendedProps<T, D> {
+export declare type ComboBoxProps<T extends object, D extends DataTypes.Keys<T>, L extends DataTypes.Keys<T, string>> = AutocompleteExtendedProps<T, D> & {
     /**
      * Auto add blank item
      */
@@ -16,7 +16,7 @@ export interface ComboBoxProps<T extends {}, D extends DataTypes.Keys<T> = DataT
     /**
      * Label field
      */
-    labelField: T extends DataTypes.IdLabelItem ? D | undefined : D;
+    labelField?: L;
     /**
      * Load data callback
      */
@@ -29,10 +29,10 @@ export interface ComboBoxProps<T extends {}, D extends DataTypes.Keys<T> = DataT
      * Array of options.
      */
     options?: ReadonlyArray<T>;
-}
+};
 /**
  * ComboBox
  * @param props Props
  * @returns Component
  */
-export declare function ComboBox<T extends {} = DataTypes.IdLabelItem, D extends DataTypes.Keys<T> = DataTypes.Keys<T>>(props: ComboBoxProps<T, D>): JSX.Element;
+export declare function ComboBox<T extends object = ListType, D extends DataTypes.Keys<T> = IdDefaultType<T>, L extends DataTypes.Keys<T, string> = LabelDefaultType<T>>(props: ComboBoxProps<T, D, L>): JSX.Element;

package/lib/mu/DataGridEx.d.ts

@@ -1,4 +1,4 @@
-import { DataTypes } from '@etsoo/shared';
+import { DataTypes, IdDefaultType } from '@etsoo/shared';
 import React from 'react';
 import { GridColumn } from '../components/GridColumn';
 import { GridLoaderStates } from '../components/GridLoader';
@@ -7,17 +7,17 @@ import { MouseEventWithDataHandler } from './MUGlobal';
 /**
  * Footer item renderer props
  */
-export interface DataGridExFooterItemRendererProps<T extends {}> {
+export declare type DataGridExFooterItemRendererProps<T extends object> = {
     column: GridColumn<T>;
     index: number;
     states: GridLoaderStates<T>;
     cellProps: any;
     checkable: boolean;
-}
+};
 /**
  * Extended DataGrid with VariableSizeGrid props
  */
-export interface DataGridExProps<T extends {}, D extends DataTypes.Keys<T> = DataTypes.Keys<T>> extends Omit<ScrollerGridProps<T, D>, 'itemRenderer' | 'columnCount' | 'columnWidth' | 'width'> {
+export declare type DataGridExProps<T extends object, D extends DataTypes.Keys<T>> = Omit<ScrollerGridProps<T, D>, 'itemRenderer' | 'columnCount' | 'columnWidth' | 'width'> & {
     /**
      * Alternating colors for odd/even rows
      */
@@ -78,7 +78,7 @@ export interface DataGridExProps<T extends {}, D extends DataTypes.Keys<T> = Dat
      * Width
      */
     width?: number;
-}
+};
 /**
  * Extended datagrid columns calculation
  * @param columns
@@ -93,4 +93,4 @@ export declare function DataGridExCalColumns<T>(columns: GridColumn<T>[]): {
  * @param props Props
  * @returns Component
  */
-export declare function DataGridEx<T extends {}, D extends DataTypes.Keys<T> = DataTypes.Keys<T>>(props: DataGridExProps<T, D>): JSX.Element;
+export declare function DataGridEx<T extends object, D extends DataTypes.Keys<T> = IdDefaultType<T>>(props: DataGridExProps<T, D>): JSX.Element;

package/lib/mu/DataGridRenderers.d.ts

@@ -18,5 +18,5 @@ export declare namespace DataGridRenderers {
      * @param location Renderer location (column index)
      * @returns Component
      */
-    function defaultFooterItemRenderer<T>(_rows: T[], { index, states, checkable }: DataGridExFooterItemRendererProps<T>, location?: number): string | undefined;
+    function defaultFooterItemRenderer<T extends object>(_rows: T[], { index, states, checkable }: DataGridExFooterItemRendererProps<T>, location?: number): string | undefined;
 }

package/lib/mu/DnDList.d.ts

@@ -17,7 +17,7 @@ export declare const DnDItemStyle: (index: number, isDragging: boolean, theme: T
 /**
  * DnD list forward ref
  */
-export interface DnDListRef<D extends {}> {
+export interface DnDListRef<D extends object> {
     /**
      * Add item
      * @param item New item
@@ -43,7 +43,7 @@ export interface DnDListRef<D extends {}> {
 /**
  * DnD sortable list properties
  */
-export interface DnDListPros<D extends {}, K extends DataTypes.Keys<D>> {
+export interface DnDListPros<D extends object, K extends DataTypes.Keys<D>> {
     /**
      * Get list item style callback
      */

package/lib/mu/ItemList.d.ts

@@ -1,8 +1,9 @@
 import React from 'react';
+import { DataTypes, IdDefaultType, LabelDefaultType, ListType } from '@etsoo/shared';
 /**
  * Item list properties
  */
-export interface ItemListProps<T extends Record<string, unknown>> {
+export interface ItemListProps<T extends object, D extends DataTypes.Keys<T>, L extends DataTypes.Keys<T, string>> {
     /**
      * Style class name
      */
@@ -10,11 +11,11 @@ export interface ItemListProps<T extends Record<string, unknown>> {
     /**
      * Id field name
      */
-    idField?: string & keyof T;
+    idField?: D;
     /**
      * Label field name or callback
      */
-    labelField?: (string & keyof T) | ((item: T) => string);
+    labelField?: L | ((item: T) => string);
     /**
      * Button icon
      */
@@ -30,7 +31,7 @@ export interface ItemListProps<T extends Record<string, unknown>> {
     /**
      * Current selected language
      */
-    selectedValue?: string;
+    selectedValue?: T[D];
     /**
      * Button size
      */
@@ -52,4 +53,4 @@ export interface ItemListProps<T extends Record<string, unknown>> {
  * Item list component
  * @param props Properties
  */
-export declare function ItemList<T extends Record<string, unknown> = Record<string, unknown>>(props: ItemListProps<T>): JSX.Element;
+export declare function ItemList<T extends object = ListType, D extends DataTypes.Keys<T> = IdDefaultType<T>, L extends DataTypes.Keys<T, string> = LabelDefaultType<T>>(props: ItemListProps<T, D, L>): JSX.Element;

package/lib/mu/ItemList.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Dialog, DialogTitle, List, ListItem, ListItemText, DialogContent, Button } from '@mui/material';
+import { Dialog, DialogTitle, List, ListItemText, DialogContent, Button, ListItemButton } from '@mui/material';
 import { DataTypes } from '@etsoo/shared';
 /**
  * Item list component
@@ -9,14 +9,6 @@ export function ItemList(props) {
     var _a;
     //  properties destructure
     const { className, color = 'primary', items, idField = 'id', labelField = 'label', icon, onClose, selectedValue, size = 'medium', title, variant = 'outlined' } = props;
-    // Get id
-    const getId = (item) => {
-        var _a;
-        const id = item[idField];
-        if (typeof id === 'number')
-            return id;
-        return (_a = DataTypes.convert(id, 'string')) !== null && _a !== void 0 ? _a : '';
-    };
     // Get label
     const getLabel = (item) => {
         var _a;
@@ -30,7 +22,7 @@ export function ItemList(props) {
     // Dialog open or not state
     const [open, setOpen] = React.useState(false);
     // Default state
-    const defaultItem = (_a = items.find((item) => getId(item) === selectedValue)) !== null && _a !== void 0 ? _a : items[0];
+    const defaultItem = (_a = items.find((item) => item[idField] === selectedValue)) !== null && _a !== void 0 ? _a : items[0];
     // Current item
     const [currentItem, setCurrentItem] = React.useState(defaultItem);
     // Click handler
@@ -70,8 +62,8 @@ export function ItemList(props) {
             React.createElement(DialogTitle, { sx: { minWidth: '200px' }, id: "dialog-title" }, title || ''),
             React.createElement(DialogContent, null,
                 React.createElement(List, null, items.map((item) => {
-                    const id = getId(item);
-                    return (React.createElement(ListItem, { button: true, key: id, disabled: id === getId(currentItem), onClick: () => closeItemHandler(item) },
+                    const id = item[idField];
+                    return (React.createElement(ListItemButton, { key: id, disabled: id === currentItem[idField], onClick: () => closeItemHandler(item) },
                         React.createElement(ListItemText, null, getLabel(item))));
                 }))))));
 }

package/lib/mu/ListMoreDisplay.d.ts

@@ -5,7 +5,7 @@ import { GridData, GridLoader } from '../components/GridLoader';
 /**
  * ListMoreDisplay props
  */
-export interface ListMoreDisplayProps<T, F extends DataTypes.BasicTemplate = DataTypes.BasicTemplate> extends Omit<CardProps, 'children'>, GridLoader<T> {
+export interface ListMoreDisplayProps<T extends object, F extends DataTypes.BasicTemplate = DataTypes.BasicTemplate> extends Omit<CardProps, 'children'>, GridLoader<T> {
     /**
      * Children to display the list
      */
@@ -32,4 +32,4 @@ export interface ListMoreDisplayProps<T, F extends DataTypes.BasicTemplate = Dat
  * @param props Props
  * @returns Component
  */
-export declare function ListMoreDisplay<T extends {}, F extends DataTypes.BasicTemplate = DataTypes.BasicTemplate>(props: ListMoreDisplayProps<T, F>): JSX.Element;
+export declare function ListMoreDisplay<T extends object, F extends DataTypes.BasicTemplate = DataTypes.BasicTemplate>(props: ListMoreDisplayProps<T, F>): JSX.Element;

package/lib/mu/MUGlobal.d.ts

@@ -55,13 +55,13 @@ export declare class MUGlobal {
      * @param input Input object
      * @returns Updated object
      */
-    static half(input: {}): {};
+    static half(input: object): {};
     /**
      * Reverse object number properties, like 5 to -5
      * @param input Input object
      * @returns Updated object
      */
-    static reverse(input: {}): {};
+    static reverse(input: object): {};
     /**
      * Update object number properties with adjustment
      * @param input Input object
@@ -69,7 +69,7 @@ export declare class MUGlobal {
      * @param field Specific field
      * @returns Updated object
      */
-    static increase(input: {}, adjust: number | {}, field?: string): {};
+    static increase(input: object, adjust: number | object, field?: string): {};
     /**
      * Adjust size with theme update
      * @param size Base size
@@ -77,7 +77,7 @@ export declare class MUGlobal {
      * @param updateFunc Theme update function
      * @returns Updated object
      */
-    static adjustWithTheme(size: number, adjust: {}, updateFunc: (value: number) => string): {};
+    static adjustWithTheme(size: number, adjust: object, updateFunc: (value: number) => string): {};
     /**
      * Break points defined
      */
@@ -91,7 +91,7 @@ export declare class MUGlobal {
      * @param theme Theme
      * @returns Result
      */
-    static getSpace(spaces: {}, theme: Theme): number;
+    static getSpace(spaces: object, theme: Theme): number;
     /**
      * Update object number properties with theme
      * @param input Input object

package/lib/mu/OptionGroup.d.ts

@@ -1,10 +1,10 @@
 /// <reference types="react" />
-import { DataTypes } from '@etsoo/shared';
+import { DataTypes, IdDefaultType, LabelDefaultType, ListType } from '@etsoo/shared';
 import { FormControlProps } from '@mui/material';
 /**
  * OptionGroup props
  */
-export interface OptionGroupProps<T extends {} = DataTypes.IdLabelItem, D extends DataTypes.Keys<T> = DataTypes.Keys<T>> extends Omit<FormControlProps<'fieldset'>, 'defaultValue'> {
+export declare type OptionGroupProps<T extends object, D extends DataTypes.Keys<T>, L extends DataTypes.Keys<T, string>> = Omit<FormControlProps<'fieldset'>, 'defaultValue'> & {
     /**
      * Default value
      */
@@ -14,17 +14,17 @@ export interface OptionGroupProps<T extends {} = DataTypes.IdLabelItem, D extend
      */
     getOptionLabel?: (option: T) => string;
     /**
-     * Id field, default is id
+     * Id field
      */
-    idField: T extends DataTypes.IdLabelItem ? D | undefined : D;
+    idField?: D;
     /**
      * Label
      */
     label?: string;
     /**
-     * Label field, default is label
+     * Label field
      */
-    labelField: T extends DataTypes.IdLabelItem ? D | undefined : D;
+    labelField?: L;
     /**
      * Multiple choose item
      */
@@ -49,10 +49,10 @@ export interface OptionGroupProps<T extends {} = DataTypes.IdLabelItem, D extend
      * Display group of elements in a compact row
      */
     row?: boolean;
-}
+};
 /**
  * OptionGroup
  * @param props Props
  * @returns Component
  */
-export declare function OptionGroup<T extends {} = DataTypes.IdLabelItem, D extends DataTypes.Keys<T> = DataTypes.Keys<T>>(props: OptionGroupProps<T, D>): JSX.Element;
+export declare function OptionGroup<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/ResponsibleContainer.d.ts

@@ -1,4 +1,4 @@
-import { DataTypes } from '@etsoo/shared';
+import { DataTypes, IdDefaultType } from '@etsoo/shared';
 import { SxProps, Theme } from '@mui/material';
 import React from 'react';
 import { ListChildComponentProps } from 'react-window';
@@ -10,7 +10,7 @@ import { ScrollerListExInnerItemRendererProps, ScrollerListExItemSize } from './
 /**
  * ResponsibleContainer props
  */
-export interface ResponsibleContainerProps<T extends {}, F extends DataTypes.BasicTemplate = DataTypes.BasicTemplate, D extends DataTypes.Keys<T> = DataTypes.Keys<T>> extends Omit<DataGridExProps<T, D>, 'height' | 'itemKey' | 'loadData' | 'mRef' | 'onScroll' | 'onItemsRendered'> {
+export declare type ResponsibleContainerProps<T extends object, F extends DataTypes.BasicTemplate = DataTypes.BasicTemplate, D extends DataTypes.Keys<T> = IdDefaultType<T>> = Omit<DataGridExProps<T, D>, 'height' | 'itemKey' | 'loadData' | 'mRef' | 'onScroll' | 'onItemsRendered'> & {
     /**
      * Height will be deducted
      * @param height Current calcuated height
@@ -23,7 +23,7 @@ export interface ResponsibleContainerProps<T extends {}, F extends DataTypes.Bas
     /**
      * Container box SX (dataGrid determines the case)
      */
-    containerBoxSx?: (paddings: {}, hasFields: boolean, dataGrid?: boolean) => SxProps<Theme>;
+    containerBoxSx?: (paddings: Record<string, string | number>, hasFields: boolean, dataGrid?: boolean) => SxProps<Theme>;
     /**
      * Min width to show Datagrid
      */
@@ -67,7 +67,7 @@ export interface ResponsibleContainerProps<T extends {}, F extends DataTypes.Bas
     /**
      * Paddings
      */
-    paddings?: {};
+    paddings?: Record<string, string | number>;
     /**
      * Pull to refresh data
      */
@@ -80,10 +80,10 @@ export interface ResponsibleContainerProps<T extends {}, F extends DataTypes.Bas
      * Size ready to read miliseconds span
      */
     sizeReadyMiliseconds?: number;
-}
+};
 /**
  * Responsible container
  * @param props Props
  * @returns Layout
  */
-export declare function ResponsibleContainer<T extends {}, F extends DataTypes.BasicTemplate = DataTypes.BasicTemplate, D extends DataTypes.Keys<T> = DataTypes.Keys<T>>(props: ResponsibleContainerProps<T, F, D>): JSX.Element;
+export declare function ResponsibleContainer<T extends object, F extends DataTypes.BasicTemplate = DataTypes.BasicTemplate, D extends DataTypes.Keys<T> = IdDefaultType<T>>(props: ResponsibleContainerProps<T, F, D>): JSX.Element;