@carbonorm/carbonreact 3.5.4 → 3.6.1

package/dist/index.cjs.js

@@ -1223,6 +1223,7 @@ function validateFragmentProps(fragment) {
   }
 }
 
+var didWarnAboutKeySpread = {};
 function jsxWithValidation(type, props, key, isStaticChildren, source, self) {
   {
     var validType = isValidElementType(type); // We warn in this case but don't throw. We expect the element creation to
@@ -1293,6 +1294,24 @@ function jsxWithValidation(type, props, key, isStaticChildren, source, self) {
       }
     }
 
+    {
+      if (hasOwnProperty.call(props, 'key')) {
+        var componentName = getComponentNameFromType(type);
+        var keys = Object.keys(props).filter(function (k) {
+          return k !== 'key';
+        });
+        var beforeExample = keys.length > 0 ? '{key: someKey, ' + keys.join(': ..., ') + ': ...}' : '{key: someKey}';
+
+        if (!didWarnAboutKeySpread[componentName + beforeExample]) {
+          var afterExample = keys.length > 0 ? '{' + keys.join(': ..., ') + ': ...}' : '{}';
+
+          error('A props object containing a "key" prop is being spread into JSX:\n' + '  let props = %s;\n' + '  <%s {...props} />\n' + 'React keys must be passed directly to JSX without using spread:\n' + '  let props = %s;\n' + '  <%s key={someKey} {...props} />', beforeExample, componentName, afterExample, componentName);
+
+          didWarnAboutKeySpread[componentName + beforeExample] = true;
+        }
+      }
+    }
+
     if (type === REACT_FRAGMENT_TYPE) {
       validateFragmentProps(element);
     } else {
@@ -4045,7 +4064,7 @@ const useEffectOnce = (effect) => {
  * @function connect
  * This function establishes a connection with the websocket and also ensures constant reconnection if connection closes
  **/
-function initiateWebsocket({ TABLES = undefined, WsLiveUpdates = undefined, url = 'ws://localhost:8080/ws', timeoutSeconds = 250, heartbeatSeconds = 60 } = {}) {
+function initiateWebsocket({ TABLES = undefined, WsLiveUpdates = undefined, url = 'ws' + (window.location.protocol === 'https:' ? 's' : '') + '://' + window.location.host + '/carbonorm/websocket', timeoutSeconds = 250, heartbeatSeconds = 60 } = {}) {
     const { websocket } = CarbonReact.instance.state;
     if (!("WebSocket" in window)) {
         // todo - store that this has been shown in the state
@@ -4237,8 +4256,10 @@ function isJsonString(str) {
     }
     return true;
 }
+// Create a context
 const CarbonReact = class extends react.Component {
     static instance;
+    context = react.createContext(this.state);
     static persistentState = undefined;
     static lastLocation = window.location.pathname;
     // @link https://github.com/welldone-software/why-did-you-render
@@ -4246,6 +4267,7 @@ const CarbonReact = class extends react.Component {
     static whyDidYouRender = true;
     constructor(props) {
         super(props);
+        console.log('CarbonORM TSX CONSTRUCTOR');
         if (CarbonReact.persistentState !== undefined && this.props.shouldStatePersist !== false) {
             this.state = CarbonReact.persistentState;
         }
@@ -4273,8 +4295,8 @@ const CarbonReact = class extends react.Component {
         else {
             CarbonReact.persistentState = nextState;
         }
-        changed(this.constructor.name + ' (DigApi)', 'props', this.props, nextProps);
-        changed(this.constructor.name + ' (DigApi)', 'state', this.state, nextState);
+        changed(this.constructor.name + ' (C6Api)', 'props', this.props, nextProps);
+        changed(this.constructor.name + ' (C6Api)', 'state', this.state, nextState);
         return true;
     }
     componentDidUpdate(_prevProps, _prevState, _snapshot) {
@@ -4295,7 +4317,9 @@ const CarbonReact = class extends react.Component {
         if (this.state.backendThrowable.length > 0) {
             return jsxRuntime_2(jsxRuntime_3, { children: [nest, jsxRuntime_1(BackendThrowable, {})] });
         }
-        return jsxRuntime_2(jsxRuntime_3, { children: [jsxRuntime_1(GlobalHistory, {}), jsxRuntime_1(CarbonWebSocket, {}), this.props.children, jsxRuntime_1(reactToastify.ToastContainer, {})] });
+        const Context = this.context.Provider;
+        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(reactToastify.ToastContainer, {})] });
     }
 };