kitchen-simulator 1.1.1-test.75 → 1.1.1-test.77

package/lib/components/viewer2d/line.js

@@ -14,6 +14,7 @@ var _ruler = _interopRequireDefault(require("./ruler"));
 var _constants = require("../../constants");
 var Three = _interopRequireWildcard(require("three"));
 var _utils = require("./utils");
+var _Tooltip = _interopRequireDefault(require("@material-ui/core/Tooltip"));
 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 STYLE = {
   stroke: 'rgb(77, 77, 77)',
@@ -157,7 +158,14 @@ function Line(_ref) {
     var r1 = itemRect.rect[1];
     var r2 = itemRect.rect[2];
     var r3 = itemRect.rect[3];
-    var delta23 = _export.GeometryUtils.verticesDistance(l2, r3) + _export.GeometryUtils.verticesDistance(r3, r2) + _export.GeometryUtils.verticesDistance(r2, l3) - _export.GeometryUtils.verticesDistance(l3, l2);
+    var tverArray = [l2, l3, r2, r3].sort(function (_ref2, _ref3) {
+      var x1 = _ref2.x,
+        y1 = _ref2.y;
+      var x2 = _ref3.x,
+        y2 = _ref3.y;
+      return x1 === x2 ? y1 - y2 : x1 - x2;
+    });
+    var delta23 = _export.GeometryUtils.verticesDistance(tverArray[0], tverArray[1]) + _export.GeometryUtils.verticesDistance(tverArray[1], tverArray[2]) + _export.GeometryUtils.verticesDistance(tverArray[2], tverArray[3]) - _export.GeometryUtils.verticesDistance(tverArray[0], tverArray[3]);
     if (delta23 < 0.1) {
       return true;
     } else {
@@ -804,7 +812,9 @@ function Line(_ref) {
     } : {}
   }, renderedLine, /*#__PURE__*/_react["default"].createElement("g", {
     transform: "translate(".concat(x1, ", ").concat(y1, ") rotate(").concat(angle, ", 0, 0)")
-  }, renderedHoles)), line.selected && /*#__PURE__*/_react["default"].createElement("g", {
+  }, renderedHoles)), line.selected && /*#__PURE__*/_react["default"].createElement(_Tooltip["default"], {
+    title: "Elevation View"
+  }, /*#__PURE__*/_react["default"].createElement("g", {
     id: 'elevation-button',
     key: 1,
     transform: "translate(".concat(x1 + 35, ", ").concat(y1 - 15, ")"),
@@ -834,7 +844,7 @@ function Line(_ref) {
     style: {
       transform: 'rotateX(180deg)'
     }
-  })), line.selected && /*#__PURE__*/_react["default"].createElement("g", {
+  }))), line.selected && /*#__PURE__*/_react["default"].createElement("g", {
     id: 'remove-button',
     key: 2,
     transform: "translate(".concat(x1 + 10, ", ").concat(y1, ")"),

package/lib/components/viewer2d/scene.js

@@ -17,6 +17,7 @@ var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits
 var _react = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _export = require("./export");
+var _utils = require("./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 _callSuper(t, o, e) { return o = (0, _getPrototypeOf2["default"])(o), (0, _possibleConstructorReturn2["default"])(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2["default"])(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
@@ -38,7 +39,6 @@ var Scene = exports["default"] = /*#__PURE__*/function (_Component) {
               if (this.props.scene.hashCode() !== nextProps.scene.hashCode()) {
                 scene = nextProps.scene, catalog = nextProps.catalog;
                 height = scene.height, layers = scene.layers;
-                console.log(layers.toJS());
                 selectedLayer = layers.get(scene.selectedLayer);
                 msg = '';
                 isNotFoundInElements = false;

package/lib/components/viewer2d/utils.js

@@ -174,12 +174,6 @@ var getToeKickSKU = exports.getToeKickSKU = function getToeKickSKU() {
   if (!skuData) return false;
   return skuData;
 };
-
-// ESM version of "area-polygon" with default + named export.
-// Same behavior: takes an array of [x,y] tuples or {x,y} objects.
-// If `signed` is truthy, returns signed area; otherwise absolute area.
-// Does not mutate the input array.
-
 function normalize(point) {
   if (Array.isArray(point)) {
     return {

package/lib/components/viewer2d/viewer2d.js

@@ -27,7 +27,6 @@ function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r
 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
-
 // variables
 var pinFlag = false;
 var sFlag = false; //for all object move
@@ -403,6 +402,17 @@ function Viewer2D(_ref, _ref2) {
     }
     var absAngle, lineAngle;
     if (draggingLine.vertices[0] !== draggingLine.vertices[1]) {
+      if ((0, _helper.isEmpty)(relatedLines) && mode !== 'DRAGGING_LINE') {
+        endDrag.push(true);
+        var originVerIndex = draggingLine.vertices.findIndex(function (vertice) {
+          return vertice !== dragVertexId;
+        });
+        var originVerId = originVerIndex < 0 ? draggingLine.vertices[0] : draggingLine.vertices[originVerIndex];
+        var ox = vertices[originVerId].x;
+        var oy = vertices[originVerId].y;
+        lineAngle = _export2.GeometryUtils.angleBetweenTwoPointsAndOrigin(ox, oy, x, y);
+        absAngle = Math.abs(lineAngle);
+      }
       for (var i = 0; i < relatedLines.length; i++) {
         var line = relatedLines[i];
         lineAngle = _export2.GeometryUtils.angleBetweenTwoLines(line, draggingLine, vertices);
@@ -428,17 +438,17 @@ function Viewer2D(_ref, _ref2) {
     } else {
       var rest = _constants.MIN_ANGLE_DISALLOW_DRAW_WALL - absAngle;
       // the origin point of rotation(snapping)
-      var originVerId = draggingLine.vertices.findIndex(function (vertice) {
+      var _originVerId = draggingLine.vertices.findIndex(function (vertice) {
         return vertice !== dragVertexId;
       });
-      originVerId = originVerId < 0 ? draggingLine.vertices[0] : draggingLine.vertices[originVerId];
+      _originVerId = _originVerId < 0 ? draggingLine.vertices[0] : draggingLine.vertices[_originVerId];
       if (stepUnit) {
-        var ox = vertices[originVerId].x;
-        var oy = vertices[originVerId].y;
+        var _ox = vertices[_originVerId].x;
+        var _oy = vertices[_originVerId].y;
         // determine the direction of rotation.
         rest = lineAngle > 0 ? -rest : rest;
         // rotate the current point to last point around the first point of drawing line.
-        var res = _export2.GeometryUtils.rotatePointAroundPoint(x, y, ox, oy, rest);
+        var res = _export2.GeometryUtils.rotatePointAroundPoint(x, y, _ox, _oy, rest);
         vtx = res.x;
         vty = res.y;
       }
@@ -816,8 +826,9 @@ function Viewer2D(_ref, _ref2) {
           current_sel_obj_id = elementData.id;
           if (elementData.part === 'rotation-anchor') itemsActions.beginRotatingItem(elementData.layer, elementData.id, x, y);else if (elementData.part === 'remove') break;else if (elementData.part === 'duplicate') break;else if (elementData.part === 'warning_edit') break;else {
             // closes the setting dialog
-            // document.getElementById('setting_dialog').style.display = 'none';
-
+            if (document.getElementById('setting_dialog')) {
+              document.getElementById('setting_dialog').style.display = 'none';
+            }
             itemsActions.selectItem(elementData.layer, elementData.id);
             // projectActions.setMode(constants.MODE_DRAGGING_ITEM);
             itemsActions.beginDraggingItem(elementData.layer, elementData.id, x, y);
@@ -870,11 +881,15 @@ function Viewer2D(_ref, _ref2) {
         var selectedLayer = scene.getIn(['layers', layerID]);
         switch (elementData ? elementData.prototype : 'none') {
           case 'areas':
-            // document.getElementById('setting_dialog').style.display = 'none';
+            if (document.getElementById('setting_dialog')) {
+              document.getElementById('setting_dialog').style.display = 'none';
+            }
             areaActions.selectArea(elementData.layer, elementData.id);
             break;
           case 'lines':
-            // document.getElementById('setting_dialog').style.display = 'none';
+            if (document.getElementById('setting_dialog')) {
+              document.getElementById('setting_dialog').style.display = 'none';
+            }
             if (elementData.part === 'remove') {
               projectActions.remove();
               break;
@@ -892,7 +907,9 @@ function Viewer2D(_ref, _ref2) {
               break;
             }
           case 'holes':
-            // document.getElementById('setting_dialog').style.display = 'none';
+            if (document.getElementById('setting_dialog')) {
+              document.getElementById('setting_dialog').style.display = 'none';
+            }
             holesActions.selectHole(elementData.layer, elementData.id);
             break;
           case 'items':
@@ -905,8 +922,9 @@ function Viewer2D(_ref, _ref2) {
               break;
             } else if (elementData.part === 'warning_edit') {
               // closes the setting dialog
-              // document.getElementById('setting_dialog').style.display = 'none';
-
+              if (document.getElementById('setting_dialog')) {
+                document.getElementById('setting_dialog').style.display = 'none';
+              }
               itemsActions.selectItem(elementData.layer, elementData.id);
               replaceCabinet(true);
               break;
@@ -1275,8 +1293,6 @@ function Viewer2D(_ref, _ref2) {
   var sceneZoom = state.zoom || 1;
   var rulerXElements = Math.ceil(sceneWidth / rulerUnitPixelSize) + 1;
   var rulerYElements = Math.ceil(sceneHeight / rulerUnitPixelSize) + 1;
-  console.log('---render viewer2d');
-  console.log(viewer2D.isEmpty());
   return /*#__PURE__*/_react["default"].createElement("div", null, rulerEdit, /*#__PURE__*/_react["default"].createElement("div", {
     style: {
       margin: 0,
@@ -1347,11 +1363,8 @@ function Viewer2D(_ref, _ref2) {
     onMouseDown: onMouseDown,
     onMouseMove: onMouseMove,
     onMouseUp: onMouseUp,
-    miniatureProps: {
-      position: 'none'
-    },
     toolbarProps: {
-      position: 'right'
+      position: 'none'
     },
     detectPinchGesture: false,
     disableDoubleClickZoomWithToolAuto: true,

package/lib/components/viewer3d/libs/mtl-loader.js

@@ -1,16 +1,12 @@
 "use strict";
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = void 0;
 /**
  * Loads a Wavefront .mtl file specifying materials
  *
  * @author angelxuanchang
  */
 
-var THREE = window.THREE;
+var THREE = window.THREE || require('three');
 var MTLLoader;
 MTLLoader = function MTLLoader(manager) {
   this.manager = manager !== undefined ? manager : THREE.DefaultLoadingManager;
@@ -360,5 +356,4 @@ MTLLoader.MaterialCreator.prototype = {
     return texture;
   }
 };
-var _default = exports["default"] = MTLLoader;
-module.exports = exports.default;
+module.exports = MTLLoader;

package/lib/components/viewer3d/libs/obj-loader.js

@@ -1,14 +1,10 @@
 "use strict";
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = void 0;
 /**
  * @author mrdoob / http://mrdoob.com/
  */
 
-var THREE = window.THREE;
+var THREE = window.THREE || require('three');
 var OBJLoader;
 OBJLoader = function OBJLoader(manager) {
   this.manager = manager !== undefined ? manager : THREE.DefaultLoadingManager;
@@ -465,5 +461,4 @@ OBJLoader.prototype = {
     return container;
   }
 };
-var _default = exports["default"] = OBJLoader;
-module.exports = exports.default;
+module.exports = OBJLoader;

package/lib/components/viewer3d/libs/orbit-controls.js

@@ -1,10 +1,5 @@
 "use strict";
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.OrbitControls = OrbitControls;
-exports["default"] = void 0;
 /**
  * @author qiao / https://github.com/qiao
  * @author mrdoob / http://mrdoob.com
@@ -20,8 +15,9 @@ exports["default"] = void 0;
 //    Zoom - middle mouse, or mousewheel / touch: two finger spread or squish
 //    Pan - right mouse, or arrow keys / touch: three finter swipe
 
-var THREE = window.THREE;
-function OrbitControls(object, domElement) {
+var THREE = window.THREE || require('three');
+var OrbitControls;
+module.exports = OrbitControls = function OrbitControls(object, domElement) {
   this.object = object;
   this.domElement = domElement !== undefined ? domElement : document;
 
@@ -629,7 +625,7 @@ function OrbitControls(object, domElement) {
   // force an update at start
 
   this.update();
-}
+};
 OrbitControls.prototype = Object.create(THREE.EventDispatcher.prototype);
 OrbitControls.prototype.constructor = OrbitControls;
 Object.defineProperties(OrbitControls.prototype, {
@@ -701,5 +697,4 @@ Object.defineProperties(OrbitControls.prototype, {
       this.dampingFactor = value;
     }
   }
-});
-var _default = exports["default"] = OrbitControls;
+});

package/lib/components/viewer3d/libs/pointer-lock-controls.js

@@ -1,16 +1,12 @@
 "use strict";
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.PointerLockControls = PointerLockControls;
-exports["default"] = void 0;
 /**
  * @author mrdoob / http://mrdoob.com/
  */
 
-var THREE = window.THREE;
-function PointerLockControls(camera) {
+var THREE = window.THREE || require('three');
+var PointerLockControls;
+module.exports = PointerLockControls = function PointerLockControls(camera) {
   var scope = this;
   camera.rotation.set(0, 0, 0);
   var pitchObject = new THREE.Object3D();
@@ -48,5 +44,4 @@ function PointerLockControls(camera) {
       return v;
     };
   }();
-}
-var _default = exports["default"] = PointerLockControls;
+};

package/lib/components/viewer3d/ruler-utils/scene3D.js

@@ -21,7 +21,6 @@ function Scene3D(_ref) {
     mode = _ref.mode,
     downloadFlag = _ref.downloadFlag;
   var layers = scene.layers;
-  console.log(layers.toJS());
   var selectedLayer = layers.get(scene.selectedLayer);
   var ceilHeight = selectedLayer.ceilHeight;
   var selectedLine = selectedLayer.lines.get(selectedLayer.selected.lines.toJS()[0]);

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

@@ -464,6 +464,7 @@ function replaceObject(modifiedPath, layer, planData, actions, sceneData, oldSce
       break;
     case 'items':
       var item = layer.getIn(['items', modifiedPath[4]]);
+      if ((0, _helper.isEmpty)(item)) break;
       deleteCountertop(planData.sceneGraph.layers[layer.id].countertops, item, planData, layer);
       var tmpMoldings = (0, _toConsumableArray2["default"])(planData.sceneGraph.layers[layer.id].moldingGroups);
       if (catalog.getElement(item.type).updateRender3D) {
@@ -717,7 +718,9 @@ function replaceObject(modifiedPath, layer, planData, actions, sceneData, oldSce
             }
             applyInteract(item3D, function () {
               // closes the setting dialog
-              // document.getElementById('setting_dialog').style.display = 'none';
+              if (document.getElementById('setting_dialog')) {
+                document.getElementById('setting_dialog').style.display = 'none';
+              }
               return actions.itemsActions.selectItem(layer.id, modifiedPath[4]);
             });
             setTimeout(function () {
@@ -1657,7 +1660,9 @@ function addHole(sceneData, planData, layer, holeID, catalog, holesActions, mode
     planData.plan.add(pivot);
     planData.sceneGraph.layers[layer.id].holes[holeData.id] = pivot;
     applyInteract(pivot, function () {
-      // document.getElementById('setting_dialog').style.display = 'none';
+      if (document.getElementById('setting_dialog')) {
+        document.getElementById('setting_dialog').style.display = 'none';
+      }
       return holesActions.selectHole(layer.id, holeData.id);
     });
     var opacity = layer.opacity;
@@ -1728,7 +1733,9 @@ function addLine(sceneData, planData, layer, lineID, catalog, linesActions) {
     planData.plan.add(pivot);
     planData.sceneGraph.layers[layer.id].lines[lineID] = pivot;
     applyInteract(pivot, function () {
-      // document.getElementById('setting_dialog').style.display = 'none';
+      if (document.getElementById('setting_dialog')) {
+        document.getElementById('setting_dialog').style.display = 'none';
+      }
       return linesActions.selectLine(layer.id, line.id);
     });
     var opacity = layer.opacity;
@@ -1828,7 +1835,9 @@ function addArea(sceneData, planData, layer, areaID, catalog, areaActions, mode)
     if ((0, _helper.isElevationView)(mode)) pivot.visible = false;
     planData.plan.add(pivot);
     planData.sceneGraph.layers[layer.id].areas[areaID] = pivot;
-    // document.getElementById('setting_dialog').style.display = 'none';
+    if (document.getElementById('setting_dialog')) {
+      document.getElementById('setting_dialog').style.display = 'none';
+    }
     applyInteract(pivot, interactFunction);
     var opacity = layer.opacity;
     if (area.selected) {
@@ -1910,7 +1919,9 @@ function addItem(sceneData, planData, layer, itemID, catalog, itemsActions) {
     pivot.position.z = -item.y;
     applyInteract(item3D, function () {
       // closes the setting dialog
-      // document.getElementById('setting_dialog').style.display = 'none';
+      if (document.getElementById('setting_dialog')) {
+        document.getElementById('setting_dialog').style.display = 'none';
+      }
       return itemsActions.selectItem(layer.id, item.id);
     });
     var opacity = layer.opacity;
@@ -2031,7 +2042,9 @@ function addItem(sceneData, planData, layer, itemID, catalog, itemsActions) {
       }
     }
     applyInteract(pivot, function () {
-      // document.getElementById('setting_dialog').style.display = 'none';
+      if (document.getElementById('setting_dialog')) {
+        document.getElementById('setting_dialog').style.display = 'none';
+      }
       return itemsActions.selectItem(layer.id, item.id);
     });
     setTimeout(function () {
@@ -2053,7 +2066,9 @@ function updateItem(sceneData, oldSceneData, planData, layer, itemID, difference
 
 // Apply interact function to children of an Object3D
 function applyInteract(object, interactFunction) {
-  // document.getElementById('setting_dialog').style.display = 'none';
+  if (document.getElementById('setting_dialog')) {
+    document.getElementById('setting_dialog').style.display = 'none';
+  }
   object.traverse(function (child) {
     if (child instanceof Three.Mesh) {
       child.interact = interactFunction;