@carbonorm/carbonreact 4.0.1 → 4.0.3

package/dist/CarbonReact.d.ts

@@ -19,14 +19,17 @@ export declare const initialCarbonReactState: iCarbonReactState & iRestfulObject
 export declare function isJsonString(str: string): boolean;
 declare abstract class CarbonReact<P = {}, S extends {
     [key: string]: any;
-} = {}> extends Component<{
+} = typeof initialCarbonReactState> extends Component<{
     children?: ReactNode | ReactNode[];
     instanceId?: string;
     websocket?: Omit<iCarbonWebSocketProps, "instance"> | boolean;
-} & P, S & iCarbonReactState> {
-    context: Context<S & iCarbonReactState>;
-    protected static instance: CarbonReact;
+} & P, S> {
+    private static persistentStateMap;
+    context: Context<S>;
     protected target: typeof CarbonReact;
+    protected static _instance: CarbonReact;
+    static get instance(): CarbonReact;
+    static set instance(instance: CarbonReact);
     protected updateRestfulObjectArrays: <ObjectType extends {
         [key: string]: any;
     } = {}>(rest: Omit<iUpdateRestfulObjectArrays<ObjectType, S, P>, "instance">) => void;
@@ -40,8 +43,8 @@ declare abstract class CarbonReact<P = {}, S extends {
         shouldStatePersist?: boolean | undefined;
         websocket?: boolean | iCarbonWebSocketProps | undefined;
     } & P);
-    shouldComponentUpdate(nextProps: Readonly<any>, nextState: Readonly<iCarbonReactState>, _nextContext: any): boolean;
-    componentDidUpdate(_prevProps: Readonly<any>, _prevState: Readonly<iCarbonReactState>, _snapshot?: any): void;
+    shouldComponentUpdate(nextProps: Readonly<P>, nextState: Readonly<S>, _nextContext: any): boolean;
+    componentDidUpdate(_prevProps: Readonly<P>, _prevState: Readonly<S>, _snapshot?: any): void;
     render(): ReactElement;
 }
 export default CarbonReact;

package/dist/index.cjs.js

@@ -4359,13 +4359,19 @@ function isJsonString(str) {
     }
     return true;
 }
-const persistentStateMap = new Map();
 class CarbonReact extends react.Component {
+    static persistentStateMap = new Map();
+    // Context is for functional components to access the state of this class efficiently
     context = react.createContext(this.state);
-    // Private static member
-    // we actually implement this in the constructor todo - test this
-    static instance;
     target;
+    static _instance;
+    static get instance() {
+        // Here `this` refers to the calling class in static context
+        return this._instance;
+    }
+    static set instance(instance) {
+        this._instance = instance;
+    }
     updateRestfulObjectArrays = (rest) => updateRestfulObjectArrays({
         instance: this,
         ...rest
@@ -4385,10 +4391,10 @@ class CarbonReact extends react.Component {
         // 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)) {
-            this.state = persistentStateMap.get(this.props.instanceId);
+        if (this.props.instanceId && CarbonReact.persistentStateMap.has(this.props.instanceId)) {
+            this.state = CarbonReact.persistentStateMap.get(this.props.instanceId);
         }
         else {
             // This should only ever be done here, when the full state is being trashed.
@@ -4407,7 +4413,7 @@ class CarbonReact extends react.Component {
     }
     shouldComponentUpdate(nextProps, nextState, _nextContext) {
         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);
         changed(this.constructor.name + ' (C6Api)', 'state', this.state, nextState);