kitchen-simulator 7.0.3-react-18 → 7.0.5-react-18

package/es/WorkSpaceHostMimic.js

@@ -1,6 +1,7 @@
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import React, { useEffect, useRef } from 'react';
+import React, { useCallback, useEffect, useRef, useState } from 'react';
 import { useResizeDetector } from 'react-resize-detector';
 import mockProps from "./mocks/mockProps.json";
 import projectItemsCatalog from "./mocks/projectItemsCatalog.json";
@@ -10,68 +11,47 @@ var options = {
   unit: 'in',
   enable3D: true
 };
-var onInternalEvent = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(evt, callback) {
-    var _t, _t2;
-    return _regeneratorRuntime.wrap(function (_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          console.log('INTERNAL:', evt.type);
-          _context.prev = 1;
-          if (!(evt.type === INTERNAL_EVENT_ITEMS_CATALOG)) {
-            _context.next = 3;
-            break;
-          }
-          _context.next = 2;
-          return callback === null || callback === void 0 ? void 0 : callback(projectItemsCatalog);
-        case 2:
-          return _context.abrupt("return");
-        case 3:
-          _context.next = 4;
-          return callback === null || callback === void 0 ? void 0 : callback();
-        case 4:
-          _context.next = 9;
-          break;
-        case 5:
-          _context.prev = 5;
-          _t = _context["catch"](1);
-          console.error('onInternalEvent failed', _t);
-          // still try to ack to avoid deadlocks
-          _context.prev = 6;
-          _context.next = 7;
-          return callback === null || callback === void 0 ? void 0 : callback();
-        case 7:
-          _context.next = 9;
-          break;
-        case 8:
-          _context.prev = 8;
-          _t2 = _context["catch"](6);
-        case 9:
-        case "end":
-          return _context.stop();
-      }
-    }, _callee, null, [[1, 5], [6, 8]]);
-  }));
-  return function onInternalEvent(_x, _x2) {
-    return _ref.apply(this, arguments);
-  };
-}();
-function WorkSpaceHostMimic() {
+export default function WorkSpaceHostMimic() {
   var _useResizeDetector = useResizeDetector(),
     width = _useResizeDetector.width,
     height = _useResizeDetector.height,
     sizeRef = _useResizeDetector.ref;
-
-  // ✅ pure JS refs
   var mountRef = useRef(null);
   var apiRef = useRef(null);
-  console.log('render WorkSpaceHostMimic');
+  var sentOnceRef = useRef(false);
+  var _useState = useState(0),
+    _useState2 = _slicedToArray(_useState, 2),
+    inFlight = _useState2[0],
+    setInFlight = _useState2[1];
+  var rafRef = useRef(0);
+  var onInternalEvent = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(evt, callback) {
+      var _t;
+      return _regeneratorRuntime.wrap(function (_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            console.log('EVENT:', evt.type, evt.value);
+            _t = evt.type;
+            _context.next = _t === INTERNAL_EVENT_ITEMS_CATALOG ? 1 : 3;
+            break;
+          case 1:
+            _context.next = 2;
+            return callback(projectItemsCatalog);
+          case 2:
+            return _context.abrupt("continue", 3);
+          case 3:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function onInternalEvent(_x, _x2) {
+      return _ref.apply(this, arguments);
+    };
+  }();
   useEffect(function () {
-    if (!mountRef.current) {
-      console.log('mountRef not ready');
-      return;
-    }
-    console.log('Initializing simulator');
+    if (!mountRef.current) return;
+    if (apiRef.current) return;
     var api = renderKitchenSimulator(mountRef.current, {
       width: width !== null && width !== void 0 ? width : window.innerWidth,
       height: height !== null && height !== void 0 ? height : window.innerHeight,
@@ -86,28 +66,39 @@ function WorkSpaceHostMimic() {
       }
     });
     apiRef.current = api;
-    console.log('Sending immediate external events');
+    var unsub = typeof api.subscribeGltfInFlight === 'function' ? api.subscribeGltfInFlight(function (count) {
+      return setInFlight(count);
+    }) : null;
     _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+      var ok;
       return _regeneratorRuntime.wrap(function (_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            _context2.next = 1;
-            return api.whenReady();
+            if (!sentOnceRef.current) {
+              _context2.next = 1;
+              break;
+            }
+            return _context2.abrupt("return");
           case 1:
-            api.sendExternalEvents({
+            sentOnceRef.current = true;
+
+            // await api.whenReady();
+
+            // ✅ send center with EMPTY payload
+            _context2.next = 2;
+            return api.sendExternalEvents([{
               type: EXTERNAL_EVENT_LOAD_PROJECT,
               // send request for sync scene data to 3DTool
               payload: JSON.parse(mockProps.projectElement[0].project_data),
               framesPerEvent: 2,
-              waitForGltfIdleAfterEachEvent: true
-            });
-            api.sendExternalEvents({
-              type: EXTERNAL_EVENT_CENTERING_2D,
-              payload: {},
-              framesPerEvent: 1,
-              waitForGltfIdleAfterEachEvent: true
+              waitForGltfIdleAfterEachEvent: false
+            }], {
+              timeoutMs: 15000
             });
           case 2:
+            ok = _context2.sent;
+            if (!ok) console.warn('Centering timed out (fail-open).');
+          case 3:
           case "end":
             return _context2.stop();
         }
@@ -115,31 +106,39 @@ function WorkSpaceHostMimic() {
     }))();
     return function () {
       var _apiRef$current, _apiRef$current$unmou;
-      console.log('Unmounting simulator');
+      try {
+        unsub === null || unsub === void 0 || unsub();
+      } catch (_unused) {}
       (_apiRef$current = apiRef.current) === null || _apiRef$current === void 0 || (_apiRef$current$unmou = _apiRef$current.unmount) === null || _apiRef$current$unmou === void 0 || _apiRef$current$unmou.call(_apiRef$current);
       apiRef.current = null;
+      sentOnceRef.current = false;
     };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
-
-  // Resize mimic
   useEffect(function () {
-    var _api$__render;
     var api = apiRef.current;
     if (!api) return;
-    (_api$__render = api.__render) === null || _api$__render === void 0 || _api$__render.call(api, {
-      width: width !== null && width !== void 0 ? width : window.innerWidth,
-      height: height !== null && height !== void 0 ? height : window.innerHeight,
-      configData: mockProps.configData,
-      options: options,
-      logoImg: '/assets/logo.png',
-      companyUrl: 'https://example.com',
-      toolbarButtons: [],
-      onInternalEvent: onInternalEvent,
-      onError: function onError(payload) {
-        return console.error('TOOL ERROR:', payload);
-      }
+    cancelAnimationFrame(rafRef.current);
+    rafRef.current = requestAnimationFrame(function () {
+      var _api$__render;
+      (_api$__render = api.__render) === null || _api$__render === void 0 || _api$__render.call(api, {
+        width: width !== null && width !== void 0 ? width : window.innerWidth,
+        height: height !== null && height !== void 0 ? height : window.innerHeight,
+        configData: mockProps.configData,
+        options: options,
+        logoImg: '/assets/logo.png',
+        companyUrl: 'https://example.com',
+        toolbarButtons: [],
+        onInternalEvent: onInternalEvent,
+        onError: function onError(payload) {
+          return console.error('TOOL ERROR:', payload);
+        }
+      });
     });
-  }, [width, height]);
+    return function () {
+      return cancelAnimationFrame(rafRef.current);
+    };
+  }, [width, height, onInternalEvent]);
   return /*#__PURE__*/React.createElement("div", {
     style: {
       width: '100vw',
@@ -151,7 +150,20 @@ function WorkSpaceHostMimic() {
       width: '100%',
       height: '100%'
     }
-  }, /*#__PURE__*/React.createElement("div", {
+  }, inFlight > 0 ? /*#__PURE__*/React.createElement("div", {
+    style: {
+      position: 'absolute',
+      zIndex: 9999,
+      top: 12,
+      right: 12,
+      padding: '8px 10px',
+      borderRadius: 8,
+      background: 'rgba(0,0,0,0.6)',
+      color: 'white',
+      fontSize: 12,
+      pointerEvents: 'none'
+    }
+  }, "Loading 3D\u2026 (", inFlight, ")") : null, /*#__PURE__*/React.createElement("div", {
     ref: mountRef,
     id: "kitchen-simulator-container",
     style: {
@@ -159,5 +171,4 @@ function WorkSpaceHostMimic() {
       height: '100%'
     }
   })));
-}
-export default WorkSpaceHostMimic;
+}

package/es/class/project.js

@@ -147,18 +147,12 @@ var Project = /*#__PURE__*/function () {
         a = viewer.viewerHeight < h ? viewer.viewerHeight / h : (viewer.viewerHeight / h * 3 / 5 - 0.5) / constants.ZOOM_VARIABLE > 400 ? viewer.viewerHeight / h * 400 / ((viewer.viewerHeight / h - 0.5) / constants.ZOOM_VARIABLE) : viewer.viewerHeight / h * 3 / 5;
         e = (viewer.viewerWidth - (bb.maxX + bb.minX) * a) / 2;
         f = (viewer.viewerHeight - (viewer.SVGHeight * 2 - bb.maxY - bb.minY) * a) / 2;
-        while (!(e <= 10)) {
-          e -= 0.1;
-        }
-        while (!(e + a * viewer.SVGWidth + 10 >= viewer.viewerWidth)) {
-          e += 0.1;
-        }
-        while (!(f <= 80)) {
-          f -= 0.1;
-        }
-        while (!(f + a * viewer.SVGHeight + 10 >= viewer.viewerHeight)) {
-          f += 0.1;
-        }
+        var maxE = 10;
+        var minE = viewer.viewerWidth - (a * viewer.SVGWidth + 10);
+        e = Math.min(maxE, Math.max(minE, e));
+        var maxF = 80;
+        var minF = viewer.viewerHeight - (a * viewer.SVGHeight + 10);
+        f = Math.min(maxF, Math.max(minF, f));
         _viewer2D = _viewer2D.merge({
           a: a,
           d: a,

package/es/index.js

@@ -374,10 +374,6 @@ export function renderKitchenSimulator(container) {
   }
   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');
@@ -533,8 +529,7 @@ export function renderKitchenSimulator(container) {
     return _createClass(Wrapper, [{
       key: "componentDidMount",
       value: function componentDidMount() {
-        var _this3 = this,
-          _resolveReady;
+        var _this3 = this;
         this._mounted = true;
         setExternalEventFn = function setExternalEventFn(newEvent) {
           if (!_this3._mounted) return;
@@ -542,9 +537,6 @@ export function renderKitchenSimulator(container) {
             externalEvent: newEvent
           });
         };
-        (_resolveReady = resolveReady) === null || _resolveReady === void 0 || _resolveReady();
-        resolveReady = null;
-        drain(); // now it can actually process queued events
       }
     }, {
       key: "componentWillUnmount",
@@ -565,9 +557,6 @@ export function renderKitchenSimulator(container) {
     __render: function __render(nextProps) {
       root.render(/*#__PURE__*/React.createElement(Wrapper, nextProps));
     },
-    whenReady: function whenReady() {
-      return readyPromise;
-    },
     // ✅ host can query current inFlight
     getGltfInFlight: function getGltfInFlight() {
       return gltfTracker.getInFlight();
@@ -599,7 +588,7 @@ export function renderKitchenSimulator(container) {
         __marker: MARKER,
         token: token
       });
-      if (setExternalEventFn) drain();
+      drain();
 
       // resolve when marker cleared
       return new Promise(function (resolve) {
@@ -657,12 +646,9 @@ export function renderKitchenSimulator(container) {
       pendingMarkers.clear();
     },
     unmount: function unmount() {
-      var _resolveReady2;
       destroyed = true;
       api.clearQueue();
       gltfTracker.uninstall();
-      (_resolveReady2 = resolveReady) === null || _resolveReady2 === void 0 || _resolveReady2();
-      resolveReady = null;
       var doUnmount = function doUnmount() {
         try {
           root.unmount();

package/es/utils/helper.js

@@ -341,20 +341,12 @@ export var updateViwer2D = function updateViwer2D(value) {
   var _zoomValue = parseInt((value.a - 0.5) / ZOOM_VARIABLE);
   if (_zoomValue > MAX_ZOOM_IN_SCALE) return;
   if (_zoomValue < 0 || Number.isNaN(_zoomValue)) return;
-
-  // modify e, f to fit to SVG
-  while (!(value.e <= 10)) {
-    value.e -= 0.1;
-  }
-  while (!(value.e + value.a * value.SVGWidth + 10 >= value.viewerWidth)) {
-    value.e += 0.1;
-  }
-  while (!(value.f <= 80)) {
-    value.f -= 0.1;
-  }
-  while (!(value.f + value.a * value.SVGHeight + 10 >= value.viewerHeight)) {
-    value.f += 0.1;
-  }
+  var maxE = 10;
+  var minE = value.viewerWidth - (value.a * value.SVGWidth + 10);
+  value.e = Math.min(maxE, Math.max(minE, value.e));
+  var maxF = 80;
+  var minF = value.viewerHeight - (value.a * value.SVGHeight + 10);
+  value.f = Math.min(maxF, Math.max(minF, value.f));
   if (viewer2DActions && compareSVGRect(value)) viewer2DActions.updateCameraView(value);
 };
 export function centering2D(state) {

package/es/utils/isolate-event-handler.js

@@ -902,8 +902,8 @@ function updateAttributeOfSelectedElement(element, attrPayload, state, layer, ca
               var xp = (lengthValue + halfWidthLength) * Math.cos(alpha) + x0;
               var yp = (lengthValue + halfWidthLength) * Math.sin(alpha) + y0;
               var offset = GeometryUtils.pointPositionOnLineSegment(x0, y0, x1, y1, xp, yp);
-              /*
-              if (x0 > x1) offset = 1 - offset;
+              /*
+              if (x0 > x1) offset = 1 - offset;
               */
               var endAt = MathUtils.toFixedFloat(lineLength - lineLength * offset - halfWidthLength, PRECISION);
               var offsetUnit = attributesFormData.getIn(['offsetB', '_unit']);
@@ -940,8 +940,8 @@ function updateAttributeOfSelectedElement(element, attrPayload, state, layer, ca
               var _xp = _x0 - (_lengthValue + _halfWidthLength) * Math.cos(_alpha);
               var _yp = _y2 - (_lengthValue + _halfWidthLength) * Math.sin(_alpha);
               var _offset = GeometryUtils.pointPositionOnLineSegment(_x9, _y, _x0, _y2, _xp, _yp);
-              /*
-              if (x0 > x1) offset = 1 - offset;
+              /*
+              if (x0 > x1) offset = 1 - offset;
               */
               var startAt = MathUtils.toFixedFloat(_lineLength * _offset - _halfWidthLength, PRECISION);
               var _offsetUnit = attributesFormData.getIn(['offsetA', '_unit']);

package/package.json

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