kitchen-simulator 4.0.0-react-18 → 4.0.2-react-18

package/es/components/viewer2d/rulerX.js

@@ -43,9 +43,10 @@ var RulerX = /*#__PURE__*/function (_Component) {
         height: '100%',
         color: this.props.fontColor
       };
+      var left = Number.isFinite(this.props.zeroLeftPosition) && Number.isFinite(this.props.mouseX) && Number.isFinite(this.props.zoom) ? this.props.zeroLeftPosition + this.props.mouseX * this.props.zoom - 6.5 : 0;
       var markerStyle = {
         position: 'absolute',
-        left: this.props.zeroLeftPosition + this.props.mouseX * this.props.zoom - 6.5,
+        left: left,
         top: 8,
         width: 0,
         height: 0,

package/lib/LiteKitchenConfigurator.js

@@ -7,9 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
@@ -314,14 +313,6 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
     key: "componentDidMount",
     value: function componentDidMount() {
       window.forRedo = [];
-      var store = this.context.store;
-      var _this$props = this.props,
-        stateExtractor = _this$props.stateExtractor,
-        plugins = _this$props.plugins;
-      var newplugins = (0, _toConsumableArray2["default"])(plugins);
-      newplugins.forEach(function (newplugin) {
-        return newplugin(store, stateExtractor);
-      });
     }
   }, {
     key: "componentWillReceiveProps",
@@ -355,20 +346,19 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
     key: "render",
     value: function render() {
       var _this2 = this;
+      var _this$props = this.props,
+        width = _this$props.width,
+        height = _this$props.height,
+        state = _this$props.state,
+        stateExtractor = _this$props.stateExtractor,
+        props = (0, _objectWithoutProperties2["default"])(_this$props, _excluded);
       var actionsFromProps = (0, _objectsUtils.objectsMap)(_export["default"], function (ns) {
         return _this2.props[ns];
       });
       var appCtxValue = _objectSpread(_objectSpread({}, actionsFromProps), {}, {
         translator: this.props.translator,
-        // instance (defaultProps already gives one)
         catalog: this.props.catalog
       });
-      var _this$props2 = this.props,
-        width = _this$props2.width,
-        height = _this$props2.height,
-        state = _this$props2.state,
-        stateExtractor = _this$props2.stateExtractor,
-        props = (0, _objectWithoutProperties2["default"])(_this$props2, _excluded);
       var _this$state = this.state,
         savePopupVisible = _this$state.savePopupVisible,
         quotePopupVisible = _this$state.quotePopupVisible,

package/lib/LiteRenderer.js

@@ -27,7 +27,6 @@ var _catalog = _interopRequireDefault(require("./catalog/catalog"));
 var Areas = _interopRequireWildcard(require("./catalog/areas/area/planner-element"));
 var Lines = _interopRequireWildcard(require("./catalog/lines/wall/planner-element"));
 var Holes = _interopRequireWildcard(require("./catalog/holes/export"));
-var _export2 = require("./plugins/export");
 var _immutable = require("immutable");
 var Sentry = _interopRequireWildcard(require("@sentry/react"));
 var THREE = _interopRequireWildcard(require("three"));
@@ -85,7 +84,6 @@ var store = (0, _redux.createStore)(reducer, null, !isProduction && window.devTo
 }) : function (f) {
   return f;
 });
-var plugins = [(0, _export2.Keyboard)(), (0, _export2.ConsoleDebugger)()];
 function serializeError(err) {
   try {
     if (!err) return {
@@ -298,7 +296,6 @@ function LiteRenderer(props) {
     height: height,
     logoImage: logoImg,
     companyURL: companyUrl,
-    plugins: plugins,
     stateExtractor: function stateExtractor(state) {
       return state.get('KitchenConfigurator');
     },

package/lib/components/content.js

@@ -13,7 +13,7 @@ var _viewer3d = _interopRequireDefault(require("./viewer3d/viewer3d"));
 var _viewer3dFirstPerson = _interopRequireDefault(require("./viewer3d/viewer3d-first-person"));
 var constants = _interopRequireWildcard(require("../constants"));
 var _front3D = _interopRequireDefault(require("./viewer3d/front3D"));
-var _useAppContext = require("../useAppContext");
+var _useAppContext2 = require("../useAppContext");
 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); }
 // import CatalogList from './catalog-view/catalog-list';
 // import ProjectConfigurator from './configurator/project-configurator';
@@ -30,6 +30,97 @@ function Content(_ref) {
     catalog = _ref.catalog,
     onInternalEvent = _ref.onInternalEvent;
   var mode = state.get('mode');
+  var _useAppContext = (0, _useAppContext2.useAppContext)(),
+    projectActions = _useAppContext.projectActions;
+  var rollback = projectActions.rollback,
+    undo = projectActions.undo,
+    redo = projectActions.redo,
+    toggleSnap = projectActions.toggleSnap,
+    copyProperties = projectActions.copyProperties,
+    pasteProperties = projectActions.pasteProperties,
+    recreate = projectActions.recreate,
+    uncreate = projectActions.uncreate,
+    shift2doff = projectActions.shift2doff,
+    shift2don = projectActions.shift2don;
+  (0, _react.useEffect)(function () {
+    function handleKeyDown(event) {
+      switch (event.keyCode) {
+        case constants.KEYBOARD_BUTTON_CODE.ESC:
+          rollback();
+          break;
+        case constants.KEYBOARD_BUTTON_CODE.Z:
+          if (event.getModifierState('Control') || event.getModifierState('Meta')) undo();
+          break;
+        case constants.KEYBOARD_BUTTON_CODE.Q:
+          if (event.getModifierState('Control') || event.getModifierState('Meta')) redo();
+          break;
+        case constants.KEYBOARD_BUTTON_CODE.ALT:
+          if (constants.MODE_SNAPPING.includes(mode)) toggleSnap(state.snapMask.merge({
+            SNAP_POINT: false,
+            SNAP_LINE: false,
+            SNAP_SEGMENT: false,
+            SNAP_GRID: false,
+            SNAP_GUIDE: false,
+            tempSnapConfiguartion: state.snapMask.toJS()
+          }));
+          break;
+        case constants.KEYBOARD_BUTTON_CODE.C:
+          {
+            var selectedLayer = state.getIn(['scene', 'selectedLayer']);
+            var selected = state.getIn(['scene', 'layers', selectedLayer, 'selected']);
+            if ((mode === constants.MODE_IDLE || mode === constants.MODE_3D_VIEW) && (selected.holes.size || selected.areas.size || selected.items.size || selected.lines.size)) {
+              if (selected.holes.size) {
+                var hole = state.getIn(['scene', 'layers', selectedLayer, 'holes', selected.holes.get(0)]);
+                copyProperties(hole.get('properties'));
+              } else if (selected.areas.size) {
+                var area = state.getIn(['scene', 'layers', selectedLayer, 'areas', selected.areas.get(0)]);
+                copyProperties(area.properties);
+              } else if (selected.items.size) {
+                var item = state.getIn(['scene', 'layers', selectedLayer, 'items', selected.items.get(0)]);
+                copyProperties(item.properties);
+              } else if (selected.lines.size) {
+                var line = state.getIn(['scene', 'layers', selectedLayer, 'lines', selected.lines.get(0)]);
+                copyProperties(line.properties);
+              }
+            }
+            break;
+          }
+        case constants.KEYBOARD_BUTTON_CODE.V:
+          pasteProperties();
+          break;
+        case constants.KEYBOARD_BUTTON_CODE.SHIFT:
+          if (!['TEXTAREA', 'INPUT'].includes(document.activeElement.tagName)) {
+            if ([constants.MODE_DRAWING_ITEM_3D, constants.MODE_IDLE_3D].includes(mode)) recreate();else if ([constants.MODE_DRAWING_ITEM, constants.MODE_IDLE].includes(mode)) shift2doff();
+          }
+          break;
+        default:
+          break;
+      }
+    }
+    function handleKeyUp(event) {
+      switch (event.keyCode) {
+        case constants.KEYBOARD_BUTTON_CODE.ALT:
+          if (constants.MODE_SNAPPING.includes(mode)) toggleSnap(state.snapMask.merge(state.snapMask.get('tempSnapConfiguartion')));
+          break;
+        case constants.KEYBOARD_BUTTON_CODE.CTRL:
+          // setAlterateState();
+          break;
+        case constants.KEYBOARD_BUTTON_CODE.SHIFT:
+          if (!['TEXTAREA', 'INPUT'].includes(document.activeElement.tagName)) {
+            if ([constants.MODE_DRAWING_ITEM_3D, constants.MODE_IDLE_3D].includes(mode)) uncreate();else if ([constants.MODE_DRAWING_ITEM, constants.MODE_IDLE].includes(mode)) shift2don();
+          }
+          break;
+        default:
+          break;
+      }
+    }
+    window.addEventListener('keydown', handleKeyDown);
+    window.addEventListener('keyup', handleKeyUp);
+    return function () {
+      window.removeEventListener('keydown', handleKeyDown);
+      window.removeEventListener('keyup', handleKeyUp);
+    };
+  }, [state, rollback, undo, redo, toggleSnap, copyProperties, pasteProperties, recreate, uncreate, shift2doff, shift2don]);
 
   // Internal Event for unselect_all
   (0, _react.useEffect)(function () {