@etsoo/react 1.4.0 → 1.4.1

package/lib/mu/NotifierMU.js

@@ -1,5 +1,5 @@
 import { NotificationAlign, NotificationMessageType, NotificationType } from '@etsoo/notificationbase';
-import { Alert, AlertTitle, Backdrop, Box, Button, CircularProgress, Dialog, DialogActions, DialogContent, DialogContentText, DialogTitle, Fade, Slider, Snackbar, styled, Switch, TextField } from '@mui/material';
+import { Alert, AlertTitle, Backdrop, Box, Button, CircularProgress, Dialog, DialogActions, DialogContent, DialogContentText, DialogTitle, Fade, Slider, Snackbar, styled, Switch, TextField, Typography } from '@mui/material';
 import { Error, Info, Help, Warning, Done } from '@mui/icons-material';
 import React from 'react';
 import { Labels } from '../app/Labels';
@@ -120,14 +120,21 @@ export class NotificationMU extends NotificationReact {
         const labels = Labels.NotificationMU;
         const title = (_a = this.title) !== null && _a !== void 0 ? _a : labels.promptTitle;
         const { cancelLabel = labels.promptCancel, okLabel = labels.promptOK, inputs, type, fullScreen, fullWidth = true, maxWidth, primaryButton, ...rest } = (_b = this.inputProps) !== null && _b !== void 0 ? _b : {};
+        const inputRef = React.createRef();
+        const errorRef = React.createRef();
+        const setError = (error) => {
+            if (errorRef.current == null)
+                return;
+            errorRef.current.innerText = error !== null && error !== void 0 ? error : '';
+        };
         const handleSubmit = async (event) => {
             // Result
             let result = undefined;
+            const input = inputRef.current;
             if (this.onReturn) {
                 // Inputs case, no HTMLForm set to value, set the current form
                 if (inputs && value == null)
                     value = event.currentTarget.form;
-                const input = inputRef.current;
                 if (input) {
                     if (type === 'date') {
                         const dateValue = input.valueAsDate;
@@ -165,12 +172,21 @@ export class NotificationMU extends NotificationReact {
             // Get the value
             // returns false to prevent default dismiss
             const v = await result;
-            if (v === false)
+            if (v === false) {
+                input === null || input === void 0 ? void 0 : input.focus();
                 return;
+            }
+            if (Array.isArray(v)) {
+                if (!v[0]) {
+                    const error = v[1];
+                    setError(error);
+                    input === null || input === void 0 ? void 0 : input.focus();
+                    return;
+                }
+            }
             this.dismiss();
         };
         let localInputs;
-        let inputRef = React.createRef();
         let value = undefined;
         if (inputs == null) {
             if (type === 'switch') {
@@ -180,7 +196,7 @@ export class NotificationMU extends NotificationReact {
                 localInputs = React.createElement(Slider, { onChange: (_e, v) => (value = v) });
             }
             else {
-                localInputs = (React.createElement(TextField, { inputRef: inputRef, autoFocus: true, margin: "dense", fullWidth: true, type: type, required: true, ...rest }));
+                localInputs = (React.createElement(TextField, { inputRef: inputRef, onChange: () => setError(undefined), autoFocus: true, margin: "dense", fullWidth: true, type: type, required: true, ...rest }));
             }
         }
         else {
@@ -193,7 +209,8 @@ export class NotificationMU extends NotificationReact {
                     React.createElement("span", { className: "dialogTitle" }, title)),
                 React.createElement(DialogContent, null,
                     React.createElement(DialogContentText, null, this.content),
-                    localInputs),
+                    localInputs,
+                    React.createElement(Typography, { variant: "caption", display: "block", ref: errorRef, color: (theme) => theme.palette.error.main })),
                 React.createElement(DialogActions, null,
                     React.createElement(Button, { color: "secondary", onClick: () => {
                             if (this.onReturn)

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/react",
-    "version": "1.4.0",
+    "version": "1.4.1",
     "description": "TypeScript ReactJs framework",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
@@ -50,8 +50,8 @@
         "@emotion/react": "^11.7.1",
         "@emotion/style": "^0.8.0",
         "@emotion/styled": "^11.6.0",
-        "@etsoo/appscript": "^1.2.11",
-        "@etsoo/notificationbase": "^1.0.95",
+        "@etsoo/appscript": "^1.2.12",
+        "@etsoo/notificationbase": "^1.0.96",
         "@etsoo/shared": "^1.0.97",
         "@mui/icons-material": "^5.2.5",
         "@mui/material": "^5.2.6",
@@ -76,12 +76,12 @@
         "react-window": "^1.8.6"
     },
     "devDependencies": {
-        "@babel/cli": "^7.16.0",
-        "@babel/core": "^7.16.5",
-        "@babel/plugin-transform-runtime": "^7.16.5",
-        "@babel/preset-env": "^7.16.5",
-        "@babel/runtime-corejs3": "^7.16.5",
-        "@types/jest": "^27.0.3",
+        "@babel/cli": "^7.16.7",
+        "@babel/core": "^7.16.7",
+        "@babel/plugin-transform-runtime": "^7.16.7",
+        "@babel/preset-env": "^7.16.7",
+        "@babel/runtime-corejs3": "^7.16.7",
+        "@types/jest": "^27.4.0",
         "@types/react-test-renderer": "^17.0.1",
         "@typescript-eslint/eslint-plugin": "^5.8.1",
         "@typescript-eslint/parser": "^5.8.1",

package/src/mu/NotifierMU.tsx

@@ -25,7 +25,8 @@ import {
     Snackbar,
     styled,
     Switch,
-    TextField
+    TextField,
+    Typography
 } from '@mui/material';
 import { Error, Info, Help, Warning, Done } from '@mui/icons-material';
 import React from 'react';
@@ -238,18 +239,31 @@ export class NotificationMU extends NotificationReact {
             ...rest
         } = this.inputProps ?? {};
 
+        const inputRef = React.createRef<HTMLInputElement>();
+        const errorRef = React.createRef<HTMLSpanElement>();
+
+        const setError = (error?: string) => {
+            if (errorRef.current == null) return;
+            errorRef.current.innerText = error ?? '';
+        };
+
         const handleSubmit = async (
             event: React.MouseEvent<HTMLButtonElement>
         ) => {
             // Result
-            let result: boolean | void | PromiseLike<boolean | void> =
+            let result:
+                | boolean
+                | [boolean, string | undefined]
+                | void
+                | PromiseLike<boolean | [boolean, string | undefined] | void> =
                 undefined;
 
+            const input = inputRef.current;
+
             if (this.onReturn) {
                 // Inputs case, no HTMLForm set to value, set the current form
                 if (inputs && value == null) value = event.currentTarget.form;
 
-                const input = inputRef.current;
                 if (input) {
                     if (type === 'date') {
                         const dateValue = input.valueAsDate;
@@ -284,13 +298,23 @@ export class NotificationMU extends NotificationReact {
             // Get the value
             // returns false to prevent default dismiss
             const v = await result;
-            if (v === false) return;
+            if (v === false) {
+                input?.focus();
+                return;
+            }
+            if (Array.isArray(v)) {
+                if (!v[0]) {
+                    const error = v[1];
+                    setError(error);
+                    input?.focus();
+                    return;
+                }
+            }
 
             this.dismiss();
         };
 
         let localInputs: React.ReactNode;
-        let inputRef = React.createRef<HTMLInputElement>();
         let value: any = undefined;
 
         if (inputs == null) {
@@ -310,6 +334,7 @@ export class NotificationMU extends NotificationReact {
                 localInputs = (
                     <TextField
                         inputRef={inputRef}
+                        onChange={() => setError(undefined)}
                         autoFocus
                         margin="dense"
                         fullWidth
@@ -341,6 +366,12 @@ export class NotificationMU extends NotificationReact {
                     <DialogContent>
                         <DialogContentText>{this.content}</DialogContentText>
                         {localInputs}
+                        <Typography
+                            variant="caption"
+                            display="block"
+                            ref={errorRef}
+                            color={(theme) => theme.palette.error.main}
+                        />
                     </DialogContent>
                     <DialogActions>
                         <Button