kitchen-simulator 3.10.0 → 3.11.0

package/lib/class/item.js

@@ -472,8 +472,9 @@ var Item = exports["default"] = /*#__PURE__*/function () {
           break;
       }
       if (onInternalEvent && duplicatedElement) {
-        var jsElement = duplicatedElement.toJS();
-        if (jsElement.prototype === 'items') jsElement.isWarning = (0, _utils.isWarningItem)(duplicatedElement);
+        var _state$get;
+        var catalog = (_state$get = state.get('catalog')) === null || _state$get === void 0 ? void 0 : _state$get.toJS();
+        var jsElement = (0, _helper.updatePayloadOfInternalEvent)(duplicatedElement, layer, catalog);
         onInternalEvent({
           type: _constants.INTERNAL_EVENT_DRAW_ELEMENT,
           value: jsElement

package/lib/class/line.js

@@ -15,7 +15,6 @@ var _export2 = require("../utils/export");
 var Three = _interopRequireWildcard(require("three"));
 var _constants = require("../constants");
 var _helper = require("../utils/helper");
-var _convertUnitsLite = require("../utils/convert-units-lite");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var timeGlobal = 0;
 var TimeRecorder = /*#__PURE__*/function () {
@@ -437,6 +436,7 @@ var Line = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "beginDrawingLine",
     value: function beginDrawingLine(state, layerID, x, y, onInternalEvent) {
+      var _state$get;
       // if end drawing by created area
       if (state.mode == _constants.MODE_IDLE) {
         return {
@@ -490,12 +490,8 @@ var Line = exports["default"] = /*#__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 = _export2.GeometryUtils.pointsDistance(v_a.x, v_a.y, v_b.x, v_b.y);
-      var _length = (0, _convertUnitsLite.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 = (0, _helper.updatePayloadOfInternalEvent)(line, layer, catalog);
       if (onInternalEvent) onInternalEvent({
         type: _constants.INTERNAL_EVENT_START_DRAW_WALL,
         value: payload

package/lib/components/viewer2d/viewer2d.js

@@ -1259,24 +1259,7 @@ 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 = _export2.GeometryUtils.pointsDistance(v_a.x, v_a.y, v_b.x, v_b.y);
-          var _length3 = (0, _convertUnitsLite.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 = (0, _utils.isWarningItem)(_currentObject);
-          // check this item is available molding
-          payload.isMoldingAvailable = _export2.MoldingUtils.isEnableItemForMolding(layer, _currentObject);
-          // check this item is snapped to wall
-          payload.isAttachedWall = _export2.MoldingUtils.isAttachedWall(layer, _currentObject);
-        }
+        var payload = (0, _helper.updatePayloadOfInternalEvent)(_currentObject, layer, catalog);
 
         // send selection event befor replace event
         if (internalType === constants.INTERNAL_EVENT_REPLACE_CABINET) {

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

@@ -677,10 +677,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/lib/components/viewer3d/viewer3d.js

@@ -1193,25 +1193,9 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
       var sendInternalEvent = function sendInternalEvent(evtType, evtElement) {
         var pointArray = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
         if (!(0, _helper.isEmpty)(evtType) && !(0, _helper.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 = _export.GeometryUtils.pointsDistance(v_a.x, v_a.y, v_b.x, v_b.y);
-            var _length = (0, _convertUnitsLite.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 = (0, _utils.isWarningItem)(evtElement);
-            // check this item is available molding
-            payload.isMoldingAvailable = _export.MoldingUtils.isEnableItemForMolding(layer, evtElement); // check this item is snapped to wall
-            payload.isAttachedWall = _export.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 = (0, _helper.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/lib/utils/helper.js

@@ -22,7 +22,9 @@ exports.refineProductForSummaryPdf = exports.refineMoldingForSummaryPdf = void 0
 exports.replaceMeshesWithLineSegments = replaceMeshesWithLineSegments;
 exports.textureCube = void 0;
 exports.toPlainObject = toPlainObject;
-exports.updateViwer2D = exports.translateDrawer = void 0;
+exports.translateDrawer = void 0;
+exports.updatePayloadOfInternalEvent = updatePayloadOfInternalEvent;
+exports.updateViwer2D = void 0;
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _HDRCubeTextureLoader = require("three/examples/jsm/loaders/HDRCubeTextureLoader.js");
@@ -32,6 +34,7 @@ var _utils = require("./../components/viewer2d/utils");
 var _convertUnitsLite = require("./convert-units-lite");
 var _math = require("./math");
 var _awsSdk = _interopRequireDefault(require("aws-sdk"));
+var _export = require("./export");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof3(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 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; }
@@ -422,4 +425,40 @@ function centering2D(state) {
   });
   if (viewer2DActions) updateViwer2D(viewer, viewer2DActions);
   return state;
+}
+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 = _export.GeometryUtils.pointsDistance(v_a.x, v_a.y, v_b.x, v_b.y);
+    var _length = (0, _convertUnitsLite.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 = (0, _utils.isWarningItem)(currentObject);
+    // check this item is available molding
+    updatedPayload.isMoldingAvailable = _export.MoldingUtils.isEnableItemForMolding(layer, currentObject);
+    // check this item is snapped to wall
+    updatedPayload.isAttachedWall = _export.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;
 }

package/package.json

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