kitchen-simulator 3.0.3 → 3.1.0-alpha.13

package/es/LiteKitchenConfigurator.js

@@ -1,13 +1,13 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 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";
-var _excluded = ["width", "height", "state", "stateExtractor"];
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+var _excluded = ["width", "height", "state", "stateExtractor", "measurementUnit"];
 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) { _defineProperty(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; }
 function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
@@ -40,6 +40,7 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
     _this = _callSuper(this, LiteKitchenConfigurator, [props]);
 
     // utm tracking
+    _defineProperty(_this, "lastProcessedExternalEventId", null);
     var utmDetailParams = new URLSearchParams(_this.props.location && _this.props.location.search);
     var utmStrEncoded = utmDetailParams.get('details');
     var utmRequestData = null;
@@ -120,12 +121,13 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
     _this.setShowProperty = _this.setShowProperty.bind(_this);
     return _this;
   }
-
-  // Toolbar control functions
   _inherits(LiteKitchenConfigurator, _Component);
   return _createClass(LiteKitchenConfigurator, [{
     key: "setToolbar",
-    value: function setToolbar(toolBarKey) {
+    value:
+    // Toolbar control functions
+
+    function setToolbar(toolBarKey) {
       this.setState({
         toolbar: toolBarKey
       });
@@ -327,23 +329,40 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
       });
     }
   }, {
-    key: "componentWillReceiveProps",
-    value: function componentWillReceiveProps(nextProps) {
-      var stateExtractor = nextProps.stateExtractor,
-        state = nextProps.state,
-        projectActions = nextProps.projectActions,
-        catalog = nextProps.catalog,
-        externalEvent = nextProps.externalEvent,
-        onInternalEvent = nextProps.onInternalEvent;
+    key: "componentDidUpdate",
+    value: function componentDidUpdate(prevProps) {
+      var _this3 = this;
+      var ev = this.props.externalEvent;
 
-      // handle external events
-      if (this.props.externalEvent !== externalEvent) {
-        handleExternalEvent(nextProps);
-      }
-      var plannerState = stateExtractor(state);
-      var catalogReady = plannerState.getIn(['catalog', 'ready']);
-      if (!catalogReady) {
-        projectActions.initCatalog(catalog);
+      // nothing new
+      if (!ev || ev === prevProps.externalEvent) return;
+
+      // must have id to ack
+      var eventId = ev.__eventId;
+      if (eventId == null) return;
+
+      // exactly-once guard
+      if (this.lastProcessedExternalEventId === eventId) return;
+      this.lastProcessedExternalEventId = eventId;
+      try {
+        var result = handleExternalEvent(this.props);
+
+        // if it returns a promise, ack after it resolves/rejects
+        if (result && typeof result.then === 'function') {
+          result["finally"](function () {
+            var _this3$props$onExtern, _this3$props;
+            (_this3$props$onExtern = (_this3$props = _this3.props).onExternalEventProcessed) === null || _this3$props$onExtern === void 0 || _this3$props$onExtern.call(_this3$props, eventId);
+          });
+        } else {
+          var _this$props$onExterna, _this$props2;
+          // sync case
+          (_this$props$onExterna = (_this$props2 = this.props).onExternalEventProcessed) === null || _this$props$onExterna === void 0 || _this$props$onExterna.call(_this$props2, eventId);
+        }
+      } catch (e) {
+        var _this$props$onExterna2, _this$props3;
+        // never deadlock the host queue
+        (_this$props$onExterna2 = (_this$props3 = this.props).onExternalEventProcessed) === null || _this$props$onExterna2 === void 0 || _this$props$onExterna2.call(_this$props3, eventId);
+        throw e;
       }
     }
   }, {
@@ -357,12 +376,13 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
   }, {
     key: "render",
     value: function render() {
-      var _this$props2 = this.props,
-        width = _this$props2.width,
-        height = _this$props2.height,
-        state = _this$props2.state,
-        stateExtractor = _this$props2.stateExtractor,
-        props = _objectWithoutProperties(_this$props2, _excluded);
+      var _this$props4 = this.props,
+        width = _this$props4.width,
+        height = _this$props4.height,
+        state = _this$props4.state,
+        stateExtractor = _this$props4.stateExtractor,
+        measurementUnit = _this$props4.measurementUnit,
+        props = _objectWithoutProperties(_this$props4, _excluded);
       var _this$state = this.state,
         savePopupVisible = _this$state.savePopupVisible,
         quotePopupVisible = _this$state.quotePopupVisible,
@@ -408,7 +428,8 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
         style: _objectSpread(_objectSpread({}, wrapperStyle), {}, {
           height: height,
           display: 'flex',
-          justifyContent: 'center'
+          justifyContent: 'center',
+          position: 'relative'
         })
       }, /*#__PURE__*/React.createElement(Content, _extends({
         width: contentW,
@@ -443,7 +464,9 @@ LiteKitchenConfigurator.propTypes = {
   customContents: PropTypes.object,
   softwareSignature: PropTypes.string,
   configData: PropTypes.object,
-  onInternalEvent: PropTypes.func
+  onInternalEvent: PropTypes.func,
+  onExternalEventProcessed: PropTypes.func,
+  externalEvent: PropTypes.any
 };
 LiteKitchenConfigurator.contextTypes = {
   store: PropTypes.object.isRequired

package/es/LiteRenderer.js

@@ -7,7 +7,7 @@ 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";
-var _excluded = ["width", "height", "configData", "options", "user", "auth", "featureFlags", "sentry", "analytics", "externalEvent", "onInternalEvent", "onError"];
+var _excluded = ["width", "height", "configData", "options", "user", "auth", "featureFlags", "externalEvent", "onInternalEvent", "onExternalEventProcessed", "onError"];
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 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) { _defineProperty(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; }
@@ -144,10 +144,9 @@ export default function LiteRenderer(props) {
     user = props.user,
     auth = props.auth,
     featureFlags = props.featureFlags,
-    sentry = props.sentry,
-    analytics = props.analytics,
     externalEvent = props.externalEvent,
     onInternalEvent = props.onInternalEvent,
+    onExternalEventProcessed = props.onExternalEventProcessed,
     onError = props.onError,
     passThrough = _objectWithoutProperties(props, _excluded);
 
@@ -298,7 +297,8 @@ export default function LiteRenderer(props) {
     },
     configData: configData,
     externalEvent: externalEvent,
-    onInternalEvent: onInternalEvent
+    onInternalEvent: onInternalEvent,
+    onExternalEventProcessed: onExternalEventProcessed
   }, passThrough)))));
 }
 
@@ -315,12 +315,9 @@ LiteRenderer.propTypes = {
   user: PropTypes.object,
   auth: PropTypes.object,
   featureFlags: PropTypes.object,
-  sentry: PropTypes.shape({
-    dsn: PropTypes.string,
-    environment: PropTypes.string
-  }),
   externalEvent: PropTypes.object,
   onInternalEvent: PropTypes.func,
   onError: PropTypes.func,
+  onExternalEventProcessed: PropTypes.func,
   store: PropTypes.object
 };

package/es/actions/lines-actions.js

@@ -13,12 +13,14 @@ export function selectToolDrawingLine(sceneComponentType) {
   };
 }
 export function beginDrawingLine(layerID, x, y, snapMask) {
+  var onInternalEvent = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : null;
   return {
     type: BEGIN_DRAWING_LINE,
     layerID: layerID,
     x: x,
     y: y,
-    snapMask: snapMask
+    snapMask: snapMask,
+    onInternalEvent: onInternalEvent
   };
 }
 export function updateDrawingLine(x, y, relatedLines, snapMask) {

package/es/catalog/factories/area-factory-3d.js

@@ -1,9 +1,9 @@
-import * as Three from 'three';
-import { Box3, Mesh, MeshBasicMaterial, MeshPhysicalMaterial, RepeatWrapping, Shape, TextureLoader, Vector2 } from 'three';
+import * as Three from "three";
+import { Box3, Mesh, MeshBasicMaterial, MeshPhysicalMaterial, RepeatWrapping, Shape, TextureLoader, Vector2 } from "three";
 import * as SharedStyle from "../../shared-style";
-import { RGBELoader } from 'three/examples/jsm/loaders/RGBELoader';
+import { RGBELoader } from "three/examples/jsm/loaders/RGBELoader";
 var params = {
-  envMap: 'HDR',
+  envMap: "HDR",
   roughness: 0.9,
   metalness: 0.8,
   exposure: 1.0
@@ -58,7 +58,7 @@ var assignUVs = function assignUVs(geometry) {
     var y3 = position.getY(i + 2);
     uvArray.push((x1 + offset.x) / range.x, (y1 + offset.y) / range.y, (x2 + offset.x) / range.x, (y2 + offset.y) / range.y, (x3 + offset.x) / range.x, (y3 + offset.y) / range.y);
   }
-  geometry.setAttribute('uv', new Three.BufferAttribute(new Float32Array(uvArray), 2));
+  geometry.setAttribute("uv", new Three.BufferAttribute(new Float32Array(uvArray), 2));
   geometry.needsUpdate = true;
 };
 export function createArea(element, layer, scene, textures) {
@@ -69,15 +69,15 @@ export function createArea(element, layer, scene, textures) {
   var texture = element.texture;
   texture.lengthRepeatScale = 0.01;
   texture.heightRepeatScale = 0.01;
-  var color = element.properties.get('patternColor');
+  var color = element.properties.get("patternColor");
   if (element.selected) {
     color = SharedStyle.AREA_MESH_COLOR.selected;
   } else {
     color = SharedStyle.AREA_MESH_COLOR.unselected;
   }
-  if (texture.uri === undefined || texture.uri == '') {
+  if (texture.uri === undefined || texture.uri == "") {
     // @todo THIS IS A TEMPORARY FIX TO HAVE A DEFAULT FLOOR TEXTURE
-    texture.uri = layer.floorStyle.uri || 'https://media.test.diydesignspace.com/uploads/CountTop/202203162950_2/texture/oak-barcelona-s.jpg';
+    texture.uri = layer.floorStyle.uri || "https://media.test.diydesignspace.com/uploads/CountTop/202203162950_2/texture/oak-barcelona-s.jpg";
   }
   var shape = new Shape();
   shape.moveTo(vertices[0].x, vertices[0].y);
@@ -85,7 +85,7 @@ export function createArea(element, layer, scene, textures) {
     shape.lineTo(vertices[i].x, vertices[i].y);
   }
   function loadFloorENV() {
-    return new RGBELoader().load('/assets/Window.hdr', function (texture) {
+    return new RGBELoader().load("/assets/Window.hdr", function (texture) {
       texture.mapping = Three.EquirectangularReflectionMapping;
       return texture;
     });
@@ -105,8 +105,8 @@ export function createArea(element, layer, scene, textures) {
   /* Create holes for the area */
   element.holes.forEach(function (holeID) {
     var holeCoords = [];
-    layer.getIn(['areas', holeID, 'vertices']).forEach(function (vertexID) {
-      var _layer$getIn = layer.getIn(['vertices', vertexID]),
+    layer.getIn(["areas", holeID, "vertices"]).forEach(function (vertexID) {
+      var _layer$getIn = layer.getIn(["vertices", vertexID]),
         x = _layer$getIn.x,
         y = _layer$getIn.y;
       holeCoords.push([x, y]);
@@ -133,7 +133,7 @@ export function createArea(element, layer, scene, textures) {
   var area = new Mesh(shapeGeometry, areaMaterial);
   area.rotation.x -= Math.PI / 2;
   area.receiveShadow = true;
-  area.name = 'floor';
+  area.name = "floor";
   // This mesh is use for creating ceiling mesh
 
   var shapeGeometry2 = new Three.ShapeGeometry(shape);
@@ -144,7 +144,7 @@ export function createArea(element, layer, scene, textures) {
   area2.castShadow = true;
   area2.rotation.x -= Math.PI / 2;
   area2.receiveShadow = true;
-  area2.name = 'floorSupport';
+  area2.name = "floorSupport";
   var floorSupport = area2.clone();
   area.userData.floorSupport = floorSupport;
   return Promise.resolve(area);
@@ -154,13 +154,13 @@ export function updatedArea(element, layer, scene, textures, mesh, oldElement, d
     selfDestroy();
     return selfBuild();
   };
-  var floor = mesh.getObjectByName('floor');
+  var floor = mesh.getObjectByName("floor");
   floor.receiveShadow = true;
-  if (differences[0] == 'selected') {
+  if (differences[0] == "selected") {
     var color = element.selected ? SharedStyle.AREA_MESH_COLOR.selected : SharedStyle.AREA_MESH_COLOR.unselected;
     floor.material.color.set(color);
-  } else if (differences[0] == 'properties') {
-    if (differences[1] === 'texture') {
+  } else if (differences[0] == "properties") {
+    if (differences[1] === "texture") {
       return noPerf();
     }
   } else return noPerf();

package/es/catalog/holes/window-clear/planner-element.js

@@ -4,12 +4,12 @@ import { loadGLTF, scaleObject } from "../../utils/load-obj";
 import { OBJTYPE_MESH } from "../../../constants";
 var cached3DWindow = null;
 export default {
-  name: 'Clear Window',
+  name: 'Window',
   prototype: 'holes',
   info: {
     title: 'Clear',
     tag: ['window'],
-    description: 'Clear Window',
+    description: 'Window',
     image: '/assets/img/svg/window/Clear.svg',
     url: '/assets/gltf/window_clear.gltf'
   },