@carbonorm/carbonreact 4.0.1 → 4.0.3

package/package.json

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

package/src/CarbonReact.tsx

@@ -48,22 +48,31 @@ export function isJsonString(str: string) {
     return true;
 }
 
-const persistentStateMap = new Map<string, iCarbonReactState>();
-
-abstract class CarbonReact<P = {}, S extends { [key: string]: any; } = {}> extends Component<{
+abstract class CarbonReact<P = {}, S extends { [key: string]: any; } = typeof initialCarbonReactState> extends Component<{
     children?: ReactNode | ReactNode[],
     instanceId?: string,
     websocket?: Omit<iCarbonWebSocketProps, "instance"> | boolean
-} & P, S & iCarbonReactState> {
+} & P, S> {
 
-    context: Context<S & iCarbonReactState> = createContext(this.state);
+    private static persistentStateMap = new Map<string, { [key: string]: any; }>();
 
-    // Private static member
-    // we actually implement this in the constructor todo - test this
-    protected static instance: CarbonReact;
+    // Context is for functional components to access the state of this class efficiently
+    context: Context<S> = createContext(this.state);
 
     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,12 +107,12 @@ abstract class CarbonReact<P = {}, S extends { [key: string]: any; } = {}> exten
         // 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 && persistentStateMap.has(this.props.instanceId)) {
+        if (this.props.instanceId && CarbonReact.persistentStateMap.has(this.props.instanceId)) {
 
-            this.state = persistentStateMap.get(this.props.instanceId) as S & iCarbonReactState;
+            this.state = CarbonReact.persistentStateMap.get(this.props.instanceId) as S & iCarbonReactState;
 
         } else {
 
@@ -128,12 +137,12 @@ abstract class CarbonReact<P = {}, S extends { [key: string]: any; } = {}> exten
 
 
     shouldComponentUpdate(
-        nextProps: Readonly<any>,
-        nextState: Readonly<iCarbonReactState>,
+        nextProps: Readonly<P>,
+        nextState: Readonly<S>,
         _nextContext: any): boolean {
 
         if (this.props.instanceId) {
-            persistentStateMap.set(this.props.instanceId, nextState);
+            CarbonReact.persistentStateMap.set(this.props.instanceId, nextState);
         }
 
         changed(this.constructor.name + ' (C6Api)', 'props', this.props, nextProps);
@@ -144,7 +153,7 @@ abstract class CarbonReact<P = {}, S extends { [key: string]: any; } = {}> exten
 
     }
 
-    componentDidUpdate(_prevProps: Readonly<any>, _prevState: Readonly<iCarbonReactState>, _snapshot?: any) {
+    componentDidUpdate(_prevProps: Readonly<P>, _prevState: Readonly<S>, _snapshot?: any) {
         if (CarbonReact.lastLocation !== location.pathname) {
             CarbonReact.lastLocation = location.pathname;
             const websocket = this.state.websocket;