kitchen-simulator 11.28.2 → 11.29.0

package/lib/components/viewer2d/item.js

@@ -6,9 +6,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = Item;
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
@@ -16,15 +13,23 @@ var _rulerDist = _interopRequireDefault(require("./rulerDist"));
 var _convertUnitsLite = require("../../utils/convert-units-lite");
 var _constants = require("../../constants");
 var _cabinetWarning = require("../../shared/domain/cabinet-warning");
-var _cabinetMirror = require("../../shared/domain/cabinet-mirror");
 var _geometry = require("../../utils/geometry");
 var _cabinetCorner = require("../../shared/domain/cabinet-corner");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
-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; }
-var ICON_WIDTH = 23;
-var ICON_HEIGHT = 23;
-var ICON_SPACING = 2.5;
+var STYLE_LINE = {
+  fill: '#0096fd',
+  stroke: '#0096fd'
+};
+var STYLE_CIRCLE = {
+  fill: '#0096fd',
+  stroke: '#0096fd',
+  cursor: 'ew-resize'
+};
+var STYLE_CIRCLE2 = {
+  fill: 'none',
+  stroke: '#0096fd',
+  cursor: 'ew-resize'
+};
 function Item(_ref, _ref2) {
   var _element$render2D;
   var layer = _ref.layer,
@@ -101,135 +106,116 @@ function Item(_ref, _ref2) {
   var isSmall = false;
   if (width < 40) isSmall = true;
   var parts = [];
-  var canMirror = (0, _cabinetMirror.canMirrorCabinet)(item);
-  var isMirrored = item.mirrored === true;
-  if (item.selected) {
-    var iconsCount = canMirror ? 3 : 2;
-    var iconHeightStart = (ICON_HEIGHT * (iconsCount - 2) + ICON_SPACING * (iconsCount - 1)) / 2;
-    var iconsData = [{
-      key: 'duplicate',
-      part: 'duplicate',
-      href: '/assets/img/svg/duplicate.svg',
-      imageProps: {
-        x: ICON_WIDTH / 4,
-        y: -(3 / 4) * ICON_HEIGHT,
-        height: ICON_HEIGHT / 2,
-        width: ICON_WIDTH / 2
-      },
-      disabled: (0, _cabinetWarning.isWarningCabinet)(item)
-    }, canMirror && {
-      key: 'mirror',
-      part: 'mirror',
-      href: '/assets/img/svg/invert.svg',
-      wrapperStyle: {
-        transformOrigin: 'center',
-        transformBox: 'fill-box',
-        transform: !isMirrored ? 'scaleX(-1)' : ''
-      },
-      imageProps: {
-        x: ICON_WIDTH / 2 - 7.5,
-        y: -ICON_HEIGHT / 2 - 7.5,
-        height: '15px',
-        width: '15px'
-      }
-    }, {
-      key: 'remove',
-      part: 'remove',
-      href: '/assets/img/svg/delete.svg',
-      imageProps: {
-        x: ICON_WIDTH / 4,
-        y: -(3 / 4) * ICON_HEIGHT,
-        height: ICON_HEIGHT / 2,
-        width: ICON_WIDTH / 2
-      }
-    }].filter(Boolean);
-    var icons = iconsData.map(function (icon, index) {
-      var translateY = iconHeightStart - index * (ICON_HEIGHT + ICON_SPACING);
-      return /*#__PURE__*/_react["default"].createElement("g", {
-        key: icon.key,
-        style: {
-          cursor: icon.disabled ? 'default' : 'pointer',
-          transform: "rotate(".concat(360 - item.rotation, "deg)\n          translate(").concat(-width / 2 - 27, "px, ").concat(translateY, "px)")
-        },
-        "data-element-root": true,
-        "data-prototype": item.prototype,
-        "data-id": item.id,
-        "data-selected": item.selected,
-        "data-layer": layer.id,
-        "data-part": icon.part
-      }, /*#__PURE__*/_react["default"].createElement("defs", null, /*#__PURE__*/_react["default"].createElement("filter", {
-        id: "shadow",
-        x: "-20%",
-        y: "-20%",
-        width: "140%",
-        height: "140%"
-      }, /*#__PURE__*/_react["default"].createElement("feDropShadow", {
-        dx: "0",
-        dy: "-1",
-        stdDeviation: "1.2",
-        "flood-color": "#000",
-        "flood-opacity": "0.16"
-      }))), /*#__PURE__*/_react["default"].createElement("g", {
-        style: icon.wrapperStyle
-      }, /*#__PURE__*/_react["default"].createElement("rect", {
-        rx: "100%",
-        ry: "100%",
-        height: ICON_HEIGHT,
-        width: ICON_WIDTH,
-        fill: "white",
-        filter: "url(#shadow)"
-      }), /*#__PURE__*/_react["default"].createElement("image", (0, _extends2["default"])({
-        href: icon.href
-      }, icon.imageProps, {
-        style: _objectSpread({
-          transform: 'rotateX(180deg)'
-        }, icon.disabled ? {
-          opacity: 0.3,
-          filter: 'contrast(0)'
-        } : {})
-      }))));
-    });
-    parts = [/*#__PURE__*/_react["default"].createElement("g", {
-      key: 0,
-      "data-element-root": true,
-      "data-prototype": item.prototype,
-      "data-id": item.id,
-      "data-selected": item.selected,
-      "data-layer": layer.id,
-      "data-part": "rotation-anchor",
-      style: {
-        cursor: 'w-resize'
-      }
-    }, /*#__PURE__*/_react["default"].createElement("image", {
-      href: clockRotateState ? '/assets/img/svg/rotate.png' : '/assets/img/svg/blank_div.svg',
-      style: {
-        transform: "scale(-1, -1) translate(".concat(width / 2, "px, ").concat(height / 2, "px) rotate(25deg)")
-      },
-      height: "20",
-      width: "20",
-      onMouseEnter: function onMouseEnter() {
-        setClockRotateState(true);
-        setAntiClockRotateState(false);
-      },
-      onMouseLeave: function onMouseLeave() {
-        return setClockRotateState(mode === _constants.MODE_ROTATING_ITEM ? true : false);
-      }
-    }), /*#__PURE__*/_react["default"].createElement("image", {
-      href: antiClockRotateState ? '/assets/img/svg/rotate.png' : '/assets/img/svg/blank_div.svg',
-      style: {
-        transform: "scale(1, -1) translate(".concat(width / 2, "px, ").concat(height / 2, "px) rotate(25deg)")
-      },
-      height: "20",
-      width: "20",
-      onMouseEnter: function onMouseEnter() {
-        setAntiClockRotateState(true);
-        setClockRotateState(false);
-      },
-      onMouseLeave: function onMouseLeave() {
-        return setAntiClockRotateState(mode === _constants.MODE_ROTATING_ITEM ? true : false);
-      }
-    }))].concat((0, _toConsumableArray2["default"])(icons));
-  }
+  var newWidth = item.toJS().properties.width.length;
+  if (item.selected) parts = [/*#__PURE__*/_react["default"].createElement("g", {
+    key: 0,
+    "data-element-root": true,
+    "data-prototype": item.prototype,
+    "data-id": item.id,
+    "data-selected": item.selected,
+    "data-layer": layer.id,
+    "data-part": "rotation-anchor",
+    style: {
+      cursor: 'w-resize'
+    }
+  }, /*#__PURE__*/_react["default"].createElement("image", {
+    href: clockRotateState ? '/assets/img/svg/rotate.png' : '/assets/img/svg/blank_div.svg',
+    style: {
+      transform: "scale(-1, -1) translate(".concat(width / 2, "px, ").concat(height / 2, "px) rotate(25deg)")
+    },
+    height: "20",
+    width: "20",
+    onMouseEnter: function onMouseEnter() {
+      setClockRotateState(true);
+      setAntiClockRotateState(false);
+    },
+    onMouseLeave: function onMouseLeave() {
+      return setClockRotateState(mode === _constants.MODE_ROTATING_ITEM ? true : false);
+    }
+  }), /*#__PURE__*/_react["default"].createElement("image", {
+    href: antiClockRotateState ? '/assets/img/svg/rotate.png' : '/assets/img/svg/blank_div.svg',
+    style: {
+      transform: "scale(1, -1) translate(".concat(width / 2, "px, ").concat(height / 2, "px) rotate(25deg)")
+    },
+    height: "20",
+    width: "20",
+    onMouseEnter: function onMouseEnter() {
+      setAntiClockRotateState(true);
+      setClockRotateState(false);
+    },
+    onMouseLeave: function onMouseLeave() {
+      return setAntiClockRotateState(mode === _constants.MODE_ROTATING_ITEM ? true : false);
+    }
+  })), /*#__PURE__*/_react["default"].createElement("g", {
+    key: 1
+    // transform={`translate(${-width / 2 - (!isSmall ? 40 : 0)},${height / 2 + 40})`}
+    ,
+    style: {
+      cursor: 'pointer',
+      transform: "rotate(".concat(360 - item.rotation, "deg) translate(").concat(-width / 2 - 27, "px, ", 0, "px)")
+    },
+    "data-element-root": true,
+    "data-prototype": item.prototype,
+    "data-id": item.id,
+    "data-selected": item.selected,
+    "data-layer": layer.id,
+    "data-part": "duplicate"
+  }, /*#__PURE__*/_react["default"].createElement("defs", null, /*#__PURE__*/_react["default"].createElement("filter", {
+    id: "shadow"
+  }, /*#__PURE__*/_react["default"].createElement("feDropShadow", {
+    dx: "0",
+    dy: "0",
+    stdDeviation: "0.6"
+  }))), /*#__PURE__*/_react["default"].createElement("rect", {
+    rx: "4",
+    ry: "4",
+    height: "22",
+    width: "22",
+    fill: "white",
+    filter: "url(#shadow)"
+  }), /*#__PURE__*/_react["default"].createElement("image", {
+    href: "/assets/img/svg/duplicate.svg",
+    x: "3",
+    y: "-19",
+    height: "16",
+    width: "16",
+    style: (0, _cabinetWarning.isWarningCabinet)(item) ? {
+      transform: 'rotateX(180deg)',
+      opacity: 0.5
+    } : {
+      transform: 'rotateX(180deg)'
+    }
+  })), /*#__PURE__*/_react["default"].createElement("g", {
+    key: 2
+    // transform={`translate(${-width / 2 - (!isSmall ? 40 : 0)},${height / 2})`}
+    ,
+    style: {
+      cursor: 'pointer',
+      transform: "rotate(".concat(360 - item.rotation, "deg) translate(").concat(-width / 2 - 27, "px, ").concat(-27, "px)")
+    },
+    "data-element-root": true,
+    "data-prototype": item.prototype,
+    "data-id": item.id,
+    "data-selected": item.selected,
+    "data-layer": layer.id,
+    "data-part": "remove"
+  }, /*#__PURE__*/_react["default"].createElement("rect", {
+    rx: "4",
+    ry: "4",
+    height: "22",
+    width: "22",
+    fill: "white",
+    filter: "url(#shadow)"
+  }), /*#__PURE__*/_react["default"].createElement("image", {
+    href: "/assets/img/svg/delete.svg",
+    x: "3",
+    y: "-19",
+    height: "16",
+    width: "16",
+    style: {
+      transform: 'rotateX(180deg)'
+    }
+  }))];
   var measure = item.layoutpos === _constants.WALL_CABINET_LAYOUTPOS ? showWallCabinetMeasure : showBaseCabinetMeasure;
   return /*#__PURE__*/_react["default"].createElement("g", {
     "data-element-root": true,

package/lib/components/viewer2d/viewer2d.js

@@ -812,7 +812,7 @@ function Viewer2D(_ref, _ref2) {
           case 'items':
             setToolbar('');
             current_sel_obj_id = elementData.id;
-            if (elementData.part === 'rotation-anchor') itemsActions.beginRotatingItem(elementData.layer, elementData.id, x, y);else if (elementData.part === 'remove') break;else if (elementData.part === 'duplicate') break;else if (elementData.part === 'mirror') break;else if (elementData.part === 'warning_edit') break;else {
+            if (elementData.part === 'rotation-anchor') itemsActions.beginRotatingItem(elementData.layer, elementData.id, x, y);else if (elementData.part === 'remove') break;else if (elementData.part === 'duplicate') break;else if (elementData.part === 'warning_edit') break;else {
               // closes the setting dialog
               if (document.getElementById('setting_dialog')) {
                 document.getElementById('setting_dialog').style.display = 'none';
@@ -960,10 +960,7 @@ function Viewer2D(_ref, _ref2) {
             holesActions.selectHole(elementData.layer, elementData.id);
             break;
           case 'items':
-            if (elementData.part === 'mirror') {
-              itemsActions.toggleItemMirror(elementData.layer, elementData.id, null, onInternalEvent);
-              break;
-            } else if (elementData.part === 'duplicate') {
+            if (elementData.part === 'duplicate') {
               var currentObject = state.getIn(['scene', 'layers', layerID, 'items', elementData.id]);
               if (!(0, _cabinetWarning.isWarningCabinet)(currentObject)) itemsActions.duplicateSelected(currentObject, onInternalEvent); // send draw internal event when duplicating
               break;