@carbonorm/carbonreact 4.0.14 → 4.0.16

package/dist/index.esm.js

@@ -1,8 +1,8 @@
 import react, { useRef, useState, useEffect, Component, createContext, lazy } from 'react';
-import { toastOptions, clearCache, timeout, axiosInstance, isVerbose, checkAllRequestsComplete } from '@carbonorm/carbonnode';
 import { useNavigate } 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';
 import classNames from 'classnames';
 import { faClose } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
@@ -4370,12 +4370,21 @@ function isJsonString(str) {
     return true;
 }
 class CarbonReact extends Component {
-    static persistentStateMap = new Map();
-    static activeInstances = new Map();
+    static allInstances = new Map();
     context = createContext(this.state);
     target;
     static _instance;
-    static getInstance() {
+    static getInstance(instanceId) {
+        const identifier = this.generateIdentifier(instanceId);
+        if (undefined !== instanceId) {
+            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})`);
+        }
+        if (!this._instance) {
+            throw new Error(`No instance has been instantiated yet for class (${this.name})`);
+        }
         return this._instance;
     }
     static get instance() {
@@ -4396,32 +4405,30 @@ class CarbonReact extends Component {
     static whyDidYouRender = true;
     constructor(props) {
         super(props);
-        const target = new.target;
-        const identifier = props.instanceId || target.name;
-        if (CarbonReact.activeInstances.has(identifier)) {
-            throw new Error(`Instance with ID ${identifier} already exists! CarbonReact extended classes can only be referenced once in DOM with the same identifier.`);
-        }
-        CarbonReact.activeInstances.set(identifier, this);
-        this.target = target;
-        console.log('CarbonORM TSX CONSTRUCTOR');
-        Object.assign(target, {
-            _instance: this
-        });
-        if (CarbonReact.persistentStateMap.has(identifier)) {
-            this.state = CarbonReact.persistentStateMap.get(identifier);
+        const identifier = this.generateIdentifier();
+        if (props.persistentState && CarbonReact.allInstances.has(identifier)) {
+            // Reuse the state from the existing instance
+            this.state = CarbonReact.allInstances.get(identifier).state;
         }
         else {
-            clearCache({
-                ignoreWarning: true
-            });
             this.state = initialCarbonReactState;
+            CarbonReact.allInstances.set(identifier, this);
         }
-        // Save the initial state to the persistent state map with the identifier
-        CarbonReact.persistentStateMap.set(identifier, this.state);
+        this.target = new.target;
+        console.log('CarbonORM TSX CONSTRUCTOR');
+        Object.assign(this.target, {
+            _instance: this
+        });
+    }
+    static generateIdentifier(instanceId) {
+        const className = this.name;
+        return instanceId ? `${className}-${instanceId}` : className;
+    }
+    generateIdentifier() {
+        const className = this.constructor.name;
+        return this.props.instanceId ? `${className}-${this.props.instanceId}` : className;
     }
     shouldComponentUpdate(nextProps, nextState, _nextContext) {
-        const identifier = this.props.instanceId || this.constructor.name;
-        CarbonReact.persistentStateMap.set(identifier, nextState);
         changed(this.constructor.name + ' (C6Api)', 'props', this.props, nextProps);
         changed(this.constructor.name + ' (C6Api)', 'state', this.state, nextState);
         return true;
@@ -4448,10 +4455,6 @@ class CarbonReact extends Component {
         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, {})] });
     }
-    componentWillUnmount() {
-        const identifier = this.props.instanceId || this.constructor.name;
-        CarbonReact.activeInstances.delete(identifier);
-    }
 }
 
 var getStatefulObjectWithWhere = ({ request }) => {