@etsoo/react 1.4.75 → 1.4.76

package/lib/components/ScrollerGrid.d.ts

@@ -33,7 +33,7 @@ export interface ScrollerGridProps<T> extends GridLoader<T>, Omit<VariableSizeGr
      * Id field
      * @default id
      */
-    idField?: keyof T;
+    idField?: string & keyof T;
     /**
      * Item renderer
      */

package/lib/mu/AutocompleteExtendedProps.d.ts

@@ -8,7 +8,7 @@ export interface AutocompleteExtendedProps<T extends Record<string, unknown>> ex
     /**
      * Id field, default is id
      */
-    idField?: keyof T;
+    idField?: string & keyof T;
     /**
      * Id value
      */

package/lib/mu/ComboBox.d.ts

@@ -12,7 +12,7 @@ export interface ComboBoxProps<T extends {}> extends AutocompleteExtendedProps<T
     /**
      * Label field
      */
-    labelField?: keyof T;
+    labelField?: string & keyof T;
     /**
      * Load data callback
      */

package/lib/mu/DnDList.d.ts

@@ -31,7 +31,7 @@ export interface DnDListProps<D extends {}, E extends React.ElementType> {
     /**
      * Label field
      */
-    labelField: keyof D;
+    labelField: string & keyof D;
     /**
      * Load data
      */

package/lib/mu/ItemList.d.ts

@@ -10,11 +10,11 @@ export interface ItemListProps<T extends Record<string, unknown>> {
     /**
      * Id field name
      */
-    idField?: keyof T;
+    idField?: string & keyof T;
     /**
      * Label field name or callback
      */
-    labelField?: keyof T | ((item: T) => string);
+    labelField?: (string & keyof T) | ((item: T) => string);
     /**
      * Button icon
      */

package/lib/mu/OptionGroup.d.ts

@@ -17,7 +17,7 @@ export interface OptionGroupProps<T extends Record<string, any> = IdLabelDto, D
     /**
      * Id field, default is id
      */
-    idField?: keyof T;
+    idField?: string & keyof T;
     /**
      * Label
      */
@@ -25,7 +25,7 @@ export interface OptionGroupProps<T extends Record<string, any> = IdLabelDto, D
     /**
      * Label field, default is label
      */
-    labelField?: keyof T;
+    labelField?: string & keyof T;
     /**
      * Multiple choose item
      */

package/lib/mu/ScrollerListEx.d.ts

@@ -40,7 +40,7 @@ export interface ScrollerListExProps<T> extends Omit<ScrollerListProps<T>, 'item
     /**
      * Id field
      */
-    idField?: keyof T;
+    idField?: string & keyof T;
     /**
      * Inner item renderer
      */

package/lib/mu/SelectEx.d.ts

@@ -8,7 +8,7 @@ export interface SelectExProps<T extends {}> extends Omit<SelectProps, 'labelId'
     /**
      * Id field, default is id
      */
-    idField?: keyof T;
+    idField?: string & keyof T;
     /**
      * Item icon renderer
      */
@@ -16,7 +16,7 @@ export interface SelectExProps<T extends {}> extends Omit<SelectProps, 'labelId'
     /**
      * Label field, default is label
      */
-    labelField?: ((option: T) => string) | keyof T;
+    labelField?: ((option: T) => string) | (string & keyof T);
     /**
      * Load data callback
      */

package/lib/mu/TableEx.d.ts

@@ -35,7 +35,7 @@ export interface TableExProps<T extends Record<string, any>> extends TableProps,
     /**
      * Id field
      */
-    idField?: keyof T;
+    idField?: string & keyof T;
     /**
      * Max height
      */

package/lib/mu/Tiplist.js

@@ -10,7 +10,6 @@ import { SearchField } from './SearchField';
  * @returns Component
  */
 export function Tiplist(props) {
-    var _a;
     // Destruct
     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
@@ -30,6 +29,8 @@ export function Tiplist(props) {
         options: [],
         value: null
     });
+    // Input value
+    const inputValue = React.useMemo(() => states.value && Reflect.get(states.value, idField), [states.value]);
     React.useEffect(() => {
         if (localValue != null)
             stateUpdate({ value: localValue });
@@ -134,7 +135,7 @@ export function Tiplist(props) {
     }, []);
     // Layout
     return (React.createElement("div", null,
-        React.createElement("input", { ref: inputRef, "data-reset": "true", type: "text", style: { display: 'none' }, name: name, value: (_a = (states.value && Reflect.get(states.value, idField))) !== null && _a !== void 0 ? _a : '', readOnly: true, onChange: inputOnChange }),
+        React.createElement("input", { ref: inputRef, "data-reset": "true", type: "text", style: { display: 'none' }, name: name, value: inputValue !== null && inputValue !== void 0 ? inputValue : '', readOnly: true, onChange: inputOnChange }),
         React.createElement(Autocomplete, { filterOptions: (options, _state) => options, value: states.value, options: states.options, onChange: (event, value, reason, details) => {
                 // Set value
                 setInputValue(value);

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

@@ -9,7 +9,7 @@ export interface ViewPageField<T extends {}> extends GridProps {
     /**
      * Data field
      */
-    data: keyof T | ((item: T) => React.ReactNode);
+    data: (string & keyof T) | ((item: T) => React.ReactNode);
     /**
      * Data type
      */

package/package.json

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

package/src/components/ScrollerGrid.tsx

@@ -54,7 +54,7 @@ export interface ScrollerGridProps<T>
      * Id field
      * @default id
      */
-    idField?: keyof T;
+    idField?: string & keyof T;
 
     /**
      * Item renderer

package/src/mu/AutocompleteExtendedProps.ts

@@ -13,7 +13,7 @@ export interface AutocompleteExtendedProps<T extends Record<string, unknown>>
     /**
      * Id field, default is id
      */
-    idField?: keyof T;
+    idField?: string & keyof T;
 
     /**
      * Id value

package/src/mu/ComboBox.tsx

@@ -20,7 +20,7 @@ export interface ComboBoxProps<T extends {}>
     /**
      * Label field
      */
-    labelField?: keyof T;
+    labelField?: string & keyof T;
 
     /**
      * Load data callback

package/src/mu/DnDList.tsx

@@ -50,7 +50,7 @@ export interface DnDListProps<D extends {}, E extends React.ElementType> {
     /**
      * Label field
      */
-    labelField: keyof D;
+    labelField: string & keyof D;
 
     /**
      * Load data

package/src/mu/ItemList.tsx

@@ -22,12 +22,12 @@ export interface ItemListProps<T extends Record<string, unknown>> {
     /**
      * Id field name
      */
-    idField?: keyof T;
+    idField?: string & keyof T;
 
     /**
      * Label field name or callback
      */
-    labelField?: keyof T | ((item: T) => string);
+    labelField?: (string & keyof T) | ((item: T) => string);
 
     /**
      * Button icon

package/src/mu/OptionGroup.tsx

@@ -32,7 +32,7 @@ export interface OptionGroupProps<
     /**
      * Id field, default is id
      */
-    idField?: keyof T;
+    idField?: string & keyof T;
 
     /**
      * Label
@@ -42,7 +42,7 @@ export interface OptionGroupProps<
     /**
      * Label field, default is label
      */
-    labelField?: keyof T;
+    labelField?: string & keyof T;
 
     /**
      * Multiple choose item

package/src/mu/ScrollerListEx.tsx

@@ -127,7 +127,7 @@ export interface ScrollerListExProps<T>
     /**
      * Id field
      */
-    idField?: keyof T;
+    idField?: string & keyof T;
 
     /**
      * Inner item renderer

package/src/mu/SelectEx.tsx

@@ -23,7 +23,7 @@ export interface SelectExProps<T extends {}>
     /**
      * Id field, default is id
      */
-    idField?: keyof T;
+    idField?: string & keyof T;
 
     /**
      * Item icon renderer
@@ -33,7 +33,7 @@ export interface SelectExProps<T extends {}>
     /**
      * Label field, default is label
      */
-    labelField?: ((option: T) => string) | keyof T;
+    labelField?: ((option: T) => string) | (string & keyof T);
 
     /**
      * Load data callback

package/src/mu/TableEx.tsx

@@ -68,7 +68,7 @@ export interface TableExProps<T extends Record<string, any>>
     /**
      * Id field
      */
-    idField?: keyof T;
+    idField?: string & keyof T;
 
     /**
      * Max height
@@ -107,7 +107,7 @@ export function TableEx<T extends Record<string, unknown>>(
     // Theme
     const theme = useTheme();
 
-    type keyType = keyof T;
+    type keyType = string & keyof T;
 
     // Destruct
     const {

package/src/mu/Tiplist.tsx

@@ -83,6 +83,12 @@ export function Tiplist<T extends {} = IdLabelDto>(props: TiplistProps<T>) {
         }
     );
 
+    // Input value
+    const inputValue = React.useMemo(
+        () => states.value && Reflect.get(states.value, idField),
+        [states.value]
+    );
+
     React.useEffect(() => {
         if (localValue != null) stateUpdate({ value: localValue });
     }, [localValue]);
@@ -219,9 +225,7 @@ export function Tiplist<T extends {} = IdLabelDto>(props: TiplistProps<T>) {
                 type="text"
                 style={{ display: 'none' }}
                 name={name}
-                value={
-                    (states.value && Reflect.get(states.value, idField)) ?? ''
-                }
+                value={inputValue ?? ''}
                 readOnly
                 onChange={inputOnChange}
             />

package/src/mu/pages/ViewPage.tsx

@@ -24,7 +24,7 @@ export interface ViewPageField<T extends {}> extends GridProps {
     /**
      * Data field
      */
-    data: keyof T | ((item: T) => React.ReactNode);
+    data: (string & keyof T) | ((item: T) => React.ReactNode);
 
     /**
      * Data type