@configuratorware/configurator-frontendgui 1.57.13 → 1.57.15

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

@@ -299,7 +299,11 @@ var DesignerSelectionToolbox = function DesignerSelectionToolbox(props) {
             var isBulkName = !selectedObject.isBulkName;
             canvas.selectedObject.isBulkName = isBulkName;
             canvas.selectedObject.content = getTextContent({
-              isBulkName: isBulkName
+              isBulkName: isBulkName,
+              styleColors: selectedObject.style.colors,
+              fontItem: currentFontItem,
+              isBold: isBold,
+              isItalic: isItalic
             });
           },
           alignVerticalCenterIcon: alignVerticalCenterIcon,

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

@@ -79,9 +79,17 @@ var mapDispatchToProps = function mapDispatchToProps(dispatch) {
       });
     },
     getTextContent: function getTextContent(_ref) {
-      var isBulkName = _ref.isBulkName;
+      var isBulkName = _ref.isBulkName,
+        styleColors = _ref.styleColors,
+        fontItem = _ref.fontItem,
+        isBold = _ref.isBold,
+        isItalic = _ref.isItalic;
       return _ServiceLocator.Services.designer.createColorizedTextContent((0, _i18n.t)(isBulkName ? 'textControlbox.bulknames' : 'addVisualElement.initialText'), 1, {
-        withPlaceholder: !isBulkName
+        withPlaceholder: !isBulkName,
+        styleColors: styleColors,
+        fontItem: fontItem,
+        isBold: isBold,
+        isItalic: isItalic
       });
     },
     addCustomFont: function addCustomFont(customFont) {

package/App/Reducers/Configurator/Reducer.js

@@ -24,12 +24,17 @@ var _isArray = _interopRequireDefault(require("lodash/isArray"));
 var _find = _interopRequireDefault(require("lodash/find"));
 var _findIndex = _interopRequireDefault(require("lodash/findIndex"));
 var _omit = _interopRequireDefault(require("lodash/omit"));
-var _forEach = _interopRequireDefault(require("lodash/forEach"));
 var _reduce = _interopRequireDefault(require("lodash/reduce"));
 var _set = _interopRequireDefault(require("../../../Utils/Immutable/set"));
 var _Reducer = require("../DesignData/Reducer");
 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); }
+function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+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; } }
+function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
+function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 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; }
 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) { _defineProperty(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; }
@@ -397,6 +402,10 @@ function baseHandler(state, action) {
         var selectedAmountsPath = 'customdata.selectedAmounts';
         var selectedAmounts = (0, _get["default"])(state.configuration, selectedAmountsPath, {});
         var configuration = (0, _set["default"])(state.configuration, selectedAmountsPath, action.amount === 0 ? (0, _omit["default"])(selectedAmounts, action.identifier) : _objectSpread(_objectSpread({}, selectedAmounts), {}, _defineProperty({}, action.identifier, action.amount)));
+        if (action.amount === 0) {
+          var bulkNames = (0, _get["default"])(configuration, 'customdata.bulkNames', {});
+          configuration = (0, _set["default"])(configuration, 'customdata.bulkNames', (0, _omit["default"])(bulkNames, action.identifier));
+        }
         return _objectSpread(_objectSpread({}, state), {}, {
           selectedAmountsUpdated: !!action.isUpdatedByUser,
           configuration: configuration
@@ -406,12 +415,21 @@ function baseHandler(state, action) {
       {
         var srcIdentifier = action.srcIdentifier,
           dstIdentifier = action.dstIdentifier;
+        if (srcIdentifier === dstIdentifier) {
+          return state;
+        }
         var _selectedAmountsPath = 'customdata.selectedAmounts';
         var _selectedAmounts = (0, _get["default"])(state.configuration, _selectedAmountsPath, {});
         if (!(srcIdentifier in _selectedAmounts)) {
           return state;
         }
         var _configuration3 = (0, _set["default"])(state.configuration, _selectedAmountsPath, (0, _omit["default"])(_objectSpread(_objectSpread({}, _selectedAmounts), {}, _defineProperty({}, dstIdentifier, _selectedAmounts[srcIdentifier])), srcIdentifier));
+        var _bulkNames = (0, _get["default"])(_configuration3, 'customdata.bulkNames', {});
+        if (srcIdentifier in _bulkNames) {
+          _configuration3 = (0, _set["default"])(_configuration3, 'customdata.bulkNames', (0, _omit["default"])(_objectSpread(_objectSpread({}, _bulkNames), {}, _defineProperty({}, dstIdentifier, _bulkNames[srcIdentifier])), srcIdentifier));
+        } else if (dstIdentifier in _bulkNames) {
+          _configuration3 = (0, _set["default"])(_configuration3, 'customdata.bulkNames', (0, _omit["default"])(_bulkNames, dstIdentifier));
+        }
         return _objectSpread(_objectSpread({}, state), {}, {
           configuration: _configuration3
         });
@@ -419,11 +437,18 @@ function baseHandler(state, action) {
     case actionTypes.SET_SELECTED_AMOUNTS:
       {
         var _selectedAmountsPath2 = 'configuration.customdata.selectedAmounts';
+        var bulkNamesPath = 'configuration.customdata.bulkNames';
         var _selectedAmounts2 = (0, _get["default"])(state, _selectedAmountsPath2, {});
         var nextAmounts = _objectSpread(_objectSpread({}, _selectedAmounts2), action.sizes);
+        var removedIdentifiers = (0, _filter["default"])(Object.keys(action.sizes || {}), function (identifier) {
+          return action.sizes[identifier] === 0;
+        });
         var newState = _objectSpread(_objectSpread({}, state), {}, {
           selectedAmountsUpdated: !!action.isUpdatedByUser
         });
+        if (removedIdentifiers.length > 0) {
+          newState = (0, _set["default"])(newState, bulkNamesPath, (0, _omit["default"])((0, _get["default"])(state, bulkNamesPath, {}), removedIdentifiers));
+        }
         return (0, _set["default"])(newState, _selectedAmountsPath2, _objectSpread({}, (0, _reduce["default"])(nextAmounts, function (selectedAmounts, amount, identifier) {
           if (amount !== 0) {
             return _objectSpread(_objectSpread({}, selectedAmounts), {}, _defineProperty({}, identifier, amount));
@@ -435,16 +460,12 @@ function baseHandler(state, action) {
     case actionTypes.DELETE_SELECTED_AMOUNTS:
       {
         var _selectedAmountsPath3 = 'configuration.customdata.selectedAmounts';
-        var _selectedAmounts3 = (0, _cloneDeep["default"])((0, _get["default"])(state, _selectedAmountsPath3, {}));
-        (0, _forEach["default"])(_selectedAmounts3, function (selectedAmount, identifier) {
-          var variantIdentifier = (0, _find["default"])(action.variant.sizes, {
-            identifier: identifier
-          });
-          if (variantIdentifier) {
-            delete _selectedAmounts3[variantIdentifier.identifier];
-          }
-        });
-        return (0, _set["default"])(state, _selectedAmountsPath3, _selectedAmounts3);
+        var _bulkNamesPath = 'configuration.customdata.bulkNames';
+        var sizeIdentifiers = (0, _reduce["default"])((0, _get["default"])(action, 'variant.sizes', []), function (identifiers, size) {
+          return size !== null && size !== void 0 && size.identifier ? [].concat(_toConsumableArray(identifiers), [size.identifier]) : identifiers;
+        }, []);
+        var nextState = (0, _set["default"])(state, _selectedAmountsPath3, (0, _omit["default"])((0, _get["default"])(state, _selectedAmountsPath3, {}), sizeIdentifiers));
+        return (0, _set["default"])(nextState, _bulkNamesPath, (0, _omit["default"])((0, _get["default"])(state, _bulkNamesPath, {}), sizeIdentifiers));
       }
     default:
       return state;
@@ -485,9 +506,9 @@ function configurationModifierHandler(state, action) {
     case actionTypes.DELETE_SELECTED_AMOUNT:
       {
         var selectedAmountsPath = 'configuration.customdata.selectedAmounts';
-        var selectedAmounts = (0, _cloneDeep["default"])((0, _get["default"])(state, selectedAmountsPath, {}));
-        delete selectedAmounts[action.identifier];
-        return (0, _set["default"])(state, selectedAmountsPath, selectedAmounts);
+        var _bulkNamesPath2 = 'configuration.customdata.bulkNames';
+        var nextState = (0, _set["default"])(state, selectedAmountsPath, (0, _omit["default"])((0, _get["default"])(state, selectedAmountsPath, {}), action.identifier));
+        return (0, _set["default"])(nextState, _bulkNamesPath2, (0, _omit["default"])((0, _get["default"])(state, _bulkNamesPath2, {}), action.identifier));
       }
     case actionTypes.SET_SELECTED_CALCULATION:
       {

package/App/Reducers/DesignArea/Selectors.js

@@ -61,6 +61,8 @@ var _exportNames = {
   findSmallestFontSizeInCanvasData: true,
   createColorData: true,
   parseColorData: true,
+  normalizeTextColorData: true,
+  getColorDataForTextContent: true,
   getCameraViewListForDesignAreaList: true,
   getDesignViewListForDesignAreas: true,
   getDesignAreaFromSelectedDesignView: true,
@@ -93,6 +95,7 @@ exports.getAvailableColorsForDesignProductionMethod = getAvailableColorsForDesig
 exports.getCameraViewListForDesignAreaList = void 0;
 exports.getCanvasSizeFromDesignArea = getCanvasSizeFromDesignArea;
 exports.getCanvasSizeFromDesignProductionMethod = getCanvasSizeFromDesignProductionMethod;
+exports.getColorDataForTextContent = void 0;
 exports.getColorOverlayData = getColorOverlayData;
 exports.getColorPalettes = void 0;
 exports.getColors = getColors;
@@ -139,7 +142,7 @@ exports.isHighlighted = isHighlighted;
 exports.isOneLineText = isOneLineText;
 exports.isPlaceholderContent = void 0;
 exports.isThereAFatalError = isThereAFatalError;
-exports.rgbToHex = exports.rgbString2hex = exports.rgbObjToHex = exports.parseColorData = exports.isVectorizedLogoMandatory = exports.isValidHex = void 0;
+exports.rgbToHex = exports.rgbString2hex = exports.rgbObjToHex = exports.parseColorData = exports.normalizeTextColorData = exports.isVectorizedLogoMandatory = exports.isValidHex = void 0;
 var _get = _interopRequireDefault(require("lodash/get"));
 var _first = _interopRequireDefault(require("lodash/first"));
 var _find2 = _interopRequireDefault(require("lodash/find"));
@@ -801,6 +804,35 @@ var parseColorData = exports.parseColorData = function parseColorData(jsonStr) {
     color: null
   }, colorData);
 };
+
+/**
+ * Normalizes canvas text color entries (style.colors or text editor) for HTML generation.
+ * @param {{ identifier: string|object, value: string }|null|undefined} color
+ * @returns {{ identifier: string, value: string }|null}
+ */
+var normalizeTextColorData = exports.normalizeTextColorData = function normalizeTextColorData(color) {
+  if (!(color !== null && color !== void 0 && color.identifier) || !(color !== null && color !== void 0 && color.value)) {
+    return null;
+  }
+  var identifier = typeof color.identifier === 'string' ? color.identifier : JSON.stringify(color.identifier);
+  return {
+    identifier: identifier,
+    value: color.value.toLowerCase()
+  };
+};
+
+/**
+ * Color from canvas object style.colors (parsed from content HTML).
+ * @param {{ styleColors?: Array }} params
+ * @returns {{ identifier: string, value: string }|null}
+ */
+var getColorDataForTextContent = exports.getColorDataForTextContent = function getColorDataForTextContent(_ref10) {
+  var styleColors = _ref10.styleColors;
+  if ((styleColors === null || styleColors === void 0 ? void 0 : styleColors.length) > 0) {
+    return normalizeTextColorData(styleColors[0]);
+  }
+  return null;
+};
 var getCameraViewListForDesignAreaList = exports.getCameraViewListForDesignAreaList = function getCameraViewListForDesignAreaList(filteredDesignAreas, designedAreas) {
   return ['default'].concat(filteredDesignAreas
   // get the design area objects by their id
@@ -958,8 +990,8 @@ var contentHasText = exports.contentHasText = function contentHasText(content) {
   return /\S/.test(div.textContent);
 };
 var getDesignAreaImageCompatibilityInfo = exports.getDesignAreaImageCompatibilityInfo = function getDesignAreaImageCompatibilityInfo(designProductionMethod) {
-  var colorPalettes = ((0, _get["default"])(designProductionMethod, 'colorPalettes') || []).map(function (_ref10) {
-    var identifier = _ref10.identifier;
+  var colorPalettes = ((0, _get["default"])(designProductionMethod, 'colorPalettes') || []).map(function (_ref11) {
+    var identifier = _ref11.identifier;
     return identifier;
   }).sort();
   var vectorsRequired = !!(0, _get["default"])(designProductionMethod, 'options.vectorsRequired');
@@ -1016,8 +1048,8 @@ var getVectorizedImageColor = exports.getVectorizedImageColor = function getVect
   }
   return {};
 };
-var areAllDesignAreasEmpty = exports.areAllDesignAreasEmpty = function areAllDesignAreasEmpty(_ref11) {
-  var configuration = _ref11.configuration;
+var areAllDesignAreasEmpty = exports.areAllDesignAreasEmpty = function areAllDesignAreasEmpty(_ref12) {
+  var configuration = _ref12.configuration;
   var designdata = (0, _get["default"])(configuration, 'designdata', {});
   for (var key in designdata) {
     if (!designdata.hasOwnProperty(key)) {
@@ -1082,8 +1114,8 @@ var getImagesByDesignArea = exports.getImagesByDesignArea = function getImagesBy
     designAreaIdentifier = getSelectedDesignArea(state).identifier;
   }
   var designData = getDesignDataByDesignAreaIdentifier(state, designAreaIdentifier);
-  return (0, _get["default"])(designData, 'canvasData.objects', []).filter(function (_ref12) {
-    var type = _ref12.type;
+  return (0, _get["default"])(designData, 'canvasData.objects', []).filter(function (_ref13) {
+    var type = _ref13.type;
     return type === 'Image';
   });
 };

package/App/Reducers/Fonts/Selectors.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getDefaultFont = getDefaultFont;
-exports.getFontMapping = exports.getDefaultFontParams = void 0;
+exports.getTextContentFontParamsFromSelection = exports.getFontMapping = exports.getDefaultFontParams = void 0;
 exports.getUsedCustomFontsInEditor = getUsedCustomFontsInEditor;
 var _first = _interopRequireDefault(require("lodash/first"));
 var _each = _interopRequireDefault(require("lodash/each"));
@@ -27,6 +27,33 @@ function getDefaultFont(state) {
     isDefault: true
   }) || (0, _first["default"])(fonts);
 }
+var stringifyFontParams = function stringifyFontParams(fontParams) {
+  return Object.keys(fontParams).map(function (prop) {
+    return "".concat(prop, ": ").concat(fontParams[prop], ";");
+  }).join(' ');
+};
+
+/**
+ * Inline font CSS from the text toolbar selection (font family + bold/italic).
+ * @param {{ fontItem?: { family?: string }, isBold?: boolean, isItalic?: boolean }} params
+ * @returns {string}
+ */
+var getTextContentFontParamsFromSelection = exports.getTextContentFontParamsFromSelection = function getTextContentFontParamsFromSelection(_ref) {
+  var fontItem = _ref.fontItem,
+    isBold = _ref.isBold,
+    isItalic = _ref.isItalic;
+  if (!(fontItem !== null && fontItem !== void 0 && fontItem.family)) {
+    return '';
+  }
+  var fontParams = {
+    'font-family': "\"".concat(escapeQuotes(fontItem.family), "\""),
+    'font-weight': isBold ? 'bold' : 'normal',
+    'font-style': isItalic ? 'italic' : 'normal'
+  };
+  return Object.keys(fontParams).map(function (prop) {
+    return "".concat(prop, ": ").concat(fontParams[prop], ";");
+  }).join(' ');
+};
 var getDefaultFontParams = exports.getDefaultFontParams = function getDefaultFontParams(state) {
   var stringify = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
   var defaultFont = getDefaultFont(state);
@@ -35,12 +62,10 @@ var getDefaultFontParams = exports.getDefaultFontParams = function getDefaultFon
     'font-weight': 'normal',
     'font-style': 'normal'
   };
-  return stringify ? Object.keys(fontParams).map(function (prop) {
-    return "".concat(prop, ": ").concat(fontParams[prop], ";");
-  }).join(' ') : fontParams;
+  return stringify ? stringifyFontParams(fontParams) : fontParams;
 };
-var getFontMapping = exports.getFontMapping = (0, _createSelector["default"])(function (_ref) {
-  var fonts = _ref.fonts;
+var getFontMapping = exports.getFontMapping = (0, _createSelector["default"])(function (_ref2) {
+  var fonts = _ref2.fonts;
   return fonts;
 }, function (fonts) {
   var typeToUrlProp = {
@@ -67,11 +92,11 @@ function getUsedCustomFontsInEditor(state) {
   var designdata = (0, _get["default"])(state, 'configurator.configuration.designdata') || {};
   Object.values(designdata).forEach(function (designAreaData) {
     var objects = (0, _get["default"])(designAreaData, 'canvasData.objects') || [];
-    objects.filter(function (_ref2) {
-      var type = _ref2.type;
+    objects.filter(function (_ref3) {
+      var type = _ref3.type;
       return type === 'Text';
-    }).forEach(function (_ref3) {
-      var fontItem = _ref3.fontItem;
+    }).forEach(function (_ref4) {
+      var fontItem = _ref4.fontItem;
       if (fontItem.isCustomFont) {
         var customFontObj = _objectSpread(_objectSpread({}, getDefaultFont(state)), fontItem);
         !(0, _find["default"])(usedCustomFonts, customFontObj) && usedCustomFonts.push(customFontObj);

package/App/Services/DesignerService.js

@@ -477,14 +477,32 @@ var DesignerService = exports["default"] = /*#__PURE__*/function () {
       var colorCount = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1;
       var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
       var _options$withPlacehol = options.withPlaceholder,
-        withPlaceholder = _options$withPlacehol === void 0 ? true : _options$withPlacehol;
+        withPlaceholder = _options$withPlacehol === void 0 ? true : _options$withPlacehol,
+        _options$styleColors = options.styleColors,
+        styleColors = _options$styleColors === void 0 ? null : _options$styleColors,
+        _options$fontItem2 = options.fontItem,
+        fontItem = _options$fontItem2 === void 0 ? null : _options$fontItem2,
+        _options$isBold = options.isBold,
+        isBold = _options$isBold === void 0 ? false : _options$isBold,
+        _options$isItalic = options.isItalic,
+        isItalic = _options$isItalic === void 0 ? false : _options$isItalic;
       var state = _ServiceLocator.Services.store.state;
-      var fontParams = (0, _Selectors3.getDefaultFontParams)(state);
+      var selectionFontParams = (0, _Selectors3.getTextContentFontParamsFromSelection)({
+        fontItem: fontItem,
+        isBold: isBold,
+        isItalic: isItalic
+      });
+      var fontParams = selectionFontParams || (0, _Selectors3.getDefaultFontParams)(state);
       var chunkLength = Math.ceil(str.length / colorCount);
       var content = str.match(new RegExp(".{1,".concat(chunkLength, "}"), 'g')).map(function (chunk, idx) {
-        var color = (0, _Selectors2.getDefaultTextColor)(state, colorCount > 1 ? idx : null);
-        var lastImageColor = (0, _Selectors2.getVectorizedImageColor)(state);
-        var colorData = (0, _isEmpty["default"])(lastImageColor) ? (0, _Selectors2.createColorData)(color.identifier, color.paletteIdentifier, color.custom, color.value) : lastImageColor;
+        var colorData = (0, _Selectors2.getColorDataForTextContent)({
+          styleColors: styleColors
+        });
+        if (!colorData) {
+          var color = (0, _Selectors2.getDefaultTextColor)(state, colorCount > 1 ? idx : null);
+          var lastImageColor = (0, _Selectors2.getVectorizedImageColor)(state);
+          colorData = (0, _isEmpty["default"])(lastImageColor) ? (0, _Selectors2.createColorData)(color.identifier, color.paletteIdentifier, color.custom, color.value) : lastImageColor;
+        }
         return "<span style='color: ".concat(colorData.value, "; ").concat(fontParams, "' data-color='").concat(colorData.identifier, "'>").concat(chunk, "</span>");
       }).join('');
       return withPlaceholder ? (0, _Modifiers.createTextPlaceholder)(content) : content;

package/App/Shared/Components/AmountInput/index.js

@@ -87,15 +87,6 @@ var AmountInput = /*#__PURE__*/function (_React$Component) {
       value: '',
       changeInprogress: false
     });
-    _defineProperty(_assertThisInitialized(_this), "updateDebounced", (0, _debounce["default"])(function () {
-      var _assertThisInitialize = _assertThisInitialized(_this),
-        value = _assertThisInitialize.props.value;
-      if (value !== _this.state.value) {
-        _this.setState({
-          value: value
-        });
-      }
-    }, 500));
     _defineProperty(_assertThisInitialized(_this), "validateKey", function (event) {
       var regEx = /^[0-9\b]+$/;
       var keyCode = event.keyCode || event.which;
@@ -104,46 +95,65 @@ var AmountInput = /*#__PURE__*/function (_React$Component) {
         event.preventDefault();
       }
     });
+    _defineProperty(_assertThisInitialized(_this), "hasPendingChange", false);
+    // An empty field means the user is retyping: committing 0 here would drop data tied to the amount
+    // (e.g. bulk names). It is committed on blur or unmount instead.
     _defineProperty(_assertThisInitialized(_this), "onChangeDebounced", (0, _debounce["default"])(function () {
-      _this.props.onChange(_this.state.value === '' ? 0 : _this.state.value);
+      if (_this.state.value === '') {
+        return;
+      }
+      _this.hasPendingChange = false;
+      _this.props.onChange(_this.state.value);
     }, _this.props.onChangeDebounceWait));
     _defineProperty(_assertThisInitialized(_this), "onChange", function (_ref) {
       var inputValue = _ref.target.value;
       var _this$props = _this.props,
         min = _this$props.min,
         max = _this$props.max;
-      var value = !inputValue ? inputValue : Math.min(max, Math.max(min, parseInt(inputValue)));
+      var value = !inputValue ? inputValue : Math.min(max, Math.max(min, parseInt(inputValue, 10)));
+      _this.hasPendingChange = true;
       _this.setState({
-        value: isNaN(value) ? '' : value
+        value: Number.isNaN(value) ? '' : value
       }, _this.onChangeDebounced);
     });
     _defineProperty(_assertThisInitialized(_this), "onBlur", function (event) {
-      var value = event.target.value;
       var _this$props2 = _this.props,
         onChange = _this$props2.onChange,
         onBlur = _this$props2.onBlur,
         min = _this$props2.min,
+        readOnly = _this$props2.readOnly,
         hasValueLabel = _this$props2.hasValueLabel;
-      _this.setState({
-        changeInprogress: false
-      });
-      if (value === '') {
-        var initialValue = min;
+      if (readOnly) {
         _this.setState({
-          value: initialValue
+          changeInprogress: false,
+          value: _this.props.value
         });
-        onChange(initialValue);
+        onBlur && onBlur(event);
+        return;
       }
-      if (hasValueLabel) {
-        _this.updateDebounced();
+      _this.onChangeDebounced.cancel();
+      var isCleared = _this.state.value === '';
+      var shouldCommit = _this.hasPendingChange || isCleared;
+      var committedValue = isCleared ? min : _this.state.value;
+      _this.hasPendingChange = false;
+      _this.setState({
+        changeInprogress: false,
+        value: hasValueLabel ? _this.props.value : committedValue
+      });
+      if (shouldCommit) {
+        onChange(committedValue);
       }
       onBlur && onBlur(event);
     });
     _defineProperty(_assertThisInitialized(_this), "onFocus", function (event) {
-      var onFocus = _this.props.onFocus;
-      _this.setState({
-        changeInprogress: true
-      });
+      var _this$props3 = _this.props,
+        onFocus = _this$props3.onFocus,
+        readOnly = _this$props3.readOnly;
+      if (!readOnly) {
+        _this.setState({
+          changeInprogress: true
+        });
+      }
       onFocus && onFocus(event);
     });
     return _this;
@@ -151,35 +161,46 @@ var AmountInput = /*#__PURE__*/function (_React$Component) {
   _createClass(AmountInput, [{
     key: "componentDidMount",
     value: function componentDidMount() {
-      var value = this.props.value;
       this.setState({
-        value: value
+        value: this.props.value
       });
     }
   }, {
     key: "componentDidUpdate",
     value: function componentDidUpdate(prevProps) {
-      var value = this.props.value;
-      if (prevProps.value !== value && !this.state.changeInprogress) {
-        this.updateDebounced();
+      var _this$props4 = this.props,
+        value = _this$props4.value,
+        readOnly = _this$props4.readOnly;
+      if (prevProps.value !== value && (readOnly || !this.state.changeInprogress)) {
+        this.setState({
+          value: value
+        });
+      }
+    }
+  }, {
+    key: "componentWillUnmount",
+    value: function componentWillUnmount() {
+      this.onChangeDebounced.cancel();
+      if (this.hasPendingChange) {
+        this.props.onChange(this.state.value === '' ? this.props.min : this.state.value);
       }
     }
   }, {
     key: "render",
     value: function render() {
-      var _this$props3 = this.props,
-        classes = _this$props3.classes,
-        amountLabel = _this$props3.amountLabel,
-        min = _this$props3.min,
-        max = _this$props3.max,
-        autoFocus = _this$props3.autoFocus,
-        error = _this$props3.error,
-        disabled = _this$props3.disabled,
-        onClick = _this$props3.onClick,
-        readOnly = _this$props3.readOnly,
-        rootProps = _this$props3.rootProps,
-        inputProps = _this$props3.inputProps,
-        type = _this$props3.type;
+      var _this$props5 = this.props,
+        classes = _this$props5.classes,
+        amountLabel = _this$props5.amountLabel,
+        min = _this$props5.min,
+        max = _this$props5.max,
+        autoFocus = _this$props5.autoFocus,
+        error = _this$props5.error,
+        disabled = _this$props5.disabled,
+        onClick = _this$props5.onClick,
+        readOnly = _this$props5.readOnly,
+        rootProps = _this$props5.rootProps,
+        inputProps = _this$props5.inputProps,
+        type = _this$props5.type;
       return /*#__PURE__*/_react["default"].createElement(_TextField["default"], {
         value: this.state.value,
         onChange: this.onChange,

package/App/Shared/Components/ProductVariant/index.js

@@ -351,8 +351,8 @@ var ProductVariant = /*#__PURE__*/function (_React$Component) {
           }
         }, (0, _i18n.t)('productVariant.confirmSelection'))), (0, _get["default"])(variant, 'sizes.length', 0) === 0 && /*#__PURE__*/_react["default"].createElement(_AmountInput["default"], {
           value: variant.amount + ' ' + (0, _i18n.t)('amountSelection.amount'),
-          hasValueLabel: true,
           amountLabel: (0, _i18n.t)('productVariant.amountLabel'),
+          hasValueLabel: true,
           onChange: _this2.handleChange(variant),
           onClick: _this2.handleBulkNameForm(variant),
           error: hasError(variant.identifier, error),

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@configuratorware/configurator-frontendgui",
-  "version": "1.57.13",
+  "version": "1.57.15",
   "license": "UNLICENSED",
   "private": false,
   "main": "./index.js",
   "dependencies": {
     "@babel/polyfill": "^7.12.1",
-    "@configuratorware/scripts": "1.57.13",
+    "@configuratorware/scripts": "1.57.15",
     "@material-ui/core": "^4.12.4",
     "@material-ui/icons": "^4.11.3",
     "@material-ui/lab": "^4.0.0-alpha.61",
@@ -36,8 +36,8 @@
     "react-router-dom": "^5.3.4",
     "react-swipeable": "^5.5.1",
     "react-zoom-pan-pinch": "^2.1.3",
-    "redhotmagma-graphics-editor": "1.57.13",
-    "redhotmagma-visualization": "1.57.13",
+    "redhotmagma-graphics-editor": "1.57.15",
+    "redhotmagma-visualization": "1.57.15",
     "redux": "^4.1.0",
     "redux-logger": "^3.0.6",
     "redux-persist": "^5.10.0",

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

@@ -345,6 +345,10 @@ const DesignerSelectionToolbox = props => {
                                                     canvas.selectedObject.isBulkName = isBulkName;
                                                     canvas.selectedObject.content = getTextContent({
                                                         isBulkName,
+                                                        styleColors: selectedObject.style.colors,
+                                                        fontItem: currentFontItem,
+                                                        isBold,
+                                                        isItalic,
                                                     });
                                                 }}
                                                 alignVerticalCenterIcon={alignVerticalCenterIcon}

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

@@ -59,12 +59,16 @@ const mapDispatchToProps = dispatch => ({
     },
     openImageEditDialog: (identifier, canvas, placeholderImageUpdate = false) =>
         Services.designer.openImageEditDialog(identifier, canvas, { placeholderImageUpdate }),
-    getTextContent: ({ isBulkName }) =>
+    getTextContent: ({ isBulkName, styleColors, fontItem, isBold, isItalic }) =>
         Services.designer.createColorizedTextContent(
             t(isBulkName ? 'textControlbox.bulknames' : 'addVisualElement.initialText'),
             1,
             {
                 withPlaceholder: !isBulkName,
+                styleColors,
+                fontItem,
+                isBold,
+                isItalic,
             }
         ),
     addCustomFont: customFont => {