kitchen-simulator 7.0.4-react-18 → 7.0.6-react-18

package/es/WorkSpaceHostMimic.js

@@ -6,7 +6,7 @@ import { useResizeDetector } from 'react-resize-detector';
 import mockProps from "./mocks/mockProps.json";
 import projectItemsCatalog from "./mocks/projectItemsCatalog.json";
 import renderKitchenSimulator from "./index";
-import { EXTERNAL_EVENT_CENTERING_2D, INTERNAL_EVENT_ITEMS_CATALOG } from "./constants";
+import { EXTERNAL_EVENT_CENTERING_2D, EXTERNAL_EVENT_LOAD_PROJECT, INTERNAL_EVENT_ITEMS_CATALOG } from "./constants";
 var options = {
   unit: 'in',
   enable3D: true
@@ -24,23 +24,31 @@ export default function WorkSpaceHostMimic() {
     inFlight = _useState2[0],
     setInFlight = _useState2[1];
   var rafRef = useRef(0);
-  var onInternalEvent = useCallback(function (evt, callback) {
-    try {
-      if ((evt === null || evt === void 0 ? void 0 : evt.type) === INTERNAL_EVENT_ITEMS_CATALOG) {
-        // ✅ correct shape
-        callback === null || callback === void 0 || callback({
-          elements: projectItemsCatalog
-        });
-      } else {
-        callback === null || callback === void 0 || callback();
-      }
-    } catch (e) {
-      console.error('onInternalEvent failed', e);
-      try {
-        callback === null || callback === void 0 || callback();
-      } catch (_unused) {}
-    }
-  }, []);
+  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) return;
     if (apiRef.current) return;
@@ -61,44 +69,46 @@ export default function WorkSpaceHostMimic() {
     var unsub = typeof api.subscribeGltfInFlight === 'function' ? api.subscribeGltfInFlight(function (count) {
       return setInFlight(count);
     }) : null;
-    _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+    _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
       var ok;
-      return _regeneratorRuntime.wrap(function (_context) {
-        while (1) switch (_context.prev = _context.next) {
+      return _regeneratorRuntime.wrap(function (_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
           case 0:
             if (!sentOnceRef.current) {
-              _context.next = 1;
+              _context2.next = 1;
               break;
             }
-            return _context.abrupt("return");
+            return _context2.abrupt("return");
           case 1:
             sentOnceRef.current = true;
-            _context.next = 2;
-            return api.whenReady();
-          case 2:
-            _context.next = 3;
+
+            // await api.whenReady();
+
+            // ✅ send center with EMPTY payload
+            _context2.next = 2;
             return api.sendExternalEvents([{
-              type: EXTERNAL_EVENT_CENTERING_2D,
-              payload: {},
+              type: EXTERNAL_EVENT_LOAD_PROJECT,
+              // send request for sync scene data to 3DTool
+              payload: JSON.parse(mockProps.projectElement[0].project_data),
               framesPerEvent: 2,
               waitForGltfIdleAfterEachEvent: false
             }], {
               timeoutMs: 15000
             });
-          case 3:
-            ok = _context.sent;
+          case 2:
+            ok = _context2.sent;
             if (!ok) console.warn('Centering timed out (fail-open).');
-          case 4:
+          case 3:
           case "end":
-            return _context.stop();
+            return _context2.stop();
         }
-      }, _callee);
+      }, _callee2);
     }))();
     return function () {
       var _apiRef$current, _apiRef$current$unmou;
       try {
         unsub === null || unsub === void 0 || unsub();
-      } catch (_unused2) {}
+      } 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;

package/es/class/project.js

@@ -146,19 +146,7 @@ var Project = /*#__PURE__*/function () {
       if (w != 0 && Math.abs(w) != Infinity && h != 0 && Math.abs(h) != Infinity) {
         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;
-        }
+        f = (viewer.viewerHeight - (bb.maxY + bb.minY) * a) / 2;
         _viewer2D = _viewer2D.merge({
           a: a,
           d: a,
@@ -180,7 +168,6 @@ var Project = /*#__PURE__*/function () {
       state = Item.setCounterTop(state, counterTop).updatedState;
       state = Area.setFloorStyles(state, floorStyle).updatedState;
       this.updateZoomScale(state, a);
-      viewer2DActions.updateCameraView(_viewer2D);
       return {
         updatedState: state
       };

package/es/utils/helper.js

@@ -341,12 +341,29 @@ 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;
-  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));
+  var scaledWidth = value.a * value.SVGWidth;
+  var scaledHeight = value.a * value.SVGHeight;
+
+  /* ---------- Horizontal ---------- */
+  if (scaledWidth <= value.viewerWidth) {
+    // scene smaller than viewport → force center
+    value.e = (value.viewerWidth - scaledWidth) / 2;
+  } else {
+    // scene larger → clamp normally
+    var maxE = 10;
+    var minE = value.viewerWidth - (scaledWidth + 10);
+    value.e = Math.min(maxE, Math.max(minE, value.e));
+  }
+
+  /* ---------- Vertical ---------- */
+  if (scaledHeight <= value.viewerHeight) {
+    // scene smaller than viewport → force center
+    value.f = (value.viewerHeight - scaledHeight) / 2;
+  } else {
+    var maxF = 80;
+    var minF = value.viewerHeight - (scaledHeight + 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.4-react-18",
+  "version": "7.0.6-react-18",
   "description": "It is a kitchen simulator (self-contained micro-frontend).",
   "license": "MIT",
   "module": "es/index.js",