@etsoo/materialui 1.0.61 → 1.0.63

package/lib/TwoFieldInput.js

@@ -2,7 +2,7 @@ import { Input, InputAdornment } from '@mui/material';
 import ArrowRightAltIcon from '@mui/icons-material/ArrowRightAlt';
 import { useDimensions } from '@etsoo/react';
 import React from 'react';
-import { DomUtils } from '@etsoo/shared';
+import { DateUtils, DomUtils } from '@etsoo/shared';
 import { InputField } from './InputField';
 /**
  * TwoField Input
@@ -10,7 +10,6 @@ import { InputField } from './InputField';
  * @returns Component
  */
 export function TwoFieldInput(props) {
-    var _a, _b;
     // Destruct
     const { name, inputProps, type = inputProps === null || inputProps === void 0 ? void 0 : inputProps.inputMode, values, onValuesChange, onChange, onInput, ...rest } = props;
     // Local values
@@ -40,14 +39,25 @@ export function TwoFieldInput(props) {
         if (onChange)
             onChange(event);
     };
+    const formatValue = (v, type) => {
+        if (v == null)
+            return '';
+        if (typeof v === 'number')
+            return v;
+        if (type === 'date')
+            return DateUtils.formatForInput(v);
+        if (type === 'datetime-local')
+            return DateUtils.formatForInput(v, true);
+        return v;
+    };
     // Layout
-    return (React.createElement(InputField, { name: `${name}-start`, type: type, defaultValue: (_a = localValues[0]) !== null && _a !== void 0 ? _a : '', ref: dimensions[0][0], inputProps: inputProps, InputProps: {
+    return (React.createElement(InputField, { name: `${name}-start`, type: type, defaultValue: formatValue(localValues[0], type), ref: dimensions[0][0], inputProps: inputProps, InputProps: {
             endAdornment: (React.createElement(InputAdornment, { position: "end", sx: {
                     display: 'flex',
                     alignItems: 'center',
                     gap: 1
                 } },
                 React.createElement(ArrowRightAltIcon, null),
-                React.createElement(Input, { type: type, name: `${name}-end`, defaultValue: (_b = localValues[1]) !== null && _b !== void 0 ? _b : '', disableUnderline: true, onInput: onInput, onChange: handleChange, inputProps: inputProps })))
+                React.createElement(Input, { type: type, name: `${name}-end`, defaultValue: formatValue(localValues[1], type), disableUnderline: true, onInput: onInput, onChange: handleChange, inputProps: inputProps })))
         }, onInput: onInput, onChange: handleChange, ...rest }));
 }

package/lib/app/ReactApp.d.ts

@@ -143,7 +143,7 @@ export declare class ReactApp<S extends IAppSettings, D extends IUser, P extends
      * @param result Action result
      * @param callback Callback
      */
-    alertResult(result: IActionResult, callback?: NotificationReturn<void>): void;
+    alertResult(result: IActionResult | string, callback?: NotificationReturn<void>): void;
     /**
      * Change culture
      * @param culture New culture definition

package/lib/app/ReactApp.js

@@ -88,7 +88,7 @@ export class ReactApp extends CoreApp {
      * @param callback Callback
      */
     alertResult(result, callback) {
-        const message = this.formatResult(result);
+        const message = typeof result === 'string' ? result : this.formatResult(result);
         if (message.endsWith(')')) {
             const startPos = message.lastIndexOf('(');
             if (startPos > 0) {
@@ -99,7 +99,7 @@ export class ReactApp extends CoreApp {
                 return;
             }
         }
-        this.notifier.alert(message, callback);
+        super.alertResult(message, callback);
     }
     /**
      * Change culture

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/materialui",
-    "version": "1.0.61",
+    "version": "1.0.63",
     "description": "TypeScript Material-UI Implementation",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",

package/src/TwoFieldInput.tsx

@@ -2,7 +2,7 @@ import { Input, InputAdornment } from '@mui/material';
 import ArrowRightAltIcon from '@mui/icons-material/ArrowRightAlt';
 import { useDimensions } from '@etsoo/react';
 import React from 'react';
-import { DomUtils } from '@etsoo/shared';
+import { DateUtils, DomUtils } from '@etsoo/shared';
 import { InputField, InputFieldProps } from './InputField';
 
 type ValueType = string | number | Date | null | undefined;
@@ -80,12 +80,20 @@ export function TwoFieldInput(props: TwoFieldInputProps) {
         if (onChange) onChange(event);
     };
 
+    const formatValue = (v: ValueType, type?: string) => {
+        if (v == null) return '';
+        if (typeof v === 'number') return v;
+        if (type === 'date') return DateUtils.formatForInput(v);
+        if (type === 'datetime-local') return DateUtils.formatForInput(v, true);
+        return v;
+    };
+
     // Layout
     return (
         <InputField
             name={`${name}-start`}
             type={type}
-            defaultValue={localValues[0] ?? ''}
+            defaultValue={formatValue(localValues[0], type)}
             ref={dimensions[0][0]}
             inputProps={inputProps}
             InputProps={{
@@ -102,7 +110,7 @@ export function TwoFieldInput(props: TwoFieldInputProps) {
                         <Input
                             type={type}
                             name={`${name}-end`}
-                            defaultValue={localValues[1] ?? ''}
+                            defaultValue={formatValue(localValues[1], type)}
                             disableUnderline
                             onInput={onInput}
                             onChange={handleChange}

package/src/app/ReactApp.ts

@@ -280,10 +280,11 @@ export class ReactApp<
      * @param callback Callback
      */
     override alertResult(
-        result: IActionResult,
+        result: IActionResult | string,
         callback?: NotificationReturn<void>
     ) {
-        const message = this.formatResult(result);
+        const message =
+            typeof result === 'string' ? result : this.formatResult(result);
         if (message.endsWith(')')) {
             const startPos = message.lastIndexOf('(');
             if (startPos > 0) {
@@ -305,7 +306,7 @@ export class ReactApp<
                 return;
             }
         }
-        this.notifier.alert(message, callback);
+        super.alertResult(message, callback);
     }
 
     /**