@carbonorm/carbonreact 3.6.0 → 3.6.2

package/dist/index.esm.js

@@ -1,4 +1,4 @@
-import react, { useRef, useState, useEffect, Component, createContext, lazy } from 'react';
+import react, { useRef, useState, useEffect, Component, createContext, useContext, lazy } from 'react';
 import { toastOptions, clearCache, timeout, axiosInstance, isVerbose, checkAllRequestsComplete } from '@carbonorm/carbonnode';
 import { useNavigate } from 'react-router-dom';
 import { toast, ToastContainer } from 'react-toastify';
@@ -4255,10 +4255,18 @@ function isJsonString(str) {
     return true;
 }
 // Create a context
-const CarbonReact = class extends Component {
-    static instance;
+const persistentStateMap = new Map();
+class CarbonReact extends Component {
     context = createContext(this.state);
-    static persistentState = undefined;
+    // Private static member
+    static instance;
+    static getState() {
+        return CarbonReact.instance.state;
+    }
+    static useContext() {
+        return () => useContext(CarbonReact.instance.context);
+    }
+    protected;
     static lastLocation = window.location.pathname;
     // @link https://github.com/welldone-software/why-did-you-render
     // noinspection JSUnusedGlobalSymbols
@@ -4266,16 +4274,20 @@ const CarbonReact = class extends Component {
     constructor(props) {
         super(props);
         console.log('CarbonORM TSX CONSTRUCTOR');
-        if (CarbonReact.persistentState !== undefined && this.props.shouldStatePersist !== false) {
-            this.state = CarbonReact.persistentState;
+        Object.assign(this, {
+            instance: this
+        });
+        if (this.props.instanceId && persistentStateMap.has(this.props.instanceId)) {
+            this.state = persistentStateMap.get(this.props.instanceId);
         }
         else {
+            // This should only ever be done here, when the full state is being trashed.
+            // todo - does this suck in context of multiple instances?
+            clearCache({
+                ignoreWarning: true
+            });
             this.state = initialCarbonReactState;
         }
-        // This should only ever be done here, when the full state is being trashed.
-        clearCache({
-            ignoreWarning: true
-        });
         /** We can think of our app as having one state; this state.
          * Long-term, I'd like us to store this state to local storage and only load updates on reload...
          * Class based components are far easier to manage state in local storage and pass state down to children.
@@ -4283,15 +4295,9 @@ const CarbonReact = class extends Component {
          * components' tend to be shorter syntactically and bonus points if it's stateless.
          **/
     }
-    static getState() {
-        return CarbonReact.instance.state;
-    }
     shouldComponentUpdate(nextProps, nextState, _nextContext) {
-        if (this.props.shouldStatePersist === false) {
-            CarbonReact.persistentState = undefined;
-        }
-        else {
-            CarbonReact.persistentState = nextState;
+        if (this.props.instanceId) {
+            persistentStateMap.set(this.props.instanceId, nextState);
         }
         changed(this.constructor.name + ' (C6Api)', 'props', this.props, nextProps);
         changed(this.constructor.name + ' (C6Api)', 'state', this.state, nextState);
@@ -4316,9 +4322,10 @@ const CarbonReact = class extends Component {
             return jsxRuntime_2(jsxRuntime_3, { children: [nest, jsxRuntime_1(BackendThrowable, {})] });
         }
         const Context = this.context.Provider;
-        return jsxRuntime_2(jsxRuntime_3, { children: [jsxRuntime_1(GlobalHistory, {}), jsxRuntime_1(CarbonWebSocket, {}), jsxRuntime_1(Context, { value: this.state, children: this.props.children }), jsxRuntime_1(ToastContainer, {})] });
+        return jsxRuntime_2(jsxRuntime_3, { children: [jsxRuntime_1(GlobalHistory, {}), this.props.websocket &&
+                    jsxRuntime_1(CarbonWebSocket, { ...(true === this.props.websocket ? {} : this.props.websocket) }), jsxRuntime_1(Context, { value: this.state, children: this.props.children }), jsxRuntime_1(ToastContainer, {})] });
     }
-};
+}
 
 var getStatefulObjectWithWhere = ({ request }) => {
     console.log('request', request);