@etsoo/materialui 1.0.30 → 1.0.32

package/__tests__/NotifierMUTests.tsx

@@ -119,7 +119,7 @@ test('Prompt tests', async () => {
         // Add the notification
         notifier.prompt<boolean>('Prompt message', handleClick, undefined, {
             type: 'switch',
-            required: false
+            inputProps: { required: false }
         });
     });
 
@@ -148,7 +148,7 @@ test('Prompt tests with form submit', async () => {
         // Add the notification
         notifier.prompt<boolean>('Prompt message', handleClick, undefined, {
             type: 'switch',
-            required: false
+            inputProps: { required: false }
         });
     });
 

package/lib/NotifierMU.js

@@ -119,7 +119,7 @@ export class NotificationMU extends NotificationReact {
         var _a, _b;
         const labels = Labels.NotificationMU;
         const title = (_a = this.title) !== null && _a !== void 0 ? _a : labels.promptTitle;
-        const { cancelLabel = labels.promptCancel, okLabel = labels.promptOK, cancelButton = true, inputs, type, fullScreen, fullWidth = true, maxWidth, primaryButton, ...rest } = (_b = this.inputProps) !== null && _b !== void 0 ? _b : {};
+        const { cancelLabel = labels.promptCancel, okLabel = labels.promptOK, cancelButton = true, inputs, type, fullScreen, fullWidth = true, maxWidth, primaryButton, inputProps } = (_b = this.inputProps) !== null && _b !== void 0 ? _b : {};
         const inputRef = React.createRef();
         const errorRef = React.createRef();
         const setError = (error) => {
@@ -187,13 +187,13 @@ export class NotificationMU extends NotificationReact {
         let value = undefined;
         if (inputs == null) {
             if (type === 'switch') {
-                localInputs = (React.createElement(Switch, { inputRef: inputRef, ...rest, value: "true", autoFocus: true, required: true }));
+                localInputs = (React.createElement(Switch, { inputRef: inputRef, ...inputProps, value: "true", autoFocus: true, required: true }));
             }
             else if (type === 'slider') {
                 localInputs = React.createElement(Slider, { onChange: (_e, v) => (value = v) });
             }
             else {
-                localInputs = (React.createElement(TextField, { inputRef: inputRef, onChange: () => setError(undefined), 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, ...inputProps }));
             }
         }
         else {

package/lib/app/ReactApp.d.ts

@@ -1,5 +1,5 @@
 import { CoreApp, IActionResult, IApp, IAppSettings, ICoreApp, IUser } from '@etsoo/appscript';
-import { NotificationRenderProps, NotificationReturn } from '@etsoo/notificationbase';
+import { INotifier, NotificationReturn } from '@etsoo/notificationbase';
 import { DataTypes } from '@etsoo/shared';
 import React from 'react';
 import { CultureAction, CultureState, INotificationReact, InputDialogProps, IPageData, IStateProps, NotificationReactCallProps, PageAction, PageState, UserAction, UserState } from '@etsoo/react';
@@ -24,6 +24,10 @@ export declare function ReactAppStateDetector(props: IStateProps): React.Functio
  * React implemented base
  */
 export interface IReactAppBase {
+    /**
+     * Override Notifier as React specific
+     */
+    readonly notifier: INotifier<React.ReactNode, NotificationReactCallProps>;
     /**
      * User state
      */
@@ -90,7 +94,7 @@ export declare class ReactApp<S extends IAppSettings, D extends IUser, P extends
     /**
      * Get notifier provider
      */
-    static get notifierProvider(): React.FunctionComponent<NotificationRenderProps>;
+    static get notifierProvider(): React.FunctionComponent<object>;
     private static createApi;
     private static createNotifier;
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/materialui",
-    "version": "1.0.30",
+    "version": "1.0.32",
     "description": "TypeScript Material-UI Implementation",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
@@ -51,12 +51,12 @@
         "@emotion/css": "^11.10.0",
         "@emotion/react": "^11.10.4",
         "@emotion/styled": "^11.10.4",
-        "@etsoo/appscript": "^1.2.97",
-        "@etsoo/notificationbase": "^1.1.7",
-        "@etsoo/react": "^1.6.3",
+        "@etsoo/appscript": "^1.2.99",
+        "@etsoo/notificationbase": "^1.1.10",
+        "@etsoo/react": "^1.6.5",
         "@etsoo/shared": "^1.1.58",
         "@mui/icons-material": "^5.10.6",
-        "@mui/material": "^5.10.6",
+        "@mui/material": "^5.10.7",
         "@types/pica": "^9.0.1",
         "@types/pulltorefreshjs": "^0.1.5",
         "@types/react": "^18.0.21",
@@ -75,10 +75,10 @@
         "react-window": "^1.8.7"
     },
     "devDependencies": {
-        "@babel/cli": "^7.18.10",
-        "@babel/core": "^7.19.1",
+        "@babel/cli": "^7.19.3",
+        "@babel/core": "^7.19.3",
         "@babel/plugin-transform-runtime": "^7.19.1",
-        "@babel/preset-env": "^7.19.1",
+        "@babel/preset-env": "^7.19.3",
         "@babel/runtime-corejs3": "^7.19.1",
         "@testing-library/jest-dom": "^5.16.5",
         "@testing-library/react": "^13.4.0",
@@ -92,6 +92,6 @@
         "jest": "^29.0.3",
         "jest-environment-jsdom": "^29.0.3",
         "ts-jest": "^29.0.2",
-        "typescript": "^4.8.3"
+        "typescript": "^4.8.4"
     }
 }

package/src/NotifierMU.tsx

@@ -240,7 +240,7 @@ export class NotificationMU extends NotificationReact {
             fullWidth = true,
             maxWidth,
             primaryButton,
-            ...rest
+            inputProps
         } = this.inputProps ?? {};
 
         const inputRef = React.createRef<HTMLInputElement>();
@@ -322,7 +322,7 @@ export class NotificationMU extends NotificationReact {
                 localInputs = (
                     <Switch
                         inputRef={inputRef}
-                        {...rest}
+                        {...inputProps}
                         value="true"
                         autoFocus
                         required
@@ -340,7 +340,7 @@ export class NotificationMU extends NotificationReact {
                         fullWidth
                         type={type}
                         required
-                        {...rest}
+                        {...inputProps}
                     />
                 );
             }

package/src/app/ReactApp.ts

@@ -9,6 +9,7 @@ import {
     IUser
 } from '@etsoo/appscript';
 import {
+    INotifier,
     NotificationMessageType,
     NotificationRenderProps,
     NotificationReturn
@@ -87,6 +88,11 @@ export function ReactAppStateDetector(props: IStateProps) {
  * React implemented base
  */
 export interface IReactAppBase {
+    /**
+     * Override Notifier as React specific
+     */
+    readonly notifier: INotifier<React.ReactNode, NotificationReactCallProps>;
+
     /**
      * User state
      */