kitchen-simulator 3.10.0 → 3.11.0

package/es/class/item.js

@@ -9,10 +9,10 @@ import { Group, Hole, Layer } from "./export";
 import { GeometryUtils, IDBroker, MoldingUtils, NameGenerator } from "../utils/export";
 import { fromJS, Map } from 'immutable';
 import { INSTALLATION_SUFFIX_TYPE, INTERNAL_EVENT_DRAW_ELEMENT, MODE_DRAGGING_ITEM, MODE_DRAGGING_ITEM_3D, MODE_DRAWING_ITEM, MODE_DRAWING_ITEM_3D, MODE_IDLE, MODE_IDLE_3D, MODE_ROTATING_ITEM, MODE_ROTATING_ITEM_3D, MOLDING_LOCATIONS } from "../constants";
-import { debugUtil } from "../utils/helper";
+import { debugUtil, updatePayloadOfInternalEvent } from "../utils/helper";
 import { isUndefined } from 'util';
 import { hasMoldingLayout } from "../utils/molding";
-import { getInstallationSuffix, isWarningItem } from "../components/viewer2d/utils";
+import { getInstallationSuffix } from "../components/viewer2d/utils";
 import { historyPush } from "../utils/history";
 var allItemRect;
 var allItemSnap;
@@ -465,8 +465,9 @@ var Item = /*#__PURE__*/function () {
           break;
       }
       if (onInternalEvent && duplicatedElement) {
-        var jsElement = duplicatedElement.toJS();
-        if (jsElement.prototype === 'items') jsElement.isWarning = isWarningItem(duplicatedElement);
+        var _state$get;
+        var catalog = (_state$get = state.get('catalog')) === null || _state$get === void 0 ? void 0 : _state$get.toJS();
+        var jsElement = updatePayloadOfInternalEvent(duplicatedElement, layer, catalog);
         onInternalEvent({
           type: INTERNAL_EVENT_DRAW_ELEMENT,
           value: jsElement

package/es/class/line.js

@@ -6,8 +6,7 @@ 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, 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";
+import { isEmpty, updatePayloadOfInternalEvent } from "../utils/helper";
 var timeGlobal = 0;
 var TimeRecorder = /*#__PURE__*/function () {
   function TimeRecorder(name) {
@@ -428,6 +427,7 @@ var Line = /*#__PURE__*/function () {
   }, {
     key: "beginDrawingLine",
     value: function beginDrawingLine(state, layerID, x, y, onInternalEvent) {
+      var _state$get;
       // if end drawing by created area
       if (state.mode == MODE_IDLE) {
         return {
@@ -481,12 +481,8 @@ var Line = /*#__PURE__*/function () {
         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(layer.unit);
-      payload.length = _length;
+      var catalog = (_state$get = state.get('catalog')) === null || _state$get === void 0 ? void 0 : _state$get.toJS();
+      var payload = updatePayloadOfInternalEvent(line, layer, catalog);
       if (onInternalEvent) onInternalEvent({
         type: INTERNAL_EVENT_START_DRAW_WALL,
         value: payload

package/es/components/viewer2d/viewer2d.js

@@ -15,9 +15,8 @@ import FormNumberInput from "../style/form-number-input";
 import { convert } from "../../utils/convert-units-lite";
 import { Map } from 'immutable';
 import { formatNumber } from "../../utils/math";
-import { isEmpty } from "../../utils/helper"; // variables
+import { isEmpty, updatePayloadOfInternalEvent } from "../../utils/helper"; // variables
 import { isWarningItem } from "./utils";
-import { MoldingUtils } from "../../utils/export";
 // variables
 var pinFlag = false;
 var sFlag = false; //for all object move
@@ -1251,24 +1250,7 @@ export default function Viewer2D(_ref, _ref2) {
         _currentObject = state.getIn(['scene', 'layers', layerID, elementPrototype, elementID]);
       }
       if (_currentObject) {
-        var _currentObject3, _currentObject4, _currentObject5;
-        var payload = (_currentObject3 = _currentObject) === null || _currentObject3 === void 0 ? void 0 : _currentObject3.toJS();
-        if (((_currentObject4 = _currentObject) === null || _currentObject4 === void 0 ? void 0 : _currentObject4.prototype) === 'lines') {
-          // caculating length of selected line//
-          var v_a = layer.vertices.get(_currentObject.vertices.get(0));
-          var v_b = layer.vertices.get(_currentObject.vertices.get(1));
-          var distance = GeometryUtils.pointsDistance(v_a.x, v_a.y, v_b.x, v_b.y);
-          var _length3 = convert(distance).from('cm').to(layer.unit);
-          payload.length = _length3;
-          //////////////////////////////////////
-        } 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);
-        }
+        var payload = updatePayloadOfInternalEvent(_currentObject, layer, catalog);
 
         // send selection event befor replace event
         if (internalType === constants.INTERNAL_EVENT_REPLACE_CABINET) {

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

@@ -642,10 +642,10 @@ function replaceObject(modifiedPath, layer, planData, actions, sceneData, oldSce
             vLine3.material.depthTest = false;
             var uVec = new Three.Vector3(-posVec.x / scalevec.x, -posVec.y / scalevec.y, -posVec.z / scalevec.z);
             var blLighting = item.type.includes('Light');
-            vLine.translateY(blLighting ? 1.6 : 0.1);
-            vLine1.translateY(blLighting ? 1.6 : 0.1);
-            vLine2.translateY(blLighting ? 1.6 : 0.1);
-            vLine3.translateY(blLighting ? 1.6 : 0.1);
+            vLine.translateY(blLighting ? 1.6 : boundingBox.min.y + 0.1);
+            vLine1.translateY(blLighting ? 1.6 : boundingBox.min.y + 0.1);
+            vLine2.translateY(blLighting ? 1.6 : boundingBox.min.y + 0.1);
+            vLine3.translateY(blLighting ? 1.6 : boundingBox.min.y + 0.1);
             upObj.translateOnAxis(uVec, 1);
             upObj.translateY(max.y - min.y);
             _mBox.name = 'TransformBox';

package/es/components/viewer3d/viewer3d.js

@@ -24,12 +24,11 @@ import { isUndefined } from 'util';
 import { verticesDistance } from "../../utils/geometry";
 import { convert } from "../../utils/convert-units-lite";
 import { GeometryUtils } from "../../utils/export";
-import { handleCamRect, isElevationView, isEmpty } from "../../utils/helper";
+import { handleCamRect, isElevationView, isEmpty, updatePayloadOfInternalEvent } from "../../utils/helper";
 import { RGBELoader } from 'three/examples/jsm/loaders/RGBELoader';
 import CameraControls from 'camera-controls';
 import { getAllMeshes, vectorIntersectWithMesh } from "../../utils/objects-utils";
-import { isWarningItem, returnReplaceableDeepSearchType } from "../viewer2d/utils";
-import { MoldingUtils } from "../../utils/export";
+import { returnReplaceableDeepSearchType } from "../viewer2d/utils";
 CameraControls.install({
   THREE: Three
 });
@@ -1187,25 +1186,9 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
       var sendInternalEvent = function sendInternalEvent(evtType, evtElement) {
         var pointArray = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
         if (!isEmpty(evtType) && !isEmpty(evtElement)) {
-          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) === 'lines') {
-            // caculating length of selected line//
-            var v_a = layer.vertices.get(evtElement.vertices.get(0));
-            var v_b = layer.vertices.get(evtElement.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(layer.unit);
-            payload.length = _length;
-            //////////////////////////////////////
-          } else 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;
-          }
+          var _state$get, _this2$props$onIntern, _this2$props;
+          var catalog = (_state$get = state.get('catalog')) === null || _state$get === void 0 ? void 0 : _state$get.toJS();
+          var payload = updatePayloadOfInternalEvent(evtElement, layer, catalog, 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

package/es/utils/helper.js

@@ -5,10 +5,11 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { HDRCubeTextureLoader } from 'three/examples/jsm/loaders/HDRCubeTextureLoader.js';
 import { ANIMATE_OBJECT_OPEN_DOOR_ROTATION_UNIT, ANIMATE_STEP_MAX, DECIMAL_PLACES_2, HDR_URLS, MAX_ZOOM_IN_SCALE, MODE_ELEVATION_VIEW, ZOOM_VARIABLE } from "../constants";
 import * as Three from 'three';
-import { returnReplaceableDeepSearchType } from "./../components/viewer2d/utils";
+import { isWarningItem, returnReplaceableDeepSearchType } from "./../components/viewer2d/utils";
 import { convert } from "./convert-units-lite";
 import { formatNumber } from "./math";
 import AWS from 'aws-sdk';
+import { GeometryUtils, MoldingUtils } from "./export";
 var s3 = new AWS.S3({
   accessKeyId: process.env.REACT_APP_AWS_ID,
   secretAccessKey: process.env.REACT_APP_AWS_SECRET
@@ -396,4 +397,40 @@ export function centering2D(state) {
   });
   if (viewer2DActions) updateViwer2D(viewer, viewer2DActions);
   return state;
+}
+export function updatePayloadOfInternalEvent(currentObject, layer, catalog) {
+  var pointArray = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
+  if (isEmpty(currentObject)) return null;
+  var updatedPayload = currentObject.toJS();
+  if (isEmpty(layer) || isEmpty(catalog)) return updatedPayload;
+  if ((currentObject === null || currentObject === void 0 ? void 0 : currentObject.prototype) === 'lines') {
+    // caculating length of selected line//
+    var v_a = layer.vertices.get(currentObject.vertices.get(0));
+    var v_b = layer.vertices.get(currentObject.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(layer.unit);
+    updatedPayload.length = _length;
+    //////////////////////////////////////
+  } else if ((currentObject === null || currentObject === void 0 ? void 0 : currentObject.prototype) === 'items') {
+    var _catalog$elements$cur;
+    // check this cabinet has warning box
+    updatedPayload.isWarning = isWarningItem(currentObject);
+    // check this item is available molding
+    updatedPayload.isMoldingAvailable = MoldingUtils.isEnableItemForMolding(layer, currentObject);
+    // check this item is snapped to wall
+    updatedPayload.isAttachedWall = MoldingUtils.isAttachedWall(layer, currentObject);
+    // update distArray
+    if (pointArray) updatedPayload.distArray = pointArray;
+
+    // update sku_number using sku_array
+    var currentDoorColorId = currentObject.getIn(['doorStyle', 'id']);
+    var skuArray = catalog === null || catalog === void 0 || (_catalog$elements$cur = catalog.elements[currentObject.get('name')]) === null || _catalog$elements$cur === void 0 || (_catalog$elements$cur = _catalog$elements$cur.obj) === null || _catalog$elements$cur === void 0 ? void 0 : _catalog$elements$cur.skuArray;
+    var correctSKU = skuArray === null || skuArray === void 0 ? void 0 : skuArray.find(function (sku) {
+      return sku.door_color_id === currentDoorColorId;
+    });
+    if (correctSKU) {
+      updatedPayload.sku_number = correctSKU.sku;
+    }
+  }
+  return updatedPayload;
 }