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

package/es/LiteKitchenConfigurator.js

@@ -43,10 +43,6 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
     var _this;
     _classCallCheck(this, LiteKitchenConfigurator);
     _this = _callSuper(this, LiteKitchenConfigurator, [props]);
-    _this._catalogInitRequested = false;
-    _this._lastHandledExternalEvent = null;
-    _this._handlingExternalEvent = false;
-    _this._scheduledExternalEventRaf = null;
     _this.state = {
       savePopupVisible: false,
       quotePopupVisible: false,
@@ -79,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);
@@ -296,6 +293,7 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
     key: "componentDidMount",
     value: function componentDidMount() {
       var _extractedState$getIn;
+      window.forRedo = [];
       var _this$props = this.props,
         catalog = _this$props.catalog,
         extractedState = _this$props.extractedState,
@@ -303,86 +301,29 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
       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);
       }
     }
   }, {
     key: "componentDidUpdate",
     value: function componentDidUpdate(prevProps) {
-      var _extractedState$getIn2,
-        _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;
-      var viewer2D = extractedState === null || extractedState === void 0 || (_extractedState$getIn2 = extractedState.getIn) === null || _extractedState$getIn2 === void 0 ? void 0 : _extractedState$getIn2.call(extractedState, ['viewer2D']);
-      if (viewer2D) {
-        var v = viewer2D.toJS();
-        if (v.e === 0 && v.f === 0) {
-          projectActions.updateViewer2D({
-            e: v.viewerWidth / 2 - v.SVGWidth / 2,
-            f: v.viewerHeight / 2 - v.SVGHeight / 2,
-            a: 0.99,
-            d: 0.99
-          });
-        }
-      }
 
-      // ---- (A) External event handling (snapshot + defer) ----
+      // 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;
-
-          // capture props snapshot corresponding to this event
-          var propsSnapshot = this.props;
-          var type = (externalEvent === null || externalEvent === void 0 ? void 0 : externalEvent.type) || 'unknown';
-          if (this._scheduledExternalEventRaf) {
-            clearTimeout(this._scheduledExternalEventRaf);
-            this._scheduledExternalEventRaf = null;
-          }
-          this._scheduledExternalEventRaf = setTimeout(function () {
-            _this2._scheduledExternalEventRaf = 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);
-        }
-      }
-    }
-  }, {
-    key: "componentWillUnmount",
-    value: function componentWillUnmount() {
-      // cleanup scheduled external event
-      if (this._scheduledExternalEventRaf) {
-        cancelAnimationFrame(this._scheduledExternalEventRaf);
-        this._scheduledExternalEventRaf = null;
+        this._catalogInitRequested = false; // allow re-init if state resets later
+      } else if (!this._catalogInitRequested) {
+        this._catalogInitRequested = true;
+        projectActions.initCatalog(catalog);
       }
     }
   }, {
@@ -406,25 +347,34 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
       }
       var _viewer2D = extractedState.getIn(['viewer2D']);
       if (!_viewer2D || _viewer2D.size <= 0) return extractedState;
-      var v = _viewer2D.toJS();
-
-      // Only do the "center viewer2D if e/f are zero" logic.
-      // ✅ No need to build keys from unrelated parts of state.
-      if (v.e !== 0 || v.f !== 0) return extractedState;
-
-      // Build a cache key ONLY for this viewer2D-centering computation.
-      var cacheKey = "".concat(width, ":").concat(height, ":").concat(v.viewerWidth, ":").concat(v.viewerHeight, ":").concat(v.SVGWidth, ":").concat(v.SVGHeight);
+      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,
@@ -440,7 +390,7 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
       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