@etsoo/materialui 1.6.44 → 1.6.46

package/lib/cjs/DataGridEx.js

@@ -319,9 +319,7 @@ function DataGridEx(props) {
                 const child = cellRenderer({
                     data,
                     field,
-                    formattedValue: valueFormatter
-                        ? valueFormatter(formatProps)
-                        : undefined,
+                    formattedValue: valueFormatter ? valueFormatter(formatProps) : null,
                     selected,
                     type,
                     rowIndex,

package/lib/cjs/DataGridRenderers.js

@@ -27,16 +27,19 @@ var DataGridRenderers;
             // First column, show loading indicator
             if (columnIndex === 0)
                 return (0, jsx_runtime_1.jsx)(CircularProgress_1.default, { size: 15 });
-            // Others return undefined
-            return undefined;
+            // Others return
+            return;
         }
+        // No formatted value
+        if (formattedValue === undefined)
+            return;
         // No formatted value and data field
         if (formattedValue == null && field == null)
-            return undefined;
+            return;
         // Cell value
         const value = formattedValue ?? data[field];
         if (value == null)
-            return undefined;
+            return;
         // For unknow and string type, keep the simple format
         if (type === react_1.GridDataType.Unkwown)
             return value;
@@ -104,7 +107,6 @@ var DataGridRenderers;
                 return loadedItems.toLocaleString() + (hasNextPage ? "+" : "");
             }
         }
-        return undefined;
     }
     DataGridRenderers.defaultFooterItemRenderer = defaultFooterItemRenderer;
 })(DataGridRenderers || (exports.DataGridRenderers = DataGridRenderers = {}));

package/lib/cjs/InputField.d.ts

@@ -16,6 +16,10 @@ export type InputFieldProps = TextFieldProps & {
      * Is the field read only?
      */
     readOnly?: boolean;
+    /**
+     * Search case
+     */
+    search?: boolean;
 };
 /**
  * Input field

package/lib/cjs/InputField.js

@@ -16,7 +16,7 @@ const TextField_1 = __importDefault(require("@mui/material/TextField"));
  */
 function InputField(props) {
     // Destruct
-    const { slotProps, onChange, onChangeDelay, changeDelay = onChangeDelay ? [480] : undefined, readOnly, size = MUGlobal_1.MUGlobal.inputFieldSize, variant = MUGlobal_1.MUGlobal.inputFieldVariant, ...rest } = props;
+    const { slotProps, onChange, onChangeDelay, changeDelay = onChangeDelay ? [480] : undefined, readOnly, search = false, size = search ? MUGlobal_1.MUGlobal.searchFieldSize : MUGlobal_1.MUGlobal.inputFieldSize, variant = search ? MUGlobal_1.MUGlobal.searchFieldVariant : MUGlobal_1.MUGlobal.inputFieldVariant, ...rest } = props;
     // Slot props
     const { htmlInput, input, inputLabel, ...restSlotProps } = slotProps ?? {};
     const isMounted = react_2.default.useRef(true);
@@ -54,7 +54,9 @@ function InputField(props) {
             },
             input: { readOnly, ...input },
             inputLabel: {
-                shrink: MUGlobal_1.MUGlobal.inputFieldShrink,
+                shrink: search
+                    ? MUGlobal_1.MUGlobal.searchFieldShrink
+                    : MUGlobal_1.MUGlobal.inputFieldShrink,
                 ...inputLabel
             },
             ...restSlotProps

package/lib/cjs/NumberInputField.d.ts

@@ -29,10 +29,6 @@ export type NumberInputFieldProps = Omit<InputFieldProps, "type" | "inputProps">
      * Maximum value
      */
     max?: number;
-    /**
-     * Is search field?
-     */
-    search?: boolean;
     /**
      * Step value
      */

package/lib/cjs/NumberInputField.js

@@ -9,7 +9,6 @@ const react_1 = __importDefault(require("react"));
 const InputField_1 = require("./InputField");
 const shared_1 = require("@etsoo/shared");
 const InputAdornment_1 = __importDefault(require("@mui/material/InputAdornment"));
-const MUGlobal_1 = require("./MUGlobal");
 /**
  * Number input field, for controlled only components, please see IntInputField and MoneyInputField
  * @param props Props
@@ -18,13 +17,12 @@ const MUGlobal_1 = require("./MUGlobal");
 function NumberInputField(props) {
     const { currency, inputStyle, min = 0, step = 1, symbol = currency
         ? `${currency} ${shared_1.NumberUtils.getCurrencySymbol(currency)}`
-        : undefined, endSymbol, max = 9999999, search = false, slotProps = {}, ...rest } = props;
-    return ((0, jsx_runtime_1.jsx)(InputField_1.InputField, { type: "number", size: search ? MUGlobal_1.MUGlobal.searchFieldSize : undefined, slotProps: Object.assign(slotProps, {
+        : undefined, endSymbol, max = 9999999, slotProps = {}, ...rest } = props;
+    return ((0, jsx_runtime_1.jsx)(InputField_1.InputField, { type: "number", slotProps: Object.assign(slotProps, {
             input: {
                 startAdornment: symbol ? ((0, jsx_runtime_1.jsx)(react_1.default.Fragment, { children: (0, jsx_runtime_1.jsx)(InputAdornment_1.default, { position: "start", children: symbol }) })) : undefined,
                 endAdornment: endSymbol ? ((0, jsx_runtime_1.jsx)(InputAdornment_1.default, { position: "end", children: endSymbol })) : undefined
             },
-            inputLabel: { shrink: search ? MUGlobal_1.MUGlobal.searchFieldShrink : undefined },
             htmlInput: {
                 min,
                 step,
@@ -32,5 +30,5 @@ function NumberInputField(props) {
                 style: inputStyle,
                 inputMode: "numeric"
             }
-        }), variant: search ? MUGlobal_1.MUGlobal.searchFieldVariant : undefined, ...rest }));
+        }), ...rest }));
 }

package/lib/mjs/DataGridEx.js

@@ -312,9 +312,7 @@ export function DataGridEx(props) {
                 const child = cellRenderer({
                     data,
                     field,
-                    formattedValue: valueFormatter
-                        ? valueFormatter(formatProps)
-                        : undefined,
+                    formattedValue: valueFormatter ? valueFormatter(formatProps) : null,
                     selected,
                     type,
                     rowIndex,

package/lib/mjs/DataGridRenderers.js

@@ -21,16 +21,19 @@ export var DataGridRenderers;
             // First column, show loading indicator
             if (columnIndex === 0)
                 return _jsx(CircularProgress, { size: 15 });
-            // Others return undefined
-            return undefined;
+            // Others return
+            return;
         }
+        // No formatted value
+        if (formattedValue === undefined)
+            return;
         // No formatted value and data field
         if (formattedValue == null && field == null)
-            return undefined;
+            return;
         // Cell value
         const value = formattedValue ?? data[field];
         if (value == null)
-            return undefined;
+            return;
         // For unknow and string type, keep the simple format
         if (type === GridDataType.Unkwown)
             return value;
@@ -98,7 +101,6 @@ export var DataGridRenderers;
                 return loadedItems.toLocaleString() + (hasNextPage ? "+" : "");
             }
         }
-        return undefined;
     }
     DataGridRenderers.defaultFooterItemRenderer = defaultFooterItemRenderer;
 })(DataGridRenderers || (DataGridRenderers = {}));

package/lib/mjs/InputField.d.ts

@@ -16,6 +16,10 @@ export type InputFieldProps = TextFieldProps & {
      * Is the field read only?
      */
     readOnly?: boolean;
+    /**
+     * Search case
+     */
+    search?: boolean;
 };
 /**
  * Input field

package/lib/mjs/InputField.js

@@ -10,7 +10,7 @@ import TextField from "@mui/material/TextField";
  */
 export function InputField(props) {
     // Destruct
-    const { slotProps, onChange, onChangeDelay, changeDelay = onChangeDelay ? [480] : undefined, readOnly, size = MUGlobal.inputFieldSize, variant = MUGlobal.inputFieldVariant, ...rest } = props;
+    const { slotProps, onChange, onChangeDelay, changeDelay = onChangeDelay ? [480] : undefined, readOnly, search = false, size = search ? MUGlobal.searchFieldSize : MUGlobal.inputFieldSize, variant = search ? MUGlobal.searchFieldVariant : MUGlobal.inputFieldVariant, ...rest } = props;
     // Slot props
     const { htmlInput, input, inputLabel, ...restSlotProps } = slotProps ?? {};
     const isMounted = React.useRef(true);
@@ -48,7 +48,9 @@ export function InputField(props) {
             },
             input: { readOnly, ...input },
             inputLabel: {
-                shrink: MUGlobal.inputFieldShrink,
+                shrink: search
+                    ? MUGlobal.searchFieldShrink
+                    : MUGlobal.inputFieldShrink,
                 ...inputLabel
             },
             ...restSlotProps

package/lib/mjs/NumberInputField.d.ts

@@ -29,10 +29,6 @@ export type NumberInputFieldProps = Omit<InputFieldProps, "type" | "inputProps">
      * Maximum value
      */
     max?: number;
-    /**
-     * Is search field?
-     */
-    search?: boolean;
     /**
      * Step value
      */

package/lib/mjs/NumberInputField.js

@@ -3,7 +3,6 @@ import React from "react";
 import { InputField } from "./InputField";
 import { NumberUtils } from "@etsoo/shared";
 import InputAdornment from "@mui/material/InputAdornment";
-import { MUGlobal } from "./MUGlobal";
 /**
  * Number input field, for controlled only components, please see IntInputField and MoneyInputField
  * @param props Props
@@ -12,13 +11,12 @@ import { MUGlobal } from "./MUGlobal";
 export function NumberInputField(props) {
     const { currency, inputStyle, min = 0, step = 1, symbol = currency
         ? `${currency} ${NumberUtils.getCurrencySymbol(currency)}`
-        : undefined, endSymbol, max = 9999999, search = false, slotProps = {}, ...rest } = props;
-    return (_jsx(InputField, { type: "number", size: search ? MUGlobal.searchFieldSize : undefined, slotProps: Object.assign(slotProps, {
+        : undefined, endSymbol, max = 9999999, slotProps = {}, ...rest } = props;
+    return (_jsx(InputField, { type: "number", slotProps: Object.assign(slotProps, {
             input: {
                 startAdornment: symbol ? (_jsx(React.Fragment, { children: _jsx(InputAdornment, { position: "start", children: symbol }) })) : undefined,
                 endAdornment: endSymbol ? (_jsx(InputAdornment, { position: "end", children: endSymbol })) : undefined
             },
-            inputLabel: { shrink: search ? MUGlobal.searchFieldShrink : undefined },
             htmlInput: {
                 min,
                 step,
@@ -26,5 +24,5 @@ export function NumberInputField(props) {
                 style: inputStyle,
                 inputMode: "numeric"
             }
-        }), variant: search ? MUGlobal.searchFieldVariant : undefined, ...rest }));
+        }), ...rest }));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/materialui",
-  "version": "1.6.44",
+  "version": "1.6.46",
   "description": "TypeScript Material-UI Implementation",
   "main": "lib/cjs/index.js",
   "module": "lib/mjs/index.js",
@@ -40,9 +40,9 @@
     "@dnd-kit/react": "^0.4.0",
     "@emotion/react": "^11.14.0",
     "@emotion/styled": "^11.14.1",
-    "@etsoo/appscript": "^1.6.60",
+    "@etsoo/appscript": "^1.6.61",
     "@etsoo/notificationbase": "^1.1.69",
-    "@etsoo/react": "^1.8.84",
+    "@etsoo/react": "^1.8.85",
     "@etsoo/shared": "^1.2.83",
     "@mui/icons-material": "^9.0.0",
     "@mui/material": "^9.0.0",

package/src/DataGridEx.tsx

@@ -665,9 +665,7 @@ export function DataGridEx<T extends object>(props: DataGridExProps<T>) {
           const child = cellRenderer({
             data,
             field,
-            formattedValue: valueFormatter
-              ? valueFormatter(formatProps)
-              : undefined,
+            formattedValue: valueFormatter ? valueFormatter(formatProps) : null,
             selected,
             type,
             rowIndex,

package/src/DataGridRenderers.tsx

@@ -31,16 +31,19 @@ export namespace DataGridRenderers {
       // First column, show loading indicator
       if (columnIndex === 0) return <CircularProgress size={15} />;
 
-      // Others return undefined
-      return undefined;
+      // Others return
+      return;
     }
 
+    // No formatted value
+    if (formattedValue === undefined) return;
+
     // No formatted value and data field
-    if (formattedValue == null && field == null) return undefined;
+    if (formattedValue == null && field == null) return;
 
     // Cell value
     const value = formattedValue ?? data[field!];
-    if (value == null) return undefined;
+    if (value == null) return;
 
     // For unknow and string type, keep the simple format
     if (type === GridDataType.Unkwown) return value;
@@ -139,7 +142,5 @@ export namespace DataGridRenderers {
         return loadedItems.toLocaleString() + (hasNextPage ? "+" : "");
       }
     }
-
-    return undefined;
   }
 }

package/src/InputField.tsx

@@ -23,6 +23,11 @@ export type InputFieldProps = TextFieldProps & {
    * Is the field read only?
    */
   readOnly?: boolean;
+
+  /**
+   * Search case
+   */
+  search?: boolean;
 };
 
 /**
@@ -38,8 +43,9 @@ export function InputField(props: InputFieldProps) {
     onChangeDelay,
     changeDelay = onChangeDelay ? [480] : undefined,
     readOnly,
-    size = MUGlobal.inputFieldSize,
-    variant = MUGlobal.inputFieldVariant,
+    search = false,
+    size = search ? MUGlobal.searchFieldSize : MUGlobal.inputFieldSize,
+    variant = search ? MUGlobal.searchFieldVariant : MUGlobal.inputFieldVariant,
     ...rest
   } = props;
 
@@ -90,7 +96,9 @@ export function InputField(props: InputFieldProps) {
         },
         input: { readOnly, ...input },
         inputLabel: {
-          shrink: MUGlobal.inputFieldShrink,
+          shrink: search
+            ? MUGlobal.searchFieldShrink
+            : MUGlobal.inputFieldShrink,
           ...inputLabel
         },
         ...restSlotProps

package/src/NumberInputField.tsx

@@ -42,11 +42,6 @@ export type NumberInputFieldProps = Omit<
    */
   max?: number;
 
-  /**
-   * Is search field?
-   */
-  search?: boolean;
-
   /**
    * Step value
    */
@@ -69,7 +64,6 @@ export function NumberInputField(props: NumberInputFieldProps) {
       : undefined,
     endSymbol,
     max = 9999999,
-    search = false,
     slotProps = {},
     ...rest
   } = props;
@@ -77,7 +71,6 @@ export function NumberInputField(props: NumberInputFieldProps) {
   return (
     <InputField
       type="number"
-      size={search ? MUGlobal.searchFieldSize : undefined}
       slotProps={Object.assign(slotProps, {
         input: {
           startAdornment: symbol ? (
@@ -89,7 +82,6 @@ export function NumberInputField(props: NumberInputFieldProps) {
             <InputAdornment position="end">{endSymbol}</InputAdornment>
           ) : undefined
         },
-        inputLabel: { shrink: search ? MUGlobal.searchFieldShrink : undefined },
         htmlInput: {
           min,
           step,
@@ -98,7 +90,6 @@ export function NumberInputField(props: NumberInputFieldProps) {
           inputMode: "numeric"
         }
       })}
-      variant={search ? MUGlobal.searchFieldVariant : undefined}
       {...rest}
     />
   );