@carbonorm/carbonreact 4.0.2 → 4.0.3

package/package.json

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

package/src/CarbonReact.tsx

@@ -56,14 +56,23 @@ abstract class CarbonReact<P = {}, S extends { [key: string]: any; } = typeof in
 
     private static persistentStateMap = new Map<string, { [key: string]: any; }>();
 
+    // Context is for functional components to access the state of this class efficiently
     context: Context<S> = createContext(this.state);
 
-    // Private static member
-    // we actually implement this in the constructor todo - test this
-    protected static instance: CarbonReact;
-
     protected target: typeof CarbonReact;
 
+    protected static _instance: CarbonReact;
+
+    static get instance() {
+        // Here `this` refers to the calling class in static context
+        return this._instance;
+    }
+
+    static set instance(instance: CarbonReact) {
+        this._instance = instance;
+    }
+
+
     protected updateRestfulObjectArrays = <ObjectType extends { [key: string]: any; } = {}>
     (rest: Omit<iUpdateRestfulObjectArrays<ObjectType, S, P>, "instance">) => updateRestfulObjectArrays<ObjectType, S, P>({
         instance: this,
@@ -98,7 +107,7 @@ abstract class CarbonReact<P = {}, S extends { [key: string]: any; } = typeof in
         // this is the magic that allows each class that's extends this to have a static instance - a singleton pattern
         // new.target is a meta-property introduced in ES6 that references the constructor that was directly invoked with the new keyword.
         Object.assign(new.target, {
-            instance: this
+            _instance: this
         })
 
         if (this.props.instanceId && CarbonReact.persistentStateMap.has(this.props.instanceId)) {