@carbonorm/carbonreact 4.0.15 → 4.0.17

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@carbonorm/carbonreact",
   "license": "MIT",
-  "version": "4.0.15",
+  "version": "4.0.17",
   "browser": "dist/index.umd.js",
   "module": "dist/index.esm.js",
   "main": "dist/index.cjs.js",

package/src/CarbonReact.tsx

@@ -1,15 +1,16 @@
 import changed from "hoc/changed";
-import { GlobalHistory } from "hoc/GlobalHistory";
+import {GlobalHistory} from "hoc/GlobalHistory";
 import hexToRgb from "hoc/hexToRgb";
-import { Component, Context, createContext, ReactElement, ReactNode } from 'react';
-import { ToastContainer } from 'react-toastify';
+import {Component, Context, createContext, ReactElement, ReactNode} from 'react';
+import {ToastContainer} from 'react-toastify';
 import 'react-toastify/dist/ReactToastify.min.css';
 import BackendThrowable from 'components/Errors/BackendThrowable';
 import Nest from 'components/Nest/Nest';
-import { initialRestfulObjectsState, iRestfulObjectArrayTypes } from "variables/C6";
-import CarbonWebSocket, { iCarbonWebSocketProps } from "./components/WebSocket/CarbonWebSocket";
-import updateRestfulObjectArrays, { iUpdateRestfulObjectArrays } from "./hoc/updateRestfulObjectArrays";
-import deleteRestfulObjectArrays, { iDeleteRestfulObjectArrays } from "./hoc/deleteRestfulObjectArrays";
+import {initialRestfulObjectsState, iRestfulObjectArrayTypes} from "variables/C6";
+import CarbonWebSocket, {iCarbonWebSocketProps} from "./components/WebSocket/CarbonWebSocket";
+import updateRestfulObjectArrays, {iUpdateRestfulObjectArrays} from "./hoc/updateRestfulObjectArrays";
+import deleteRestfulObjectArrays, {iDeleteRestfulObjectArrays} from "./hoc/deleteRestfulObjectArrays";
+import {BrowserRouter, HashRouter, MemoryRouter, Routes} from "react-router-dom";
 
 export type tStatefulApiData<T extends { [key: string]: any } = {}> = T[] | undefined | null;
 
@@ -44,15 +45,21 @@ export function isJsonString(str: string) {
     return true;
 }
 
+export enum eRouterType {
+    BrowserRouter,
+    HashRouter,
+    MemoryRouter,
+}
+
 abstract class CarbonReact<P = {}, S extends iCarbonReactState = iCarbonReactState> extends Component<{
     children?: ReactNode | ReactNode[],
     instanceId?: string,
     persistentState?: boolean,
+    routerType?: eRouterType,
     websocket?: Omit<iCarbonWebSocketProps<P, S>, "instance"> | false
 } & P, S> {
 
     private static allInstances = new Map<string, CarbonReact<any, any>>();
-    private static activeInstances = new Map<string, CarbonReact<any, any>>();
 
     context: Context<S & iCarbonReactState> = createContext(this.state);
     protected target: typeof CarbonReact;
@@ -64,8 +71,8 @@ abstract class CarbonReact<P = {}, S extends iCarbonReactState = iCarbonReactSta
         const identifier = this.generateIdentifier(instanceId);
 
         if (undefined !== instanceId) {
-            if (CarbonReact.activeInstances.has(identifier)) {
-                return CarbonReact.activeInstances.get(identifier) as T;
+            if (CarbonReact.allInstances.has(identifier)) {
+                return CarbonReact.allInstances.get(identifier) as T;
             }
             throw new Error(`No instance has been instantiated yet for class (${this.name}) with instanceId (${instanceId})`);
         }
@@ -75,6 +82,7 @@ abstract class CarbonReact<P = {}, S extends iCarbonReactState = iCarbonReactSta
         }
 
         return this._instance as T;
+
     }
 
     static get instance() {
@@ -111,13 +119,6 @@ abstract class CarbonReact<P = {}, S extends iCarbonReactState = iCarbonReactSta
 
         const identifier = this.generateIdentifier();
 
-        if (CarbonReact.activeInstances.has(identifier)) {
-            throw new Error(`${identifier} instance already exists in the DOM! Each instance should have a unique instanceId.`);
-        }
-
-        // Register the new instance
-        CarbonReact.activeInstances.set(identifier, this);
-
         if (props.persistentState && CarbonReact.allInstances.has(identifier)) {
             // Reuse the state from the existing instance
             this.state = CarbonReact.allInstances.get(identifier)!.state as S & iCarbonReactState;
@@ -144,11 +145,6 @@ abstract class CarbonReact<P = {}, S extends iCarbonReactState = iCarbonReactSta
         return this.props.instanceId ? `${className}-${this.props.instanceId}` : className;
     }
 
-    componentWillUnmount() {
-        const identifier = this.generateIdentifier();
-        CarbonReact.activeInstances.delete(identifier);
-    }
-
     shouldComponentUpdate(
         nextProps: Readonly<P>,
         nextState: Readonly<S>,
@@ -171,6 +167,19 @@ abstract class CarbonReact<P = {}, S extends iCarbonReactState = iCarbonReactSta
         }
     }
 
+    reactRouterContext(children: ReactElement) {
+        switch (this.props.routerType) {
+            case eRouterType.BrowserRouter:
+                return <BrowserRouter>{children}</BrowserRouter>
+            case eRouterType.MemoryRouter:
+                return <MemoryRouter initialEntries={['/']}>{children}</MemoryRouter>
+            case eRouterType.HashRouter:
+                return <HashRouter>{children}</HashRouter>
+            default:
+                throw new Error('Invalid routerType');
+        }
+    }
+
     render(): ReactElement {
         console.log('CarbonORM TSX RENDER');
 
@@ -178,27 +187,28 @@ abstract class CarbonReact<P = {}, S extends iCarbonReactState = iCarbonReactSta
 
         console.log('%c color (' + colorHex + ')', 'color: ' + colorHex);
 
-        const nest = <Nest position={'fixed'} backgroundColor={''} color={hexToRgb(colorHex)} count={100} />;
+        const nest = <Nest position={'fixed'} backgroundColor={''} color={hexToRgb(colorHex)} count={100}/>;
 
         if (this.state.backendThrowable.length > 0) {
             return <>
                 {nest}
-                <BackendThrowable instance={this} />
+                <BackendThrowable instance={this}/>
             </>;
         }
 
+        this.context = createContext(this.state)
         const Context = this.context.Provider;
 
-        return <>
-            <GlobalHistory />
+        return this.reactRouterContext(<Routes>
+            <GlobalHistory/>
             {this.props.websocket &&
                 <CarbonWebSocket<P, S> {...(false !== this.props.websocket ? this.props.websocket : {})}
-                                       instance={this} />}
+                                       instance={this}/>}
             <Context value={this.state}>
                 {this.props.children}
             </Context>
-            <ToastContainer />
-        </>;
+            <ToastContainer/>
+        </Routes>);
     }
 }