kitchen-simulator 6.0.3-react.18 → 7.0.1-react-18

package/es/LiteKitchenConfigurator.js

@@ -75,7 +75,6 @@ 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);
@@ -299,10 +298,7 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
         extractedState = _this$props.extractedState,
         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;
-        projectActions.initCatalog(catalog);
-      }
+      if (!catalogReady) projectActions.initCatalog(catalog);
     }
   }, {
     key: "componentDidUpdate",
@@ -314,17 +310,12 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
         projectActions = _this$props2.projectActions,
         catalog = _this$props2.catalog;
 
-      // handle external event when it changes
-      if (prevProps.externalEvent !== externalEvent && externalEvent) {
+      // same behavior: handle external event when it changes
+      if (prevProps.externalEvent !== externalEvent) {
         handleExternalEvent(this.props);
       }
       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) {
-        this._catalogInitRequested = false; // allow re-init if state resets later
-      } else if (!this._catalogInitRequested) {
-        this._catalogInitRequested = true;
-        projectActions.initCatalog(catalog);
-      }
+      if (!catalogReady) projectActions.initCatalog(catalog);
     }
   }, {
     key: "isProjectEmpty",
@@ -347,20 +338,20 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
       }
       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);
+      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);
       if (this._cachedViewer2DKey === cacheKey && this._cachedExtractedState) {
         return this._cachedExtractedState;
       }
       var centeredViewer2D = _viewer2D.merge({
-        e: viewerWidth / 2 - SVGWidth / 2,
-        f: viewerHeight / 2 - SVGHeight / 2,
+        e: v.viewerWidth / 2 - v.SVGWidth / 2,
+        f: v.viewerHeight / 2 - v.SVGHeight / 2,
         a: 0.99,
         d: 0.99
       });

package/es/WorkSpace.js

@@ -1,7 +1,7 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import React, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import { Map } from 'immutable';
 import { useResizeDetector } from 'react-resize-detector';
 import projectItemsCatalog from "./mocks/projectItemsCatalog.json";
@@ -62,6 +62,13 @@ function WorkSpace(props) {
     _useState2 = _slicedToArray(_useState, 2),
     externalEvent = _useState2[0],
     setExternalEvent = _useState2[1];
+  useEffect(function () {
+    setExternalEvent({
+      type: EXTERNAL_EVENT_LOAD_PROJECT,
+      // send request for sync scene data to 3DTool
+      payload: JSON.parse(mockProps.projectElement[0].project_data)
+    });
+  }, []);
   var offset = 5;
   return /*#__PURE__*/React.createElement("div", {
     className: "flex gap-4"

package/es/index.js

@@ -5,71 +5,25 @@ import _possibleConstructorReturn from "@babel/runtime/helpers/esm/possibleConst
 import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
 import _inherits from "@babel/runtime/helpers/esm/inherits";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-// kitchen-simulator/index.js (or wherever renderKitchenSimulator lives)
 import React from 'react';
-import { createRoot } from 'react-dom/client';
-import LiteRenderer from "./LiteRenderer";
 import * as Three from 'three';
+import LiteRenderer from "./LiteRenderer";
+import { createRoot } from 'react-dom/client';
 var ROOT_KEY = '__kitchenSimulatorRoot__';
 var API_KEY = '__kitchenSimulatorApi__';
-function makeLogger(getEnabled) {
-  var prefix = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '[kitchen-simulator]';
-  var now = function now() {
-    return (typeof performance !== 'undefined' && performance.now ? performance.now() : Date.now()).toFixed(1);
-  };
-  var safe = function safe(v) {
-    try {
-      if (v == null) return v;
-      if (typeof v === 'string') return v;
-      if (typeof v === 'number' || typeof v === 'boolean') return v;
-      return JSON.stringify(v, function (k, val) {
-        if (k === 'children' || k === 'parent') return '[omitted]';
-        if (typeof val === 'function') return '[fn]';
-        return val;
-      });
-    } catch (_unused) {
-      return '[unserializable]';
-    }
-  };
-  var log = function log() {
-    var _console;
-    if (!getEnabled()) return;
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-    (_console = console).log.apply(_console, ["".concat(prefix, " ").concat(now(), "ms")].concat(_toConsumableArray(args.map(safe))));
-  };
-  var warn = function warn() {
-    var _console2;
-    if (!getEnabled()) return;
-    for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
-      args[_key2] = arguments[_key2];
-    }
-    (_console2 = console).warn.apply(_console2, ["".concat(prefix, " ").concat(now(), "ms")].concat(_toConsumableArray(args.map(safe))));
-  };
-  var error = function error() {
-    var _console3;
-    if (!getEnabled()) return;
-    for (var _len3 = arguments.length, args = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
-      args[_key3] = arguments[_key3];
-    }
-    (_console3 = console).error.apply(_console3, ["".concat(prefix, " ").concat(now(), "ms")].concat(_toConsumableArray(args.map(safe))));
-  };
-  return {
-    log: log,
-    warn: warn,
-    error: error
-  };
+function nextFrame() {
+  return new Promise(function (resolve) {
+    return requestAnimationFrame(resolve);
+  });
 }
 
-// ---- Your URL rewrite + TextureLoader patch stays as you had it ----
+// DIY-714 [Temp Fix] Rewrite API URLs
 var API_HOST_REGEX = /(https?:\/\/)?(api\.diydesignspace\.com|api\.addovisuals\.com|127\.0\.0\.1:4002)/;
 var API_HOST_REPLACEMENT = 'https://api-old.diydesignspace.com';
 function rewriteApiUrl(url) {
@@ -134,7 +88,7 @@ function installGltfTracker() {
       var s = typeof url === 'string' ? url : (_url$toString = url === null || url === void 0 || (_url$toString2 = url.toString) === null || _url$toString2 === void 0 ? void 0 : _url$toString2.call(url)) !== null && _url$toString !== void 0 ? _url$toString : '';
       var u = s.toLowerCase().split('?')[0]; // ignore cache params
       return u.endsWith('.gltf') || u.endsWith('.glb') || u.endsWith('.bin') || u.endsWith('.ktx2') || u.endsWith('.hdr') || u.endsWith('.exr') || u.endsWith('.png') || u.endsWith('.jpg') || u.endsWith('.jpeg') || u.endsWith('.webp');
-    } catch (_unused2) {
+    } catch (_unused) {
       return false;
     }
   };
@@ -171,8 +125,8 @@ function installGltfTracker() {
       XHR.prototype.open = function (method, url) {
         var _g$originalOpen;
         this.__is3dAssetRequest = is3dAssetUrl(url);
-        for (var _len4 = arguments.length, rest = new Array(_len4 > 2 ? _len4 - 2 : 0), _key4 = 2; _key4 < _len4; _key4++) {
-          rest[_key4 - 2] = arguments[_key4];
+        for (var _len = arguments.length, rest = new Array(_len > 2 ? _len - 2 : 0), _key = 2; _key < _len; _key++) {
+          rest[_key - 2] = arguments[_key];
         }
         return (_g$originalOpen = g.originalOpen).call.apply(_g$originalOpen, [this, method, url].concat(rest));
       };
@@ -195,8 +149,8 @@ function installGltfTracker() {
           this.addEventListener('abort', _done);
           this.addEventListener('timeout', _done);
         }
-        for (var _len5 = arguments.length, args = new Array(_len5), _key5 = 0; _key5 < _len5; _key5++) {
-          args[_key5] = arguments[_key5];
+        for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+          args[_key2] = arguments[_key2];
         }
         return g.originalSend.apply(this, args);
       };
@@ -206,9 +160,9 @@ function installGltfTracker() {
     g.originalFetch = window.fetch;
     if (typeof g.originalFetch === 'function') {
       window.fetch = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-        var _len6,
+        var _len3,
           args,
-          _key6,
+          _key3,
           input,
           init,
           newUrl,
@@ -217,8 +171,8 @@ function installGltfTracker() {
         return _regeneratorRuntime.wrap(function (_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              for (_len6 = _args2.length, args = new Array(_len6), _key6 = 0; _key6 < _len6; _key6++) {
-                args[_key6] = _args2[_key6];
+              for (_len3 = _args2.length, args = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
+                args[_key3] = _args2[_key3];
               }
               input = args[0], init = args[1]; // DIY-714 [Temp Fix] Rewrite API URLs
               if (typeof input === 'string') {
@@ -404,104 +358,96 @@ export function renderKitchenSimulator(container) {
   var _props$framesPerEvent, _props$waitForGltfIdl, _props$gltfTimeoutMs;
   var props = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   if (!container) throw new Error('renderKitchenSimulator: container is required');
-  var DEBUG_KEY = '__kitchenSimulatorDebug__';
-  var debugEnabled = !!props.debug || typeof window !== 'undefined' && !!window[DEBUG_KEY];
-  var _makeLogger = makeLogger(function () {
-      return debugEnabled;
-    }),
-    log = _makeLogger.log,
-    warn = _makeLogger.warn,
-    error = _makeLogger.error;
 
   // ✅ Reuse existing API
   if (container[API_KEY]) {
     var _container$API_KEY$__, _container$API_KEY;
-    log('Reusing existing API; calling __render with new props');
     (_container$API_KEY$__ = (_container$API_KEY = container[API_KEY]).__render) === null || _container$API_KEY$__ === void 0 || _container$API_KEY$__.call(_container$API_KEY, props);
     return container[API_KEY];
   }
 
-  // ✅ Root
+  // ✅ Reuse root
   var root = container[ROOT_KEY];
   if (!root) {
     root = createRoot(container);
     container[ROOT_KEY] = root;
-    log('Created new React root');
   }
   var setExternalEventFn = null;
   var destroyed = false;
+  var resolveReady = null;
+  var readyPromise = new Promise(function (res) {
+    return resolveReady = res;
+  });
   var queue = [];
   var pendingMarkers = new Set();
   var MARKER = Symbol('marker');
+  var gltfTracker = installGltfTracker();
 
-  // ✅ keep your tracker
-  var gltfTracker = installGltfTracker(debugEnabled);
+  // FAST defaults (safe)
   var defaultFramesPerEvent = (_props$framesPerEvent = props.framesPerEvent) !== null && _props$framesPerEvent !== void 0 ? _props$framesPerEvent : 1;
   var waitForAssets = (_props$waitForGltfIdl = props.waitForGltfIdleAfterEachEvent) !== null && _props$waitForGltfIdl !== void 0 ? _props$waitForGltfIdl : true;
   var defaultTimeout = (_props$gltfTimeoutMs = props.gltfTimeoutMs) !== null && _props$gltfTimeoutMs !== void 0 ? _props$gltfTimeoutMs : 30000;
-  var draining = false;
 
-  // ---- Ready gate: mounted & setExternalEventFn installed ----
-  var readyResolve = null;
-  var readyReject = null;
-  var readyPromise = new Promise(function (res, rej) {
-    readyResolve = res;
-    readyReject = rej;
-  });
+  // If you want ultra-fast UI responsiveness, you can disable waiting per-event
+  // and only wait on “important” events, see comment in settle() below.
 
-  // ---- Catalog-ready gate (NEW) ----
-  var catalogReadyResolve = null;
-  var catalogReadyPromise = new Promise(function (res) {
-    catalogReadyResolve = res;
-  });
-  var catalogReady = false;
-  function nextFrame() {
-    return new Promise(function (resolve) {
-      return requestAnimationFrame(resolve);
-    });
+  var draining = false;
+  function isSyncScene(ev) {
+    var _ev$payload;
+    return (ev === null || ev === void 0 ? void 0 : ev.type) === 'EXTERNAL_EVENT_SYNC_SCENE' || (ev === null || ev === void 0 || (_ev$payload = ev.payload) === null || _ev$payload === void 0 ? void 0 : _ev$payload.mode) === 'sync-scene' || (ev === null || ev === void 0 ? void 0 : ev.__sync) === true;
   }
   function settle(_x2) {
     return _settle.apply(this, arguments);
   }
   function _settle() {
-    _settle = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee8(ev) {
-      var _ev$framesPerEvent, _ev$waitForGltfIdleAf, _ev$gltfTimeoutMs;
-      var frames, shouldWait, timeoutMs, i;
-      return _regeneratorRuntime.wrap(function (_context8) {
-        while (1) switch (_context8.prev = _context8.next) {
+    _settle = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee7(ev) {
+      var _ev$framesPerEvent, _ev$waitForGltfIdleAf;
+      var frames, i, shouldWait, _ev$gltfTimeoutMs, timeoutMs;
+      return _regeneratorRuntime.wrap(function (_context7) {
+        while (1) switch (_context7.prev = _context7.next) {
           case 0:
-            frames = (_ev$framesPerEvent = ev === null || ev === void 0 ? void 0 : ev.framesPerEvent) !== null && _ev$framesPerEvent !== void 0 ? _ev$framesPerEvent : defaultFramesPerEvent;
-            shouldWait = (_ev$waitForGltfIdleAf = ev === null || ev === void 0 ? void 0 : ev.waitForGltfIdleAfterEachEvent) !== null && _ev$waitForGltfIdleAf !== void 0 ? _ev$waitForGltfIdleAf : waitForAssets;
-            timeoutMs = (_ev$gltfTimeoutMs = ev === null || ev === void 0 ? void 0 : ev.gltfTimeoutMs) !== null && _ev$gltfTimeoutMs !== void 0 ? _ev$gltfTimeoutMs : defaultTimeout; // RAF frames
+            frames = (_ev$framesPerEvent = ev === null || ev === void 0 ? void 0 : ev.framesPerEvent) !== null && _ev$framesPerEvent !== void 0 ? _ev$framesPerEvent : defaultFramesPerEvent; // (1) allow react/reducers to run (fixes “must zoom to see updates”)
             i = 0;
           case 1:
             if (!(i < frames)) {
-              _context8.next = 3;
+              _context7.next = 3;
               break;
             }
-            _context8.next = 2;
+            _context7.next = 2;
             return nextFrame();
           case 2:
-            i++;
-            _context8.next = 1;
+            i += 1;
+            _context7.next = 1;
             break;
           case 3:
+            // (2) optionally wait for assets
+            // fastest safe approach: keep ON for events that add/replace/load models
+            // You can override per-event via ev.waitForGltfIdleAfterEachEvent = false
+            shouldWait = (_ev$waitForGltfIdleAf = ev === null || ev === void 0 ? void 0 : ev.waitForGltfIdleAfterEachEvent) !== null && _ev$waitForGltfIdleAf !== void 0 ? _ev$waitForGltfIdleAf : waitForAssets;
             if (!shouldWait) {
-              _context8.next = 4;
+              _context7.next = 4;
               break;
             }
-            _context8.next = 4;
+            timeoutMs = (_ev$gltfTimeoutMs = ev === null || ev === void 0 ? void 0 : ev.gltfTimeoutMs) !== null && _ev$gltfTimeoutMs !== void 0 ? _ev$gltfTimeoutMs : defaultTimeout;
+            _context7.next = 4;
             return gltfTracker.waitForIdle({
               timeoutMs: timeoutMs
             });
           case 4:
-            _context8.next = 5;
+            _context7.next = 5;
             return nextFrame();
           case 5:
+            if (!isSyncScene(ev)) {
+              _context7.next = 6;
+              break;
+            }
+            _context7.next = 6;
+            return nextFrame();
+          case 6:
           case "end":
-            return _context8.stop();
+            return _context7.stop();
         }
-      }, _callee8);
+      }, _callee7);
     }));
     return _settle.apply(this, arguments);
   }
@@ -509,69 +455,66 @@ export function renderKitchenSimulator(container) {
     return _drain.apply(this, arguments);
   }
   function _drain() {
-    _drain = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee9() {
-      var item, _err$message, _t;
-      return _regeneratorRuntime.wrap(function (_context9) {
-        while (1) switch (_context9.prev = _context9.next) {
+    _drain = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee8() {
+      var item, _t;
+      return _regeneratorRuntime.wrap(function (_context8) {
+        while (1) switch (_context8.prev = _context8.next) {
           case 0:
             if (!(draining || destroyed)) {
-              _context9.next = 1;
+              _context8.next = 1;
               break;
             }
-            return _context9.abrupt("return");
+            return _context8.abrupt("return");
           case 1:
             draining = true;
-            _context9.prev = 2;
-            _context9.next = 3;
-            return readyPromise;
+            _context8.prev = 2;
           case 3:
             if (!(!destroyed && queue.length)) {
-              _context9.next = 10;
+              _context8.next = 10;
               break;
             }
             if (setExternalEventFn) {
-              _context9.next = 5;
+              _context8.next = 5;
               break;
             }
-            _context9.next = 4;
+            _context8.next = 4;
             return nextFrame();
           case 4:
-            return _context9.abrupt("continue", 3);
+            return _context8.abrupt("continue", 3);
           case 5:
             item = queue.shift();
             if (!(item && item.__marker === MARKER)) {
-              _context9.next = 6;
+              _context8.next = 6;
               break;
             }
             pendingMarkers["delete"](item.token);
-            return _context9.abrupt("continue", 3);
+            return _context8.abrupt("continue", 3);
           case 6:
-            _context9.prev = 6;
+            _context8.prev = 6;
             setExternalEventFn(item);
-            _context9.next = 7;
+            _context8.next = 7;
             return settle(item);
           case 7:
-            _context9.next = 9;
+            _context8.next = 9;
             break;
           case 8:
-            _context9.prev = 8;
-            _t = _context9["catch"](6);
-            error('drain:event failed', {
-              err: (_err$message = _t === null || _t === void 0 ? void 0 : _t.message) !== null && _err$message !== void 0 ? _err$message : _t,
-              type: item === null || item === void 0 ? void 0 : item.type
-            });
+            _context8.prev = 8;
+            _t = _context8["catch"](6);
+            console.error('[kitchen-simulator] event failed:', item, _t);
+            // IMPORTANT: continue so we can eventually consume the marker
+            // Optionally you can decide to clear remaining queue here.
           case 9:
-            _context9.next = 3;
+            _context8.next = 3;
             break;
           case 10:
-            _context9.prev = 10;
+            _context8.prev = 10;
             draining = false;
-            return _context9.finish(10);
+            return _context8.finish(10);
           case 11:
           case "end":
-            return _context9.stop();
+            return _context8.stop();
         }
-      }, _callee9, null, [[2,, 10, 11], [6, 8]]);
+      }, _callee8, null, [[2,, 10, 11], [6, 8]]);
     }));
     return _drain.apply(this, arguments);
   }
@@ -590,64 +533,29 @@ export function renderKitchenSimulator(container) {
     return _createClass(Wrapper, [{
       key: "componentDidMount",
       value: function componentDidMount() {
-        var _this3 = this;
+        var _this3 = this,
+          _resolveReady;
         this._mounted = true;
-        log('Wrapper mounted -> ready');
         setExternalEventFn = function setExternalEventFn(newEvent) {
           if (!_this3._mounted) return;
           _this3.setState({
             externalEvent: newEvent
           });
         };
-        if (readyResolve) {
-          readyResolve(true);
-          readyResolve = null;
-        }
+        (_resolveReady = resolveReady) === null || _resolveReady === void 0 || _resolveReady();
+        resolveReady = null;
+        drain(); // now it can actually process queued events
       }
     }, {
       key: "componentWillUnmount",
       value: function componentWillUnmount() {
         this._mounted = false;
         setExternalEventFn = null;
-        if (readyReject) {
-          readyReject(new Error('Wrapper unmounted before ready'));
-          readyReject = null;
-        }
       }
     }, {
       key: "render",
       value: function render() {
-        var userOnInternalEvent = this.props.onInternalEvent;
-
-        // ✅ Wrap internal event to detect catalog readiness
-        var onInternalEventWrapped = /*#__PURE__*/function () {
-          var _ref5 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee6(evt, callback) {
-            return _regeneratorRuntime.wrap(function (_context6) {
-              while (1) switch (_context6.prev = _context6.next) {
-                case 0:
-                  // IMPORTANT: first time we see INTERNAL_EVENT_ITEMS_CATALOG,
-                  // it means catalog init path ran and tool is requesting items.
-                  if (!catalogReady && (evt === null || evt === void 0 ? void 0 : evt.type) === 'INTERNAL_EVENT_ITEMS_CATALOG') {
-                    catalogReady = true;
-                    if (catalogReadyResolve) {
-                      catalogReadyResolve(true);
-                      catalogReadyResolve = null;
-                    }
-                    log('Catalog is ready (observed INTERNAL_EVENT_ITEMS_CATALOG)');
-                  }
-                  return _context6.abrupt("return", userOnInternalEvent === null || userOnInternalEvent === void 0 ? void 0 : userOnInternalEvent(evt, callback));
-                case 1:
-                case "end":
-                  return _context6.stop();
-              }
-            }, _callee6);
-          }));
-          return function onInternalEventWrapped(_x3, _x4) {
-            return _ref5.apply(this, arguments);
-          };
-        }();
         return /*#__PURE__*/React.createElement(LiteRenderer, _extends({}, this.props, {
-          onInternalEvent: onInternalEventWrapped,
           externalEvent: this.state.externalEvent
         }));
       }
@@ -657,26 +565,22 @@ export function renderKitchenSimulator(container) {
     __render: function __render(nextProps) {
       root.render(/*#__PURE__*/React.createElement(Wrapper, nextProps));
     },
-    // ✅ Host can await mount
     whenReady: function whenReady() {
       return readyPromise;
     },
-    // ✅ Host can await catalog init (NEW)
-    whenCatalogReady: function whenCatalogReady() {
-      return catalogReadyPromise;
-    },
+    // ✅ host can query current inFlight
     getGltfInFlight: function getGltfInFlight() {
       return gltfTracker.getInFlight();
     },
+    // ✅ host can subscribe to inFlight changes (loader)
     subscribeGltfInFlight: function subscribeGltfInFlight(cb) {
       return gltfTracker.subscribe(cb);
     },
     sendExternalEvents: function sendExternalEvents(eventOrEvents) {
-      var _ref6 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
-        _ref6$timeoutMs = _ref6.timeoutMs,
-        timeoutMs = _ref6$timeoutMs === void 0 ? 60000 : _ref6$timeoutMs;
+      var _ref5 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
+        _ref5$timeoutMs = _ref5.timeoutMs,
+        timeoutMs = _ref5$timeoutMs === void 0 ? 60000 : _ref5$timeoutMs;
       var events = Array.isArray(eventOrEvents) ? eventOrEvents : [eventOrEvents];
-      var token = Symbol('batch');
       var _iterator2 = _createForOfIteratorHelper(events),
         _step2;
       try {
@@ -689,69 +593,85 @@ export function renderKitchenSimulator(container) {
       } finally {
         _iterator2.f();
       }
+      var token = Symbol('batch');
       pendingMarkers.add(token);
       queue.push({
         __marker: MARKER,
         token: token
       });
-      drain();
+      if (setExternalEventFn) drain();
+
+      // resolve when marker cleared
       return new Promise(function (resolve) {
         var start = Date.now();
         var check = /*#__PURE__*/function () {
-          var _ref7 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee7() {
-            return _regeneratorRuntime.wrap(function (_context7) {
-              while (1) switch (_context7.prev = _context7.next) {
+          var _ref6 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee6() {
+            return _regeneratorRuntime.wrap(function (_context6) {
+              while (1) switch (_context6.prev = _context6.next) {
                 case 0:
                   if (destroyed) {
-                    _context7.next = 4;
+                    _context6.next = 4;
                     break;
                   }
                   if (pendingMarkers.has(token)) {
-                    _context7.next = 1;
+                    _context6.next = 1;
                     break;
                   }
                   resolve(true);
-                  return _context7.abrupt("return");
+                  return _context6.abrupt("return");
                 case 1:
                   if (!(Date.now() - start > timeoutMs)) {
-                    _context7.next = 2;
+                    _context6.next = 2;
                     break;
                   }
-                  error('sendExternalEvents timed out', {
-                    timeoutMs: timeoutMs
-                  });
+                  console.error('[kitchen-simulator] sendExternalEvents timed out');
                   pendingMarkers["delete"](token); // fail-open
                   resolve(false);
-                  return _context7.abrupt("return");
+                  return _context6.abrupt("return");
                 case 2:
-                  _context7.next = 3;
+                  _context6.next = 3;
                   return nextFrame();
                 case 3:
-                  _context7.next = 0;
+                  _context6.next = 0;
                   break;
                 case 4:
                   resolve(false);
                 case 5:
                 case "end":
-                  return _context7.stop();
+                  return _context6.stop();
               }
-            }, _callee7);
+            }, _callee6);
           }));
           return function check() {
-            return _ref7.apply(this, arguments);
+            return _ref6.apply(this, arguments);
           };
         }();
         check();
       });
     },
-    unmount: function unmount() {
-      destroyed = true;
+    updateExternalEvent: function updateExternalEvent(e) {
+      return api.sendExternalEvents(e);
+    },
+    clearQueue: function clearQueue() {
       queue.length = 0;
       pendingMarkers.clear();
+    },
+    unmount: function unmount() {
+      var _resolveReady2;
+      destroyed = true;
+      api.clearQueue();
       gltfTracker.uninstall();
-      root.unmount();
-      container[ROOT_KEY] = null;
-      container[API_KEY] = null;
+      (_resolveReady2 = resolveReady) === null || _resolveReady2 === void 0 || _resolveReady2();
+      resolveReady = null;
+      var doUnmount = function doUnmount() {
+        try {
+          root.unmount();
+        } finally {
+          container[ROOT_KEY] = null;
+          container[API_KEY] = null;
+        }
+      };
+      if (typeof queueMicrotask === 'function') queueMicrotask(doUnmount);else setTimeout(doUnmount, 0);
     }
   };
   api.__render(props);

package/es/reducers/items-reducer.js

@@ -23,6 +23,9 @@ export default function (state, action) {
     case UPDATE_POPUP_OPEN:
       return Item.updatePopupOpen(state, action.value).updatedState;
     case SELECT_ITEM:
+      state = state.merge({
+        sceneHistory: history.historyPush(state.sceneHistory, state.scene)
+      });
       return Item.select(state, action.layerID, action.itemID).updatedState;
     case SELECT_TOOL_DRAWING_ITEM:
       state = state.merge({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kitchen-simulator",
-  "version": "6.0.3-react.18",
+  "version": "7.0.1-react-18",
   "description": "It is a kitchen simulator (self-contained micro-frontend).",
   "license": "MIT",
   "module": "es/index.js",