kitchen-simulator 5.0.2-react.18 → 5.0.4-react.18

package/es/AppContext.js

@@ -1,3 +1,6 @@
 import React from 'react';
-var AppContext = /*#__PURE__*/React.createContext({});
+var AppContext = /*#__PURE__*/React.createContext({
+  translator: null,
+  catalog: null
+});
 export default AppContext;

package/es/LiteKitchenConfigurator.js

@@ -21,7 +21,7 @@ import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
 import * as constants from "./constants";
 import { base64Decode } from "./utils/helper";
-import actions from "./actions/export";
+import actions, { projectActions } from "./actions/export";
 import Catalog from "./catalog/catalog";
 import { Content } from "./components/export";
 import Translator from "./translator/translator";
@@ -40,23 +40,9 @@ var SubCategoryItemImage = styled.img(_templateObject2 || (_templateObject2 = _t
 });
 var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
   function LiteKitchenConfigurator(props) {
-    var _utmRequestData2, _utmRequestData3, _utmRequestData4, _utmRequestData5, _utmRequestData6, _utmRequestData7, _utmRequestData8, _utmRequestData9, _utmRequestData0;
     var _this;
     _classCallCheck(this, LiteKitchenConfigurator);
     _this = _callSuper(this, LiteKitchenConfigurator, [props]);
-    var utmDetailParams = new URLSearchParams(_this.props.location && _this.props.location.search);
-    var utmStrEncoded = utmDetailParams.get('details');
-    var utmRequestData = null;
-    if (utmStrEncoded) {
-      try {
-        var _utmRequestData;
-        utmRequestData = JSON.parse(base64Decode(utmStrEncoded));
-        utmRequestData = JSON.parse((_utmRequestData = utmRequestData) === null || _utmRequestData === void 0 ? void 0 : _utmRequestData.utm);
-      } catch (e) {
-        console.error('Cannot parse utm parameter: ', e);
-        utmRequestData = null;
-      }
-    }
     _this.state = {
       savePopupVisible: false,
       quotePopupVisible: false,
@@ -89,17 +75,6 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
       isSaved: false,
       isLeaving: false
     };
-    _this.utm = {
-      utm_source: ((_utmRequestData2 = utmRequestData) === null || _utmRequestData2 === void 0 ? void 0 : _utmRequestData2.source) || 'source',
-      utm_medium: ((_utmRequestData3 = utmRequestData) === null || _utmRequestData3 === void 0 ? void 0 : _utmRequestData3.medium) || 'medium',
-      utm_campaign: ((_utmRequestData4 = utmRequestData) === null || _utmRequestData4 === void 0 ? void 0 : _utmRequestData4.campaign) || 'campaign',
-      utm_term: ((_utmRequestData5 = utmRequestData) === null || _utmRequestData5 === void 0 ? void 0 : _utmRequestData5.term) || 'term',
-      utm_content: ((_utmRequestData6 = utmRequestData) === null || _utmRequestData6 === void 0 ? void 0 : _utmRequestData6.content) || 'content',
-      gclid: ((_utmRequestData7 = utmRequestData) === null || _utmRequestData7 === void 0 ? void 0 : _utmRequestData7.gclid) || 'gclid',
-      msclkid: ((_utmRequestData8 = utmRequestData) === null || _utmRequestData8 === void 0 ? void 0 : _utmRequestData8.msclkid) || 'msclkid',
-      fbclid: ((_utmRequestData9 = utmRequestData) === null || _utmRequestData9 === void 0 ? void 0 : _utmRequestData9.fbclid) || 'fbclid',
-      ttclid: ((_utmRequestData0 = utmRequestData) === null || _utmRequestData0 === void 0 ? void 0 : _utmRequestData0.ttclid) || 'ttclid'
-    };
     _this.openFloor = _this.openFloor.bind(_this);
     _this.openCabinet = _this.openCabinet.bind(_this);
     _this.openFinishing = _this.openFinishing.bind(_this);
@@ -316,25 +291,30 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
   }, {
     key: "componentDidMount",
     value: function componentDidMount() {
+      var _extractedState$getIn;
       window.forRedo = [];
+      var _this$props = this.props,
+        catalog = _this$props.catalog,
+        extractedState = _this$props.extractedState,
+        projectActions = _this$props.projectActions;
+      var catalogReady = extractedState === null || extractedState === void 0 || (_extractedState$getIn = extractedState.getIn) === null || _extractedState$getIn === void 0 ? void 0 : _extractedState$getIn.call(extractedState, ['catalog', 'ready']);
+      if (!catalogReady) projectActions.initCatalog(catalog);
     }
   }, {
     key: "componentDidUpdate",
     value: function componentDidUpdate(prevProps) {
-      var _extractedState$getIn;
-      var _this$props = this.props,
-        externalEvent = _this$props.externalEvent,
-        extractedState = _this$props.extractedState,
-        projectActions = _this$props.projectActions,
-        catalog = _this$props.catalog;
+      var _extractedState$getIn2;
+      var _this$props2 = this.props,
+        externalEvent = _this$props2.externalEvent,
+        extractedState = _this$props2.extractedState,
+        projectActions = _this$props2.projectActions,
+        catalog = _this$props2.catalog;
 
       // same behavior: handle external event when it changes
       if (prevProps.externalEvent !== externalEvent) {
         handleExternalEvent(this.props);
       }
-
-      // same behavior: init catalog until ready
-      var catalogReady = extractedState === null || extractedState === void 0 || (_extractedState$getIn = extractedState.getIn) === null || _extractedState$getIn === void 0 ? void 0 : _extractedState$getIn.call(extractedState, ['catalog', 'ready']);
+      var catalogReady = extractedState === null || extractedState === void 0 || (_extractedState$getIn2 = extractedState.getIn) === null || _extractedState$getIn2 === void 0 ? void 0 : _extractedState$getIn2.call(extractedState, ['catalog', 'ready']);
       if (!catalogReady) projectActions.initCatalog(catalog);
     }
   }, {
@@ -386,11 +366,11 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
     key: "render",
     value: function render() {
       var _this2 = this;
-      var _this$props2 = this.props,
-        width = _this$props2.width,
-        height = _this$props2.height,
-        extractedState = _this$props2.extractedState,
-        props = _objectWithoutProperties(_this$props2, _excluded);
+      var _this$props3 = this.props,
+        width = _this$props3.width,
+        height = _this$props3.height,
+        extractedState = _this$props3.extractedState,
+        props = _objectWithoutProperties(_this$props3, _excluded);
       var _this$state = this.state,
         savePopupVisible = _this$state.savePopupVisible,
         quotePopupVisible = _this$state.quotePopupVisible,

package/es/LiteRenderer.js

@@ -319,6 +319,9 @@ export default function LiteRenderer(props) {
   var _ref = configData || {},
     logoImg = _ref.logoImg,
     companyUrl = _ref.companyUrl;
+  if (!catalogRef.current) {
+    return null;
+  }
   return /*#__PURE__*/React.createElement(Provider, {
     store: storeRef.current
   }, /*#__PURE__*/React.createElement(ToolErrorBoundary, {

package/es/WorkSpace.js

@@ -54,6 +54,10 @@ var onInternalEvent = /*#__PURE__*/function () {
 }();
 document.getElementById('app').style.display = 'block';
 function WorkSpace(props) {
+  var _useResizeDetector = useResizeDetector(),
+    width = _useResizeDetector.width,
+    height = _useResizeDetector.height,
+    ref = _useResizeDetector.ref;
   var _useState = useState(null),
     _useState2 = _slicedToArray(_useState, 2),
     externalEvent = _useState2[0],
@@ -798,9 +802,27 @@ function WorkSpace(props) {
       };
       setExternalEvent(evt);
     }
-  }, "Setting-MeasurementUnit-'mm'")), /*#__PURE__*/React.createElement(LiteRenderer, {
-    width: props.width,
-    height: props.height,
+  }, "Setting-MeasurementUnit-'mm'")), /*#__PURE__*/React.createElement("div", {
+    style: {
+      display: 'flex',
+      width: '100vw',
+      height: '100vh'
+    }
+  }, /*#__PURE__*/React.createElement("div", {
+    style: {
+      flex: 1,
+      minWidth: 0,
+      minHeight: 0
+    }
+  }, /*#__PURE__*/React.createElement("div", {
+    ref: ref,
+    style: {
+      width: '100%',
+      height: '100%'
+    }
+  }, /*#__PURE__*/React.createElement(LiteRenderer, {
+    width: width !== null && width !== void 0 ? width : 0,
+    height: height !== null && height !== void 0 ? height : 0,
     configData: mockProps.configData,
     options: options,
     logoImg: "/assets/logo.png",
@@ -818,36 +840,10 @@ function WorkSpace(props) {
       // }
       console.error('TOOL ERROR:', payload);
     }
-  }));
+  })))));
 }
 function App() {
-  var _useResizeDetector = useResizeDetector(),
-    width = _useResizeDetector.width,
-    height = _useResizeDetector.height,
-    ref = _useResizeDetector.ref;
-  return /*#__PURE__*/React.createElement("div", {
-    id: "kitchen-simulator-container",
-    style: {
-      display: 'flex',
-      width: '100vw',
-      height: '100vh'
-    }
-  }, /*#__PURE__*/React.createElement("div", {
-    style: {
-      flex: 1,
-      minWidth: 0,
-      minHeight: 0
-    }
-  }, /*#__PURE__*/React.createElement("div", {
-    ref: ref,
-    style: {
-      width: '100%',
-      height: '100%'
-    }
-  }, width && height ? /*#__PURE__*/React.createElement(WorkSpace, {
-    width: width,
-    height: height
-  }) : null)));
+  return /*#__PURE__*/React.createElement(WorkSpace, null);
 }
 var container = document.getElementById('app');
 var root = createRoot(container);

package/es/components/viewer2d/item.js

@@ -83,6 +83,7 @@ export default function Item(_ref3) {
       var itemDistanceFromLine = el[0];
       var dir = el[1];
       if (itemDistanceFromLine > ep || itemDistanceFromLine < -ep) {
+        var _cat$info;
         renderedRuler.push(/*#__PURE__*/React.createElement("g", {
           "data-element-root": true,
           "data-prototype": "rulerDist",
@@ -99,7 +100,7 @@ export default function Item(_ref3) {
           length: itemDistanceFromLine,
           angle: rotation,
           rotation: dir,
-          transform: "translate(".concat(dir === 180 ? -nw : dir === 0 ? nw : 0, ", ").concat(dir === 90 ? nh : dir === -90 ? cat.info.is_corner !== 1 ? -(nh + 4) : -nh : 0, ") rotate(").concat(dir, ", 0, 0)")
+          transform: "translate(".concat(dir === 180 ? -nw : dir === 0 ? nw : 0, ", ").concat(dir === 90 ? nh : dir === -90 ? (cat === null || cat === void 0 || (_cat$info = cat.info) === null || _cat$info === void 0 ? void 0 : _cat$info.is_corner) !== 1 ? -(nh + 4) : -nh : 0, ") rotate(").concat(dir, ", 0, 0)")
         })));
       }
     });

package/es/components/viewer2d/line.js

@@ -878,6 +878,7 @@ export default function Line(_ref) {
 
     // Angle SVG Path
     lines.push(/*#__PURE__*/React.createElement("path", {
+      key: 'angle-line-' + vertex[0].id + '-' + vertex[1].id + '-' + rotDir,
       style: STYLE_ANGLE,
       d: "\n          M ".concat(vertex[0].x, ",").concat(vertex[0].y, "           L ").concat(pos1.x, ",").concat(pos1.y, "           A ").concat(minLineLength, " ").concat(minLineLength, " ").concat(angle, " 0 ").concat(t > 0 ? 1 : 0, " ").concat(pos2.x, ",").concat(pos2.y, " z\n        ")
     }));