@carbonorm/carbonreact 4.0.14 → 4.0.16

package/dist/CarbonReact.d.ts

@@ -20,14 +20,14 @@ export declare function isJsonString(str: string): boolean;
 declare abstract class CarbonReact<P = {}, S extends iCarbonReactState = iCarbonReactState> extends Component<{
     children?: ReactNode | ReactNode[];
     instanceId?: string;
+    persistentState?: boolean;
     websocket?: Omit<iCarbonWebSocketProps<P, S>, "instance"> | false;
 } & P, S> {
-    private static persistentStateMap;
-    private static activeInstances;
+    private static allInstances;
     context: Context<S & iCarbonReactState>;
     protected target: typeof CarbonReact;
     protected static _instance: ThisType<CarbonReact<any, any>>;
-    static getInstance<T extends CarbonReact<any, any>>(): T;
+    static getInstance<T extends CarbonReact<any, any>>(instanceId?: string): T;
     static get instance(): CarbonReact<any, any>;
     static set instance(instance: CarbonReact<any, any>);
     updateRestfulObjectArrays: <ObjectType extends {
@@ -40,13 +40,14 @@ declare abstract class CarbonReact<P = {}, S extends iCarbonReactState = iCarbon
     static whyDidYouRender: boolean;
     protected constructor(props: {
         children?: ReactNode | ReactNode[];
-        shouldStatePersist?: boolean | undefined;
         websocket?: boolean | iCarbonWebSocketProps<P, S> | undefined;
         instanceId?: string;
+        persistentState?: boolean;
     } & P);
+    private static generateIdentifier;
+    private generateIdentifier;
     shouldComponentUpdate(nextProps: Readonly<P>, nextState: Readonly<S>, _nextContext: any): boolean;
     componentDidUpdate(_prevProps: Readonly<P>, _prevState: Readonly<S>, _snapshot?: any): void;
     render(): ReactElement;
-    componentWillUnmount(): void;
 }
 export default CarbonReact;

package/dist/index.cjs.js

@@ -1,10 +1,10 @@
 'use strict';
 
 var react = require('react');
-var carbonnode = require('@carbonorm/carbonnode');
 var reactRouterDom = require('react-router-dom');
 var reactToastify = require('react-toastify');
 var OutsideClickHandler = require('react-outside-click-handler');
+var carbonnode = require('@carbonorm/carbonnode');
 var classNames = require('classnames');
 var freeSolidSvgIcons = require('@fortawesome/free-solid-svg-icons');
 var reactFontawesome = require('@fortawesome/react-fontawesome');
@@ -4372,12 +4372,21 @@ function isJsonString(str) {
     return true;
 }
 class CarbonReact extends react.Component {
-    static persistentStateMap = new Map();
-    static activeInstances = new Map();
+    static allInstances = new Map();
     context = react.createContext(this.state);
     target;
     static _instance;
-    static getInstance() {
+    static getInstance(instanceId) {
+        const identifier = this.generateIdentifier(instanceId);
+        if (undefined !== instanceId) {
+            if (CarbonReact.allInstances.has(identifier)) {
+                return CarbonReact.allInstances.get(identifier);
+            }
+            throw new Error(`No instance has been instantiated yet for class (${this.name}) with instanceId (${instanceId})`);
+        }
+        if (!this._instance) {
+            throw new Error(`No instance has been instantiated yet for class (${this.name})`);
+        }
         return this._instance;
     }
     static get instance() {
@@ -4398,32 +4407,30 @@ class CarbonReact extends react.Component {
     static whyDidYouRender = true;
     constructor(props) {
         super(props);
-        const target = new.target;
-        const identifier = props.instanceId || target.name;
-        if (CarbonReact.activeInstances.has(identifier)) {
-            throw new Error(`Instance with ID ${identifier} already exists! CarbonReact extended classes can only be referenced once in DOM with the same identifier.`);
-        }
-        CarbonReact.activeInstances.set(identifier, this);
-        this.target = target;
-        console.log('CarbonORM TSX CONSTRUCTOR');
-        Object.assign(target, {
-            _instance: this
-        });
-        if (CarbonReact.persistentStateMap.has(identifier)) {
-            this.state = CarbonReact.persistentStateMap.get(identifier);
+        const identifier = this.generateIdentifier();
+        if (props.persistentState && CarbonReact.allInstances.has(identifier)) {
+            // Reuse the state from the existing instance
+            this.state = CarbonReact.allInstances.get(identifier).state;
         }
         else {
-            carbonnode.clearCache({
-                ignoreWarning: true
-            });
             this.state = initialCarbonReactState;
+            CarbonReact.allInstances.set(identifier, this);
         }
-        // Save the initial state to the persistent state map with the identifier
-        CarbonReact.persistentStateMap.set(identifier, this.state);
+        this.target = new.target;
+        console.log('CarbonORM TSX CONSTRUCTOR');
+        Object.assign(this.target, {
+            _instance: this
+        });
+    }
+    static generateIdentifier(instanceId) {
+        const className = this.name;
+        return instanceId ? `${className}-${instanceId}` : className;
+    }
+    generateIdentifier() {
+        const className = this.constructor.name;
+        return this.props.instanceId ? `${className}-${this.props.instanceId}` : className;
     }
     shouldComponentUpdate(nextProps, nextState, _nextContext) {
-        const identifier = this.props.instanceId || this.constructor.name;
-        CarbonReact.persistentStateMap.set(identifier, nextState);
         changed(this.constructor.name + ' (C6Api)', 'props', this.props, nextProps);
         changed(this.constructor.name + ' (C6Api)', 'state', this.state, nextState);
         return true;
@@ -4450,10 +4457,6 @@ class CarbonReact extends react.Component {
         return jsxRuntime_2(jsxRuntime_3, { children: [jsxRuntime_1(GlobalHistory, {}), this.props.websocket &&
                     jsxRuntime_1(CarbonWebSocket, { ...(false !== this.props.websocket ? this.props.websocket : {}), instance: this }), jsxRuntime_1(Context, { value: this.state, children: this.props.children }), jsxRuntime_1(reactToastify.ToastContainer, {})] });
     }
-    componentWillUnmount() {
-        const identifier = this.props.instanceId || this.constructor.name;
-        CarbonReact.activeInstances.delete(identifier);
-    }
 }
 
 var getStatefulObjectWithWhere = ({ request }) => {