@etsoo/react 1.5.78 → 1.5.79

package/lib/components/ScrollerGrid.d.ts

@@ -1,4 +1,4 @@
-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';
@@ -16,7 +16,7 @@ export declare type ScrollerGridItemRendererProps<T> = Omit<GridChildComponentPr
 /**
  * Scroller vertical grid props
  */
-export declare type ScrollerGridProps<T extends object, D extends DataTypes.Keys<T> = DataTypes.Keys<T>> = 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
@@ -109,4 +109,4 @@ export interface ScrollerGridForwardRef extends GridMethodRef {
  * @param props Props
  * @returns Component
  */
-export declare const ScrollerGrid: <T extends object, D extends DataTypes.Keys<T, string | number> = DataTypes.Keys<T, string | number>>(props: ScrollerGridProps<T, D>) => 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/mu/AutocompleteExtendedProps.d.ts

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

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 declare type ComboBoxProps<T extends object, D extends DataTypes.Keys<T> = DataTypes.Keys<T>> = 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
      */
@@ -13,6 +13,10 @@ export declare type ComboBoxProps<T extends object, D extends DataTypes.Keys<T>
      * Data readonly
      */
     dataReadonly?: boolean;
+    /**
+     * Label field
+     */
+    labelField?: L;
     /**
      * Load data callback
      */
@@ -25,16 +29,10 @@ export declare type ComboBoxProps<T extends object, D extends DataTypes.Keys<T>
      * Array of options.
      */
     options?: ReadonlyArray<T>;
-} & (T extends {
-    label: string;
-} ? {
-    labelField?: D;
-} : {
-    labelField: D;
-});
+};
 /**
  * ComboBox
  * @param props Props
  * @returns Component
  */
-export declare function ComboBox<T extends object = 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';
@@ -17,7 +17,7 @@ export declare type DataGridExFooterItemRendererProps<T extends object> = {
 /**
  * Extended DataGrid with VariableSizeGrid props
  */
-export declare type DataGridExProps<T extends object, D extends DataTypes.Keys<T> = DataTypes.Keys<T>> = 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
      */
@@ -93,4 +93,4 @@ export declare function DataGridExCalColumns<T>(columns: GridColumn<T>[]): {
  * @param props Props
  * @returns Component
  */
-export declare function DataGridEx<T extends object, 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/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/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 declare type OptionGroupProps<T extends object = DataTypes.IdLabelItem, D extends DataTypes.Keys<T> = DataTypes.Keys<T>> = 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
      */
@@ -13,10 +13,18 @@ export declare type OptionGroupProps<T extends object = DataTypes.IdLabelItem, D
      * Get option label function
      */
     getOptionLabel?: (option: T) => string;
+    /**
+     * Id field
+     */
+    idField?: D;
     /**
      * Label
      */
     label?: string;
+    /**
+     * Label field
+     */
+    labelField?: L;
     /**
      * Multiple choose item
      */
@@ -41,22 +49,10 @@ export declare type OptionGroupProps<T extends object = DataTypes.IdLabelItem, D
      * Display group of elements in a compact row
      */
     row?: boolean;
-} & (T extends {
-    id: DataTypes.IdType;
-} ? {
-    idField?: D;
-} : {
-    idField: D;
-}) & (T extends {
-    label: string;
-} ? {
-    labelField?: D;
-} : {
-    labelField: D;
-});
+};
 /**
  * OptionGroup
  * @param props Props
  * @returns Component
  */
-export declare function OptionGroup<T extends object = 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 declare type ResponsibleContainerProps<T extends object, F extends DataTypes.BasicTemplate = DataTypes.BasicTemplate, D extends DataTypes.Keys<T> = DataTypes.Keys<T>> = 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
@@ -86,4 +86,4 @@ export declare type ResponsibleContainerProps<T extends object, F extends DataTy
  * @param props Props
  * @returns Layout
  */
-export declare function ResponsibleContainer<T extends object, 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;

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';
@@ -34,7 +34,7 @@ export declare type ScrollerListExItemSize = ((index: number) => [number, number
 /**
  * Extended ScrollerList Props
  */
-export declare type ScrollerListExProps<T extends object, D extends DataTypes.Keys<T> = DataTypes.Keys<T>> = 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
      */
@@ -78,4 +78,4 @@ export declare type ScrollerListExProps<T extends object, D extends DataTypes.Ke
  * @param props Props
  * @returns Component
  */
-export declare function ScrollerListEx<T extends object, 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 object = 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,18 +1,26 @@
 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 declare type SelectExProps<T extends object, D extends DataTypes.Keys<T> = DataTypes.Keys<T>> = 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
      */
     autoAddBlankItem?: boolean;
+    /**
+     * Id field
+     */
+    idField?: D;
     /**
      * Item icon renderer
      */
     itemIconRenderer?: (id: unknown) => React.ReactNode;
+    /**
+     * Label field
+     */
+    labelField?: L | ((option: T) => string);
     /**
      * Load data callback
      */
@@ -33,22 +41,10 @@ export declare type SelectExProps<T extends object, D extends DataTypes.Keys<T>
      * Is search case?
      */
     search?: boolean;
-} & (T extends {
-    id: DataTypes.IdType;
-} ? {
-    idField?: D;
-} : {
-    idField: D;
-}) & (T extends {
-    label: string;
-} ? {
-    labelField?: ((option: T) => string) | D;
-} : {
-    labelField: ((option: T) => string) | D;
-});
+};
 /**
  * Extended select component
  * @param props Props
  * @returns Component
  */
-export declare function SelectEx<T extends object = 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/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 declare type TableExProps<T extends object, D extends DataTypes.Keys<T> = DataTypes.Keys<T>> = TableProps & GridLoader<T> & {
+export declare type TableExProps<T extends object, D extends DataTypes.Keys<T>> = TableProps & GridLoader<T> & {
     /**
      * Alternating colors for odd/even rows
      */
@@ -33,6 +33,10 @@ export declare type TableExProps<T extends object, D extends DataTypes.Keys<T> =
      * Header cells background color and font color
      */
     headerColors?: [string?, string?];
+    /**
+     * Id field
+     */
+    idField?: D;
     /**
      * Max height
      */
@@ -53,16 +57,10 @@ export declare type TableExProps<T extends object, D extends DataTypes.Keys<T> =
      * Header and bottom height
      */
     otherHeight?: number;
-} & (T extends {
-    id: DataTypes.IdType;
-} ? {
-    idField?: D;
-} : {
-    idField: D;
-});
+};
 /**
  * Extended Table
  * @param props Props
  * @returns Component
  */
-export declare function TableEx<T extends object, 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,5 +1,5 @@
 /// <reference types="react" />
-import { DataTypes } from '@etsoo/shared';
+import { DataTypes, IdDefaultType, ListType } from '@etsoo/shared';
 import { AutocompleteExtendedProps } from './AutocompleteExtendedProps';
 /**
  * Tiplist props
@@ -15,4 +15,4 @@ export declare type TiplistProps<T extends object, D extends DataTypes.Keys<T>>
  * @param props Props
  * @returns Component
  */
-export declare function Tiplist<T extends object = 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/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 extends object, F extends DataTypes.BasicTemplate = DataTypes.BasicTemplate, D extends DataTypes.Keys<T> = DataTypes.Keys<T>>(props: DataGridPageProps<T, F, D>): 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 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'> & {
+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

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 object, 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 object, 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,4 +4,4 @@ import { SearchPageProps } from './SearchPageProps';
 /**
  * List page props
  */
-export declare type ListPageProps<T extends object, F extends DataTypes.BasicTemplate> = 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 object, F extends DataTypes.BasicTemplate = DataTypes.BasicTemplate, D extends DataTypes.Keys<T> = DataTypes.Keys<T>>(props: ResponsePageProps<T, F, D>): 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 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'> & {
+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
      */

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 object, 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,4 +4,4 @@ import { SearchPageProps } from './SearchPageProps';
 /**
  * Table page props
  */
-export declare type TablePageProps<T extends object, F extends DataTypes.BasicTemplate> = 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/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/react",
-    "version": "1.5.78",
+    "version": "1.5.79",
     "description": "TypeScript ReactJs framework",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",

package/src/components/ScrollerGrid.tsx

@@ -1,4 +1,4 @@
-import { DataTypes } from '@etsoo/shared';
+import { DataTypes, IdDefaultType } from '@etsoo/shared';
 import React from 'react';
 import {
     Align,
@@ -30,7 +30,7 @@ export type ScrollerGridItemRendererProps<T> = Omit<
  */
 export type ScrollerGridProps<
     T extends object,
-    D extends DataTypes.Keys<T> = DataTypes.Keys<T>
+    D extends DataTypes.Keys<T>
 > = GridLoader<T> &
     Omit<
         VariableSizeGridProps<T>,
@@ -149,7 +149,7 @@ export interface ScrollerGridForwardRef extends GridMethodRef {
  */
 export const ScrollerGrid = <
     T extends object,
-    D extends DataTypes.Keys<T> = DataTypes.Keys<T>
+    D extends DataTypes.Keys<T> = IdDefaultType<T>
 >(
     props: ScrollerGridProps<T, D>
 ) => {

package/src/mu/AutocompleteExtendedProps.ts

@@ -12,6 +12,11 @@ export type AutocompleteExtendedProps<
     AutocompleteProps<T, undefined, false, false>,
     'renderInput' | 'options'
 > & {
+    /**
+     * Id field
+     */
+    idField?: D;
+
     /**
      * Id value
      */
@@ -75,10 +80,4 @@ export type AutocompleteExtendedProps<
      * Is search field?
      */
     search?: boolean;
-} & (T extends { id: DataTypes.IdType }
-        ? {
-              idField?: D;
-          }
-        : {
-              idField: D;
-          });
+};