@configuratorware/configurator-admingui 1.44.2 → 1.44.3

package/Screens/Designer/SubScreens/Designviews/Reducers/Actions.js

@@ -179,7 +179,13 @@ var removeDesignArea = function removeDesignArea(identifier) {
       if (idx !== -1) {
         designAreas.splice(idx, 1);
         dispatch(DesignViewActions.setFieldData('designAreas', designAreas));
-        dispatch(DesignViewActions.postData(false));
+        var _getState4 = getState(),
+          designerData = _getState4.designerData;
+        if (isCreatorDesignerMode(designerData)) {
+          dispatch(CreatorViewActions.postData(false));
+        } else {
+          dispatch(DesignViewActions.postData(false));
+        }
       }
       dispatch((0, _Actions2.cancelDeleteEntitiesDialog)());
     }, function () {
@@ -189,8 +195,8 @@ var removeDesignArea = function removeDesignArea(identifier) {
 };
 var postData = function postData() {
   return function (dispatch, getState) {
-    var _getState4 = getState(),
-      designerData = _getState4.designerData;
+    var _getState5 = getState(),
+      designerData = _getState5.designerData;
     if (isCreatorDesignerMode(designerData)) {
       return dispatch(CreatorViewActions.postData(true));
     } else {
@@ -203,8 +209,8 @@ var detailsAction = function detailsAction() {
     args[_key] = arguments[_key];
   }
   return function (dispatch, getState) {
-    var _getState5 = getState(),
-      designerData = _getState5.designerData;
+    var _getState6 = getState(),
+      designerData = _getState6.designerData;
     if (isCreatorDesignerMode(designerData)) {
       return dispatch(CreatorViewActions.detailsAction.apply(CreatorViewActions, args));
     } else {
@@ -212,8 +218,23 @@ var detailsAction = function detailsAction() {
     }
   };
 };
+var hideDetails = function hideDetails() {
+  for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+    args[_key2] = arguments[_key2];
+  }
+  return function (dispatch, getState) {
+    var _getState7 = getState(),
+      designerData = _getState7.designerData;
+    if (isCreatorDesignerMode(designerData)) {
+      return dispatch(CreatorViewActions.hideDetails.apply(CreatorViewActions, args));
+    } else {
+      return dispatch(DesignViewActions.hideDetails.apply(DesignViewActions, args));
+    }
+  };
+};
 var mergedActions = _objectSpread(_objectSpread({}, DesignViewActions), {}, {
   detailsAction: detailsAction,
+  hideDetails: hideDetails,
   postData: postData,
   listAction: listAction,
   invalidateList: invalidateList,

package/Screens/Designer/SubScreens/Visualization/Components/AreaEditor.js

@@ -52,6 +52,7 @@ var AreaEditor = exports.AreaEditor = /*#__PURE__*/function (_React$Component) {
       onChange && !(0, _isEqual["default"])(area, prevArea) && onChange();
     }, 1000));
     _defineProperty(_assertThisInitialized(_this), "setupAreaEditor", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var _this$_movableArea;
       var canvas, _canvas$parentElement, width, backgroundImageElement, textureAspectRatio;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -70,6 +71,7 @@ var AreaEditor = exports.AreaEditor = /*#__PURE__*/function (_React$Component) {
             if (backgroundImageElement) {
               _this.backgroundImage = (0, _funDraw.fitSize)((0, _funDraw.createImageObject)(backgroundImageElement), canvas.width, canvas.height);
             }
+            (_this$_movableArea = _this._movableArea) === null || _this$_movableArea === void 0 || _this$_movableArea.dispose();
             _this._movableArea = (0, _movableObject.createMovableObjectWithControls)(canvas, _this.area, {
               drawFunction: function drawFunction(object, ctx) {
                 (0, _funDraw.draw)(object, ctx);
@@ -96,7 +98,7 @@ var AreaEditor = exports.AreaEditor = /*#__PURE__*/function (_React$Component) {
             });
             _this._movableArea.init();
             _this.onUpdate();
-          case 14:
+          case 15:
           case "end":
             return _context.stop();
         }

package/Screens/Designer/SubScreens/Visualization/Containers/Edit/Edit.js

@@ -741,9 +741,10 @@ var VisualizationSettingsEdit = exports.VisualizationSettingsEdit = /*#__PURE__*
       var _this$props6 = this.props,
         designArea = _this$props6.designArea,
         classes = _this$props6.classes,
-        mode = _this$props6.mode;
+        mode = _this$props6.mode,
+        entityState = _this$props6.entityState;
       var three = this.three;
-      if (!designArea) {
+      if (!designArea || !entityState.showDetails) {
         return null;
       }
       var data = this.getCurrentDesignAreaData();

package/Utils/FunDraw/funDraw.js

@@ -44,7 +44,13 @@ var decorateObject = exports.decorateObject = function decorateObject(object, de
 };
 var createObject = exports.createObject = function createObject() {
   var initialObject = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  return decorateObject(initialObject, {
+  return decorateObject(_objectSpread({
+    x: 0,
+    y: 0,
+    width: 0,
+    height: 0,
+    angle: 0
+  }, initialObject), {
     setPosition: setPosition,
     setSize: setSize,
     setAngle: setAngle,
@@ -163,14 +169,14 @@ var createControl = exports.createControl = function createControl() {
   return createObject(_objectSpread({}, initialObject)).setSize(20, 20).setPosition(0, 0);
 };
 var reversePointTransform = exports.reversePointTransform = function reversePointTransform(object, x, y) {
-  var _x$y$angle$object = _objectSpread({
-      x: 0,
-      y: 0,
-      angle: 0
-    }, object),
-    cx = _x$y$angle$object.x,
-    cy = _x$y$angle$object.y,
-    angle = _x$y$angle$object.angle;
+  var _object$x$y$angle = _objectSpread(_objectSpread({}, object), {}, {
+      x: object.x || 0,
+      y: object.y || 0,
+      angle: object.angle || 0
+    }),
+    cx = _object$x$y$angle.x,
+    cy = _object$x$y$angle.y,
+    angle = _object$x$y$angle.angle;
   var ox = x - cx;
   var oy = y - cy;
   var cosAi = Math.cos(-angle);

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@configuratorware/configurator-admingui",
-  "version": "1.44.2",
+  "version": "1.44.3",
   "license": "UNLICENSED",
   "private": false,
   "dependencies": {
     "@babel/polyfill": "^7.12.1",
-    "@configuratorware/scripts": "1.44.2",
+    "@configuratorware/scripts": "1.44.3",
     "@material-ui/core": "^3.9.4",
     "@material-ui/icons": "^3.0.2",
     "@tweenjs/tween.js": "^17.6.0",
@@ -28,7 +28,7 @@
     "react-redux-i18n": "^1.9.3",
     "react-router": "^3.2.6",
     "react-sortable-hoc": "^1.11.0",
-    "redhotmagma-visualization": "1.44.2",
+    "redhotmagma-visualization": "1.44.3",
     "redux": "^4.1.0",
     "redux-logger": "^3.0.6",
     "redux-persist": "^5.10.0",