@etsoo/react 1.5.28 → 1.5.31

package/__tests__/mu/NotifierMUTests.tsx

@@ -1,8 +1,12 @@
 import React from 'react';
-import ReactDOM from 'react-dom';
+import { createRoot } from 'react-dom/client';
 import { act } from 'react-dom/test-utils';
 import { INotification, NotificationMessageType, NotifierMU } from '../../src';
 
+// Without it will popup error:
+// The current testing environment is not configured to support act
+(globalThis as any).IS_REACT_ACT_ENVIRONMENT = true;
+
 // Root
 const root = document.body;
 const container: HTMLElement = document.createElement('div');
@@ -10,7 +14,12 @@ root.append(container);
 
 // The state provider
 const Provider = NotifierMU.setup();
-ReactDOM.render(<Provider />, container);
+const reactRoot = createRoot(container); // createRoot(container!) if you use TypeScript
+
+act(() => {
+    // Concorrent renderer needs act block
+    reactRoot.render(<Provider />);
+});
 
 // Notifier
 const notifier = NotifierMU.instance;

package/lib/app/ReactApp.d.ts

@@ -22,7 +22,9 @@ export declare let globalApp: IReactApp<IAppSettings, any, IPageData>;
  * @param props Props
  * @returns Component
  */
-export declare function ReactAppStateDetector(props: IStateProps): React.FunctionComponentElement<{}>;
+export declare function ReactAppStateDetector(props: IStateProps): React.FunctionComponentElement<{
+    children?: React.ReactNode;
+}>;
 /**
  * Core application interface
  */

package/lib/app/ReactUtils.js

@@ -47,8 +47,8 @@ export var ReactUtils;
                     // Go(-1), a, index = 0
                     // View c, index = 1, directly push is wrong
                     if (index < stack.length) {
-                        stack.splice(index, stack.length - index);
-                        states.splice(index, stack.length - index);
+                        stack.splice(index);
+                        states.splice(index);
                     }
                     stack.push({
                         pathname,

package/lib/mu/FlexBox.d.ts

@@ -5,10 +5,10 @@ import { StackProps } from '@mui/material';
  * @param props Props
  * @returns Component
  */
-export declare function HBox(props: Exclude<StackProps, 'ref'>): JSX.Element;
+export declare function HBox(props: Omit<StackProps, 'ref'>): JSX.Element;
 /**
  * Vertial box
  * @param props Props
  * @returns Component
  */
-export declare function VBox(props: Exclude<StackProps, 'ref'>): JSX.Element;
+export declare function VBox(props: Omit<StackProps, 'ref'>): JSX.Element;

package/lib/mu/ListMoreDisplay.d.ts

@@ -5,7 +5,7 @@ import { GridData, GridLoader } from '../components/GridLoader';
 /**
  * ListMoreDisplay props
  */
-export interface ListMoreDisplayProps<T, F extends DataTypes.BasicTemplate = DataTypes.BasicTemplate> extends CardProps, GridLoader<T> {
+export interface ListMoreDisplayProps<T, F extends DataTypes.BasicTemplate = DataTypes.BasicTemplate> extends Omit<CardProps, 'children'>, GridLoader<T> {
     /**
      * Children to display the list
      */

package/lib/mu/NotifierMU.js

@@ -311,8 +311,10 @@ export class NotifierMU extends NotifierReact {
      */
     static setup(className = 'notifier-mu') {
         // Create an instance
-        NotifierReact.updateInstance(new NotifierMU());
-        return NotifierReact.instance.createProvider(className);
+        const instance = new NotifierMU();
+        const provider = instance.createProvider(className);
+        NotifierReact.updateInstance(instance);
+        return provider;
     }
     // Calculate origin from align property
     static getOrigin(align) {

package/lib/mu/pages/ViewPage.d.ts

@@ -31,7 +31,7 @@ declare type ViewPageFieldType<T> = (string & keyof T) | [string & keyof T, Grid
 /**
  * View page props
  */
-export interface ViewPageProps<T extends {}> extends Exclude<CommonPageProps, 'children'> {
+export interface ViewPageProps<T extends {}> extends Omit<CommonPageProps, 'children'> {
     /**
      * Actions
      */

package/lib/notifier/Notifier.js

@@ -16,7 +16,8 @@ export class NotifierReact extends NotificationContainer {
     constructor() {
         super((notification, dismiss) => {
             // Make sure the state update is set
-            this.stateUpdate({ notification, dismiss });
+            if (this.stateUpdate)
+                this.stateUpdate({ notification, dismiss });
         });
     }
     /**

package/lib/states/IState.d.ts

@@ -1,5 +1,5 @@
 import { IAction, IState, UserKey } from '@etsoo/appscript';
-import React from 'react';
+import React, { ReactNode } from 'react';
 /**
  * State UI creator
  */
@@ -42,5 +42,12 @@ export interface IProviderUpdate<A extends IAction> {
  * State provider props
  */
 export interface IProviderProps<A extends IAction> {
+    /**
+     * Children
+     */
+    children?: ReactNode | undefined;
+    /**
+     * Update callback
+     */
     update?: IProviderUpdate<A>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/react",
-    "version": "1.5.28",
+    "version": "1.5.31",
     "description": "TypeScript ReactJs framework",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
@@ -46,52 +46,53 @@
     },
     "homepage": "https://github.com/ETSOO/AppReact#readme",
     "dependencies": {
-        "@emotion/css": "^11.7.1",
-        "@emotion/react": "^11.8.1",
+        "@emotion/css": "^11.9.0",
+        "@emotion/react": "^11.9.0",
         "@emotion/style": "^0.8.0",
         "@emotion/styled": "^11.8.1",
-        "@etsoo/appscript": "^1.2.57",
-        "@etsoo/notificationbase": "^1.1.2",
-        "@etsoo/shared": "^1.1.14",
-        "@mui/icons-material": "^5.4.2",
-        "@mui/material": "^5.4.3",
+        "@etsoo/appscript": "^1.2.60",
+        "@etsoo/notificationbase": "^1.1.3",
+        "@etsoo/shared": "^1.1.38",
+        "@mui/icons-material": "^5.8.0",
+        "@mui/material": "^5.8.1",
         "@reach/router": "^1.3.4",
         "@types/pica": "^9.0.0",
         "@types/pulltorefreshjs": "^0.1.5",
         "@types/reach__router": "^1.3.10",
-        "@types/react": "^17.0.39",
-        "@types/react-avatar-editor": "^10.3.6",
+        "@types/react": "^18.0.9",
+        "@types/react-avatar-editor": "^12.0.0",
         "@types/react-beautiful-dnd": "^13.1.2",
-        "@types/react-dom": "^17.0.11",
+        "@types/react-dom": "^18.0.5",
         "@types/react-input-mask": "^3.0.1",
         "@types/react-window": "^1.8.5",
         "pica": "^9.0.1",
         "pulltorefreshjs": "^0.1.22",
-        "react": "^17.0.2",
-        "react-avatar-editor": "^12.0.0",
+        "react": "^18.1.0",
+        "react-avatar-editor": "^13.0.0",
         "react-beautiful-dnd": "^13.1.0",
-        "react-dom": "^17.0.2",
-        "react-draggable": "^4.4.4",
+        "react-dom": "^18.1.0",
+        "react-draggable": "^4.4.5",
         "react-imask": "^6.4.2",
-        "react-window": "^1.8.6"
+        "react-window": "^1.8.7"
     },
     "devDependencies": {
-        "@babel/cli": "^7.17.6",
-        "@babel/core": "^7.17.5",
-        "@babel/plugin-transform-runtime": "^7.17.0",
-        "@babel/preset-env": "^7.16.11",
-        "@babel/runtime-corejs3": "^7.17.2",
-        "@types/jest": "^27.4.1",
-        "@types/react-test-renderer": "^17.0.1",
-        "@typescript-eslint/eslint-plugin": "^5.12.1",
-        "@typescript-eslint/parser": "^5.12.1",
-        "eslint": "^8.10.0",
+        "@babel/cli": "^7.17.10",
+        "@babel/core": "^7.18.0",
+        "@babel/plugin-transform-runtime": "^7.18.0",
+        "@babel/preset-env": "^7.18.0",
+        "@babel/runtime-corejs3": "^7.18.0",
+        "@types/jest": "^27.5.1",
+        "@types/react-test-renderer": "^18.0.0",
+        "@typescript-eslint/eslint-plugin": "^5.26.0",
+        "@typescript-eslint/parser": "^5.26.0",
+        "eslint": "^8.16.0",
         "eslint-config-airbnb-base": "^15.0.0",
-        "eslint-plugin-import": "^2.25.4",
-        "eslint-plugin-react": "^7.29.2",
-        "jest": "^27.5.1",
-        "react-test-renderer": "^17.0.2",
-        "ts-jest": "^27.1.3",
-        "typescript": "^4.5.5"
+        "eslint-plugin-import": "^2.26.0",
+        "eslint-plugin-react": "^7.30.0",
+        "jest": "^28.1.0",
+        "jest-environment-jsdom": "^28.1.0",
+        "react-test-renderer": "^18.1.0",
+        "ts-jest": "^28.0.3",
+        "typescript": "^4.6.4"
     }
 }

package/src/app/ReactUtils.ts

@@ -65,8 +65,8 @@ export namespace ReactUtils {
                     // Go(-1), a, index = 0
                     // View c, index = 1, directly push is wrong
                     if (index < stack.length) {
-                        stack.splice(index, stack.length - index);
-                        states.splice(index, stack.length - index);
+                        stack.splice(index);
+                        states.splice(index);
                     }
 
                     stack.push({

package/src/mu/FlexBox.tsx

@@ -6,7 +6,7 @@ import React from 'react';
  * @param props Props
  * @returns Component
  */
-export function HBox(props: Exclude<StackProps, 'ref'>) {
+export function HBox(props: Omit<StackProps, 'ref'>) {
     return <Stack direction="row" width="100%" {...props} />;
 }
 
@@ -15,6 +15,6 @@ export function HBox(props: Exclude<StackProps, 'ref'>) {
  * @param props Props
  * @returns Component
  */
-export function VBox(props: Exclude<StackProps, 'ref'>) {
+export function VBox(props: Omit<StackProps, 'ref'>) {
     return <Stack direction="column" {...props} />;
 }

package/src/mu/ListMoreDisplay.tsx

@@ -24,7 +24,7 @@ import { LoadingButton } from './LoadingButton';
 export interface ListMoreDisplayProps<
     T,
     F extends DataTypes.BasicTemplate = DataTypes.BasicTemplate
-> extends CardProps,
+> extends Omit<CardProps, 'children'>,
         GridLoader<T> {
     /**
      * Children to display the list

package/src/mu/NotifierMU.tsx

@@ -487,8 +487,10 @@ export class NotifierMU extends NotifierReact {
      */
     static setup(className = 'notifier-mu') {
         // Create an instance
-        NotifierReact.updateInstance(new NotifierMU());
-        return NotifierReact.instance.createProvider(className);
+        const instance = new NotifierMU();
+        const provider = instance.createProvider(className);
+        NotifierReact.updateInstance(instance);
+        return provider;
     }
 
     // Calculate origin from align property

package/src/mu/pages/ViewPage.tsx

@@ -58,7 +58,7 @@ type ViewPageFieldType<T> =
  * View page props
  */
 export interface ViewPageProps<T extends {}>
-    extends Exclude<CommonPageProps, 'children'> {
+    extends Omit<CommonPageProps, 'children'> {
     /**
      * Actions
      */

package/src/notifier/Notifier.ts

@@ -163,7 +163,7 @@ export abstract class NotifierReact
     protected constructor() {
         super((notification, dismiss) => {
             // Make sure the state update is set
-            this.stateUpdate!({ notification, dismiss });
+            if (this.stateUpdate) this.stateUpdate({ notification, dismiss });
         });
     }
 

package/src/states/IState.ts

@@ -1,5 +1,5 @@
 import { IAction, IState, UserKey } from '@etsoo/appscript';
-import React from 'react';
+import React, { ReactNode } from 'react';
 
 /**
  * State UI creator
@@ -49,5 +49,13 @@ export interface IProviderUpdate<A extends IAction> {
  * State provider props
  */
 export interface IProviderProps<A extends IAction> {
+    /**
+     * Children
+     */
+    children?: ReactNode | undefined;
+
+    /**
+     * Update callback
+     */
     update?: IProviderUpdate<A>;
 }

package/src/states/RouterProps.ts

@@ -1,6 +1,5 @@
 import { DataTypes } from '@etsoo/shared';
 import { RouteComponentProps } from '@reach/router';
-import { Props } from 'react-input-mask';
 
 /**
  * Add / Edit page router props, include 'id' (/:id) or none when adding query parameter