@carbonorm/carbonreact 4.0.15 → 4.0.17

package/dist/CarbonReact.d.ts

@@ -17,14 +17,19 @@ export interface iCarbonReactState {
 export declare const initialRequiredCarbonORMState: iCarbonReactState;
 export declare const initialCarbonReactState: iCarbonReactState & iRestfulObjectArrayTypes;
 export declare function isJsonString(str: string): boolean;
+export declare enum eRouterType {
+    BrowserRouter = 0,
+    HashRouter = 1,
+    MemoryRouter = 2
+}
 declare 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;
-    private static activeInstances;
     context: Context<S & iCarbonReactState>;
     protected target: typeof CarbonReact;
     protected static _instance: ThisType<CarbonReact<any, any>>;
@@ -47,9 +52,9 @@ declare abstract class CarbonReact<P = {}, S extends iCarbonReactState = iCarbon
     } & P);
     private static generateIdentifier;
     private generateIdentifier;
-    componentWillUnmount(): void;
     shouldComponentUpdate(nextProps: Readonly<P>, nextState: Readonly<S>, _nextContext: any): boolean;
     componentDidUpdate(_prevProps: Readonly<P>, _prevState: Readonly<S>, _snapshot?: any): void;
+    reactRouterContext(children: ReactElement): import("react/jsx-runtime").JSX.Element;
     render(): ReactElement;
 }
 export default CarbonReact;

package/dist/index.cjs.js

@@ -4371,17 +4371,22 @@ function isJsonString(str) {
     }
     return true;
 }
+exports.eRouterType = void 0;
+(function (eRouterType) {
+    eRouterType[eRouterType["BrowserRouter"] = 0] = "BrowserRouter";
+    eRouterType[eRouterType["HashRouter"] = 1] = "HashRouter";
+    eRouterType[eRouterType["MemoryRouter"] = 2] = "MemoryRouter";
+})(exports.eRouterType || (exports.eRouterType = {}));
 class CarbonReact extends react.Component {
     static allInstances = new Map();
-    static activeInstances = new Map();
     context = react.createContext(this.state);
     target;
     static _instance;
     static getInstance(instanceId) {
         const identifier = this.generateIdentifier(instanceId);
         if (undefined !== instanceId) {
-            if (CarbonReact.activeInstances.has(identifier)) {
-                return CarbonReact.activeInstances.get(identifier);
+            if (CarbonReact.allInstances.has(identifier)) {
+                return CarbonReact.allInstances.get(identifier);
             }
             throw new Error(`No instance has been instantiated yet for class (${this.name}) with instanceId (${instanceId})`);
         }
@@ -4409,11 +4414,6 @@ class CarbonReact extends react.Component {
     constructor(props) {
         super(props);
         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;
@@ -4436,10 +4436,6 @@ class CarbonReact extends react.Component {
         const className = this.constructor.name;
         return this.props.instanceId ? `${className}-${this.props.instanceId}` : className;
     }
-    componentWillUnmount() {
-        const identifier = this.generateIdentifier();
-        CarbonReact.activeInstances.delete(identifier);
-    }
     shouldComponentUpdate(nextProps, nextState, _nextContext) {
         changed(this.constructor.name + ' (C6Api)', 'props', this.props, nextProps);
         changed(this.constructor.name + ' (C6Api)', 'state', this.state, nextState);
@@ -4455,6 +4451,18 @@ class CarbonReact extends react.Component {
             }
         }
     }
+    reactRouterContext(children) {
+        switch (this.props.routerType) {
+            case exports.eRouterType.BrowserRouter:
+                return jsxRuntime_1(reactRouterDom.BrowserRouter, { children: children });
+            case exports.eRouterType.MemoryRouter:
+                return jsxRuntime_1(reactRouterDom.MemoryRouter, { initialEntries: ['/'], children: children });
+            case exports.eRouterType.HashRouter:
+                return jsxRuntime_1(reactRouterDom.HashRouter, { children: children });
+            default:
+                throw new Error('Invalid routerType');
+        }
+    }
     render() {
         console.log('CarbonORM TSX RENDER');
         const colorHex = '#' + Math.random().toString(16).slice(-6);
@@ -4463,9 +4471,10 @@ class CarbonReact extends react.Component {
         if (this.state.backendThrowable.length > 0) {
             return jsxRuntime_2(jsxRuntime_3, { children: [nest, jsxRuntime_1(BackendThrowable, { instance: this })] });
         }
+        this.context = react.createContext(this.state);
         const Context = this.context.Provider;
-        return jsxRuntime_2(jsxRuntime_3, { children: [jsxRuntime_1(GlobalHistory, {}), this.props.websocket &&
-                    jsxRuntime_1(CarbonWebSocket, { ...(false !== this.props.websocket ? this.props.websocket : {}), instance: this }), jsxRuntime_1(Context, { value: this.state, children: this.props.children }), jsxRuntime_1(reactToastify.ToastContainer, {})] });
+        return this.reactRouterContext(jsxRuntime_2(reactRouterDom.Routes, { children: [jsxRuntime_1(GlobalHistory, {}), this.props.websocket &&
+                    jsxRuntime_1(CarbonWebSocket, { ...(false !== this.props.websocket ? this.props.websocket : {}), instance: this }), jsxRuntime_1(Context, { value: this.state, children: this.props.children }), jsxRuntime_1(reactToastify.ToastContainer, {})] }));
     }
 }