kitchen-simulator 4.4.1 → 4.4.2

package/lib/utils/molding.js

@@ -13,7 +13,6 @@ exports.getLinesFromItems = getLinesFromItems;
 exports.getLinesFromItems2 = getLinesFromItems2;
 exports.getLinesOfItem = getLinesOfItem;
 exports.getLinesOfItem2 = getLinesOfItem2;
-exports.getMoldingDataOfScene = getMoldingDataOfScene;
 exports.getMoldingDataOfScene2 = getMoldingDataOfScene2;
 exports.hasMoldingLayout = hasMoldingLayout;
 exports.isAttachedWall = isAttachedWall;
@@ -968,7 +967,7 @@ function createMonldingGroup(oldMG, layer, molding, catalog) {
   newMG = getMDPoints(newMG);
   return newMG;
 }
-function getMoldingDataOfScene2(layer, catalog, doorStyle) {
+function getMoldingDataOfScene2(layer, catalog, doorStyle, moldingPieceLength) {
   var _layer$items;
   var moldingData = [];
   var items = layer === null || layer === void 0 || (_layer$items = layer.items) === null || _layer$items === void 0 ? void 0 : _layer$items.toArray();
@@ -1130,10 +1129,10 @@ function getMoldingDataOfScene2(layer, catalog, doorStyle) {
     if (idx < 0) moldingData.push(_objectSpread(_objectSpread({}, ml.molding), {}, {
       doorStyle: ml.doorStyle,
       totalLength: mlLength,
-      count: Math.ceil(mlLength * 1.1 / 96)
+      count: Math.ceil(mlLength * 1.1 / moldingPieceLength)
     }));else {
       moldingData[idx].totalLength += mlLength;
-      moldingData[idx].count = Math.ceil(moldingData[idx].totalLength * 1.1 / 96);
+      moldingData[idx].count = Math.ceil(moldingData[idx].totalLength * 1.1 / moldingPieceLength);
     }
   };
   for (var k = 0; k < moldingLines.length; k++) {
@@ -1141,237 +1140,5 @@ function getMoldingDataOfScene2(layer, catalog, doorStyle) {
   }
   // console.log('moldingData: ', moldingData);
 
-  return moldingData;
-}
-function getMoldingDataOfScene(layer, catalog, doorStyle) {
-  var moldingData = [];
-  var items = layer.items.toArray();
-  var moldings = [];
-  // get all moldings info
-  items.forEach(function (itemCat) {
-    var _itemCat$molding;
-    itemCat === null || itemCat === void 0 || (_itemCat$molding = itemCat.molding) === null || _itemCat$molding === void 0 || _itemCat$molding.forEach(function (molding) {
-      if (!moldings.some(function (m) {
-        return m.name === molding.name;
-      })) moldings.push(molding);
-    });
-  });
-
-  // calc normal molding
-  moldings.forEach(function (molding) {
-    var itemGroups = [];
-    var temp_items = [];
-    items.forEach(function (item) {
-      if (item.molding.some(function (mol) {
-        return mol.itemID === molding.itemID;
-      }) && isEnableItemForMolding(layer, item)) {
-        temp_items.push(item);
-      }
-    });
-    if (temp_items.length) {
-      while (temp_items.length > 0) {
-        var itemGroup = [temp_items[0]];
-        var _loop10 = function _loop10(_idx) {
-          if (!itemGroup.some(function (it) {
-            return it.id === temp_items[_idx].id;
-          }) && isItemSnappedGroup(temp_items[_idx], itemGroup)) {
-            itemGroup.push(temp_items[_idx]);
-            _idx = 0;
-          }
-          idx = _idx;
-        };
-        for (var idx = 0; idx < temp_items.length; idx++) {
-          _loop10(idx);
-        }
-        itemGroup.forEach(function (item) {
-          var index = temp_items.findIndex(function (it) {
-            return it.id === item.id;
-          });
-          if (index > -1) {
-            temp_items.splice(index, 1);
-          }
-        });
-        itemGroups.push(itemGroup);
-      }
-      var molding_totalLength = 0;
-      itemGroups.forEach(function (itemgroup) {
-        var allLineRects = _export.GeometryUtils.buildRectFromLines(layer, _export.GeometryUtils.getAllLines(layer));
-        var items = (0, _toConsumableArray2["default"])(itemgroup);
-        var MGlines = getLinesOfItem(items[0], allLineRects, catalog);
-        items = sortItemsByDistance(items, items[0]);
-        var _loop11 = function _loop11() {
-          var itemLines = getLinesOfItem(items[i], allLineRects, catalog);
-          var temp_MGLines = [];
-          MGlines.forEach(function (line) {
-            var idx = itemLines.findIndex(function (itemLine) {
-              return isLinesOverlapped(line, itemLine);
-            });
-            var curItemLine = itemLines[idx];
-            if (idx > -1) {
-              if (!(_export.GeometryUtils.samePoints(line[0], curItemLine[0]) && _export.GeometryUtils.samePoints(line[1], curItemLine[1]) || _export.GeometryUtils.samePoints(line[0], curItemLine[1]) && _export.GeometryUtils.samePoints(line[1], curItemLine[0]))) {
-                var MGLine = mergeOverlappedLines(line, curItemLine);
-                temp_MGLines.push(MGLine);
-              }
-              itemLines.splice(idx, 1);
-            } else {
-              temp_MGLines.push(line);
-            }
-          });
-          itemLines.forEach(function (itemLine) {
-            return temp_MGLines.push(itemLine);
-          });
-          MGlines = [].concat(temp_MGLines);
-        };
-        for (var i = 1; i < items.length; i++) {
-          _loop11();
-        }
-        MGlines.forEach(function (line) {
-          molding_totalLength += _export.GeometryUtils.verticesDistance(line[0], line[1]);
-        });
-      });
-      molding_totalLength = (0, _convertUnitsLite.convert)(molding_totalLength).from('cm').to('in');
-      moldingData.push(_objectSpread(_objectSpread({}, molding), {}, {
-        doorStyle: doorStyle,
-        count: Math.ceil(molding_totalLength * 1.1 / 96)
-      }));
-    }
-  });
-
-  // calc toe kick molding
-  var tmp = [];
-  items.forEach(function (item) {
-    if (item.category === 'cabinet' && !item.cabinet_category.toLowerCase().includes('microwave')) {
-      tmp.push(item);
-    }
-  });
-  var tmpMoldingData = [];
-  var toedoorStyles = [];
-  tmp.map(function (item) {
-    var _item$molding2;
-    if (item.layoutpos === _constants.BASE_CABINET_LAYOUTPOS && ((0, _helper.isEmpty)(item.molding) || ((_item$molding2 = item.molding) === null || _item$molding2 === void 0 ? void 0 : _item$molding2.length) < 1 || !isEnableItemForMolding(layer, item))) {
-      var w = item.properties.get('width').get('_length');
-      var wUnit = item.properties.get('width').get('_unit') || 'cm';
-      w = (0, _convertUnitsLite.convert)(w / 2).from(wUnit).to('cm');
-      var h = item.properties.get('depth').get('_length');
-      var hUnit = item.properties.get('depth').get('_unit') || 'cm';
-      h = (0, _convertUnitsLite.convert)(h / 2).from(hUnit).to('cm');
-      var outline = null;
-      var element = catalog.elements[item.get('type')];
-      if (!element) element = catalog.elements[(0, _utils.returnReplaceableDeepSearchType)(item.get('type'))];
-      outline = element.info.outline;
-      var len = 0;
-      if (outline) {
-        // Extract Points from `outline`
-        var outlinePaths = outline.paths;
-        var outlineWidth = outline.svgWidth;
-        var outlineHeight = outline.svgHeight;
-        var outlinePoints = []; // Hold Points Of SVG
-        var _iterator5 = _createForOfIteratorHelper(outlinePaths),
-          _step5;
-        try {
-          for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-            var path = _step5.value;
-            var _iterator6 = _createForOfIteratorHelper(path.subPaths),
-              _step6;
-            try {
-              for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
-                var subPath = _step6.value;
-                outlinePoints = outlinePoints.concat(subPath.getPoints());
-              }
-            } catch (err) {
-              _iterator6.e(err);
-            } finally {
-              _iterator6.f();
-            }
-          }
-        } catch (err) {
-          _iterator5.e(err);
-        } finally {
-          _iterator5.f();
-        }
-        var maxX = outlinePoints[0].x,
-          minX = outlinePoints[0].x;
-        var maxY = outlinePoints[0].y,
-          minY = outlinePoints[0].y;
-        outlinePoints.forEach(function (point) {
-          if (point.x > maxX) {
-            maxX = point.x;
-          }
-          if (point.x < minX) {
-            minX = point.x;
-          }
-          if (point.y > maxY) {
-            maxY = point.y;
-          }
-          if (point.y < minY) {
-            minY = point.y;
-          }
-        });
-        outlinePoints.forEach(function (point) {
-          if (_export.GeometryUtils.isPointInRect([{
-            x: minX,
-            y: minY
-          }, {
-            x: minX,
-            y: maxY
-          }, {
-            x: maxX,
-            y: maxY
-          }, {
-            x: maxX,
-            y: minY
-          }], point)) {
-            if (point.x > 10) len += (point.x / outlineWidth - 0.5) * w * 2 + h * 2 - (point.y / outlineHeight - 0.5) * h * 2;
-          }
-        });
-        len = (0, _convertUnitsLite.convert)(len).from('cm').to('in');
-      } else {
-        w = (0, _convertUnitsLite.convert)(w * 2).from('cm').to('in');
-        len += w;
-      }
-      var doorIndex = toedoorStyles.findIndex(function (a) {
-        var iDS = item === null || item === void 0 ? void 0 : item.doorStyle;
-        if (!iDS) return false;
-        if (!iDS.hasOwnProperty('id')) {
-          iDS = iDS.toJS();
-        }
-        return a.doorStyle.id === iDS.id && (0, _utils.isEqualInstallationType)(a.doorStyle, iDS);
-      });
-      if (doorIndex > -1) {
-        toedoorStyles[doorIndex].totalLength += len;
-      } else {
-        toedoorStyles.push({
-          doorStyle: item.doorStyle.hasOwnProperty('id') ? item.doorStyle : item.doorStyle && item.doorStyle.toJS(),
-          totalLength: len
-        });
-      }
-    }
-  });
-  toedoorStyles.forEach(function (doorStyle) {
-    var skuName = (0, _utils.getToeKickSKU)(doorStyle.doorStyle, catalog);
-    var thumbnail = skuName ? skuName : '';
-    // moldings.forEach(molding => {
-    //   if (
-    //     molding.name ===
-    //     getToeKickSKU(
-    //       doorStyle.doorStyle,
-    //       catalog,
-    //       true
-    //     )
-    //   )
-    //     thumbnail = molding.thumbnail;
-    // });
-
-    doorStyle.totalLength && tmpMoldingData.push({
-      name: _constants.TOE_KICK_MOLDING,
-      sku: (0, _utils.getToeKickSKU)(doorStyle.doorStyle, catalog),
-      thumbnail: thumbnail,
-      category: 'molding',
-      type: 'cabinet',
-      doorStyle: doorStyle.doorStyle,
-      count: Math.ceil(doorStyle.totalLength * 1.1 / 96)
-    });
-  });
-  if (tmpMoldingData.length > 0) moldingData = [].concat((0, _toConsumableArray2["default"])(moldingData), tmpMoldingData);
   return moldingData;
 }

package/lib/utils/skinPanelEngine.js

@@ -311,14 +311,27 @@ function buildSkinPanelData(faces) {
   }
   return result;
 }
+function shouldExcludeSkinPanel(itemJS, exclusionSet) {
+  var _itemJS$doorStyle;
+  var cabinetSku = itemJS === null || itemJS === void 0 ? void 0 : itemJS.sku_number;
+  var doorColorSku = itemJS === null || itemJS === void 0 || (_itemJS$doorStyle = itemJS.doorStyle) === null || _itemJS$doorStyle === void 0 ? void 0 : _itemJS$doorStyle.sku;
+  if (!cabinetSku || !doorColorSku) return false;
+  return exclusionSet.has("".concat(cabinetSku, "-").concat(doorColorSku));
+}
 function computeSkinPanels(layer) {
+  var skinPanelExclusionSKUs = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+  var exclusionSet = new Set(skinPanelExclusionSKUs);
+
   // Get candidate skin panel items and other items
   var _collectLayerItems = collectLayerItems(layer),
     skinPanelItems = _collectLayerItems.skinPanelItems,
     otherItems = _collectLayerItems.otherItems;
+  var filteredSkinPanelItems = skinPanelItems.filter(function (item) {
+    return !shouldExcludeSkinPanel(item.toJS(), exclusionSet);
+  });
 
   // Get all skin face list of [skinPanelItems] & [otherItems]
-  var skinFaces = collectFaces(skinPanelItems, layer);
+  var skinFaces = collectFaces(filteredSkinPanelItems, layer);
   var otherFaces = collectFaces(otherItems, layer);
   skinFaces = filterFacesBlockedByFaces(skinFaces, skinFaces);
   skinFaces = filterFacesBlockedByFaces(skinFaces, otherFaces);

package/package.json

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