kitchen-simulator 3.0.1 → 3.1.0

package/es/actions/lines-actions.js

@@ -13,12 +13,14 @@ export function selectToolDrawingLine(sceneComponentType) {
   };
 }
 export function beginDrawingLine(layerID, x, y, snapMask) {
+  var onInternalEvent = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : null;
   return {
     type: BEGIN_DRAWING_LINE,
     layerID: layerID,
     x: x,
     y: y,
-    snapMask: snapMask
+    snapMask: snapMask,
+    onInternalEvent: onInternalEvent
   };
 }
 export function updateDrawingLine(x, y, relatedLines, snapMask) {

package/es/catalog/utils/item-loader.js

@@ -450,6 +450,7 @@ export function render3DItem(element, layer, scene, sizeinfo, structure_json, is
   var tempPlaceholders = structure.tempPlaceholders;
   var tPlaceholders = tempPlaceholders.find(function (el) {
     return el.id === tempDoorStyles.cabinet_door_style_id;
+    // return el.id === tempDoorStyles.cds[0].cabinet_door_style_id;
   });
   if (tPlaceholders !== undefined) {
     placeholders = tPlaceholders.placeholders;

package/es/class/item.js

@@ -479,6 +479,9 @@ var Item = /*#__PURE__*/function () {
     key: "storeDistArray",
     value: function storeDistArray(state, layerID, itemID, distArray) {
       var curDistArray = state.getIn(['scene', 'layers', layerID, 'items', itemID, 'distArray']);
+      distArray.forEach(function (dist) {
+        dist[0] < 0 ? dist[0] = 0 : dist[0];
+      });
       var isEqualDist = function isEqualDist(a, b) {
         return a == b;
       };
@@ -1145,6 +1148,7 @@ var Item = /*#__PURE__*/function () {
       for (var x in keys) {
         tmp[keys[x]] = doorStyle.doorStyles[keys[x]];
       }
+      doorStyle.cds = itemCDS;
       state = state.setIn(['scene', 'layers', state.scene.selectedLayer, 'doorStyle'], doorStyle);
       state = state.merge({
         doorStyle: doorStyle

package/es/class/line.js

@@ -5,8 +5,9 @@ import { fromJS, List, Map } from 'immutable';
 import { Group, Hole, Layer, Vertex } from "./export";
 import { GeometryUtils, history, IDBroker, NameGenerator, SnapSceneUtils, SnapUtils } from "../utils/export";
 import * as Three from 'three';
-import { END_DRAGGING_LINE, END_DRAGGING_VERTEX, END_DRAWING_LINE, EPSILON, MIN_ANGLE_DISALLOW_DRAW_WALL, MODE_DRAGGING_LINE, MODE_DRAWING_LINE, MODE_IDLE, MODE_WAITING_DRAWING_LINE, UNIT_ANGLE } from "../constants";
+import { END_DRAGGING_LINE, END_DRAGGING_VERTEX, END_DRAWING_LINE, EPSILON, INTERNAL_EVENT_START_DRAW_WALL, MIN_ANGLE_DISALLOW_DRAW_WALL, MODE_DRAGGING_LINE, MODE_DRAWING_LINE, MODE_IDLE, MODE_WAITING_DRAWING_LINE, UNIT_ANGLE } from "../constants";
 import { isEmpty } from "../utils/helper";
+import { convert } from "../utils/convert-units-lite";
 var timeGlobal = 0;
 var TimeRecorder = /*#__PURE__*/function () {
   function TimeRecorder(name) {
@@ -426,7 +427,7 @@ var Line = /*#__PURE__*/function () {
     }
   }, {
     key: "beginDrawingLine",
-    value: function beginDrawingLine(state, layerID, x, y) {
+    value: function beginDrawingLine(state, layerID, x, y, onInternalEvent) {
       // if end drawing by created area
       if (state.mode == MODE_IDLE) {
         return {
@@ -479,6 +480,17 @@ var Line = /*#__PURE__*/function () {
         activeSnapElement: snap ? snap.snap : null,
         drawingSupport: drawingSupport
       });
+      var layer = state.getIn(['scene', 'layers', layerID]);
+      var payload = line.toJS();
+      var v_a = layer.vertices.get(line.vertices.get(0));
+      var v_b = layer.vertices.get(line.vertices.get(1));
+      var distance = GeometryUtils.pointsDistance(v_a.x, v_a.y, v_b.x, v_b.y);
+      var _length = convert(distance).from('cm').to('in');
+      payload.length = _length;
+      if (onInternalEvent) onInternalEvent({
+        type: INTERNAL_EVENT_START_DRAW_WALL,
+        value: payload
+      });
       return {
         updatedState: state
       };

package/es/components/viewer2d/item.js

@@ -5,7 +5,7 @@ import RulerDist from "./rulerDist";
 import { convert } from "../../utils/convert-units-lite";
 import { GeometryUtils } from "../../utils/export";
 import { MODE_ROTATING_ITEM, WALL_CABINET_LAYOUTPOS } from "../../constants";
-import { isEmpty, returnReplaceableDeepSearchType } from "./utils";
+import { isEmpty, isWarningItem, returnReplaceableDeepSearchType } from "./utils";
 import { findCatalogElement } from "../../utils/geometry";
 var STYLE_LINE = {
   fill: '#0096fd',
@@ -390,7 +390,10 @@ export default function Item(_ref, _ref2) {
     y: "-19",
     height: "16",
     width: "16",
-    style: {
+    style: isWarningItem(item) ? {
+      transform: 'rotateX(180deg)',
+      opacity: 0.5
+    } : {
       transform: 'rotateX(180deg)'
     }
   })), /*#__PURE__*/React.createElement("g", {

package/es/components/viewer2d/rulerDist.js

@@ -34,7 +34,7 @@ export default function RulerDist(_ref) {
   var _unit = 'in';
   // let _length = convert(length).from(unit).to(rulerUnit);
   var distanceText = "".concat(convert(length).from('cm').to(rulerUnit).toFixed(0));
-  var textLength = (distanceText.length + layer.unit.length) * 18;
+  var textLength = (distanceText.length + layer.unit.length) * 8;
   var textangle = angle + 90;
   var textRotation = 1;
   var ay = 2;

package/es/components/viewer2d/viewer2d.js

@@ -948,7 +948,7 @@ export default function Viewer2D(_ref, _ref2) {
           case 'items':
             if (elementData.part === 'duplicate') {
               var currentObject = state.getIn(['scene', 'layers', layerID, 'items', elementData.id]);
-              itemsActions.duplicateSelected(currentObject, onInternalEvent); // send draw internal event when duplicating
+              if (!isWarningItem(currentObject)) itemsActions.duplicateSelected(currentObject, onInternalEvent); // send draw internal event when duplicating
               break;
             } else if (elementData.part === 'remove') {
               projectActions.remove();
@@ -1199,7 +1199,7 @@ export default function Viewer2D(_ref, _ref2) {
         break;
       case constants.MODE_WAITING_DRAWING_LINE:
         setdrawStart(true);
-        linesActions.beginDrawingLine(layerID, x, y, state.snapMask);
+        linesActions.beginDrawingLine(layerID, x, y, state.snapMask, onInternalEvent);
         break;
       case constants.MODE_DRAWING_LINE:
         // Blocked 90 degree snap.
@@ -1213,7 +1213,7 @@ export default function Viewer2D(_ref, _ref2) {
         getConnectedLines();
         var endInfor = getEndPoint(vertices, x, y, 'END_DRAWIN_LINE');
         linesActions.endDrawingLine(endInfor.x, endInfor.y, state.snapMask);
-        linesActions.beginDrawingLine(layerID, endInfor.x, endInfor.y, state.snapMask);
+        linesActions.beginDrawingLine(layerID, endInfor.x, endInfor.y, state.snapMask, onInternalEvent);
         break;
       case constants.MODE_DRAWING_HOLE:
         holesActions.endDrawingHole(layerID, x, y);
@@ -1264,6 +1264,8 @@ export default function Viewer2D(_ref, _ref2) {
         } else if (((_currentObject5 = _currentObject) === null || _currentObject5 === void 0 ? void 0 : _currentObject5.prototype) === 'items') {
           // check this cabinet has warning box
           payload.isWarning = isWarningItem(_currentObject);
+          // check this item is available molding
+          payload.isMoldingAvailable = MoldingUtils.isEnableItemForMolding(layer, _currentObject);
           // check this item is snapped to wall
           payload.isAttachedWall = MoldingUtils.isAttachedWall(layer, _currentObject);
         }

package/es/components/viewer3d/viewer3d.js

@@ -1184,6 +1184,26 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
           itemID: selItemId
         };
       };
+      var sendInternalEvent = function sendInternalEvent(evtType, evtElement) {
+        var pointArray = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
+        if (!isEmpty(evtType)) {
+          var _this2$props$onIntern, _this2$props;
+          var payload = evtElement === null || evtElement === void 0 ? void 0 : evtElement.toJS();
+          if ((evtElement === null || evtElement === void 0 ? void 0 : evtElement.prototype) === 'items') {
+            // check this cabinet has warning box
+            payload.isWarning = isWarningItem(evtElement);
+            // check this item is available molding
+            payload.isMoldingAvailable = MoldingUtils.isEnableItemForMolding(layer, evtElement); // check this item is snapped to wall
+            payload.isAttachedWall = MoldingUtils.isAttachedWall(layer, evtElement);
+            // update distArray
+            if (pointArray) payload.distArray = pointArray;
+          }
+          (_this2$props$onIntern = (_this2$props = _this2.props).onInternalEvent) === null || _this2$props$onIntern === void 0 || _this2$props$onIntern.call(_this2$props, {
+            type: evtType,
+            value: payload
+          });
+        }
+      };
       this.mouseDownEvent = function (event) {
         gridPlanOrigin = gridPlane.position;
         gridMatrix.copy(gridPlane.matrixWorld).invert();
@@ -1479,39 +1499,42 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
                   currentObject = currentObject.parent;
                 }
                 isSelected = true;
-                getDistances(layer);
-                var selectedItem = planData.sceneGraph.layers[selectedObject.layerID].items[selectedObject.itemID];
-                if (isUndefined(selectedItem)) return;
-                selectedElement = _this2.props.state.scene.layers.get(selectedObject.layerID).items.get(selectedObject.itemID);
-                var itemPos = selectedItem.position.clone();
-                if (intersects[_i10].object.parent && intersects[_i10].object.parent.parent.userData.itemId === selectedItem.userData.itemId) {
-                  toolObj.position.set(intersects[_i10].point.x, intersects[_i10].point.y, intersects[_i10].point.z);
-                } else {
-                  toolObj.position.set(planData.plan.position.x + itemPos.x, selectedElement.category === 'lighting' ? -planData.plan.position.y - selectedElement.properties.get('height').get('length') : planData.plan.position.y + selectedItem.children[0].position.y, planData.plan.position.z + itemPos.z);
-                }
-                scene3D.add(toolObj);
-                _this2.setState({
-                  toolObj: toolObj
-                });
-                // showItemButtons(layer.getIn(['items', selectedObject.itemID]), currentObject, event, camera, this.renderer);
-                var pointArray = [],
-                  cnt = 0;
-                pointArray.push([fVLine[0].userData.distance, 90]);
-                pointArray.push([fVLine[1].userData.distance, -90]);
-                pointArray.push([fVLine[2].userData.distance, 180]);
-                pointArray.push([fVLine[3].userData.distance, 0]);
-                pointArray.forEach(function (pointElement, index) {
-                  if (pointElement[0] == undefined) pointArray[index][0] = 0;
-                });
-                pointArray.forEach(function (pointElement) {
-                  if (pointElement[0] == 0) cnt++;
+                setTimeout(function () {
+                  getDistances(layer);
+                  var selectedItem = planData.sceneGraph.layers[selectedObject.layerID].items[selectedObject.itemID];
+                  if (isUndefined(selectedItem)) return;
+                  selectedElement = _this2.props.state.scene.layers.get(selectedObject.layerID).items.get(selectedObject.itemID);
+                  var itemPos = selectedItem.position.clone();
+                  if (intersects[_i10].object.parent && intersects[_i10].object.parent.parent.userData.itemId === selectedItem.userData.itemId) {
+                    toolObj.position.set(intersects[_i10].point.x, intersects[_i10].point.y, intersects[_i10].point.z);
+                  } else {
+                    toolObj.position.set(planData.plan.position.x + itemPos.x, selectedElement.category === 'lighting' ? -planData.plan.position.y - selectedElement.properties.get('height').get('length') : planData.plan.position.y + selectedItem.children[0].position.y, planData.plan.position.z + itemPos.z);
+                  }
+                  scene3D.add(toolObj);
+                  _this2.setState({
+                    toolObj: toolObj
+                  });
+                  // showItemButtons(layer.getIn(['items', selectedObject.itemID]), currentObject, event, camera, this.renderer);
+                  var pointArray = [],
+                    cnt = 0;
+                  pointArray.push([fVLine[0].userData.distance, 90]);
+                  pointArray.push([fVLine[1].userData.distance, -90]);
+                  pointArray.push([fVLine[2].userData.distance, 180]);
+                  pointArray.push([fVLine[3].userData.distance, 0]);
+                  pointArray.forEach(function (pointElement, index) {
+                    if (pointElement[0] == undefined) pointArray[index][0] = 0;
+                  });
+                  pointArray.forEach(function (pointElement) {
+                    if (pointElement[0] == 0) cnt++;
+                  });
+                  if (cnt == 4 || cnt == 3) {
+                    pointArray[0][0] = 100;
+                    pointArray[1][0] = 100;
+                  }
+                  actions.itemsActions.storeDistArray(layer.id, selectedObject.itemID, pointArray);
+                  internalType = internalType ? internalType : INTERNAL_EVENT_SELECT_ELEMENT;
+                  sendInternalEvent(internalType, selectedElement, pointArray);
                 });
-                if (cnt == 4 || cnt == 3) {
-                  pointArray[0][0] = 100;
-                  pointArray[1][0] = 100;
-                }
-                actions.itemsActions.storeDistArray(layer.id, selectedObject.itemID, pointArray);
-                internalType = internalType ? internalType : INTERNAL_EVENT_SELECT_ELEMENT;
               } else {
                 if (selectedObject) {
                   var elementID = null;
@@ -1569,14 +1592,14 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
             getPoint(event, alti);
             if (bRotate) {
               var _intersects$_i;
-              var _selectedItem = planData.sceneGraph.layers[selectedObject.layerID].items[selectedObject.itemID];
-              if (isUndefined(_selectedItem)) return;
+              var selectedItem = planData.sceneGraph.layers[selectedObject.layerID].items[selectedObject.itemID];
+              if (isUndefined(selectedItem)) return;
               selectedElement = _this2.props.state.scene.layers.get(selectedObject.layerID).items.get(selectedObject.itemID);
-              var _itemPos = _selectedItem.position.clone();
-              if (((_intersects$_i = intersects[_i10]) === null || _intersects$_i === void 0 || (_intersects$_i = _intersects$_i.object) === null || _intersects$_i === void 0 || (_intersects$_i = _intersects$_i.parent) === null || _intersects$_i === void 0 || (_intersects$_i = _intersects$_i.parent) === null || _intersects$_i === void 0 || (_intersects$_i = _intersects$_i.userData) === null || _intersects$_i === void 0 ? void 0 : _intersects$_i.itemId) === _selectedItem.userData.itemId) {
+              var itemPos = selectedItem.position.clone();
+              if (((_intersects$_i = intersects[_i10]) === null || _intersects$_i === void 0 || (_intersects$_i = _intersects$_i.object) === null || _intersects$_i === void 0 || (_intersects$_i = _intersects$_i.parent) === null || _intersects$_i === void 0 || (_intersects$_i = _intersects$_i.parent) === null || _intersects$_i === void 0 || (_intersects$_i = _intersects$_i.userData) === null || _intersects$_i === void 0 ? void 0 : _intersects$_i.itemId) === selectedItem.userData.itemId) {
                 toolObj.position.set(intersects[_i10].point.x, intersects[_i10].point.y, intersects[_i10].point.z);
               } else {
-                toolObj.position.set(planData.plan.position.x + _itemPos.x, selectedElement.category === 'lighting' ? -planData.plan.position.y - selectedElement.properties.get('height').get('length') : planData.plan.position.y + _selectedItem.children[0].position.y, planData.plan.position.z + _itemPos.z);
+                toolObj.position.set(planData.plan.position.x + itemPos.x, selectedElement.category === 'lighting' ? -planData.plan.position.y - selectedElement.properties.get('height').get('length') : planData.plan.position.y + selectedItem.children[0].position.y, planData.plan.position.z + itemPos.z);
               }
               scene3D.add(toolObj);
               _this2.setState({
@@ -1587,14 +1610,14 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
             }
             if (bMove) {
               bMove = false;
-              var _selectedItem2 = planData.sceneGraph.layers[selectedObject.layerID].items[selectedObject.itemID];
-              if (isUndefined(_selectedItem2)) return;
+              var _selectedItem = planData.sceneGraph.layers[selectedObject.layerID].items[selectedObject.itemID];
+              if (isUndefined(_selectedItem)) return;
               selectedElement = _this2.props.state.scene.layers.get(selectedObject.layerID).items.get(selectedObject.itemID);
-              var _itemPos2 = _selectedItem2.position.clone();
-              if (intersects[_i10].object.parent.parent.userData.itemId === _selectedItem2.userData.itemId) {
+              var _itemPos = _selectedItem.position.clone();
+              if (intersects[_i10].object.parent.parent.userData.itemId === _selectedItem.userData.itemId) {
                 toolObj.position.set(intersects[_i10].point.x, intersects[_i10].point.y, intersects[_i10].point.z);
               } else {
-                toolObj.position.set(planData.plan.position.x + _itemPos2.x, selectedElement.category === 'lighting' ? -planData.plan.position.y - selectedElement.properties.get('height').get('length') : planData.plan.position.y + _selectedItem2.children[0].position.y, planData.plan.position.z + _itemPos2.z);
+                toolObj.position.set(planData.plan.position.x + _itemPos.x, selectedElement.category === 'lighting' ? -planData.plan.position.y - selectedElement.properties.get('height').get('length') : planData.plan.position.y + _selectedItem.children[0].position.y, planData.plan.position.z + _itemPos.z);
               }
               scene3D.add(toolObj);
               _this2.setState({
@@ -1628,20 +1651,7 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
             selectedObj = allItemRect.cur;
           }
         }
-        if (!isEmpty(internalType)) {
-          var _selectedElement, _selectedElement2, _this2$props$onIntern, _this2$props;
-          var payload = (_selectedElement = selectedElement) === null || _selectedElement === void 0 ? void 0 : _selectedElement.toJS();
-          if (((_selectedElement2 = selectedElement) === null || _selectedElement2 === void 0 ? void 0 : _selectedElement2.prototype) === 'items') {
-            // check this cabinet has warning box
-            payload.isWarning = isWarningItem(selectedElement);
-            // check this item is snapped to wall
-            payload.isAttachedWall = MoldingUtils.isAttachedWall(layer, selectedElement);
-          }
-          (_this2$props$onIntern = (_this2$props = _this2.props).onInternalEvent) === null || _this2$props$onIntern === void 0 || _this2$props$onIntern.call(_this2$props, {
-            type: internalType,
-            value: payload
-          });
-        }
+        sendInternalEvent(internalType, selectedElement);
       };
       this.mouseEnterEvent = function (event) {
         if (_this2.props.state.mode !== MODE_DRAWING_ITEM_3D) return;
@@ -2609,9 +2619,10 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
           }, /*#__PURE__*/React.createElement("img", {
             style: {
               animation: 'spin 2s linear infinite',
-              marginTop: "50%",
-              width: '50px',
-              height: '50px'
+              position: "absolute",
+              top: "50%",
+              width: '70px',
+              height: '70px'
             },
             src: '/assets/img/loading/loading.gif',
             alt: "img"
@@ -2631,8 +2642,8 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
             animation: 'spin 2s linear infinite',
             position: "absolute",
             top: "50%",
-            width: '50px',
-            height: '50px'
+            width: '70px',
+            height: '70px'
           },
           src: '/assets/img/loading/loading.gif',
           alt: "img"

package/es/constants.js

@@ -747,6 +747,7 @@ export var INTERNAL_EVENT_DRAG_ELEMENT = 'INTERNAL_EVENT_DRAG_ELEMENT';
 export var INTERNAL_EVENT_DRAW_ELEMENT = 'INTERNAL_EVENT_DRAW_ELEMENT';
 export var INTERNAL_EVENT_ROTATE_ELEMENT = 'INTERNAL_EVENT_ROTATE_ELEMENT';
 export var INTERNAL_EVENT_REPLACE_CABINET = 'INTERNAL_EVENT_REPLACE_CABINET';
+export var INTERNAL_EVENT_START_DRAW_WALL = 'INTERNAL_EVENT_START_DRAW_WALL';
 
 // room shape type
 export var ROOM_SHAPE_TYPE = {

package/es/reducers/lines-reducer.js

@@ -13,7 +13,7 @@ export default function (state, action) {
       state = state.merge({
         sceneHistory: history.historyPush(state.sceneHistory, state.scene)
       });
-      return Line.beginDrawingLine(state, action.layerID, action.x, action.y).updatedState;
+      return Line.beginDrawingLine(state, action.layerID, action.x, action.y, action.onInternalEvent).updatedState;
     case UPDATE_DRAWING_LINE:
       return Line.updateDrawingLine(state, action.x, action.y, action.relatedLines).updatedState;
     case STOP_DRAWING_LINE: