kitchen-simulator 3.15.0 → 3.16.0-test-renderer-fix

package/es/devLiteRenderer.js

@@ -335,6 +335,104 @@ function WorkSpace(props) {
       setExternalEvent(evt);
     }
   }, "Add Room shape(rectangle)"), /*#__PURE__*/React.createElement(Button, {
+    actionType: "danger",
+    onClick: function onClick() {
+      var evt = {
+        type: EXTERNAL_EVENT_ADD_ROOM_SHAPE,
+        payload: {
+          roomShapeType: 'custom',
+          width: 0,
+          height: 0,
+          doorStyle: {
+            id: 36,
+            type: 'door',
+            name: 'Brilliant White Shaker',
+            thumbnail: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/thumbnail/Brilliant%20White%20Shaker%20-%20RTA.jpg',
+            texture: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+            color: '#ffffff',
+            glossness: 1,
+            door_style_id: 42,
+            brightness: 1,
+            sku: 'SW',
+            color_family: ',10,',
+            color_sku_alias: 'SW',
+            door_style_name: 'Shaker',
+            install: '',
+            doorStyles: {
+              base: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              counttop: 'https://media.test.diydesignspace.com/uploads/CountTop/202105074107_5/texture/Unique_Calcatta_texture.jpg',
+              interior: 'http://127.0.0.1:4002/uploads/assets/default/maple.jpg',
+              base_door_1: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              base_fixed_drawer_door_1: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              base_drawer_1: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              base_drawer_door_1: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              door_handle_1: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
+              fixed_drawer_door_handle_1: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
+              drawer_door_handle_1: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
+              base_door_2: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              base_fixed_drawer_door_2: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              base_drawer_2: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              base_drawer_door_2: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              door_handle_2: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
+              fixed_drawer_door_handle_2: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
+              drawer_door_handle_2: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
+              base_door_3: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              base_fixed_drawer_door_3: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              base_drawer_3: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              base_drawer_door_3: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              door_handle_3: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
+              fixed_drawer_door_handle_3: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
+              drawer_door_handle_3: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
+              base_door_4: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              base_fixed_drawer_door_4: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              base_drawer_4: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              base_drawer_door_4: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              door_handle_4: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
+              fixed_drawer_door_handle_4: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
+              drawer_door_handle_4: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
+              base_door_5: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              base_fixed_drawer_door_5: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              base_drawer_5: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              base_drawer_door_5: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              door_handle_5: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
+              fixed_drawer_door_handle_5: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
+              drawer_door_handle_5: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
+              base_door_6: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              base_fixed_drawer_door_6: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              base_drawer_6: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              base_drawer_door_6: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              door_handle_6: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
+              fixed_drawer_door_handle_6: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
+              drawer_door_handle_6: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
+              base_door_7: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              base_fixed_drawer_door_7: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              base_drawer_7: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              base_drawer_door_7: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              door_handle_7: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
+              fixed_drawer_door_handle_7: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
+              drawer_door_handle_7: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
+              base_door_8: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              base_fixed_drawer_door_8: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              base_drawer_8: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              base_drawer_door_8: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              door_handle_8: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
+              fixed_drawer_door_handle_8: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
+              drawer_door_handle_8: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
+              base_door_9: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              base_fixed_drawer_door_9: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              base_drawer_9: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              base_drawer_door_9: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              door_handle_9: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
+              fixed_drawer_door_handle_9: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
+              drawer_door_handle_9: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg'
+            },
+            installation_types: [125, 124]
+          }
+        }
+      };
+      setExternalEvent(evt);
+    }
+  }, "Add Room shape(custom)"), /*#__PURE__*/React.createElement(Button, {
     actionType: "danger",
     onClick: function onClick() {
       var evt = {

package/es/utils/isolate-event-handler.js

@@ -729,6 +729,7 @@ function initPropData(element, catalog) {
 function updateAttributeOfSelectedElement(element, attrPayload, state, layer, catalog, projectActions) {
   var _attributesFormData;
   var callback = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : null;
+  var layerUnit = state.getIn(['scene', 'layers', 'layer-1', 'unit']);
   var attributesFormData = initAttrData(element, layer, state);
   var value = attrPayload.value;
   var attributeName = attrPayload.attributeName;
@@ -736,28 +737,8 @@ function updateAttributeOfSelectedElement(element, attrPayload, state, layer, ca
   if (attributeName === ATT_ITEM_POS) {
     // calculate the new position of movement
     var rotRad = (value.directionAng + element.rotation) / 180 * Math.PI;
-    var newX = element.x + convert((value.oldDistance - value.newDistance) * Math.cos(rotRad)).from('in').to('cm');
-    var newY = element.y + convert((value.oldDistance - value.newDistance) * Math.sin(rotRad)).from('in').to('cm');
-    // const reversedDirection =
-    //   value.directionAng === LEFT_DIST_ANG
-    //     ? RIGHT_DIST_ANG
-    //     : value.directionAng === RIGHT_DIST_ANG
-    //     ? LEFT_DIST_ANG
-    //     : value.directionAng === BACK_DIST_ANG
-    //     ? FRONT_DIST_ANG
-    //     : BACK_DIST_ANG;
-    // let dist = convert(
-    //   element.distArray?.find(v => v[1] === reversedDirection)
-    //     ? element.distArray?.find(v => v[1] === reversedDirection)[0]
-    //     : 0
-    // )
-    //   .from('cm')
-    //   .to('in');
-    // if (dist + (value.oldDistance - value.newDistance) <= 0 || value.newDistance < 0) {
-    //   // confirm "The item will be placed outside the floor plan. Are you sure?"
-    //   setPopupOpen(true);
-    //   return;
-    // }
+    var newX = element.x + convert((value.oldDistance - value.newDistance) * Math.cos(rotRad)).from(layerUnit).to('cm');
+    var newY = element.y + convert((value.oldDistance - value.newDistance) * Math.sin(rotRad)).from(layerUnit).to('cm');
     value = {
       x: newX,
       y: newY
@@ -766,8 +747,8 @@ function updateAttributeOfSelectedElement(element, attrPayload, state, layer, ca
     var att = attributesFormData.has(attributeName) ? attributesFormData.get(attributeName) : element[attributeName];
     if (att) value = att.merge({
       _length: value,
-      _unit: UNIT_INCH,
-      length: convert(value).from(UNIT_INCH).to(UNIT_CENTIMETER)
+      _unit: layerUnit,
+      length: convert(value).from(layerUnit).to(UNIT_CENTIMETER)
     });
   }
   // make the new attrivutes
@@ -1179,9 +1160,16 @@ function _handleExternalEvent() {
               while (1) switch (_context8.prev = _context8.next) {
                 case 0:
                   it = evt === null || evt === void 0 || (_evt$payload2 = evt.payload) === null || _evt$payload2 === void 0 || (_evt$payload2 = _evt$payload2.layers['layer-1']) === null || _evt$payload2 === void 0 ? void 0 : _evt$payload2.items[itemKeys[i]]; //////// check altitude of item property and change length from _length (convert length from 'in' fo 'cm')
-                  if (it.properties.altitude.length !== convert(it.properties.altitude._length).from('in').to('cm')) {
-                    it.properties.altitude.length = convert(it.properties.altitude._length).from('in').to('cm');
-                  }
+                  // if (
+                  //   it.properties.altitude.length !==
+                  //   convert(it.properties.altitude._length).from('in').to('cm')
+                  // ) {
+                  //   it.properties.altitude.length = convert(
+                  //     it.properties.altitude._length
+                  //   )
+                  //     .from('in')
+                  //     .to('cm');
+                  // }
                   /////////
                   if (!cdsItems.some(function (v) {
                     var _it$doorStyle;
@@ -1254,7 +1242,7 @@ function _handleExternalEvent() {
                 return _ref2.apply(this, arguments);
               };
             }());
-          }
+          } else props.projectActions.loadProject(evt.payload);
         case 5:
           return _context1.abrupt("continue", 44);
         case 6:
@@ -1401,7 +1389,7 @@ function _handleExternalEvent() {
           } else props.itemsActions.setDoorStyle(doorStyle, itemCDS, isAll);
           return _context1.abrupt("continue", 44);
         case 20:
-          _evt$payload6 = evt.payload, roomShapeType = _evt$payload6.roomShapeType, width = _evt$payload6.width, height = _evt$payload6.height, _doorStyle = _evt$payload6.doorStyle; // console.log('****', layer);
+          _evt$payload6 = evt.payload, roomShapeType = _evt$payload6.roomShapeType, width = _evt$payload6.width, height = _evt$payload6.height, _doorStyle = _evt$payload6.doorStyle;
           props.projectActions.createRoomWithShape(roomShapeType, width, height, _doorStyle);
           return _context1.abrupt("continue", 44);
         case 21:

package/lib/LiteKitchenConfigurator.js

@@ -31,8 +31,8 @@ var _translator = _interopRequireDefault(require("./translator/translator"));
 var _objectsUtils = require("./utils/objects-utils");
 var _version = require("./version");
 var _isolateEventHandler = require("./utils/isolate-event-handler");
-var _excluded = ["width", "height", "state", "stateExtractor", "measurementUnit"];
-var _templateObject, _templateObject2;
+var _excluded = ["width", "height", "extractedState", "measurementUnit"];
+var _templateObject, _templateObject2; // LiteKitchenConfigurator.jsx
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -43,7 +43,7 @@ var wrapperStyle = {
   display: 'flex',
   flexFlow: 'row nowrap'
 };
-var WarningItem = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  opacity: 0.8;\n  position: absolute;\n  border-radius: 6px;\n  z-index: 11;\n  background-color: #ff7400;\n  width: max-content;\n  align-items: center;\n  padding: 10px;\n  display: none;\n  box-shadow: 0px 3px 5px -1px rgba(0, 0, 0, 0.2),\n    0px 6px 10px 0px rgba(0, 0, 0, 0.39), 0px 1px 18px 0px rgba(0, 0, 0, 0.12);\n  top: -50px;\n  left: 5px;\n  color: white;\n"])));
+var WarningItem = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  opacity: 0.8;\n  position: absolute;\n  border-radius: 6px;\n  z-index: 11;\n  background-color: #ff7400;\n  width: max-content;\n  align-items: center;\n  padding: 10px;\n  display: none;\n  box-shadow:\n    0px 3px 5px -1px rgba(0, 0, 0, 0.2),\n    0px 6px 10px 0px rgba(0, 0, 0, 0.39),\n    0px 1px 18px 0px rgba(0, 0, 0, 0.12);\n  top: -50px;\n  left: 5px;\n  color: white;\n"])));
 var SubCategoryItemImage = _styledComponents["default"].img(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  background-color: ", ";\n  height: 30px;\n  width: 30px;\n  -webkit-mask-image: url(", ");\n  -webkit-mask-size: calc(100% - 2px) calc(100% - 2px);\n  -webkit-mask-repeat: no-repeat;\n  -webkit-mask-position: 1px 1px;\n"])), constants.SECONDARY_PURPLE_COLOR, function (props) {
   return props.maskImage + '?nocache=2025';
 });
@@ -53,8 +53,6 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
     var _this;
     (0, _classCallCheck2["default"])(this, LiteKitchenConfigurator);
     _this = _callSuper(this, LiteKitchenConfigurator, [props]);
-
-    // utm tracking
     var utmDetailParams = new URLSearchParams(_this.props.location && _this.props.location.search);
     var utmStrEncoded = utmDetailParams.get('details');
     var utmRequestData = null;
@@ -64,7 +62,7 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
         utmRequestData = JSON.parse((0, _helper.base64Decode)(utmStrEncoded));
         utmRequestData = JSON.parse((_utmRequestData = utmRequestData) === null || _utmRequestData === void 0 ? void 0 : _utmRequestData.utm);
       } catch (e) {
-        console.error('Cannot parse utm parameter: ', error);
+        console.error('Cannot parse utm parameter: ', e);
         utmRequestData = null;
       }
     }
@@ -83,7 +81,6 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
       myProjectsOpen: false,
       myProjectsToLogin: false,
       downloadPopupVisible: false,
-      // For Toolbar Item
       toolbar: '',
       reviewQuotePopupOpened: false,
       floorOpened: false,
@@ -101,8 +98,6 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
       isSaved: false,
       isLeaving: false
     };
-
-    // For UTM tracking
     _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',
@@ -133,10 +128,12 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
     _this.setDownloadPopupVisible = _this.setDownloadPopupVisible.bind(_this);
     _this.neverShowInput = /*#__PURE__*/_react["default"].createRef(null);
     _this.setShowProperty = _this.setShowProperty.bind(_this);
+
+    // cache to avoid immutable merge allocations every render
+    _this._cachedViewer2DKey = null;
+    _this._cachedExtractedState = null;
     return _this;
   }
-
-  // Toolbar control functions
   (0, _inherits2["default"])(LiteKitchenConfigurator, _Component);
   return (0, _createClass2["default"])(LiteKitchenConfigurator, [{
     key: "setToolbar",
@@ -220,26 +217,32 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
   }, {
     key: "openFloor",
     value: function openFloor() {
+      var _el$parentElement;
       this.setState({
         floorOpened: true
       });
-      document.getElementById('make_floorplan_inactive').parentElement.parentElement.style.zIndex = 999;
+      var el = document.getElementById('make_floorplan_inactive');
+      el && ((_el$parentElement = el.parentElement) === null || _el$parentElement === void 0 ? void 0 : _el$parentElement.parentElement) && (el.parentElement.parentElement.style.zIndex = 999);
     }
   }, {
     key: "openCabinet",
     value: function openCabinet() {
+      var _el$parentElement2;
       this.setState({
         cabinetOpened: true
       });
-      document.getElementById('add_cabinets_inactive').parentElement.parentElement.style.zIndex = 999;
+      var el = document.getElementById('add_cabinets_inactive');
+      el && ((_el$parentElement2 = el.parentElement) === null || _el$parentElement2 === void 0 ? void 0 : _el$parentElement2.parentElement) && (el.parentElement.parentElement.style.zIndex = 999);
     }
   }, {
     key: "toggleDoorStyle",
     value: function toggleDoorStyle(visible) {
+      var _el$parentElement3;
       this.setState({
         doorStyleOpen: visible
       });
-      document.getElementById('select_doorstyle_inactive').parentElement.parentElement.style.zIndex = visible ? 999 : 6;
+      var el = document.getElementById('select_doorstyle_inactive');
+      el && ((_el$parentElement3 = el.parentElement) === null || _el$parentElement3 === void 0 ? void 0 : _el$parentElement3.parentElement) && (el.parentElement.parentElement.style.zIndex = visible ? 999 : 6);
     }
   }, {
     key: "replaceCabinet",
@@ -251,70 +254,72 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
   }, {
     key: "openAppliance",
     value: function openAppliance() {
+      var _el$parentElement4;
       this.setState({
         applianceOpened: true
       });
-      document.getElementById('add_appliances_inactive').parentElement.parentElement.style.zIndex = 999;
+      var el = document.getElementById('add_appliances_inactive');
+      el && ((_el$parentElement4 = el.parentElement) === null || _el$parentElement4 === void 0 ? void 0 : _el$parentElement4.parentElement) && (el.parentElement.parentElement.style.zIndex = 999);
     }
   }, {
     key: "openFinishing",
     value: function openFinishing() {
+      var _el$parentElement5;
       this.setState({
         finishingOpened: true
       });
-      document.getElementById('finishing_touches_inactive').parentElement.parentElement.style.zIndex = 999;
+      var el = document.getElementById('finishing_touches_inactive');
+      el && ((_el$parentElement5 = el.parentElement) === null || _el$parentElement5 === void 0 ? void 0 : _el$parentElement5.parentElement) && (el.parentElement.parentElement.style.zIndex = 999);
     }
   }, {
     key: "onReviewQuoteClicked",
     value: function onReviewQuoteClicked(visible) {
+      var _el$parentElement6;
       this.setState({
         reviewQuotePopupOpened: visible
       });
-      document.getElementById('review_quote_inactive').parentElement.parentElement.style.zIndex = visible ? 999 : 6;
+      var el = document.getElementById('review_quote_inactive');
+      el && ((_el$parentElement6 = el.parentElement) === null || _el$parentElement6 === void 0 ? void 0 : _el$parentElement6.parentElement) && (el.parentElement.parentElement.style.zIndex = visible ? 999 : 6);
     }
   }, {
     key: "closeFloorTB",
     value: function closeFloorTB() {
+      var _el$parentElement7;
       this.setState({
         floorOpened: false
       });
-      document.getElementById('make_floorplan_inactive') && (document.getElementById('make_floorplan_inactive').parentElement.parentElement.style.zIndex = 6);
+      var el = document.getElementById('make_floorplan_inactive');
+      el && ((_el$parentElement7 = el.parentElement) === null || _el$parentElement7 === void 0 ? void 0 : _el$parentElement7.parentElement) && (el.parentElement.parentElement.style.zIndex = 6);
     }
   }, {
     key: "closeCabinetTB",
     value: function closeCabinetTB() {
+      var _el$parentElement8;
       this.setState({
         cabinetOpened: false
       });
-      document.getElementById('add_cabinets_inactive').parentElement.parentElement.style.zIndex = 6;
+      var el = document.getElementById('add_cabinets_inactive');
+      el && ((_el$parentElement8 = el.parentElement) === null || _el$parentElement8 === void 0 ? void 0 : _el$parentElement8.parentElement) && (el.parentElement.parentElement.style.zIndex = 6);
     }
   }, {
     key: "closeFinishingTB",
     value: function closeFinishingTB() {
+      var _el$parentElement9;
       this.setState({
         finishingOpened: false
       });
-      document.getElementById('finishing_touches_inactive').parentElement.parentElement.style.zIndex = 6;
+      var el = document.getElementById('finishing_touches_inactive');
+      el && ((_el$parentElement9 = el.parentElement) === null || _el$parentElement9 === void 0 ? void 0 : _el$parentElement9.parentElement) && (el.parentElement.parentElement.style.zIndex = 6);
     }
   }, {
     key: "closeApplianceTB",
     value: function closeApplianceTB() {
+      var _el$parentElement0;
       this.setState({
         applianceOpened: false
       });
-      document.getElementById('add_appliances_inactive').parentElement.parentElement.style.zIndex = 6;
-    }
-  }, {
-    key: "closeDoorstyle",
-    value: function closeDoorstyle() {
-      this.setState({});
-      document.getElementById('select_doorstyle_inactive').parentElement.parentElement.style.zIndex = 6;
-    }
-  }, {
-    key: "closeReviewQuote",
-    value: function closeReviewQuote() {
-      this.setState({});
-      document.getElementById('review_quote_inactive').parentElement.parentElement.style.zIndex = 6;
+      var el = document.getElementById('add_appliances_inactive');
+      el && ((_el$parentElement0 = el.parentElement) === null || _el$parentElement0 === void 0 ? void 0 : _el$parentElement0.parentElement) && (el.parentElement.parentElement.style.zIndex = 6);
     }
   }, {
     key: "getChildContext",
@@ -330,7 +335,6 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
   }, {
     key: "componentDidMount",
     value: function componentDidMount() {
-      console.log('context =>', this.context);
       window.forRedo = [];
       var store = this.context.store;
       var _this$props = this.props,
@@ -342,21 +346,23 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
       });
     }
   }, {
-    key: "componentWillReceiveProps",
-    value: function componentWillReceiveProps(nextProps) {
-      var stateExtractor = nextProps.stateExtractor,
-        state = nextProps.state,
-        projectActions = nextProps.projectActions,
-        catalog = nextProps.catalog,
-        externalEvent = nextProps.externalEvent,
-        onInternalEvent = nextProps.onInternalEvent;
+    key: "componentDidUpdate",
+    value: function componentDidUpdate(prevProps) {
+      var _extractedState$getIn;
+      var _this$props2 = this.props,
+        externalEvent = _this$props2.externalEvent,
+        stateExtractor = _this$props2.stateExtractor,
+        extractedState = _this$props2.extractedState,
+        projectActions = _this$props2.projectActions,
+        catalog = _this$props2.catalog;
 
-      // handle external events
-      if (this.props.externalEvent !== externalEvent) {
-        (0, _isolateEventHandler.handleExternalEvent)(nextProps);
+      // handle external events (same behavior as before)
+      if (prevProps.externalEvent !== externalEvent) {
+        (0, _isolateEventHandler.handleExternalEvent)(this.props);
       }
-      var plannerState = stateExtractor(state);
-      var catalogReady = plannerState.getIn(['catalog', 'ready']);
+
+      // init catalog once ready flag says not ready (same behavior)
+      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);
       }
@@ -369,16 +375,55 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
       var layer = layers.get(selectedLayer);
       return layer.areas.size + layer.lines.size + layer.holes.size + layer.items.size === 0;
     }
+
+    // Compute viewer2D transform only when needed, and cache it.
+    // This preserves the exact visual result but avoids merge allocations every render.
+  }, {
+    key: "getExtractedStateWithViewer2DInit",
+    value: function getExtractedStateWithViewer2DInit(extractedState, width, height) {
+      if (!extractedState) return extractedState;
+      var _scene = extractedState.getIn(['scene']);
+      var len = (0, _convertUnitsLite.convert)(_scene.width).from(_scene.unit).to('cm');
+      var _viewer2D = extractedState.getIn(['viewer2D']);
+      if (!_viewer2D || _viewer2D.size <= 0) return extractedState;
+
+      // build a stable cache key based on inputs that affect the result
+      var v = _viewer2D.toJS();
+      var cacheKey = "".concat(width, ":").concat(height, ":").concat(len, ":").concat(v.e, ":").concat(v.f, ":").concat(v.viewerWidth, ":").concat(v.viewerHeight, ":").concat(v.SVGWidth, ":").concat(v.SVGHeight);
+      if (this._cachedViewer2DKey === cacheKey && this._cachedExtractedState) {
+        return this._cachedExtractedState;
+      }
+
+      // your original logic
+      if (v.e === 0 && v.f === 0) {
+        _viewer2D = _viewer2D.merge({
+          e: v.viewerWidth / 2 - v.SVGWidth / 2,
+          f: v.viewerHeight / 2 - v.SVGHeight / 2,
+          a: 0.99,
+          d: 0.99
+        });
+        var merged = extractedState.merge({
+          viewer2D: _viewer2D
+        });
+        this._cachedViewer2DKey = cacheKey;
+        this._cachedExtractedState = merged;
+        return merged;
+      }
+
+      // no merge needed
+      this._cachedViewer2DKey = cacheKey;
+      this._cachedExtractedState = extractedState;
+      return extractedState;
+    }
   }, {
     key: "render",
     value: function render() {
-      var _this$props2 = this.props,
-        width = _this$props2.width,
-        height = _this$props2.height,
-        state = _this$props2.state,
-        stateExtractor = _this$props2.stateExtractor,
-        measurementUnit = _this$props2.measurementUnit,
-        props = (0, _objectWithoutProperties2["default"])(_this$props2, _excluded);
+      var _this$props3 = this.props,
+        width = _this$props3.width,
+        height = _this$props3.height,
+        extractedState = _this$props3.extractedState,
+        measurementUnit = _this$props3.measurementUnit,
+        props = (0, _objectWithoutProperties2["default"])(_this$props3, _excluded);
       var _this$state = this.state,
         savePopupVisible = _this$state.savePopupVisible,
         quotePopupVisible = _this$state.quotePopupVisible,
@@ -386,40 +431,12 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
         signOpen = _this$state.signOpen,
         myProjectsOpen = _this$state.myProjectsOpen;
       var contentW = width - toolbarW;
-      // let contentW = width - toolbarW - sidebarW;
-      // let toolbarH = height - footerBarH;
-      // let contentH = height - footerBarH;
-      // let sidebarH = height - footerBarH;
-      var toolbarH = height;
       var contentH = height;
-      var sidebarH = height;
       var headerW = width;
       var headerH = 60;
-      var extractedState = stateExtractor(state);
-      var firstVisit = this.state.wizardStepOpend && this.isProjectEmpty(extractedState.scene);
+      var extracted = this.getExtractedStateWithViewer2DInit(extractedState, width, height);
+      var firstVisit = this.state.wizardStepOpend && this.isProjectEmpty(extracted.scene);
       var allVisible = firstVisit || signOpen || myProjectsOpen;
-      var _scene = extractedState.getIn(['scene']);
-      var len = (0, _convertUnitsLite.convert)(_scene.width).from(_scene.unit).to('cm');
-      var _viewer2D = extractedState.getIn(['viewer2D']);
-      if (_viewer2D.size > 0) {
-        var scaleX = width / len * 3;
-        var scaleY = height / len * 3;
-        var scale = scaleX > scaleY ? scaleY : scaleX;
-        var _e = width - len * scale,
-          _f = height - len * scale;
-        var viewer = _viewer2D.toJS();
-        if (viewer.e === 0 && viewer.f === 0) {
-          _viewer2D = _viewer2D.merge({
-            e: viewer.viewerWidth / 2 - viewer.SVGWidth / 2,
-            f: viewer.viewerHeight / 2 - viewer.SVGHeight / 2,
-            a: 0.99,
-            d: 0.99
-          });
-        }
-      }
-      extractedState = extractedState.merge({
-        viewer2D: _viewer2D
-      });
       return /*#__PURE__*/_react["default"].createElement("section", null, /*#__PURE__*/_react["default"].createElement("div", {
         style: _objectSpread(_objectSpread({}, wrapperStyle), {}, {
           height: height,
@@ -431,7 +448,7 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
         width: contentW,
         height: contentH,
         catalog: this.props.catalog,
-        state: extractedState,
+        state: extracted,
         toolBar: this.state.toolbar,
         setToolbar: this.setToolbar,
         replaceCabinet: this.replaceCabinet,
@@ -473,7 +490,8 @@ LiteKitchenConfigurator.propTypes = {
   customContents: _propTypes["default"].object,
   softwareSignature: _propTypes["default"].string,
   configData: _propTypes["default"].object,
-  onInternalEvent: _propTypes["default"].func
+  onInternalEvent: _propTypes["default"].func,
+  extractedState: _propTypes["default"].object // <-- new injected prop
 };
 LiteKitchenConfigurator.contextTypes = {
   store: _propTypes["default"].object.isRequired
@@ -496,10 +514,14 @@ LiteKitchenConfigurator.defaultProps = {
   configData: {}
 };
 
-//redux connect
-function mapStateToProps(reduxState) {
+// IMPORTANT: select only the extracted slice so top component doesn't rerender on every dispatch
+function mapStateToProps(reduxState, ownProps) {
+  var stateExtractor = ownProps.stateExtractor || function (s) {
+    return s;
+  };
+  var extractedState = stateExtractor(reduxState);
   return {
-    state: reduxState
+    extractedState: extractedState
   };
 }
 function mapDispatchToProps(dispatch) {