kitchen-simulator 1.1.1-test.20 → 1.1.1-test.21

package/es/class/item.js

@@ -14,13 +14,11 @@ function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r),
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import convert from 'convert-units';
-import { Layer, Group, Hole } from "./export";
-import { IDBroker, NameGenerator, GeometryUtils, MoldingUtils } from "../utils/export";
-import { Map, fromJS } from 'immutable';
-import path from 'path';
-import { MODE_IDLE, MODE_IDLE_3D, MODE_DRAWING_ITEM, MODE_DRAWING_ITEM_3D, MODE_DRAGGING_ITEM, MODE_DRAGGING_ITEM_3D, MODE_ROTATING_ITEM, MODE_ROTATING_ITEM_3D, MOLDING_LOCATIONS, INSTALLATION_SUFFIX_TYPE } from "../constants";
+import { Group, Hole, Layer } from "./export";
+import { GeometryUtils, IDBroker, MoldingUtils, NameGenerator } from "../utils/export";
+import { fromJS, Map } from 'immutable';
+import { INSTALLATION_SUFFIX_TYPE, 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 { isUndefined } from 'util';
 import { hasMoldingLayout } from "../utils/molding";
 import { getInstallationSuffix } from "../components/viewer2d/utils";
 var allItemRect;
@@ -726,7 +724,7 @@ var Item = /*#__PURE__*/function () {
     value: function beginDraggingItem(state, layerID, itemID, x, y) {
       var item = state.getIn(['scene', 'layers', layerID, 'items', itemID]);
       time1 = debugUtil();
-      if (isUndefined(item)) return;
+      if (!item) return;
       state = state.merge({
         mode: MODE_DRAGGING_ITEM,
         draggingSupport: Map({
@@ -747,7 +745,7 @@ var Item = /*#__PURE__*/function () {
     value: function beginDraggingItem3D(state, layerID, itemID, x, y) {
       var item = state.getIn(['scene', 'layers', layerID, 'items', itemID]);
       state = state.setIn(['scene', 'isEndDragging'], false);
-      if (isUndefined(item)) return {
+      if (!item) return {
         updatedState: state
       };
       state = state.merge({
@@ -780,7 +778,7 @@ var Item = /*#__PURE__*/function () {
       var diffX = startPointX - x;
       var diffY = startPointY - y;
       var item = scene.getIn(['layers', layerID, 'items', itemID]);
-      if (isUndefined(item)) return {
+      if (!item) return {
         updatedState: state
       };
       var tX = originalX - diffX;

package/es/components/viewer3d/viewer3d.js

@@ -21,24 +21,22 @@ import React from 'react';
 import * as PropTypes from 'prop-types/prop-types';
 import ReactDOM from 'react-dom';
 import * as Three from 'three';
-import { parseData, updateScene, visibleTransformBox, getDistances, fVLine, deleteSpecifiedMeshObjects, createBacksplash, checkCabinetOverlap } from "./scene-creator";
-import { disposeScene } from "./three-memory-cleaner";
-import { disposeObject } from "./three-memory-cleaner";
+import { checkCabinetOverlap, createBacksplash, deleteSpecifiedMeshObjects, fVLine, getDistances, parseData, updateScene, visibleTransformBox } from "./scene-creator";
+import { disposeObject, disposeScene } from "./three-memory-cleaner";
 import diff from 'immutablediff';
 import * as SharedStyle from "../../shared-style";
-import { MODE_DRAWING_ITEM_3D, MODE_IDLE_3D, MODE_3D_VIEW, UNIT_CENTIMETER, MODE_DRAWING_HOLE_3D, SECONDARY_PURPLE_COLOR, MODE_ELEVATION_VIEW, MODE_DRAGGING_ITEM_3D, MODE_ROTATING_ITEM_3D, WALL_CABINET_LAYOUTPOS, BASE_CABINET_LAYOUTPOS, TALL_CABINET_LAYOUTPOS } from "../../constants";
-import { isUndefined } from 'util';
+import { BASE_CABINET_LAYOUTPOS, MODE_3D_VIEW, MODE_DRAGGING_ITEM_3D, MODE_DRAWING_HOLE_3D, MODE_DRAWING_ITEM_3D, MODE_ELEVATION_VIEW, MODE_IDLE_3D, MODE_ROTATING_ITEM_3D, SECONDARY_PURPLE_COLOR, TALL_CABINET_LAYOUTPOS, UNIT_CENTIMETER, WALL_CABINET_LAYOUTPOS } from "../../constants";
 import { verticesDistance } from "../../utils/geometry";
 import convert from 'convert-units';
 import { GeometryUtils } from "../../utils/export";
 import { handleCamRect, isElevationView, isEmpty } from "../../utils/helper";
 import { RGBELoader } from 'three/examples/jsm/loaders/RGBELoader';
 import CameraControls from 'camera-controls';
+import { returnReplaceableDeepSearchType } from "../viewer2d/utils";
+import { getAllMeshes, vectorIntersectWithMesh } from "../../utils/objects-utils";
 CameraControls.install({
   THREE: Three
 });
-import { returnReplaceableDeepSearchType } from "../viewer2d/utils";
-import { getAllMeshes, vectorIntersectWithMesh } from "../../utils/objects-utils";
 var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
   function Scene3DViewer(props) {
     var _this;
@@ -1293,7 +1291,7 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
                   offsetX: event.offsetX - 50,
                   offsetY: event.offsetY
                 }, alti);
-                if (isUndefined(selectedItem)) return;
+                if (!selectedItem) return;
                 var selItem = _this2.props.state.scene.layers.get(selectedObject.layerID).items.get(selectedObject.itemID);
                 lastAngle = 0;
                 angleObj.position.set(planData.plan.position.x + Point.x, selItem.category === 'lighting' ? -planData.plan.position.y - selItem.properties.get('height').get('length') : selItem.properties.get('altitude').get('length') + planData.plan.position.y, planData.plan.position.z - Point.y);
@@ -1464,7 +1462,7 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
                 setTimeout(function () {
                   getDistances(layer);
                   var selectedItem = planData.sceneGraph.layers[selectedObject.layerID].items[selectedObject.itemID];
-                  if (isUndefined(selectedItem)) return;
+                  if (!selectedItem) return;
                   var selItem = _this2.props.state.scene.layers.get(selectedObject.layerID).items.get(selectedObject.itemID);
                   var itemPos = selectedItem.position.clone();
                   if (intersects[_i10].object.parent && intersects[_i10].object.parent.parent.userData.itemId === selectedItem.userData.itemId) {
@@ -1546,7 +1544,7 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
             if (bRotate) {
               var _intersects$_i;
               var selectedItem = planData.sceneGraph.layers[selectedObject.layerID].items[selectedObject.itemID];
-              if (isUndefined(selectedItem)) return;
+              if (!selectedItem) return;
               var selItem = _this2.props.state.scene.layers.get(selectedObject.layerID).items.get(selectedObject.itemID);
               var itemPos = selectedItem.position.clone();
               if (((_intersects$_i = intersects[_i10]) === null || _intersects$_i === void 0 || (_intersects$_i = _intersects$_i.object) === null || _intersects$_i === void 0 || (_intersects$_i = _intersects$_i.parent) === null || _intersects$_i === void 0 || (_intersects$_i = _intersects$_i.parent) === null || _intersects$_i === void 0 || (_intersects$_i = _intersects$_i.userData) === null || _intersects$_i === void 0 ? void 0 : _intersects$_i.itemId) === selectedItem.userData.itemId) {
@@ -1564,7 +1562,7 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
             if (bMove) {
               bMove = false;
               var _selectedItem = planData.sceneGraph.layers[selectedObject.layerID].items[selectedObject.itemID];
-              if (isUndefined(_selectedItem)) return;
+              if (!_selectedItem) return;
               var _selItem = _this2.props.state.scene.layers.get(selectedObject.layerID).items.get(selectedObject.itemID);
               var _itemPos = _selectedItem.position.clone();
               if (intersects[_i10].object.parent.parent.userData.itemId === _selectedItem.userData.itemId) {
@@ -2044,7 +2042,7 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
         setTimeout(function () {
           try {
             currentObject = planData.sceneGraph.layers[selectedObject.layerID].items[selectedObject.itemID];
-            if (isUndefined(currentObject)) return;
+            if (!currentObject) return;
             var selItem = _this2.props.state.scene.layers.get(selectedObject.layerID).items.get(selectedObject.itemID);
             var itemPos = currentObject.position.clone();
             toolObj.position.set(planData.plan.position.x + itemPos.x, selItem.category === 'lighting' ? -planData.plan.position.y - selItem.properties.get('height').get('length') : planData.plan.position.y + currentObject.children[0].position.y, planData.plan.position.z + itemPos.z);

package/lib/class/item.js

@@ -8,10 +8,8 @@ var _convertUnits = _interopRequireDefault(require("convert-units"));
 var _export = require("./export");
 var _export2 = require("../utils/export");
 var _immutable = require("immutable");
-var _path = _interopRequireDefault(require("path"));
 var _constants = require("../constants");
 var _helper = require("../utils/helper");
-var _util = require("util");
 var _molding = require("../utils/molding");
 var _utils = require("../components/viewer2d/utils");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
@@ -733,7 +731,7 @@ var Item = exports["default"] = /*#__PURE__*/function () {
     value: function beginDraggingItem(state, layerID, itemID, x, y) {
       var item = state.getIn(['scene', 'layers', layerID, 'items', itemID]);
       time1 = (0, _helper.debugUtil)();
-      if ((0, _util.isUndefined)(item)) return;
+      if (!item) return;
       state = state.merge({
         mode: _constants.MODE_DRAGGING_ITEM,
         draggingSupport: (0, _immutable.Map)({
@@ -754,7 +752,7 @@ var Item = exports["default"] = /*#__PURE__*/function () {
     value: function beginDraggingItem3D(state, layerID, itemID, x, y) {
       var item = state.getIn(['scene', 'layers', layerID, 'items', itemID]);
       state = state.setIn(['scene', 'isEndDragging'], false);
-      if ((0, _util.isUndefined)(item)) return {
+      if (!item) return {
         updatedState: state
       };
       state = state.merge({
@@ -787,7 +785,7 @@ var Item = exports["default"] = /*#__PURE__*/function () {
       var diffX = startPointX - x;
       var diffY = startPointY - y;
       var item = scene.getIn(['layers', layerID, 'items', itemID]);
-      if ((0, _util.isUndefined)(item)) return {
+      if (!item) return {
         updatedState: state
       };
       var tX = originalX - diffX;

package/lib/components/viewer3d/viewer3d.js

@@ -14,7 +14,6 @@ var _threeMemoryCleaner = require("./three-memory-cleaner");
 var _immutablediff = _interopRequireDefault(require("immutablediff"));
 var SharedStyle = _interopRequireWildcard(require("../../shared-style"));
 var _constants = require("../../constants");
-var _util = require("util");
 var _geometry = require("../../utils/geometry");
 var _convertUnits = _interopRequireDefault(require("convert-units"));
 var _export = require("../../utils/export");
@@ -1298,7 +1297,7 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
                   offsetX: event.offsetX - 50,
                   offsetY: event.offsetY
                 }, alti);
-                if ((0, _util.isUndefined)(selectedItem)) return;
+                if (!selectedItem) return;
                 var selItem = _this2.props.state.scene.layers.get(selectedObject.layerID).items.get(selectedObject.itemID);
                 lastAngle = 0;
                 angleObj.position.set(planData.plan.position.x + Point.x, selItem.category === 'lighting' ? -planData.plan.position.y - selItem.properties.get('height').get('length') : selItem.properties.get('altitude').get('length') + planData.plan.position.y, planData.plan.position.z - Point.y);
@@ -1469,7 +1468,7 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
                 setTimeout(function () {
                   (0, _sceneCreator.getDistances)(layer);
                   var selectedItem = planData.sceneGraph.layers[selectedObject.layerID].items[selectedObject.itemID];
-                  if ((0, _util.isUndefined)(selectedItem)) return;
+                  if (!selectedItem) return;
                   var selItem = _this2.props.state.scene.layers.get(selectedObject.layerID).items.get(selectedObject.itemID);
                   var itemPos = selectedItem.position.clone();
                   if (intersects[_i10].object.parent && intersects[_i10].object.parent.parent.userData.itemId === selectedItem.userData.itemId) {
@@ -1551,7 +1550,7 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
             if (bRotate) {
               var _intersects$_i;
               var selectedItem = planData.sceneGraph.layers[selectedObject.layerID].items[selectedObject.itemID];
-              if ((0, _util.isUndefined)(selectedItem)) return;
+              if (!selectedItem) return;
               var selItem = _this2.props.state.scene.layers.get(selectedObject.layerID).items.get(selectedObject.itemID);
               var itemPos = selectedItem.position.clone();
               if (((_intersects$_i = intersects[_i10]) === null || _intersects$_i === void 0 || (_intersects$_i = _intersects$_i.object) === null || _intersects$_i === void 0 || (_intersects$_i = _intersects$_i.parent) === null || _intersects$_i === void 0 || (_intersects$_i = _intersects$_i.parent) === null || _intersects$_i === void 0 || (_intersects$_i = _intersects$_i.userData) === null || _intersects$_i === void 0 ? void 0 : _intersects$_i.itemId) === selectedItem.userData.itemId) {
@@ -1569,7 +1568,7 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
             if (bMove) {
               bMove = false;
               var _selectedItem = planData.sceneGraph.layers[selectedObject.layerID].items[selectedObject.itemID];
-              if ((0, _util.isUndefined)(_selectedItem)) return;
+              if (!_selectedItem) return;
               var _selItem = _this2.props.state.scene.layers.get(selectedObject.layerID).items.get(selectedObject.itemID);
               var _itemPos = _selectedItem.position.clone();
               if (intersects[_i10].object.parent.parent.userData.itemId === _selectedItem.userData.itemId) {
@@ -2049,7 +2048,7 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
         setTimeout(function () {
           try {
             currentObject = planData.sceneGraph.layers[selectedObject.layerID].items[selectedObject.itemID];
-            if ((0, _util.isUndefined)(currentObject)) return;
+            if (!currentObject) return;
             var selItem = _this2.props.state.scene.layers.get(selectedObject.layerID).items.get(selectedObject.itemID);
             var itemPos = currentObject.position.clone();
             toolObj.position.set(planData.plan.position.x + itemPos.x, selItem.category === 'lighting' ? -planData.plan.position.y - selItem.properties.get('height').get('length') : planData.plan.position.y + currentObject.children[0].position.y, planData.plan.position.z + itemPos.z);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kitchen-simulator",
-  "version": "1.1.1-test.20",
+  "version": "1.1.1-test.21",
   "description": "It is a kitchen simulator.",
   "license": "MIT",
   "main": "lib/index.js",