kitchen-simulator 11.30.2 → 11.31.0

package/lib/components/viewer2d/viewer2d.js

@@ -23,6 +23,7 @@ var _immutable = require("immutable");
 var _math = require("../../utils/math");
 var _helper = require("../../utils/helper");
 var _cabinetWarning = require("../../shared/domain/cabinet-warning");
+var _viewerUtils = require("../../engine/2d/viewer-utils");
 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); }
 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; } // variables
@@ -578,6 +579,7 @@ function Viewer2D(_ref, _ref2) {
     }
   };
   var onMouseMove = function onMouseMove(viewerEvent) {
+    var _allItemRect$cur2;
     //workaround that allow imageful component to work
 
     // let evt = new Event('mousemove-planner-event');
@@ -641,6 +643,7 @@ function Viewer2D(_ref, _ref2) {
             endPoint.x = x;
             endPoint.y = y;
           } else {
+            var _allItemRect$cur;
             prepareSnap();
             var _GeometryUtils$calcSn = _export2.GeometryUtils.calcSnap(allItemRect, allItemSnap, allLineRects, allLineSnap, allRect, x, y, allArea),
               nx = _GeometryUtils$calcSn.nx,
@@ -684,19 +687,8 @@ function Viewer2D(_ref, _ref2) {
               y: ny
             };
             var _isrectSect = _export2.GeometryUtils.validInterSect(allItemRect.others, _val);
-            if (_isrectSect && _isSect) {
-              itemsActions.updateDraggingItemChanged(nx, ny, layerID, current_sel_obj_id);
-              itemsActions.updateRotatingItemChanged(rot, layerID, current_sel_obj_id);
-              endPoint.x = nx;
-              endPoint.y = ny;
-            }
-            if (allItemRect.cur && allItemRect.cur.itemInfo.name.includes('Cook Top') || allItemRect.cur && allItemRect.cur.itemInfo.name.includes('cabinet')) {
-              itemsActions.updateDraggingItemChanged(nx, ny, layerID, current_sel_obj_id);
-              itemsActions.updateRotatingItemChanged(rot, layerID, current_sel_obj_id);
-              endPoint.x = nx;
-              endPoint.y = ny;
-            }
-            if (allItemRect.cur && allItemRect.cur.itemInfo.name.includes('Hood') || allItemRect.cur.itemInfo.cabinet_category.toLowerCase().includes('hood') || allItemRect.cur && allItemRect.cur.itemInfo.name.includes('Range') || allItemRect.cur && allItemRect.cur.itemInfo.name.includes('Cook Top')) {
+            var _isCabinet = (_allItemRect$cur = allItemRect.cur) === null || _allItemRect$cur === void 0 ? void 0 : _allItemRect$cur.itemInfo.name.includes('cabinet');
+            if (_isrectSect && _isSect || _isCabinet || (0, _viewerUtils.shouldBypassItemIntersectionValidation)(allItemRect.cur)) {
               itemsActions.updateDraggingItemChanged(nx, ny, layerID, current_sel_obj_id);
               itemsActions.updateRotatingItemChanged(rot, layerID, current_sel_obj_id);
               endPoint.x = nx;
@@ -760,15 +752,8 @@ function Viewer2D(_ref, _ref2) {
             y: ny
           };
           var isrectSect = _export2.GeometryUtils.validInterSect(allItemRect.others, val);
-          if (isrectSect && isSect) {
-            itemsActions.updateDraggingItemChanged(nx, ny, layerID, current_sel_obj_id);
-            itemsActions.updateRotatingItemChanged(rot, layerID, current_sel_obj_id);
-          }
-          if (allItemRect.cur && allItemRect.cur.itemInfo.name.includes('Cook Top') || allItemRect.cur && allItemRect.cur.itemInfo.name.includes('Cabinet')) {
-            itemsActions.updateDraggingItemChanged(nx, ny, layerID, current_sel_obj_id);
-            itemsActions.updateRotatingItemChanged(rot, layerID, current_sel_obj_id);
-          }
-          if (allItemRect.cur && allItemRect.cur.itemInfo.name.includes('Hood') || allItemRect.cur.itemInfo.cabinet_category.toLowerCase().includes('hood') || allItemRect.cur && allItemRect.cur.itemInfo.name.includes('Range') || allItemRect.cur && allItemRect.cur.itemInfo.name.includes('Cook Top')) {
+          var isCabinet = (_allItemRect$cur2 = allItemRect.cur) === null || _allItemRect$cur2 === void 0 ? void 0 : _allItemRect$cur2.itemInfo.name.includes('Cabinet');
+          if (isrectSect && isSect || isCabinet || (0, _viewerUtils.shouldBypassItemIntersectionValidation)(allItemRect.cur)) {
             itemsActions.updateDraggingItemChanged(nx, ny, layerID, current_sel_obj_id);
             itemsActions.updateRotatingItemChanged(rot, layerID, current_sel_obj_id);
           }