kitchen-simulator 3.0.1 → 3.1.0-alpha.12

package/lib/index.js

@@ -12,52 +12,121 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireDefault(require("react"));
 var _reactDom = _interopRequireDefault(require("react-dom"));
 var _LiteRenderer = _interopRequireDefault(require("./LiteRenderer"));
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2["default"])(o), (0, _possibleConstructorReturn2["default"])(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2["default"])(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 renderKitchenSimulator(container) {
   var props = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  var setExternalEventFn = null;
-
-  // Internal wrapper that exposes a state setter
+  var apiRef = null;
+  var idSeq = 0;
   var Wrapper = /*#__PURE__*/function (_React$Component) {
     function Wrapper(p) {
       var _this;
       (0, _classCallCheck2["default"])(this, Wrapper);
       _this = _callSuper(this, Wrapper, [p]);
+      (0, _defineProperty2["default"])(_this, "onExternalEventProcessed", function (eventId) {
+        // Resolve only if it matches the current event in flight
+        if (eventId === _this._currentId) {
+          try {
+            var _this$_currentResolve, _this2;
+            (_this$_currentResolve = (_this2 = _this)._currentResolve) === null || _this$_currentResolve === void 0 || _this$_currentResolve.call(_this2);
+          } finally {
+            _this._currentResolve = null;
+            _this._currentId = null;
+            _this.processing = false;
+            _this.processNext();
+          }
+        }
+      });
       _this.state = {
-        externalEvent: p.externalEvent || null
+        externalEvent: null
+      };
+      _this.queue = [];
+      _this.processing = false;
+      _this._currentResolve = null;
+      _this._currentId = null;
+      apiRef = {
+        enqueueExternalEvent: function enqueueExternalEvent(ev) {
+          return _this.enqueue(ev);
+        }
       };
-      setExternalEventFn = _this.setExternalEvent.bind(_this);
       return _this;
     }
     (0, _inherits2["default"])(Wrapper, _React$Component);
     return (0, _createClass2["default"])(Wrapper, [{
-      key: "setExternalEvent",
-      value: function setExternalEvent(newEvent) {
+      key: "enqueue",
+      value: function enqueue(ev) {
+        if (!ev) return Promise.resolve();
+        var id = ++idSeq;
+        var resolve;
+        var promise = new Promise(function (res) {
+          return resolve = res;
+        });
+        this.queue.push({
+          id: id,
+          ev: ev,
+          resolve: resolve
+        });
+        if (!this.processing) this.processNext();
+        return promise;
+      }
+    }, {
+      key: "processNext",
+      value: function processNext() {
+        var _this3 = this;
+        var next = this.queue.shift();
+        if (!next) {
+          this.processing = false;
+          return;
+        }
+        this.processing = true;
+
+        // Tool assigns __eventId (do NOT rely on host for this)
+        var payload = _objectSpread(_objectSpread({}, next.ev), {}, {
+          __eventId: next.id
+        });
+
+        // Edge trigger: clear then set so downstream sees prop change reliably
         this.setState({
-          externalEvent: newEvent
+          externalEvent: null
+        }, function () {
+          _this3._currentResolve = next.resolve;
+          _this3._currentId = next.id;
+          _this3.setState({
+            externalEvent: payload
+          });
         });
       }
     }, {
       key: "render",
       value: function render() {
         return /*#__PURE__*/_react["default"].createElement(_LiteRenderer["default"], (0, _extends2["default"])({}, this.props, {
-          externalEvent: this.state.externalEvent
+          externalEvent: this.state.externalEvent,
+          onExternalEventProcessed: this.onExternalEventProcessed
         }));
       }
     }]);
-  }(_react["default"].Component); // Mount once
+  }(_react["default"].Component);
   _reactDom["default"].render(/*#__PURE__*/_react["default"].createElement(Wrapper, props), container);
   return {
-    updateExternalEvent: function updateExternalEvent(newExternalEvent) {
-      var _setExternalEventFn;
-      (_setExternalEventFn = setExternalEventFn) === null || _setExternalEventFn === void 0 || _setExternalEventFn(newExternalEvent);
+    // ✅ Promise-based API (use this from host)
+    enqueueExternalEvent: function enqueueExternalEvent(ev) {
+      var _apiRef$enqueueExtern, _apiRef, _apiRef$enqueueExtern2;
+      return (_apiRef$enqueueExtern = (_apiRef = apiRef) === null || _apiRef === void 0 || (_apiRef$enqueueExtern2 = _apiRef.enqueueExternalEvent) === null || _apiRef$enqueueExtern2 === void 0 ? void 0 : _apiRef$enqueueExtern2.call(_apiRef, ev)) !== null && _apiRef$enqueueExtern !== void 0 ? _apiRef$enqueueExtern : Promise.resolve();
+    },
+    // old API still works, but no await possible
+    updateExternalEvent: function updateExternalEvent(ev) {
+      var _apiRef2, _apiRef2$enqueueExter;
+      (_apiRef2 = apiRef) === null || _apiRef2 === void 0 || (_apiRef2$enqueueExter = _apiRef2.enqueueExternalEvent) === null || _apiRef2$enqueueExter === void 0 || _apiRef2$enqueueExter.call(_apiRef2, ev);
     },
     unmount: function unmount() {
       _reactDom["default"].unmountComponentAtNode(container);
+      apiRef = null;
     }
   };
 }

package/lib/reducers/lines-reducer.js

@@ -19,7 +19,7 @@ function _default(state, action) {
       state = state.merge({
         sceneHistory: _export2.history.historyPush(state.sceneHistory, state.scene)
       });
-      return _export.Line.beginDrawingLine(state, action.layerID, action.x, action.y).updatedState;
+      return _export.Line.beginDrawingLine(state, action.layerID, action.x, action.y, action.onInternalEvent).updatedState;
     case _constants.UPDATE_DRAWING_LINE:
       return _export.Line.updateDrawingLine(state, action.x, action.y, action.relatedLines).updatedState;
     case _constants.STOP_DRAWING_LINE:

package/lib/utils/geometry.js

@@ -14,6 +14,7 @@ exports.angleBetweenTwoPoints = angleBetweenTwoPoints;
 exports.angleBetweenTwoPointsAndOrigin = angleBetweenTwoPointsAndOrigin;
 exports.buildRectFromLines = buildRectFromLines;
 exports.calcCreateSnap = calcCreateSnap;
+exports.calcDistancesFromItemToWalls = calcDistancesFromItemToWalls;
 exports.calcSnap = calcSnap;
 exports.calcSnap1 = calcSnap1;
 exports.calcSnap2 = calcSnap2;
@@ -2542,4 +2543,165 @@ function validRect(itemRect, rects) {
   return rects.every(function (rect) {
     return !intersectRect(rect.rect, updatedItemRect.rect);
   });
+}
+function getCalcRectFromItem2(itemInfo) {
+  var x = itemInfo.pos.x;
+  var y = itemInfo.pos.y;
+  var w = itemInfo.size.width / 2;
+  var h = itemInfo.size.height / 2;
+  var rotRad = itemInfo.rotRad;
+  var mh = 3 * h / 4;
+  var mx = x - w * Math.cos(rotRad) - mh * Math.sin(rotRad);
+  var my = y - w * Math.sin(rotRad) + mh * Math.cos(rotRad);
+  var m2x = x + w * Math.cos(rotRad) - mh * Math.sin(rotRad);
+  var m2y = y + w * Math.sin(rotRad) + mh * Math.cos(rotRad);
+  var m3x = x - h * Math.sin(rotRad);
+  var m3y = y + h * Math.cos(rotRad);
+  var m1x = x + h * Math.sin(rotRad);
+  var m1y = y - h * Math.cos(rotRad);
+  return {
+    rectCenterPoint: [[point(mx, my), 180], [point(m1x, m1y), -90], [point(m2x, m2y), 0], [point(m3x, m3y), 90]]
+  };
+}
+function getAllItems2(curItem, layer) {
+  var rectarray = [];
+  var tempHeight = curItem.get('properties').get('depth');
+  layer.items.forEach(function (item) {
+    var val = {
+      pos: {
+        x: item.x,
+        y: item.y
+      },
+      rotRad: item.rotation / 180 * Math.PI
+    };
+    var width = (0, _convertUnitsLite.convert)(item.properties.getIn(['width', '_length'])).from('in').to('cm');
+    var height = (0, _convertUnitsLite.convert)(item.properties.getIn(['depth', '_length'])).from('in').to('cm');
+    val.size = {
+      width: width,
+      height: height
+    };
+    if (curItem.get('id') !== item.id) {
+      var detectObjectsAtSameAltitudeFlag = curItem.get('layoutpos') === 'Base' ? item.properties.getIn(['altitude', '_length']) <= curItem.get('properties').getIn(['altitude', '_length']) + tempHeight.get('_length') : item.properties.getIn(['altitude', '_length']) + item.properties.getIn(['height', '_length']) >= curItem.get('properties').getIn(['altitude', '_length']);
+      if (detectObjectsAtSameAltitudeFlag) {
+        var x = val.pos.x;
+        var y = val.pos.y;
+        var rotRad = val.rotRad;
+        var w = val.size.width / 2;
+        var h = val.size.height / 2;
+        var mx = x - w * Math.cos(rotRad);
+        var my = y - w * Math.sin(rotRad);
+        var x0 = mx + h * Math.sin(rotRad);
+        var y0 = my - h * Math.cos(rotRad);
+        var x3 = mx * 2 - x0;
+        var y3 = my * 2 - y0;
+        var x1 = x * 2 - x3;
+        var y1 = y * 2 - y3;
+        var x2 = x * 2 - x0;
+        var y2 = y * 2 - y0;
+        rectarray.push({
+          rect: [point(x0, y0), point(x1, y1), point(x0, y0), point(x1, y1)]
+        });
+        rectarray.push({
+          rect: [point(x1, y1), point(x2, y2), point(x1, y1), point(x2, y2)]
+        });
+        rectarray.push({
+          rect: [point(x2, y2), point(x3, y3), point(x2, y2), point(x3, y3)]
+        });
+        rectarray.push({
+          rect: [point(x3, y3), point(x0, y0), point(x3, y3), point(x0, y0)]
+        });
+      }
+    }
+  });
+  return {
+    others: rectarray
+  };
+}
+function calcDistancesFromItemToWalls(curItem, layer) {
+  if ((0, _helper.isEmpty)(curItem)) return [];
+  var x = curItem.get('x');
+  var y = curItem.get('y');
+  var rotRad = curItem.get('rotation') / 180 * Math.PI;
+  var width, height;
+  if (curItem.get('properties').get('width') || curItem.get('properties').get('depth')) {
+    width = (0, _convertUnitsLite.convert)(curItem.get('properties').get('width').get('_length')).from(curItem.get('properties').get('width').get('_unit')).to('cm');
+    height = (0, _convertUnitsLite.convert)(curItem.get('properties').get('depth').get('_length')).from(curItem.get('properties').get('depth').get('_unit')).to('cm');
+  } else {
+    width = (0, _convertUnitsLite.convert)(curItem.info.sizeinfo.width).from('in').to('cm');
+    height = (0, _convertUnitsLite.convert)(curItem.info.sizeinfo.depth).from('in').to('cm');
+  }
+  var center_h = 3 * height / 8;
+  var center_x = x; // middle of front line of cabinet rect
+  var center_y = y;
+  var center_x1 = x - center_h * Math.sin(rotRad); // center point of cabinet rect
+  var center_y1 = y + center_h * Math.cos(rotRad);
+  var PointArray = [];
+  var itemInfo = {
+    pos: {
+      x: x,
+      y: y
+    },
+    rotRad: rotRad
+  };
+  itemInfo.size = {
+    width: width,
+    height: height
+  };
+  var curiteminfo = getCalcRectFromItem2(itemInfo);
+  var allItemRect = getAllItems2(curItem, layer);
+  var allLines = getAllLines(layer);
+  var allLineRects = buildRectFromLines(layer, allLines);
+  var allRect = allLineRects.concat(allItemRect.others);
+  var _loop = function _loop(i) {
+    // [rectCenterPoint] has four middle points of cabinet rect edges
+    var centerpoint = curiteminfo.rectCenterPoint[i];
+    var comparelength = []; // distance array from rectCenterPoint[i] to other lines(walls, other cabinet rect edges)
+    var a;
+    var RectLineFuction; // normal line of cabinet rect edge
+    if (centerpoint[1] === 180 || centerpoint[1] === 0) RectLineFuction = linePassingThroughTwoPoints(centerpoint[0].x, centerpoint[0].y, center_x1, center_y1);else RectLineFuction = linePassingThroughTwoPoints(centerpoint[0].x, centerpoint[0].y, center_x, center_y);
+    allRect.forEach(function (linerect) {
+      // calc distance to all other lines
+      var p0 = clone_point(linerect.rect[2]);
+      var p1 = clone_point(linerect.rect[3]);
+      var lineFunction = {}; // other line function
+      if (p0.x !== p1.x || p0.y !== p1.y) lineFunction = linePassingThroughTwoPoints(p0.x, p0.y, p1.x, p1.y);
+      // intersection between normal line and other line
+      var coordinatePoint = twoLinesIntersection(lineFunction.a, lineFunction.b, lineFunction.c, RectLineFuction.a, RectLineFuction.b, RectLineFuction.c);
+      if (coordinatePoint !== undefined) {
+        if (
+        // intersection point is on the other line
+        pointsDistance(p0.x, p0.y, p1.x, p1.y) > pointsDistance(p0.x, p0.y, coordinatePoint.x, coordinatePoint.y) && pointsDistance(p0.x, p0.y, p1.x, p1.y) > pointsDistance(p1.x, p1.y, coordinatePoint.x, coordinatePoint.y)) {
+          // check the intersection point is outside direction of edge
+          var isOutside = true;
+          for (var j = 0; j < curiteminfo.rectCenterPoint.length; j++) {
+            if (j === i) continue;
+            var otherCenterPoint = curiteminfo.rectCenterPoint[j];
+            if (isPointOnLineSegment(centerpoint[0].x, centerpoint[0].y, coordinatePoint.x, coordinatePoint.y, otherCenterPoint[0].x, otherCenterPoint[0].y)) isOutside = false;
+          }
+          if (isOutside && pointsDistance(coordinatePoint.x, coordinatePoint.y, center_x, center_y) > pointsDistance(centerpoint[0].x, centerpoint[0].y, coordinatePoint.x, coordinatePoint.y)) {
+            comparelength.push(pointsDistance(centerpoint[0].x, centerpoint[0].y, coordinatePoint.x, coordinatePoint.y));
+            a = Math.min.apply(null, comparelength);
+          }
+        }
+      }
+    });
+    PointArray.push([a, centerpoint[1]]);
+  };
+  for (var i = 0; i < curiteminfo.rectCenterPoint.length; i++) {
+    _loop(i);
+  }
+  PointArray.forEach(function (pointElement, index) {
+    if (pointElement[0] == undefined) PointArray[index][0] = 0;
+  });
+  var cnt = 0;
+  PointArray.forEach(function (pointElement) {
+    if (pointElement[0] == 0) cnt++;
+  });
+  if (cnt == 4 || cnt == 3) {
+    PointArray[0][0] = 100;
+    PointArray[1][0] = 100;
+  }
+  return {
+    PointArray: PointArray
+  };
 }