kitchen-simulator 4.1.6-react-18 → 5.0.0-react.18

package/es/components/viewer2d/rulerDist.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { convert } from "../../utils/convert-units-lite";
+import { UNIT_FOOT, UNIT_METER } from "../../constants";
 var ARROW_STYLE = {
   stroke: '#1183B7',
   strokeWidth: '2px',
@@ -31,9 +32,9 @@ export default function RulerDist(_ref) {
     transform = _ref.transform,
     angle = _ref.angle,
     rotation = _ref.rotation;
-  var _unit = 'in';
-  // let _length = convert(length).from(unit).to(rulerUnit);
-  var distanceText = "".concat(convert(length).from('cm').to(rulerUnit).toFixed(0));
+  var ruLength = convert(length).from(unit).to(rulerUnit);
+  var fixedLength = layer.unit === UNIT_METER || layer.unit === UNIT_FOOT ? 2 : 0;
+  var distanceText = (Math.round(convert(ruLength).from(rulerUnit).to(layer.unit) * 100) / 100).toFixed(fixedLength);
   var textLength = (distanceText.length + layer.unit.length) * 8;
   var textangle = angle + 90;
   var textRotation = 1;
@@ -66,8 +67,8 @@ export default function RulerDist(_ref) {
     textRotation = 180;
     ay = 5;
   }
-  if (distanceText > 0) {
-    if (distanceText < 28) {
+  if (ruLength > 0) {
+    if (convert(ruLength).from(rulerUnit).to('in') < 3) {
       return /*#__PURE__*/React.createElement("g", {
         transform: transform
       }, /*#__PURE__*/React.createElement("g", null, /*#__PURE__*/React.createElement("text", {
@@ -75,7 +76,7 @@ export default function RulerDist(_ref) {
         y: "0",
         transform: "translate(".concat(length / 2, ",").concat(ay, ") scale(1, -1) rotate(").concat(textRotation, ")"),
         style: STYLE_TEXT
-      }, Math.round(convert(distanceText).from('in').to(layer.unit) * 100) / 100, layer.unit === 'in' ? '"' : layer.unit)));
+      }, distanceText, layer.unit === 'in' ? '"' : layer.unit)));
     } else {
       return /*#__PURE__*/React.createElement("g", {
         transform: transform
@@ -84,7 +85,7 @@ export default function RulerDist(_ref) {
         y: "0",
         transform: "translate(".concat(length / 2, ",").concat(ay, ") scale(1, -1) rotate(").concat(textRotation, ")"),
         style: STYLE_TEXT
-      }, Math.round(convert(distanceText).from('in').to(layer.unit) * 100) / 100, layer.unit === 'in' ? '"' : layer.unit)), /*#__PURE__*/React.createElement("line", {
+      }, distanceText, layer.unit === 'in' ? '"' : layer.unit)), /*#__PURE__*/React.createElement("line", {
         x1: "2",
         y1: "0",
         x2: (length - textLength) / 2 < 0 ? 0 : (length - textLength) / 2,

package/es/components/viewer2d/rulerX.js

@@ -43,10 +43,9 @@ var RulerX = /*#__PURE__*/function (_Component) {
         height: '100%',
         color: this.props.fontColor
       };
-      var left = Number.isFinite(this.props.zeroLeftPosition) && Number.isFinite(this.props.mouseX) && Number.isFinite(this.props.zoom) ? this.props.zeroLeftPosition + this.props.mouseX * this.props.zoom - 6.5 : 0;
       var markerStyle = {
         position: 'absolute',
-        left: Number.isFinite(left) ? left : 0,
+        left: this.props.zeroLeftPosition + this.props.mouseX * this.props.zoom - 6.5,
         top: 8,
         width: 0,
         height: 0,

package/es/components/viewer2d/scene.js

@@ -1,17 +1,14 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
 import _possibleConstructorReturn from "@babel/runtime/helpers/esm/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
 import _inherits from "@babel/runtime/helpers/esm/inherits";
-import _regeneratorRuntime from "@babel/runtime/regenerator";
 function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(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; })(); }
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { Layer, Grids } from "./export";
-import { searchForSkuValue } from "./utils";
 var Scene = /*#__PURE__*/function (_Component) {
   function Scene() {
     _classCallCheck(this, Scene);
@@ -20,65 +17,52 @@ var Scene = /*#__PURE__*/function (_Component) {
   _inherits(Scene, _Component);
   return _createClass(Scene, [{
     key: "componentDidUpdate",
-    value: function () {
-      var _componentDidUpdate = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(prevProps) {
-        var _this$props, scene, catalog, height, layers, selectedLayer, msg, isNotFoundInElements, itemType;
-        return _regeneratorRuntime.wrap(function (_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              if (this.props.scene.hashCode() !== prevProps.scene.hashCode()) {
-                _this$props = this.props, scene = _this$props.scene, catalog = _this$props.catalog;
-                height = scene.height, layers = scene.layers;
-                selectedLayer = layers.get(scene.selectedLayer);
-                msg = '';
-                isNotFoundInElements = false;
-                itemType = '';
-                selectedLayer.items.valueSeq().forEach(function (item) {
-                  if (!catalog.elements.hasOwnProperty(item.type)) {
-                    itemType = item.type;
-                    isNotFoundInElements = true;
-                  }
-                });
-                // if(isNotFoundInElements){
-                //   const deepSearchResult = await searchForSkuValue(catalog, selectedLayer, itemType)
-                //   if(!deepSearchResult.isAvailable){
-                //     msg += (`Element ${itemType} does not exist in catalog.\n`);
-                //   }
-                // }
+    value: function componentDidUpdate(prevProps) {
+      var prevScene = prevProps.scene;
+      var nextScene = this.props.scene;
+      if (!prevScene || !nextScene) return;
 
-                // if(msg !== '') {
-                //   msg += `Do you want to initialize?`;
-                //   confirm(msg)
-                //   ? this.context.projectActions.newProject()
-                //   : null
-                // }
-              }
-            case 1:
-            case "end":
-              return _context.stop();
+      // Only run when scene actually changes
+      if (prevScene.hashCode() !== nextScene.hashCode()) {
+        var _this$props = this.props,
+          scene = _this$props.scene,
+          catalog = _this$props.catalog;
+        var layers = scene.layers;
+        var selectedLayer = layers.get(scene.selectedLayer);
+        if (!selectedLayer) return;
+        var isNotFoundInElements = false;
+        var itemType = '';
+        selectedLayer.items.valueSeq().forEach(function (item) {
+          if (!catalog.elements || !Object.prototype.hasOwnProperty.call(catalog.elements, item.type)) {
+            itemType = item.type;
+            isNotFoundInElements = true;
           }
-        }, _callee, this);
-      }));
-      function componentDidUpdate(_x) {
-        return _componentDidUpdate.apply(this, arguments);
+        });
+        void isNotFoundInElements;
+        void itemType;
       }
-      return componentDidUpdate;
-    }()
+    }
   }, {
     key: "shouldComponentUpdate",
-    value: function shouldComponentUpdate(nextProps, nextState) {
-      return this.props.scene.hashCode() !== nextProps.scene.hashCode();
+    value: function shouldComponentUpdate(nextProps) {
+      var curr = this.props.scene;
+      var next = nextProps.scene;
+
+      // Be safe if scene is temporarily undefined/null
+      if (!curr || !next) return true;
+      return curr.hashCode() !== next.hashCode();
     }
   }, {
     key: "render",
     value: function render() {
-      var _this = this;
       var _this$props2 = this.props,
         scene = _this$props2.scene,
-        catalog = _this$props2.catalog;
-      var height = scene.height,
-        layers = scene.layers;
+        catalog = _this$props2.catalog,
+        state = _this$props2.state,
+        relatedLines = _this$props2.relatedLines;
+      var layers = scene.layers;
       var selectedLayer = layers.get(scene.selectedLayer);
+      var mode = this.props.state.get('mode');
       return /*#__PURE__*/React.createElement("g", null, /*#__PURE__*/React.createElement(Grids, {
         scene: scene
       }), /*#__PURE__*/React.createElement("g", {
@@ -99,19 +83,19 @@ var Scene = /*#__PURE__*/function (_Component) {
           layer: layer,
           scene: scene,
           catalog: catalog,
-          mode: _this.props.state.mode,
-          state: _this.props.state,
-          relatedLines: _this.props.relatedLines
+          mode: mode,
+          state: state,
+          relatedLines: relatedLines
         });
-      })), /*#__PURE__*/React.createElement(Layer, {
+      })), selectedLayer ? /*#__PURE__*/React.createElement(Layer, {
         key: selectedLayer.id,
         layer: selectedLayer,
         scene: scene,
         catalog: catalog,
-        mode: this.props.state.mode,
-        state: this.props.state,
-        relatedLines: this.props.relatedLines
-      }));
+        mode: mode,
+        state: state,
+        relatedLines: relatedLines
+      }) : null);
     }
   }]);
 }(Component);
@@ -119,5 +103,6 @@ export { Scene as default };
 Scene.propTypes = {
   scene: PropTypes.object.isRequired,
   catalog: PropTypes.object.isRequired,
-  relatedLines: PropTypes.array.isRequired
+  relatedLines: PropTypes.array.isRequired,
+  state: PropTypes.object.isRequired
 };

package/es/components/viewer2d/utils.js

@@ -187,7 +187,7 @@ export var areaPolygon = function areaPolygon(points) {
 };
 export var isWarningItem = function isWarningItem(item) {
   var _item$toJS$doorStyle;
-  return !(item !== null && item !== void 0 && (_item$toJS$doorStyle = item.toJS().doorStyle) !== null && _item$toJS$doorStyle !== void 0 && (_item$toJS$doorStyle = _item$toJS$doorStyle.doorStyles) !== null && _item$toJS$doorStyle !== void 0 && (_item$toJS$doorStyle = _item$toJS$doorStyle.cds) !== null && _item$toJS$doorStyle !== void 0 && _item$toJS$doorStyle.filter(function (cd) {
+  if (item.category === 'cabinet') return !(item !== null && item !== void 0 && (_item$toJS$doorStyle = item.toJS().doorStyle) !== null && _item$toJS$doorStyle !== void 0 && (_item$toJS$doorStyle = _item$toJS$doorStyle.doorStyles) !== null && _item$toJS$doorStyle !== void 0 && (_item$toJS$doorStyle = _item$toJS$doorStyle.cds) !== null && _item$toJS$doorStyle !== void 0 && _item$toJS$doorStyle.filter(function (cd) {
     return cd.itemID == (item === null || item === void 0 ? void 0 : item.getIn(['itemID']));
-  }).length) > 0;
+  }).length) > 0;else return false;
 };

package/es/components/viewer2d/vertex.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import * as SharedStyle from "../../shared-style";
+import { isEmpty } from "./utils";
 //Space from the center of the point(Use cases:x - vertexthickness,y + vertexthickness )
 var vertexthickness = 4;
 var STYLE = {
@@ -31,9 +32,9 @@ export default function Vertex(_ref) {
       });
       if (index > -1) {
         var vertice = line.relatedVertices.filter(function (a) {
-          if (a['index'] === undefined) {
+          if (isEmpty(a['index'])) {
             return a.get('index') === index;
-          } else if (a['index'] !== undefined) {
+          } else {
             return a.index === index;
           }
         }).get(0);