@carbonorm/carbonreact 4.0.15 → 4.0.16

package/package.json

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

package/src/CarbonReact.tsx

@@ -52,7 +52,6 @@ abstract class CarbonReact<P = {}, S extends iCarbonReactState = iCarbonReactSta
 } & 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 +63,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 +74,7 @@ abstract class CarbonReact<P = {}, S extends iCarbonReactState = iCarbonReactSta
         }
 
         return this._instance as T;
+
     }
 
     static get instance() {
@@ -111,13 +111,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 +137,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>,