kitchen-simulator 11.13.0 → 11.15.0

package/es/class/item.js

@@ -15,6 +15,7 @@ import { hasMoldingLayout } from "../utils/molding";
 import { getInstallationSuffix, isEmpty } from "../components/viewer2d/utils";
 import { historyPush } from "../utils/history";
 import { toJSIfNeeded } from "../shared/objects/immutable";
+import { isWarningCabinet } from "../shared/domain/cabinet-warning";
 var allItemRect;
 var allItemSnap;
 var allLines;
@@ -1320,19 +1321,6 @@ var Item = /*#__PURE__*/function () {
         var itemID = data.id;
         var curItem = state.getIn(['scene', 'layers', layerID, 'items', itemID]);
         var layer = state.getIn(['scene', 'layers', layerID]);
-        var tmpMolding = _toConsumableArray(curItem.molding);
-        var temp_item_molding = _toConsumableArray(curItem.molding);
-        temp_item_molding = temp_item_molding.filter(function (md) {
-          return itemCDS === null || itemCDS === void 0 ? void 0 : itemCDS.some(function (ds) {
-            return ds.itemID === md.itemID;
-          });
-        });
-        tmpMolding.forEach(function (md) {
-          var itemGroup = MoldingUtils.getItemGroupFromMolding(layer, curItem, md);
-          itemGroup.forEach(function (it) {
-            state = state.setIn(['scene', 'layers', layerID, 'items', it.id, 'molding'], temp_item_molding);
-          });
-        });
         var cds = itemCDS === null || itemCDS === void 0 ? void 0 : itemCDS.find(function (elem) {
           return elem.itemID === data.itemID;
         });
@@ -1429,6 +1417,19 @@ var Item = /*#__PURE__*/function () {
           })
         };
         state = state.mergeIn(['scene', 'layers', layerID, 'items', itemID, 'doorStyle'], fromJS(tmpDS));
+        var tmpMolding = _toConsumableArray(curItem.molding);
+        // let temp_item_molding = [...curItem.molding];
+        var itemGroup = [];
+        tmpMolding.forEach(function (md) {
+          var _itemGroup;
+          itemGroup = MoldingUtils.getItemGroupFromMolding(layer, curItem, md);
+          itemGroup = (_itemGroup = itemGroup) === null || _itemGroup === void 0 ? void 0 : _itemGroup.filter(function (it) {
+            return isWarningCabinet(it);
+          });
+          itemGroup.forEach(function (it) {
+            state = state.setIn(['scene', 'layers', layerID, 'items', it.id, 'molding'], []);
+          });
+        });
       };
 
       // 🔥 Apply to resolved items

package/es/components/viewer3d/scene-creator.js

@@ -2184,9 +2184,9 @@ function addItem(sceneData, planData, layer, itemID, catalog, itemsActions) {
         if (_item4.category === ITEM_TYPE.CABINET) {
           if (!isWarningCabinet(item)) {
             pivot.children.pop();
-          } else {
-            pivot.children.pop();
           }
+        } else {
+          pivot.children.pop();
         }
       }
     }

package/lib/class/item.js

@@ -20,6 +20,7 @@ var _molding = require("../utils/molding");
 var _utils = require("../components/viewer2d/utils");
 var _history = require("../utils/history");
 var _immutable2 = require("../shared/objects/immutable");
+var _cabinetWarning = require("../shared/domain/cabinet-warning");
 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; }
 var allItemRect;
@@ -1327,19 +1328,6 @@ var Item = exports["default"] = /*#__PURE__*/function () {
         var itemID = data.id;
         var curItem = state.getIn(['scene', 'layers', layerID, 'items', itemID]);
         var layer = state.getIn(['scene', 'layers', layerID]);
-        var tmpMolding = (0, _toConsumableArray2["default"])(curItem.molding);
-        var temp_item_molding = (0, _toConsumableArray2["default"])(curItem.molding);
-        temp_item_molding = temp_item_molding.filter(function (md) {
-          return itemCDS === null || itemCDS === void 0 ? void 0 : itemCDS.some(function (ds) {
-            return ds.itemID === md.itemID;
-          });
-        });
-        tmpMolding.forEach(function (md) {
-          var itemGroup = _export2.MoldingUtils.getItemGroupFromMolding(layer, curItem, md);
-          itemGroup.forEach(function (it) {
-            state = state.setIn(['scene', 'layers', layerID, 'items', it.id, 'molding'], temp_item_molding);
-          });
-        });
         var cds = itemCDS === null || itemCDS === void 0 ? void 0 : itemCDS.find(function (elem) {
           return elem.itemID === data.itemID;
         });
@@ -1436,6 +1424,19 @@ var Item = exports["default"] = /*#__PURE__*/function () {
           })
         };
         state = state.mergeIn(['scene', 'layers', layerID, 'items', itemID, 'doorStyle'], (0, _immutable.fromJS)(tmpDS));
+        var tmpMolding = (0, _toConsumableArray2["default"])(curItem.molding);
+        // let temp_item_molding = [...curItem.molding];
+        var itemGroup = [];
+        tmpMolding.forEach(function (md) {
+          var _itemGroup;
+          itemGroup = _export2.MoldingUtils.getItemGroupFromMolding(layer, curItem, md);
+          itemGroup = (_itemGroup = itemGroup) === null || _itemGroup === void 0 ? void 0 : _itemGroup.filter(function (it) {
+            return (0, _cabinetWarning.isWarningCabinet)(it);
+          });
+          itemGroup.forEach(function (it) {
+            state = state.setIn(['scene', 'layers', layerID, 'items', it.id, 'molding'], []);
+          });
+        });
       };
 
       // 🔥 Apply to resolved items

package/lib/components/viewer3d/scene-creator.js

@@ -2218,9 +2218,9 @@ function addItem(sceneData, planData, layer, itemID, catalog, itemsActions) {
         if (_item4.category === _constants.ITEM_TYPE.CABINET) {
           if (!(0, _cabinetWarning.isWarningCabinet)(item)) {
             pivot.children.pop();
-          } else {
-            pivot.children.pop();
           }
+        } else {
+          pivot.children.pop();
         }
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kitchen-simulator",
-  "version": "11.13.0",
+  "version": "11.15.0",
   "description": "It is a kitchen simulator (self-contained micro-frontend).",
   "license": "MIT",
   "main": "lib/index.js",