kitchen-simulator 11.0.0-react-18 → 11.0.0

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

@@ -25,7 +25,6 @@ exports.parseData = parseData;
 exports.removeItem = removeItem;
 exports.removeSelItemMesh = removeSelItemMesh;
 exports.sameSign = sameSign;
-exports.showYelloBox = showYelloBox;
 exports.threedfabs = threedfabs;
 exports.tryAdjacentMD = tryAdjacentMD;
 exports.updateDoorHandleMesh = updateDoorHandleMesh;
@@ -44,9 +43,11 @@ var _convertUnitsLite = require("../../utils/convert-units-lite");
 var _geometry2 = require("../../utils/geometry");
 var GeomUtils = _interopRequireWildcard(require("../../catalog/utils/geom-utils"));
 var _itemLoader = require("../../catalog/utils/item-loader");
+var _cabinetWarning = require("../../shared/domain/cabinet-warning");
 var _utils = require("../viewer2d/utils");
 var _helper = require("../../utils/helper");
 var _math = require("../../utils/math");
+var _immutable = require("../../shared/objects/immutable");
 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; }
@@ -537,16 +538,14 @@ function replaceObject(modifiedPath, layer, planData, actions, sceneData, oldSce
               }
               var mBoxColor = 0x99c3fb;
               var _item = item.toJS();
-              if (_item.doorStyle.doorStyles !== undefined && _item.doorStyle.doorStyles.cds) {
-                if (showYelloBox(_item)) {
-                  mBoxColor = 'rgba(232,187,47,1)';
-                  var mBox = GeomUtils.makeMBoxfromObject(item3D, mBoxColor);
-                  var warningObj = createWarningObject();
-                  warningObj.position.set(0, item.properties.get('height').get('length') / 3, 0);
-                  if (mBox) {
-                    mBox.add(warningObj);
-                    item3D.add(mBox);
-                  }
+              if ((0, _cabinetWarning.isWarningCabinet)(_item)) {
+                mBoxColor = 'rgba(232,187,47,1)';
+                var mBox = GeomUtils.makeMBoxfromObject(item3D, mBoxColor);
+                var warningObj = createWarningObject();
+                warningObj.position.set(0, item.properties.get('height').get('length') / 3, 0);
+                if (mBox) {
+                  mBox.add(warningObj);
+                  item3D.add(mBox);
                 }
               }
             }
@@ -727,16 +726,14 @@ function replaceObject(modifiedPath, layer, planData, actions, sceneData, oldSce
             if (item3D) {
               var _mBoxColor = 0x99c3fb;
               var _item2 = item.toJS();
-              if (_item2.doorStyle.doorStyles !== undefined && _item2.doorStyle.doorStyles.cds) {
-                if (showYelloBox(_item2)) {
-                  _mBoxColor = 'rgba(232,187,47,1)';
-                  var _mBox2 = GeomUtils.makeMBoxfromObject(item3D, _mBoxColor);
-                  var _warningObj = createWarningObject();
-                  _warningObj.position.set(0, item.properties.get('height').get('length') / 3, 0);
-                  if (_mBox2) {
-                    _mBox2.add(_warningObj);
-                    item3D.add(_mBox2);
-                  }
+              if ((0, _cabinetWarning.isWarningCabinet)(_item2)) {
+                _mBoxColor = 'rgba(232,187,47,1)';
+                var _mBox2 = GeomUtils.makeMBoxfromObject(item3D, _mBoxColor);
+                var _warningObj = createWarningObject();
+                _warningObj.position.set(0, item.properties.get('height').get('length') / 3, 0);
+                if (_mBox2) {
+                  _mBox2.add(_warningObj);
+                  item3D.add(_mBox2);
                 }
               }
             }
@@ -859,10 +856,8 @@ function replaceObject(modifiedPath, layer, planData, actions, sceneData, oldSce
             }
             var _mBoxColor2 = 0x99c3fb;
             var _item3 = item.toJS();
-            if (_item3.doorStyle.doorStyles !== undefined && _item3.doorStyle.doorStyles.cds) {
-              if (showYelloBox(_item3)) {
-                _mBoxColor2 = 'rgba(232,187,47,1)';
-              }
+            if ((0, _cabinetWarning.isWarningCabinet)(_item3)) {
+              _mBoxColor2 = 'rgba(232,187,47,1)';
             }
             rItem.children[0].children.forEach(function (rItemElement) {
               rItemElement.visible = false;
@@ -2082,21 +2077,19 @@ function addItem(sceneData, planData, layer, itemID, catalog, itemsActions) {
     if (pivot) {
       var mBoxColor = 0x99c3fb;
       var _item = item.toJS();
-      if (_item.doorStyle.doorStyles !== undefined && _item.doorStyle.doorStyles.cds) {
-        if (showYelloBox(_item)) {
-          mBoxColor = 'rgba(232,187,47,1)';
-        } else {
-          pivot.children[0].children.forEach(function (pivotElement) {
-            pivotElement.visible = false;
-          });
-        }
-        var mBox = GeomUtils.makeMBoxfromObject(pivot, mBoxColor);
-        var warningObj = createWarningObject();
-        warningObj.position.set(0, item.properties.get('height').get('length') / 3, 0);
-        if (mBox) {
-          mBox.add(warningObj);
-          pivot.add(mBox);
-        }
+      if ((0, _cabinetWarning.isWarningCabinet)(_item)) {
+        mBoxColor = 'rgba(232,187,47,1)';
+      } else {
+        pivot.children[0].children.forEach(function (pivotElement) {
+          pivotElement.visible = false;
+        });
+      }
+      var mBox = GeomUtils.makeMBoxfromObject(pivot, mBoxColor);
+      var warningObj = createWarningObject();
+      warningObj.position.set(0, item.properties.get('height').get('length') / 3, 0);
+      if (mBox) {
+        mBox.add(warningObj);
+        pivot.add(mBox);
       }
     }
 
@@ -2194,8 +2187,8 @@ function addItem(sceneData, planData, layer, itemID, catalog, itemsActions) {
       height: height,
       depth: depth
     };
-    val.layoutpos = cat.info.layoutpos;
-    val.is_corner = cat.info.is_corner;
+    val.layoutpos = item === null || item === void 0 ? void 0 : item.layoutpos;
+    val.is_corner = item === null || item === void 0 ? void 0 : item.is_corner;
     val.item = item;
     var calcrect = _export.GeometryUtils.getCalcRectFromItem3D(val);
 
@@ -2222,13 +2215,9 @@ function addItem(sceneData, planData, layer, itemID, catalog, itemsActions) {
       });
       if (pivot.children.length > 1) {
         var _item4 = item.toJS();
-        if (_item4.doorStyle.doorStyles !== undefined) {
-          if (_item4.category === 'cabinet') {
-            if (_item4.doorStyle.doorStyles.cds.some(function (element) {
-              return element.itemID === item.itemID;
-            })) {
-              pivot.children.pop();
-            }
+        if (_item4.category === _constants.ITEM_TYPE.CABINET) {
+          if (!(0, _cabinetWarning.isWarningCabinet)(item)) {
+            pivot.children.pop();
           } else {
             pivot.children.pop();
           }
@@ -2945,31 +2934,6 @@ function threedfabs(a) {
 function getDistanceBetweenLineSegment(pos1, pos2, pos3, pos4) {
   if (pos1.x == pos2.x && pos3.x == pos4.x) return pos3.x - pos1.x;else if (pos1.y == pos2.y && pos3.y == pos4.y) return pos3.y - pos1.y;else return -1;
 }
-
-/**
- * check to see if an item is suitable for the given doorStyle.
- * @param _item
- * @returns true if it's not suitable.
- */
-function showYelloBox(_item) {
-  var _doorStyle;
-  var doorStyle = _item === null || _item === void 0 ? void 0 : _item.doorStyle;
-
-  // If doorStyle is an Immutable Map, convert to plain JS
-  if (doorStyle && typeof doorStyle.toJS === 'function') {
-    doorStyle = doorStyle.toJS();
-  }
-  var isItemCabinet = (_item === null || _item === void 0 ? void 0 : _item.category) === 'cabinet';
-  var cds = (_doorStyle = doorStyle) === null || _doorStyle === void 0 || (_doorStyle = _doorStyle.doorStyles) === null || _doorStyle === void 0 ? void 0 : _doorStyle.cds;
-
-  // hasItemCDS: item is suitable if its itemID exists in cds
-  var hasItemCDS = isItemCabinet && Array.isArray(cds) ? cds.some(function (element) {
-    return element.itemID === _item.itemID;
-  }) : false;
-
-  // return true if it's a cabinet but not suitable for the current doorStyle
-  return isItemCabinet && !hasItemCDS;
-}
 function isSimilar(a, b) {
   if (threedfabs(a - b) <= 0.01) return 1;
   return 0;
@@ -3508,7 +3472,7 @@ function addMolding(MGArray, addItem, planData, layer, itemActions, mode) {
   if (addItem.selected && [_constants.MODE_DRAGGING_ITEM_3D, _constants.MODE_ROTATING_ITEM_3D].includes(mode)) return false;
 
   // If the item is not available for current doorStyle
-  if (showYelloBox(addItem))
+  if ((0, _cabinetWarning.isWarningCabinet)(addItem))
     // Do not add molding to that item
     return MGArray;
 

package/lib/components/viewer3d/viewer3d-first-person.js

@@ -11,10 +11,9 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireDefault(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
-var _AppContext = _interopRequireDefault(require("../../AppContext"));
+var _reactDom = _interopRequireDefault(require("react-dom"));
 var Three = _interopRequireWildcard(require("three"));
 var _sceneCreator = require("./scene-creator");
 var _threeMemoryCleaner = require("./three-memory-cleaner");
@@ -33,7 +32,6 @@ var Viewer3DFirstPerson = exports["default"] = /*#__PURE__*/function (_React$Com
     _this.width = props.width;
     _this.height = props.height;
     _this.stopRendering = false;
-    _this.canvasWrapperRef = /*#__PURE__*/_react["default"].createRef();
     _this.renderer = window.__threeRenderer || new Three.WebGLRenderer({
       preserveDrawingBuffer: true
     });
@@ -64,7 +62,7 @@ var Viewer3DFirstPerson = exports["default"] = /*#__PURE__*/function (_React$Com
       };
       var state = this.props.state;
       var data = state.scene;
-      var canvasWrapper = this.canvasWrapperRef.current;
+      var canvasWrapper = _reactDom["default"].findDOMNode(this.refs.canvasWrapper);
       var scene3D = new Three.Scene();
 
       // As I need to show the pointer above all scene objects, I use this workaround http://stackoverflow.com/a/13309722
@@ -263,8 +261,8 @@ var Viewer3DFirstPerson = exports["default"] = /*#__PURE__*/function (_React$Com
       this.renderer.renderLists.dispose();
     }
   }, {
-    key: "UNSAFE_componentWillReceiveProps",
-    value: function UNSAFE_componentWillReceiveProps(nextProps) {
+    key: "componentWillReceiveProps",
+    value: function componentWillReceiveProps(nextProps) {
       var width = nextProps.width,
         height = nextProps.height;
       var camera = this.camera,
@@ -297,15 +295,22 @@ var Viewer3DFirstPerson = exports["default"] = /*#__PURE__*/function (_React$Com
     key: "render",
     value: function render() {
       return /*#__PURE__*/_react["default"].createElement('div', {
-        ref: this.canvasWrapperRef
+        ref: 'canvasWrapper'
       });
     }
   }]);
 }(_react["default"].Component);
-(0, _defineProperty2["default"])(Viewer3DFirstPerson, "contextType", _AppContext["default"]);
 Viewer3DFirstPerson.propTypes = {
   state: _propTypes["default"].object.isRequired,
   width: _propTypes["default"].number.isRequired,
   height: _propTypes["default"].number.isRequired
 };
+Viewer3DFirstPerson.contextTypes = {
+  areaActions: _propTypes["default"].object.isRequired,
+  holesActions: _propTypes["default"].object.isRequired,
+  itemsActions: _propTypes["default"].object.isRequired,
+  linesActions: _propTypes["default"].object.isRequired,
+  projectActions: _propTypes["default"].object.isRequired,
+  catalog: _propTypes["default"].object
+};
 module.exports = exports.default;

package/lib/components/viewer3d/viewer3d.js

@@ -7,15 +7,15 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 var _readOnlyError2 = _interopRequireDefault(require("@babel/runtime/helpers/readOnlyError"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireDefault(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
-var _AppContext = _interopRequireDefault(require("../../AppContext"));
+var _reactDom = _interopRequireDefault(require("react-dom"));
 var Three = _interopRequireWildcard(require("three"));
 var _sceneCreator = require("./scene-creator");
 var _threeMemoryCleaner = require("./three-memory-cleaner");
@@ -57,7 +57,6 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
     _this.width = props.width;
     _this.height = props.height;
     _this.renderingID = 0;
-    _this.canvasWrapperRef = /*#__PURE__*/_react["default"].createRef();
     var mode = props.state.mode;
     if (!window.__elevationRendererDownload) {
       window.__elevationRendererDownload = {};
@@ -552,7 +551,7 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
         if (item !== null) {
           var catid = item.type;
           var cat = catalog.elements[catid];
-          layoutpos = cat.info.layoutpos;
+          layoutpos = item === null || item === void 0 ? void 0 : item.layoutpos;
         }
         var oPos = new Three.Vector2(pos.clone().x, pos.clone().y);
         var sBounding = obj.children[0].userData;
@@ -572,9 +571,7 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
             return false;
           }
           var _item = layer.items.getIn([data.id]);
-          var ocatid = _item.type;
-          var ocat = catalog.elements[ocatid];
-          var olayoutpos = ocat.info.layoutpos;
+          var olayoutpos = _item.layoutpos;
           if (!(layoutpos === _constants.BASE_CABINET_LAYOUTPOS && olayoutpos === _constants.WALL_CABINET_LAYOUTPOS || layoutpos === _constants.WALL_CABINET_LAYOUTPOS && olayoutpos === _constants.BASE_CABINET_LAYOUTPOS)) {
             var tRot = _item.rotation;
             var tPos = new Three.Vector2(_item.x, _item.y);
@@ -1200,9 +1197,8 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
         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, curLayer, catalog, pointArray);
+          var _this2$props$onIntern, _this2$props;
+          var payload = (0, _helper.updatePayloadOfInternalEvent)(evtElement, curLayer, 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
@@ -2173,7 +2169,7 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
       }
 
       // Add the output of the renderer to the html element
-      var canvasWrapper = this.canvasWrapperRef.current;
+      var canvasWrapper = _reactDom["default"].findDOMNode(this.refs.canvasWrapper);
       canvasWrapper && canvasWrapper.appendChild(this.renderer.domElement);
 
       //
@@ -2442,8 +2438,8 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
       this.renderer.renderLists.dispose();
     }
   }, {
-    key: "UNSAFE_componentWillReceiveProps",
-    value: function UNSAFE_componentWillReceiveProps(nextProps) {
+    key: "componentWillReceiveProps",
+    value: function componentWillReceiveProps(nextProps) {
       var _this4 = this;
       if (this.props.downloadFlag && (0, _immutablediff["default"])(this.props.state, nextProps.state).toJS().length == 0 || (0, _helper.isEmpty)(nextProps.state.scene)) return;
       var width = nextProps.width,
@@ -2653,17 +2649,25 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
         this.renderer.domElement.style.opacity = '1';
         !this.props.downloadFlag && document.getElementById('front') && (document.getElementById('front').style.display = 'block');
         return /*#__PURE__*/_react["default"].createElement('div', {
-          ref: this.canvasWrapperRef
+          ref: 'canvasWrapper'
         });
       }
     }
   }]);
 }(_react["default"].Component);
-(0, _defineProperty2["default"])(Scene3DViewer, "contextType", _AppContext["default"]);
 Scene3DViewer.propTypes = {
   state: _propTypes["default"].object.isRequired,
   width: _propTypes["default"].number.isRequired,
   height: _propTypes["default"].number.isRequired,
   replaceCabinet: _propTypes["default"].func.isRequired
 };
+Scene3DViewer.contextTypes = {
+  areaActions: _propTypes["default"].object.isRequired,
+  holesActions: _propTypes["default"].object.isRequired,
+  itemsActions: _propTypes["default"].object.isRequired,
+  linesActions: _propTypes["default"].object.isRequired,
+  sceneActions: _propTypes["default"].object.isRequired,
+  projectActions: _propTypes["default"].object.isRequired,
+  catalog: _propTypes["default"].object
+};
 module.exports = exports.default;