@configuratorware/configurator-frontendgui 1.54.2 → 1.55.0

package/App/Modules/Designer/Containers/AddGalleryImage.js

@@ -12,7 +12,7 @@ var _AddGalleryImage = _interopRequireDefault(require("../Components/AddGalleryI
 var _Progress = _interopRequireDefault(require("../../../Shared/Components/Progress/Progress"));
 var _Actions = require("../../../Reducers/ImageGallery/Actions");
 var _Selectors = require("../../../Reducers/UI/Selectors");
-var _configuration = require("../../../configuration");
+var _getUrl = require("../../../Utils/getUrl");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 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; }
@@ -41,10 +41,9 @@ var getTags = (0, _createSelector["default"])(function (imageGalleryState) {
 var getGalleryImages = (0, _createSelector["default"])(function (imageGalleryState) {
   return imageGalleryState.gallery;
 }, function (images) {
-  var host = (0, _configuration.getConf)('network.host');
   return images.map(function (image) {
     return _objectSpread(_objectSpread({}, image), {}, {
-      url: image.thumbUrl.startsWith('http') ? image.thumbUrl : "".concat(host).concat(image.thumbUrl)
+      url: (0, _getUrl.getUrl)(image.thumbUrl)
     });
   });
 });

package/App/Modules/Designer/Containers/ImageEditDialog.js

@@ -28,6 +28,7 @@ var _DesignDataService = require("../../../Services/DesignDataService");
 var _AddGalleryImage = _interopRequireDefault(require("./AddGalleryImage"));
 var _createSelector = _interopRequireDefault(require("../../../../Utils/Function/createSelector"));
 var _configuration = require("../../../configuration");
+var _getUrl = require("../../../Utils/getUrl");
 var _Constant = require("../../../Constant");
 var _ImageEditUtils = require("../Utils/ImageEditUtils");
 var _Transformers = require("../Utils/Transformers");
@@ -127,7 +128,7 @@ var ImageEditDialogContainer = exports.ImageEditDialogContainer = /*#__PURE__*/f
           case 0:
             image = _this.props.image;
             url = (0, _get["default"])(image, 'preview.url', '');
-            previewUrl = url.startsWith('http') ? url : "".concat((0, _configuration.getConf)('network.host')).concat(url);
+            previewUrl = (0, _getUrl.getUrl)(url);
             isSvg = previewUrl && /\.svg$/.test(previewUrl);
             if (!isSvg) {
               _context.n = 2;
@@ -863,13 +864,12 @@ _defineProperty(ImageEditDialogContainer, "defaultProps", {
 var getUserImages = (0, _createSelector["default"])(function (imageGalleryState) {
   return imageGalleryState.userImages;
 }, function (images) {
-  var host = (0, _configuration.getConf)('network.host');
   var userImages = images.filter(function (image) {
     return !image.isPlaceHolderImage;
   });
   return userImages.map(function (image) {
     return _objectSpread(_objectSpread({}, image), {}, {
-      url: image.thumbnail.url.startsWith('http') ? image.thumbnail.url : "".concat(host).concat(image.thumbnail.url)
+      url: (0, _getUrl.getUrl)(image.thumbnail.url)
     });
   });
 });

package/App/Modules/Designer/Utils/Transformers.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.prepareObjectData = exports.prepareImageObjectData = exports.prepareCanvasData = exports.noCache = exports.isOriginalVector = exports.getRasterURL = exports.fixSrcURL = exports.calculateScaleFactor = void 0;
 var _get = _interopRequireDefault(require("lodash/get"));
 var _isArray = _interopRequireDefault(require("lodash/isArray"));
-var _configuration = require("../../../configuration");
+var _getUrl = require("../../../Utils/getUrl");
 var _Selectors = require("../../../Reducers/ImageGallery/Selectors");
 var _DesignDataService = require("../../../Services/DesignDataService");
 var _excluded = ["objects"];
@@ -32,7 +32,7 @@ var calculateScaleFactor = exports.calculateScaleFactor = function calculateScal
   return 1;
 };
 var fixSrcURL = exports.fixSrcURL = function fixSrcURL(src) {
-  return src && src[0] === '/' ? "".concat((0, _configuration.getConf)('network.host')).concat(src) : src;
+  return (0, _getUrl.getUrl)(src);
 };
 var getRasterURL = exports.getRasterURL = function getRasterURL(imageURL) {
   return ('' + imageURL).replace(/svg$/, 'png');

package/App/Reducers/DesignArea/Selectors.js

@@ -1058,8 +1058,8 @@ var getVectorizeForDesignProductionMethods = exports.getVectorizeForDesignProduc
   var _getSelectedDesignAre3 = getSelectedDesignAreaProperties(state),
     designProductionMethod = _getSelectedDesignAre3.designProductionMethod;
   var newProductionMethod = getDesignProductionMethodByIdentifier(state, designProductionMethodIdentifier);
-  var currentVectorsRequired = !!(0, _get["default"])(designProductionMethod, 'options.vectorsRequired') && isVectorizedLogoMandatory(designProductionMethod);
-  var newVectorsRequired = !!(0, _get["default"])(newProductionMethod, 'options.vectorsRequired') && isVectorizedLogoMandatory(newProductionMethod);
+  var currentVectorsRequired = !!(0, _get["default"])(designProductionMethod, 'options.vectorsRequired');
+  var newVectorsRequired = !!(0, _get["default"])(newProductionMethod, 'options.vectorsRequired');
   return {
     currentVectorsRequired: currentVectorsRequired,
     newVectorsRequired: newVectorsRequired

package/App/Reducers/Fonts/Actions.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.receiveFonts = exports.fetchFonts = exports.addFontFamilyToDOM = exports.addCustomFonts = exports.addCustomFont = exports.RECEIVE_FONTS = exports.ADD_FONTS = exports.ADD_FONT = void 0;
-var _configuration = require("../../configuration");
+var _getUrl = require("../../Utils/getUrl");
 var _Actions = require("../Actions");
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
@@ -26,7 +26,6 @@ var addFontFamilyToDOM = exports.addFontFamilyToDOM = function addFontFamilyToDO
 };
 var receiveFonts = exports.receiveFonts = function receiveFonts(data) {
   return function (dispatch) {
-    var host = (0, _configuration.getConf)('network.host');
     var fonts = [];
     var _iterator = _createForOfIteratorHelper(data),
       _step;
@@ -67,7 +66,7 @@ var receiveFonts = exports.receiveFonts = function receiveFonts(data) {
           var fontField = _fontFields[_i];
           var fontPath = customFont[fontField.field];
           if (fontPath) {
-            var fontUrl = host + fontPath;
+            var fontUrl = (0, _getUrl.getUrl)(fontPath);
             var urlFieldName = 'url' + fontField.property.charAt(0).toUpperCase() + fontField.property.slice(1);
             font[fontField.property] = true;
             font[urlFieldName] = fontUrl;

package/App/Reducers/ImageGallery/Actions.js

@@ -4,7 +4,7 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.uploadImage = exports.updateUploadDelayed = exports.updateImage = exports.setSelectedImageData = exports.setSelectedImageByIdentifier = exports.setSelectedImage = exports.setModeToEdit = exports.setModeToAdd = exports.selectTags = exports.selectTag = exports.receiveGalleryTags = exports.getGalleryUrlForTags = exports.fetchTags = exports.fetchGallery = exports.editImage = exports.dismissError = exports.commitChanges = exports.addImagesFromDesignArea = exports.addGalleryImageToUserImages = exports.WN_UPLOAD_IMAGE = exports.WN_LOAD_TAGS = exports.WN_LOAD_IMAGES = exports.URL_UPLOAD = exports.URL_TAGS = exports.URL_GALLERY = exports.UPDATE_UPLOAD_DELAYED = exports.UPDATE_IMAGE = exports.SET_SELECTED_IMAGE = exports.SET_MODE = exports.SELECT_GALLERY_TAGS = exports.SELECT_GALLERY_TAG = exports.RECEIVE_IMAGE_UPLOAD_DATA = exports.RECEIVE_GALLERY_TAGS = exports.RECEIVE_GALLERY = exports.ImageGalleryModes = exports.DISMISS_ERROR = exports.COMMIT_CHANGES = exports.ADD_IMAGES_FROM_DESIGN_AREA = exports.ADD_GALLERY_IMAGE_TO_USER_IMAGES = void 0;
+exports.uploadImage = exports.updateUploadDelayed = exports.updateImage = exports.setSelectedImageData = exports.setSelectedImageByIdentifier = exports.setModeToEdit = exports.setModeToAdd = exports.selectTags = exports.selectTag = exports.receiveGalleryTags = exports.getGalleryUrlForTags = exports.fetchTags = exports.fetchGallery = exports.editImage = exports.dismissError = exports.commitChanges = exports.addImagesFromDesignArea = exports.addGalleryImageToUserImages = exports.WN_UPLOAD_IMAGE = exports.WN_LOAD_TAGS = exports.WN_LOAD_IMAGES = exports.URL_UPLOAD = exports.URL_TAGS = exports.URL_GALLERY = exports.UPDATE_UPLOAD_DELAYED = exports.UPDATE_IMAGE = exports.SET_SELECTED_IMAGE = exports.SET_MODE = exports.SELECT_GALLERY_TAGS = exports.SELECT_GALLERY_TAG = exports.RECEIVE_IMAGE_UPLOAD_DATA = exports.RECEIVE_GALLERY_TAGS = exports.RECEIVE_GALLERY = exports.ImageGalleryModes = exports.DISMISS_ERROR = exports.COMMIT_CHANGES = exports.ADD_IMAGES_FROM_DESIGN_AREA = exports.ADD_GALLERY_IMAGE_TO_USER_IMAGES = void 0;
 var _Actions = require("../Actions");
 var _Actions2 = require("../UI/Actions");
 var _Selectors = require("./Selectors");
@@ -81,12 +81,6 @@ var selectTags = exports.selectTags = function selectTags(tags) {
     return dispatch(fetchGallery(tags));
   };
 };
-var setSelectedImage = exports.setSelectedImage = function setSelectedImage(fileName) {
-  return {
-    type: SET_SELECTED_IMAGE,
-    fileName: fileName
-  };
-};
 var setSelectedImageByIdentifier = exports.setSelectedImageByIdentifier = function setSelectedImageByIdentifier(identifier) {
   return {
     type: SET_SELECTED_IMAGE,

package/App/Reducers/ImageGallery/Selectors.js

@@ -9,6 +9,7 @@ var _find = _interopRequireDefault(require("lodash/find"));
 var _isString = _interopRequireDefault(require("lodash/isString"));
 var _flatten = _interopRequireDefault(require("lodash/flatten"));
 var _configuration = require("../../configuration");
+var _getUrl = require("../../Utils/getUrl");
 var _Selectors = require("../Configurator/Selectors");
 var _Reducer = require("../DesignData/Reducer");
 var _Actions = require("./Actions");
@@ -22,9 +23,7 @@ var getPreviewUrlFromImageData = exports.getPreviewUrlFromImageData = function g
   if (/^data:image/.test(previewUrl)) {
     return previewUrl;
   }
-  var _options$host = options.host,
-    host = _options$host === void 0 ? (0, _configuration.getConf)('network.host', '') : _options$host;
-  return previewUrl.startsWith('http') ? previewUrl : "".concat(host).concat(previewUrl);
+  return (0, _getUrl.getUrl)(previewUrl, options.host);
 };
 var isEditableVectorImage = exports.isEditableVectorImage = function isEditableVectorImage(preview) {
   return preview && preview.url && (/.svg$/.test(preview.url) || /^data:image\/svg\+xml/.test(preview.url));

package/App/Screens/Configurator/ThemeProvider.js

@@ -14,7 +14,7 @@ var _merge = _interopRequireDefault(require("lodash/merge"));
 var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
 var _set = _interopRequireDefault(require("lodash/set"));
 var _Selectors = require("../../Reducers/Configurator/Selectors");
-var _configuration = require("../../configuration");
+var _getUrl = require("../../Utils/getUrl");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
 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); }
 var darkTextColor = '#282828';
@@ -228,8 +228,7 @@ var createThemeFromClientTheme = function createThemeFromClientTheme(clientTheme
     (0, _set["default"])(theme, 'overrides.Designer-Editor.graphicsEditorContainer.borderColor', clientTheme.highlightColor);
   }
   if (clientTheme.font) {
-    var host = (0, _configuration.getConf)('network.host');
-    var fontUrl = host + clientTheme.font;
+    var fontUrl = (0, _getUrl.getUrl)(clientTheme.font);
     var fontName = clientTheme.font.substring(clientTheme.font.lastIndexOf('/') + 1, clientTheme.font.indexOf('.'));
     loadClientFont(fontName, fontUrl);
     (0, _set["default"])(theme, 'typography.fontFamily', fontName);

package/App/Services/DesignDataService.js

@@ -11,9 +11,11 @@ var _get2 = _interopRequireDefault(require("lodash/get"));
 var _find = _interopRequireDefault(require("lodash/find"));
 var _isEmpty = _interopRequireDefault(require("lodash/isEmpty"));
 var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
+var _merge = _interopRequireDefault(require("lodash/merge"));
 var _i18n = require("../../Framework/i18n");
 var _ServiceLocator = require("../ServiceLocator");
 var _configuration = require("../configuration");
+var _getUrl = require("../Utils/getUrl");
 var _Observable = _interopRequireDefault(require("../../Utils/Decorators/Observable"));
 var _setupDesigner = _interopRequireDefault(require("../Modules/Designer/setupDesigner"));
 var _Actions = require("../Reducers/DesignData/Actions");
@@ -158,7 +160,7 @@ var calculateImageBrightness = exports.calculateImageBrightness = function calcu
   var thumbnail = (0, _get2["default"])(image, 'data.thumbnail.url', null);
   var imageUrl = null;
   if (thumbnail) {
-    imageUrl = thumbnail.startsWith('http') ? thumbnail : "".concat((0, _configuration.getConf)('network.host')).concat(thumbnail);
+    imageUrl = (0, _getUrl.getUrl)(thumbnail);
   }
   var fuzzy = 0.1;
   return new Promise(function (resolve, reject) {
@@ -302,7 +304,7 @@ var getSvgContent = exports.getSvgContent = function () {
   return function getSvgContent(url) {
     var absolute = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     var forceFetch = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
-    var absUrl = absolute ? url : "".concat((0, _configuration.getConf)('network.host')).concat(url);
+    var absUrl = (0, _getUrl.getUrl)(url, absolute ? undefined : (0, _configuration.getConf)('network.host'));
     if (!forceFetch && svgContentMap.has(absUrl)) {
       return svgContentMap.get(absUrl);
     }
@@ -1835,18 +1837,27 @@ var DesignDataService = exports["default"] = /*#__PURE__*/function () {
     value: (function () {
       var _redrawAllDesignAreas = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee21(getDrawingContext, updateEventObject) {
         var _this8 = this;
-        var state, showHighlight, textureBuilderConfig, variantIdentifier, effectEnabled, drawingFn, _t10;
+        var options,
+          state,
+          showHighlight,
+          textureBuilderConfig,
+          variantIdentifier,
+          effectEnabled,
+          drawingFn,
+          _args22 = arguments,
+          _t11;
         return _regenerator().w(function (_context22) {
           while (1) switch (_context22.p = _context22.n) {
             case 0:
+              options = _args22.length > 2 && _args22[2] !== undefined ? _args22[2] : {};
               state = _ServiceLocator.Services.store.state;
               showHighlight = (0, _get2["default"])(state, 'designArea.showHighlight');
-              textureBuilderConfig = {
+              textureBuilderConfig = (0, _merge["default"])({
                 highlight: {
                   borderColor: (0, _Selectors3.getClientHighlightColor)(state),
                   backgroundColor: (0, _configuration.getConf)('visualization.designAreaHighlightBackgroundColor')
                 }
-              };
+              }, options.textureBuilderConfig);
               variantIdentifier = (0, _get2["default"])(updateEventObject, 'data.variant', false);
               effectEnabled = !(0, _Selectors3.isDesignerProductPreviewMode)();
               drawingFn = /*#__PURE__*/function () {
@@ -1855,19 +1866,30 @@ var DesignDataService = exports["default"] = /*#__PURE__*/function () {
                     _getTextureBuilder,
                     getTextureImage,
                     drawCanvasToArea,
-                    highlightDesignAreas,
+                    drawCanvasToAreaDirect,
+                    highlightDesignArea,
                     drawOn,
                     getParams,
                     _iterator9,
                     _step9,
+                    designArea,
+                    canvas,
+                    releaseLock,
+                    maskHandler,
+                    restoreOutlineVisibility,
+                    restoreOutlineOnly,
+                    drawToContext,
+                    _iterator0,
+                    _step0,
                     _loop,
                     _args21 = arguments,
-                    _t1;
+                    _t1,
+                    _t10;
                   return _regenerator().w(function (_context21) {
                     while (1) switch (_context21.p = _context21.n) {
                       case 0:
                         designAreas = _args21.length > 2 && _args21[2] !== undefined ? _args21[2] : _this8.getDesignAreas();
-                        _getTextureBuilder = getTextureBuilder(textureBuilderConfig), getTextureImage = _getTextureBuilder.getTextureImage, drawCanvasToArea = _getTextureBuilder.drawCanvasToArea, highlightDesignAreas = _getTextureBuilder.highlightDesignAreas, drawOn = _getTextureBuilder.drawOn, getParams = _getTextureBuilder.getParams;
+                        _getTextureBuilder = getTextureBuilder(textureBuilderConfig), getTextureImage = _getTextureBuilder.getTextureImage, drawCanvasToArea = _getTextureBuilder.drawCanvasToArea, drawCanvasToAreaDirect = _getTextureBuilder.drawCanvasToAreaDirect, highlightDesignArea = _getTextureBuilder.highlightDesignArea, drawOn = _getTextureBuilder.drawOn, getParams = _getTextureBuilder.getParams;
                         if (getTextureImage()) {
                           _context21.n = 1;
                           break;
@@ -1876,94 +1898,152 @@ var DesignDataService = exports["default"] = /*#__PURE__*/function () {
                         console.warn('Texture image is missing!', designAreas);
                         return _context21.a(2);
                       case 1:
-                        if (showHighlight) {
-                          // highlight only the design areas with no mask
-                          // for the others the outline is added by the maskHandler
-                          highlightDesignAreas(designAreas.filter(function (designArea) {
-                            return !(0, _Selectors.designAreaAppliesMask)(state, designArea);
-                          }));
+                        if (!showHighlight) {
+                          _context21.n = 13;
+                          break;
                         }
                         _iterator9 = _createForOfIteratorHelper(designAreas);
                         _context21.p = 2;
+                        _iterator9.s();
+                      case 3:
+                        if ((_step9 = _iterator9.n()).done) {
+                          _context21.n = 10;
+                          break;
+                        }
+                        designArea = _step9.value;
+                        canvas = _this8._getCanvas(_this8.getDesignAreaByIdentifier(designArea.identifier));
+                        if (canvas) {
+                          _context21.n = 4;
+                          break;
+                        }
+                        return _context21.a(3, 9);
+                      case 4:
+                        _context21.n = 5;
+                        return (0, _ObjectLock.requestLock)(canvas);
+                      case 5:
+                        releaseLock = _context21.v;
+                        maskHandler = canvas.getMaskHandler();
+                        if (!((0, _Selectors.designAreaAppliesMask)(state, designArea) && maskHandler)) {
+                          _context21.n = 7;
+                          break;
+                        }
+                        restoreOutlineVisibility = maskHandler.toggleOutline(true, {
+                          getZoomFactor: function getZoomFactor(_ref18) {
+                            var zoom = _ref18.zoom;
+                            // currentZoom is only available for 2D, for 3D it is always 1
+                            var threeFactor = Math.min(getParams().currentZoom, 1) || 1;
+                            return zoom * threeFactor;
+                          }
+                        });
+                        restoreOutlineOnly = maskHandler.showOutlineOnly();
+                        drawToContext = canvas.drawToContext.bind(canvas);
+                        _context21.n = 6;
+                        return drawCanvasToAreaDirect({
+                          drawToContext: drawToContext,
+                          designArea: designArea
+                        });
+                      case 6:
+                        restoreOutlineVisibility === null || restoreOutlineVisibility === void 0 || restoreOutlineVisibility();
+                        restoreOutlineOnly === null || restoreOutlineOnly === void 0 || restoreOutlineOnly();
+                        _context21.n = 8;
+                        break;
+                      case 7:
+                        highlightDesignArea(designArea);
+                      case 8:
+                        releaseLock();
+                      case 9:
+                        _context21.n = 3;
+                        break;
+                      case 10:
+                        _context21.n = 12;
+                        break;
+                      case 11:
+                        _context21.p = 11;
+                        _t1 = _context21.v;
+                        _iterator9.e(_t1);
+                      case 12:
+                        _context21.p = 12;
+                        _iterator9.f();
+                        return _context21.f(12);
+                      case 13:
+                        _iterator0 = _createForOfIteratorHelper(designAreas);
+                        _context21.p = 14;
                         _loop = /*#__PURE__*/_regenerator().m(function _loop() {
-                          var designArea, canvas, _canvas$getColorOverl, releaseLock, selectedObject, maskHandler, restoreOutlineVisibility, restoreColorOverlayVisibility, drawToContext, getSvg;
+                          var _canvas$getColorOverl, _canvas$getMaskHandle;
+                          var designArea, canvas, releaseLock, selectedObject, restoreColorOverlayVisibility, restoreOutlineVisibility, drawToContext, getSvg;
                           return _regenerator().w(function (_context20) {
                             while (1) switch (_context20.n) {
                               case 0:
-                                designArea = _step9.value;
+                                designArea = _step0.value;
                                 canvas = _this8._getCanvas(_this8.getDesignAreaByIdentifier(designArea.identifier));
-                                if (!canvas) {
-                                  _context20.n = 3;
+                                if (canvas) {
+                                  _context20.n = 1;
                                   break;
                                 }
-                                _context20.n = 1;
-                                return (0, _ObjectLock.requestLock)(canvas);
+                                return _context20.a(2, 1);
                               case 1:
+                                _context20.n = 2;
+                                return (0, _ObjectLock.requestLock)(canvas);
+                              case 2:
                                 releaseLock = _context20.v;
                                 selectedObject = (0, _get2["default"])(canvas, 'selectedObject');
                                 if (selectedObject) {
                                   selectedObject.selected = false;
                                 }
-                                maskHandler = canvas.getMaskHandler();
-                                if (maskHandler) {
-                                  restoreOutlineVisibility = maskHandler.toggleOutline(showHighlight, {
-                                    getZoomFactor: function getZoomFactor(_ref18) {
-                                      var zoom = _ref18.zoom;
-                                      // currentZoom is only available for 2D, for 3D it is always 1
-                                      var threeFactor = Math.min(getParams().currentZoom, 1) || 1;
-                                      return zoom * threeFactor;
-                                    }
-                                  });
-                                }
                                 restoreColorOverlayVisibility = (_canvas$getColorOverl = canvas.getColorOverlay()) === null || _canvas$getColorOverl === void 0 ? void 0 : _canvas$getColorOverl.toggle(false);
+                                restoreOutlineVisibility = (_canvas$getMaskHandle = canvas.getMaskHandler()) === null || _canvas$getMaskHandle === void 0 ? void 0 : _canvas$getMaskHandle.toggleOutline(false);
                                 drawToContext = canvas.drawToContext.bind(canvas);
                                 getSvg = function getSvg() {
                                   return canvas.getScreenshot((0, _Selectors4.getFontMapping)(state));
                                 };
-                                _context20.n = 2;
+                                _context20.n = 3;
                                 return drawCanvasToArea(_objectSpread({
                                   drawToContext: drawToContext,
                                   designArea: designArea,
                                   getSvg: getSvg
                                 }, effectEnabled && (0, _Selectors.getVisualizationEffectWithOptions)(state, designArea, variantIdentifier)));
-                              case 2:
-                                if (maskHandler) {
-                                  restoreOutlineVisibility();
-                                }
-                                restoreColorOverlayVisibility && restoreColorOverlayVisibility();
-                                releaseLock();
                               case 3:
+                                restoreColorOverlayVisibility === null || restoreColorOverlayVisibility === void 0 || restoreColorOverlayVisibility();
+                                restoreOutlineVisibility === null || restoreOutlineVisibility === void 0 || restoreOutlineVisibility();
+                                releaseLock();
+                              case 4:
                                 return _context20.a(2);
                             }
                           }, _loop);
                         });
-                        _iterator9.s();
-                      case 3:
-                        if ((_step9 = _iterator9.n()).done) {
-                          _context21.n = 5;
+                        _iterator0.s();
+                      case 15:
+                        if ((_step0 = _iterator0.n()).done) {
+                          _context21.n = 18;
                           break;
                         }
-                        return _context21.d(_regeneratorValues(_loop()), 4);
-                      case 4:
-                        _context21.n = 3;
+                        return _context21.d(_regeneratorValues(_loop()), 16);
+                      case 16:
+                        if (!_context21.v) {
+                          _context21.n = 17;
+                          break;
+                        }
+                        return _context21.a(3, 17);
+                      case 17:
+                        _context21.n = 15;
                         break;
-                      case 5:
-                        _context21.n = 7;
+                      case 18:
+                        _context21.n = 20;
                         break;
-                      case 6:
-                        _context21.p = 6;
-                        _t1 = _context21.v;
-                        _iterator9.e(_t1);
-                      case 7:
-                        _context21.p = 7;
-                        _iterator9.f();
-                        return _context21.f(7);
-                      case 8:
+                      case 19:
+                        _context21.p = 19;
+                        _t10 = _context21.v;
+                        _iterator0.e(_t10);
+                      case 20:
+                        _context21.p = 20;
+                        _iterator0.f();
+                        return _context21.f(20);
+                      case 21:
                         drawOn(textureCtx);
-                      case 9:
+                      case 22:
                         return _context21.a(2);
                     }
-                  }, _callee20, null, [[2, 6, 7, 8]]);
+                  }, _callee20, null, [[14, 19, 20, 21], [2, 11, 12, 13]]);
                 }));
                 return function drawingFn(_x22, _x23) {
                   return _ref17.apply(this, arguments);
@@ -1977,9 +2057,9 @@ var DesignDataService = exports["default"] = /*#__PURE__*/function () {
               break;
             case 3:
               _context22.p = 3;
-              _t10 = _context22.v;
+              _t11 = _context22.v;
               // eslint-disable-next-line no-console
-              console.warn('Could not get drawing context, texture update is skipped!', _t10.message);
+              console.warn('Could not get drawing context, texture update is skipped!', _t11.message);
             case 4:
               return _context22.a(2);
           }
@@ -2059,8 +2139,8 @@ var DesignDataService = exports["default"] = /*#__PURE__*/function () {
                 return canvas && canvas[screenshotFn] && canvas.objects && canvas.objects.length > 0;
               }).map(/*#__PURE__*/function () {
                 var _ref22 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee23(_ref21) {
-                  var _canvas$getColorOverl2;
-                  var id, canvas, releaseLock, maskHandler, restoreOutlineVisibility, restoreColorOverlayVisibility, result, _t11, _t12;
+                  var _canvas$getMaskHandle2, _canvas$getColorOverl2;
+                  var id, canvas, releaseLock, restoreOutlineVisibility, restoreColorOverlayVisibility, result, _t12, _t13;
                   return _regenerator().w(function (_context24) {
                     while (1) switch (_context24.n) {
                       case 0:
@@ -2069,17 +2149,16 @@ var DesignDataService = exports["default"] = /*#__PURE__*/function () {
                         return (0, _ObjectLock.requestLock)(canvas);
                       case 1:
                         releaseLock = _context24.v;
-                        maskHandler = canvas.getMaskHandler();
-                        restoreOutlineVisibility = maskHandler && maskHandler.toggleOutline(false);
+                        restoreOutlineVisibility = (_canvas$getMaskHandle2 = canvas.getMaskHandler()) === null || _canvas$getMaskHandle2 === void 0 ? void 0 : _canvas$getMaskHandle2.toggleOutline(false);
                         restoreColorOverlayVisibility = (_canvas$getColorOverl2 = canvas.getColorOverlay()) === null || _canvas$getColorOverl2 === void 0 ? void 0 : _canvas$getColorOverl2.toggle(false);
-                        _t11 = id;
+                        _t12 = id;
                         _context24.n = 2;
                         return canvas[screenshotFn](fontMapping);
                       case 2:
-                        _t12 = _context24.v;
-                        result = [_t11, _t12];
-                        restoreOutlineVisibility && restoreOutlineVisibility();
-                        restoreColorOverlayVisibility && restoreColorOverlayVisibility();
+                        _t13 = _context24.v;
+                        result = [_t12, _t13];
+                        restoreOutlineVisibility === null || restoreOutlineVisibility === void 0 || restoreOutlineVisibility();
+                        restoreColorOverlayVisibility === null || restoreColorOverlayVisibility === void 0 || restoreColorOverlayVisibility();
                         releaseLock();
                         return _context24.a(2, result);
                     }
@@ -2334,11 +2413,11 @@ var DesignDataService = exports["default"] = /*#__PURE__*/function () {
       if (preSelectionDesignAreaIdentifier) {
         this.selectDesignArea(preSelectionDesignAreaIdentifier);
       }
-      var _iterator0 = _createForOfIteratorHelper(filteredDesignAreas),
-        _step0;
+      var _iterator1 = _createForOfIteratorHelper(filteredDesignAreas),
+        _step1;
       try {
-        for (_iterator0.s(); !(_step0 = _iterator0.n()).done;) {
-          var area = _step0.value;
+        for (_iterator1.s(); !(_step1 = _iterator1.n()).done;) {
+          var area = _step1.value;
           var selectedDesignArea = (0, _Selectors.getDesignAreaPreSelection)(area.identifier);
           if (selectedDesignArea.identifier) {
             var preSelectionColorAmount = +(0, _get2["default"])(selectedDesignArea, 'colorAmount', 1);
@@ -2350,9 +2429,9 @@ var DesignDataService = exports["default"] = /*#__PURE__*/function () {
           }
         }
       } catch (err) {
-        _iterator0.e(err);
+        _iterator1.e(err);
       } finally {
-        _iterator0.f();
+        _iterator1.f();
       }
     }
   }, {
@@ -2367,7 +2446,7 @@ var DesignDataService = exports["default"] = /*#__PURE__*/function () {
     key: "setImageAndTextColor",
     value: function () {
       var _setImageAndTextColor = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee29(color) {
-        var designArea, designData, objects, hasmultipleObjects, canvas, isImageSelected, selectedImageIdentifier, _iterator1, _step1, object, image, operations, _t13;
+        var designArea, designData, objects, hasmultipleObjects, canvas, isImageSelected, selectedImageIdentifier, _iterator10, _step10, object, image, operations, _t14;
         return _regenerator().w(function (_context30) {
           while (1) switch (_context30.p = _context30.n) {
             case 0:
@@ -2391,15 +2470,15 @@ var DesignDataService = exports["default"] = /*#__PURE__*/function () {
               isImageSelected = canvas.selectedObject && canvas.selectedObject.type === 'Image';
               selectedImageIdentifier = isImageSelected ? (0, _get2["default"])(_ServiceLocator.Services.store.state, 'imageGallery.selectedImage.identifier', null) : null;
               _ServiceLocator.Services.store.dispatch((0, _Actions.setDesignAreaTextsColor)(designArea.identifier, color));
-              _iterator1 = _createForOfIteratorHelper(objects);
+              _iterator10 = _createForOfIteratorHelper(objects);
               _context30.p = 3;
-              _iterator1.s();
+              _iterator10.s();
             case 4:
-              if ((_step1 = _iterator1.n()).done) {
+              if ((_step10 = _iterator10.n()).done) {
                 _context30.n = 6;
                 break;
               }
-              object = _step1.value;
+              object = _step10.value;
               if (!(object.type === 'Image' && object.imageData.identifier !== selectedImageIdentifier)) {
                 _context30.n = 5;
                 break;
@@ -2416,11 +2495,11 @@ var DesignDataService = exports["default"] = /*#__PURE__*/function () {
               break;
             case 7:
               _context30.p = 7;
-              _t13 = _context30.v;
-              _iterator1.e(_t13);
+              _t14 = _context30.v;
+              _iterator10.e(_t14);
             case 8:
               _context30.p = 8;
-              _iterator1.f();
+              _iterator10.f();
               return _context30.f(8);
             case 9:
               _context30.n = 10;

package/App/Services/DesignerService.js

@@ -13,6 +13,7 @@ var _i18n = require("../../Framework/i18n");
 var _Transformers = require("../Modules/Designer/Utils/Transformers");
 var _ServiceLocator = require("../ServiceLocator");
 var _configuration = require("../configuration");
+var _getUrl = require("../Utils/getUrl");
 var _Selectors = require("../Reducers/ImageGallery/Selectors");
 var _Actions = require("../Reducers/ImageGallery/Actions");
 var _Selectors2 = require("../Reducers/DesignArea/Selectors");
@@ -233,12 +234,15 @@ var DesignerService = exports["default"] = /*#__PURE__*/function () {
         return _regenerator().w(function (_context5) {
           while (1) switch (_context5.n) {
             case 0:
+              _context5.n = 1;
+              return _ServiceLocator.Services.store.dispatch((0, _Actions.setSelectedImageByIdentifier)(null));
+            case 1:
               timeout = setTimeout(function () {
                 _ServiceLocator.Services.store.dispatch((0, _Actions.updateUploadDelayed)(true));
               }, 10000);
-              _context5.n = 1;
+              _context5.n = 2;
               return _ServiceLocator.Services.store.dispatch((0, _Actions.uploadImage)(file));
-            case 1:
+            case 2:
               response = _context5.v;
               clearTimeout(timeout);
               url = (0, _get["default"])(response, 'data.preview.url');
@@ -247,13 +251,13 @@ var DesignerService = exports["default"] = /*#__PURE__*/function () {
                 _ServiceLocator.Services.ui.alertMessage((0, _i18n.t)(term));
               }
               if (url) {
-                _context5.n = 2;
+                _context5.n = 3;
                 break;
               }
               throw new Error('Preview image url is not specified!');
-            case 2:
+            case 3:
               _ServiceLocator.Services.store.dispatch((0, _Actions.updateUploadDelayed)(false));
-              return _context5.a(2, url.startsWith('http') ? url : "".concat((0, _configuration.getConf)('network.host')).concat(url));
+              return _context5.a(2, (0, _getUrl.getUrl)(url));
           }
         }, _callee5);
       }));