kitchen-simulator 11.36.0 → 11.38.0

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

@@ -40,7 +40,7 @@ var _threeMemoryCleaner = require("./three-memory-cleaner");
 var _constants = require("../../constants");
 var _export = require("../../utils/export");
 var _convertUnitsLite = require("../../utils/convert-units-lite");
-var _geometry2 = require("../../utils/geometry");
+var _geometry3 = require("../../utils/geometry");
 var GeomUtils = _interopRequireWildcard(require("../../catalog/utils/geom-utils"));
 var _itemLoader = require("../../catalog/utils/item-loader");
 var _cabinetWarning = require("../../shared/domain/cabinet-warning");
@@ -923,7 +923,7 @@ function replaceObject(modifiedPath, layer, planData, actions, sceneData, oldSce
 }
 function getDistances(layer, curItem, isCalcWall) {
   // matching fvLine distance with OP
-  var pointArray = (0, _geometry2.calcDistancesFromItemToWalls)(curItem, layer).PointArray;
+  var pointArray = (0, _geometry3.calcDistancesFromItemToWalls)(curItem, layer).PointArray;
   if ((pointArray === null || pointArray === void 0 ? void 0 : pointArray.length) > 0) {
     var _loop2 = function _loop2() {
       var direction = i === 0 ? 90 : i === 1 ? -90 : i === 2 ? 180 : 0;
@@ -2758,6 +2758,12 @@ function isSingleQuadrilateral(groupCount, pointGroup) {
  * @param model - molding info that appear in real 3D
  */
 function moldingVertices(mPointGroup, mdGeo, MDV, model, svg_width, svg_height, groupCount) {
+  // Guard against bad SVG metadata (missing/zero dimensions) which would produce NaN/Infinity vertices.
+  if (!Number.isFinite(svg_width) || !Number.isFinite(svg_height) || svg_width <= 0 || svg_height <= 0) {
+    mdGeo.setAttribute('position', new Three.BufferAttribute(new Float32Array(), 3));
+    mdGeo.needsUpdate = true;
+    return mdGeo;
+  }
   var pointGroup = mPointGroup;
   var length = pointGroup.length;
   var isSnap = true;
@@ -2835,15 +2841,19 @@ function moldingVertices(mPointGroup, mdGeo, MDV, model, svg_width, svg_height,
     }
     vecNorm.rotateAround(o, Math.PI / 2 - alpha);
     vecNorm.normalize();
-    vecNorm.multiplyScalar(1 / Math.sin(alpha));
+    var sinAlpha = Math.sin(alpha);
+    if (Math.abs(sinAlpha) > 1e-6) {
+      vecNorm.multiplyScalar(1 / sinAlpha);
+    }
 
     // Make 3D Points
     MDV.forEach(function (p) {
       var x = cur.x - vecNorm.x * ((p.x / svg_width - 0.5) * model.length);
       var y = (0.5 - p.y / svg_height) * model.width;
       var z = -cur.y + vecNorm.y * ((p.x / svg_width - 0.5) * model.length);
-      if (mdGeo.attributes.hasOwnProperty('position')) verticesArray = mdGeo.attributes.position.array;
-      verticesArray.push(x, y, z);
+      if (Number.isFinite(x) && Number.isFinite(y) && Number.isFinite(z)) {
+        verticesArray.push(x, y, z);
+      }
     });
   });
   var mdGeo1 = mdGeo.setAttribute('position', new Three.BufferAttribute(new Float32Array(verticesArray), 3));
@@ -2976,7 +2986,7 @@ function sameSign(pos1, pos2, pos3) {
 function getTotalDistance(pos, rect) {
   var sum = 0;
   for (var i = 0; i < rect.length; i++) {
-    sum += (0, _geometry2.verticesDistance)(pos, rect[i]);
+    sum += (0, _geometry3.verticesDistance)(pos, rect[i]);
   }
   return sum;
 }
@@ -3031,7 +3041,7 @@ function createBacksplash(item, layer, planData, scene) {
   }
 
   // Get current wall line that item is snapped
-  var wLines = (_getSnappedWallLines = (0, _geometry2.getSnappedWallLines)(item.itemInfo, layer, planData.catalog)) === null || _getSnappedWallLines === void 0 ? void 0 : _getSnappedWallLines.filter(function (sLine) {
+  var wLines = (_getSnappedWallLines = (0, _geometry3.getSnappedWallLines)(item.itemInfo, layer, planData.catalog)) === null || _getSnappedWallLines === void 0 ? void 0 : _getSnappedWallLines.filter(function (sLine) {
     return sLine.snapSide === 'front';
   });
   var curLine = wLines.length > 0 ? wLines[0] : null;
@@ -3068,7 +3078,7 @@ function createBacksplash(item, layer, planData, scene) {
     var altitudeUnit = ((_wallItem$itemInfo2 = wallItem.itemInfo) === null || _wallItem$itemInfo2 === void 0 || (_wallItem$itemInfo2 = _wallItem$itemInfo2.properties) === null || _wallItem$itemInfo2 === void 0 ? void 0 : _wallItem$itemInfo2.get('altitude').get('_unit')) || 'cm';
     if (!(0, _helper.isEmpty)(altitude) && !(0, _helper.isEmpty)(altitudeUnit)) {
       altitude = (0, _convertUnitsLite.convert)(altitude).from(altitudeUnit).to('cm');
-      var altPoints = (0, _geometry2.getLineSnapPointsOfItem)(layer, curLine, wallItem);
+      var altPoints = (0, _geometry3.getLineSnapPointsOfItem)(layer, curLine, wallItem);
       if (altPoints.length > 1) {
         D0 = altPoints[0];
         D1 = altPoints[1];
@@ -3091,7 +3101,7 @@ function createBacksplash(item, layer, planData, scene) {
     var v0 = (_layer$vertices = layer.vertices) === null || _layer$vertices === void 0 ? void 0 : _layer$vertices.get(line === null || line === void 0 || (_line$vertices = line.vertices) === null || _line$vertices === void 0 ? void 0 : _line$vertices.get(0));
     var v1 = (_layer$vertices2 = layer.vertices) === null || _layer$vertices2 === void 0 ? void 0 : _layer$vertices2.get(line === null || line === void 0 || (_line$vertices2 = line.vertices) === null || _line$vertices2 === void 0 ? void 0 : _line$vertices2.get(1));
     if (!(0, _helper.isEmpty)(v0) || !(0, _helper.isEmpty)(v1)) {
-      var lineLength = (0, _geometry2.pointsDistance)(v0.x, v0.y, v1.x, v1.y);
+      var lineLength = (0, _geometry3.pointsDistance)(v0.x, v0.y, v1.x, v1.y);
       var disD0 = lineLength * hole.offset - width / 2;
       var disD1 = lineLength * hole.offset + width / 2;
       D0 = {
@@ -3116,7 +3126,7 @@ function createBacksplash(item, layer, planData, scene) {
   if (altItems.length > 0) {
     depth = altItems[0].altitude;
     altItems.map(function (altItem) {
-      if ((0, _geometry2.isOverlappedTwoItemsOnOneLine)(layer, curLine, item, altItem)) {
+      if ((0, _geometry3.isOverlappedTwoItemsOnOneLine)(layer, curLine, item, altItem)) {
         if (depth >= altItem.altitude) {
           depth = altItem.altitude;
           flag = true;
@@ -3284,7 +3294,7 @@ function _addMGMesh(molding, planData, layer, data, svg_width, svg_height, flag)
   // let layoutType = molding.items[0].layoutpos;
   // let visible = molding.items[0];
   molding.pointGroups.forEach(function (pointGroup) {
-    var _child$width_unit, _child$height_unit, _child$length_unit;
+    var _child$width_unit, _child$height_unit, _child$length_unit, _geometry2;
     var geometry = new Three.BufferGeometry();
     var length = data.length; //point array
     var widthUnit = child.width_unit === 'inch' ? 'in' : (_child$width_unit = child.width_unit) !== null && _child$width_unit !== void 0 ? _child$width_unit : 'in';
@@ -3298,6 +3308,10 @@ function _addMGMesh(molding, planData, layer, data, svg_width, svg_height, flag)
     child.length_unit = 'cm';
     geometry.needsUpdate = true;
     geometry = moldingVertices(pointGroup, geometry, data, child, svg_width, svg_height, molding.pointGroups.length);
+    // If we failed to generate positions (bad SVG/model data), skip this molding group.
+    if (!((_geometry2 = geometry) !== null && _geometry2 !== void 0 && (_geometry2 = _geometry2.attributes) !== null && _geometry2 !== void 0 && _geometry2.position) || geometry.attributes.position.count < 3) {
+      return;
+    }
     var total = geometry.attributes.position.count;
     var len = geometry.attributes.position.count / length;
     if (!_export.GeometryUtils.samePoints(pointGroup[0], pointGroup[pointGroup.length - 1])) {
@@ -3341,7 +3355,7 @@ function _addMGMesh(molding, planData, layer, data, svg_width, svg_height, flag)
         x: data[_i2 + 1].x,
         y: data[_i2 + 1].y
       };
-      var posDistance = (0, _geometry2.verticesDistance)(v1, v2);
+      var posDistance = (0, _geometry3.verticesDistance)(v1, v2);
       sumDistance += posDistance;
       if (_i2 === data.length - 2) finalDistance = sumDistance;
       sumDistanceArray.push(sumDistance);
@@ -3678,7 +3692,7 @@ function updateMoldingGroupArray(MGArray, selItem, planData, layer) {
           }).toJS()[0] : (_mg$items$4 = mg.items[0]) === null || _mg$items$4 === void 0 || (_mg$items$4 = _mg$items$4.molding) === null || _mg$items$4 === void 0 ? void 0 : _mg$items$4.filter(function (mol) {
             return (mol === null || mol === void 0 ? void 0 : mol.location_type) === mg.location_type;
           })[0];
-          if (mg.molding === null || mg.molding.itemID !== mol.itemID || mg.lines === null || mg.points === null) {
+          if (mg.molding === null || mg.molding.itemID !== molding.itemID || mg.lines === null || mg.points === null) {
             var _mg$molding;
             if (mg.molding !== null && ((_mg$molding = mg.molding) === null || _mg$molding === void 0 ? void 0 : _mg$molding.itemID) !== molding.itemID) {
               deleteMGMesh(mg, planData, mode);

package/lib/events/external/handleExternalEvent.util.js

@@ -9,6 +9,7 @@ exports.getElement = getElement;
 exports.getPlannerStateFromProps = getPlannerStateFromProps;
 exports.loadMoldingSvg = loadMoldingSvg;
 exports.mergeSameElements = mergeSameElements;
+exports.prepareMoldingCCDFList = prepareMoldingCCDFList;
 exports.updateAttributeOfSelectedElement = updateAttributeOfSelectedElement;
 exports.updatePropertyOfSelectedElement = updatePropertyOfSelectedElement;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
@@ -408,7 +409,7 @@ function _parseTempPlaceholdersFromCabinetPayload() {
               }
             });
             tempPlaceholdersData.push({
-              id: parseInt(el, 10),
+              id: el,
               placeholders: tempData,
               structure: cabinetPayload.structure_json.tempPlaceholders[k].structure
             });
@@ -1038,11 +1039,19 @@ function _loadMoldingSvg() {
             }
             var loader = new _SVGLoader.SVGLoader();
             loader.load(url, function (data) {
-              var _data$xml$viewBox$ani, _data$xml, _data$xml$viewBox$ani2, _data$xml2;
+              var _data$xml$viewBox$ani, _data$xml, _data$xml2, _data$xml$viewBox$ani2, _data$xml3, _data$xml4, _data$xml$width$animV, _data$xml5, _data$xml6, _data$xml$height$anim, _data$xml7, _data$xml8, _ref6, _ref7;
+              // Some SVGs omit a viewBox; fall back to width/height to avoid 0 dimensions.
+              // 0/invalid svg_width/svg_height later causes NaN/Infinity vertex positions in 3D molding meshes.
+              var viewBoxWidth = (_data$xml$viewBox$ani = (_data$xml = data.xml) === null || _data$xml === void 0 || (_data$xml = _data$xml.viewBox) === null || _data$xml === void 0 || (_data$xml = _data$xml.animVal) === null || _data$xml === void 0 ? void 0 : _data$xml.width) !== null && _data$xml$viewBox$ani !== void 0 ? _data$xml$viewBox$ani : (_data$xml2 = data.xml) === null || _data$xml2 === void 0 || (_data$xml2 = _data$xml2.viewBox) === null || _data$xml2 === void 0 || (_data$xml2 = _data$xml2.baseVal) === null || _data$xml2 === void 0 ? void 0 : _data$xml2.width;
+              var viewBoxHeight = (_data$xml$viewBox$ani2 = (_data$xml3 = data.xml) === null || _data$xml3 === void 0 || (_data$xml3 = _data$xml3.viewBox) === null || _data$xml3 === void 0 || (_data$xml3 = _data$xml3.animVal) === null || _data$xml3 === void 0 ? void 0 : _data$xml3.height) !== null && _data$xml$viewBox$ani2 !== void 0 ? _data$xml$viewBox$ani2 : (_data$xml4 = data.xml) === null || _data$xml4 === void 0 || (_data$xml4 = _data$xml4.viewBox) === null || _data$xml4 === void 0 || (_data$xml4 = _data$xml4.baseVal) === null || _data$xml4 === void 0 ? void 0 : _data$xml4.height;
+              var attrWidth = (_data$xml$width$animV = (_data$xml5 = data.xml) === null || _data$xml5 === void 0 || (_data$xml5 = _data$xml5.width) === null || _data$xml5 === void 0 || (_data$xml5 = _data$xml5.animVal) === null || _data$xml5 === void 0 ? void 0 : _data$xml5.value) !== null && _data$xml$width$animV !== void 0 ? _data$xml$width$animV : (_data$xml6 = data.xml) === null || _data$xml6 === void 0 || (_data$xml6 = _data$xml6.width) === null || _data$xml6 === void 0 || (_data$xml6 = _data$xml6.baseVal) === null || _data$xml6 === void 0 ? void 0 : _data$xml6.value;
+              var attrHeight = (_data$xml$height$anim = (_data$xml7 = data.xml) === null || _data$xml7 === void 0 || (_data$xml7 = _data$xml7.height) === null || _data$xml7 === void 0 || (_data$xml7 = _data$xml7.animVal) === null || _data$xml7 === void 0 ? void 0 : _data$xml7.value) !== null && _data$xml$height$anim !== void 0 ? _data$xml$height$anim : (_data$xml8 = data.xml) === null || _data$xml8 === void 0 || (_data$xml8 = _data$xml8.height) === null || _data$xml8 === void 0 || (_data$xml8 = _data$xml8.baseVal) === null || _data$xml8 === void 0 ? void 0 : _data$xml8.value;
+              var svg_width = Number((_ref6 = viewBoxWidth !== null && viewBoxWidth !== void 0 ? viewBoxWidth : attrWidth) !== null && _ref6 !== void 0 ? _ref6 : 0);
+              var svg_height = Number((_ref7 = viewBoxHeight !== null && viewBoxHeight !== void 0 ? viewBoxHeight : attrHeight) !== null && _ref7 !== void 0 ? _ref7 : 0);
               molding.data = {
                 paths: data.paths,
-                svg_width: (_data$xml$viewBox$ani = (_data$xml = data.xml) === null || _data$xml === void 0 || (_data$xml = _data$xml.viewBox) === null || _data$xml === void 0 || (_data$xml = _data$xml.animVal) === null || _data$xml === void 0 ? void 0 : _data$xml.width) !== null && _data$xml$viewBox$ani !== void 0 ? _data$xml$viewBox$ani : 0,
-                svg_height: (_data$xml$viewBox$ani2 = (_data$xml2 = data.xml) === null || _data$xml2 === void 0 || (_data$xml2 = _data$xml2.viewBox) === null || _data$xml2 === void 0 || (_data$xml2 = _data$xml2.animVal) === null || _data$xml2 === void 0 ? void 0 : _data$xml2.height) !== null && _data$xml$viewBox$ani2 !== void 0 ? _data$xml$viewBox$ani2 : 0
+                svg_width: Number.isFinite(svg_width) ? svg_width : 0,
+                svg_height: Number.isFinite(svg_height) ? svg_height : 0
               };
               resolve();
             }, null, function (error) {
@@ -1082,4 +1091,21 @@ function mergeSameElements(projectItemsCatalog) {
     _loop(i);
   }
   return result;
+}
+function prepareMoldingCCDFList(doorStyle, moldingData) {
+  var moldingCCDFs = [];
+  for (var i = 0; i < moldingData.length; i++) {
+    var _molding$ccdf$catalog, _molding$ccdf, _molding$ccdf$cabinet, _molding$ccdf2, _doorStyle$id, _molding$long_name;
+    var molding = moldingData[i];
+    moldingCCDFs.push({
+      sizeinfo: molding.sizeinfo,
+      catalog_cabinet_sku: (_molding$ccdf$catalog = molding === null || molding === void 0 || (_molding$ccdf = molding.ccdf) === null || _molding$ccdf === void 0 ? void 0 : _molding$ccdf.catalog_cabinet_sku) !== null && _molding$ccdf$catalog !== void 0 ? _molding$ccdf$catalog : molding.sku_number,
+      cabinet_id: (_molding$ccdf$cabinet = molding === null || molding === void 0 || (_molding$ccdf2 = molding.ccdf) === null || _molding$ccdf2 === void 0 ? void 0 : _molding$ccdf2.cabinet_id) !== null && _molding$ccdf$cabinet !== void 0 ? _molding$ccdf$cabinet : molding.itemID,
+      ccdf: molding.ccdf,
+      target_door_finish_id: (_doorStyle$id = doorStyle === null || doorStyle === void 0 ? void 0 : doorStyle.id) !== null && _doorStyle$id !== void 0 ? _doorStyle$id : null,
+      long_name: (_molding$long_name = molding === null || molding === void 0 ? void 0 : molding.long_name) !== null && _molding$long_name !== void 0 ? _molding$long_name : null,
+      id: molding.itemID
+    });
+  }
+  return moldingCCDFs;
 }

package/lib/events/external/handlers.changeDoorStyle.js

@@ -8,23 +8,7 @@ exports.handleChangeDoorStyleEvent = handleChangeDoorStyleEvent;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _asyncPool = require("../../shared/concurrency/async-pool");
-function prepareMoldingCCDFList(doorStyle, moldingData) {
-  var moldingCCDFs = [];
-  for (var i = 0; i < moldingData.length; i++) {
-    var _molding$ccdf$catalog, _molding$ccdf, _molding$ccdf$cabinet, _molding$ccdf2, _doorStyle$id, _molding$long_name;
-    var molding = moldingData[i];
-    moldingCCDFs.push({
-      sizeinfo: molding.sizeinfo,
-      catalog_cabinet_sku: (_molding$ccdf$catalog = molding === null || molding === void 0 || (_molding$ccdf = molding.ccdf) === null || _molding$ccdf === void 0 ? void 0 : _molding$ccdf.catalog_cabinet_sku) !== null && _molding$ccdf$catalog !== void 0 ? _molding$ccdf$catalog : molding.sku_number,
-      cabinet_id: (_molding$ccdf$cabinet = molding === null || molding === void 0 || (_molding$ccdf2 = molding.ccdf) === null || _molding$ccdf2 === void 0 ? void 0 : _molding$ccdf2.cabinet_id) !== null && _molding$ccdf$cabinet !== void 0 ? _molding$ccdf$cabinet : molding.itemID,
-      ccdf: molding.ccdf,
-      target_door_finish_id: (_doorStyle$id = doorStyle === null || doorStyle === void 0 ? void 0 : doorStyle.id) !== null && _doorStyle$id !== void 0 ? _doorStyle$id : null,
-      long_name: (_molding$long_name = molding === null || molding === void 0 ? void 0 : molding.long_name) !== null && _molding$long_name !== void 0 ? _molding$long_name : null,
-      id: molding.itemID
-    });
-  }
-  return moldingCCDFs;
-}
+var _handleExternalEvent = require("./handleExternalEvent.util");
 function handleChangeDoorStyleEvent(_x, _x2, _x3, _x4, _x5, _x6, _x7, _x8, _x9, _x0, _x1, _x10) {
   return _handleChangeDoorStyleEvent.apply(this, arguments);
 }
@@ -66,7 +50,7 @@ function _handleChangeDoorStyleEvent() {
         case 4:
           ccdf_list = [];
           _loop = /*#__PURE__*/_regenerator["default"].mark(function _loop() {
-            var item, _item$ccdf$catalog_ca, _item$ccdf, _item$ccdf$cabinet_id, _item$ccdf2, _doorStyle$id3, _item$long_name;
+            var item, _item$ccdf$catalog_ca, _item$ccdf, _item$ccdf$cabinet_id, _item$ccdf2, _doorStyle$id2, _item$long_name;
             return _regenerator["default"].wrap(function (_context2) {
               while (1) switch (_context2.prev = _context2.next) {
                 case 0:
@@ -80,7 +64,7 @@ function _handleChangeDoorStyleEvent() {
                       catalog_cabinet_sku: (_item$ccdf$catalog_ca = item === null || item === void 0 || (_item$ccdf = item.ccdf) === null || _item$ccdf === void 0 ? void 0 : _item$ccdf.catalog_cabinet_sku) !== null && _item$ccdf$catalog_ca !== void 0 ? _item$ccdf$catalog_ca : item.sku_number,
                       cabinet_id: (_item$ccdf$cabinet_id = item === null || item === void 0 || (_item$ccdf2 = item.ccdf) === null || _item$ccdf2 === void 0 ? void 0 : _item$ccdf2.cabinet_id) !== null && _item$ccdf$cabinet_id !== void 0 ? _item$ccdf$cabinet_id : null,
                       ccdf: item.ccdf,
-                      target_door_finish_id: (_doorStyle$id3 = doorStyle === null || doorStyle === void 0 ? void 0 : doorStyle.id) !== null && _doorStyle$id3 !== void 0 ? _doorStyle$id3 : null,
+                      target_door_finish_id: (_doorStyle$id2 = doorStyle === null || doorStyle === void 0 ? void 0 : doorStyle.id) !== null && _doorStyle$id2 !== void 0 ? _doorStyle$id2 : null,
                       long_name: (_item$long_name = item === null || item === void 0 ? void 0 : item.long_name) !== null && _item$long_name !== void 0 ? _item$long_name : null,
                       scene_cabinet_id: item.id
                     });
@@ -103,7 +87,7 @@ function _handleChangeDoorStyleEvent() {
           _context3.next = 5;
           break;
         case 7:
-          moldingCCDFList = prepareMoldingCCDFList(doorStyle, moldingData);
+          moldingCCDFList = (0, _handleExternalEvent.prepareMoldingCCDFList)(doorStyle, moldingData);
           if (ccdf_list.length > 0) {
             (_props$onInternalEven = props.onInternalEvent) === null || _props$onInternalEven === void 0 || _props$onInternalEven.call(props, {
               type: INTERNAL_EVENT_ITEMS_CATALOG,
@@ -117,7 +101,7 @@ function _handleChangeDoorStyleEvent() {
             // result is ccdf_list
             function () {
               var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(result) {
-                var _result$ccdf_list, _doorStyle$id2, _result$molding_ccdf_;
+                var _result$ccdf_list, _doorStyle$id, _result$molding_ccdf_;
                 var mappedCabinetDefinitionList, rt;
                 return _regenerator["default"].wrap(function (_context) {
                   while (1) switch (_context.prev = _context.next) {
@@ -135,7 +119,7 @@ function _handleChangeDoorStyleEvent() {
                       // Persist ccdf on affected instances so SYNC includes the latest ccdf.id for each item.
                       // IMPORTANT: host response `ccdf_list[]` may not include `door_finish_id`.
                       // Use request door_finish_id (doorStyle.id) as the source of truth for door_finish_id.
-                      props.itemsActions.setItemsCCDF((_result$ccdf_list = result === null || result === void 0 ? void 0 : result.ccdf_list) !== null && _result$ccdf_list !== void 0 ? _result$ccdf_list : [], applyScope, itemIds, (_doorStyle$id2 = doorStyle === null || doorStyle === void 0 ? void 0 : doorStyle.id) !== null && _doorStyle$id2 !== void 0 ? _doorStyle$id2 : null);
+                      props.itemsActions.setItemsCCDF((_result$ccdf_list = result === null || result === void 0 ? void 0 : result.ccdf_list) !== null && _result$ccdf_list !== void 0 ? _result$ccdf_list : [], applyScope, itemIds, (_doorStyle$id = doorStyle === null || doorStyle === void 0 ? void 0 : doorStyle.id) !== null && _doorStyle$id !== void 0 ? _doorStyle$id : null);
                       props.itemsActions.setMoldingsCCDF((_result$molding_ccdf_ = result === null || result === void 0 ? void 0 : result.molding_ccdf_list) !== null && _result$molding_ccdf_ !== void 0 ? _result$molding_ccdf_ : [], applyScope);
                       props.itemsActions.setDoorStyle(doorStyle, itemCDS, applyScope, itemIds);
                     case 2:

package/lib/events/external/handlers.loadProject.js

@@ -7,11 +7,14 @@ Object.defineProperty(exports, "__esModule", {
 exports.handleLoadProjectEvent = handleLoadProjectEvent;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _convertUnitsLite = require("../../utils/convert-units-lite");
 var _constants = require("../../constants");
 var _models = require("../../models");
 var _asyncPool = require("../../shared/concurrency/async-pool");
+var _handleExternalEvent = require("./handleExternalEvent.util");
+var _utils = require("../../components/viewer2d/utils");
 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; }
 function handleLoadProjectEvent(_x, _x2, _x3, _x4, _x5, _x6, _x7, _x8) {
@@ -19,14 +22,14 @@ function handleLoadProjectEvent(_x, _x2, _x3, _x4, _x5, _x6, _x7, _x8) {
 }
 function _handleLoadProjectEvent() {
   _handleLoadProjectEvent = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(props, state, evt, mapFromCCDFToCDS, updateProjectWithCDSList, ccdfMapper, mergeSameElements, addItemToCatalog) {
-    var layerName, _evt$payload$layers$l, _evt$payload, _state$catalog, ccdf_list, items, newScene, tempState, _props$onInternalEven;
+    var layerName, _evt$payload$layers$l, _evt$payload, _state$catalog, ccdf_list, molding_ccdf_list, items, newScene, tempState, _props$onInternalEven;
     return _regenerator["default"].wrap(function (_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
           layerName = 'layer-1';
           if (evt !== null && evt !== void 0 && evt.payload) {
             // prepare item data request
-            ccdf_list = [];
+            ccdf_list = [], molding_ccdf_list = [];
             items = (_evt$payload$layers$l = evt === null || evt === void 0 || (_evt$payload = evt.payload) === null || _evt$payload === void 0 || (_evt$payload = _evt$payload.layers[layerName]) === null || _evt$payload === void 0 ? void 0 : _evt$payload.items) !== null && _evt$payload$layers$l !== void 0 ? _evt$payload$layers$l : {};
             Object.keys(items).forEach(function (k) {
               var _it$properties, _it$properties2, _it$properties3;
@@ -50,6 +53,7 @@ function _handleLoadProjectEvent() {
                   long_name: (_it$long_name = it === null || it === void 0 ? void 0 : it.long_name) !== null && _it$long_name !== void 0 ? _it$long_name : null,
                   scene_cabinet_id: it.id
                 });
+                if (!(0, _utils.isEmpty)(it.doorStyle) && !(0, _utils.isEmpty)(it.molding)) molding_ccdf_list.push.apply(molding_ccdf_list, (0, _toConsumableArray2["default"])((0, _handleExternalEvent.prepareMoldingCCDFList)(it.doorStyle, it.molding)));
               }
             });
             newScene = new _models.Scene(evt === null || evt === void 0 ? void 0 : evt.payload);
@@ -62,7 +66,8 @@ function _handleLoadProjectEvent() {
                 type: _constants.INTERNAL_EVENT_ITEMS_CATALOG,
                 value: {
                   event_type: 'load_project',
-                  ccdf_list: ccdf_list
+                  ccdf_list: ccdf_list,
+                  molding_ccdf_list: molding_ccdf_list
                 }
               }, /*#__PURE__*/function () {
                 var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(result) {
@@ -106,6 +111,7 @@ function _handleLoadProjectEvent() {
                         });
                       case 1:
                         props.projectActions.loadProject(evt.payload);
+                        props.itemsActions.setMoldingsCCDF(result === null || result === void 0 ? void 0 : result.molding_ccdf_list, 'all');
                       case 2:
                       case "end":
                         return _context.stop();

package/lib/events/external/handlers.molding.js

@@ -20,7 +20,7 @@ function _handleSetMolding() {
           _context.next = 1;
           return loadMoldingSvg(moldingInfo);
         case 1:
-          props.itemsActions.setMolding(moldingInfo, isGlobal);
+          props.itemsActions.setMolding(moldingInfo, isGlobal, props.onInternalEvent);
         case 2:
         case "end":
           return _context.stop();

package/lib/reducers/items-reducer.js

@@ -112,7 +112,7 @@ function _default(state, action) {
       state = stateHistoryPush(state).updatedState;
       return _export.Item.setCounterTop(state, action.counterTop).updatedState;
     case _constants.SET_MOLDING:
-      return _export.Item.setMolding(state, action.molding, action.isAll).updatedState;
+      return _export.Item.setMolding(state, action.molding, action.isAll, action.onInternalEvent).updatedState;
     case _constants.UPDATE_MOLDING:
       return _export.Item.updateMolding(state).updatedState;
     case _constants.SET_WALL_COLOR:

package/lib/utils/molding.js

@@ -9,7 +9,6 @@ exports.createMonldingGroup = createMonldingGroup;
 exports.getAllMoldingGroups = getAllMoldingGroups;
 exports.getItemGroupFromMolding = getItemGroupFromMolding;
 exports.getItemRect = getItemRect;
-exports.getLinesFromItems = getLinesFromItems;
 exports.getLinesFromItems2 = getLinesFromItems2;
 exports.getLinesOfItem = getLinesOfItem;
 exports.getLinesOfItem2 = getLinesOfItem2;
@@ -727,97 +726,6 @@ function getTrimmedContourLineSegs(lineSegs, otherLines, cnt) {
     return [];
   }
 }
-function getLinesFromItems(moldingGroup, layer, catalog) {
-  var allLineRects = _export.GeometryUtils.buildRectFromLines(layer, _export.GeometryUtils.getAllLines(layer));
-  var items = (0, _toConsumableArray2["default"])(moldingGroup.items);
-  var MGlines = getLinesOfItem(items[0], allLineRects, catalog);
-  items = sortItemsByDistance(items, items[0]);
-  var _loop7 = function _loop7() {
-    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++) {
-    _loop7();
-  }
-  // return MGlines;
-  var snapped_other_items = layer.items.toArray().filter(function (item) {
-    if (items.some(function (it) {
-      return item.id === it.id;
-    })) return false;
-    return isItemSnappedGroup(item, items);
-  });
-  snapped_other_items.forEach(function (item) {
-    var itemAltitude = item.properties.get('altitude').get('_length');
-    var itemAltitudeUnit = item.properties.get('altitude').get('_unit');
-    itemAltitude = (0, _convertUnitsLite.convert)(itemAltitude).from(itemAltitudeUnit).to('cm');
-    var itemHeight = item.properties.get('height').get('_length');
-    var itemHeightUnit = item.properties.get('height').get('_unit');
-    itemHeight = (0, _convertUnitsLite.convert)(itemHeight).from(itemHeightUnit).to('cm');
-    var mgroupAltitude = items[0].properties.get('altitude').get('_length');
-    var mgroupAltitudeUnit = items[0].properties.get('altitude').get('_unit');
-    mgroupAltitude = (0, _convertUnitsLite.convert)(mgroupAltitude).from(mgroupAltitudeUnit).to('cm');
-    var mgroupHeight = items[0].properties.get('height').get('_length');
-    var mgroupHeightUnit = items[0].properties.get('height').get('_unit');
-    mgroupHeight = (0, _convertUnitsLite.convert)(mgroupHeight).from(mgroupHeightUnit).to('cm');
-    var flag = false;
-    switch (moldingGroup.location_type) {
-      case _constants.TOP_MOLDING_LOCATION:
-        flag = itemAltitude + itemHeight > mgroupAltitude + mgroupHeight;
-        break;
-      case _constants.MIDDLE_MOLDING_LOCATION:
-        flag = true;
-        break;
-      case _constants.BOTTOM_MOLDING_LOCATION:
-        flag = itemAltitude < mgroupAltitude;
-        break;
-    }
-    if (item.category !== 'cabinet' || ![_constants.BASE_CABINET_LAYOUTPOS, _constants.WALL_CABINET_LAYOUTPOS, _constants.TALL_CABINET_LAYOUTPOS].includes(item.layoutpos)) flag = true;
-    if (flag) {
-      var itemLines = getLinesOfItem(item, allLineRects, catalog);
-      var temp_MGLines = [];
-      MGlines.forEach(function (mgl) {
-        var idx = itemLines.findIndex(function (itl) {
-          return isLinesOverlapped(mgl, itl);
-        });
-        var curITL = itemLines[idx];
-        if (idx > -1) {
-          if (getDelta(mgl[0], mgl[1], curITL[1], curITL[0]) < _constants.EPSILON || getDelta(mgl[0], mgl[1], curITL[0], curITL[1]) < _constants.EPSILON) {
-            if (_export.GeometryUtils.verticesDistance(mgl[0], mgl[1]) > _export.GeometryUtils.verticesDistance(curITL[0], curITL[1])) {
-              var MGLine = mergeOverlappedLines(mgl, curITL);
-              temp_MGLines.push(MGLine);
-            }
-            itemLines.splice(idx, 1);
-          } else {
-            temp_MGLines.push(mgl);
-          }
-        } else {
-          temp_MGLines.push(mgl);
-        }
-      });
-      MGlines = [].concat(temp_MGLines);
-    }
-  });
-  return MGlines;
-}
 function getMDPoints(newMD) {
   if (newMD.lines.length < 1) return _objectSpread(_objectSpread({}, newMD), {}, {
     pointGroups: []
@@ -867,7 +775,7 @@ function getMDPoints(newMD) {
   var pointGroups = [[]];
   var flag = 1;
   var i = 0;
-  var _loop8 = function _loop8() {
+  var _loop7 = function _loop7() {
     if (pointGroups[i].length === 0) {
       pointGroups[i].push(new Three.Vector2(MDlines[0][0].x - cPos.x, MDlines[0][0].y - cPos.y), new Three.Vector2(MDlines[0][1].x - cPos.x, MDlines[0][1].y - cPos.y));
       MDlines.splice(0, 1);
@@ -932,7 +840,7 @@ function getMDPoints(newMD) {
     }
   };
   while (MDlines.length !== 0) {
-    _loop8();
+    _loop7();
   }
   var z = newMD.items[0].properties.get('altitude').get('_length');
   var zUnit = newMD.items[0].properties.get('altitude').get('_unit') || 'cm';
@@ -1042,14 +950,14 @@ function getMoldingDataOfScene2(layer, catalog, doorStyle, moldingPieceLength) {
   // filter the real molding line segments
   var removeLineIds = []; // remove the line that fully overlapped to other line
   var newLines = []; // new countour line segment that except the overlapped part
-  var _loop9 = function _loop9(i) {
+  var _loop8 = function _loop8(i) {
     var srcLine = {
       x1: moldingLines[i].line[0].x,
       y1: moldingLines[i].line[0].y,
       x2: moldingLines[i].line[1].x,
       y2: moldingLines[i].line[1].y
     };
-    var _loop1 = function _loop1(_j) {
+    var _loop0 = function _loop0(_j) {
         if (i === _j) return 0; // continue
         if (Math.abs(moldingLines[i].z - moldingLines[_j].z) > _constants.EPSILON) return 0; // continue
         var destLine = {
@@ -1084,13 +992,13 @@ function getMoldingDataOfScene2(layer, catalog, doorStyle, moldingPieceLength) {
       },
       _ret4;
     for (var _j = 0; _j < moldingLines.length; _j++) {
-      _ret4 = _loop1(_j);
+      _ret4 = _loop0(_j);
       if (_ret4 === 0) continue;
       if (_ret4 === 1) break;
     }
   };
   for (var i = 0; i < moldingLines.length; i++) {
-    _loop9(i);
+    _loop8(i);
   }
   moldingLines = moldingLines.filter(function (line, idx) {
     return !removeLineIds.some(function (id) {
@@ -1121,7 +1029,7 @@ function getMoldingDataOfScene2(layer, catalog, doorStyle, moldingPieceLength) {
   // console.log('moldingLines: ', moldingLines);
 
   // make molding data with grouping molding & doorStyle
-  var _loop0 = function _loop0() {
+  var _loop9 = function _loop9() {
     var ml = moldingLines[k];
     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) {
@@ -1138,7 +1046,7 @@ function getMoldingDataOfScene2(layer, catalog, doorStyle, moldingPieceLength) {
     }
   };
   for (var k = 0; k < moldingLines.length; k++) {
-    _loop0();
+    _loop9();
   }
   // console.log('moldingData: ', moldingData);
 

package/package.json

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