@carbonorm/carbonreact 4.0.10 → 4.0.11

package/package.json

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

package/src/CarbonReact.tsx

@@ -49,11 +49,13 @@ export function isJsonString(str: string) {
 
 }
 
-abstract class CarbonReact<P = {}, S extends iCarbonReactState = iCarbonReactState> extends Component<{
+export interface iCarbonReactProps<P = {}, S extends iCarbonReactState = iCarbonReactState> {
     children?: ReactNode | ReactNode[],
     instanceId?: string,
-    websocket?: Omit<iCarbonWebSocketProps<P,S>, "instance"> | false
-} & P, S> {
+    websocket?: Omit<iCarbonWebSocketProps<P, S>, "instance"> | false
+}
+
+abstract class CarbonReact<P = {}, S extends iCarbonReactState = iCarbonReactState> extends Component<iCarbonReactProps<P, S> & P, S> {
 
     private static persistentStateMap = new Map<string, { [key: string]: any; }>();
 
@@ -68,9 +70,11 @@ abstract class CarbonReact<P = {}, S extends iCarbonReactState = iCarbonReactSta
     static getInstance<T extends CarbonReact<any, any>>(): T {
         return this._instance as T;
     }
+
     static get instance() {
         return this.getInstance();
     }
+
     static set instance(instance: CarbonReact<any, any>) {
         this._instance = instance;
     }
@@ -95,14 +99,20 @@ abstract class CarbonReact<P = {}, S extends iCarbonReactState = iCarbonReactSta
     static whyDidYouRender = true;
 
 
-    protected constructor(props: {
-        children?: ReactNode | ReactNode[];
-        shouldStatePersist?: boolean | undefined;
-        websocket?: boolean | iCarbonWebSocketProps<P,S> | undefined;
-    } & P) {
+    protected constructor(props) {
 
         super(props);
 
+        if (!props.instanceId && (new.target as typeof CarbonReact)._instance) {
+
+            // todo - instanceId being unique should solve this, but.... how
+            // This is a singleton pattern, we can only have one instance of this class
+            throw new Error(`${new.target.name} instance already exists! CarbonReact extended classes can only be referenced once in DOM`);
+
+        }
+
+        (new.target as typeof CarbonReact).instance = (this);
+
         this.target = new.target;
 
         console.log('CarbonORM TSX CONSTRUCTOR');
@@ -191,8 +201,8 @@ abstract class CarbonReact<P = {}, S extends iCarbonReactState = iCarbonReactSta
         return <>
             <GlobalHistory/>
             {this.props.websocket &&
-                <CarbonWebSocket<P,S> {...(false !== this.props.websocket ? this.props.websocket : {})}
-                                 instance={this}/>}
+                <CarbonWebSocket<P, S> {...(false !== this.props.websocket ? this.props.websocket : {})}
+                                       instance={this}/>}
             <Context value={this.state}>
                 {this.props.children}
             </Context>

package/src/components/Alert/Alert.tsx

@@ -18,10 +18,10 @@ export interface iAlertButtonOptions {
     color: "default" | "primary" | "secondary" | "inherit" | "danger" | "info" | "success" | "warning" | undefined,
 }
 
-export interface iAlert<P,S extends iCarbonReactState> {
+export interface iAlert<P, S extends iCarbonReactState> {
     title: string,
     text: string,
-    instance: CarbonReact<P,S>,
+    instance: CarbonReact<P, S>,
     component?: ReactNode,
     icon?: "warning" | "error" | "success" | "info" | "question" | null,
     buttons?: (iAlertButtonOptions)[] | undefined, //['No thanks!', 'Yes, Delete it'],
@@ -41,13 +41,11 @@ export function addAlert<P, S extends iCarbonReactState>(props: iAlert<P, S>) {
     }));
 }
 
-export default function Alert<P,S extends iCarbonReactState>({
-                                  instance
-                              }: { instance:   CarbonReact<P,S> }) {
+export default function Alert<P, S extends iCarbonReactState>({instance}: { instance: CarbonReact<P, S> }) {
 
     const {alertsWaiting, backendThrowable} = instance.state
 
-    let alert: iAlert<P,S> | undefined = undefined;
+    let alert: iAlert<P, S> | undefined = undefined;
 
     const alertWaiting = alertsWaiting.length + backendThrowable.length