@carbonorm/carbonreact 4.0.15 → 4.0.17

package/dist/index.esm.js

@@ -1,5 +1,5 @@
 import react, { useRef, useState, useEffect, Component, createContext, lazy } from 'react';
-import { useNavigate } from 'react-router-dom';
+import { useNavigate, HashRouter, MemoryRouter, BrowserRouter, Routes } from 'react-router-dom';
 import { toast, ToastContainer } from 'react-toastify';
 import OutsideClickHandler from 'react-outside-click-handler';
 import { toastOptions, timeout, axiosInstance, isVerbose, checkAllRequestsComplete } from '@carbonorm/carbonnode';
@@ -4369,17 +4369,22 @@ function isJsonString(str) {
     }
     return true;
 }
+var eRouterType;
+(function (eRouterType) {
+    eRouterType[eRouterType["BrowserRouter"] = 0] = "BrowserRouter";
+    eRouterType[eRouterType["HashRouter"] = 1] = "HashRouter";
+    eRouterType[eRouterType["MemoryRouter"] = 2] = "MemoryRouter";
+})(eRouterType || (eRouterType = {}));
 class CarbonReact extends Component {
     static allInstances = new Map();
-    static activeInstances = new Map();
     context = 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})`);
         }
@@ -4407,11 +4412,6 @@ class CarbonReact extends 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;
@@ -4434,10 +4434,6 @@ class CarbonReact extends 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);
@@ -4453,6 +4449,18 @@ class CarbonReact extends Component {
             }
         }
     }
+    reactRouterContext(children) {
+        switch (this.props.routerType) {
+            case eRouterType.BrowserRouter:
+                return jsxRuntime_1(BrowserRouter, { children: children });
+            case eRouterType.MemoryRouter:
+                return jsxRuntime_1(MemoryRouter, { initialEntries: ['/'], children: children });
+            case eRouterType.HashRouter:
+                return jsxRuntime_1(HashRouter, { children: children });
+            default:
+                throw new Error('Invalid routerType');
+        }
+    }
     render() {
         console.log('CarbonORM TSX RENDER');
         const colorHex = '#' + Math.random().toString(16).slice(-6);
@@ -4461,9 +4469,10 @@ class CarbonReact extends Component {
         if (this.state.backendThrowable.length > 0) {
             return jsxRuntime_2(jsxRuntime_3, { children: [nest, jsxRuntime_1(BackendThrowable, { instance: this })] });
         }
+        this.context = 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(ToastContainer, {})] });
+        return this.reactRouterContext(jsxRuntime_2(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(ToastContainer, {})] }));
     }
 }
 
@@ -4759,5 +4768,5 @@ function useWindowDimensions() {
     return windowDimensions;
 }
 
-export { AccessDenied, Alert, BackendThrowable, C6, COLUMNS, CarbonReact, CarbonWebSocket, ErrorHttpCode, GlobalHistory, Loading, Nest, PageNotFound, Popup, TABLES, addAlert, addValidSQL$1 as addValidSQL, carbons, changed, comments, deleteRestfulObjectArrays, documentation, eUpdateInsertMethod, feature_group_references, features, getRootStyleValue, getStatefulObjectWithWhere, getStyles, globalNavigate, group_references, groups, hexToRgb, history_logs, initialCarbonReactState, initialRequiredCarbonORMState, initialRestfulObjectsState, initiateWebsocket, isEdgeBrowser, isJsonString, isProduction, location_references, locations, parseMultipleJson, photos, range, reports, ScrollIntoViewDirective as scrollIntoView, setCookies, setUrl, setupTests, toDataURL, updateRestfulObjectArrays, uploadImage, uploadImageChange, useEffectOnce, user_followers, user_groups, user_messages, user_sessions, user_tasks, users, ValidSQL as validSQL, watchInputElementChangeEvent, useWindowDimensions as windowDimensions, wp_commentmeta, wp_comments, wp_links, wp_options, wp_postmeta, wp_posts, wp_term_relationships, wp_term_taxonomy, wp_termmeta, wp_terms, wp_usermeta, wp_users };
+export { AccessDenied, Alert, BackendThrowable, C6, COLUMNS, CarbonReact, CarbonWebSocket, ErrorHttpCode, GlobalHistory, Loading, Nest, PageNotFound, Popup, TABLES, addAlert, addValidSQL$1 as addValidSQL, carbons, changed, comments, deleteRestfulObjectArrays, documentation, eRouterType, eUpdateInsertMethod, feature_group_references, features, getRootStyleValue, getStatefulObjectWithWhere, getStyles, globalNavigate, group_references, groups, hexToRgb, history_logs, initialCarbonReactState, initialRequiredCarbonORMState, initialRestfulObjectsState, initiateWebsocket, isEdgeBrowser, isJsonString, isProduction, location_references, locations, parseMultipleJson, photos, range, reports, ScrollIntoViewDirective as scrollIntoView, setCookies, setUrl, setupTests, toDataURL, updateRestfulObjectArrays, uploadImage, uploadImageChange, useEffectOnce, user_followers, user_groups, user_messages, user_sessions, user_tasks, users, ValidSQL as validSQL, watchInputElementChangeEvent, useWindowDimensions as windowDimensions, wp_commentmeta, wp_comments, wp_links, wp_options, wp_postmeta, wp_posts, wp_term_relationships, wp_term_taxonomy, wp_termmeta, wp_terms, wp_usermeta, wp_users };
 //# sourceMappingURL=index.esm.js.map