kitchen-simulator 5.10.6-react.18 → 5.10.8-react.18

package/es/LiteKitchenConfigurator.js

@@ -43,6 +43,7 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
     var _this;
     _classCallCheck(this, LiteKitchenConfigurator);
     _this = _callSuper(this, LiteKitchenConfigurator, [props]);
+    _this._catalogInitStarted = false;
     _this.state = {
       savePopupVisible: false,
       quotePopupVisible: false,
@@ -289,33 +290,33 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
       if (el !== null && el !== void 0 && (_el$parentElement0 = el.parentElement) !== null && _el$parentElement0 !== void 0 && _el$parentElement0.parentElement) el.parentElement.parentElement.style.zIndex = 6;
     }
   }, {
-    key: "componentDidMount",
-    value: function componentDidMount() {
+    key: "ensureCatalogReady",
+    value: function ensureCatalogReady() {
       var _extractedState$getIn;
-      window.forRedo = [];
       var _this$props = this.props,
         catalog = _this$props.catalog,
         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) projectActions.initCatalog(catalog);
+      var ready = extractedState === null || extractedState === void 0 || (_extractedState$getIn = extractedState.getIn) === null || _extractedState$getIn === void 0 ? void 0 : _extractedState$getIn.call(extractedState, ['catalog', 'ready']);
+      if (ready) return;
+      if (this._catalogInitStarted) return; // ✅ prevent repeated init storms
+      this._catalogInitStarted = true;
+      projectActions.initCatalog(catalog);
+    }
+  }, {
+    key: "componentDidMount",
+    value: function componentDidMount() {
+      window.forRedo = [];
+      if (this.props.externalEvent) handleExternalEvent(this.props);
+      this.ensureCatalogReady();
     }
   }, {
     key: "componentDidUpdate",
     value: function componentDidUpdate(prevProps) {
-      var _extractedState$getIn2;
-      var _this$props2 = this.props,
-        externalEvent = _this$props2.externalEvent,
-        extractedState = _this$props2.extractedState,
-        projectActions = _this$props2.projectActions,
-        catalog = _this$props2.catalog;
-
-      // same behavior: handle external event when it changes
-      if (prevProps.externalEvent !== externalEvent) {
+      if (prevProps.externalEvent !== this.props.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) projectActions.initCatalog(catalog);
+      this.ensureCatalogReady();
     }
   }, {
     key: "isProjectEmpty",
@@ -366,11 +367,11 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
     key: "render",
     value: function render() {
       var _this2 = this;
-      var _this$props3 = this.props,
-        width = _this$props3.width,
-        height = _this$props3.height,
-        extractedState = _this$props3.extractedState,
-        props = _objectWithoutProperties(_this$props3, _excluded);
+      var _this$props2 = this.props,
+        width = _this$props2.width,
+        height = _this$props2.height,
+        extractedState = _this$props2.extractedState,
+        props = _objectWithoutProperties(_this$props2, _excluded);
       var _this$state = this.state,
         savePopupVisible = _this$state.savePopupVisible,
         quotePopupVisible = _this$state.quotePopupVisible,

package/es/components/viewer2d/viewer2d.js

@@ -218,7 +218,6 @@ export default function Viewer2D(_ref) {
     var moveX = topX + (bottomX - topX) / 2;
     var moveY = 2000 - (bottomY + (topY - bottomY) / 2);
     var zoom = viewer2DState && !viewer2DState.isEmpty() ? viewer2DState.get('a') : 1;
-    console.log('aici');
     Viewer.current.setPointOnViewerCenter(moveX, moveY, zoom);
   }, [viewerReady, state.scene.selectedLayer]);
   var layerID = scene.selectedLayer;

package/es/index.js

@@ -140,14 +140,8 @@ function installGltfTracker() {
             if (g.inFlight < 0) g.inFlight = 0;
             notify();
             _this.removeEventListener('loadend', _done);
-            _this.removeEventListener('error', _done);
-            _this.removeEventListener('abort', _done);
-            _this.removeEventListener('timeout', _done);
           };
           this.addEventListener('loadend', _done);
-          this.addEventListener('error', _done);
-          this.addEventListener('abort', _done);
-          this.addEventListener('timeout', _done);
         }
         for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
           args[_key2] = arguments[_key2];
@@ -246,11 +240,13 @@ function installGltfTracker() {
       var _ref3,
         _ref3$timeoutMs,
         timeoutMs,
+        start,
         _args4 = arguments;
       return _regeneratorRuntime.wrap(function (_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
             _ref3 = _args4.length > 0 && _args4[0] !== undefined ? _args4[0] : {}, _ref3$timeoutMs = _ref3.timeoutMs, timeoutMs = _ref3$timeoutMs === void 0 ? 30000 : _ref3$timeoutMs;
+            start = Date.now();
             _context4.next = 1;
             return waitStableIdle2Frames();
           case 1:
@@ -262,50 +258,38 @@ function installGltfTracker() {
           case 2:
             return _context4.abrupt("return", new Promise(function (resolve, reject) {
               var unsub = null;
-              var finished = false;
-              var finishOk = function finishOk() {
-                if (finished) return;
-                finished = true;
-                if (unsub) unsub();
-                clearTimeout(timer);
-                resolve(true);
-              };
-              var finishErr = function finishErr(err) {
-                if (finished) return;
-                finished = true;
-                if (unsub) unsub();
-                clearTimeout(timer);
-                reject(err);
-              };
-
-              // ✅ Real timeout no matter what happens with inFlight changes
-              var timer = setTimeout(function () {
-                finishErr(new Error('3D assets did not become idle within timeout'));
-              }, timeoutMs);
               var onChange = /*#__PURE__*/function () {
                 var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee3(count) {
                   var stable;
                   return _regeneratorRuntime.wrap(function (_context3) {
                     while (1) switch (_context3.prev = _context3.next) {
                       case 0:
-                        if (!finished) {
+                        if (!(count !== 0)) {
                           _context3.next = 1;
                           break;
                         }
+                        if (Date.now() - start > timeoutMs) {
+                          if (unsub) unsub();
+                          reject(new Error('3D assets did not become idle within timeout'));
+                        }
                         return _context3.abrupt("return");
                       case 1:
-                        if (!(count !== 0)) {
-                          _context3.next = 2;
+                        _context3.next = 2;
+                        return waitStableIdle2Frames();
+                      case 2:
+                        stable = _context3.sent;
+                        if (!stable) {
+                          _context3.next = 3;
                           break;
                         }
+                        if (unsub) unsub();
+                        resolve(true);
                         return _context3.abrupt("return");
-                      case 2:
-                        _context3.next = 3;
-                        return waitStableIdle2Frames();
                       case 3:
-                        stable = _context3.sent;
-                        if (stable) finishOk();
-                        // else keep waiting
+                        if (Date.now() - start > timeoutMs) {
+                          if (unsub) unsub();
+                          reject(new Error('3D assets did not become idle within timeout'));
+                        }
                       case 4:
                       case "end":
                         return _context3.stop();
@@ -466,7 +450,7 @@ export function renderKitchenSimulator(container) {
             _context8.prev = 2;
           case 3:
             if (!(!destroyed && queue.length)) {
-              _context8.next = 10;
+              _context8.next = 11;
               break;
             }
             if (setExternalEventFn) {
@@ -486,31 +470,29 @@ export function renderKitchenSimulator(container) {
             pendingMarkers["delete"](item.token);
             return _context8.abrupt("continue", 3);
           case 6:
-            _context8.prev = 6;
             setExternalEventFn(item);
-            _context8.next = 7;
+            _context8.prev = 7;
+            _context8.next = 8;
             return settle(item);
-          case 7:
-            _context8.next = 9;
-            break;
           case 8:
-            _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.
+            _context8.next = 10;
+            break;
           case 9:
+            _context8.prev = 9;
+            _t = _context8["catch"](7);
+            console.error('settle failed', _t);
+          case 10:
             _context8.next = 3;
             break;
-          case 10:
-            _context8.prev = 10;
-            draining = false;
-            return _context8.finish(10);
           case 11:
+            _context8.prev = 11;
+            draining = false;
+            return _context8.finish(11);
+          case 12:
           case "end":
             return _context8.stop();
         }
-      }, _callee8, null, [[2,, 10, 11], [6, 8]]);
+      }, _callee8, null, [[2,, 11, 12], [7, 9]]);
     }));
     return _drain.apply(this, arguments);
   }
@@ -566,9 +548,6 @@ export function renderKitchenSimulator(container) {
       return gltfTracker.subscribe(cb);
     },
     sendExternalEvents: function sendExternalEvents(eventOrEvents) {
-      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 _iterator2 = _createForOfIteratorHelper(events),
         _step2;
@@ -592,47 +571,36 @@ export function renderKitchenSimulator(container) {
 
       // resolve when marker cleared
       return new Promise(function (resolve) {
-        var start = Date.now();
         var check = /*#__PURE__*/function () {
-          var _ref6 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee6() {
+          var _ref5 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee6() {
             return _regeneratorRuntime.wrap(function (_context6) {
               while (1) switch (_context6.prev = _context6.next) {
                 case 0:
                   if (destroyed) {
-                    _context6.next = 4;
-                    break;
-                  }
-                  if (pendingMarkers.has(token)) {
-                    _context6.next = 1;
+                    _context6.next = 3;
                     break;
                   }
-                  resolve(true);
-                  return _context6.abrupt("return");
-                case 1:
-                  if (!(Date.now() - start > timeoutMs)) {
+                  if (!pendingMarkers.has(token)) {
                     _context6.next = 2;
                     break;
                   }
-                  console.error('[kitchen-simulator] sendExternalEvents timed out');
-                  pendingMarkers["delete"](token); // fail-open
-                  resolve(false);
-                  return _context6.abrupt("return");
-                case 2:
-                  _context6.next = 3;
+                  _context6.next = 1;
                   return nextFrame();
+                case 1:
+                  return _context6.abrupt("continue", 0);
+                case 2:
+                  resolve(true);
+                  return _context6.abrupt("return");
                 case 3:
-                  _context6.next = 0;
-                  break;
-                case 4:
                   resolve(false);
-                case 5:
+                case 4:
                 case "end":
                   return _context6.stop();
               }
             }, _callee6);
           }));
           return function check() {
-            return _ref6.apply(this, arguments);
+            return _ref5.apply(this, arguments);
           };
         }();
         check();

package/package.json

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