kitchen-simulator 4.2.1 → 4.2.3

package/es/utils/molding.js

@@ -939,22 +939,26 @@ export function createMonldingGroup(oldMG, layer, molding, catalog) {
   return newMG;
 }
 export function getMoldingDataOfScene2(layer, catalog, doorStyle) {
+  var _layer$items;
   var moldingData = [];
-  var items = layer.items.toArray();
+  var items = layer === null || layer === void 0 || (_layer$items = layer.items) === null || _layer$items === void 0 ? void 0 : _layer$items.toArray();
   var allLineRects = GeometryUtils.buildRectFromLines(layer, GeometryUtils.getAllLines(layer));
 
   // get all molding line segments
   var moldingLines = [];
-  items.forEach(function (item) {
+  items === null || items === void 0 || items.forEach(function (item) {
     if (item.category === ITEM_TYPE.CABINET) {
-      var _item$molding;
+      var _item$properties$get$, _item$properties$get$2, _item$properties$get$3, _item$molding;
       var MGlines = getLinesOfItem2(item, allLineRects, catalog); // exclude overlayed to wall
+      // id & width
+      var parentId = item.id;
+      var inchWidth = convert(item.properties.get('width').get('_length')).from((_item$properties$get$ = item.properties.get('width').get('_unit')) !== null && _item$properties$get$ !== void 0 ? _item$properties$get$ : 'in').to('in');
       // z position of molding line
       var z = item.properties.get('altitude').get('_length');
-      var zUnit = item.properties.get('altitude').get('_unit') || 'cm';
+      var zUnit = (_item$properties$get$2 = item.properties.get('altitude').get('_unit')) !== null && _item$properties$get$2 !== void 0 ? _item$properties$get$2 : 'in';
       z = convert(z).from(zUnit).to('cm');
       var h = item.properties.get('height').get('_length');
-      var hUnit = item.properties.get('height').get('_unit') || 'cm';
+      var hUnit = (_item$properties$get$3 = item.properties.get('height').get('_unit')) !== null && _item$properties$get$3 !== void 0 ? _item$properties$get$3 : 'in';
       h = convert(h).from(hUnit).to('cm');
       if (!isEmpty(item.molding) && isEnableItemForMolding(layer, item)) {
         // calc normal molding line
@@ -973,7 +977,9 @@ export function getMoldingDataOfScene2(layer, catalog, doorStyle) {
               molding: _objectSpread({}, molding),
               doorStyle: item.doorStyle.hasOwnProperty('id') ? item.doorStyle : !isEmpty(item.doorStyle) && item.doorStyle.toJS(),
               line: line,
-              z: lineZ
+              z: lineZ,
+              parentId: parentId,
+              inchWidth: inchWidth
             });
           });
         });
@@ -993,7 +999,9 @@ export function getMoldingDataOfScene2(layer, catalog, doorStyle) {
             },
             doorStyle: item.doorStyle.hasOwnProperty('id') ? item.doorStyle : !isEmpty(item.doorStyle) && item.doorStyle.toJS(),
             line: line,
-            z: z
+            z: z,
+            parentId: parentId,
+            inchWidth: inchWidth
           });
         });
       }
@@ -1010,14 +1018,14 @@ export function getMoldingDataOfScene2(layer, catalog, doorStyle) {
       x2: moldingLines[i].line[1].x,
       y2: moldingLines[i].line[1].y
     };
-    var _loop1 = function _loop1(j) {
-        if (i === j) return 0; // continue
-        if (Math.abs(moldingLines[i].z - moldingLines[j].z) > EPSILON) return 0; // continue
+    var _loop1 = function _loop1(_j) {
+        if (i === _j) return 0; // continue
+        if (Math.abs(moldingLines[i].z - moldingLines[_j].z) > EPSILON) return 0; // continue
         var destLine = {
-          x1: moldingLines[j].line[0].x,
-          y1: moldingLines[j].line[0].y,
-          x2: moldingLines[j].line[1].x,
-          y2: moldingLines[j].line[1].y
+          x1: moldingLines[_j].line[0].x,
+          y1: moldingLines[_j].line[0].y,
+          x2: moldingLines[_j].line[1].x,
+          y2: moldingLines[_j].line[1].y
         };
         var rst = GeometryUtils.relationshipOfTwoOverlappedLines(srcLine, destLine);
         if (rst.result === OVERLAP_SAME || rst.result === OVERLAP_INCLUDED) {
@@ -1026,7 +1034,7 @@ export function getMoldingDataOfScene2(layer, catalog, doorStyle) {
         } else if (rst.result === OVERLAP_SOME) {
           removeLineIds.push(i);
           var lineSegs = getTrimmedContourLineSegs(rst.trimmedSegs, moldingLines.filter(function (v, idx) {
-            return idx !== i && idx !== j && Math.abs(v.z - moldingLines[i].z) < EPSILON;
+            return idx !== i && idx !== _j && Math.abs(v.z - moldingLines[i].z) < EPSILON;
           }), 0);
           if (lineSegs.length > 0) {
             lineSegs.forEach(function (ls) {
@@ -1034,7 +1042,9 @@ export function getMoldingDataOfScene2(layer, catalog, doorStyle) {
                 molding: _objectSpread({}, moldingLines[i].molding),
                 doorStyle: moldingLines[i].doorStyle,
                 line: _toConsumableArray(ls),
-                z: moldingLines[i].z
+                z: moldingLines[i].z,
+                parentId: moldingLines[i].parentId,
+                inchWidth: moldingLines[i].inchWidth
               });
             });
           }
@@ -1042,8 +1052,8 @@ export function getMoldingDataOfScene2(layer, catalog, doorStyle) {
         }
       },
       _ret4;
-    for (var j = 0; j < moldingLines.length; j++) {
-      _ret4 = _loop1(j);
+    for (var _j = 0; _j < moldingLines.length; _j++) {
+      _ret4 = _loop1(_j);
       if (_ret4 === 0) continue;
       if (_ret4 === 1) break;
     }
@@ -1057,12 +1067,32 @@ export function getMoldingDataOfScene2(layer, catalog, doorStyle) {
     });
   });
   if (newLines.length > 0) moldingLines = [].concat(_toConsumableArray(moldingLines), newLines);
+
+  // filter again for toe kick molding lines
+  // only remain one line per toe kick molding item
+  var duplicatedLineIdxs = [];
+  for (var _i4 = 0; _i4 < moldingLines.length; _i4++) {
+    var _iml$molding;
+    if (duplicatedLineIdxs.includes(_i4)) continue;
+    var iml = moldingLines[_i4];
+    if (((_iml$molding = iml.molding) === null || _iml$molding === void 0 ? void 0 : _iml$molding.name) !== TOE_KICK_MOLDING) continue;
+    for (var j = 0; j < moldingLines.length; j++) {
+      if (_i4 === j) continue;
+      var jml = moldingLines[j];
+      if (jml.parentId === iml.parentId) duplicatedLineIdxs.push(j);
+    }
+  }
+  moldingLines = moldingLines.filter(function (line, idx) {
+    return !duplicatedLineIdxs.some(function (id) {
+      return idx === id;
+    });
+  });
   // console.log('moldingLines: ', moldingLines);
 
   // make molding data with sorting molding & doorStyle
   var _loop0 = function _loop0() {
     var ml = moldingLines[k];
-    var mlLength = convert(GeometryUtils.verticesDistance(ml.line[0], ml.line[1])).from('cm').to('in');
+    var mlLength = ml.molding.name === TOE_KICK_MOLDING ? ml.inchWidth : convert(GeometryUtils.verticesDistance(ml.line[0], ml.line[1])).from('cm').to('in');
     var idx = moldingData.findIndex(function (v) {
       var _ml$molding, _v$doorStyle, _ml$doorStyle;
       return (v === null || v === void 0 ? void 0 : v.name) === ((_ml$molding = ml.molding) === null || _ml$molding === void 0 ? void 0 : _ml$molding.name) && ((_v$doorStyle = v.doorStyle) === null || _v$doorStyle === void 0 ? void 0 : _v$doorStyle.id) === ((_ml$doorStyle = ml.doorStyle) === null || _ml$doorStyle === void 0 ? void 0 : _ml$doorStyle.id);

package/es/utils/ruler.js

@@ -15,7 +15,7 @@ function formatDistance(value, fixed) {
   // 2.00 -> 2
   // 2.50 -> 2.5
   // 200.00 -> 200
-  text = text.replace(/\.?0+$/, '');
+  text = text.replace(/(\.\d*?)0+$/, '$1').replace(/\.$/, '');
   return text;
 }
 function getUnitString(unit) {

package/lib/utils/molding.js

@@ -968,22 +968,26 @@ function createMonldingGroup(oldMG, layer, molding, catalog) {
   return newMG;
 }
 function getMoldingDataOfScene2(layer, catalog, doorStyle) {
+  var _layer$items;
   var moldingData = [];
-  var items = layer.items.toArray();
+  var items = layer === null || layer === void 0 || (_layer$items = layer.items) === null || _layer$items === void 0 ? void 0 : _layer$items.toArray();
   var allLineRects = _export.GeometryUtils.buildRectFromLines(layer, _export.GeometryUtils.getAllLines(layer));
 
   // get all molding line segments
   var moldingLines = [];
-  items.forEach(function (item) {
+  items === null || items === void 0 || items.forEach(function (item) {
     if (item.category === _constants.ITEM_TYPE.CABINET) {
-      var _item$molding;
+      var _item$properties$get$, _item$properties$get$2, _item$properties$get$3, _item$molding;
       var MGlines = getLinesOfItem2(item, allLineRects, catalog); // exclude overlayed to wall
+      // id & width
+      var parentId = item.id;
+      var inchWidth = (0, _convertUnitsLite.convert)(item.properties.get('width').get('_length')).from((_item$properties$get$ = item.properties.get('width').get('_unit')) !== null && _item$properties$get$ !== void 0 ? _item$properties$get$ : 'in').to('in');
       // z position of molding line
       var z = item.properties.get('altitude').get('_length');
-      var zUnit = item.properties.get('altitude').get('_unit') || 'cm';
+      var zUnit = (_item$properties$get$2 = item.properties.get('altitude').get('_unit')) !== null && _item$properties$get$2 !== void 0 ? _item$properties$get$2 : 'in';
       z = (0, _convertUnitsLite.convert)(z).from(zUnit).to('cm');
       var h = item.properties.get('height').get('_length');
-      var hUnit = item.properties.get('height').get('_unit') || 'cm';
+      var hUnit = (_item$properties$get$3 = item.properties.get('height').get('_unit')) !== null && _item$properties$get$3 !== void 0 ? _item$properties$get$3 : 'in';
       h = (0, _convertUnitsLite.convert)(h).from(hUnit).to('cm');
       if (!(0, _helper.isEmpty)(item.molding) && isEnableItemForMolding(layer, item)) {
         // calc normal molding line
@@ -1002,7 +1006,9 @@ function getMoldingDataOfScene2(layer, catalog, doorStyle) {
               molding: _objectSpread({}, molding),
               doorStyle: item.doorStyle.hasOwnProperty('id') ? item.doorStyle : !(0, _helper.isEmpty)(item.doorStyle) && item.doorStyle.toJS(),
               line: line,
-              z: lineZ
+              z: lineZ,
+              parentId: parentId,
+              inchWidth: inchWidth
             });
           });
         });
@@ -1022,7 +1028,9 @@ function getMoldingDataOfScene2(layer, catalog, doorStyle) {
             },
             doorStyle: item.doorStyle.hasOwnProperty('id') ? item.doorStyle : !(0, _helper.isEmpty)(item.doorStyle) && item.doorStyle.toJS(),
             line: line,
-            z: z
+            z: z,
+            parentId: parentId,
+            inchWidth: inchWidth
           });
         });
       }
@@ -1039,14 +1047,14 @@ function getMoldingDataOfScene2(layer, catalog, doorStyle) {
       x2: moldingLines[i].line[1].x,
       y2: moldingLines[i].line[1].y
     };
-    var _loop1 = function _loop1(j) {
-        if (i === j) return 0; // continue
-        if (Math.abs(moldingLines[i].z - moldingLines[j].z) > _constants.EPSILON) return 0; // continue
+    var _loop1 = function _loop1(_j) {
+        if (i === _j) return 0; // continue
+        if (Math.abs(moldingLines[i].z - moldingLines[_j].z) > _constants.EPSILON) return 0; // continue
         var destLine = {
-          x1: moldingLines[j].line[0].x,
-          y1: moldingLines[j].line[0].y,
-          x2: moldingLines[j].line[1].x,
-          y2: moldingLines[j].line[1].y
+          x1: moldingLines[_j].line[0].x,
+          y1: moldingLines[_j].line[0].y,
+          x2: moldingLines[_j].line[1].x,
+          y2: moldingLines[_j].line[1].y
         };
         var rst = _export.GeometryUtils.relationshipOfTwoOverlappedLines(srcLine, destLine);
         if (rst.result === _constants.OVERLAP_SAME || rst.result === _constants.OVERLAP_INCLUDED) {
@@ -1055,7 +1063,7 @@ function getMoldingDataOfScene2(layer, catalog, doorStyle) {
         } else if (rst.result === _constants.OVERLAP_SOME) {
           removeLineIds.push(i);
           var lineSegs = getTrimmedContourLineSegs(rst.trimmedSegs, moldingLines.filter(function (v, idx) {
-            return idx !== i && idx !== j && Math.abs(v.z - moldingLines[i].z) < _constants.EPSILON;
+            return idx !== i && idx !== _j && Math.abs(v.z - moldingLines[i].z) < _constants.EPSILON;
           }), 0);
           if (lineSegs.length > 0) {
             lineSegs.forEach(function (ls) {
@@ -1063,7 +1071,9 @@ function getMoldingDataOfScene2(layer, catalog, doorStyle) {
                 molding: _objectSpread({}, moldingLines[i].molding),
                 doorStyle: moldingLines[i].doorStyle,
                 line: (0, _toConsumableArray2["default"])(ls),
-                z: moldingLines[i].z
+                z: moldingLines[i].z,
+                parentId: moldingLines[i].parentId,
+                inchWidth: moldingLines[i].inchWidth
               });
             });
           }
@@ -1071,8 +1081,8 @@ function getMoldingDataOfScene2(layer, catalog, doorStyle) {
         }
       },
       _ret4;
-    for (var j = 0; j < moldingLines.length; j++) {
-      _ret4 = _loop1(j);
+    for (var _j = 0; _j < moldingLines.length; _j++) {
+      _ret4 = _loop1(_j);
       if (_ret4 === 0) continue;
       if (_ret4 === 1) break;
     }
@@ -1086,12 +1096,32 @@ function getMoldingDataOfScene2(layer, catalog, doorStyle) {
     });
   });
   if (newLines.length > 0) moldingLines = [].concat((0, _toConsumableArray2["default"])(moldingLines), newLines);
+
+  // filter again for toe kick molding lines
+  // only remain one line per toe kick molding item
+  var duplicatedLineIdxs = [];
+  for (var _i4 = 0; _i4 < moldingLines.length; _i4++) {
+    var _iml$molding;
+    if (duplicatedLineIdxs.includes(_i4)) continue;
+    var iml = moldingLines[_i4];
+    if (((_iml$molding = iml.molding) === null || _iml$molding === void 0 ? void 0 : _iml$molding.name) !== _constants.TOE_KICK_MOLDING) continue;
+    for (var j = 0; j < moldingLines.length; j++) {
+      if (_i4 === j) continue;
+      var jml = moldingLines[j];
+      if (jml.parentId === iml.parentId) duplicatedLineIdxs.push(j);
+    }
+  }
+  moldingLines = moldingLines.filter(function (line, idx) {
+    return !duplicatedLineIdxs.some(function (id) {
+      return idx === id;
+    });
+  });
   // console.log('moldingLines: ', moldingLines);
 
   // make molding data with sorting molding & doorStyle
   var _loop0 = function _loop0() {
     var ml = moldingLines[k];
-    var mlLength = (0, _convertUnitsLite.convert)(_export.GeometryUtils.verticesDistance(ml.line[0], ml.line[1])).from('cm').to('in');
+    var mlLength = ml.molding.name === _constants.TOE_KICK_MOLDING ? ml.inchWidth : (0, _convertUnitsLite.convert)(_export.GeometryUtils.verticesDistance(ml.line[0], ml.line[1])).from('cm').to('in');
     var idx = moldingData.findIndex(function (v) {
       var _ml$molding, _v$doorStyle, _ml$doorStyle;
       return (v === null || v === void 0 ? void 0 : v.name) === ((_ml$molding = ml.molding) === null || _ml$molding === void 0 ? void 0 : _ml$molding.name) && ((_v$doorStyle = v.doorStyle) === null || _v$doorStyle === void 0 ? void 0 : _v$doorStyle.id) === ((_ml$doorStyle = ml.doorStyle) === null || _ml$doorStyle === void 0 ? void 0 : _ml$doorStyle.id);

package/lib/utils/ruler.js

@@ -20,7 +20,7 @@ function formatDistance(value, fixed) {
   // 2.00 -> 2
   // 2.50 -> 2.5
   // 200.00 -> 200
-  text = text.replace(/\.?0+$/, '');
+  text = text.replace(/(\.\d*?)0+$/, '$1').replace(/\.$/, '');
   return text;
 }
 function getUnitString(unit) {

package/package.json

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