@carbonorm/carbonreact 4.0.2 → 4.0.4

package/dist/index.esm.js

@@ -4359,11 +4359,16 @@ function isJsonString(str) {
 }
 class CarbonReact extends Component {
     static persistentStateMap = new Map();
+    // Context is for functional components to access the state of this class efficiently
     context = createContext(this.state);
-    // Private static member
-    // we actually implement this in the constructor todo - test this
-    static instance;
     target;
+    static _instance;
+    static get instance() {
+        return this;
+    }
+    static set instance(instance) {
+        this._instance = instance;
+    }
     updateRestfulObjectArrays = (rest) => updateRestfulObjectArrays({
         instance: this,
         ...rest
@@ -4383,7 +4388,7 @@ class CarbonReact extends 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 && CarbonReact.persistentStateMap.has(this.props.instanceId)) {
             this.state = CarbonReact.persistentStateMap.get(this.props.instanceId);
@@ -4427,11 +4432,11 @@ class CarbonReact extends Component {
         console.log('%c color (' + colorHex + ')', 'color: ' + colorHex);
         const nest = jsxRuntime_1(Nest, { position: 'fixed', backgroundColor: '', color: hexToRgb(colorHex), count: 100 });
         if (this.state.backendThrowable.length > 0) {
-            return jsxRuntime_2(jsxRuntime_3, { children: [nest, jsxRuntime_1(BackendThrowable, { instance: CarbonReact.instance })] });
+            return jsxRuntime_2(jsxRuntime_3, { children: [nest, jsxRuntime_1(BackendThrowable, { instance: this })] });
         }
         const Context = this.context.Provider;
         return jsxRuntime_2(jsxRuntime_3, { children: [jsxRuntime_1(GlobalHistory, {}), this.props.websocket &&
-                    jsxRuntime_1(CarbonWebSocket, { ...(true === this.props.websocket ? {} : this.props.websocket), instance: CarbonReact.instance }), jsxRuntime_1(Context, { value: this.state, children: this.props.children }), jsxRuntime_1(ToastContainer, {})] });
+                    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, {})] });
     }
 }