@etsoo/react 1.5.76 → 1.5.79

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (83) hide show
  1. package/lib/app/CommonApp.d.ts +2 -2
  2. package/lib/app/Labels.d.ts +1 -1
  3. package/lib/app/ServiceApp.d.ts +2 -2
  4. package/lib/components/GridColumn.d.ts +10 -10
  5. package/lib/components/GridLoader.d.ts +7 -8
  6. package/lib/components/ScrollerGrid.d.ts +7 -7
  7. package/lib/components/ScrollerList.d.ts +2 -2
  8. package/lib/mu/AutocompleteExtendedProps.d.ts +4 -4
  9. package/lib/mu/ComboBox.d.ts +5 -5
  10. package/lib/mu/ComboBox.js +1 -1
  11. package/lib/mu/DataGridEx.d.ts +6 -5
  12. package/lib/mu/DataGridRenderers.d.ts +1 -1
  13. package/lib/mu/DnDList.d.ts +2 -2
  14. package/lib/mu/ItemList.d.ts +6 -5
  15. package/lib/mu/ItemList.js +4 -12
  16. package/lib/mu/ListMoreDisplay.d.ts +2 -2
  17. package/lib/mu/MUGlobal.d.ts +5 -5
  18. package/lib/mu/OptionGroup.d.ts +10 -11
  19. package/lib/mu/ResponsibleContainer.d.ts +6 -6
  20. package/lib/mu/ScrollerListEx.d.ts +11 -9
  21. package/lib/mu/ScrollerListEx.js +1 -1
  22. package/lib/mu/SearchOptionGroup.d.ts +2 -3
  23. package/lib/mu/SelectBool.d.ts +2 -3
  24. package/lib/mu/SelectBool.js +1 -1
  25. package/lib/mu/SelectEx.d.ts +6 -6
  26. package/lib/mu/SelectEx.js +1 -1
  27. package/lib/mu/TableEx.d.ts +5 -4
  28. package/lib/mu/TableEx.js +1 -2
  29. package/lib/mu/Tiplist.d.ts +4 -4
  30. package/lib/mu/Tiplist.js +2 -4
  31. package/lib/mu/pages/CommonPageProps.d.ts +1 -1
  32. package/lib/mu/pages/DataGridPage.d.ts +2 -2
  33. package/lib/mu/pages/DataGridPageProps.d.ts +3 -3
  34. package/lib/mu/pages/FixedListPage.d.ts +2 -2
  35. package/lib/mu/pages/ListPage.d.ts +2 -2
  36. package/lib/mu/pages/ListPageProps.d.ts +1 -2
  37. package/lib/mu/pages/ResponsivePage.d.ts +2 -2
  38. package/lib/mu/pages/ResponsivePageProps.d.ts +3 -3
  39. package/lib/mu/pages/SearchPageProps.d.ts +2 -2
  40. package/lib/mu/pages/TablePage.d.ts +2 -2
  41. package/lib/mu/pages/TablePageProps.d.ts +1 -2
  42. package/lib/mu/pages/ViewPage.d.ts +5 -4
  43. package/lib/states/IState.d.ts +1 -1
  44. package/lib/uses/useCombinedRefs.d.ts +1 -1
  45. package/package.json +11 -11
  46. package/src/app/CommonApp.ts +2 -2
  47. package/src/app/Labels.ts +1 -1
  48. package/src/app/ServiceApp.ts +2 -2
  49. package/src/components/GridColumn.ts +10 -11
  50. package/src/components/GridLoader.ts +7 -7
  51. package/src/components/ScrollerGrid.tsx +66 -59
  52. package/src/components/ScrollerList.tsx +2 -4
  53. package/src/mu/AutocompleteExtendedProps.ts +9 -9
  54. package/src/mu/ComboBox.tsx +21 -13
  55. package/src/mu/DataGridEx.tsx +19 -18
  56. package/src/mu/DataGridRenderers.tsx +1 -1
  57. package/src/mu/DnDList.tsx +2 -2
  58. package/src/mu/ItemList.tsx +28 -25
  59. package/src/mu/ListMoreDisplay.tsx +2 -2
  60. package/src/mu/MUGlobal.ts +5 -5
  61. package/src/mu/OptionGroup.tsx +30 -23
  62. package/src/mu/ResponsibleContainer.tsx +19 -22
  63. package/src/mu/ScrollerListEx.tsx +25 -21
  64. package/src/mu/SearchOptionGroup.tsx +11 -6
  65. package/src/mu/SelectBool.tsx +7 -12
  66. package/src/mu/SelectEx.tsx +21 -13
  67. package/src/mu/TableEx.tsx +61 -60
  68. package/src/mu/Tiplist.tsx +15 -12
  69. package/src/mu/pages/CommonPageProps.ts +1 -1
  70. package/src/mu/pages/DataGridPage.tsx +15 -11
  71. package/src/mu/pages/DataGridPageProps.ts +17 -14
  72. package/src/mu/pages/FixedListPage.tsx +6 -5
  73. package/src/mu/pages/ListPage.tsx +6 -5
  74. package/src/mu/pages/ListPageProps.ts +5 -3
  75. package/src/mu/pages/ResponsivePage.tsx +6 -5
  76. package/src/mu/pages/ResponsivePageProps.ts +10 -7
  77. package/src/mu/pages/SearchPageProps.ts +5 -3
  78. package/src/mu/pages/TablePage.tsx +6 -5
  79. package/src/mu/pages/TablePageProps.ts +5 -3
  80. package/src/mu/pages/ViewPage.tsx +8 -6
  81. package/src/states/IState.ts +1 -1
  82. package/src/states/UserState.ts +1 -1
  83. package/src/uses/useCombinedRefs.ts +3 -3
@@ -28,12 +28,12 @@ export declare abstract class CommonApp<U extends IUser = IUser, P extends IPage
28
28
  * Refresh token
29
29
  * @param props Props
30
30
  */
31
- refreshToken<D = RefreshTokenRQ>(props?: RefreshTokenProps<D>): Promise<boolean>;
31
+ refreshToken<D extends object = RefreshTokenRQ>(props?: RefreshTokenProps<D>): Promise<boolean>;
32
32
  /**
33
33
  * Try login
34
34
  * @param data Additional data
35
35
  * @param showLoading Show loading bar or not
36
36
  * @returns Result
37
37
  */
38
- tryLogin<D = RefreshTokenRQ>(data?: D, showLoading?: boolean): Promise<boolean>;
38
+ tryLogin<D extends object = RefreshTokenRQ>(data?: D, showLoading?: boolean): Promise<boolean>;
39
39
  }
@@ -61,5 +61,5 @@ export declare namespace Labels {
61
61
  * @param labels Labels
62
62
  * @param reference Key reference
63
63
  */
64
- const setLabels: (labels: {}, reference?: setLabelsReference) => void;
64
+ const setLabels: (labels: DataTypes.StringRecord, reference?: setLabelsReference) => void;
65
65
  }
@@ -45,7 +45,7 @@ export declare class ServiceApp<U extends IServiceUser = IServiceUser, P extends
45
45
  * Refresh token
46
46
  * @param props Props
47
47
  */
48
- refreshToken<D = RefreshTokenRQ>(props?: RefreshTokenProps<D>): Promise<boolean>;
48
+ refreshToken<D extends object = RefreshTokenRQ>(props?: RefreshTokenProps<D>): Promise<boolean>;
49
49
  /**
50
50
  * Service decrypt message
51
51
  * @param messageEncrypted Encrypted message
@@ -67,7 +67,7 @@ export declare class ServiceApp<U extends IServiceUser = IServiceUser, P extends
67
67
  * @param showLoading Show loading bar or not
68
68
  * @returns Result
69
69
  */
70
- tryLogin<D extends {} = {}>(data?: D, showLoading?: boolean): Promise<boolean>;
70
+ tryLogin<D extends object = {}>(data?: D, showLoading?: boolean): Promise<boolean>;
71
71
  /**
72
72
  * User login extended
73
73
  * @param user Core system user
@@ -23,7 +23,7 @@ export declare type GridCellValueType = string | number | Date | boolean | undef
23
23
  /**
24
24
  * Grid cell formatter props
25
25
  */
26
- export interface GridCellFormatterProps<T> {
26
+ export declare type GridCellFormatterProps<T> = {
27
27
  /**
28
28
  * Current data
29
29
  */
@@ -40,11 +40,11 @@ export interface GridCellFormatterProps<T> {
40
40
  * Column index
41
41
  */
42
42
  columnIndex: number;
43
- }
43
+ };
44
44
  /**
45
45
  * Grid cell renderer props
46
46
  */
47
- export interface GridCellRendererProps<T, P = any> extends GridCellFormatterProps<T> {
47
+ export declare type GridCellRendererProps<T, P = any> = GridCellFormatterProps<T> & {
48
48
  /**
49
49
  * Cell props
50
50
  */
@@ -65,11 +65,11 @@ export interface GridCellRendererProps<T, P = any> extends GridCellFormatterProp
65
65
  * Render props
66
66
  */
67
67
  renderProps?: GridColumnRenderProps;
68
- }
68
+ };
69
69
  /**
70
70
  * Grid header cell renderer props
71
71
  */
72
- export interface GridHeaderCellRendererProps<T, P = any> {
72
+ export declare type GridHeaderCellRendererProps<T, P = any> = {
73
73
  /**
74
74
  * Cell props
75
75
  */
@@ -86,11 +86,11 @@ export interface GridHeaderCellRendererProps<T, P = any> {
86
86
  * States
87
87
  */
88
88
  states: GridLoaderStates<T>;
89
- }
89
+ };
90
90
  /**
91
91
  * Grid column render props
92
92
  */
93
- export interface GridColumnRenderProps {
93
+ export declare type GridColumnRenderProps = {
94
94
  /**
95
95
  * Culture, like zh-CN
96
96
  */
@@ -115,11 +115,11 @@ export interface GridColumnRenderProps {
115
115
  * Additional data
116
116
  */
117
117
  readonly data?: Readonly<Record<string, any>>;
118
- }
118
+ };
119
119
  /**
120
120
  * Grid column
121
121
  */
122
- export interface GridColumn<T> {
122
+ export declare type GridColumn<T> = {
123
123
  /**
124
124
  * The column identifier. It's used to map with row data
125
125
  */
@@ -169,4 +169,4 @@ export interface GridColumn<T> {
169
169
  * Header cell renderer
170
170
  */
171
171
  headerCellRenderer?: (props: GridHeaderCellRendererProps<T>) => React.ReactNode;
172
- }
172
+ };
@@ -22,12 +22,11 @@ export declare function GridDataGet<F extends DataTypes.BasicTemplate>(props: Gr
22
22
  /**
23
23
  * Grid Json data
24
24
  */
25
- export interface GridJsonData extends Omit<GridLoadDataProps, 'data'> {
26
- }
25
+ export declare type GridJsonData = Omit<GridLoadDataProps, 'data'>;
27
26
  /**
28
27
  * Grid data load props
29
28
  */
30
- export interface GridLoadDataProps {
29
+ export declare type GridLoadDataProps = {
31
30
  /**
32
31
  * Current page
33
32
  */
@@ -48,11 +47,11 @@ export interface GridLoadDataProps {
48
47
  * Data related
49
48
  */
50
49
  data?: GridData;
51
- }
50
+ };
52
51
  /**
53
52
  * Grid data loader
54
53
  */
55
- export interface GridLoader<T> {
54
+ export declare type GridLoader<T extends object> = {
56
55
  /**
57
56
  * Auto load data, otherwise call reset
58
57
  * @default true
@@ -74,11 +73,11 @@ export interface GridLoader<T> {
74
73
  * Threshold at which to pre-fetch data; default is half of loadBatchSize
75
74
  */
76
75
  threshold?: number | undefined;
77
- }
76
+ };
78
77
  /**
79
78
  * Grid loader states
80
79
  */
81
- export interface GridLoaderStates<T> extends GridLoadDataProps {
80
+ export declare type GridLoaderStates<T> = GridLoadDataProps & {
82
81
  /**
83
82
  * Auto load data, otherwise call reset
84
83
  * @default true
@@ -108,4 +107,4 @@ export interface GridLoaderStates<T> extends GridLoadDataProps {
108
107
  * Selected items of id
109
108
  */
110
109
  selectedItems: T[];
111
- }
110
+ };
@@ -1,8 +1,9 @@
1
+ import { DataTypes, IdDefaultType } from '@etsoo/shared';
1
2
  import React from 'react';
2
3
  import { Align, GridChildComponentProps, VariableSizeGridProps } from 'react-window';
3
4
  import { GridMethodRef } from '../mu/GridMethodRef';
4
5
  import { GridLoader, GridLoaderStates } from './GridLoader';
5
- export interface ScrollerGridItemRendererProps<T> extends Omit<GridChildComponentProps<T>, 'data'> {
6
+ export declare type ScrollerGridItemRendererProps<T> = Omit<GridChildComponentProps<T>, 'data'> & {
6
7
  /**
7
8
  * Selected items
8
9
  */
@@ -11,11 +12,11 @@ export interface ScrollerGridItemRendererProps<T> extends Omit<GridChildComponen
11
12
  * Data
12
13
  */
13
14
  data?: T;
14
- }
15
+ };
15
16
  /**
16
17
  * Scroller vertical grid props
17
18
  */
18
- export interface ScrollerGridProps<T> extends GridLoader<T>, Omit<VariableSizeGridProps<T>, 'children' | 'rowCount' | 'rowHeight' | 'ref'> {
19
+ export declare type ScrollerGridProps<T extends object, D extends DataTypes.Keys<T>> = GridLoader<T> & Omit<VariableSizeGridProps<T>, 'children' | 'rowCount' | 'rowHeight' | 'ref'> & {
19
20
  /**
20
21
  * Default order by asc
21
22
  * @default true
@@ -31,9 +32,8 @@ export interface ScrollerGridProps<T> extends GridLoader<T>, Omit<VariableSizeGr
31
32
  headerRenderer?: (states: GridLoaderStates<T>) => React.ReactNode;
32
33
  /**
33
34
  * Id field
34
- * @default id
35
35
  */
36
- idField?: string & keyof T;
36
+ idField?: D;
37
37
  /**
38
38
  * Item renderer
39
39
  */
@@ -50,7 +50,7 @@ export interface ScrollerGridProps<T> extends GridLoader<T>, Omit<VariableSizeGr
50
50
  * Returns the height of the specified row.
51
51
  */
52
52
  rowHeight?: ((index: number) => number) | number;
53
- }
53
+ };
54
54
  /**
55
55
  * Scroller grid forward ref
56
56
  */
@@ -109,4 +109,4 @@ export interface ScrollerGridForwardRef extends GridMethodRef {
109
109
  * @param props Props
110
110
  * @returns Component
111
111
  */
112
- export declare const ScrollerGrid: <T extends Record<string, unknown>>(props: ScrollerGridProps<T>) => JSX.Element;
112
+ export declare const ScrollerGrid: <T extends object, D extends DataTypes.Keys<T, string | number> = IdDefaultType<T>>(props: ScrollerGridProps<T, D>) => JSX.Element;
@@ -5,7 +5,7 @@ import { GridLoader } from './GridLoader';
5
5
  /**
6
6
  * Scroller vertical list props
7
7
  */
8
- export interface ScrollerListProps<T> extends GridLoader<T>, Omit<ListProps<T>, 'ref' | 'outerRef' | 'height' | 'width' | 'children' | 'itemCount'> {
8
+ export interface ScrollerListProps<T extends object> extends GridLoader<T>, Omit<ListProps<T>, 'ref' | 'outerRef' | 'height' | 'width' | 'children' | 'itemCount'> {
9
9
  /**
10
10
  * Default order by asc/desc
11
11
  */
@@ -59,5 +59,5 @@ export interface ScrollerListForwardRef extends GridMethodRef, ScrollerListRef {
59
59
  * @param props Props
60
60
  * @returns Component
61
61
  */
62
- export declare const ScrollerList: <T extends Record<string, any>>(props: ScrollerListProps<T>) => JSX.Element;
62
+ export declare const ScrollerList: <T extends object>(props: ScrollerListProps<T>) => JSX.Element;
63
63
  export {};
@@ -4,11 +4,11 @@ import { ChangeEventHandler } from 'react';
4
4
  /**
5
5
  * Autocomplete extended props
6
6
  */
7
- export interface AutocompleteExtendedProps<T extends {}, D extends DataTypes.Keys<T>> extends Omit<AutocompleteProps<T, undefined, false, false>, 'renderInput' | 'options'> {
7
+ export declare type AutocompleteExtendedProps<T extends object, D extends DataTypes.Keys<T>> = Omit<AutocompleteProps<T, undefined, false, false>, 'renderInput' | 'options'> & {
8
8
  /**
9
- * Id field, default is id
9
+ * Id field
10
10
  */
11
- idField: D;
11
+ idField?: D;
12
12
  /**
13
13
  * Id value
14
14
  */
@@ -61,4 +61,4 @@ export interface AutocompleteExtendedProps<T extends {}, D extends DataTypes.Key
61
61
  * Is search field?
62
62
  */
63
63
  search?: boolean;
64
- }
64
+ };
@@ -1,10 +1,10 @@
1
1
  /// <reference types="react" />
2
- import { DataTypes } from '@etsoo/shared';
2
+ import { DataTypes, IdDefaultType, LabelDefaultType, ListType } from '@etsoo/shared';
3
3
  import { AutocompleteExtendedProps } from './AutocompleteExtendedProps';
4
4
  /**
5
5
  * ComboBox props
6
6
  */
7
- export interface ComboBoxProps<T extends {}, D extends DataTypes.Keys<T> = DataTypes.Keys<T>> extends AutocompleteExtendedProps<T, D> {
7
+ export declare type ComboBoxProps<T extends object, D extends DataTypes.Keys<T>, L extends DataTypes.Keys<T, string>> = AutocompleteExtendedProps<T, D> & {
8
8
  /**
9
9
  * Auto add blank item
10
10
  */
@@ -16,7 +16,7 @@ export interface ComboBoxProps<T extends {}, D extends DataTypes.Keys<T> = DataT
16
16
  /**
17
17
  * Label field
18
18
  */
19
- labelField: D;
19
+ labelField?: L;
20
20
  /**
21
21
  * Load data callback
22
22
  */
@@ -29,10 +29,10 @@ export interface ComboBoxProps<T extends {}, D extends DataTypes.Keys<T> = DataT
29
29
  * Array of options.
30
30
  */
31
31
  options?: ReadonlyArray<T>;
32
- }
32
+ };
33
33
  /**
34
34
  * ComboBox
35
35
  * @param props Props
36
36
  * @returns Component
37
37
  */
38
- export declare function ComboBox<T extends {} = DataTypes.IdLabelItem, D extends DataTypes.Keys<T> = DataTypes.Keys<T>>(props: ComboBoxProps<T, D>): JSX.Element;
38
+ 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;
@@ -12,7 +12,7 @@ import { ReactUtils } from '../app/ReactUtils';
12
12
  */
13
13
  export function ComboBox(props) {
14
14
  // Destruct
15
- 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;
15
+ 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;
16
16
  // Value input ref
17
17
  const inputRef = React.createRef();
18
18
  // Options state
@@ -1,3 +1,4 @@
1
+ import { DataTypes, IdDefaultType } from '@etsoo/shared';
1
2
  import React from 'react';
2
3
  import { GridColumn } from '../components/GridColumn';
3
4
  import { GridLoaderStates } from '../components/GridLoader';
@@ -6,17 +7,17 @@ import { MouseEventWithDataHandler } from './MUGlobal';
6
7
  /**
7
8
  * Footer item renderer props
8
9
  */
9
- export interface DataGridExFooterItemRendererProps<T extends Record<string, any>> {
10
+ export declare type DataGridExFooterItemRendererProps<T extends object> = {
10
11
  column: GridColumn<T>;
11
12
  index: number;
12
13
  states: GridLoaderStates<T>;
13
14
  cellProps: any;
14
15
  checkable: boolean;
15
- }
16
+ };
16
17
  /**
17
18
  * Extended DataGrid with VariableSizeGrid props
18
19
  */
19
- export interface DataGridExProps<T extends Record<string, any>> extends Omit<ScrollerGridProps<T>, 'itemRenderer' | 'columnCount' | 'columnWidth' | 'width'> {
20
+ export declare type DataGridExProps<T extends object, D extends DataTypes.Keys<T>> = Omit<ScrollerGridProps<T, D>, 'itemRenderer' | 'columnCount' | 'columnWidth' | 'width'> & {
20
21
  /**
21
22
  * Alternating colors for odd/even rows
22
23
  */
@@ -77,7 +78,7 @@ export interface DataGridExProps<T extends Record<string, any>> extends Omit<Scr
77
78
  * Width
78
79
  */
79
80
  width?: number;
80
- }
81
+ };
81
82
  /**
82
83
  * Extended datagrid columns calculation
83
84
  * @param columns
@@ -92,4 +93,4 @@ export declare function DataGridExCalColumns<T>(columns: GridColumn<T>[]): {
92
93
  * @param props Props
93
94
  * @returns Component
94
95
  */
95
- export declare function DataGridEx<T extends Record<string, any>>(props: DataGridExProps<T>): JSX.Element;
96
+ export declare function DataGridEx<T extends object, D extends DataTypes.Keys<T> = IdDefaultType<T>>(props: DataGridExProps<T, D>): JSX.Element;
@@ -18,5 +18,5 @@ export declare namespace DataGridRenderers {
18
18
  * @param location Renderer location (column index)
19
19
  * @returns Component
20
20
  */
21
- function defaultFooterItemRenderer<T>(_rows: T[], { index, states, checkable }: DataGridExFooterItemRendererProps<T>, location?: number): string | undefined;
21
+ function defaultFooterItemRenderer<T extends object>(_rows: T[], { index, states, checkable }: DataGridExFooterItemRendererProps<T>, location?: number): string | undefined;
22
22
  }
@@ -17,7 +17,7 @@ export declare const DnDItemStyle: (index: number, isDragging: boolean, theme: T
17
17
  /**
18
18
  * DnD list forward ref
19
19
  */
20
- export interface DnDListRef<D extends {}> {
20
+ export interface DnDListRef<D extends object> {
21
21
  /**
22
22
  * Add item
23
23
  * @param item New item
@@ -43,7 +43,7 @@ export interface DnDListRef<D extends {}> {
43
43
  /**
44
44
  * DnD sortable list properties
45
45
  */
46
- export interface DnDListPros<D extends {}, K extends DataTypes.Keys<D>> {
46
+ export interface DnDListPros<D extends object, K extends DataTypes.Keys<D>> {
47
47
  /**
48
48
  * Get list item style callback
49
49
  */
@@ -1,8 +1,9 @@
1
1
  import React from 'react';
2
+ import { DataTypes, IdDefaultType, LabelDefaultType, ListType } from '@etsoo/shared';
2
3
  /**
3
4
  * Item list properties
4
5
  */
5
- export interface ItemListProps<T extends Record<string, unknown>> {
6
+ export interface ItemListProps<T extends object, D extends DataTypes.Keys<T>, L extends DataTypes.Keys<T, string>> {
6
7
  /**
7
8
  * Style class name
8
9
  */
@@ -10,11 +11,11 @@ export interface ItemListProps<T extends Record<string, unknown>> {
10
11
  /**
11
12
  * Id field name
12
13
  */
13
- idField?: string & keyof T;
14
+ idField?: D;
14
15
  /**
15
16
  * Label field name or callback
16
17
  */
17
- labelField?: (string & keyof T) | ((item: T) => string);
18
+ labelField?: L | ((item: T) => string);
18
19
  /**
19
20
  * Button icon
20
21
  */
@@ -30,7 +31,7 @@ export interface ItemListProps<T extends Record<string, unknown>> {
30
31
  /**
31
32
  * Current selected language
32
33
  */
33
- selectedValue?: string;
34
+ selectedValue?: T[D];
34
35
  /**
35
36
  * Button size
36
37
  */
@@ -52,4 +53,4 @@ export interface ItemListProps<T extends Record<string, unknown>> {
52
53
  * Item list component
53
54
  * @param props Properties
54
55
  */
55
- export declare function ItemList<T extends Record<string, unknown> = Record<string, unknown>>(props: ItemListProps<T>): JSX.Element;
56
+ 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;
@@ -1,5 +1,5 @@
1
1
  import React from 'react';
2
- import { Dialog, DialogTitle, List, ListItem, ListItemText, DialogContent, Button } from '@mui/material';
2
+ import { Dialog, DialogTitle, List, ListItemText, DialogContent, Button, ListItemButton } from '@mui/material';
3
3
  import { DataTypes } from '@etsoo/shared';
4
4
  /**
5
5
  * Item list component
@@ -9,14 +9,6 @@ export function ItemList(props) {
9
9
  var _a;
10
10
  // properties destructure
11
11
  const { className, color = 'primary', items, idField = 'id', labelField = 'label', icon, onClose, selectedValue, size = 'medium', title, variant = 'outlined' } = props;
12
- // Get id
13
- const getId = (item) => {
14
- var _a;
15
- const id = item[idField];
16
- if (typeof id === 'number')
17
- return id;
18
- return (_a = DataTypes.convert(id, 'string')) !== null && _a !== void 0 ? _a : '';
19
- };
20
12
  // Get label
21
13
  const getLabel = (item) => {
22
14
  var _a;
@@ -30,7 +22,7 @@ export function ItemList(props) {
30
22
  // Dialog open or not state
31
23
  const [open, setOpen] = React.useState(false);
32
24
  // Default state
33
- const defaultItem = (_a = items.find((item) => getId(item) === selectedValue)) !== null && _a !== void 0 ? _a : items[0];
25
+ const defaultItem = (_a = items.find((item) => item[idField] === selectedValue)) !== null && _a !== void 0 ? _a : items[0];
34
26
  // Current item
35
27
  const [currentItem, setCurrentItem] = React.useState(defaultItem);
36
28
  // Click handler
@@ -70,8 +62,8 @@ export function ItemList(props) {
70
62
  React.createElement(DialogTitle, { sx: { minWidth: '200px' }, id: "dialog-title" }, title || ''),
71
63
  React.createElement(DialogContent, null,
72
64
  React.createElement(List, null, items.map((item) => {
73
- const id = getId(item);
74
- return (React.createElement(ListItem, { button: true, key: id, disabled: id === getId(currentItem), onClick: () => closeItemHandler(item) },
65
+ const id = item[idField];
66
+ return (React.createElement(ListItemButton, { key: id, disabled: id === currentItem[idField], onClick: () => closeItemHandler(item) },
75
67
  React.createElement(ListItemText, null, getLabel(item))));
76
68
  }))))));
77
69
  }
@@ -5,7 +5,7 @@ import { GridData, GridLoader } from '../components/GridLoader';
5
5
  /**
6
6
  * ListMoreDisplay props
7
7
  */
8
- export interface ListMoreDisplayProps<T, F extends DataTypes.BasicTemplate = DataTypes.BasicTemplate> extends Omit<CardProps, 'children'>, GridLoader<T> {
8
+ export interface ListMoreDisplayProps<T extends object, F extends DataTypes.BasicTemplate = DataTypes.BasicTemplate> extends Omit<CardProps, 'children'>, GridLoader<T> {
9
9
  /**
10
10
  * Children to display the list
11
11
  */
@@ -32,4 +32,4 @@ export interface ListMoreDisplayProps<T, F extends DataTypes.BasicTemplate = Dat
32
32
  * @param props Props
33
33
  * @returns Component
34
34
  */
35
- export declare function ListMoreDisplay<T extends {}, F extends DataTypes.BasicTemplate = DataTypes.BasicTemplate>(props: ListMoreDisplayProps<T, F>): JSX.Element;
35
+ export declare function ListMoreDisplay<T extends object, F extends DataTypes.BasicTemplate = DataTypes.BasicTemplate>(props: ListMoreDisplayProps<T, F>): JSX.Element;
@@ -55,13 +55,13 @@ export declare class MUGlobal {
55
55
  * @param input Input object
56
56
  * @returns Updated object
57
57
  */
58
- static half(input: {}): {};
58
+ static half(input: object): {};
59
59
  /**
60
60
  * Reverse object number properties, like 5 to -5
61
61
  * @param input Input object
62
62
  * @returns Updated object
63
63
  */
64
- static reverse(input: {}): {};
64
+ static reverse(input: object): {};
65
65
  /**
66
66
  * Update object number properties with adjustment
67
67
  * @param input Input object
@@ -69,7 +69,7 @@ export declare class MUGlobal {
69
69
  * @param field Specific field
70
70
  * @returns Updated object
71
71
  */
72
- static increase(input: {}, adjust: number | {}, field?: string): {};
72
+ static increase(input: object, adjust: number | object, field?: string): {};
73
73
  /**
74
74
  * Adjust size with theme update
75
75
  * @param size Base size
@@ -77,7 +77,7 @@ export declare class MUGlobal {
77
77
  * @param updateFunc Theme update function
78
78
  * @returns Updated object
79
79
  */
80
- static adjustWithTheme(size: number, adjust: {}, updateFunc: (value: number) => string): {};
80
+ static adjustWithTheme(size: number, adjust: object, updateFunc: (value: number) => string): {};
81
81
  /**
82
82
  * Break points defined
83
83
  */
@@ -91,7 +91,7 @@ export declare class MUGlobal {
91
91
  * @param theme Theme
92
92
  * @returns Result
93
93
  */
94
- static getSpace(spaces: {}, theme: Theme): number;
94
+ static getSpace(spaces: object, theme: Theme): number;
95
95
  /**
96
96
  * Update object number properties with theme
97
97
  * @param input Input object
@@ -1,31 +1,30 @@
1
1
  /// <reference types="react" />
2
- import { IdLabelDto } from '@etsoo/appscript';
3
- import { DataTypes } from '@etsoo/shared';
2
+ import { DataTypes, IdDefaultType, LabelDefaultType, ListType } from '@etsoo/shared';
4
3
  import { FormControlProps } from '@mui/material';
5
4
  /**
6
5
  * OptionGroup props
7
6
  */
8
- export interface OptionGroupProps<T extends Record<string, any> = IdLabelDto, D extends DataTypes.IdType = string> extends Omit<FormControlProps<'fieldset'>, 'defaultValue'> {
7
+ export declare type OptionGroupProps<T extends object, D extends DataTypes.Keys<T>, L extends DataTypes.Keys<T, string>> = Omit<FormControlProps<'fieldset'>, 'defaultValue'> & {
9
8
  /**
10
9
  * Default value
11
10
  */
12
- defaultValue?: D | D[];
11
+ defaultValue?: T[D] | T[D][];
13
12
  /**
14
13
  * Get option label function
15
14
  */
16
15
  getOptionLabel?: (option: T) => string;
17
16
  /**
18
- * Id field, default is id
17
+ * Id field
19
18
  */
20
- idField?: string & keyof T;
19
+ idField?: D;
21
20
  /**
22
21
  * Label
23
22
  */
24
23
  label?: string;
25
24
  /**
26
- * Label field, default is label
25
+ * Label field
27
26
  */
28
- labelField?: string & keyof T;
27
+ labelField?: L;
29
28
  /**
30
29
  * Multiple choose item
31
30
  */
@@ -37,7 +36,7 @@ export interface OptionGroupProps<T extends Record<string, any> = IdLabelDto, D
37
36
  /**
38
37
  * On value change handler
39
38
  */
40
- onValueChange?: (value: D | D[] | undefined) => void;
39
+ onValueChange?: (value: T[D] | T[D][] | undefined) => void;
41
40
  /**
42
41
  * Array of options.
43
42
  */
@@ -50,10 +49,10 @@ export interface OptionGroupProps<T extends Record<string, any> = IdLabelDto, D
50
49
  * Display group of elements in a compact row
51
50
  */
52
51
  row?: boolean;
53
- }
52
+ };
54
53
  /**
55
54
  * OptionGroup
56
55
  * @param props Props
57
56
  * @returns Component
58
57
  */
59
- export declare function OptionGroup<T extends Record<string, unknown> = IdLabelDto, D extends DataTypes.IdType = string>(props: OptionGroupProps<T, D>): JSX.Element;
58
+ 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;
@@ -1,4 +1,4 @@
1
- import { DataTypes } from '@etsoo/shared';
1
+ import { DataTypes, IdDefaultType } from '@etsoo/shared';
2
2
  import { SxProps, Theme } from '@mui/material';
3
3
  import React from 'react';
4
4
  import { ListChildComponentProps } from 'react-window';
@@ -10,7 +10,7 @@ import { ScrollerListExInnerItemRendererProps, ScrollerListExItemSize } from './
10
10
  /**
11
11
  * ResponsibleContainer props
12
12
  */
13
- export interface ResponsibleContainerProps<T extends {}, F extends DataTypes.BasicTemplate = DataTypes.BasicTemplate> extends Omit<DataGridExProps<T>, 'height' | 'itemKey' | 'loadData' | 'mRef' | 'onScroll' | 'onItemsRendered'> {
13
+ 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'> & {
14
14
  /**
15
15
  * Height will be deducted
16
16
  * @param height Current calcuated height
@@ -23,7 +23,7 @@ export interface ResponsibleContainerProps<T extends {}, F extends DataTypes.Bas
23
23
  /**
24
24
  * Container box SX (dataGrid determines the case)
25
25
  */
26
- containerBoxSx?: (paddings: {}, hasFields: boolean, dataGrid?: boolean) => SxProps<Theme>;
26
+ containerBoxSx?: (paddings: Record<string, string | number>, hasFields: boolean, dataGrid?: boolean) => SxProps<Theme>;
27
27
  /**
28
28
  * Min width to show Datagrid
29
29
  */
@@ -67,7 +67,7 @@ export interface ResponsibleContainerProps<T extends {}, F extends DataTypes.Bas
67
67
  /**
68
68
  * Paddings
69
69
  */
70
- paddings?: {};
70
+ paddings?: Record<string, string | number>;
71
71
  /**
72
72
  * Pull to refresh data
73
73
  */
@@ -80,10 +80,10 @@ export interface ResponsibleContainerProps<T extends {}, F extends DataTypes.Bas
80
80
  * Size ready to read miliseconds span
81
81
  */
82
82
  sizeReadyMiliseconds?: number;
83
- }
83
+ };
84
84
  /**
85
85
  * Responsible container
86
86
  * @param props Props
87
87
  * @returns Layout
88
88
  */
89
- export declare function ResponsibleContainer<T extends {}, F extends DataTypes.BasicTemplate = DataTypes.BasicTemplate>(props: ResponsibleContainerProps<T, F>): JSX.Element;
89
+ 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;