@etsoo/react 1.5.76 → 1.5.77

package/lib/components/ScrollerGrid.d.ts

@@ -1,3 +1,4 @@
+import { DataTypes } from '@etsoo/shared';
 import React from 'react';
 import { Align, GridChildComponentProps, VariableSizeGridProps } from 'react-window';
 import { GridMethodRef } from '../mu/GridMethodRef';
@@ -15,7 +16,7 @@ export interface ScrollerGridItemRendererProps<T> extends Omit<GridChildComponen
 /**
  * Scroller vertical grid props
  */
-export interface ScrollerGridProps<T> extends GridLoader<T>, Omit<VariableSizeGridProps<T>, 'children' | 'rowCount' | 'rowHeight' | 'ref'> {
+export interface ScrollerGridProps<T extends {}, D extends DataTypes.Keys<T> = DataTypes.Keys<T>> extends GridLoader<T>, Omit<VariableSizeGridProps<T>, 'children' | 'rowCount' | 'rowHeight' | 'ref'> {
     /**
      * Default order by asc
      * @default true
@@ -33,7 +34,7 @@ export interface ScrollerGridProps<T> extends GridLoader<T>, Omit<VariableSizeGr
      * Id field
      * @default id
      */
-    idField?: string & keyof T;
+    idField?: D;
     /**
      * Item renderer
      */
@@ -109,4 +110,4 @@ export interface ScrollerGridForwardRef extends GridMethodRef {
  * @param props Props
  * @returns Component
  */
-export declare const ScrollerGrid: <T extends Record<string, unknown>>(props: ScrollerGridProps<T>) => JSX.Element;
+export declare const ScrollerGrid: <T extends Record<string, unknown>>(props: ScrollerGridProps<T, DataTypes.Keys<T, string | number>>) => JSX.Element;

package/lib/components/ScrollerList.d.ts

@@ -59,5 +59,5 @@ export interface ScrollerListForwardRef extends GridMethodRef, ScrollerListRef {
  * @param props Props
  * @returns Component
  */
-export declare const ScrollerList: <T extends Record<string, any>>(props: ScrollerListProps<T>) => JSX.Element;
+export declare const ScrollerList: <T extends {}>(props: ScrollerListProps<T>) => JSX.Element;
 export {};

package/lib/mu/AutocompleteExtendedProps.d.ts

@@ -8,7 +8,7 @@ export interface AutocompleteExtendedProps<T extends {}, D extends DataTypes.Key
     /**
      * Id field, default is id
      */
-    idField: D;
+    idField: T extends DataTypes.IdLabelItem ? D | undefined : D;
     /**
      * Id value
      */

package/lib/mu/ComboBox.d.ts

@@ -16,7 +16,7 @@ export interface ComboBoxProps<T extends {}, D extends DataTypes.Keys<T> = DataT
     /**
      * Label field
      */
-    labelField: D;
+    labelField: T extends DataTypes.IdLabelItem ? D | undefined : D;
     /**
      * Load data callback
      */

package/lib/mu/ComboBox.js

@@ -12,7 +12,7 @@ import { ReactUtils } from '../app/ReactUtils';
  */
 export function ComboBox(props) {
     // Destruct
-    const { search = false, autoAddBlankItem = search, idField, idValue, inputError, inputHelperText, inputMargin, inputOnChange, inputRequired, inputVariant, defaultValue, label, labelField, loadData, onLoadData, name, inputAutoComplete = 'off', options, dataReadonly = true, readOnly, onChange, openOnFocus = true, value, getOptionLabel = (option) => `${option[labelField]}`, sx = { minWidth: '150px' }, ...rest } = props;
+    const { search = false, autoAddBlankItem = search, idField = 'id', idValue, inputError, inputHelperText, inputMargin, inputOnChange, inputRequired, inputVariant, defaultValue, label, labelField = 'label', loadData, onLoadData, name, inputAutoComplete = 'off', options, dataReadonly = true, readOnly, onChange, openOnFocus = true, value, getOptionLabel = (option) => `${option[labelField]}`, sx = { minWidth: '150px' }, ...rest } = props;
     // Value input ref
     const inputRef = React.createRef();
     // Options state

package/lib/mu/DataGridEx.d.ts

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

package/lib/mu/OptionGroup.d.ts

@@ -1,15 +1,14 @@
 /// <reference types="react" />
-import { IdLabelDto } from '@etsoo/appscript';
 import { DataTypes } from '@etsoo/shared';
 import { FormControlProps } from '@mui/material';
 /**
  * OptionGroup props
  */
-export interface OptionGroupProps<T extends Record<string, any> = IdLabelDto, D extends DataTypes.IdType = string> extends Omit<FormControlProps<'fieldset'>, 'defaultValue'> {
+export interface OptionGroupProps<T extends {} = DataTypes.IdLabelItem, D extends DataTypes.Keys<T> = DataTypes.Keys<T>> extends Omit<FormControlProps<'fieldset'>, 'defaultValue'> {
     /**
      * Default value
      */
-    defaultValue?: D | D[];
+    defaultValue?: T[D] | T[D][];
     /**
      * Get option label function
      */
@@ -17,7 +16,7 @@ export interface OptionGroupProps<T extends Record<string, any> = IdLabelDto, D
     /**
      * Id field, default is id
      */
-    idField?: string & keyof T;
+    idField: T extends DataTypes.IdLabelItem ? D | undefined : D;
     /**
      * Label
      */
@@ -25,7 +24,7 @@ export interface OptionGroupProps<T extends Record<string, any> = IdLabelDto, D
     /**
      * Label field, default is label
      */
-    labelField?: string & keyof T;
+    labelField: T extends DataTypes.IdLabelItem ? D | undefined : D;
     /**
      * Multiple choose item
      */
@@ -37,7 +36,7 @@ export interface OptionGroupProps<T extends Record<string, any> = IdLabelDto, D
     /**
      * On value change handler
      */
-    onValueChange?: (value: D | D[] | undefined) => void;
+    onValueChange?: (value: T[D] | T[D][] | undefined) => void;
     /**
      * Array of options.
      */
@@ -56,4 +55,4 @@ export interface OptionGroupProps<T extends Record<string, any> = IdLabelDto, D
  * @param props Props
  * @returns Component
  */
-export declare function OptionGroup<T extends Record<string, unknown> = IdLabelDto, D extends DataTypes.IdType = string>(props: OptionGroupProps<T, D>): JSX.Element;
+export declare function OptionGroup<T extends {} = DataTypes.IdLabelItem, D extends DataTypes.Keys<T> = DataTypes.Keys<T>>(props: OptionGroupProps<T, D>): JSX.Element;

package/lib/mu/ResponsibleContainer.d.ts

@@ -10,7 +10,7 @@ import { ScrollerListExInnerItemRendererProps, ScrollerListExItemSize } from './
 /**
  * ResponsibleContainer props
  */
-export interface ResponsibleContainerProps<T extends {}, F extends DataTypes.BasicTemplate = DataTypes.BasicTemplate> extends Omit<DataGridExProps<T>, 'height' | 'itemKey' | 'loadData' | 'mRef' | 'onScroll' | 'onItemsRendered'> {
+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'> {
     /**
      * Height will be deducted
      * @param height Current calcuated height
@@ -86,4 +86,4 @@ export interface ResponsibleContainerProps<T extends {}, F extends DataTypes.Bas
  * @param props Props
  * @returns Layout
  */
-export declare function ResponsibleContainer<T extends {}, F extends DataTypes.BasicTemplate = DataTypes.BasicTemplate>(props: ResponsibleContainerProps<T, F>): JSX.Element;
+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;

package/lib/mu/ScrollerListEx.d.ts

@@ -1,3 +1,4 @@
+import { DataTypes } from '@etsoo/shared';
 import React from 'react';
 import { ListChildComponentProps } from 'react-window';
 import { ScrollerListProps } from '../components/ScrollerList';
@@ -33,7 +34,7 @@ export declare type ScrollerListExItemSize = ((index: number) => [number, number
 /**
  * Extended ScrollerList Props
  */
-export interface ScrollerListExProps<T> extends Omit<ScrollerListProps<T>, 'itemRenderer' | 'itemSize'> {
+export interface ScrollerListExProps<T extends {}, D extends DataTypes.Keys<T> = DataTypes.Keys<T>> extends Omit<ScrollerListProps<T>, 'itemRenderer' | 'itemSize'> {
     /**
      * Alternating colors for odd/even rows
      */
@@ -41,7 +42,7 @@ export interface ScrollerListExProps<T> extends Omit<ScrollerListProps<T>, 'item
     /**
      * Id field
      */
-    idField?: string & keyof T;
+    idField?: D;
     /**
      * Inner item renderer
      */
@@ -76,4 +77,4 @@ export interface ScrollerListExProps<T> extends Omit<ScrollerListProps<T>, 'item
  * @param props Props
  * @returns Component
  */
-export declare function ScrollerListEx<T extends Record<string, unknown>>(props: ScrollerListExProps<T>): JSX.Element;
+export declare function ScrollerListEx<T extends {}, D extends DataTypes.Keys<T> = DataTypes.Keys<T>>(props: ScrollerListExProps<T, D>): JSX.Element;

package/lib/mu/ScrollerListEx.js

@@ -112,7 +112,7 @@ export function ScrollerListEx(props) {
         return selected;
     };
     // Destruct
-    const { alternatingColors = [undefined, undefined], className, idField = 'id', innerItemRenderer, itemSize, itemKey = (index, data) => { var _a; return (_a = DataTypes.getValue(data, idField)) !== null && _a !== void 0 ? _a : index; }, itemRenderer = (itemProps) => {
+    const { alternatingColors = [undefined, undefined], className, idField = 'id', innerItemRenderer, itemSize, itemKey = (index, data) => { var _a; return (_a = DataTypes.getIdValue1(data, idField)) !== null && _a !== void 0 ? _a : index; }, itemRenderer = (itemProps) => {
         const [itemHeight, space, margins] = calculateItemSize(itemProps.index);
         return defaultItemRenderer({
             itemHeight,

package/lib/mu/SearchOptionGroup.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="react" />
-import { IdLabelDto } from '@etsoo/appscript';
 import { DataTypes } from '@etsoo/shared';
 import { OptionGroupProps } from './OptionGroup';
 /**
@@ -7,4 +6,4 @@ import { OptionGroupProps } from './OptionGroup';
  * @param props Props
  * @returns Component
  */
-export declare function SearchOptionGroup<T extends Record<string, any> = IdLabelDto, D extends DataTypes.IdType = string>(props: OptionGroupProps<T, D>): JSX.Element;
+export declare function SearchOptionGroup<T extends {} = DataTypes.IdLabelItem, D extends DataTypes.Keys<T> = DataTypes.Keys<T>>(props: OptionGroupProps<T, D>): JSX.Element;

package/lib/mu/SelectBool.d.ts

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

package/lib/mu/SelectEx.d.ts

@@ -12,7 +12,7 @@ export interface SelectExProps<T extends {}, D extends DataTypes.Keys<T> = DataT
     /**
      * Id field
      */
-    idField: D;
+    idField: T extends DataTypes.IdLabelItem ? D | undefined : D;
     /**
      * Item icon renderer
      */
@@ -20,7 +20,7 @@ export interface SelectExProps<T extends {}, D extends DataTypes.Keys<T> = DataT
     /**
      * Label field
      */
-    labelField: ((option: T) => string) | D;
+    labelField: ((option: T) => string) | (T extends DataTypes.IdLabelItem ? D | undefined : D);
     /**
      * Load data callback
      */

package/lib/mu/SelectEx.js

@@ -12,7 +12,7 @@ import { ReactUtils } from '../app/ReactUtils';
 export function SelectEx(props) {
     var _a;
     // Destruct
-    const { defaultValue, idField, itemIconRenderer, label, labelField, loadData, onItemClick, onLoadData, multiple = false, name, options = [], search = false, autoAddBlankItem = search, value, onChange, fullWidth, ...rest } = props;
+    const { defaultValue, idField = 'id', itemIconRenderer, label, labelField = 'label', loadData, onItemClick, onLoadData, multiple = false, name, options = [], search = false, autoAddBlankItem = search, value, onChange, fullWidth, ...rest } = props;
     // Options state
     const [localOptions, setOptions] = React.useState(options);
     const isMounted = React.useRef(true);

package/lib/mu/TableEx.d.ts

@@ -1,3 +1,4 @@
+import { DataTypes } from '@etsoo/shared';
 import { TableProps } from '@mui/material';
 import React from 'react';
 import { GridColumn } from '../components/GridColumn';
@@ -19,7 +20,7 @@ export interface TableExMethodRef extends GridMethodRef {
 /**
  * Extended table props
  */
-export interface TableExProps<T extends Record<string, any>> extends TableProps, GridLoader<T> {
+export interface TableExProps<T extends {}, D extends DataTypes.Keys<T> = DataTypes.Keys<T>> extends TableProps, GridLoader<T> {
     /**
      * Alternating colors for odd/even rows
      */
@@ -35,7 +36,7 @@ export interface TableExProps<T extends Record<string, any>> extends TableProps,
     /**
      * Id field
      */
-    idField?: string & keyof T;
+    idField?: D;
     /**
      * Max height
      */
@@ -62,4 +63,4 @@ export interface TableExProps<T extends Record<string, any>> extends TableProps,
  * @param props Props
  * @returns Component
  */
-export declare function TableEx<T extends Record<string, unknown>>(props: TableExProps<T>): JSX.Element;
+export declare function TableEx<T extends {}, D extends DataTypes.Keys<T> = DataTypes.Keys<T>>(props: TableExProps<T, D>): JSX.Element;

package/lib/mu/TableEx.js

@@ -259,8 +259,7 @@ export function TableEx(props) {
                                 columnIndex,
                                 cellProps
                             })) : (React.createElement(React.Fragment, null, "\u00A0"));
-                            return (React.createElement(TableCell, { key: rowId.toString() +
-                                    columnIndex, ...cellProps }, child));
+                            return (React.createElement(TableCell, { key: `${rowId}${columnIndex}`, ...cellProps }, child));
                         })));
                 })))),
         React.createElement(TablePagination, { component: "div", showFirstButton: true, count: totalRows, rowsPerPage: batchSize, page: currentPage, onPageChange: handleChangePage, onRowsPerPageChange: handleChangeRowsPerPage, rowsPerPageOptions: [

package/lib/mu/Tiplist.d.ts

@@ -15,4 +15,4 @@ export interface TiplistProps<T extends {}, D extends DataTypes.Keys<T>> extends
  * @param props Props
  * @returns Component
  */
-export declare function Tiplist<T extends {}, D extends DataTypes.Keys<T>>(props: TiplistProps<T, D>): JSX.Element;
+export declare function Tiplist<T extends {} = DataTypes.IdLabelItem, D extends DataTypes.Keys<T> = DataTypes.Keys<T>>(props: TiplistProps<T, D>): JSX.Element;

package/lib/mu/Tiplist.js

@@ -12,7 +12,7 @@ import { SearchField } from './SearchField';
  */
 export function Tiplist(props) {
     // Destruct
-    const { search = false, idField, idValue, inputAutoComplete = 'off', inputError, inputHelperText, inputMargin, inputOnChange, inputRequired, inputVariant, label, loadData, defaultValue, value, name, readOnly, onChange, openOnFocus = true, sx = { minWidth: '180px' }, ...rest } = props;
+    const { search = false, idField = 'id', idValue, inputAutoComplete = 'off', inputError, inputHelperText, inputMargin, inputOnChange, inputRequired, inputVariant, label, loadData, defaultValue, value, name, readOnly, onChange, openOnFocus = true, sx = { minWidth: '180px' }, ...rest } = props;
     // Value input ref
     const inputRef = React.createRef();
     // Local value
@@ -20,7 +20,7 @@ export function Tiplist(props) {
     if (localValue === undefined)
         localValue = null;
     // One time calculation for input's default value (uncontrolled)
-    const localIdValue = idValue !== null && idValue !== void 0 ? idValue : (localValue && localValue[idField]);
+    const localIdValue = idValue !== null && idValue !== void 0 ? idValue : DataTypes.getValue(localValue, idField !== null && idField !== void 0 ? idField : 'id');
     // Changable states
     const [states, stateUpdate] = React.useReducer((currentState, newState) => {
         return { ...currentState, ...newState };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/react",
-    "version": "1.5.76",
+    "version": "1.5.77",
     "description": "TypeScript ReactJs framework",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
@@ -51,11 +51,11 @@
         "@emotion/css": "^11.10.0",
         "@emotion/react": "^11.10.0",
         "@emotion/styled": "^11.10.0",
-        "@etsoo/appscript": "^1.2.79",
+        "@etsoo/appscript": "^1.2.81",
         "@etsoo/notificationbase": "^1.1.6",
-        "@etsoo/shared": "^1.1.46",
-        "@mui/icons-material": "^5.8.4",
-        "@mui/material": "^5.10.1",
+        "@etsoo/shared": "^1.1.47",
+        "@mui/icons-material": "^5.10.2",
+        "@mui/material": "^5.10.2",
         "@types/pica": "^9.0.1",
         "@types/pulltorefreshjs": "^0.1.5",
         "@types/react": "^18.0.17",

package/src/components/ScrollerGrid.tsx

@@ -1,3 +1,4 @@
+import { DataTypes } from '@etsoo/shared';
 import React from 'react';
 import {
     Align,
@@ -25,8 +26,10 @@ export interface ScrollerGridItemRendererProps<T>
 /**
  * Scroller vertical grid props
  */
-export interface ScrollerGridProps<T>
-    extends GridLoader<T>,
+export interface ScrollerGridProps<
+    T extends {},
+    D extends DataTypes.Keys<T> = DataTypes.Keys<T>
+> extends GridLoader<T>,
         Omit<
             VariableSizeGridProps<T>,
             'children' | 'rowCount' | 'rowHeight' | 'ref'
@@ -54,7 +57,7 @@ export interface ScrollerGridProps<T>
      * Id field
      * @default id
      */
-    idField?: string & keyof T;
+    idField?: D;
 
     /**
      * Item renderer

package/src/components/ScrollerList.tsx

@@ -98,9 +98,7 @@ const calculateBatchSize = (
  * @param props Props
  * @returns Component
  */
-export const ScrollerList = <T extends Record<string, any>>(
-    props: ScrollerListProps<T>
-) => {
+export const ScrollerList = <T extends {}>(props: ScrollerListProps<T>) => {
     // Destruct
     const {
         autoLoad = true,

package/src/mu/AutocompleteExtendedProps.ts

@@ -15,7 +15,7 @@ export interface AutocompleteExtendedProps<
     /**
      * Id field, default is id
      */
-    idField: D;
+    idField: T extends DataTypes.IdLabelItem ? D | undefined : D;
 
     /**
      * Id value

package/src/mu/ComboBox.tsx

@@ -27,7 +27,7 @@ export interface ComboBoxProps<
     /**
      * Label field
      */
-    labelField: D;
+    labelField: T extends DataTypes.IdLabelItem ? D | undefined : D;
 
     /**
      * Load data callback
@@ -58,7 +58,7 @@ export function ComboBox<
     const {
         search = false,
         autoAddBlankItem = search,
-        idField,
+        idField = 'id' as D,
         idValue,
         inputError,
         inputHelperText,
@@ -68,7 +68,7 @@ export function ComboBox<
         inputVariant,
         defaultValue,
         label,
-        labelField,
+        labelField = 'label' as D,
         loadData,
         onLoadData,
         name,

package/src/mu/DataGridEx.tsx

@@ -1,5 +1,5 @@
 import { css } from '@emotion/css';
-import { Utils } from '@etsoo/shared';
+import { DataTypes, Utils } from '@etsoo/shared';
 import {
     Box,
     BoxProps,
@@ -30,9 +30,7 @@ import { MouseEventWithDataHandler } from './MUGlobal';
 /**
  * Footer item renderer props
  */
-export interface DataGridExFooterItemRendererProps<
-    T extends Record<string, any>
-> {
+export interface DataGridExFooterItemRendererProps<T extends {}> {
     column: GridColumn<T>;
     index: number;
     states: GridLoaderStates<T>;
@@ -43,9 +41,11 @@ export interface DataGridExFooterItemRendererProps<
 /**
  * Extended DataGrid with VariableSizeGrid props
  */
-export interface DataGridExProps<T extends Record<string, any>>
-    extends Omit<
-        ScrollerGridProps<T>,
+export interface DataGridExProps<
+    T extends {},
+    D extends DataTypes.Keys<T> = DataTypes.Keys<T>
+> extends Omit<
+        ScrollerGridProps<T, D>,
         'itemRenderer' | 'columnCount' | 'columnWidth' | 'width'
     > {
     /**
@@ -210,9 +210,10 @@ export function DataGridExCalColumns<T>(columns: GridColumn<T>[]) {
  * @param props Props
  * @returns Component
  */
-export function DataGridEx<T extends Record<string, any>>(
-    props: DataGridExProps<T>
-) {
+export function DataGridEx<
+    T extends {},
+    D extends DataTypes.Keys<T> = DataTypes.Keys<T>
+>(props: DataGridExProps<T, D>) {
     // Theme
     const theme = useTheme();
 
@@ -360,7 +361,7 @@ export function DataGridEx<T extends Record<string, any>>(
         footerItemRenderer = DataGridRenderers.defaultFooterItemRenderer,
         hideFooter = false,
         hoverColor = '#f6f9fb',
-        idField = 'id',
+        idField = 'id' as D,
         mRef = React.createRef(),
         onClick,
         onDoubleClick,
@@ -372,7 +373,7 @@ export function DataGridEx<T extends Record<string, any>>(
 
     if (checkable) {
         const cbColumn: GridColumn<T> = {
-            field: 'selected',
+            field: 'selected' as any, // Avoid validation from data model
             header: '',
             sortable: false,
             width: 50,

package/src/mu/OptionGroup.tsx

@@ -1,4 +1,3 @@
-import { IdLabelDto } from '@etsoo/appscript';
 import { DataTypes, Utils } from '@etsoo/shared';
 import {
     Checkbox,
@@ -16,13 +15,13 @@ import React from 'react';
  * OptionGroup props
  */
 export interface OptionGroupProps<
-    T extends Record<string, any> = IdLabelDto,
-    D extends DataTypes.IdType = string
+    T extends {} = DataTypes.IdLabelItem,
+    D extends DataTypes.Keys<T> = DataTypes.Keys<T>
 > extends Omit<FormControlProps<'fieldset'>, 'defaultValue'> {
     /**
      * Default value
      */
-    defaultValue?: D | D[];
+    defaultValue?: T[D] | T[D][];
 
     /**
      * Get option label function
@@ -32,7 +31,7 @@ export interface OptionGroupProps<
     /**
      * Id field, default is id
      */
-    idField?: string & keyof T;
+    idField: T extends DataTypes.IdLabelItem ? D | undefined : D;
 
     /**
      * Label
@@ -42,7 +41,7 @@ export interface OptionGroupProps<
     /**
      * Label field, default is label
      */
-    labelField?: string & keyof T;
+    labelField: T extends DataTypes.IdLabelItem ? D | undefined : D;
 
     /**
      * Multiple choose item
@@ -57,7 +56,7 @@ export interface OptionGroupProps<
     /**
      * On value change handler
      */
-    onValueChange?: (value: D | D[] | undefined) => void;
+    onValueChange?: (value: T[D] | T[D][] | undefined) => void;
 
     /**
      * Array of options.
@@ -81,16 +80,16 @@ export interface OptionGroupProps<
  * @returns Component
  */
 export function OptionGroup<
-    T extends Record<string, unknown> = IdLabelDto,
-    D extends DataTypes.IdType = string
+    T extends {} = DataTypes.IdLabelItem,
+    D extends DataTypes.Keys<T> = DataTypes.Keys<T>
 >(props: OptionGroupProps<T, D>) {
     // Destruct
     const {
         getOptionLabel,
         defaultValue,
-        idField = 'id',
+        idField = 'id' as D,
         label,
-        labelField = 'label',
+        labelField = 'label' as D,
         multiple = false,
         name,
         onValueChange,
@@ -103,10 +102,10 @@ export function OptionGroup<
 
     // Get option value
     // D type should be the source id type
-    const getOptionValue = (option: T): D | null => {
+    const getOptionValue = (option: T): T[D] | null => {
         const value = DataTypes.getValue(option, idField);
         if (value == null) return null;
-        return value as D;
+        return value as T[D];
     };
 
     // Checkbox values
@@ -142,7 +141,7 @@ export function OptionGroup<
                 onChange={(event) => {
                     if (firstOptionValue == null) return;
 
-                    const typeValue = Utils.parseString<D>(
+                    const typeValue = Utils.parseString(
                         event.target.value,
                         firstOptionValue
                     );
@@ -175,7 +174,7 @@ export function OptionGroup<
 
         // Value, convert to string
         // Will fail when type is number
-        const value = getOptionValue(option);
+        const value = getOptionValue(option) as unknown as React.Key;
 
         return (
             <FormControlLabel
@@ -197,7 +196,7 @@ export function OptionGroup<
             value={values[0]}
             onChange={(_event, value) => {
                 if (firstOptionValue == null) return;
-                const typeValue = Utils.parseString<D>(value, firstOptionValue);
+                const typeValue = Utils.parseString(value, firstOptionValue);
                 if (onValueChange) onValueChange(typeValue);
                 setValues([typeValue]);
             }}

package/src/mu/ResponsibleContainer.tsx

@@ -32,9 +32,10 @@ import { SearchBar } from './SearchBar';
  */
 export interface ResponsibleContainerProps<
     T extends {},
-    F extends DataTypes.BasicTemplate = DataTypes.BasicTemplate
+    F extends DataTypes.BasicTemplate = DataTypes.BasicTemplate,
+    D extends DataTypes.Keys<T> = DataTypes.Keys<T>
 > extends Omit<
-        DataGridExProps<T>,
+        DataGridExProps<T, D>,
         | 'height'
         | 'itemKey'
         | 'loadData'
@@ -163,8 +164,9 @@ function defaultContainerBoxSx(
  */
 export function ResponsibleContainer<
     T extends {},
-    F extends DataTypes.BasicTemplate = DataTypes.BasicTemplate
->(props: ResponsibleContainerProps<T, F>) {
+    F extends DataTypes.BasicTemplate = DataTypes.BasicTemplate,
+    D extends DataTypes.Keys<T> = DataTypes.Keys<T>
+>(props: ResponsibleContainerProps<T, F, D>) {
     // Destruct
     const {
         adjustHeight,
@@ -319,7 +321,7 @@ export function ResponsibleContainer<
 
         return [
             <Box className="ListBox" sx={{ height: heightLocal }}>
-                <ScrollerListEx<T>
+                <ScrollerListEx<T, D>
                     autoLoad={!hasFields}
                     height={heightLocal}
                     loadData={localLoadData}

package/src/mu/ScrollerListEx.tsx

@@ -117,8 +117,10 @@ export type ScrollerListExItemSize =
 /**
  * Extended ScrollerList Props
  */
-export interface ScrollerListExProps<T>
-    extends Omit<ScrollerListProps<T>, 'itemRenderer' | 'itemSize'> {
+export interface ScrollerListExProps<
+    T extends {},
+    D extends DataTypes.Keys<T> = DataTypes.Keys<T>
+> extends Omit<ScrollerListProps<T>, 'itemRenderer' | 'itemSize'> {
     /**
      * Alternating colors for odd/even rows
      */
@@ -127,7 +129,7 @@ export interface ScrollerListExProps<T>
     /**
      * Id field
      */
-    idField?: string & keyof T;
+    idField?: D;
 
     /**
      * Inner item renderer
@@ -260,9 +262,10 @@ function defaultItemRenderer<T>({
  * @param props Props
  * @returns Component
  */
-export function ScrollerListEx<T extends Record<string, unknown>>(
-    props: ScrollerListExProps<T>
-) {
+export function ScrollerListEx<
+    T extends {},
+    D extends DataTypes.Keys<T> = DataTypes.Keys<T>
+>(props: ScrollerListExProps<T, D>) {
     // Selected item ref
     const selectedItem = React.useRef<[HTMLDivElement, T]>();
 
@@ -295,11 +298,11 @@ export function ScrollerListEx<T extends Record<string, unknown>>(
     const {
         alternatingColors = [undefined, undefined],
         className,
-        idField = 'id',
+        idField = 'id' as D,
         innerItemRenderer,
         itemSize,
         itemKey = (index: number, data: T) =>
-            DataTypes.getValue(data, idField) ?? index,
+            DataTypes.getIdValue1(data, idField) ?? index,
         itemRenderer = (itemProps) => {
             const [itemHeight, space, margins] = calculateItemSize(
                 itemProps.index

package/src/mu/SearchOptionGroup.tsx

@@ -1,4 +1,3 @@
-import { IdLabelDto } from '@etsoo/appscript';
 import { DataTypes } from '@etsoo/shared';
 import React from 'react';
 import { MUGlobal } from './MUGlobal';
@@ -10,8 +9,8 @@ import { OptionGroup, OptionGroupProps } from './OptionGroup';
  * @returns Component
  */
 export function SearchOptionGroup<
-    T extends Record<string, any> = IdLabelDto,
-    D extends DataTypes.IdType = string
+    T extends {} = DataTypes.IdLabelItem,
+    D extends DataTypes.Keys<T> = DataTypes.Keys<T>
 >(props: OptionGroupProps<T, D>) {
     // Destruct
     const {

package/src/mu/SelectBool.tsx

@@ -1,5 +1,4 @@
-import { IdLabelDto } from '@etsoo/appscript';
-import { Utils } from '@etsoo/shared';
+import { DataTypes, Utils } from '@etsoo/shared';
 import React from 'react';
 import { globalApp } from '..';
 import { SelectEx, SelectExProps } from './SelectEx';
@@ -8,7 +7,10 @@ import { SelectEx, SelectExProps } from './SelectEx';
  * SelectBool props
  */
 export interface SelectBoolProps
-    extends Omit<SelectExProps<IdLabelDto<string>>, 'options' | 'loadData'> {}
+    extends Omit<
+        SelectExProps<DataTypes.IdLabelItem<string>>,
+        'options' | 'loadData'
+    > {}
 
 /**
  * SelectBool (yes/no)
@@ -20,7 +22,7 @@ export function SelectBool(props: SelectBoolProps) {
     const { search = true, autoAddBlankItem = search, ...rest } = props;
 
     // Options
-    const options: IdLabelDto<string>[] = [
+    const options: DataTypes.IdLabelItem<string>[] = [
         { id: 'false', label: globalApp.get('no')! },
         { id: 'true', label: globalApp.get('yes')! }
     ];
@@ -29,7 +31,7 @@ export function SelectBool(props: SelectBoolProps) {
 
     // Layout
     return (
-        <SelectEx<IdLabelDto<string>>
+        <SelectEx<DataTypes.IdLabelItem<string>>
             options={options}
             search={search}
             {...rest}

package/src/mu/SelectEx.tsx

@@ -30,7 +30,7 @@ export interface SelectExProps<
     /**
      * Id field
      */
-    idField: D;
+    idField: T extends DataTypes.IdLabelItem ? D | undefined : D;
 
     /**
      * Item icon renderer
@@ -40,7 +40,9 @@ export interface SelectExProps<
     /**
      * Label field
      */
-    labelField: ((option: T) => string) | D;
+    labelField:
+        | ((option: T) => string)
+        | (T extends DataTypes.IdLabelItem ? D | undefined : D);
 
     /**
      * Load data callback
@@ -80,10 +82,10 @@ export function SelectEx<
     // Destruct
     const {
         defaultValue,
-        idField,
+        idField = 'id' as D,
         itemIconRenderer,
         label,
-        labelField,
+        labelField = 'label' as D,
         loadData,
         onItemClick,
         onLoadData,

package/src/mu/TableEx.tsx

@@ -47,8 +47,10 @@ export interface TableExMethodRef extends GridMethodRef {
 /**
  * Extended table props
  */
-export interface TableExProps<T extends Record<string, any>>
-    extends TableProps,
+export interface TableExProps<
+    T extends {},
+    D extends DataTypes.Keys<T> = DataTypes.Keys<T>
+> extends TableProps,
         GridLoader<T> {
     /**
      * Alternating colors for odd/even rows
@@ -68,7 +70,7 @@ export interface TableExProps<T extends Record<string, any>>
     /**
      * Id field
      */
-    idField?: string & keyof T;
+    idField?: D;
 
     /**
      * Max height
@@ -101,14 +103,13 @@ export interface TableExProps<T extends Record<string, any>>
  * @param props Props
  * @returns Component
  */
-export function TableEx<T extends Record<string, unknown>>(
-    props: TableExProps<T>
-) {
+export function TableEx<
+    T extends {},
+    D extends DataTypes.Keys<T> = DataTypes.Keys<T>
+>(props: TableExProps<T, D>) {
     // Theme
     const theme = useTheme();
 
-    type keyType = string & keyof T;
-
     // Destruct
     const {
         alternatingColors = [theme.palette.action.hover, undefined],
@@ -116,7 +117,7 @@ export function TableEx<T extends Record<string, unknown>>(
         columns,
         defaultOrderBy,
         headerColors = [undefined, undefined],
-        idField = 'id' as keyType,
+        idField = 'id' as D,
         loadBatchSize,
         loadData,
         maxHeight,
@@ -451,7 +452,10 @@ export function TableEx<T extends Record<string, unknown>>(
                                 : false;
 
                             return (
-                                <TableRow key={rowId} selected={isItemSelected}>
+                                <TableRow
+                                    key={rowId as unknown as React.Key}
+                                    selected={isItemSelected}
+                                >
                                     {selectable && (
                                         <TableCell padding="checkbox">
                                             {row && (
@@ -522,10 +526,7 @@ export function TableEx<T extends Record<string, unknown>>(
 
                                             return (
                                                 <TableCell
-                                                    key={
-                                                        rowId.toString() +
-                                                        columnIndex
-                                                    }
+                                                    key={`${rowId}${columnIndex}`}
                                                     {...cellProps}
                                                 >
                                                     {child}

package/src/mu/Tiplist.tsx

@@ -34,13 +34,14 @@ interface States<T extends {}> {
  * @param props Props
  * @returns Component
  */
-export function Tiplist<T extends {}, D extends DataTypes.Keys<T>>(
-    props: TiplistProps<T, D>
-) {
+export function Tiplist<
+    T extends {} = DataTypes.IdLabelItem,
+    D extends DataTypes.Keys<T> = DataTypes.Keys<T>
+>(props: TiplistProps<T, D>) {
     // Destruct
     const {
         search = false,
-        idField,
+        idField = 'id' as D,
         idValue,
         inputAutoComplete = 'off',
         inputError,
@@ -69,7 +70,8 @@ export function Tiplist<T extends {}, D extends DataTypes.Keys<T>>(
     if (localValue === undefined) localValue = null;
 
     // One time calculation for input's default value (uncontrolled)
-    const localIdValue = idValue ?? (localValue && localValue[idField]);
+    const localIdValue =
+        idValue ?? DataTypes.getValue(localValue, idField ?? 'id');
 
     // Changable states
     const [states, stateUpdate] = React.useReducer(