@carbonorm/carbonreact 4.0.6 → 4.0.8

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@carbonorm/carbonreact",
   "license": "MIT",
-  "version": "4.0.6",
+  "version": "4.0.8",
   "browser": "dist/index.umd.js",
   "module": "dist/index.esm.js",
   "main": "dist/index.cjs.js",
   "types": "dist/index.d.ts",
   "type": "module",
   "dependencies": {
-    "@carbonorm/carbonnode": "^1.6.44",
+    "@carbonorm/carbonnode": "^2.0.0",
     "@fortawesome/fontawesome-svg-core": "^6.4.0",
     "@fortawesome/free-solid-svg-icons": "^6.4.0",
     "@fortawesome/react-fontawesome": "^0.2.0",

package/src/CarbonReact.tsx

@@ -46,6 +46,7 @@ export function isJsonString(str: string) {
         return false;
     }
     return true;
+
 }
 
 abstract class CarbonReact<P = {}, S extends iCarbonReactState = iCarbonReactState> extends Component<{
@@ -61,17 +62,18 @@ abstract class CarbonReact<P = {}, S extends iCarbonReactState = iCarbonReactSta
 
     protected target: typeof CarbonReact;
 
-    protected static _instance: typeof this;
+    protected static _instance: CarbonReact<any, any>;
 
-    static get instance()  {
-        return this;
+    static getInstance<T extends CarbonReact<any, any>>(): T {
+        return this._instance as T;
     }
-
-    static set instance(instance: typeof this) {
+    static get instance() {
+        return this.getInstance();
+    }
+    static set instance(instance: CarbonReact<any, any>) {
         this._instance = instance;
     }
 
-
     protected updateRestfulObjectArrays = <ObjectType extends { [key: string]: any; } = {}>
     (rest: Omit<iUpdateRestfulObjectArrays<ObjectType, S, P>, "instance">) => updateRestfulObjectArrays<ObjectType, S, P>({
         instance: this,

package/src/components/Alert/Alert.tsx

@@ -18,7 +18,7 @@ export interface iAlertButtonOptions {
     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>,
@@ -33,7 +33,7 @@ export interface iAlert<P,S> {
     backendThrowable?: { [key: string]: any },
 }
 
-export function addAlert<P, S extends Partial<iCarbonReactState>>(props: iAlert<P, S>) {
+export function addAlert<P, S extends iCarbonReactState>(props: iAlert<P, S>) {
     props.instance.setState(previousState => ({
         alertsWaiting: previousState.alertsWaiting.length === 0
             ? [props]
@@ -41,7 +41,7 @@ export function addAlert<P, S extends Partial<iCarbonReactState>>(props: iAlert<
     }));
 }
 
-export default function Alert<P,S extends Partial<iCarbonReactState>>({
+export default function Alert<P,S extends iCarbonReactState>({
                                   instance
                               }: { instance:   CarbonReact<P,S> }) {
 

package/src/components/WebSocket/CarbonWebSocket.tsx

@@ -4,7 +4,7 @@ import {useEffectOnce} from "../../api/hoc/useEffectOnce";
 import {tC6Tables, tC6RestApi} from "@carbonorm/carbonnode";
 
 
-export interface iCarbonWebSocketProps<P,S> {
+export interface iCarbonWebSocketProps<P,S extends iCarbonReactState> {
     url?: string,
     timeoutSeconds?: number,
     heartbeatSeconds?: number,
@@ -17,7 +17,7 @@ export interface iCarbonWebSocketProps<P,S> {
  * @function connect
  * This function establishes a connection with the websocket and also ensures constant reconnection if connection closes
  **/
-export function initiateWebsocket<P,S extends Partial<iCarbonReactState>>(props: iCarbonWebSocketProps<P,S>) {
+export function initiateWebsocket<P,S extends iCarbonReactState>(props: iCarbonWebSocketProps<P,S>) {
 
     let {
         instance,
@@ -286,7 +286,7 @@ export function initiateWebsocket<P,S extends Partial<iCarbonReactState>>(props:
 
 }
 
-export default function <P,S extends Partial<iCarbonReactState>>(props: iCarbonWebSocketProps<P,S>) {
+export default function <P,S extends iCarbonReactState>(props: iCarbonWebSocketProps<P,S>) {
 
     useEffectOnce(() => {