kitchen-simulator 1.0.0-alin.9 → 1.0.0-clark.101

package/es/components/viewer2d/item.js

@@ -6,6 +6,7 @@ import { convert } from "../../utils/convert-units-lite";
 import { GeometryUtils } from "../../utils/export";
 import { MODE_ROTATING_ITEM, WALL_CABINET_LAYOUTPOS } from "../../constants";
 import { isEmpty, returnReplaceableDeepSearchType } from "./utils";
+import { findCatalogElement } from "../../utils/geometry";
 var STYLE_LINE = {
   fill: '#0096fd',
   stroke: '#0096fd'
@@ -21,6 +22,7 @@ var STYLE_CIRCLE2 = {
   cursor: 'ew-resize'
 };
 export default function Item(_ref, _ref2) {
+  var _element$render2D;
   var layer = _ref.layer,
     item = _ref.item,
     scene = _ref.scene,
@@ -29,7 +31,8 @@ export default function Item(_ref, _ref2) {
   var itemsActions = _ref2.itemsActions;
   var x = item.x,
     y = item.y,
-    rotation = item.rotation;
+    rotation = item.rotation,
+    id = item.id;
   var showBaseCabinetMeasure = scene.showBaseCabinetMeasure,
     showWallCabinetMeasure = scene.showWallCabinetMeasure;
   var vertices = layer.vertices;
@@ -75,13 +78,6 @@ export default function Item(_ref, _ref2) {
       y: y
     };
   }
-  var buttons = [{
-    name: 'Edit',
-    thumbnail: '/assets/img/svg/3d_item_warning_edit.svg'
-  }, {
-    name: 'Info',
-    thumbnail: '/assets/img/svg/3d_item_warning_info.svg'
-  }];
   function getCalcRectFromItem(items) {
     var x = items.pos.x;
     var y = items.pos.y;
@@ -115,16 +111,11 @@ export default function Item(_ref, _ref2) {
     var selectedItem;
     if (layer.selected.items.size > 0) {
       selectedItem = layer.getIn(['items', layer.selected.items.get(0)]);
-      var catid = selectedItem.type;
-      var cat = catalog.elements[catid];
-      if (!cat) cat = catalog.elements[returnReplaceableDeepSearchType(catid)];
-      if (cat === undefined || cat === null) {
-        cat = catalog.getIn(['elements', catid]);
-        if (!cat) cat = catalog.getIn(['elements', returnReplaceableDeepSearchType(catid)]);
-      }
+      var _catid = selectedItem.type;
+      var _cat = findCatalogElement(catalog, _catid);
       currentItem = {
         selectedItem: selectedItem,
-        cat: cat
+        cat: _cat
       };
     }
     layer.items.forEach(function (item) {
@@ -136,8 +127,7 @@ export default function Item(_ref, _ref2) {
         rotRad: item.rotation / 180 * Math.PI
       };
       var catid = item.type;
-      var cat = catalog.elements[catid];
-      if (!cat) cat = catalog.elements[returnReplaceableDeepSearchType(catid)];
+      var cat = findCatalogElement(catalog, catid);
       var width = convert(item.properties.getIn(['width', '_length'])).from('in').to('cm');
       var height = convert(item.properties.getIn(['depth', '_length'])).from('in').to('cm');
       // let width = cat.info.sizeinfo.width;
@@ -263,7 +253,7 @@ export default function Item(_ref, _ref2) {
           if (GeometryUtils.pointsDistance(p0.x, p0.y, p1.x, p1.y) > GeometryUtils.pointsDistance(p0.x, p0.y, coordinatePoint.x, coordinatePoint.y) && GeometryUtils.pointsDistance(p0.x, p0.y, p1.x, p1.y) > GeometryUtils.pointsDistance(p1.x, p1.y, coordinatePoint.x, coordinatePoint.y)) {
             if (GeometryUtils.pointsDistance(coordinatePoint.x, coordinatePoint.y, center_x, center_y) > GeometryUtils.pointsDistance(centerpoint[0].x, centerpoint[0].y, coordinatePoint.x, coordinatePoint.y)) {
               comparelength.push(GeometryUtils.pointsDistance(centerpoint[0].x, centerpoint[0].y, coordinatePoint.x, coordinatePoint.y));
-              a = Math.min.apply(null, comparelength);
+              a = Math.max.apply(null, comparelength);
             }
           }
         }
@@ -278,9 +268,17 @@ export default function Item(_ref, _ref2) {
   var nh = height / 2;
   var _getDistant = getDistant(x, y, val.rotRad),
     PointArray = _getDistant.PointArray;
+  var catid = item.type;
+  var cat = catalog.elements[catid];
   PointArray.forEach(function (pointElement, index) {
     if (pointElement[0] == undefined) PointArray[index][0] = 0;
+    if (pointElement[1] === -90 && cat.info.is_corner !== 1) {
+      PointArray[index][0] -= 4;
+    }
   });
+  if (Array.isArray(PointArray)) {
+    itemsActions.storeDistArray(layerID, id, PointArray);
+  }
   var renderedRuler = [];
   var ep = 0.1;
   if (item.selected) {
@@ -305,75 +303,16 @@ export default function Item(_ref, _ref2) {
           length: itemDistanceFromLine,
           angle: rotation,
           rotation: element[1],
-          transform: "translate(".concat(element[1] === 180 ? -nw : element[1] === 0 ? nw : 0, ", ").concat(element[1] === 90 ? nh : element[1] === -90 ? -nh : 3 * nh / 4, ") rotate(").concat(element[1], ", 0, 0)")
+          transform: "translate(".concat(element[1] === 180 ? -nw : element[1] === 0 ? nw : 0, ", ").concat(element[1] === 90 ? nh : element[1] === -90 ? cat.info.is_corner !== 1 ? -(nh + 4) : -nh : 0, ") rotate(").concat(element[1], ", 0, 0)")
         })));
       }
     });
   }
-  var renderedItem = element.render2D.call(element, item, layer, scene);
+  var renderedItem = element === null || element === void 0 || (_element$render2D = element.render2D) === null || _element$render2D === void 0 ? void 0 : _element$render2D.call(element, item, layer, scene);
   var isSmall = false;
   if (width < 40) isSmall = true;
   var parts = [];
-  var warning_buttons = '';
   var newWidth = item.toJS().properties.width.length;
-  if (item.toJS().doorStyle.doorStyles && item.toJS().doorStyle.doorStyles.cds && item.toJS().doorStyle.doorStyles.cds.filter(function (cd) {
-    return cd.itemID == item.getIn(['itemID']);
-  }).length === 0 && item.category === 'cabinet') warning_buttons = /*#__PURE__*/React.createElement("g", null, /*#__PURE__*/React.createElement("g", {
-    id: "warning_info_2d",
-    style: {
-      transform: "translate(0px,20px)",
-      cursor: 'pointer'
-    },
-    onMouseEnter: function onMouseEnter(event) {
-      var bbox = event.target.getBoundingClientRect();
-      if (!isEmpty(document.getElementById('warning_box_2d'))) {
-        document.getElementById('warning_box_2d').style.display = 'flex';
-        document.getElementById('warning_box_2d').style.top = "".concat(bbox.top - 60, "px");
-        document.getElementById('warning_box_2d').style.left = "".concat(bbox.left, "px");
-      }
-    },
-    onMouseLeave: function onMouseLeave() {
-      if (!isEmpty(document.getElementById('warning_box_2d'))) document.getElementById('warning_box_2d').style.display = 'none';
-    }
-  }, /*#__PURE__*/React.createElement("circle", {
-    cx: 0,
-    cy: 0,
-    r: 8,
-    fill: "white"
-  }), /*#__PURE__*/React.createElement("image", {
-    width: 15,
-    height: 15,
-    x: -7.5,
-    y: -7.5,
-    style: {
-      transform: "rotate(".concat(180 - item.rotation, "deg)")
-    },
-    href: buttons[1].thumbnail
-  })), /*#__PURE__*/React.createElement("g", {
-    style: {
-      cursor: 'pointer'
-    },
-    "data-element-root": true,
-    "data-prototype": item.prototype,
-    "data-id": item.id,
-    "data-selected": item.selected,
-    "data-layer": layer.id,
-    "data-part": "warning_edit"
-  }, /*#__PURE__*/React.createElement("circle", {
-    cx: 0,
-    cy: 0,
-    r: 8,
-    fill: "white"
-  }), /*#__PURE__*/React.createElement("image", {
-    width: 15,
-    height: 15,
-    x: -7.5,
-    y: -7.5,
-    style: {
-      transform: "rotate(".concat(90 - item.rotation, "deg)")
-    },
-    href: buttons[0].thumbnail
-  })));
   if (item.selected) parts = [/*#__PURE__*/React.createElement("g", {
     key: 0,
     "data-element-root": true,
@@ -495,7 +434,7 @@ export default function Item(_ref, _ref2) {
     style: {
       cursor: 'initial'
     }
-  }, measure ? renderedRuler : null, parts, warning_buttons));
+  }, measure ? renderedRuler : null, parts));
 }
 Item.propTypes = {
   item: PropTypes.object.isRequired,

package/es/components/viewer2d/layer.js

@@ -137,7 +137,7 @@ export default function Layer(_ref) {
       unit: unit,
       catalog: catalog
     });
-  }), lineData, itemData, itemWall, itemSelected, mode !== MODE_DRAWING_LINE && vertices.valueSeq().filter(function (v) {
+  }), itemData, itemWall, lineData, itemSelected, mode !== MODE_DRAWING_LINE && vertices.valueSeq().filter(function (v) {
     return v.selected;
   }).map(function (vertex) {
     return /*#__PURE__*/React.createElement(Vertex, {