@configuratorware/configurator-frontendgui 1.30.0 → 1.30.3

package/App/Modules/Designer/Components/DesignerSelectionToolbox/DesignerSelectionToolbox.js

@@ -13,8 +13,6 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _isEmpty = _interopRequireDefault(require("lodash/isEmpty"));
 
-var _get = _interopRequireDefault(require("lodash/get"));
-
 var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
 
 var _withStyles = _interopRequireDefault(require("@material-ui/core/styles/withStyles"));
@@ -41,6 +39,8 @@ var _Selectors2 = require("../../../../Reducers/DesignData/Selectors");
 
 var _i18n = require("../../../../../Framework/i18n");
 
+var _Transformers = require("../../Utils/Transformers");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -156,7 +156,7 @@ var _handleObjectButtonClick = function handleObjectButtonClick(evt, canvas, onM
 };
 
 var isOriginallyVector = function isOriginallyVector(object) {
-  return object && object.type === 'Image' && /^(eps|pdf|ai|svg)$/i.test((0, _get["default"])(object, 'imageData.original.format', '')) || false;
+  return object && object.type === 'Image' && (0, _Transformers.isOriginalVector)(object.imageData) || false;
 };
 
 exports.isOriginallyVector = isOriginallyVector;

package/App/Modules/Designer/Components/ImageColorPicker/ImageColorPicker.js

@@ -342,9 +342,8 @@ var ImageColorPicker = /*#__PURE__*/function (_React$Component) {
 
       var ow = img.width,
           oh = img.height;
-      var oa = ow / oh;
 
-      if (oa <= 1) {
+      if (ow / oh <= pw / ph) {
         var height = ph;
         var width = height * (ow / oh);
         this.updateCanvasDimensionsAndContent(canvas, img, width, height);

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

@@ -940,7 +940,8 @@ var ImageEditDialogContainer = /*#__PURE__*/function (_React$Component) {
           ImageColorizeComponent = _this$props6.ImageColorizeComponent,
           ImageUploadComponent = _this$props6.ImageUploadComponent,
           customControlElements = _this$props6.customControlElements,
-          checkOwnership = _this$props6.checkOwnership;
+          checkOwnership = _this$props6.checkOwnership,
+          designProductionMethod = _this$props6.designProductionMethod;
       var _this$state3 = this.state,
           preview = _this$state3.preview,
           clipping = _this$state3.clipping,
@@ -996,7 +997,8 @@ var ImageEditDialogContainer = /*#__PURE__*/function (_React$Component) {
           imageColorsWereEdited: imageColorsWereEdited,
           vectorsRequired: vectorsRequired,
           colorAmountList: colorAmountList,
-          customControlElements: customControlElements
+          customControlElements: customControlElements,
+          designProductionMethodName: designProductionMethod === null || designProductionMethod === void 0 ? void 0 : designProductionMethod.title
         }),
         activeTabIndex: activeTabIndex,
         onActiveTabChange: this.onActiveTabChange,
@@ -1142,7 +1144,8 @@ var mapStateToProps = function mapStateToProps(state) {
     usedColors: usedColors,
     hasPlaceHolderImage: hasPlaceHolderImage,
     initialColorMaxAmount: initialColorMaxAmount,
-    colorPreviewRequirementFulfilled: colorPreviewRequirementFulfilled
+    colorPreviewRequirementFulfilled: colorPreviewRequirementFulfilled,
+    designProductionMethod: designProductionMethod
   };
 };
 

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

@@ -61,7 +61,7 @@ var getRasterURL = function getRasterURL(imageURL) {
 exports.getRasterURL = getRasterURL;
 
 var isOriginalVector = function isOriginalVector(imageData) {
-  return /svg|pdf|eps|ai/i.test((0, _get["default"])(imageData, 'original.format', ''));
+  return /^(eps|ept|ps|pdf|ai|svg)$/i.test((0, _get["default"])(imageData, 'original.format', ''));
 };
 
 exports.isOriginalVector = isOriginalVector;

package/App/Reducers/ImageGallery/Selectors.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isColorPreviewCompatible = exports.isHardModified = exports.showVectorizeImageQuality = exports.isVectorFormat = exports.isColorMappingCompatible = exports.isImageReadyToBeAdded = exports.isImageCompatible = exports.isAddMode = exports.isEditMode = exports.getImageUsageInfo = exports.getUserImagesByDesignArea = exports.getUserImage = exports.isEditableVectorImage = exports.getPreviewUrlFromImageData = void 0;
+exports.isColorPreviewCompatible = exports.isHardModified = exports.showVectorizeImageQuality = exports.isColorMappingCompatible = exports.isImageReadyToBeAdded = exports.isImageCompatible = exports.isAddMode = exports.isEditMode = exports.getImageUsageInfo = exports.getUserImagesByDesignArea = exports.getUserImage = exports.isEditableVectorImage = exports.getPreviewUrlFromImageData = void 0;
 
 var _get = _interopRequireDefault(require("lodash/get"));
 
@@ -165,12 +165,6 @@ var isColorMappingCompatible = function isColorMappingCompatible(colorPalettes,
 
 exports.isColorMappingCompatible = isColorMappingCompatible;
 
-var isVectorFormat = function isVectorFormat(extension) {
-  return /^(eps|pdf|ai|svg)$/i.test(extension);
-};
-
-exports.isVectorFormat = isVectorFormat;
-
 var showVectorizeImageQuality = function showVectorizeImageQuality(imageToAnalyse) {
   var minimumPixelAmount = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
 

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@configuratorware/configurator-frontendgui",
-  "version": "1.30.0",
+  "version": "1.30.3",
   "license": "UNLICENSED",
   "private": false,
   "main": "./index.js",
   "dependencies": {
     "@babel/polyfill": "^7.12.1",
-    "@configuratorware/scripts": "1.30.0",
+    "@configuratorware/scripts": "1.30.3",
     "@hot-loader/react-dom": "^17.0.1",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.11.2",
@@ -39,8 +39,8 @@
     "react-router-dom": "^5.2.0",
     "react-swipeable": "^5.5.1",
     "react-zoom-pan-pinch": "^2.1.3",
-    "redhotmagma-graphics-editor": "1.30.0",
-    "redhotmagma-visualization": "1.30.0",
+    "redhotmagma-graphics-editor": "1.30.3",
+    "redhotmagma-visualization": "1.30.3",
     "redux": "^4.1.0",
     "redux-logger": "^3.0.6",
     "redux-persist": "^5.10.0",

package/src/App/Modules/Designer/Components/DesignerSelectionToolbox/DesignerSelectionToolbox.js

@@ -1,7 +1,6 @@
 import React, { useRef, useState } from 'react';
 import PropTypes from 'prop-types';
 import isEmpty from 'lodash/isEmpty';
-import get from 'lodash/get';
 import cloneDeep from 'lodash/cloneDeep';
 import withStyles from '@material-ui/core/styles/withStyles';
 import withWidth from '@material-ui/core/withWidth/withWidth';
@@ -15,6 +14,7 @@ import { isPlaceholderContent } from 'App/Reducers/DesignArea/Selectors';
 import isMobileDevice from 'Framework/Helpers/isMobileDevice';
 import { hasBackgroundColor } from 'App/Reducers/DesignData/Selectors';
 import { t } from 'Framework/i18n';
+import { isOriginalVector } from '../../Utils/Transformers';
 
 const styles = theme => ({
     root: {
@@ -98,10 +98,7 @@ const handleObjectButtonClick = (evt, canvas, onMoveUpClick, onMoveDownClick) =>
 };
 
 export const isOriginallyVector = object =>
-    (object &&
-        object.type === 'Image' &&
-        /^(eps|pdf|ai|svg)$/i.test(get(object, 'imageData.original.format', ''))) ||
-    false;
+    (object && object.type === 'Image' && isOriginalVector(object.imageData)) || false;
 
 const isRaster = object =>
     (object && object.type === 'Image' && /\.(jpe?g|png|gif)$/i.test(object.src)) || false;

package/src/App/Modules/Designer/Components/DesignerSelectionToolbox/DesignerSelectionToolbox.test.js

@@ -23,6 +23,7 @@ describe('Designer/DesignerSelectionToolbox', () => {
         const createObject = (type, format) => ({ type, imageData: { original: { format } } });
 
         expect(isOriginallyVector(createObject('Image', 'eps'))).toEqual(true);
+        expect(isOriginallyVector(createObject('Image', 'ept'))).toEqual(true);
         expect(isOriginallyVector(createObject('Image', 'pdf'))).toEqual(true);
         expect(isOriginallyVector(createObject('Image', 'ai'))).toEqual(true);
         expect(isOriginallyVector(createObject('Image', 'svg'))).toEqual(true);

package/src/App/Modules/Designer/Components/ImageColorPicker/ImageColorPicker.js

@@ -210,9 +210,7 @@ export class ImageColorPicker extends React.Component {
         const { width: pw, height: ph } = container.getBoundingClientRect();
         const { width: ow, height: oh } = img;
 
-        const oa = ow / oh;
-
-        if (oa <= 1) {
+        if (ow / oh <= pw / ph) {
             const height = ph;
             const width = height * (ow / oh);
 

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

@@ -649,6 +649,7 @@ export class ImageEditDialogContainer extends React.Component {
             ImageUploadComponent,
             customControlElements,
             checkOwnership,
+            designProductionMethod,
         } = this.props;
         const {
             preview,
@@ -718,6 +719,7 @@ export class ImageEditDialogContainer extends React.Component {
                             vectorsRequired={vectorsRequired}
                             colorAmountList={colorAmountList}
                             customControlElements={customControlElements}
+                            designProductionMethodName={designProductionMethod?.title}
                         />
                     }
                     activeTabIndex={activeTabIndex}
@@ -818,6 +820,7 @@ const mapStateToProps = state => {
         hasPlaceHolderImage,
         initialColorMaxAmount,
         colorPreviewRequirementFulfilled,
+        designProductionMethod,
     };
 };
 

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

@@ -19,7 +19,8 @@ export const fixSrcURL = src => {
 
 export const getRasterURL = imageURL => ('' + imageURL).replace(/svg$/, 'png');
 
-export const isOriginalVector = imageData => /svg|pdf|eps|ai/i.test(get(imageData, 'original.format', ''));
+export const isOriginalVector = imageData =>
+    /^(eps|ept|ps|pdf|ai|svg)$/i.test(get(imageData, 'original.format', ''));
 
 export const noCache = src => `${src}?${Math.random()}`;
 

package/src/App/Reducers/ImageGallery/Selectors.js

@@ -115,8 +115,6 @@ export const isColorMappingCompatible = (colorPalettes, vectorizeColorsMap) => {
     );
 };
 
-export const isVectorFormat = extension => /^(eps|pdf|ai|svg)$/i.test(extension);
-
 export const showVectorizeImageQuality = (imageToAnalyse, minimumPixelAmount = null) => {
     if (imageToAnalyse) {
         const pixelsInTheImage =

package/src/App/Reducers/ImageGallery/__tests__/Selectors.test.js

@@ -8,7 +8,6 @@ import {
     isImageCompatible,
     isImageReadyToBeAdded,
     showVectorizeImageQuality,
-    isVectorFormat,
     isHardModified,
     isColorPreviewCompatible,
     getPreviewUrlFromImageData,
@@ -624,18 +623,6 @@ describe('Reducers/ImageGallery/Selectors', () => {
         });
     });
 
-    test('isVectorFormat returns true for known vector formats, otherwise false', () => {
-        [
-            ['eps', true],
-            ['pdf', true],
-            ['ai', true],
-            ['svg', true],
-            ['png', false],
-            ['jpg', false],
-            ['gif', false],
-        ].forEach(([format, expectedValue]) => expect(isVectorFormat(format)).toBe(expectedValue));
-    });
-
     test('isHardModified returns true if the related props are changed', () => {
         expect(
             isHardModified(