kitchen-simulator 1.0.0-alin.46 → 1.0.0-alin.48

package/es/LiteKitchenConfigurator.js

@@ -1,12 +1,12 @@
 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";
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 var _excluded = ["width", "height", "state", "stateExtractor"];
 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; }
@@ -40,23 +40,6 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
     _this = _callSuper(this, LiteKitchenConfigurator, [props]);
 
     // utm tracking
-    _defineProperty(_this, "handleBeforeUnload", function (e) {
-      var areas = _this.props.stateExtractor(_this.props.state).getIn(['scene', 'layers', _this.props.stateExtractor(_this.props.state).scene.selectedLayer, 'areas']);
-      if (!_this.state.isSaved && areas.size > 0) {
-        setTimeout(function () {
-          _this.setState({
-            savePromptVisible: true,
-            isLeaving: true
-          });
-        }, 500);
-        _this.saveProjectToStorage();
-
-        // This line is required to trigger the browser confirmation dialog
-        e.preventDefault();
-        e.returnValue = '';
-        return '';
-      }
-    });
     var utmDetailParams = new URLSearchParams(_this.props.location && _this.props.location.search);
     var utmStrEncoded = utmDetailParams.get('details');
     var utmRequestData = null;
@@ -343,8 +326,6 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
   }, {
     key: "componentDidMount",
     value: function componentDidMount() {
-      window.addEventListener('beforeunload', this.handleBeforeUnload);
-      console.log('context =>', this.context);
       window.forRedo = [];
       var store = this.context.store;
       var _this$props2 = this.props,
@@ -355,15 +336,6 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
         return newplugin(store, stateExtractor);
       });
     }
-  }, {
-    key: "componentWillUnmount",
-    value: function componentWillUnmount() {
-      window.addEventListener('beforeunload', this.handleBeforeUnload);
-      window.onbeforeunload = null;
-    }
-  }, {
-    key: "componentWillMount",
-    value: function componentWillMount() {}
   }, {
     key: "componentWillReceiveProps",
     value: function componentWillReceiveProps(nextProps) {

package/es/LiteRenderer.js

@@ -257,8 +257,6 @@ export default function LiteRenderer(props) {
     furnishing = _ref2$furnishing === void 0 ? [] : _ref2$furnishing,
     _ref2$lighting = _ref2.lighting,
     lighting = _ref2$lighting === void 0 ? [] : _ref2$lighting;
-  var _projectElement = _slicedToArray(projectElement, 1),
-    project_data = _projectElement[0].project_data;
   var id = configData.id,
     logoImg = configData.logoImg,
     companyUrl = configData.companyUrl;
@@ -266,10 +264,6 @@ export default function LiteRenderer(props) {
     _React$useState2 = _slicedToArray(_React$useState, 2),
     outlineSVGData = _React$useState2[0],
     setOutlineSVGData = _React$useState2[1];
-  var _React$useState3 = React.useState(false),
-    _React$useState4 = _slicedToArray(_React$useState3, 2),
-    catalogInitiated = _React$useState4[0],
-    setCatalogInitiated = _React$useState4[1];
   useEffect(function () {
     var initMyCatalog = /*#__PURE__*/function () {
       var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
@@ -466,7 +460,6 @@ export default function LiteRenderer(props) {
         return _regeneratorRuntime.wrap(function (_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              setCatalogInitiated(false);
               _context5.next = 1;
               return initMyCatalog();
             case 1:
@@ -476,8 +469,6 @@ export default function LiteRenderer(props) {
               _context5.next = 3;
               return loadSVGs();
             case 3:
-              setCatalogInitiated(true);
-            case 4:
             case "end":
               return _context5.stop();
           }
@@ -526,28 +517,6 @@ export default function LiteRenderer(props) {
     });
     for (var x in Item) MyCatalog.registerElement(Item[x]);
   }, [outlineSVGData, data, appliances, furnishing, lighting]);
-  useEffect(function () {
-    if (projectElement.length === 0) return;
-    if (!catalogInitiated) return;
-    store.dispatch(initCatalog(MyCatalog));
-    if (sessionStorage.getItem(window.location.href)) {
-      var _jsonData = sessionStorage.getItem(window.location.href);
-      store.dispatch(loadProject(JSON.parse(_jsonData), categoryData));
-      sessionStorage.removeItem(window.location.href);
-      return;
-    }
-    sessionStorage.setItem('projectTitle', projectElement[0].title);
-    store.dispatch(rename(projectElement[0].title));
-    sessionStorage.setItem('projectId', projectElement[0].id);
-    sessionStorage.setItem('email', projectElement[0].email);
-    sessionStorage.setItem('firstName', projectElement[0].firstName);
-    sessionStorage.setItem('lastName', projectElement[0].lastName);
-    sessionStorage.setItem('phone', projectElement[0].phone);
-    var jsonData;
-    jsonData = JSON.parse(projectElement[0].project_data);
-    jsonData.isLoadingCabinet = false;
-    store.dispatch(loadProject(jsonData, categoryData));
-  }, [project_data, catalogInitiated]);
   return /*#__PURE__*/React.createElement(AppContext.Provider, null, /*#__PURE__*/React.createElement(Provider, {
     store: store
   }, /*#__PURE__*/React.createElement(ToolErrorBoundary, {

package/es/components/viewer2d/viewer2d.js

@@ -4,7 +4,7 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 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; }
 import React, { useEffect, useRef, useState } from 'react';
 import PropTypes from 'prop-types';
-import { INITIAL_VALUE, ReactSVGPanZoom, TOOL_AUTO, TOOL_NONE, TOOL_PAN, TOOL_ZOOM_IN, TOOL_ZOOM_OUT, POSITION_NONE } from 'react-svg-pan-zoom';
+import { ReactSVGPanZoom, TOOL_AUTO, TOOL_NONE, TOOL_PAN, TOOL_ZOOM_IN, TOOL_ZOOM_OUT } from 'react-svg-pan-zoom';
 import * as constants from "../../constants";
 import { DECIMAL_PLACES_2, LINE_THICKNESS, MIN_ANGLE_DISALLOW_DRAW_WALL, MODE_ELEVATION_VIEW, MODE_IDLE, UNIT_ANGLE } from "../../constants";
 import State from "./state";
@@ -1309,7 +1309,7 @@ export default function Viewer2D(_ref, _ref2) {
     },
     width: width - rulerSize,
     height: height - rulerSize,
-    value: viewer2D.isEmpty() ? INITIAL_VALUE : viewer2D.toJS(),
+    value: viewer2D.isEmpty() ? null : viewer2D.toJS(),
     onChangeValue: onChangeValue,
     tool: mode2Tool(mode),
     onChangeTool: onChangeTool,
@@ -1317,9 +1317,8 @@ export default function Viewer2D(_ref, _ref2) {
     onMouseDown: onMouseDown,
     onMouseMove: onMouseMove,
     onMouseUp: onMouseUp,
-    toolbarProps: {
-      position: POSITION_NONE
-    },
+    miniaturePosition: "none",
+    toolbarPosition: "none",
     detectPinchGesture: false,
     disableDoubleClickZoomWithToolAuto: true,
     ref: Viewer

package/lib/LiteKitchenConfigurator.js

@@ -9,12 +9,12 @@ exports["default"] = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+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 _axios = _interopRequireDefault(require("axios"));
 var _convertUnitsLite = require("./utils/convert-units-lite");
 var _propTypes = _interopRequireDefault(require("prop-types"));
@@ -49,23 +49,6 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
     _this = _callSuper(this, LiteKitchenConfigurator, [props]);
 
     // utm tracking
-    (0, _defineProperty2["default"])(_this, "handleBeforeUnload", function (e) {
-      var areas = _this.props.stateExtractor(_this.props.state).getIn(['scene', 'layers', _this.props.stateExtractor(_this.props.state).scene.selectedLayer, 'areas']);
-      if (!_this.state.isSaved && areas.size > 0) {
-        setTimeout(function () {
-          _this.setState({
-            savePromptVisible: true,
-            isLeaving: true
-          });
-        }, 500);
-        _this.saveProjectToStorage();
-
-        // This line is required to trigger the browser confirmation dialog
-        e.preventDefault();
-        e.returnValue = '';
-        return '';
-      }
-    });
     var utmDetailParams = new URLSearchParams(_this.props.location && _this.props.location.search);
     var utmStrEncoded = utmDetailParams.get('details');
     var utmRequestData = null;
@@ -352,8 +335,6 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
   }, {
     key: "componentDidMount",
     value: function componentDidMount() {
-      window.addEventListener('beforeunload', this.handleBeforeUnload);
-      console.log('context =>', this.context);
       window.forRedo = [];
       var store = this.context.store;
       var _this$props2 = this.props,
@@ -364,15 +345,6 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
         return newplugin(store, stateExtractor);
       });
     }
-  }, {
-    key: "componentWillUnmount",
-    value: function componentWillUnmount() {
-      window.addEventListener('beforeunload', this.handleBeforeUnload);
-      window.onbeforeunload = null;
-    }
-  }, {
-    key: "componentWillMount",
-    value: function componentWillMount() {}
   }, {
     key: "componentWillReceiveProps",
     value: function componentWillReceiveProps(nextProps) {

package/lib/LiteRenderer.js

@@ -266,8 +266,6 @@ function LiteRenderer(props) {
     furnishing = _ref2$furnishing === void 0 ? [] : _ref2$furnishing,
     _ref2$lighting = _ref2.lighting,
     lighting = _ref2$lighting === void 0 ? [] : _ref2$lighting;
-  var _projectElement = (0, _slicedToArray2["default"])(projectElement, 1),
-    project_data = _projectElement[0].project_data;
   var id = configData.id,
     logoImg = configData.logoImg,
     companyUrl = configData.companyUrl;
@@ -275,10 +273,6 @@ function LiteRenderer(props) {
     _React$useState2 = (0, _slicedToArray2["default"])(_React$useState, 2),
     outlineSVGData = _React$useState2[0],
     setOutlineSVGData = _React$useState2[1];
-  var _React$useState3 = _react["default"].useState(false),
-    _React$useState4 = (0, _slicedToArray2["default"])(_React$useState3, 2),
-    catalogInitiated = _React$useState4[0],
-    setCatalogInitiated = _React$useState4[1];
   (0, _react.useEffect)(function () {
     var initMyCatalog = /*#__PURE__*/function () {
       var _ref3 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
@@ -475,7 +469,6 @@ function LiteRenderer(props) {
         return _regenerator["default"].wrap(function (_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              setCatalogInitiated(false);
               _context5.next = 1;
               return initMyCatalog();
             case 1:
@@ -485,8 +478,6 @@ function LiteRenderer(props) {
               _context5.next = 3;
               return loadSVGs();
             case 3:
-              setCatalogInitiated(true);
-            case 4:
             case "end":
               return _context5.stop();
           }
@@ -535,28 +526,6 @@ function LiteRenderer(props) {
     });
     for (var x in Item) MyCatalog.registerElement(Item[x]);
   }, [outlineSVGData, data, appliances, furnishing, lighting]);
-  (0, _react.useEffect)(function () {
-    if (projectElement.length === 0) return;
-    if (!catalogInitiated) return;
-    store.dispatch((0, _projectActions.initCatalog)(MyCatalog));
-    if (sessionStorage.getItem(window.location.href)) {
-      var _jsonData = sessionStorage.getItem(window.location.href);
-      store.dispatch((0, _projectActions.loadProject)(JSON.parse(_jsonData), categoryData));
-      sessionStorage.removeItem(window.location.href);
-      return;
-    }
-    sessionStorage.setItem('projectTitle', projectElement[0].title);
-    store.dispatch((0, _projectActions.rename)(projectElement[0].title));
-    sessionStorage.setItem('projectId', projectElement[0].id);
-    sessionStorage.setItem('email', projectElement[0].email);
-    sessionStorage.setItem('firstName', projectElement[0].firstName);
-    sessionStorage.setItem('lastName', projectElement[0].lastName);
-    sessionStorage.setItem('phone', projectElement[0].phone);
-    var jsonData;
-    jsonData = JSON.parse(projectElement[0].project_data);
-    jsonData.isLoadingCabinet = false;
-    store.dispatch((0, _projectActions.loadProject)(jsonData, categoryData));
-  }, [project_data, catalogInitiated]);
   return /*#__PURE__*/_react["default"].createElement(_AppContext["default"].Provider, null, /*#__PURE__*/_react["default"].createElement(_reactRedux.Provider, {
     store: store
   }, /*#__PURE__*/_react["default"].createElement(ToolErrorBoundary, {

package/lib/components/viewer2d/viewer2d.js

@@ -1319,7 +1319,7 @@ function Viewer2D(_ref, _ref2) {
     },
     width: width - rulerSize,
     height: height - rulerSize,
-    value: viewer2D.isEmpty() ? _reactSvgPanZoom.INITIAL_VALUE : viewer2D.toJS(),
+    value: viewer2D.isEmpty() ? null : viewer2D.toJS(),
     onChangeValue: onChangeValue,
     tool: mode2Tool(mode),
     onChangeTool: onChangeTool,
@@ -1327,9 +1327,8 @@ function Viewer2D(_ref, _ref2) {
     onMouseDown: onMouseDown,
     onMouseMove: onMouseMove,
     onMouseUp: onMouseUp,
-    toolbarProps: {
-      position: _reactSvgPanZoom.POSITION_NONE
-    },
+    miniaturePosition: "none",
+    toolbarPosition: "none",
     detectPinchGesture: false,
     disableDoubleClickZoomWithToolAuto: true,
     ref: Viewer

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kitchen-simulator",
-  "version": "1.0.0-alin.46",
+  "version": "1.0.0-alin.48",
   "description": "It is a kitchen simulator (self-contained micro-frontend).",
   "license": "MIT",
   "main": "lib/index.js",
@@ -82,7 +82,7 @@
     "react-hotjar": "^1.0.11",
     "react-icons": "3.5.0",
     "react-redux": "5.0.7",
-    "react-svg-pan-zoom": "^3.13.1",
+    "react-svg-pan-zoom": "2.18.0",
     "redux": "4.0.1",
     "three": "0.166.0",
     "moment": "^2.30.1",