@etsoo/react 1.5.49 → 1.5.52

package/__tests__/mu/NotifierMUTests.tsx

@@ -78,6 +78,33 @@ test('Confirm tests', async () => {
     jest.runOnlyPendingTimers();
 });
 
+test('Confirm tests without cancel button', async () => {
+    // Click
+    const handleClick = jest.fn();
+
+    act(() => {
+        // Add the notification
+        notifier.confirm('Confirm message', undefined, handleClick, {
+            cancelButton: false
+        });
+    });
+
+    // Button
+    const button = root.getElementsByTagName('button');
+
+    expect(button.length).toBe(1);
+    expect(button[0].innerHTML).toContain('OK');
+
+    await act(async () => {
+        button[0].click();
+    });
+
+    expect(handleClick).toBeCalled();
+
+    // Fast forward
+    jest.runOnlyPendingTimers();
+});
+
 test('Prompt tests', async () => {
     // Click
     const handleClick = jest.fn((result: boolean) => {
@@ -107,6 +134,33 @@ test('Prompt tests', async () => {
     jest.runOnlyPendingTimers();
 });
 
+test('Prompt tests with form submit', async () => {
+    // Click
+    const handleClick = jest.fn((result: boolean) => {
+        expect(result).toBeTruthy();
+    });
+
+    act(() => {
+        // Add the notification
+        notifier.prompt<boolean>('Prompt message', handleClick, undefined, {
+            type: 'switch',
+            required: false
+        });
+    });
+
+    await act(async () => {
+        (
+            root
+                .getElementsByTagName('form')[0]
+                .elements.namedItem('okButton') as HTMLButtonElement
+        )?.click();
+    });
+
+    expect(handleClick).toBeCalled();
+
+    jest.runOnlyPendingTimers();
+});
+
 test('Message tests', (done) => {
     // Callback
     const callback = jest.fn(() => done());

package/lib/mu/NotifierMU.js

@@ -200,7 +200,12 @@ export class NotificationMU extends NotificationReact {
             localInputs = inputs;
         }
         return (React.createElement(Dialog, { key: this.id, open: this.open, PaperComponent: DraggablePaperComponent, className: className, fullWidth: fullWidth, maxWidth: maxWidth, fullScreen: fullScreen },
-            React.createElement("form", null,
+            React.createElement("form", { onSubmit: (event) => {
+                    var _a;
+                    event.preventDefault();
+                    (_a = event.currentTarget.elements.namedItem('okButton')) === null || _a === void 0 ? void 0 : _a.click();
+                    return false;
+                } },
                 React.createElement(IconDialogTitle, { className: "draggable-dialog-title" },
                     React.createElement(Info, { color: "primary" }),
                     React.createElement("span", { className: "dialogTitle" }, title)),
@@ -214,7 +219,7 @@ export class NotificationMU extends NotificationReact {
                                 this.onReturn(undefined);
                             this.dismiss();
                         } }, cancelLabel)),
-                    React.createElement(LoadingButton, { color: "primary", autoFocus: true, onClick: handleSubmit, ...primaryButton }, okLabel)))));
+                    React.createElement(LoadingButton, { color: "primary", autoFocus: true, onClick: handleSubmit, name: "okButton", ...primaryButton }, okLabel)))));
     }
     // Create loading
     createLoading(_props, className) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/react",
-    "version": "1.5.49",
+    "version": "1.5.52",
     "description": "TypeScript ReactJs framework",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
@@ -48,9 +48,8 @@
     "dependencies": {
         "@emotion/css": "^11.9.0",
         "@emotion/react": "^11.9.3",
-        "@emotion/style": "^0.8.0",
         "@emotion/styled": "^11.9.3",
-        "@etsoo/appscript": "^1.2.62",
+        "@etsoo/appscript": "^1.2.63",
         "@etsoo/notificationbase": "^1.1.4",
         "@etsoo/shared": "^1.1.40",
         "@mui/icons-material": "^5.8.4",

package/src/mu/NotifierMU.tsx

@@ -358,7 +358,17 @@ export class NotificationMU extends NotificationReact {
                 maxWidth={maxWidth}
                 fullScreen={fullScreen}
             >
-                <form>
+                <form
+                    onSubmit={(event) => {
+                        event.preventDefault();
+                        (
+                            event.currentTarget.elements.namedItem(
+                                'okButton'
+                            ) as HTMLButtonElement
+                        )?.click();
+                        return false;
+                    }}
+                >
                     <IconDialogTitle className="draggable-dialog-title">
                         <Info color="primary" />
                         <span className="dialogTitle">{title}</span>
@@ -389,6 +399,7 @@ export class NotificationMU extends NotificationReact {
                             color="primary"
                             autoFocus
                             onClick={handleSubmit}
+                            name="okButton"
                             {...primaryButton}
                         >
                             {okLabel}