kitchen-simulator 5.10.14-react.18 → 6.0.1-react.18

package/es/LiteKitchenConfigurator.js

@@ -20,7 +20,8 @@ import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
 import * as constants from "./constants";
-import actions from "./actions/export";
+import { base64Decode } from "./utils/helper";
+import actions, { projectActions } from "./actions/export";
 import Catalog from "./catalog/catalog";
 import { Content } from "./components/export";
 import Translator from "./translator/translator";
@@ -42,20 +43,6 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
     var _this;
     _classCallCheck(this, LiteKitchenConfigurator);
     _this = _callSuper(this, LiteKitchenConfigurator, [props]);
-
-    // ---- guards / schedulers ----
-    _this._catalogInitRequested = false;
-    _this._lastHandledExternalEvent = null;
-    _this._handlingExternalEvent = false;
-    _this._scheduledExternalEventTimeout = null;
-
-    // viewer2D init guard (prevents dispatch loops)
-    _this._viewer2DInitKeyDone = null;
-
-    // cache for viewer2D init (no merging in render)
-    _this._lastExtractedStateRef = null;
-    _this._cachedViewer2DKey = null;
-    _this._cachedExtractedState = null;
     _this.state = {
       savePopupVisible: false,
       quotePopupVisible: false,
@@ -88,6 +75,7 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
       isSaved: false,
       isLeaving: false
     };
+    _this._catalogInitRequested = false;
     _this.openFloor = _this.openFloor.bind(_this);
     _this.openCabinet = _this.openCabinet.bind(_this);
     _this.openFinishing = _this.openFinishing.bind(_this);
@@ -107,10 +95,13 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
     _this.setDownloadPopupVisible = _this.setDownloadPopupVisible.bind(_this);
     _this.neverShowInput = /*#__PURE__*/React.createRef(null);
     _this.setShowProperty = _this.setShowProperty.bind(_this);
+
+    // cache for viewer2D init so we don't allocate merges every render
+    _this._lastExtractedStateRef = null;
+    _this._cachedViewer2DKey = null;
+    _this._cachedExtractedState = null;
     return _this;
   }
-
-  // ---------------- UI setters (unchanged) ----------------
   _inherits(LiteKitchenConfigurator, _Component);
   return _createClass(LiteKitchenConfigurator, [{
     key: "setToolbar",
@@ -298,154 +289,92 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
       var el = document.getElementById('add_appliances_inactive');
       if (el !== null && el !== void 0 && (_el$parentElement0 = el.parentElement) !== null && _el$parentElement0 !== void 0 && _el$parentElement0.parentElement) el.parentElement.parentElement.style.zIndex = 6;
     }
-
-    // ---------------- viewer2D init (SAFE, guarded) ----------------
-  }, {
-    key: "maybeInitViewer2D",
-    value: function maybeInitViewer2D(extractedState, width, height) {
-      var _extractedState$getIn;
-      var viewer2DActions = this.props.viewer2DActions;
-      var viewer2D = extractedState === null || extractedState === void 0 || (_extractedState$getIn = extractedState.getIn) === null || _extractedState$getIn === void 0 ? void 0 : _extractedState$getIn.call(extractedState, ['viewer2D']);
-      if (!viewer2D || viewer2D.size <= 0) return;
-      var v = viewer2D.toJS();
-      if (!v) return;
-
-      // Only init when e/f are exactly zero
-      if (v.e !== 0 || v.f !== 0) return;
-      var key = "".concat(width, ":").concat(height, ":").concat(v.viewerWidth, ":").concat(v.viewerHeight, ":").concat(v.SVGWidth, ":").concat(v.SVGHeight);
-
-      // ✅ prevent dispatch loop: do it once per signature
-      if (this._viewer2DInitKeyDone === key) return;
-      this._viewer2DInitKeyDone = key;
-      var payload = {
-        e: v.viewerWidth / 2 - v.SVGWidth / 2,
-        f: v.viewerHeight / 2 - v.SVGHeight / 2,
-        a: 0.99,
-        d: 0.99
-      };
-      viewer2DActions.updateViewer2D(payload);
-    }
   }, {
     key: "componentDidMount",
     value: function componentDidMount() {
-      var _extractedState$getIn2;
+      var _extractedState$getIn;
+      window.forRedo = [];
       var _this$props = this.props,
         catalog = _this$props.catalog,
         extractedState = _this$props.extractedState,
-        projectActions = _this$props.projectActions,
-        width = _this$props.width,
-        height = _this$props.height;
-
-      // init catalog once
-      var catalogReady = extractedState === null || extractedState === void 0 || (_extractedState$getIn2 = extractedState.getIn) === null || _extractedState$getIn2 === void 0 ? void 0 : _extractedState$getIn2.call(extractedState, ['catalog', 'ready']);
+        projectActions = _this$props.projectActions;
+      var catalogReady = extractedState === null || extractedState === void 0 || (_extractedState$getIn = extractedState.getIn) === null || _extractedState$getIn === void 0 ? void 0 : _extractedState$getIn.call(extractedState, ['catalog', 'ready']);
       if (!catalogReady && !this._catalogInitRequested) {
         this._catalogInitRequested = true;
-        console.log('[LiteKitchenConfigurator] initCatalog (mount)');
         projectActions.initCatalog(catalog);
       }
-
-      // viewer2D init (safe)
-      this.maybeInitViewer2D(extractedState, width, height);
     }
   }, {
     key: "componentDidUpdate",
     value: function componentDidUpdate(prevProps) {
-      var _this2 = this,
-        _extractedState$getIn3;
+      var _extractedState$getIn2;
       var _this$props2 = this.props,
         externalEvent = _this$props2.externalEvent,
         extractedState = _this$props2.extractedState,
         projectActions = _this$props2.projectActions,
-        catalog = _this$props2.catalog,
-        width = _this$props2.width,
-        height = _this$props2.height;
+        catalog = _this$props2.catalog;
 
-      // viewer2D init only when relevant inputs change
-      if (prevProps.extractedState !== extractedState || prevProps.width !== width || prevProps.height !== height) {
-        this.maybeInitViewer2D(extractedState, width, height);
-      }
-
-      // ---- (A) External event handling (defer OUTSIDE RAF) ----
+      // handle external event when it changes
       if (prevProps.externalEvent !== externalEvent && externalEvent) {
-        if (this._lastHandledExternalEvent === externalEvent) {
-          console.warn('[LiteKitchenConfigurator] externalEvent already handled (same ref), skipping');
-        } else if (this._handlingExternalEvent) {
-          console.warn('[LiteKitchenConfigurator] externalEvent handling already in progress, skipping');
-        } else {
-          this._lastHandledExternalEvent = externalEvent;
-          this._handlingExternalEvent = true;
-          var propsSnapshot = this.props;
-          var type = (externalEvent === null || externalEvent === void 0 ? void 0 : externalEvent.type) || 'unknown';
-          if (this._scheduledExternalEventTimeout) {
-            clearTimeout(this._scheduledExternalEventTimeout);
-            this._scheduledExternalEventTimeout = null;
-          }
-          this._scheduledExternalEventTimeout = setTimeout(function () {
-            _this2._scheduledExternalEventTimeout = null;
-            console.time("[handleExternalEvent] ".concat(type));
-            try {
-              handleExternalEvent(propsSnapshot);
-            } catch (e) {
-              console.error('[LiteKitchenConfigurator] handleExternalEvent crashed', e);
-            } finally {
-              console.timeEnd("[handleExternalEvent] ".concat(type));
-              _this2._handlingExternalEvent = false;
-            }
-          }, 0);
-        }
+        handleExternalEvent(this.props);
       }
-
-      // ---- (B) initCatalog: request once until ready ----
-      var catalogReady = extractedState === null || extractedState === void 0 || (_extractedState$getIn3 = extractedState.getIn) === null || _extractedState$getIn3 === void 0 ? void 0 : _extractedState$getIn3.call(extractedState, ['catalog', 'ready']);
+      var catalogReady = extractedState === null || extractedState === void 0 || (_extractedState$getIn2 = extractedState.getIn) === null || _extractedState$getIn2 === void 0 ? void 0 : _extractedState$getIn2.call(extractedState, ['catalog', 'ready']);
       if (catalogReady) {
-        if (this._catalogInitRequested) console.log('[LiteKitchenConfigurator] catalog ready');
-        this._catalogInitRequested = false;
-      } else {
-        if (!this._catalogInitRequested) {
-          this._catalogInitRequested = true;
-          console.log('[LiteKitchenConfigurator] initCatalog (update)');
-          projectActions.initCatalog(catalog);
-        }
+        this._catalogInitRequested = false; // allow re-init if state resets later
+      } else if (!this._catalogInitRequested) {
+        this._catalogInitRequested = true;
+        projectActions.initCatalog(catalog);
       }
     }
   }, {
-    key: "componentWillUnmount",
-    value: function componentWillUnmount() {
-      if (this._scheduledExternalEventTimeout) {
-        clearTimeout(this._scheduledExternalEventTimeout);
-        this._scheduledExternalEventTimeout = null;
-      }
+    key: "isProjectEmpty",
+    value: function isProjectEmpty(scene) {
+      var layers = scene.layers,
+        selectedLayer = scene.selectedLayer;
+      var layer = layers.get(selectedLayer);
+      return layer.areas.size + layer.lines.size + layer.holes.size + layer.items.size === 0;
     }
-
-    // ✅ IMPORTANT: do NOT mutate/merge redux state in render
   }, {
     key: "getExtractedStateWithViewer2DInit",
     value: function getExtractedStateWithViewer2DInit(extractedState, width, height) {
       if (!extractedState) return extractedState;
+
+      // ✅ If the extractedState reference changed, drop cache immediately.
       if (this._lastExtractedStateRef !== extractedState) {
         this._lastExtractedStateRef = extractedState;
         this._cachedViewer2DKey = null;
         this._cachedExtractedState = null;
       }
-      var viewer2D = extractedState.getIn(['viewer2D']);
-      if (!viewer2D || viewer2D.size <= 0) return extractedState;
-      var v = viewer2D.toJS();
-      if (!v) return extractedState;
-      if (v.e !== 0 || v.f !== 0) return extractedState;
-
-      // Keep cache (doesn't change state), mostly no-op now
-      var cacheKey = "".concat(width, ":").concat(height, ":").concat(v.viewerWidth, ":").concat(v.viewerHeight, ":").concat(v.SVGWidth, ":").concat(v.SVGHeight);
+      var _viewer2D = extractedState.getIn(['viewer2D']);
+      if (!_viewer2D || _viewer2D.size <= 0) return extractedState;
+      var e = _viewer2D.get('e');
+      var f = _viewer2D.get('f');
+      if (e !== 0 || f !== 0) return extractedState;
+      var viewerWidth = _viewer2D.get('viewerWidth');
+      var viewerHeight = _viewer2D.get('viewerHeight');
+      var SVGWidth = _viewer2D.get('SVGWidth');
+      var SVGHeight = _viewer2D.get('SVGHeight');
+      var cacheKey = "".concat(width, ":").concat(height, ":").concat(viewerWidth, ":").concat(viewerHeight, ":").concat(SVGWidth, ":").concat(SVGHeight);
       if (this._cachedViewer2DKey === cacheKey && this._cachedExtractedState) {
         return this._cachedExtractedState;
       }
+      var centeredViewer2D = _viewer2D.merge({
+        e: viewerWidth / 2 - SVGWidth / 2,
+        f: viewerHeight / 2 - SVGHeight / 2,
+        a: 0.99,
+        d: 0.99
+      });
+      var merged = extractedState.merge({
+        viewer2D: centeredViewer2D
+      });
       this._cachedViewer2DKey = cacheKey;
-      this._cachedExtractedState = extractedState;
-      return extractedState;
+      this._cachedExtractedState = merged;
+      return merged;
     }
   }, {
     key: "render",
     value: function render() {
-      var _this3 = this;
+      var _this2 = this;
       var _this$props3 = this.props,
         width = _this$props3.width,
         height = _this$props3.height,
@@ -454,12 +383,14 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
       var _this$state = this.state,
         savePopupVisible = _this$state.savePopupVisible,
         quotePopupVisible = _this$state.quotePopupVisible,
-        assistPopupVisible = _this$state.assistPopupVisible;
+        assistPopupVisible = _this$state.assistPopupVisible,
+        signOpen = _this$state.signOpen,
+        myProjectsOpen = _this$state.myProjectsOpen;
       var contentW = width - toolbarW;
       var contentH = height;
       var extracted = this.getExtractedStateWithViewer2DInit(extractedState, width, height);
       var ctxValue = _objectSpread(_objectSpread({}, objectsMap(actions, function (actionNamespace) {
-        return _this3.props[actionNamespace];
+        return _this2.props[actionNamespace];
       })), {}, {
         translator: this.props.translator,
         catalog: this.props.catalog
@@ -517,6 +448,7 @@ LiteKitchenConfigurator.propTypes = {
   configData: PropTypes.object,
   onInternalEvent: PropTypes.func,
   extractedState: PropTypes.object,
+  // ✅ injected by connect
   externalEvent: PropTypes.object
 };
 LiteKitchenConfigurator.defaultProps = {
@@ -530,6 +462,9 @@ LiteKitchenConfigurator.defaultProps = {
   customContents: {},
   configData: {}
 };
+
+// ✅ Only select the slice you actually use.
+// This preserves behavior but massively reduces rerenders.
 function mapStateToProps(reduxState, ownProps) {
   var stateExtractor = ownProps.stateExtractor || function (s) {
     return s;

package/es/LiteRenderer.js

@@ -25,6 +25,7 @@ import * as THREE from 'three';
 import * as Models from "./models";
 import { State } from "./models";
 import PlannerReducer from "./reducers/reducer";
+import AppContext from "./AppContext";
 import Catalog from "./catalog/catalog";
 import * as Areas from "./catalog/areas/area/planner-element";
 import * as Lines from "./catalog/lines/wall/planner-element";

package/es/actions/viewer2d-actions.js

@@ -1,4 +1,4 @@
-import { UPDATE_CEIL_HEIGHT_UNIT, UPDATE_CEIL_HEIGHT, UPDATE_2D_CAMERA, SELECT_TOOL_PAN, SELECT_TOOL_ZOOM_IN, SELECT_TOOL_ZOOM_OUT, CHANGE_WALL_LENGTH_MEASURE, CHANGE_BASE_CABINET_MEASURE, CHANGE_WALL_CABINET_MEASURE, CHANGE_WINDOW_DOOR_MEASURE, UPDATE_VIEWER2D } from "../constants";
+import { UPDATE_CEIL_HEIGHT_UNIT, UPDATE_CEIL_HEIGHT, UPDATE_2D_CAMERA, SELECT_TOOL_PAN, SELECT_TOOL_ZOOM_IN, SELECT_TOOL_ZOOM_OUT, CHANGE_WALL_LENGTH_MEASURE, CHANGE_BASE_CABINET_MEASURE, CHANGE_WALL_CABINET_MEASURE, CHANGE_WINDOW_DOOR_MEASURE } from "../constants";
 export function updateCeilHeight(value) {
   return {
     type: UPDATE_CEIL_HEIGHT,
@@ -55,10 +55,4 @@ export function selectToolZoomIn() {
   return {
     type: SELECT_TOOL_ZOOM_IN
   };
-}
-export function updateViewer2D(viewer2D) {
-  return {
-    type: UPDATE_VIEWER2D,
-    viewer2D: viewer2D
-  };
 }

package/es/constants.js

@@ -12,7 +12,6 @@ export var NEW_PROJECT = 'NEW_PROJECT';
 export var LOAD_PROJECT = 'LOAD_PROJECT';
 export var SAVE_PROJECT = 'SAVE_PROJECT';
 export var OPEN_CATALOG = 'OPEN_CATALOG';
-export var UPDATE_VIEWER2D = 'UPDATE_VIEWER2D';
 export var SELECT_TOOL_EDIT = 'SELECT_TOOL_EDIT';
 export var UNSELECT_ALL = 'UNSELECT_ALL';
 export var SELECT_ALL = 'SELECT_ALL';