kitchen-simulator 4.3.7 → 4.3.9

package/es/class/project.js

@@ -105,6 +105,9 @@ var Project = /*#__PURE__*/function () {
 
       // check type of ceilHeight and make it to Number
       if (typeof sceneJSON.layers[layerID].ceilHeight !== 'number') sceneJSON.layers[layerID].ceilHeight = Number(sceneJSON.layers[layerID].ceilHeight);
+
+      // force change the [isLoadingCabinet] to [false], otherwise 3D view will be stay in loading
+      if (sceneJSON.isLoadingCabinet !== false) sceneJSON.isLoadingCabinet = false;
       var newScene = new Scene(sceneJSON);
       state = new State({
         scene: newScene.toJS(),

package/es/components/viewer3d/viewer3d.js

@@ -1189,10 +1189,12 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
       };
       var sendInternalEvent = function sendInternalEvent(evtType, evtElement) {
         var pointArray = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
+        var curLayerId = _this2.props.state.scene.selectedLayer;
+        var curLayer = _this2.props.state.scene.getIn(['layers', curLayerId]);
         if (!isEmpty(evtType) && !isEmpty(evtElement)) {
           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);
+          var payload = updatePayloadOfInternalEvent(evtElement, curLayer, 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/molding.js

@@ -5,6 +5,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+import { Map } from 'immutable';
 import { BASE_CABINET_LAYOUTPOS, BOTTOM_MOLDING_LOCATION, EPSILON, ITEM_TYPE, MIDDLE_MOLDING_LOCATION, MOLDING_LOCATIONS, OVERLAP_INCLUDED, OVERLAP_LINK, OVERLAP_SAME, OVERLAP_SOME, TALL_CABINET_LAYOUTPOS, TOE_KICK_MOLDING, TOP_MOLDING_LOCATION, WALL_CABINET_LAYOUTPOS } from "../constants";
 import * as Three from 'three';
 import { convert } from "./convert-units-lite";
@@ -975,7 +976,7 @@ export function getMoldingDataOfScene2(layer, catalog, doorStyle) {
           MGlines === null || MGlines === void 0 || MGlines.forEach(function (line) {
             return moldingLines.push({
               molding: _objectSpread({}, molding),
-              doorStyle: item.doorStyle.hasOwnProperty('id') ? item.doorStyle : !isEmpty(item.doorStyle) && item.doorStyle.toJS(),
+              doorStyle: !isEmpty(item.doorStyle) && Map.isMap(item.doorStyle) ? item.doorStyle.toJS() : item.doorStyle,
               line: line,
               z: lineZ,
               parentId: parentId,
@@ -997,7 +998,7 @@ export function getMoldingDataOfScene2(layer, catalog, doorStyle) {
               category: 'molding',
               type: 'cabinet'
             },
-            doorStyle: item.doorStyle.hasOwnProperty('id') ? item.doorStyle : !isEmpty(item.doorStyle) && item.doorStyle.toJS(),
+            doorStyle: !isEmpty(item.doorStyle) && Map.isMap(item.doorStyle) ? item.doorStyle.toJS() : item.doorStyle,
             line: line,
             z: z,
             parentId: parentId,

package/lib/class/project.js

@@ -114,6 +114,9 @@ var Project = exports["default"] = /*#__PURE__*/function () {
 
       // check type of ceilHeight and make it to Number
       if (typeof sceneJSON.layers[layerID].ceilHeight !== 'number') sceneJSON.layers[layerID].ceilHeight = Number(sceneJSON.layers[layerID].ceilHeight);
+
+      // force change the [isLoadingCabinet] to [false], otherwise 3D view will be stay in loading
+      if (sceneJSON.isLoadingCabinet !== false) sceneJSON.isLoadingCabinet = false;
       var newScene = new _models.Scene(sceneJSON);
       state = new _models.State({
         scene: newScene.toJS(),

package/lib/components/viewer3d/viewer3d.js

@@ -1196,10 +1196,12 @@ 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;
+        var curLayerId = _this2.props.state.scene.selectedLayer;
+        var curLayer = _this2.props.state.scene.getIn(['layers', curLayerId]);
         if (!(0, _helper.isEmpty)(evtType) && !(0, _helper.isEmpty)(evtElement)) {
           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);
+          var payload = (0, _helper.updatePayloadOfInternalEvent)(evtElement, curLayer, 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/molding.js

@@ -28,6 +28,7 @@ exports.sortItemsByDistance = sortItemsByDistance;
 exports.tryMergeMDItem = tryMergeMDItem;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _immutable = require("immutable");
 var _constants = require("../constants");
 var Three = _interopRequireWildcard(require("three"));
 var _convertUnitsLite = require("./convert-units-lite");
@@ -1004,7 +1005,7 @@ function getMoldingDataOfScene2(layer, catalog, doorStyle) {
           MGlines === null || MGlines === void 0 || MGlines.forEach(function (line) {
             return moldingLines.push({
               molding: _objectSpread({}, molding),
-              doorStyle: item.doorStyle.hasOwnProperty('id') ? item.doorStyle : !(0, _helper.isEmpty)(item.doorStyle) && item.doorStyle.toJS(),
+              doorStyle: !(0, _helper.isEmpty)(item.doorStyle) && _immutable.Map.isMap(item.doorStyle) ? item.doorStyle.toJS() : item.doorStyle,
               line: line,
               z: lineZ,
               parentId: parentId,
@@ -1026,7 +1027,7 @@ function getMoldingDataOfScene2(layer, catalog, doorStyle) {
               category: 'molding',
               type: 'cabinet'
             },
-            doorStyle: item.doorStyle.hasOwnProperty('id') ? item.doorStyle : !(0, _helper.isEmpty)(item.doorStyle) && item.doorStyle.toJS(),
+            doorStyle: !(0, _helper.isEmpty)(item.doorStyle) && _immutable.Map.isMap(item.doorStyle) ? item.doorStyle.toJS() : item.doorStyle,
             line: line,
             z: z,
             parentId: parentId,

package/package.json

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