kitchen-simulator 3.16.1-test-renderer-fix → 3.16.2-test-renderer-fix

package/es/LiteKitchenConfigurator.js

@@ -122,6 +122,7 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
     _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;
@@ -370,32 +371,38 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
     key: "getExtractedStateWithViewer2DInit",
     value: function getExtractedStateWithViewer2DInit(extractedState, width, height) {
       if (!extractedState) return extractedState;
-      var _scene = extractedState.getIn(['scene']);
-      var len = convert(_scene.width).from(_scene.unit).to('cm');
+
+      // ✅ 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();
-      var cacheKey = "".concat(width, ":").concat(height, ":").concat(len, ":").concat(v.e, ":").concat(v.f, ":").concat(v.viewerWidth, ":").concat(v.viewerHeight, ":").concat(v.SVGWidth, ":").concat(v.SVGHeight, ":").concat(v.a, ":").concat(v.d);
+
+      // 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);
       if (this._cachedViewer2DKey === cacheKey && this._cachedExtractedState) {
         return this._cachedExtractedState;
       }
-      if (v.e === 0 && v.f === 0) {
-        _viewer2D = _viewer2D.merge({
-          e: v.viewerWidth / 2 - v.SVGWidth / 2,
-          f: v.viewerHeight / 2 - v.SVGHeight / 2,
-          a: 0.99,
-          d: 0.99
-        });
-        var merged = extractedState.merge({
-          viewer2D: _viewer2D
-        });
-        this._cachedViewer2DKey = cacheKey;
-        this._cachedExtractedState = merged;
-        return merged;
-      }
+      var centeredViewer2D = _viewer2D.merge({
+        e: v.viewerWidth / 2 - v.SVGWidth / 2,
+        f: v.viewerHeight / 2 - v.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",
@@ -499,7 +506,8 @@ function mapStateToProps(reduxState, ownProps) {
   };
   var extractedState = stateExtractor(reduxState);
   return {
-    extractedState: extractedState
+    extractedState: extractedState,
+    state: extractedState
   };
 }
 function mapDispatchToProps(dispatch) {

package/lib/LiteKitchenConfigurator.js

@@ -130,6 +130,7 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
     _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;
@@ -378,32 +379,38 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
     key: "getExtractedStateWithViewer2DInit",
     value: function getExtractedStateWithViewer2DInit(extractedState, width, height) {
       if (!extractedState) return extractedState;
-      var _scene = extractedState.getIn(['scene']);
-      var len = (0, _convertUnitsLite.convert)(_scene.width).from(_scene.unit).to('cm');
+
+      // ✅ 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();
-      var cacheKey = "".concat(width, ":").concat(height, ":").concat(len, ":").concat(v.e, ":").concat(v.f, ":").concat(v.viewerWidth, ":").concat(v.viewerHeight, ":").concat(v.SVGWidth, ":").concat(v.SVGHeight, ":").concat(v.a, ":").concat(v.d);
+
+      // 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);
       if (this._cachedViewer2DKey === cacheKey && this._cachedExtractedState) {
         return this._cachedExtractedState;
       }
-      if (v.e === 0 && v.f === 0) {
-        _viewer2D = _viewer2D.merge({
-          e: v.viewerWidth / 2 - v.SVGWidth / 2,
-          f: v.viewerHeight / 2 - v.SVGHeight / 2,
-          a: 0.99,
-          d: 0.99
-        });
-        var merged = extractedState.merge({
-          viewer2D: _viewer2D
-        });
-        this._cachedViewer2DKey = cacheKey;
-        this._cachedExtractedState = merged;
-        return merged;
-      }
+      var centeredViewer2D = _viewer2D.merge({
+        e: v.viewerWidth / 2 - v.SVGWidth / 2,
+        f: v.viewerHeight / 2 - v.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",
@@ -507,7 +514,8 @@ function mapStateToProps(reduxState, ownProps) {
   };
   var extractedState = stateExtractor(reduxState);
   return {
-    extractedState: extractedState
+    extractedState: extractedState,
+    state: extractedState
   };
 }
 function mapDispatchToProps(dispatch) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kitchen-simulator",
-  "version": "3.16.1-test-renderer-fix",
+  "version": "3.16.2-test-renderer-fix",
   "description": "It is a kitchen simulator (self-contained micro-frontend).",
   "license": "MIT",
   "main": "lib/index.js",