@carbonorm/carbonreact 4.0.6 → 4.0.8

package/dist/CarbonReact.d.ts

@@ -25,9 +25,10 @@ declare abstract class CarbonReact<P = {}, S extends iCarbonReactState = iCarbon
     private static persistentStateMap;
     context: Context<S & iCarbonReactState>;
     protected target: typeof CarbonReact;
-    protected static _instance: typeof this;
-    static get instance(): typeof this;
-    static set instance(instance: typeof this);
+    protected static _instance: CarbonReact<any, any>;
+    static getInstance<T extends CarbonReact<any, any>>(): T;
+    static get instance(): CarbonReact<any, any>;
+    static set instance(instance: CarbonReact<any, any>);
     protected updateRestfulObjectArrays: <ObjectType extends {
         [key: string]: any;
     } = {}>(rest: Omit<iUpdateRestfulObjectArrays<ObjectType, S, P>, "instance">) => void;

package/dist/components/Alert/Alert.d.ts

@@ -6,7 +6,7 @@ export interface iAlertButtonOptions {
     className?: string;
     color: "default" | "primary" | "secondary" | "inherit" | "danger" | "info" | "success" | "warning" | undefined;
 }
-export interface iAlert<P, S> {
+export interface iAlert<P, S extends iCarbonReactState> {
     title: string;
     text: string;
     instance: CarbonReact<P, S>;
@@ -22,7 +22,7 @@ export interface iAlert<P, S> {
         [key: string]: any;
     };
 }
-export declare function addAlert<P, S extends Partial<iCarbonReactState>>(props: iAlert<P, S>): void;
-export default function Alert<P, S extends Partial<iCarbonReactState>>({ instance }: {
+export declare function addAlert<P, S extends iCarbonReactState>(props: iAlert<P, S>): void;
+export default function Alert<P, S extends iCarbonReactState>({ instance }: {
     instance: CarbonReact<P, S>;
 }): import("react/jsx-runtime").JSX.Element | null;

package/dist/components/WebSocket/CarbonWebSocket.d.ts

@@ -1,6 +1,6 @@
 import CarbonReact, { iCarbonReactState } from "CarbonReact";
 import { tC6Tables, tC6RestApi } from "@carbonorm/carbonnode";
-export interface iCarbonWebSocketProps<P, S> {
+export interface iCarbonWebSocketProps<P, S extends iCarbonReactState> {
     url?: string;
     timeoutSeconds?: number;
     heartbeatSeconds?: number;
@@ -12,5 +12,5 @@ export interface iCarbonWebSocketProps<P, S> {
  * @function connect
  * This function establishes a connection with the websocket and also ensures constant reconnection if connection closes
  **/
-export declare function initiateWebsocket<P, S extends Partial<iCarbonReactState>>(props: iCarbonWebSocketProps<P, S>): void;
-export default function <P, S extends Partial<iCarbonReactState>>(props: iCarbonWebSocketProps<P, S>): null;
+export declare function initiateWebsocket<P, S extends iCarbonReactState>(props: iCarbonWebSocketProps<P, S>): void;
+export default function <P, S extends iCarbonReactState>(props: iCarbonWebSocketProps<P, S>): null;

package/dist/index.cjs.js

@@ -4365,8 +4365,11 @@ class CarbonReact extends react.Component {
     context = react.createContext(this.state);
     target;
     static _instance;
+    static getInstance() {
+        return this._instance;
+    }
     static get instance() {
-        return this;
+        return this.getInstance();
     }
     static set instance(instance) {
         this._instance = instance;