@crystaldesign/web-planner-logic 26.14.0-beta.32 → 26.14.0-beta.33

package/build/cjs/{index-03575eb4.js → index-11211a0e.js}

@@ -2068,7 +2068,7 @@ function isPropertyOn(value) {
 
 /** The encoding per property codex, for one entity. */
 
-/** 100 properties parsed on the catalog entity. */
+/** 101 properties parsed on the catalog entity. */
 var CATALOG_PROPERTIES = {
   '3D_COMPATIBLE_WITH_IMAGE_CACHE': 'boolean:1',
   ACCESSOIRE_STEP_AS_PLANNER: 'boolean:1',
@@ -2165,6 +2165,7 @@ var CATALOG_PROPERTIES = {
   USEGLOBALSVGSCALE: 'boolean:1',
   USEPOSCOUNTVALUE: 'boolean:1',
   USEPRGASOPVARTICLENR: 'boolean:1',
+  USE_ARTICLE_NAME_AS_TITLE: 'boolean:1',
   USE_DECISION_POS_COUNT_VALUE: 'boolean:1',
   USE_DIOMEX_CONFIG_LOGIC: 'boolean:1',
   USE_SHELFPLANNER_RTV: 'boolean:1',
@@ -18144,6 +18145,21 @@ function measureInUnit(centimeters, unit) {
   return Math.round(centimeters / TO_CENTIMETERS[unit](1) * 1e6) / 1e6;
 }
 
+/** The symbol of each IDM length code, the same in every language. */
+var SYMBOL_OF_IDM_CODE = {
+  MMT: 'mm',
+  CMT: 'cm',
+  DMT: 'dm',
+  MTR: 'm',
+  INH: 'in'
+};
+
+/** An option's unit as people read it: the symbol of an IDM length code (MMT → mm), any other unit as the catalog writes it. */
+function measureUnitSymbol(unit) {
+  var code = idmMeasureUnit(unit);
+  return code && Object.prototype.hasOwnProperty.call(SYMBOL_OF_IDM_CODE, code) ? SYMBOL_OF_IDM_CODE[code] : unit;
+}
+
 var LOG$s = DivaUtils__default["default"].initLog('Planner', 'WEB-PLANNER-LOGIC');
 var OptionValueCatalogData = /*#__PURE__*/function () {
   function OptionValueCatalogData(opv, catalogData) {
@@ -22238,7 +22254,7 @@ function _loadMoreFromIDMArticles() {
               while (1) switch (_context5.prev = _context5.next) {
                 case 0:
                   prfgNo = _step6.value;
-                  if (!set.CatalogData.getPricefeaturegroup(prfgNo)) {
+                  if (!catalogData.getPricefeaturegroup(prfgNo)) {
                     _context5.next = 3;
                     break;
                   }
@@ -22250,7 +22266,7 @@ function _loadMoreFromIDMArticles() {
                   }).map(function (a) {
                     return a.articleCodex;
                   });
-                  set.CatalogData.reportMissingPricefeaturegroup(prfgNo, {
+                  catalogData.reportMissingPricefeaturegroup(prfgNo, {
                     articleCodices: askedBy
                   });
                 case 5:
@@ -22404,7 +22420,7 @@ function _loadMoreFromIDMArticles() {
               while (1) switch (_context6.prev = _context6.next) {
                 case 0:
                   featureNo = _step7.value;
-                  if (!set.CatalogData.loadedFeatures.some(function (f) {
+                  if (!catalogData.loadedFeatures.some(function (f) {
                     return f.featureNo == featureNo;
                   })) {
                     _context6.next = 3;
@@ -22417,7 +22433,7 @@ function _loadMoreFromIDMArticles() {
                   }).map(function (fc) {
                     return fc.featureClassNo;
                   });
-                  set.CatalogData.reportMissingFeature(Number(featureNo), {
+                  catalogData.reportMissingFeature(Number(featureNo), {
                     featureClassNos: askedBy
                   });
                 case 5:
@@ -24611,6 +24627,11 @@ var DivaCatalogData = /*#__PURE__*/function () {
     get: function get() {
       return this.catalogProps.divaForceRTV;
     }
+  }, {
+    key: "useArticleNameAsTitle",
+    get: function get() {
+      return this.catalogProps.useArticleNameAsTitle;
+    }
   }, {
     key: "PlannerMeasureDigits",
     get: function get() {
@@ -25438,6 +25459,10 @@ var DivaCatalogData = /*#__PURE__*/function () {
           case 'DIVA3D_AR_FORCERTV':
             _this2.catalogProps.divaForceRTV = item.Value === true;
             break;
+          case 'USE_ARTICLE_NAME_AS_TITLE':
+            // no stored value = not set: the view config keeps deciding
+            _this2.catalogProps.useArticleNameAsTitle = item.Value === undefined ? undefined : item.Value === true;
+            break;
           case 'DIVA3D_USE_RTV_NEXT':
             _this2.catalogProps.divaUseRtvNext = item.Value === true;
             break;
@@ -28835,20 +28860,18 @@ var DivaEngine = /*#__PURE__*/function () {
               }
               break;
           }
-          if ((mUnit || OP == 'OPTUMFANG' || OP == 'OPTUMFANG_KREIS') && this.article.parentHasSameOption(OP) && !((_ops$addToMeasure = ops.addToMeasure) !== null && _ops$addToMeasure !== void 0 && _ops$addToMeasure.length)) {
+          var perimeter = this.article.getPerimeter(OP);
+          if ((mUnit || perimeter !== undefined) && this.article.parentHasSameOption(OP) && !((_ops$addToMeasure = ops.addToMeasure) !== null && _ops$addToMeasure !== void 0 && _ops$addToMeasure.length)) {
             var freeTextMeasure = parseFloat(ops.freeText ? ops.freeText : '');
             var newFreeTextMeasure = this.article.calcAddToMeasure(OP, freeTextMeasure);
             if (newFreeTextMeasure) LOG$j.debug('freetext changed by addToMeasure at price calculation', newFreeTextMeasure, freeTextMeasure, ops.addToMeasure);
             freeTextMeasure = newFreeTextMeasure;
-            if (freeTextMeasure || OP == 'OPTUMFANG' || OP == 'OPTUMFANG_KREIS') {
+            if (freeTextMeasure || perimeter !== undefined) {
               if (calcUnitPrice != 0) {
                 var quantity = 0;
-                if (OP == 'OPTUMFANG') {
-                  mUnit = 'cm';
-                  quantity = this.article.calcWidth * 2 + this.article.calcDepth * 2;
-                } else if (OP == 'OPTUMFANG_KREIS') {
+                if (perimeter !== undefined) {
                   mUnit = 'cm';
-                  quantity = this.article.calcWidth * Math.PI;
+                  quantity = perimeter;
                 } else {
                   quantity = freeTextMeasure;
                 }
@@ -33518,6 +33541,14 @@ var DivaArticle = /*#__PURE__*/function () {
         this.actPlannerData.depthFromSVG = false;
       }
     }
+    /** The band length in cm the perimeter options OPTUMFANG and OPTUMFANG_KREIS stand for; undefined for every other option. */
+  }, {
+    key: "getPerimeter",
+    value: function getPerimeter(optionCodex) {
+      if (optionCodex == 'OPTUMFANG') return this.calcWidth * 2 + this.calcDepth * 2;
+      if (optionCodex == 'OPTUMFANG_KREIS') return this.calcWidth * Math.PI;
+      return undefined;
+    }
   }, {
     key: "height",
     get: function get() {
@@ -33737,25 +33768,57 @@ var DivaArticle = /*#__PURE__*/function () {
       }
       return ret;
     }
+
+    /**
+     * Options that hold different values inside this article's partlist tree, e.g. a frame and a headboard with their
+     * own fabric. The flat VisibleVariantValues can keep only one of those values.
+     */
   }, {
-    key: "AllVariantValues",
+    key: "conflictingOptionCodices",
     get: function get() {
-      var ret = {};
-      var opss = this.getAllArticleOptionsStates();
-      var _iterator11 = _createForOfIteratorHelper$o(opss),
+      var values = new Map();
+      var conflicting = new Set();
+      var _iterator11 = _createForOfIteratorHelper$o(this.getAllArticleOptionsStates()),
         _step11;
       try {
         for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
+          var _ops$freeText2;
           var ops = _step11.value;
+          if (!ops.valCodex) continue;
+          var value = ops.valCodex + ((_ops$freeText2 = ops.freeText) !== null && _ops$freeText2 !== void 0 ? _ops$freeText2 : '');
+          var otherValue = values.get(ops.optionCodex);
+          if (otherValue !== undefined && otherValue !== value) {
+            conflicting.add(ops.optionCodex);
+            conflicting.add(ops.optionCodex + '_val');
+          }
+          values.set(ops.optionCodex, value);
+        }
+      } catch (err) {
+        _iterator11.e(err);
+      } finally {
+        _iterator11.f();
+      }
+      return conflicting;
+    }
+  }, {
+    key: "AllVariantValues",
+    get: function get() {
+      var ret = {};
+      var opss = this.getAllArticleOptionsStates();
+      var _iterator12 = _createForOfIteratorHelper$o(opss),
+        _step12;
+      try {
+        for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
+          var ops = _step12.value;
           ret[ops.optionCodex] = ops.valCodex;
           if (ops.freeText) {
             ret[ops.optionCodex + '_val'] = ops.freeText;
           }
         }
       } catch (err) {
-        _iterator11.e(err);
+        _iterator12.e(err);
       } finally {
-        _iterator11.f();
+        _iterator12.f();
       }
       return ret;
     }
@@ -33763,12 +33826,12 @@ var DivaArticle = /*#__PURE__*/function () {
     key: "VariantValuesWithoutEmptyFreetext",
     get: function get() {
       var ret = {};
-      var _iterator12 = _createForOfIteratorHelper$o(this.articleOptionStates.values()),
-        _step12;
+      var _iterator13 = _createForOfIteratorHelper$o(this.articleOptionStates.values()),
+        _step13;
       try {
-        for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
+        for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
           var _ops$freeTextLang;
-          var ops = _step12.value;
+          var ops = _step13.value;
           // free text entered per language (classification) lives in freeTextLang only, in any of its languages; 'OPV_TEXT_FREI' is the codex, not a text
           var hasFreeTextLang = Object.values((_ops$freeTextLang = ops.freeTextLang) !== null && _ops$freeTextLang !== void 0 ? _ops$freeTextLang : {}).some(function (text) {
             return !!text && text !== 'OPV_TEXT_FREI';
@@ -33778,9 +33841,9 @@ var DivaArticle = /*#__PURE__*/function () {
           }
         }
       } catch (err) {
-        _iterator12.e(err);
+        _iterator13.e(err);
       } finally {
-        _iterator12.f();
+        _iterator13.f();
       }
       return ret;
     }
@@ -33788,12 +33851,12 @@ var DivaArticle = /*#__PURE__*/function () {
     key: "VariantValuesParentOption",
     get: function get() {
       var ret = {};
-      var _iterator13 = _createForOfIteratorHelper$o(this.articleOptionStates.values()),
-        _step13;
+      var _iterator14 = _createForOfIteratorHelper$o(this.articleOptionStates.values()),
+        _step14;
       try {
-        for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
+        for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
           var _ops$optionOcd;
-          var ops = _step13.value;
+          var ops = _step14.value;
           var optionCodex = (ops.option.parentOptionCodex ? ops.option.parentOptionCodex + '.' : '') + ((_ops$optionOcd = ops.optionOcd) !== null && _ops$optionOcd !== void 0 ? _ops$optionOcd : ops.option.codex);
           if (ops.isMultiselect && ops.multiSelects) {
             ret[optionCodex] = ops.multiSelects.map(function (v) {
@@ -33814,9 +33877,9 @@ var DivaArticle = /*#__PURE__*/function () {
           }
         }
       } catch (err) {
-        _iterator13.e(err);
+        _iterator14.e(err);
       } finally {
-        _iterator13.f();
+        _iterator14.f();
       }
       return ret;
     }
@@ -33836,11 +33899,11 @@ var DivaArticle = /*#__PURE__*/function () {
     key: "setDifferentOptions",
     value: function setDifferentOptions(options) {
       var _this3 = this;
-      var _iterator14 = _createForOfIteratorHelper$o(this.articleOptionStates.values()),
-        _step14;
+      var _iterator15 = _createForOfIteratorHelper$o(this.articleOptionStates.values()),
+        _step15;
       try {
         var _loop = function _loop() {
-          var ops = _step14.value;
+          var ops = _step15.value;
           var found = false;
           for (var i = 0; i < options.length; i++) {
             var option = options[i];
@@ -33857,13 +33920,13 @@ var DivaArticle = /*#__PURE__*/function () {
           }
           if (!found) ops.isDifferentOption = false;
         };
-        for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
+        for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
           _loop();
         }
       } catch (err) {
-        _iterator14.e(err);
+        _iterator15.e(err);
       } finally {
-        _iterator14.f();
+        _iterator15.f();
       }
     }
   }, {
@@ -33876,20 +33939,20 @@ var DivaArticle = /*#__PURE__*/function () {
     get: function get() {
       var hash = this.catalogCodex + '_' + this.articleCodex + '_' + this.quantity + '_';
       var variantValues = [];
-      var _iterator15 = _createForOfIteratorHelper$o(this.articleOptionStates.values()),
-        _step15;
+      var _iterator16 = _createForOfIteratorHelper$o(this.articleOptionStates.values()),
+        _step16;
       try {
-        for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
+        for (_iterator16.s(); !(_step16 = _iterator16.n()).done;) {
           var _ops$idmVariantenArt;
-          var ops = _step15.value;
+          var ops = _step16.value;
           if (ops.isDoShow && (![95, 96, 97, 1095, 1096, 1097].includes((_ops$idmVariantenArt = ops.idmVariantenArt) !== null && _ops$idmVariantenArt !== void 0 ? _ops$idmVariantenArt : 0) || ops.isVisibleFreeText) && ops.val && ops.visibleCount > 0 && !ops.isDescribingState) {
             variantValues.push((this.CatalogData.isIDMFormat ? ops.optionCodex : ops.optionCodex.substring(3)) + '_' + (this.CatalogData.isIDMFormat ? ops.val.codex : ops.val.codex.substring(3)) + (ops.freeText ? '_' + ops.freeText : ops.value ? '_' + ops.value : ''));
           }
         }
       } catch (err) {
-        _iterator15.e(err);
+        _iterator16.e(err);
       } finally {
-        _iterator15.f();
+        _iterator16.f();
       }
       return DivaUtils.md5(hash + variantValues.join());
     }
@@ -33897,11 +33960,11 @@ var DivaArticle = /*#__PURE__*/function () {
     key: "VariantValuesWithoutOPTandOPV",
     get: function get() {
       var ret = {};
-      var _iterator16 = _createForOfIteratorHelper$o(this.articleOptionStates.values()),
-        _step16;
+      var _iterator17 = _createForOfIteratorHelper$o(this.articleOptionStates.values()),
+        _step17;
       try {
-        for (_iterator16.s(); !(_step16 = _iterator16.n()).done;) {
-          var ops = _step16.value;
+        for (_iterator17.s(); !(_step17 = _iterator17.n()).done;) {
+          var ops = _step17.value;
           if (ops.valCodex && !ops.isDescribingState) {
             ret[this.CatalogData.isIDMFormat ? ops.optionCodex : ops.optionCodex.substring(3)] = this.CatalogData.isIDMFormat ? ops.valCodex : ops.valCodex.substring(3);
             if (ops.freeText) {
@@ -33910,9 +33973,9 @@ var DivaArticle = /*#__PURE__*/function () {
           }
         }
       } catch (err) {
-        _iterator16.e(err);
+        _iterator17.e(err);
       } finally {
-        _iterator16.f();
+        _iterator17.f();
       }
       return ret;
     }
@@ -33931,11 +33994,11 @@ var DivaArticle = /*#__PURE__*/function () {
     key: "getVariantValuesTillOPT",
     value: function getVariantValuesTillOPT(opt) {
       var ret = {};
-      var _iterator17 = _createForOfIteratorHelper$o(this.articleOptionStates.values()),
-        _step17;
+      var _iterator18 = _createForOfIteratorHelper$o(this.articleOptionStates.values()),
+        _step18;
       try {
-        for (_iterator17.s(); !(_step17 = _iterator17.n()).done;) {
-          var ops = _step17.value;
+        for (_iterator18.s(); !(_step18 = _iterator18.n()).done;) {
+          var ops = _step18.value;
           if (opt != ops.optionCodex) {
             if (ops.valCodex) {
               ret[ops.optionCodex] = ops.valCodex;
@@ -33945,9 +34008,9 @@ var DivaArticle = /*#__PURE__*/function () {
           }
         }
       } catch (err) {
-        _iterator17.e(err);
+        _iterator18.e(err);
       } finally {
-        _iterator17.f();
+        _iterator18.f();
       }
       return ret;
     }
@@ -33982,18 +34045,18 @@ var DivaArticle = /*#__PURE__*/function () {
     key: "requiredUserInputOptions",
     get: function get() {
       var options = [];
-      var _iterator18 = _createForOfIteratorHelper$o(this.openRequiredUserInputOptions),
-        _step18;
+      var _iterator19 = _createForOfIteratorHelper$o(this.openRequiredUserInputOptions),
+        _step19;
       try {
-        for (_iterator18.s(); !(_step18 = _iterator18.n()).done;) {
-          var ops = _step18.value;
+        for (_iterator19.s(); !(_step19 = _iterator19.n()).done;) {
+          var ops = _step19.value;
           ops.showWarningForRequiresUserInput = true;
           options.push(ops.optionCodex);
         }
       } catch (err) {
-        _iterator18.e(err);
+        _iterator19.e(err);
       } finally {
-        _iterator18.f();
+        _iterator19.f();
       }
       return options;
     }
@@ -34095,20 +34158,20 @@ var DivaArticle = /*#__PURE__*/function () {
     key: "getMetaData",
     value: function getMetaData(locales) {
       var metaDatas = locales ? this.article.catalogArticle.metaData_locales : this.article.catalogArticle.metaData;
-      var _iterator19 = _createForOfIteratorHelper$o(this.articleOptionStates.values()),
-        _step19;
+      var _iterator20 = _createForOfIteratorHelper$o(this.articleOptionStates.values()),
+        _step20;
       try {
-        for (_iterator19.s(); !(_step19 = _iterator19.n()).done;) {
+        for (_iterator20.s(); !(_step20 = _iterator20.n()).done;) {
           var _ref3;
-          var ops = _step19.value;
+          var ops = _step20.value;
           var opv = ops.val;
           var opsMetaData = (_ref3 = locales ? opv === null || opv === void 0 ? void 0 : opv.metaData_locales : opv === null || opv === void 0 ? void 0 : opv.metaData) !== null && _ref3 !== void 0 ? _ref3 : {};
           this.mergeMetaDatas(metaDatas, opsMetaData);
         }
       } catch (err) {
-        _iterator19.e(err);
+        _iterator20.e(err);
       } finally {
-        _iterator19.f();
+        _iterator20.f();
       }
       for (var basketId in this.partlistArticles) {
         this.mergeMetaDatas(metaDatas, locales ? this.partlistArticles[basketId].MetaData_locales : this.partlistArticles[basketId].MetaData);
@@ -34167,11 +34230,11 @@ var DivaArticle = /*#__PURE__*/function () {
                 opvDoesExist = false;
               var opvsInOption = refOptData.articleOptionValues;
               if (refOptData.hasOPG && opvsInOption) {
-                var _iterator20 = _createForOfIteratorHelper$o(opvsInOption.keys()),
-                  _step20;
+                var _iterator21 = _createForOfIteratorHelper$o(opvsInOption.keys()),
+                  _step21;
                 try {
-                  for (_iterator20.s(); !(_step20 = _iterator20.n()).done;) {
-                    var iKey = _step20.value;
+                  for (_iterator21.s(); !(_step21 = _iterator21.n()).done;) {
+                    var iKey = _step21.value;
                     if (opvIsValid && anyDoShowFound) break;
                     var opg = opvsInOption.get(iKey);
                     if (!opg) continue;
@@ -34180,11 +34243,11 @@ var DivaArticle = /*#__PURE__*/function () {
                     if (refOps.visibleOptionValues.get(iKey)) {
                       anyDoShowFound = true;
                     }
-                    var _iterator21 = _createForOfIteratorHelper$o(opvsFromOpg.keys()),
-                      _step21;
+                    var _iterator22 = _createForOfIteratorHelper$o(opvsFromOpg.keys()),
+                      _step22;
                     try {
-                      for (_iterator21.s(); !(_step21 = _iterator21.n()).done;) {
-                        var jKey = _step21.value;
+                      for (_iterator22.s(); !(_step22 = _iterator22.n()).done;) {
+                        var jKey = _step22.value;
                         var opv = opvsFromOpg.get(jKey);
                         if (opv && refOps.visibleOptionValues.get(iKey)) {
                           var parentName = opv.parentName;
@@ -34206,22 +34269,22 @@ var DivaArticle = /*#__PURE__*/function () {
                         }
                       }
                     } catch (err) {
-                      _iterator21.e(err);
+                      _iterator22.e(err);
                     } finally {
-                      _iterator21.f();
+                      _iterator22.f();
                     }
                   }
                 } catch (err) {
-                  _iterator20.e(err);
+                  _iterator21.e(err);
                 } finally {
-                  _iterator20.f();
+                  _iterator21.f();
                 }
               } else if (opvsInOption) {
-                var _iterator22 = _createForOfIteratorHelper$o(opvsInOption.keys()),
-                  _step22;
+                var _iterator23 = _createForOfIteratorHelper$o(opvsInOption.keys()),
+                  _step23;
                 try {
-                  for (_iterator22.s(); !(_step22 = _iterator22.n()).done;) {
-                    var _iKey = _step22.value;
+                  for (_iterator23.s(); !(_step23 = _iterator23.n()).done;) {
+                    var _iKey = _step23.value;
                     if (opvIsValid && anyDoShowFound) break;
                     if (refOps.visibleOptionValues.get(_iKey)) {
                       anyDoShowFound = true;
@@ -34242,9 +34305,9 @@ var DivaArticle = /*#__PURE__*/function () {
                     }
                   }
                 } catch (err) {
-                  _iterator22.e(err);
+                  _iterator23.e(err);
                 } finally {
-                  _iterator22.f();
+                  _iterator23.f();
                 }
               }
               if (!opvIsValid || ignoreOPVIsValid) {
@@ -34295,11 +34358,11 @@ var DivaArticle = /*#__PURE__*/function () {
             var _accessoiresToUpdate$;
             var variantValues = {};
             var accessoire = articles[_i2];
-            var _iterator23 = _createForOfIteratorHelper$o(accessoire.articleOptionStates.values()),
-              _step23;
+            var _iterator24 = _createForOfIteratorHelper$o(accessoire.articleOptionStates.values()),
+              _step24;
             try {
-              for (_iterator23.s(); !(_step23 = _iterator23.n()).done;) {
-                var ops = _step23.value;
+              for (_iterator24.s(); !(_step24 = _iterator24.n()).done;) {
+                var ops = _step24.value;
                 if (singleOpts.includes(ops.optionCodex)) {
                   if (accessoire.hasType1Dependencies) {
                     variantValues[ops.optionCodex] = curOpvValue.replace('OPV' + opt.substring(3), 'OPV' + ops.optionCodex.substring(3));
@@ -34310,9 +34373,9 @@ var DivaArticle = /*#__PURE__*/function () {
               }
               //an accessoire can get values of several global options, the ones of the previous options must stay
             } catch (err) {
-              _iterator23.e(err);
+              _iterator24.e(err);
             } finally {
-              _iterator23.f();
+              _iterator24.f();
             }
             if (Object.entries(variantValues).length > 0) accessoiresToUpdate[accessoire.basketId] = {
               accessoire: accessoire,
@@ -34328,11 +34391,11 @@ var DivaArticle = /*#__PURE__*/function () {
     value: function getGlobalOptions() {
       var ret = {};
       var opss = this.articleOptionStatesWithParents;
-      var _iterator24 = _createForOfIteratorHelper$o(opss),
-        _step24;
+      var _iterator25 = _createForOfIteratorHelper$o(opss),
+        _step25;
       try {
-        for (_iterator24.s(); !(_step24 = _iterator24.n()).done;) {
-          var ops = _step24.value;
+        for (_iterator25.s(); !(_step25 = _iterator25.n()).done;) {
+          var ops = _step25.value;
           var value = ops.option.isDefaultValueForOptions;
           if (value) {
             var entires = value.split(';');
@@ -34341,9 +34404,9 @@ var DivaArticle = /*#__PURE__*/function () {
           }
         }
       } catch (err) {
-        _iterator24.e(err);
+        _iterator25.e(err);
       } finally {
-        _iterator24.f();
+        _iterator25.f();
       }
       return ret;
     }
@@ -34383,34 +34446,34 @@ var DivaArticle = /*#__PURE__*/function () {
         }
         if (Object.keys(ret.opt).length === 0) {
           //nicht gefunden - jetzt OCD kontrollieren
-          var _iterator25 = _createForOfIteratorHelper$o(this.articleOptionStates.values()),
-            _step25;
+          var _iterator26 = _createForOfIteratorHelper$o(this.articleOptionStates.values()),
+            _step26;
           try {
-            for (_iterator25.s(); !(_step25 = _iterator25.n()).done;) {
-              var _ops4 = _step25.value;
+            for (_iterator26.s(); !(_step26 = _iterator26.n()).done;) {
+              var _ops4 = _step26.value;
               if (_ops4.option.ocd == optionCodex && _ops4.isDoShow && (parentOptionCodex == '' || parentOptionCodex == _ops4.option.parentOptionCodex)) {
                 ret = this.checkOptionSearchOPV(_ops4.option, optionValueCodex, ret);
               }
             }
             //fallback for pfister classification usecase
           } catch (err) {
-            _iterator25.e(err);
+            _iterator26.e(err);
           } finally {
-            _iterator25.f();
+            _iterator26.f();
           }
-          var _iterator26 = _createForOfIteratorHelper$o(this.articleOptionStates.values()),
-            _step26;
+          var _iterator27 = _createForOfIteratorHelper$o(this.articleOptionStates.values()),
+            _step27;
           try {
-            for (_iterator26.s(); !(_step26 = _iterator26.n()).done;) {
-              var _ops5 = _step26.value;
+            for (_iterator27.s(); !(_step27 = _iterator27.n()).done;) {
+              var _ops5 = _step27.value;
               if (_ops5.option.ocd == optionCodex && optionCodex !== null && optionCodex !== void 0 && optionCodex.startsWith('OPTOPT') && (parentOptionCodex == '' || parentOptionCodex == _ops5.option.parentOptionCodex)) {
                 return this.checkOptionSearchOPV(_ops5.option, optionValueCodex, ret);
               }
             }
           } catch (err) {
-            _iterator26.e(err);
+            _iterator27.e(err);
           } finally {
-            _iterator26.f();
+            _iterator27.f();
           }
         }
       }
@@ -34426,26 +34489,26 @@ var DivaArticle = /*#__PURE__*/function () {
       }
       if (myOPT.hasOPG) {
         var myOPGs = myOPT.articleOptionValues;
-        var _iterator27 = _createForOfIteratorHelper$o(myOPGs),
-          _step27;
+        var _iterator28 = _createForOfIteratorHelper$o(myOPGs),
+          _step28;
         try {
-          for (_iterator27.s(); !(_step27 = _iterator27.n()).done;) {
-            var _step27$value = _slicedToArray__default["default"](_step27.value, 2),
-              iKey = _step27$value[0],
-              opg = _step27$value[1];
+          for (_iterator28.s(); !(_step28 = _iterator28.n()).done;) {
+            var _step28$value = _slicedToArray__default["default"](_step28.value, 2),
+              iKey = _step28$value[0],
+              opg = _step28$value[1];
             var myOPVs = opg.articleOptionValues;
             if (myOPVs && myOPVs.get(optionValueCodex)) {
               ret.opv = myOPVs.get(optionValueCodex);
               found = true;
             }
             if (!found) {
-              var _iterator28 = _createForOfIteratorHelper$o(myOPVs),
-                _step28;
+              var _iterator29 = _createForOfIteratorHelper$o(myOPVs),
+                _step29;
               try {
-                for (_iterator28.s(); !(_step28 = _iterator28.n()).done;) {
-                  var _step28$value = _slicedToArray__default["default"](_step28.value, 2),
-                    jKey = _step28$value[0],
-                    opv = _step28$value[1];
+                for (_iterator29.s(); !(_step29 = _iterator29.n()).done;) {
+                  var _step29$value = _slicedToArray__default["default"](_step29.value, 2),
+                    jKey = _step29$value[0],
+                    opv = _step29$value[1];
                   if (opv.ocd == optionValueCodex || opv.codex == optionValueCodex || optionValueCodex === 'OPVOPV_NICHT_RELEVANT' && jKey.startsWith('OPVOPV_NICHT_RELEVANT')) {
                     ret.opv = opv;
                     found = true;
@@ -34453,19 +34516,19 @@ var DivaArticle = /*#__PURE__*/function () {
                   }
                 }
               } catch (err) {
-                _iterator28.e(err);
+                _iterator29.e(err);
               } finally {
-                _iterator28.f();
+                _iterator29.f();
               }
             }
             if (!found && myOPT.parentOptionCodex) {
-              var _iterator29 = _createForOfIteratorHelper$o(myOPVs),
-                _step29;
+              var _iterator30 = _createForOfIteratorHelper$o(myOPVs),
+                _step30;
               try {
-                for (_iterator29.s(); !(_step29 = _iterator29.n()).done;) {
-                  var _step29$value = _slicedToArray__default["default"](_step29.value, 2),
-                    _jKey = _step29$value[0],
-                    _opv = _step29$value[1];
+                for (_iterator30.s(); !(_step30 = _iterator30.n()).done;) {
+                  var _step30$value = _slicedToArray__default["default"](_step30.value, 2),
+                    _jKey = _step30$value[0],
+                    _opv = _step30$value[1];
                   if (_opv.ocd && _opv.ocd.startsWith(optionValueCodex) || _opv.codex.startsWith(optionValueCodex)) {
                     ret.opv = _opv;
                     found = true;
@@ -34473,17 +34536,17 @@ var DivaArticle = /*#__PURE__*/function () {
                   }
                 }
               } catch (err) {
-                _iterator29.e(err);
+                _iterator30.e(err);
               } finally {
-                _iterator29.f();
+                _iterator30.f();
               }
             }
             if (ret.opv && Object.entries(ret.opv).length != 0) break;
           }
         } catch (err) {
-          _iterator27.e(err);
+          _iterator28.e(err);
         } finally {
-          _iterator27.f();
+          _iterator28.f();
         }
       } else {
         var _myOPVs = myOPT.articleOptionValues;
@@ -34492,13 +34555,13 @@ var DivaArticle = /*#__PURE__*/function () {
           found = true;
         }
         if (!found) {
-          var _iterator30 = _createForOfIteratorHelper$o(_myOPVs),
-            _step30;
+          var _iterator31 = _createForOfIteratorHelper$o(_myOPVs),
+            _step31;
           try {
-            for (_iterator30.s(); !(_step30 = _iterator30.n()).done;) {
-              var _step30$value = _slicedToArray__default["default"](_step30.value, 2),
-                _jKey2 = _step30$value[0],
-                _opv2 = _step30$value[1];
+            for (_iterator31.s(); !(_step31 = _iterator31.n()).done;) {
+              var _step31$value = _slicedToArray__default["default"](_step31.value, 2),
+                _jKey2 = _step31$value[0],
+                _opv2 = _step31$value[1];
               if (_opv2.ocd == optionValueCodex || optionValueCodex === 'OPVOPV_NICHT_RELEVANT' && _jKey2.startsWith('OPVOPV_NICHT_RELEVANT')) {
                 ret.opv = _opv2;
                 found = true;
@@ -34506,9 +34569,9 @@ var DivaArticle = /*#__PURE__*/function () {
               }
             }
           } catch (err) {
-            _iterator30.e(err);
+            _iterator31.e(err);
           } finally {
-            _iterator30.f();
+            _iterator31.f();
           }
         }
       }
@@ -34518,11 +34581,11 @@ var DivaArticle = /*#__PURE__*/function () {
     key: "getArticleJsonVariantValues",
     value: function getArticleJsonVariantValues() {
       var retval = {};
-      var _iterator31 = _createForOfIteratorHelper$o(this.articleOptionStates.values()),
-        _step31;
+      var _iterator32 = _createForOfIteratorHelper$o(this.articleOptionStates.values()),
+        _step32;
       try {
-        for (_iterator31.s(); !(_step31 = _iterator31.n()).done;) {
-          var ops = _step31.value;
+        for (_iterator32.s(); !(_step32 = _iterator32.n()).done;) {
+          var ops = _step32.value;
           if (ops.valCodex) {
             retval[ops.optionCodex] = ops.valCodex;
             var opsVal = this.getArticleOptionStateFlat(ops.optionCodex + '_val');
@@ -34535,9 +34598,9 @@ var DivaArticle = /*#__PURE__*/function () {
           }
         }
       } catch (err) {
-        _iterator31.e(err);
+        _iterator32.e(err);
       } finally {
-        _iterator31.f();
+        _iterator32.f();
       }
       return retval;
     }
@@ -34637,38 +34700,38 @@ var DivaArticle = /*#__PURE__*/function () {
   }, {
     key: "findFreeTextOpv",
     value: function findFreeTextOpv(ops) {
-      var _iterator32 = _createForOfIteratorHelper$o(ops.visibleOptionValues),
-        _step32;
+      var _iterator33 = _createForOfIteratorHelper$o(ops.visibleOptionValues),
+        _step33;
       try {
-        for (_iterator32.s(); !(_step32 = _iterator32.n()).done;) {
-          var _step32$value = _slicedToArray__default["default"](_step32.value, 2),
-            key = _step32$value[0],
-            opv = _step32$value[1];
+        for (_iterator33.s(); !(_step33 = _iterator33.n()).done;) {
+          var _step33$value = _slicedToArray__default["default"](_step33.value, 2),
+            key = _step33$value[0],
+            opv = _step33$value[1];
           if (opv.isFreeText) {
             return opv;
           }
         }
       } catch (err) {
-        _iterator32.e(err);
+        _iterator33.e(err);
       } finally {
-        _iterator32.f();
+        _iterator33.f();
       }
       return undefined;
     }
   }, {
     key: "defineAllOptions",
     value: function defineAllOptions() {
-      var _iterator33 = _createForOfIteratorHelper$o(this.articleOptionStates.values()),
-        _step33;
+      var _iterator34 = _createForOfIteratorHelper$o(this.articleOptionStates.values()),
+        _step34;
       try {
-        for (_iterator33.s(); !(_step33 = _iterator33.n()).done;) {
-          var ops = _step33.value;
+        for (_iterator34.s(); !(_step34 = _iterator34.n()).done;) {
+          var ops = _step34.value;
           ops.isDefined = true;
         }
       } catch (err) {
-        _iterator33.e(err);
+        _iterator34.e(err);
       } finally {
-        _iterator33.f();
+        _iterator34.f();
       }
     }
   }, {
@@ -34680,13 +34743,13 @@ var DivaArticle = /*#__PURE__*/function () {
   }, {
     key: "getDefaultOpv",
     value: function getDefaultOpv(visibleOptionValues) {
-      var _iterator34 = _createForOfIteratorHelper$o(visibleOptionValues),
-        _step34;
+      var _iterator35 = _createForOfIteratorHelper$o(visibleOptionValues),
+        _step35;
       try {
-        for (_iterator34.s(); !(_step34 = _iterator34.n()).done;) {
-          var _step34$value = _slicedToArray__default["default"](_step34.value, 2),
-            iKey = _step34$value[0],
-            opv = _step34$value[1];
+        for (_iterator35.s(); !(_step35 = _iterator35.n()).done;) {
+          var _step35$value = _slicedToArray__default["default"](_step35.value, 2),
+            iKey = _step35$value[0],
+            opv = _step35$value[1];
           if (opv.isOPVG) {
             var _opv$articleOptionVal, _opv$articleOptionVal2;
             var defaultOPV = Array.from((_opv$articleOptionVal = (_opv$articleOptionVal2 = opv.articleOptionValues) === null || _opv$articleOptionVal2 === void 0 ? void 0 : _opv$articleOptionVal2.values()) !== null && _opv$articleOptionVal !== void 0 ? _opv$articleOptionVal : []).find(function (opv) {
@@ -34701,9 +34764,9 @@ var DivaArticle = /*#__PURE__*/function () {
           }
         }
       } catch (err) {
-        _iterator34.e(err);
+        _iterator35.e(err);
       } finally {
-        _iterator34.f();
+        _iterator35.f();
       }
       return Array.from(visibleOptionValues.values())[0];
     }
@@ -34811,7 +34874,7 @@ var DivaArticle = /*#__PURE__*/function () {
                 break;
               }
               _context.next = 4;
-              return Promise.resolve().then(function () { return require('./ShelfPlanner-f6b19965.js'); });
+              return Promise.resolve().then(function () { return require('./ShelfPlanner-18139c57.js'); });
             case 4:
               _yield$import = _context.sent;
               ShelfPlanner = _yield$import["default"];
@@ -34900,19 +34963,19 @@ var DivaArticle = /*#__PURE__*/function () {
     value: function afterInit() {
       if (!this.CatalogData.useDiomexConfigLogic) return {};
       var variantValues = {};
-      var _iterator35 = _createForOfIteratorHelper$o(this.articleOptionStates.values()),
-        _step35;
+      var _iterator36 = _createForOfIteratorHelper$o(this.articleOptionStates.values()),
+        _step36;
       try {
-        for (_iterator35.s(); !(_step35 = _iterator35.n()).done;) {
-          var ops = _step35.value;
+        for (_iterator36.s(); !(_step36 = _iterator36.n()).done;) {
+          var ops = _step36.value;
           if (ops.val === undefined && ops.visibleOPVKeys.length && !ops.invisibleWithoutMaskeInfluence) {
             variantValues[ops.optionCodex] = ops.visibleOPVKeys[0];
           }
         }
       } catch (err) {
-        _iterator35.e(err);
+        _iterator36.e(err);
       } finally {
-        _iterator35.f();
+        _iterator36.f();
       }
       return variantValues;
     }
@@ -34953,13 +35016,13 @@ var DivaArticle = /*#__PURE__*/function () {
         var catalogopv = ops.option.articleOptionValues.get(myValues[_key]);
         if (catalogopv !== null && catalogopv !== void 0 && catalogopv.sameopv) {
           var opvs = ops.option.articleOptionValues;
-          var _iterator36 = _createForOfIteratorHelper$o(opvs),
-            _step36;
+          var _iterator37 = _createForOfIteratorHelper$o(opvs),
+            _step37;
           try {
-            for (_iterator36.s(); !(_step36 = _iterator36.n()).done;) {
-              var _step36$value = _slicedToArray__default["default"](_step36.value, 2),
-                opvKey = _step36$value[0],
-                checkingOpv = _step36$value[1];
+            for (_iterator37.s(); !(_step37 = _iterator37.n()).done;) {
+              var _step37$value = _slicedToArray__default["default"](_step37.value, 2),
+                opvKey = _step37$value[0],
+                checkingOpv = _step37$value[1];
               if (opvKey === catalogopv.codex) continue;
               if (checkingOpv !== null && checkingOpv !== void 0 && checkingOpv.sameopv && catalogopv.sameopv == checkingOpv.sameopv) {
                 if (!ops.visibleOptionValues.get(catalogopv.codex) && ops.visibleOptionValues.get(checkingOpv.codex)) {
@@ -34968,9 +35031,9 @@ var DivaArticle = /*#__PURE__*/function () {
               }
             }
           } catch (err) {
-            _iterator36.e(err);
+            _iterator37.e(err);
           } finally {
-            _iterator36.f();
+            _iterator37.f();
           }
         }
       }
@@ -34981,20 +35044,20 @@ var DivaArticle = /*#__PURE__*/function () {
         } else if (_key2.endsWith('_val') && this.getArticleOptionState(_key2.replace(/_val/g, ''))) {
           validValues[_key2] = myValues[_key2];
         } else {
-          var _iterator37 = _createForOfIteratorHelper$o(this.articleOptionStates.values()),
-            _step37;
+          var _iterator38 = _createForOfIteratorHelper$o(this.articleOptionStates.values()),
+            _step38;
           try {
-            for (_iterator37.s(); !(_step37 = _iterator37.n()).done;) {
-              var _ops7 = _step37.value;
+            for (_iterator38.s(); !(_step38 = _iterator38.n()).done;) {
+              var _ops7 = _step38.value;
               if (_ops7.optionOcd == _key2) {
                 var values = this.checkOptionSearchOPV(_ops7.option, myValues[_key2], {});
                 if (values !== null && values !== void 0 && values.opv) validValues[_ops7.optionCodex] = values.opv.codex;
               }
             }
           } catch (err) {
-            _iterator37.e(err);
+            _iterator38.e(err);
           } finally {
-            _iterator37.f();
+            _iterator38.f();
           }
         }
         //for classification usecase when suboption and option have the same name like OPTOPT_MATERIAL_1_00 and OPTOPT_MATERIAL_1_00.OPTOPT_MATERIAL_1_00
@@ -35076,12 +35139,12 @@ var DivaArticle = /*#__PURE__*/function () {
       for (var _i4 = 0, _arr = [this].concat(_toConsumableArray__default["default"](this.partlistArticlesReqursive)); _i4 < _arr.length; _i4++) {
         var article = _arr[_i4];
         if (article.isIDM3DSkipped) continue;
-        var _iterator38 = _createForOfIteratorHelper$o(article.getArticleOptionStatesWithOptionsForPrint().values()),
-          _step38;
+        var _iterator39 = _createForOfIteratorHelper$o(article.getArticleOptionStatesWithOptionsForPrint().values()),
+          _step39;
         try {
-          for (_iterator38.s(); !(_step38 = _iterator38.n()).done;) {
+          for (_iterator39.s(); !(_step39 = _iterator39.n()).done;) {
             var _ops$option$ocd, _ops$val$ocd3, _ops$val$property, _ops$val$properties;
-            var ops = _step38.value;
+            var ops = _step39.value;
             if (!ops.val || article.isPartListArticle && ops.val.isNotRelevant) continue;
             var opt = (article.CatalogData.isIDMFormat ? 'OPT' : '') + ((_ops$option$ocd = ops.option.ocd) !== null && _ops$option$ocd !== void 0 ? _ops$option$ocd : ops.optionCodex);
             if (alternateRenderInfo !== null && alternateRenderInfo !== void 0 && alternateRenderInfo.hideOptionsIn3DImage.includes(opt)) continue;
@@ -35093,9 +35156,9 @@ var DivaArticle = /*#__PURE__*/function () {
             });
           }
         } catch (err) {
-          _iterator38.e(err);
+          _iterator39.e(err);
         } finally {
-          _iterator38.f();
+          _iterator39.f();
         }
       }
       return sources;
@@ -35104,18 +35167,18 @@ var DivaArticle = /*#__PURE__*/function () {
     key: "addOptionStateFromArticleToPlannerData",
     value: function addOptionStateFromArticleToPlannerData(ret, alternateRenderInfo, partlistPrefix) {
       var articleOptions = this.getArticleOptionStatesWithOptionsForPrint();
-      var _iterator39 = _createForOfIteratorHelper$o(articleOptions.values()),
-        _step39;
+      var _iterator40 = _createForOfIteratorHelper$o(articleOptions.values()),
+        _step40;
       try {
-        for (_iterator39.s(); !(_step39 = _iterator39.n()).done;) {
+        for (_iterator40.s(); !(_step40 = _iterator40.n()).done;) {
           var _ops$val5;
-          var ops = _step39.value;
+          var ops = _step40.value;
           if (!this.article.isPartlistArticle || !((_ops$val5 = ops.val) !== null && _ops$val5 !== void 0 && _ops$val5.isNotRelevant)) this.addOptionStateToPlannerData(ret, ops, alternateRenderInfo, partlistPrefix);
         }
       } catch (err) {
-        _iterator39.e(err);
+        _iterator40.e(err);
       } finally {
-        _iterator39.f();
+        _iterator40.f();
       }
       for (var key in this.article.partlistArticles) {
         var _pla$partlistGroupPre;
@@ -35177,11 +35240,11 @@ var DivaArticle = /*#__PURE__*/function () {
     key: "getAccessoireMATData",
     value: function getAccessoireMATData(onString) {
       var MAT = [];
-      var _iterator40 = _createForOfIteratorHelper$o(this.articleOptionStates.values()),
-        _step40;
+      var _iterator41 = _createForOfIteratorHelper$o(this.articleOptionStates.values()),
+        _step41;
       try {
-        for (_iterator40.s(); !(_step40 = _iterator40.n()).done;) {
-          var ops = _step40.value;
+        for (_iterator41.s(); !(_step41 = _iterator41.n()).done;) {
+          var ops = _step41.value;
           var opt = void 0;
           if (!ops.val) continue;
           opt = ops.optionCodex;
@@ -35194,9 +35257,9 @@ var DivaArticle = /*#__PURE__*/function () {
           });
         }
       } catch (err) {
-        _iterator40.e(err);
+        _iterator41.e(err);
       } finally {
-        _iterator40.f();
+        _iterator41.f();
       }
       return MAT;
     }
@@ -35240,11 +35303,11 @@ var DivaArticle = /*#__PURE__*/function () {
     value: function getVariantBasketData() {
       var variantBasketData = [];
       var articleOptions = this.getArticleOptionStatesWithOptionsForPrint();
-      var _iterator41 = _createForOfIteratorHelper$o(articleOptions.values()),
-        _step41;
+      var _iterator42 = _createForOfIteratorHelper$o(articleOptions.values()),
+        _step42;
       try {
-        for (_iterator41.s(); !(_step41 = _iterator41.n()).done;) {
-          var ops = _step41.value;
+        for (_iterator42.s(); !(_step42 = _iterator42.n()).done;) {
+          var ops = _step42.value;
           var OP = ops.optionCodex;
           if (ops) {
             var _ops$idmVariantenArt2;
@@ -35271,6 +35334,10 @@ var DivaArticle = /*#__PURE__*/function () {
                 var opvNames = this.getMergedOPGNames(ops);
                 // a partlist position prints the options its OptionsForPrint names, even implicit (type I) ones
                 var isOptionForPrint = this.isPartListArticle && !!((_this$optionsForPrint2 = this.optionsForPrint) !== null && _this$optionsForPrint2 !== void 0 && _this$optionsForPrint2.includes(OP));
+                // the perimeter options name the formula the price is calculated with; print its result instead, rounded up so the
+                // band reaches around the carpet (to 2 decimals first, so float noise like 890.0000001 does not add a centimetre)
+                var perimeter = this.getPerimeter(OP);
+                var perimeterName = perimeter !== undefined && perimeter > 0 ? Math.ceil(DivaUtils__default["default"].decimalAdjust('round', perimeter, 2)) + ' cm' : undefined;
                 var myOptItem = {
                   BasketID: this.basketId,
                   OPT: this.CatalogData.isIDMFormat ? OP : OP.substring(3),
@@ -35281,9 +35348,9 @@ var DivaArticle = /*#__PURE__*/function () {
                   OCD: ops.ocd,
                   OPV: this.CatalogData.isIDMFormat ? ops.val.codex : ops.val.codex.substring(3),
                   vOPV: !this.CatalogData.dontUseVCodexInBasket ? ops.vCodex : undefined,
-                  OPVName: DivaUtils__default["default"].stripTags(opvNames.origName),
-                  MaskOPVName: opvNames.origName !== opvNames.name ? DivaUtils__default["default"].stripTags(opvNames.name) : undefined,
-                  OPVName_locales: DivaUtils__default["default"].stripTagsFromDict((_ops$valName_locales2 = ops.valName_locales) !== null && _ops$valName_locales2 !== void 0 ? _ops$valName_locales2 : {}),
+                  OPVName: perimeterName !== null && perimeterName !== void 0 ? perimeterName : DivaUtils__default["default"].stripTags(opvNames.origName),
+                  MaskOPVName: !perimeterName && opvNames.origName !== opvNames.name ? DivaUtils__default["default"].stripTags(opvNames.name) : undefined,
+                  OPVName_locales: perimeterName ? {} : DivaUtils__default["default"].stripTagsFromDict((_ops$valName_locales2 = ops.valName_locales) !== null && _ops$valName_locales2 !== void 0 ? _ops$valName_locales2 : {}),
                   OPVImage: ops.val.image ? this.CatalogData.getCatImageURL(ops.val.image, '_gal') : '',
                   FreeText: freeText,
                   MeasureUnit: ops.measureUnit,
@@ -35302,7 +35369,9 @@ var DivaArticle = /*#__PURE__*/function () {
                   TabGroup_locales: ops.optionTabGroup_locales,
                   SendToSAP: ops.option.sendToSAP,
                   ArticlePlaceholder: ops.option.articlePlaceholder,
-                  Hidden: !!(ops.headerPosVariationType == 'I' && !isOptionForPrint || ops.invisibleWithoutMaskeInfluence || ops.val.hideInSummary || this.isPartListArticle && (_this$optionsForPrint3 = this.optionsForPrint) !== null && _this$optionsForPrint3 !== void 0 && _this$optionsForPrint3.length && !isOptionForPrint),
+                  Hidden: !!(ops.headerPosVariationType == 'I' && !isOptionForPrint || ops.invisibleWithoutMaskeInfluence || ops.val.hideInSummary || this.isPartListArticle && (_this$optionsForPrint3 = this.optionsForPrint) !== null && _this$optionsForPrint3 !== void 0 && _this$optionsForPrint3.length && !isOptionForPrint ||
+                  // a band position may name both perimeter options; only the one its carpet has is the band's length, as in the price
+                  perimeter !== undefined && !this.parentHasSameOption(OP)),
                   HideInOrderText: ops.hideInOrderText,
                   IsDescribingState: ops.isDescribingState,
                   FreeTextLang: ops.freeTextLang,
@@ -35314,9 +35383,9 @@ var DivaArticle = /*#__PURE__*/function () {
           }
         }
       } catch (err) {
-        _iterator41.e(err);
+        _iterator42.e(err);
       } finally {
-        _iterator41.f();
+        _iterator42.f();
       }
       return variantBasketData;
     }
@@ -35507,13 +35576,13 @@ var DivaArticle = /*#__PURE__*/function () {
     key: "unresolvedTemplateTokens",
     value: function unresolvedTemplateTokens(template) {
       var unresolved = [];
-      var _iterator42 = _createForOfIteratorHelper$o(template.matchAll(/\{(.*?)\}/g)),
-        _step42;
+      var _iterator43 = _createForOfIteratorHelper$o(template.matchAll(/\{(.*?)\}/g)),
+        _step43;
       try {
-        for (_iterator42.s(); !(_step42 = _iterator42.n()).done;) {
-          var _step42$value = _slicedToArray__default["default"](_step42.value, 2),
-            token = _step42$value[0],
-            expression = _step42$value[1];
+        for (_iterator43.s(); !(_step43 = _iterator43.n()).done;) {
+          var _step43$value = _slicedToArray__default["default"](_step43.value, 2),
+            token = _step43$value[0],
+            expression = _step43$value[1];
           var resolved = this.resolveTemplateToken(String(expression));
           if (resolved === '' || resolved.startsWith('___')) unresolved.push({
             token: token,
@@ -35521,9 +35590,9 @@ var DivaArticle = /*#__PURE__*/function () {
           });
         }
       } catch (err) {
-        _iterator42.e(err);
+        _iterator43.e(err);
       } finally {
-        _iterator42.f();
+        _iterator43.f();
       }
       return unresolved;
     }
@@ -35651,18 +35720,18 @@ var DivaArticle = /*#__PURE__*/function () {
     value: function cloneArticle(set) {
       var clonedArticle = new DivaArticle(set, this.basketId, _objectSpread$p({}, this.article), this.article.catalogArticle, set.CatalogData);
       clonedArticle.articleOptionStatesData = new Map();
-      var _iterator43 = _createForOfIteratorHelper$o(this.articleOptionStates.values()),
-        _step43;
+      var _iterator44 = _createForOfIteratorHelper$o(this.articleOptionStates.values()),
+        _step44;
       try {
-        for (_iterator43.s(); !(_step43 = _iterator43.n()).done;) {
-          var ops = _step43.value;
+        for (_iterator44.s(); !(_step44 = _iterator44.n()).done;) {
+          var ops = _step44.value;
           var clonedOps = ops.cloneOptionState(clonedArticle.getIsConfigSingle);
           clonedArticle.articleOptionStatesData.set(ops.optionCodex, clonedOps);
         }
       } catch (err) {
-        _iterator43.e(err);
+        _iterator44.e(err);
       } finally {
-        _iterator43.f();
+        _iterator44.f();
       }
       clonedArticle.initEngine();
       clonedArticle.hasDecisionsInitialized = true;
@@ -37532,7 +37601,7 @@ var DivaArticleHandler = /*#__PURE__*/function () {
     key: "correctPartlistArticlesByGlobalRules",
     value: (function () {
       var _correctPartlistArticlesByGlobalRules = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee18(set, partlistArticlesToLoad, bundleRules, doChangeRetailArticleNumbers) {
-        var article, ownPositions, bundledCodices, _loop4, _i8, _arr, _iterator8, _step8, _step8$value, source, positions;
+        var article, ownPositions, bundledCodices, _iterator8, _step8, position, source, toCompare, _loop4, _i8, _arr, _iterator9, _step9, _step9$value, _source, positions;
         return _regeneratorRuntime__default["default"].wrap(function _callee18$(_context20) {
           while (1) switch (_context20.prev = _context20.next) {
             case 0:
@@ -37541,26 +37610,78 @@ var DivaArticleHandler = /*#__PURE__*/function () {
               }); //a shelf accessoire that can be planned for free keeps the positions no rule names: its noPrice has to waive the parts
               //it brings along, and pooled onto the first article they would be charged there. Everything else is pooled.
               ownPositions = new Map();
-              if (bundleRules) {
-                bundledCodices = new Set(bundleRules.flatMap(function (rule) {
-                  var _rule$result;
-                  return [].concat(_toConsumableArray__default["default"](rule.toBundle), _toConsumableArray__default["default"]((_rule$result = rule.result) !== null && _rule$result !== void 0 ? _rule$result : [])).map(function (entry) {
-                    return entry.articleCodex;
-                  });
-                }));
-                partlistArticlesToLoad = partlistArticlesToLoad.filter(function (position) {
-                  var _source$accessoirePar, _ownPositions$get;
-                  var source = position.SourceBasketID ? set.getArticleByBasketId(position.SourceBasketID) : undefined;
-                  if (!source || source.deleted || source === article || bundledCodices.has(position.ArticleCodex)) return true;
-                  if (!((_source$accessoirePar = source.accessoireParentArticle) !== null && _source$accessoirePar !== void 0 && (_source$accessoirePar = _source$accessoirePar.shelfPlanner) !== null && _source$accessoirePar !== void 0 && _source$accessoirePar.canBeFree(source.articleCodex))) return true;
-                  ownPositions.set(source, [].concat(_toConsumableArray__default["default"]((_ownPositions$get = ownPositions.get(source)) !== null && _ownPositions$get !== void 0 ? _ownPositions$get : []), [position]));
-                  return false;
+              if (!bundleRules) {
+                _context20.next = 29;
+                break;
+              }
+              bundledCodices = new Set(bundleRules.flatMap(function (rule) {
+                var _rule$result;
+                return [].concat(_toConsumableArray__default["default"](rule.toBundle), _toConsumableArray__default["default"]((_rule$result = rule.result) !== null && _rule$result !== void 0 ? _rule$result : [])).map(function (entry) {
+                  return entry.articleCodex;
                 });
-                partlistArticlesToLoad = this.bundlePartlistArticles(partlistArticlesToLoad, bundleRules, set.getDivaArticles());
+              })); //pooled positions load onto the first article without their own article's values (loaded on their own they get them
+              //as the parent's values): each takes them along, so a position of the second article is not resolved with the first's
+              _iterator8 = _createForOfIteratorHelper$n(partlistArticlesToLoad);
+              _context20.prev = 5;
+              _iterator8.s();
+            case 7:
+              if ((_step8 = _iterator8.n()).done) {
+                _context20.next = 15;
+                break;
               }
-              //Correct RetailArticleNumbers
+              position = _step8.value;
+              source = position.SourceBasketID ? set.getArticleByBasketId(position.SourceBasketID) : undefined;
+              if (!(!source || source.deleted)) {
+                _context20.next = 12;
+                break;
+              }
+              return _context20.abrupt("continue", 13);
+            case 12:
+              position.VariantValues = position.ConfigurationMode ? _objectSpread$o(_objectSpread$o({}, source.VariantValues), position.VariantValues) : _objectSpread$o(_objectSpread$o({}, position.VariantValues), source.VariantValues);
+            case 13:
+              _context20.next = 7;
+              break;
+            case 15:
+              _context20.next = 20;
+              break;
+            case 17:
+              _context20.prev = 17;
+              _context20.t0 = _context20["catch"](5);
+              _iterator8.e(_context20.t0);
+            case 20:
+              _context20.prev = 20;
+              _iterator8.f();
+              return _context20.finish(20);
+            case 23:
+              partlistArticlesToLoad = partlistArticlesToLoad.filter(function (position) {
+                var _source$accessoirePar, _ownPositions$get;
+                var source = position.SourceBasketID ? set.getArticleByBasketId(position.SourceBasketID) : undefined;
+                if (!source || source.deleted || source === article || bundledCodices.has(position.ArticleCodex)) return true;
+                if (!((_source$accessoirePar = source.accessoireParentArticle) !== null && _source$accessoirePar !== void 0 && (_source$accessoirePar = _source$accessoirePar.shelfPlanner) !== null && _source$accessoirePar !== void 0 && _source$accessoirePar.canBeFree(source.articleCodex))) return true;
+                ownPositions.set(source, [].concat(_toConsumableArray__default["default"]((_ownPositions$get = ownPositions.get(source)) !== null && _ownPositions$get !== void 0 ? _ownPositions$get : []), [position]));
+                return false;
+              });
+              //the positions merge by the values of their own features, which a catalog loads with the article on demand: load
+              //them before they are compared (they are loaded right after anyway)
+              toCompare = partlistArticlesToLoad.filter(function (position) {
+                return !bundledCodices.has(position.ArticleCodex);
+              });
+              if (!toCompare.length) {
+                _context20.next = 28;
+                break;
+              }
+              _context20.next = 28;
+              return this.preLoadArticles(set, toCompare.map(function (position) {
+                return {
+                  articleCodex: position.ArticleCodex,
+                  catalogCodex: position.CatalogCodex
+                };
+              }));
+            case 28:
+              partlistArticlesToLoad = this.bundlePartlistArticles(partlistArticlesToLoad, bundleRules, set.getDivaArticles());
+            case 29:
               if (!(doChangeRetailArticleNumbers !== null && doChangeRetailArticleNumbers !== void 0 && doChangeRetailArticleNumbers.doChange && doChangeRetailArticleNumbers.retailArticleRules)) {
-                _context20.next = 11;
+                _context20.next = 37;
                 break;
               }
               _loop4 = /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _loop4() {
@@ -37584,50 +37705,50 @@ var DivaArticleHandler = /*#__PURE__*/function () {
                 }, _loop4);
               });
               _i8 = 0, _arr = [].concat(_toConsumableArray__default["default"](partlistArticlesToLoad), _toConsumableArray__default["default"](_toConsumableArray__default["default"](ownPositions.values()).flat()));
-            case 6:
+            case 32:
               if (!(_i8 < _arr.length)) {
-                _context20.next = 11;
+                _context20.next = 37;
                 break;
               }
-              return _context20.delegateYield(_loop4(), "t0", 8);
-            case 8:
+              return _context20.delegateYield(_loop4(), "t1", 34);
+            case 34:
               _i8++;
-              _context20.next = 6;
+              _context20.next = 32;
               break;
-            case 11:
-              _context20.next = 13;
+            case 37:
+              _context20.next = 39;
               return this.loadPartlistArticles(partlistArticlesToLoad, article, {});
-            case 13:
-              _iterator8 = _createForOfIteratorHelper$n(ownPositions);
-              _context20.prev = 14;
-              _iterator8.s();
-            case 16:
-              if ((_step8 = _iterator8.n()).done) {
-                _context20.next = 22;
+            case 39:
+              _iterator9 = _createForOfIteratorHelper$n(ownPositions);
+              _context20.prev = 40;
+              _iterator9.s();
+            case 42:
+              if ((_step9 = _iterator9.n()).done) {
+                _context20.next = 48;
                 break;
               }
-              _step8$value = _slicedToArray__default["default"](_step8.value, 2), source = _step8$value[0], positions = _step8$value[1];
-              _context20.next = 20;
-              return this.loadPartlistArticles(positions, source, {});
-            case 20:
-              _context20.next = 16;
+              _step9$value = _slicedToArray__default["default"](_step9.value, 2), _source = _step9$value[0], positions = _step9$value[1];
+              _context20.next = 46;
+              return this.loadPartlistArticles(positions, _source, {});
+            case 46:
+              _context20.next = 42;
               break;
-            case 22:
-              _context20.next = 27;
+            case 48:
+              _context20.next = 53;
               break;
-            case 24:
-              _context20.prev = 24;
-              _context20.t1 = _context20["catch"](14);
-              _iterator8.e(_context20.t1);
-            case 27:
-              _context20.prev = 27;
-              _iterator8.f();
-              return _context20.finish(27);
-            case 30:
+            case 50:
+              _context20.prev = 50;
+              _context20.t2 = _context20["catch"](40);
+              _iterator9.e(_context20.t2);
+            case 53:
+              _context20.prev = 53;
+              _iterator9.f();
+              return _context20.finish(53);
+            case 56:
             case "end":
               return _context20.stop();
           }
-        }, _callee18, this, [[14, 24, 27, 30]]);
+        }, _callee18, this, [[5, 17, 20, 23], [40, 50, 53, 56]]);
       }));
       function correctPartlistArticlesByGlobalRules(_x53, _x54, _x55, _x56) {
         return _correctPartlistArticlesByGlobalRules.apply(this, arguments);
@@ -37637,10 +37758,36 @@ var DivaArticleHandler = /*#__PURE__*/function () {
   }, {
     key: "bundlePartlistArticles",
     value: function bundlePartlistArticles(partlistArticlesToLoad, bundleRules, articles) {
+      var _Object$values$0$set$, _Object$values$;
       var partlistArticlesToLoadGrouped = [];
+      // A position resolves its numbers and sub-positions from the values of its own features, so only positions equal in
+      // those merge - a layout of a 3-raster box is not the one of a 1-raster box. The features come from the loaded
+      // catalog articles (the global rules load them first; one not loaded yet merges by number); what a rule bundles
+      // pools by number, so the rule counts it across the articles.
+      var bundledCodices = new Set(bundleRules.flatMap(function (rule) {
+        var _rule$result2;
+        return [].concat(_toConsumableArray__default["default"](rule.toBundle), _toConsumableArray__default["default"]((_rule$result2 = rule.result) !== null && _rule$result2 !== void 0 ? _rule$result2 : [])).map(function (entry) {
+          return entry.articleCodex;
+        });
+      }));
+      var catalogs = Object.values((_Object$values$0$set$ = (_Object$values$ = Object.values(articles)[0]) === null || _Object$values$ === void 0 || (_Object$values$ = _Object$values$.set) === null || _Object$values$ === void 0 || (_Object$values$ = _Object$values$.getSetState) === null || _Object$values$ === void 0 ? void 0 : _Object$values$.divaCatalogs) !== null && _Object$values$0$set$ !== void 0 ? _Object$values$0$set$ : {});
+      var ownFeatures = function ownFeatures(position) {
+        var _catalog$getCatalogAr, _catalog$getCatalogAr2;
+        var catalog = catalogs.find(function (catalogData) {
+          return String(catalogData.catalogCodex) === String(position.CatalogCodex);
+        });
+        return Object.keys((_catalog$getCatalogAr = catalog === null || catalog === void 0 || (_catalog$getCatalogAr2 = catalog.getCatalogArticle(position.ArticleCodex)) === null || _catalog$getCatalogAr2 === void 0 ? void 0 : _catalog$getCatalogAr2.articleOptions) !== null && _catalog$getCatalogAr !== void 0 ? _catalog$getCatalogAr : {});
+      };
+      var sameConfiguration = function sameConfiguration(a, b) {
+        if (bundledCodices.has(a.ArticleCodex)) return true;
+        return ownFeatures(a).every(function (feature) {
+          var _a$VariantValues, _b$VariantValues;
+          return ((_a$VariantValues = a.VariantValues) === null || _a$VariantValues === void 0 ? void 0 : _a$VariantValues[feature]) === ((_b$VariantValues = b.VariantValues) === null || _b$VariantValues === void 0 ? void 0 : _b$VariantValues[feature]);
+        });
+      };
       var _loop5 = function _loop5(i) {
         var index = partlistArticlesToLoadGrouped.findIndex(function (item, j) {
-          if (item.CatalogCodex == partlistArticlesToLoad[i].CatalogCodex && item.ArticleCodex == partlistArticlesToLoad[i].ArticleCodex && item.RetailArticleNr == partlistArticlesToLoad[i].RetailArticleNr && item.RetailPrefix == partlistArticlesToLoad[i].RetailPrefix) {
+          if (item.CatalogCodex == partlistArticlesToLoad[i].CatalogCodex && item.ArticleCodex == partlistArticlesToLoad[i].ArticleCodex && item.RetailArticleNr == partlistArticlesToLoad[i].RetailArticleNr && item.RetailPrefix == partlistArticlesToLoad[i].RetailPrefix && sameConfiguration(item, partlistArticlesToLoad[i])) {
             return true;
           }
           return false;
@@ -37679,10 +37826,14 @@ var DivaArticleHandler = /*#__PURE__*/function () {
             var _bundleRule$result;
             bundleUsedCounter++;
             var _toBundleList = bundleRule.toBundle;
+            // the catalog of the bundled positions: where a result no partlist names and no loaded article knows comes from
+            var bundledCatalogCodex = void 0;
             for (var _j = 0; _j < _toBundleList.length; _j++) {
               var _toBundle = _toBundleList[_j];
               for (var _m = 0; _m < partlistArticlesToLoadGrouped.length; _m++) {
                 if (_toBundle.articleCodex == partlistArticlesToLoadGrouped[_m].ArticleCodex && _toBundle.quantity <= partlistArticlesToLoadGrouped[_m].Quantity) {
+                  var _bundledCatalogCodex;
+                  (_bundledCatalogCodex = bundledCatalogCodex) !== null && _bundledCatalogCodex !== void 0 ? _bundledCatalogCodex : bundledCatalogCodex = partlistArticlesToLoadGrouped[_m].CatalogCodex;
                   partlistArticlesToLoadGrouped[_m].Quantity -= _toBundle.quantity;
                   if (partlistArticlesToLoadGrouped[_m].Quantity == 0) {
                     partlistArticlesToLoadGrouped.splice(_m, 1);
@@ -37704,7 +37855,7 @@ var DivaArticleHandler = /*#__PURE__*/function () {
                 }
               }
               if (!resutlAlreadyExists) {
-                partlistArticlesToLoadGrouped.push(this.createNewPartlistArticleByArticleCodex(result.articleCodex, result.quantity, articles));
+                partlistArticlesToLoadGrouped.push(this.createNewPartlistArticleByArticleCodex(result.articleCodex, result.quantity, articles, bundledCatalogCodex));
               }
             }
           }
@@ -37714,7 +37865,7 @@ var DivaArticleHandler = /*#__PURE__*/function () {
     }
   }, {
     key: "createNewPartlistArticleByArticleCodex",
-    value: function createNewPartlistArticleByArticleCodex(articleCodex, quantity, articles) {
+    value: function createNewPartlistArticleByArticleCodex(articleCodex, quantity, articles, bundledCatalogCodex) {
       var alreadyCheckedArticles = [];
       var catalogData = undefined;
       for (var iKey in articles) {
@@ -37742,6 +37893,18 @@ var DivaArticleHandler = /*#__PURE__*/function () {
           };
         }
       }
+
+      // A catalog loads its articles on demand, so the result may be one nobody has asked for yet: it comes from the
+      // catalog of the positions it replaces and is fetched when the partlist loads, with its own numbers.
+      if (bundledCatalogCodex) {
+        return {
+          CatalogCodex: bundledCatalogCodex,
+          ArticleCodex: articleCodex,
+          RetailArticleNr: '',
+          Quantity: quantity,
+          VariantValues: {}
+        };
+      }
       throw new Error('Bundle Creation Failed. not Result with the Codex: ' + articleCodex + ' found');
     }
   }]);
@@ -38412,10 +38575,10 @@ var DivaConfigTreeData = /*#__PURE__*/function () {
     }
   }, {
     key: "getVisibility",
-    value: function getVisibility(configStepKey, visible, catalogData) {
+    value: function getVisibility(configStepKey, visible, set) {
       var allSteps = this.getAllByKey(configStepKey);
       if (allSteps) {
-        var option = catalogData.getOption(allSteps.optionStep.codex);
+        var option = set.getCatalogOption(allSteps.optionStep.codex, allSteps.configStep.targetArticles[0]);
         if (allSteps.configStep.singleOPVOnly && option !== null && option !== void 0 && option.hideOptionInConfigurator) {
           return false;
         }
@@ -38505,7 +38668,7 @@ var DivaConfigTreeData = /*#__PURE__*/function () {
                 lKey = _step20$value[0],
                 myOption = _step20$value[1];
               if (myOption.idmVariantType) {
-                var _catalog$getOption;
+                var _myOption$configSteps, _set$getCatalogOption;
                 var opgPairs = [[2, 3], [4, 5], [6, 7], [11, 12]];
                 for (var i = 0; i < opgPairs.length; i++) {
                   var optionStep = this.getOptionWhereIDMVariantIs(iKey, opgPairs[i][1]);
@@ -38514,7 +38677,8 @@ var DivaConfigTreeData = /*#__PURE__*/function () {
                     optionStep.mergesToOPG = true;
                   }
                 }
-                var toMergeWithOption = (_catalog$getOption = catalog.getOption(lKey)) === null || _catalog$getOption === void 0 ? void 0 : _catalog$getOption.mergeIDMToOPG;
+                var ownerBasketId = (_myOption$configSteps = myOption.configSteps.values().next().value) === null || _myOption$configSteps === void 0 || (_myOption$configSteps = _myOption$configSteps.targetArticles) === null || _myOption$configSteps === void 0 ? void 0 : _myOption$configSteps[0];
+                var toMergeWithOption = (_set$getCatalogOption = set.getCatalogOption(lKey, ownerBasketId)) === null || _set$getCatalogOption === void 0 ? void 0 : _set$getCatalogOption.mergeIDMToOPG;
                 var mergeWithOption = (!catalog.isIDMFormat ? 'OPT' : '') + toMergeWithOption;
                 if (toMergeWithOption && myTabGroup.options.has(mergeWithOption)) {
                   var _iterator21 = _createForOfIteratorHelper$m(myTabGroup.options),
@@ -39091,7 +39255,7 @@ var SummaryHandler = /*#__PURE__*/function () {
             var lookupBasketId = article.partlistArticleVisibleInTree ? (_article$partListPare = (_article$partListPare2 = article.partListParentArticle) === null || _article$partListPare2 === void 0 ? void 0 : _article$partListPare2.basketId) !== null && _article$partListPare !== void 0 ? _article$partListPare : article.basketId : article.basketId;
             var configStep = (_set$configTree$getCo = set.configTree.getConfigStepBasketIdAndOptionCodex(lookupBasketId, ops.optionCodex)) !== null && _set$configTree$getCo !== void 0 ? _set$configTree$getCo : (_set$hiddenConfigTree = set.hiddenConfigTree) === null || _set$hiddenConfigTree === void 0 ? void 0 : _set$hiddenConfigTree.getConfigStepBasketIdAndOptionCodex(lookupBasketId, ops.optionCodex);
             var itemsInTabGroup = summaryTabItems[tabGroupCodex].summaryItems;
-            var itemImage = ops.val.image ? set.CatalogData.getCatImageURL(ops.val.image, '') : undefined;
+            var itemImage = ops.val.image ? article.CatalogData.getCatImageURL(ops.val.image, '') : undefined;
             var opsName = article.getMergedOPGNames(ops).name;
             if (configStep && itemsInTabGroup) {
               var _ops$val2, _this$getAdditionalPr;
@@ -39707,7 +39871,7 @@ var SummaryHandler = /*#__PURE__*/function () {
     key: "getVariantsSummary",
     value: function () {
       var _getVariantsSummary = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee3(doConfigure, set) {
-        var summaryVariants, _yield$DivaFavorites$, variants, disabled, singleOptions, catalogData, _loop2, i;
+        var summaryVariants, _yield$DivaFavorites$, variants, disabled, singleOptions, _loop2, i;
         return _regeneratorRuntime__default["default"].wrap(function _callee3$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
@@ -39719,7 +39883,6 @@ var SummaryHandler = /*#__PURE__*/function () {
               variants = _yield$DivaFavorites$.variants;
               disabled = _yield$DivaFavorites$.disabled;
               singleOptions = _yield$DivaFavorites$.singleOptions;
-              catalogData = set.CatalogData; //index that does not count upo for diabled variants
               _loop2 = /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _loop2(i) {
                 var _variant$price, _variant$title;
                 var variant, result, basketID, variantVals, _loop3, opt, isDisabled;
@@ -39737,7 +39900,7 @@ var SummaryHandler = /*#__PURE__*/function () {
                       basketID = _context4.t1.value;
                       variantVals = variant.targetArticles[basketID];
                       _loop3 = /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _loop3(opt) {
-                        var _variant$configVarian, _optObject$name, _opvObject$name, optObject, opvObject;
+                        var _variant$configVarian, _optObject$name, _opvObject$name, optObject, opvCatalog, opvObject;
                         return _regeneratorRuntime__default["default"].wrap(function _loop3$(_context2) {
                           while (1) switch (_context2.prev = _context2.next) {
                             case 0:
@@ -39745,14 +39908,15 @@ var SummaryHandler = /*#__PURE__*/function () {
                                 return item.opt === opt;
                               }) && !singleOptions.includes(opt)) {
                                 if (((_variant$configVarian = variant.configVariantValues) === null || _variant$configVarian === void 0 || (_variant$configVarian = _variant$configVarian[basketID]) === null || _variant$configVarian === void 0 ? void 0 : _variant$configVarian[opt.substring(3)]) === variantVals[opt].substring(3)) {
-                                  optObject = catalogData.getOption(opt);
-                                  opvObject = catalogData.getOptionValue(variantVals[opt]);
+                                  optObject = set.getCatalogOption(opt, basketID);
+                                  opvCatalog = set.getOptionValueCatalog(variantVals[opt], basketID);
+                                  opvObject = opvCatalog === null || opvCatalog === void 0 ? void 0 : opvCatalog.getOptionValue(variantVals[opt]);
                                   result.push({
                                     opt: opt,
                                     opv: variantVals[opt],
                                     optionName: (_optObject$name = optObject === null || optObject === void 0 ? void 0 : optObject.name) !== null && _optObject$name !== void 0 ? _optObject$name : '',
                                     optionValueName: (_opvObject$name = opvObject === null || opvObject === void 0 ? void 0 : opvObject.name) !== null && _opvObject$name !== void 0 ? _opvObject$name : '',
-                                    optionValueImage: opvObject !== null && opvObject !== void 0 && opvObject.image ? catalogData.getCatImageURL(opvObject.image, '_gal') : undefined
+                                    optionValueImage: opvObject !== null && opvObject !== void 0 && opvObject.image ? opvCatalog === null || opvCatalog === void 0 ? void 0 : opvCatalog.getCatImageURL(opvObject.image, '_gal') : undefined
                                   });
                                 } else {
                                   result.push({
@@ -39836,17 +40000,17 @@ var SummaryHandler = /*#__PURE__*/function () {
                 }, _loop2);
               });
               i = 0;
-            case 10:
+            case 9:
               if (!(i < variants.length)) {
-                _context5.next = 15;
+                _context5.next = 14;
                 break;
               }
-              return _context5.delegateYield(_loop2(i), "t0", 12);
-            case 12:
+              return _context5.delegateYield(_loop2(i), "t0", 11);
+            case 11:
               i++;
-              _context5.next = 10;
+              _context5.next = 9;
               break;
-            case 15:
+            case 14:
               return _context5.abrupt("return", {
                 items: summaryVariants,
                 name: '',
@@ -39854,7 +40018,7 @@ var SummaryHandler = /*#__PURE__*/function () {
                 quantity: 1,
                 type: 'VARIANTS'
               });
-            case 16:
+            case 15:
             case "end":
               return _context5.stop();
           }
@@ -40214,7 +40378,7 @@ var DivaFavoritesHandler = /*#__PURE__*/function () {
     value: function changeOnFavorites(set, opt, opvs, targetArticles, remove, openModal) {
       var favorit = undefined;
       for (var i = 0; i < opvs.length; i++) {
-        var _set$CatalogData$getO;
+        var _set$getCatalogOption;
         if (!remove) {
           var _set$favorites2;
           favorit = (_set$favorites2 = set.favorites) === null || _set$favorites2 === void 0 || (_set$favorites2 = _set$favorites2.VariantValues[opt]) === null || _set$favorites2 === void 0 ? void 0 : _set$favorites2[opvs[i]];
@@ -40222,8 +40386,8 @@ var DivaFavoritesHandler = /*#__PURE__*/function () {
             favorit.targetArticles = _toConsumableArray__default["default"](new Set(favorit.targetArticles.concat(targetArticles)));
           }
         }
-        var optionName = (_set$CatalogData$getO = set.CatalogData.getOption(opt)) === null || _set$CatalogData$getO === void 0 ? void 0 : _set$CatalogData$getO.name;
-        var optionValue = set.CatalogData.getOptionValue(opvs[i]);
+        var optionName = (_set$getCatalogOption = set.getCatalogOption(opt, targetArticles[0])) === null || _set$getCatalogOption === void 0 ? void 0 : _set$getCatalogOption.name;
+        var optionValue = set.getCatalogOptionValue(opvs[i], targetArticles[0]);
         var optionValueName = optionValue === null || optionValue === void 0 ? void 0 : optionValue.name;
         var optionValueImage = optionValue === null || optionValue === void 0 ? void 0 : optionValue.image;
         favorit = new basketModel.Favorite(opt, opvs[i], targetArticles, optionName, optionValueName, optionValueImage);
@@ -40886,180 +41050,6 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
       } finally {
         _iterator2.f();
       }
-      this.checkForMergableSelectionModes(set.configTree, set.getDivaArticles());
-    }
-  }, {
-    key: "checkForMergableSelectionModes",
-    value: function checkForMergableSelectionModes(configTree, articles) {
-      if (Object.values(articles).find(function (article) {
-        return article.shelfPlanner;
-      })) return;
-      if (Object.values(articles).find(function (article) {
-        return article.set.CatalogData.useBoxPlanner;
-      })) return;
-      var _iterator3 = _createForOfIteratorHelper$k(configTree.tabGroups),
-        _step3;
-      try {
-        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-          var _step3$value = _slicedToArray__default["default"](_step3.value, 2),
-            tabGroupCodex = _step3$value[0],
-            tabGroup = _step3$value[1];
-          if (tabGroup.type == 'OPTION') {
-            var hasSelectionMode1 = [];
-            var hasSelectionMode2 = [];
-            var hasSelectionMode3 = [];
-            var basketIds = [];
-            var breakTabgroup = false;
-            var _iterator4 = _createForOfIteratorHelper$k(tabGroup.options),
-              _step4;
-            try {
-              for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-                var _step4$value = _slicedToArray__default["default"](_step4.value, 2),
-                  _optionCodex2 = _step4$value[0],
-                  _option2 = _step4$value[1];
-                var configSteps = Array.from(_option2.configSteps.values());
-                if (configSteps.find(function (configStep) {
-                  return configStep.notDisplayedInMainConfigTree;
-                })) breakTabgroup = true;
-                switch (_option2.selectionmode) {
-                  case 1:
-                    hasSelectionMode1.push(_optionCodex2);
-                    break;
-                  case 2:
-                    hasSelectionMode2.push(_optionCodex2);
-                    break;
-                  case 3:
-                    hasSelectionMode3.push(_optionCodex2);
-                    break;
-                }
-                var _iterator10 = _createForOfIteratorHelper$k(_option2.configSteps),
-                  _step10;
-                try {
-                  for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
-                    var _step10$value = _slicedToArray__default["default"](_step10.value, 2),
-                      x = _step10$value[0],
-                      _configStep2 = _step10$value[1];
-                    var _iterator11 = _createForOfIteratorHelper$k(_configStep2.targetArticles),
-                      _step11;
-                    try {
-                      for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
-                        var basketId = _step11.value;
-                        if (!basketIds.includes(basketId)) basketIds.push(basketId);
-                      }
-                    } catch (err) {
-                      _iterator11.e(err);
-                    } finally {
-                      _iterator11.f();
-                    }
-                  }
-                } catch (err) {
-                  _iterator10.e(err);
-                } finally {
-                  _iterator10.f();
-                }
-              }
-            } catch (err) {
-              _iterator4.e(err);
-            } finally {
-              _iterator4.f();
-            }
-            if (breakTabgroup) continue;
-            if (hasSelectionMode2.length > 0 && hasSelectionMode3.length > 0 && hasSelectionMode1.length == 0) {
-              //make the selectionmode 2 options -> selectionmode 3
-              var _iterator5 = _createForOfIteratorHelper$k(hasSelectionMode2),
-                _step5;
-              try {
-                for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-                  var optionCodex = _step5.value;
-                  var option = tabGroup.options.get(optionCodex);
-                  option.selectionmode = 3;
-                  var newConfigSteps = new Map();
-                  var _iterator6 = _createForOfIteratorHelper$k(option.configSteps),
-                    _step6;
-                  try {
-                    for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
-                      var _step6$value = _slicedToArray__default["default"](_step6.value, 2),
-                        configStepCodex = _step6$value[0],
-                        configStep = _step6$value[1];
-                      if (configStep.keyType == 'ALL') {
-                        var targetArticles = _toConsumableArray__default["default"](configStep.targetArticles);
-                        var _iterator7 = _createForOfIteratorHelper$k(targetArticles),
-                          _step7;
-                        try {
-                          for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
-                            var targetArticle = _step7.value;
-                            var newConfigStepKey = configStepCodex.replace('_ALL', '') + '_' + targetArticle;
-                            newConfigSteps.set(newConfigStepKey, _objectSpread$l(_objectSpread$l({}, configStep), {}, {
-                              keyType: 'BasketId',
-                              key: newConfigStepKey,
-                              targetArticles: [targetArticle]
-                            }));
-                          }
-                        } catch (err) {
-                          _iterator7.e(err);
-                        } finally {
-                          _iterator7.f();
-                        }
-                      } else {
-                        newConfigSteps.set(configStepCodex, configStep);
-                      }
-                    }
-                  } catch (err) {
-                    _iterator6.e(err);
-                  } finally {
-                    _iterator6.f();
-                  }
-                  option.configSteps = newConfigSteps;
-                }
-              } catch (err) {
-                _iterator5.e(err);
-              } finally {
-                _iterator5.f();
-              }
-            } else if (hasSelectionMode1.length > 0 && hasSelectionMode2.length > 0 && hasSelectionMode3.length == 0 || basketIds.length == 1) {
-              //make the selectionmode 2 options -> selectionmode 1
-              var stepsToConvertToSelectionmode1 = [].concat(hasSelectionMode2, hasSelectionMode3);
-              var _iterator8 = _createForOfIteratorHelper$k(stepsToConvertToSelectionmode1),
-                _step8;
-              try {
-                for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
-                  var _optionCodex = _step8.value;
-                  var _option = tabGroup.options.get(_optionCodex);
-                  _option.selectionmode = 1;
-                  var _newConfigSteps = new Map();
-                  var _iterator9 = _createForOfIteratorHelper$k(_option.configSteps),
-                    _step9;
-                  try {
-                    for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
-                      var _step9$value = _slicedToArray__default["default"](_step9.value, 2),
-                        _configStepCodex = _step9$value[0],
-                        _configStep = _step9$value[1];
-                      var _newConfigStepKey = _configStepCodex.replace('_ALL', '').replace('_' + _configStep.targetArticles[0], '') + '_' + 'ALL';
-                      _newConfigSteps.set(_newConfigStepKey, _objectSpread$l(_objectSpread$l({}, _configStep), {}, {
-                        keyType: 'ALL',
-                        key: _newConfigStepKey
-                      }));
-                    }
-                  } catch (err) {
-                    _iterator9.e(err);
-                  } finally {
-                    _iterator9.f();
-                  }
-                  _option.configSteps = _newConfigSteps;
-                }
-              } catch (err) {
-                _iterator8.e(err);
-              } finally {
-                _iterator8.f();
-              }
-            }
-          }
-        }
-      } catch (err) {
-        _iterator3.e(err);
-      } finally {
-        _iterator3.f();
-      }
     }
   }, {
     key: "addOptionsStateToConfigTree",
@@ -41367,7 +41357,7 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
     key: "getConifgItemsForView",
     value: function () {
       var _getConifgItemsForView = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee(set, configStepKey) {
-        var articles, step, retValues, optionCodex, configItems, selectedItems, optionState, _iterator12, _step12, _configItem$parent$oc, key, configItem, configItemsInOPG, retVal, _retVal, configStepOPG, configStepOPV, staticItems;
+        var articles, step, retValues, optionCodex, configItems, selectedItems, optionState, _iterator3, _step3, _configItem$parent$oc, key, configItem, configItemsInOPG, retVal, _retVal, configStepOPG, configStepOPV, staticItems;
         return _regeneratorRuntime__default["default"].wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -41393,15 +41383,15 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
                 _context.next = 36;
                 break;
               }
-              _iterator12 = _createForOfIteratorHelper$k(retValues.configItems.keys());
+              _iterator3 = _createForOfIteratorHelper$k(retValues.configItems.keys());
               _context.prev = 13;
-              _iterator12.s();
+              _iterator3.s();
             case 15:
-              if ((_step12 = _iterator12.n()).done) {
+              if ((_step3 = _iterator3.n()).done) {
                 _context.next = 26;
                 break;
               }
-              key = _step12.value;
+              key = _step3.value;
               configItem = retValues.configItems.get(key);
               if (configItem) {
                 _context.next = 20;
@@ -41430,10 +41420,10 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
             case 28:
               _context.prev = 28;
               _context.t0 = _context["catch"](13);
-              _iterator12.e(_context.t0);
+              _iterator3.e(_context.t0);
             case 31:
               _context.prev = 31;
-              _iterator12.f();
+              _iterator3.f();
               return _context.finish(31);
             case 34:
               _context.next = 52;
@@ -41516,11 +41506,11 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
       var owner = targetArticle.articleOptionStates.has(ops.optionCodex) ? targetArticle : (_targetArticle$partli = targetArticle.partlistArticlesAsArray.find(function (child) {
         return child.articleOptionStates.get(ops.optionCodex) === ops;
       })) !== null && _targetArticle$partli !== void 0 ? _targetArticle$partli : targetArticle;
-      var _iterator13 = _createForOfIteratorHelper$k(owner.articleOptionStates.values()),
-        _step13;
+      var _iterator4 = _createForOfIteratorHelper$k(owner.articleOptionStates.values()),
+        _step4;
       try {
-        for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
-          var state = _step13.value;
+        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+          var state = _step4.value;
           if (state.optionCodex === opg.optionCodex || state.optionCodex === ops.optionCodex || !state.isInvisible) continue;
           var parentValues = state.option.articleOptionValues;
           if (!(parentValues !== null && parentValues !== void 0 && parentValues.size)) continue;
@@ -41528,12 +41518,12 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
           // a parent family: EVERY option value of the invisible feature is an option group over the value feature
           var parentMembers = new Map();
           var isFamily = true;
-          var _iterator14 = _createForOfIteratorHelper$k(parentValues.keys()),
-            _step14;
+          var _iterator5 = _createForOfIteratorHelper$k(parentValues.keys()),
+            _step5;
           try {
-            for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
+            for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
               var _optionGroups$parentC;
-              var parentCodex = _step14.value;
+              var parentCodex = _step5.value;
               var members = (_optionGroups$parentC = optionGroups[parentCodex]) === null || _optionGroups$parentC === void 0 ? void 0 : _optionGroups$parentC.map(optionGroupMemberKey);
               if (!(members !== null && members !== void 0 && members.length) || !members.every(function (key) {
                 return valueKeys.has(key);
@@ -41544,19 +41534,19 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
               parentMembers.set(parentCodex, new Set(members));
             }
           } catch (err) {
-            _iterator14.e(err);
+            _iterator5.e(err);
           } finally {
-            _iterator14.f();
+            _iterator5.f();
           }
           if (!isFamily) continue;
           var parentNames = new Map();
-          var _iterator15 = _createForOfIteratorHelper$k(opg.visibleOptionValues),
-            _step15;
+          var _iterator6 = _createForOfIteratorHelper$k(opg.visibleOptionValues),
+            _step6;
           try {
             var _loop4 = function _loop4() {
                 var _optionGroups$opgValu, _parentValues$get;
-                var _step15$value = _slicedToArray__default["default"](_step15.value, 2),
-                  opgValue = _step15$value[1];
+                var _step6$value = _slicedToArray__default["default"](_step6.value, 2),
+                  opgValue = _step6$value[1];
                 var groupMembers = (_optionGroups$opgValu = optionGroups[opgValue.codex]) === null || _optionGroups$opgValu === void 0 ? void 0 : _optionGroups$opgValu.map(optionGroupMemberKey);
                 if (!(groupMembers !== null && groupMembers !== void 0 && groupMembers.length)) return 0; // continue
                 var parent = _toConsumableArray__default["default"](parentMembers.entries()).find(function (_ref2) {
@@ -41571,21 +41561,21 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
                 if (parentName) parentNames.set(opgValue.codex, parentName);
               },
               _ret;
-            for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
+            for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
               _ret = _loop4();
               if (_ret === 0) continue;
             }
           } catch (err) {
-            _iterator15.e(err);
+            _iterator6.e(err);
           } finally {
-            _iterator15.f();
+            _iterator6.f();
           }
           if (parentNames.size) return parentNames;
         }
       } catch (err) {
-        _iterator13.e(err);
+        _iterator4.e(err);
       } finally {
-        _iterator13.f();
+        _iterator4.f();
       }
       return undefined;
     }
@@ -41603,22 +41593,22 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
       if (!opg || !ops) return undefined;
       var parentNames = this.idmOpgParentNames(targetArticle, opg, ops);
       var configItems = [];
-      var _iterator16 = _createForOfIteratorHelper$k(opg.visibleOptionValues),
-        _step16;
+      var _iterator7 = _createForOfIteratorHelper$k(opg.visibleOptionValues),
+        _step7;
       try {
-        for (_iterator16.s(); !(_step16 = _iterator16.n()).done;) {
+        for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
           var _targetArticle$engine, _targetArticle$engine2, _ops$optionOcd2;
-          var _step16$value = _slicedToArray__default["default"](_step16.value, 2),
-            opgValue = _step16$value[1];
+          var _step7$value = _slicedToArray__default["default"](_step7.value, 2),
+            opgValue = _step7$value[1];
           var pool = (_targetArticle$engine = (_targetArticle$engine2 = targetArticle.engine).staticVisibleOptionValuesForFeature) === null || _targetArticle$engine === void 0 ? void 0 : _targetArticle$engine.call(_targetArticle$engine2, ops.optionCodex, opg.optionCodex, opgValue.codex);
           if (!pool) return undefined;
           var retVal = this.prepareConfigItemsForView(set, optionState, pool, constructionRules, [], configStepOPG.targetArticles, (_ops$optionOcd2 = ops.optionOcd) !== null && _ops$optionOcd2 !== void 0 ? _ops$optionOcd2 : ops.optionCodex, opgValue.name, opgValue.codex, opg.optionCodex, parentNames === null || parentNames === void 0 ? void 0 : parentNames.get(opgValue.codex));
           configItems = configItems.concat(retVal.myConfigItemsForView);
         }
       } catch (err) {
-        _iterator16.e(err);
+        _iterator7.e(err);
       } finally {
-        _iterator16.f();
+        _iterator7.f();
       }
       var _loop5 = function _loop5() {
         var _articles$configStepO;
@@ -41642,7 +41632,7 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
     key: "mergeOPGItemsByReconfiguration",
     value: (function () {
       var _mergeOPGItemsByReconfiguration = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee2(set, step, configStepOPG, configStepOPV, optionState, constructionRules, selectedItems) {
-        var configItems, clonedSet, clonedArticles, targetArticle, opg, ops, selectedOpv, originalVariantValues, parentNames, mergedOptionOnPartlistArticle, useFastPath, fastPathValidated, variantValues, _iterator17, _step17, _clonedSet$favorites$, _clonedSet$favorites, _step17$value, opgValue, alreadyCalcedVisibleOPVs, _loop7, _i2, _targetArticle$engine3, _targetArticle$engine4, _ops$optionOcd3, visibleOptionValues, updatedOps, fastPathKeys, fullKeys, retVal, clonedConfigItemsForView, _loop6, i;
+        var configItems, clonedSet, clonedArticles, targetArticle, opg, ops, selectedOpv, originalVariantValues, parentNames, mergedOptionOnPartlistArticle, useFastPath, fastPathValidated, variantValues, _iterator8, _step8, _clonedSet$favorites$, _clonedSet$favorites, _step8$value, opgValue, alreadyCalcedVisibleOPVs, _loop7, _i2, _targetArticle$engine3, _targetArticle$engine4, _ops$optionOcd3, visibleOptionValues, updatedOps, fastPathKeys, fullKeys, retVal, clonedConfigItemsForView, _loop6, i;
         return _regeneratorRuntime__default["default"].wrap(function _callee2$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
@@ -41670,15 +41660,15 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
               mergedOptionOnPartlistArticle = !targetArticle.getArticleOptionStateFlat(ops.optionCodex);
               useFastPath = true, fastPathValidated = false;
               variantValues = {};
-              _iterator17 = _createForOfIteratorHelper$k(opg.visibleOptionValues);
+              _iterator8 = _createForOfIteratorHelper$k(opg.visibleOptionValues);
               _context4.prev = 17;
-              _iterator17.s();
+              _iterator8.s();
             case 19:
-              if ((_step17 = _iterator17.n()).done) {
+              if ((_step8 = _iterator8.n()).done) {
                 _context4.next = 51;
                 break;
               }
-              _step17$value = _slicedToArray__default["default"](_step17.value, 2), opgValue = _step17$value[1];
+              _step8$value = _slicedToArray__default["default"](_step8.value, 2), opgValue = _step8$value[1];
               // The visible groups are set on the article one after another and each group's valid values fetched -> visibleOptionValues.
               variantValues[opg.optionCodex] = opgValue.codex;
               alreadyCalcedVisibleOPVs = targetArticle.getMergesToOPG(opg.optionCodex + '_' + opgValue.codex, JSON.stringify(targetArticle.getVariantValuesTillOPT(opg.optionCodex)));
@@ -41763,10 +41753,10 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
             case 53:
               _context4.prev = 53;
               _context4.t1 = _context4["catch"](17);
-              _iterator17.e(_context4.t1);
+              _iterator8.e(_context4.t1);
             case 56:
               _context4.prev = 56;
-              _iterator17.f();
+              _iterator8.f();
               return _context4.finish(56);
             case 59:
               _loop6 = /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _loop6() {
@@ -41849,11 +41839,11 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
               constructionRules = myOptionState.constructionRules;
               configItems = new Map(myOptionState.visibleOptionValues);
             } else {
-              var _iterator18 = _createForOfIteratorHelper$k(configItems.keys()),
-                _step18;
+              var _iterator9 = _createForOfIteratorHelper$k(configItems.keys()),
+                _step9;
               try {
                 var _loop8 = function _loop8() {
-                  var key = _step18.value;
+                  var key = _step9.value;
                   if (!myOptionState.visibleOptionValues.get(key) && !myOptionState.visibleOptionValues.values().find(function (v) {
                     var _configItems$get;
                     return v.sameopv && v.sameopv == ((_configItems$get = configItems.get(key)) === null || _configItems$get === void 0 ? void 0 : _configItems$get.sameopv);
@@ -41861,13 +41851,13 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
                     configItems["delete"](key);
                   }
                 };
-                for (_iterator18.s(); !(_step18 = _iterator18.n()).done;) {
+                for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
                   _loop8();
                 }
               } catch (err) {
-                _iterator18.e(err);
+                _iterator9.e(err);
               } finally {
-                _iterator18.f();
+                _iterator9.f();
               }
             }
           } else if (i == 0 && configStep.targetArticles.length == 1) {
@@ -41982,11 +41972,11 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
         ret = false;
       var articles = set.getDivaArticles();
       for (var basketId in articles) {
-        var _iterator19 = _createForOfIteratorHelper$k(articles[basketId].articleOptionStates.values()),
-          _step19;
+        var _iterator10 = _createForOfIteratorHelper$k(articles[basketId].articleOptionStates.values()),
+          _step10;
         try {
-          for (_iterator19.s(); !(_step19 = _iterator19.n()).done;) {
-            var ops = _step19.value;
+          for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
+            var ops = _step10.value;
             if (ops.headerPosVariationType == 'K') {
               if (optionValues[ops.optionCodex] == undefined) {
                 optionValues[ops.optionCodex] = ops.valCodex ? ops.valCodex : null;
@@ -41999,9 +41989,9 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
             }
           }
         } catch (err) {
-          _iterator19.e(err);
+          _iterator10.e(err);
         } finally {
-          _iterator19.f();
+          _iterator10.f();
         }
         if (ret == true) break;
       }
@@ -42249,12 +42239,12 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
       for (var iKey in optionStatesOfArticles) {
         //hier evtl. die Article mit einer gewissen reihenfolge durchlaufen!
         var optionsStates = optionStatesOfArticles[iKey];
-        var _iterator20 = _createForOfIteratorHelper$k(optionsStates.values()),
-          _step20;
+        var _iterator11 = _createForOfIteratorHelper$k(optionsStates.values()),
+          _step11;
         try {
-          for (_iterator20.s(); !(_step20 = _iterator20.n()).done;) {
+          for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
             var _ops$addToMeasure2;
-            var ops = _step20.value;
+            var ops = _step11.value;
             var selectionmode = ops.selectionmode;
             if (set.CatalogData.forceConfigSingle && (selectionmode == 1 || selectionmode == 2)) selectionmode = 3;
             if (ops.isInvisible || selectionmode == 0 || !ops.isDoShow || ops.visibleCount == 0 || !!((_ops$addToMeasure2 = ops.addToMeasure) !== null && _ops$addToMeasure2 !== void 0 && _ops$addToMeasure2.length)) {
@@ -42262,9 +42252,9 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
             }
           }
         } catch (err) {
-          _iterator20.e(err);
+          _iterator11.e(err);
         } finally {
-          _iterator20.f();
+          _iterator11.f();
         }
       }
       return configTree;
@@ -42938,12 +42928,14 @@ var DivaSet = /*#__PURE__*/function () {
   }, {
     key: "getSetTitle",
     value: function getSetTitle() {
-      var _this$ViewConfig, _this$setState$config;
-      if ((_this$ViewConfig = this.ViewConfig) !== null && _this$ViewConfig !== void 0 && _this$ViewConfig.useArticleNameAsTitle && _toConsumableArray__default["default"](new Set(this.mainArtcles.map(function (a) {
+      var _this$catalogData$use, _this$ViewConfig, _this$setState$config;
+      // the series property USE_ARTICLE_NAME_AS_TITLE, when set, replaces the view config value
+      var useArticleNameAsTitle = (_this$catalogData$use = this.catalogData.useArticleNameAsTitle) !== null && _this$catalogData$use !== void 0 ? _this$catalogData$use : (_this$ViewConfig = this.ViewConfig) === null || _this$ViewConfig === void 0 ? void 0 : _this$ViewConfig.useArticleNameAsTitle;
+      if (useArticleNameAsTitle && _toConsumableArray__default["default"](new Set(this.mainArtcles.map(function (a) {
         return a.articleCodex;
       }))).length == 1) {
         var name = this.mainArtcles[0].name.replace(/\(.+?\)/g, '');
-        if (typeof this.ViewConfig.useArticleNameAsTitle !== 'number' || name.length < this.ViewConfig.useArticleNameAsTitle) return name;
+        if (typeof useArticleNameAsTitle !== 'number' || name.length < useArticleNameAsTitle) return name;
       }
       return (_this$setState$config = this.setState.configuratorTitle) !== null && _this$setState$config !== void 0 ? _this$setState$config : this.getSetName();
     }
@@ -43019,6 +43011,76 @@ var DivaSet = /*#__PURE__*/function () {
       }
       return articles;
     }
+
+    /**
+     * Catalog option of `codex`, from the catalog of the article `basketId` first, then from the set catalog and every
+     * other article's catalog: partlist components of another serie (e.g. serie 0) register theirs in that serie's catalog.
+     */
+  }, {
+    key: "getCatalogOption",
+    value: function getCatalogOption(codex, basketId) {
+      var _iterator = _createForOfIteratorHelper$j(this.getAllCatalogs(basketId)),
+        _step;
+      try {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          var catalog = _step.value;
+          var option = catalog.getOption(codex);
+          if (option) return option;
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+      return undefined;
+    }
+
+    /** Catalog option value of `codex`, looked up across the same catalogs as getCatalogOption. */
+  }, {
+    key: "getCatalogOptionValue",
+    value: function getCatalogOptionValue(codex, basketId) {
+      var _this$getOptionValueC;
+      return (_this$getOptionValueC = this.getOptionValueCatalog(codex, basketId)) === null || _this$getOptionValueC === void 0 ? void 0 : _this$getOptionValueC.getOptionValue(codex);
+    }
+
+    /** The catalog holding the option value `codex`; its media settings resolve the value's images. */
+  }, {
+    key: "getOptionValueCatalog",
+    value: function getOptionValueCatalog(codex, basketId) {
+      var _iterator2 = _createForOfIteratorHelper$j(this.getAllCatalogs(basketId)),
+        _step2;
+      try {
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          var catalog = _step2.value;
+          if (catalog.getOptionValue(codex)) return catalog;
+        }
+      } catch (err) {
+        _iterator2.e(err);
+      } finally {
+        _iterator2.f();
+      }
+      return undefined;
+    }
+
+    // one walk over articles and partlist components, without building the recursive article map: this runs per looked-up value on every doConfigure
+  }, {
+    key: "getAllCatalogs",
+    value: function getAllCatalogs(basketId) {
+      var catalogs = [this.catalogData];
+      var ownCatalog;
+      var _collect = function collect(articles) {
+        for (var key in articles) {
+          var article = articles[key];
+          if (key === basketId) ownCatalog = article.CatalogData;
+          if (!catalogs.includes(article.CatalogData)) catalogs.push(article.CatalogData);
+          _collect(article.partlistArticles);
+        }
+      };
+      _collect(this.divaArticles);
+      return ownCatalog ? [ownCatalog].concat(_toConsumableArray__default["default"](catalogs.filter(function (catalog) {
+        return catalog !== ownCatalog;
+      }))) : catalogs;
+    }
   }, {
     key: "getDivaArticlesByGridGroup",
     value: function getDivaArticlesByGridGroup(gridGroup) {
@@ -43070,30 +43132,30 @@ var DivaSet = /*#__PURE__*/function () {
     value: function () {
       var _getCustomDimsFromCostructionService = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee3() {
         var _this2 = this;
-        var dims, dimensions, _iterator, _step, article, _iterator2, _step2, dimensionId, dimension, cleanedDimensions;
+        var dims, dimensions, _iterator3, _step3, article, _iterator4, _step4, dimensionId, dimension, cleanedDimensions;
         return _regeneratorRuntime__default["default"].wrap(function _callee3$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
               dims = [];
               dimensions = [];
-              _iterator = _createForOfIteratorHelper$j(this.getArticleVariantValues());
+              _iterator3 = _createForOfIteratorHelper$j(this.getArticleVariantValues());
               _context4.prev = 3;
-              _iterator.s();
+              _iterator3.s();
             case 5:
-              if ((_step = _iterator.n()).done) {
+              if ((_step3 = _iterator3.n()).done) {
                 _context4.next = 28;
                 break;
               }
-              article = _step.value;
-              _iterator2 = _createForOfIteratorHelper$j(article.headerDimensions);
+              article = _step3.value;
+              _iterator4 = _createForOfIteratorHelper$j(article.headerDimensions);
               _context4.prev = 8;
-              _iterator2.s();
+              _iterator4.s();
             case 10:
-              if ((_step2 = _iterator2.n()).done) {
+              if ((_step4 = _iterator4.n()).done) {
                 _context4.next = 18;
                 break;
               }
-              dimensionId = _step2.value;
+              dimensionId = _step4.value;
               _context4.next = 14;
               return this.api.getDimensionbyId(dimensionId, article.iln, this.getCatalogCodex(), article.variantValues);
             case 14:
@@ -43112,10 +43174,10 @@ var DivaSet = /*#__PURE__*/function () {
             case 20:
               _context4.prev = 20;
               _context4.t0 = _context4["catch"](8);
-              _iterator2.e(_context4.t0);
+              _iterator4.e(_context4.t0);
             case 23:
               _context4.prev = 23;
-              _iterator2.f();
+              _iterator4.f();
               return _context4.finish(23);
             case 26:
               _context4.next = 5;
@@ -43126,10 +43188,10 @@ var DivaSet = /*#__PURE__*/function () {
             case 30:
               _context4.prev = 30;
               _context4.t1 = _context4["catch"](3);
-              _iterator.e(_context4.t1);
+              _iterator3.e(_context4.t1);
             case 33:
               _context4.prev = 33;
-              _iterator.f();
+              _iterator3.f();
               return _context4.finish(33);
             case 36:
               if (!(!dims || dims.every(function (r, idx) {
@@ -43175,11 +43237,11 @@ var DivaSet = /*#__PURE__*/function () {
       var cleanedDimensions = [];
       for (var basketId in articles) {
         var artice = articles[basketId];
-        var _iterator3 = _createForOfIteratorHelper$j(artice.articleOptionStates.values()),
-          _step3;
+        var _iterator5 = _createForOfIteratorHelper$j(artice.articleOptionStates.values()),
+          _step5;
         try {
           var _loop2 = function _loop2() {
-            var ops = _step3.value;
+            var ops = _step5.value;
             if (ops.customDimension && artice.posNr !== -1) {
               var value;
               if (typeof ops.customDimension == 'number') {
@@ -43209,13 +43271,13 @@ var DivaSet = /*#__PURE__*/function () {
               }
             }
           };
-          for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+          for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
             _loop2();
           }
         } catch (err) {
-          _iterator3.e(err);
+          _iterator5.e(err);
         } finally {
-          _iterator3.f();
+          _iterator5.f();
         }
       }
       return cleanedDimensions;
@@ -43404,20 +43466,20 @@ var DivaSet = /*#__PURE__*/function () {
       var options = [];
       for (var key in this.divaArticles) {
         var article = this.divaArticles[key];
-        var _iterator4 = _createForOfIteratorHelper$j(article.articleOptionStates.values()),
-          _step4;
+        var _iterator6 = _createForOfIteratorHelper$j(article.articleOptionStates.values()),
+          _step6;
         try {
-          for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-            var ops = _step4.value;
+          for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+            var ops = _step6.value;
             if (!ops.invisibleWithoutMaskeInfluence && ops.isDoShow && ops.val && ops.valCodex != 'OPVNR' && ops.valCodex != 'OPOHNE') {
               var _ops$val$setName;
               if (ops.option.setName) options.push((_ops$val$setName = ops.val.setName) !== null && _ops$val$setName !== void 0 ? _ops$val$setName : ops.val.name);
             }
           }
         } catch (err) {
-          _iterator4.e(err);
+          _iterator6.e(err);
         } finally {
-          _iterator4.f();
+          _iterator6.f();
         }
       }
       return options;
@@ -43665,7 +43727,7 @@ var DivaSet = /*#__PURE__*/function () {
                 break;
               }
               _context5.next = 3;
-              return Promise.resolve().then(function () { return require('./DoorPlanner-3193abf9.js'); });
+              return Promise.resolve().then(function () { return require('./DoorPlanner-8cbae86f.js'); });
             case 3:
               _yield$import = _context5.sent;
               DoorPlanner = _yield$import["default"];
@@ -43800,6 +43862,11 @@ var DivaSet = /*#__PURE__*/function () {
     get: function get() {
       return this.setState.actions;
     }
+
+    /** Set by the planner when a view adopts or releases it. */,
+    set: function set(actions) {
+      this.setState.actions = actions;
+    }
   }, {
     key: "getPlanning2DAsJpg",
     get: function get() {
@@ -44517,13 +44584,15 @@ var Grid = /*#__PURE__*/function () {
    */
   return _createClass__default["default"](Grid, [{
     key: "tryFitOnShelf",
-    value: function tryFitOnShelf(accessoire, index, accessorieShelfPlanner, checkParentRuleOnly // when remove old shelfplanner logic remove this param
+    value: function tryFitOnShelf(accessoire, index, accessorieShelfPlanner, checkParentRuleOnly,
+    // when remove old shelfplanner logic remove this param
+    movingBasketId // the accessoire being moved: its own cells are free for it
     ) {
       var gridAllowedOnCells = accessorieShelfPlanner === null || accessorieShelfPlanner === void 0 ? void 0 : accessorieShelfPlanner.GridAllowedOnCells;
       var gridAllowedOntoArticles = accessorieShelfPlanner === null || accessorieShelfPlanner === void 0 ? void 0 : accessorieShelfPlanner.GridAllowedOntoArticles;
       var size = accessoire.shelfHeight;
       if (gridAllowedOntoArticles) {
-        return this.checkIfFitting(index, size, 'fitsOnToAccessoire', undefined, gridAllowedOntoArticles);
+        return this.checkIfFitting(index, size, 'fitsOnToAccessoire', undefined, gridAllowedOntoArticles, undefined, movingBasketId);
       }
       if (gridAllowedOnCells && gridAllowedOnCells.length > 0) {
         var noSpaceOn = false;
@@ -44533,11 +44602,11 @@ var Grid = /*#__PURE__*/function () {
             if (gridAllowedOnCell.onParent == this.article.articleCodex || gridAllowedOnCell.onParent == undefined) {
               noSpaceOn = gridAllowedOnCell.Cells;
               if (gridAllowedOnCell.Cells.includes(index)) {
-                return this.checkIfFitting(index, size, 'fitsOnParentRule', gridAllowedOnCell.Cells, undefined, checkParentRuleOnly);
+                return this.checkIfFitting(index, size, 'fitsOnParentRule', gridAllowedOnCell.Cells, undefined, checkParentRuleOnly, movingBasketId);
               } else {
                 for (var j = 0; j < gridAllowedOnCell.Cells.length; j++) {
-                  if (this.tryFitOnIndex(size, gridAllowedOnCell.Cells[j], undefined, checkParentRuleOnly)) {
-                    return this.checkIfFitting(gridAllowedOnCell.Cells[j], size, 'fitsOnParentRuleButOriginalNotAllowed', gridAllowedOnCell.Cells, undefined, checkParentRuleOnly);
+                  if (this.tryFitOnIndex(size, gridAllowedOnCell.Cells[j], undefined, checkParentRuleOnly, movingBasketId)) {
+                    return this.checkIfFitting(gridAllowedOnCell.Cells[j], size, 'fitsOnParentRuleButOriginalNotAllowed', gridAllowedOnCell.Cells, undefined, checkParentRuleOnly, movingBasketId);
                   }
                 }
               }
@@ -44566,7 +44635,7 @@ var Grid = /*#__PURE__*/function () {
           canOnlyFitOn: noSpaceOn
         };
       }
-      var ret = this.checkIfFitting(index, size);
+      var ret = this.checkIfFitting(index, size, undefined, undefined, undefined, undefined, movingBasketId);
       return ret;
     }
   }, {
@@ -44576,25 +44645,26 @@ var Grid = /*#__PURE__*/function () {
       var gridAllowedOnCell = arguments.length > 3 ? arguments[3] : undefined;
       var placedOnToAccessoire = arguments.length > 4 ? arguments[4] : undefined;
       var checkParentRuleOnly = arguments.length > 5 ? arguments[5] : undefined;
+      var movingBasketId = arguments.length > 6 ? arguments[6] : undefined;
       var count = 0;
       var noFitType = 'doesNotFit';
       var canOnlyFitOn = undefined;
       while (true) {
-        if (!this.cells[index - count] || this.cells[index - count].InUse > -1 && !checkParentRuleOnly) {
+        if (!this.cells[index - count] || this.isTakenFor(index - count, movingBasketId) && !checkParentRuleOnly) {
           return {
             type: noFitType,
             size: size,
             canOnlyFitOn: canOnlyFitOn
           };
         }
-        if (this.tryFitOnIndex(size, index - count, gridAllowedOnCell, checkParentRuleOnly)) {
-          if (!placedOnToAccessoire || this.checkIfPlacedOnToAccessoireRule(placedOnToAccessoire, index - count)) {
+        if (this.tryFitOnIndex(size, index - count, gridAllowedOnCell, checkParentRuleOnly, movingBasketId)) {
+          if (!placedOnToAccessoire || this.checkIfPlacedOnToAccessoireRule(placedOnToAccessoire, index - count, movingBasketId)) {
             return {
               type: type,
               size: size,
               index: index - count
             };
-          } else if (!this.cells[index - (count + 1)] || this.cells[index - (count + 1)].InUse > -1 && !checkParentRuleOnly) {
+          } else if (!this.cells[index - (count + 1)] || this.isTakenFor(index - (count + 1), movingBasketId) && !checkParentRuleOnly) {
             noFitType = 'notAllowedByAccessoireRule';
             canOnlyFitOn = this.getNamesOfArticles(placedOnToAccessoire);
           }
@@ -44602,11 +44672,20 @@ var Grid = /*#__PURE__*/function () {
         count++;
       }
     }
+
+    // Whether cell `index` holds an accessoire other than the one being moved (`movingBasketId`), which leaves its own cells.
+  }, {
+    key: "isTakenFor",
+    value: function isTakenFor(index, movingBasketId) {
+      var _cell$Article;
+      var cell = this.cells[index];
+      return cell.InUse > -1 && (movingBasketId === undefined || ((_cell$Article = cell.Article) === null || _cell$Article === void 0 ? void 0 : _cell$Article.basketId) !== movingBasketId);
+    }
   }, {
     key: "tryFitOnIndex",
-    value: function tryFitOnIndex(size, index, gridAllowedOnCell, checkParentRuleOnly) {
+    value: function tryFitOnIndex(size, index, gridAllowedOnCell, checkParentRuleOnly, movingBasketId) {
       for (var i = index; i < size + index; i++) {
-        if (this.cells[i] == undefined || this.cells[i].InUse > -1 && !checkParentRuleOnly || gridAllowedOnCell && !gridAllowedOnCell.includes(i)) {
+        if (this.cells[i] == undefined || this.isTakenFor(i, movingBasketId) && !checkParentRuleOnly || gridAllowedOnCell && !gridAllowedOnCell.includes(i)) {
           return false;
         }
       }
@@ -44623,11 +44702,14 @@ var Grid = /*#__PURE__*/function () {
       }
       return true;
     }
+
+    // The accessoire being moved (`movingBasketId`) leaves its cells, so it is no support for itself.
   }, {
     key: "checkIfPlacedOnToAccessoireRule",
-    value: function checkIfPlacedOnToAccessoireRule(fitsOnToAccessoire, position) {
-      var article = this.cells[position - 1].Article;
-      return article ? fitsOnToAccessoire.includes(article.articleCodex) : false;
+    value: function checkIfPlacedOnToAccessoireRule(fitsOnToAccessoire, position, movingBasketId) {
+      var _this$cells;
+      var article = (_this$cells = this.cells[position - 1]) === null || _this$cells === void 0 ? void 0 : _this$cells.Article;
+      return article && article.basketId !== movingBasketId ? fitsOnToAccessoire.includes(article.articleCodex) : false;
     }
   }, {
     key: "getNamesOfArticles",
@@ -44933,10 +45015,10 @@ var Grid = /*#__PURE__*/function () {
       var after = accessoire.shelfHeightAbove;
       if (before) {
         for (var i = 1; i <= before; i++) {
-          var _this$cells$index, _cell$Article;
+          var _this$cells$index, _cell$Article2;
           var index = cellIndex - i;
           var cell = this.cells[index];
-          if (this.cells[index] && ((_this$cells$index = this.cells[index]) === null || _this$cells$index === void 0 ? void 0 : _this$cells$index.InUse) != -1 && accessoire.basketId !== ((_cell$Article = cell.Article) === null || _cell$Article === void 0 ? void 0 : _cell$Article.basketId)) {
+          if (this.cells[index] && ((_this$cells$index = this.cells[index]) === null || _this$cells$index === void 0 ? void 0 : _this$cells$index.InUse) != -1 && accessoire.basketId !== ((_cell$Article2 = cell.Article) === null || _cell$Article2 === void 0 ? void 0 : _cell$Article2.basketId)) {
             return true;
           }
         }
@@ -45119,18 +45201,18 @@ var Grid = /*#__PURE__*/function () {
               //check for all the accessoires that moved during the process if they are allowed to be there
               accessoriesMoved = [];
               _loop2 = /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _loop2() {
-                var cell, _cell$Article3;
+                var cell, _cell$Article4;
                 return _regeneratorRuntime__default["default"].wrap(function _loop2$(_context7) {
                   while (1) switch (_context7.prev = _context7.next) {
                     case 0:
                       cell = _this2.cells[_i13];
                       if (cell.Type == 'fitsOnParentRule' && cell.InUse > -1 && !accessoriesMoved.find(function (a) {
-                        var _cell$Article2;
-                        return ((_cell$Article2 = cell.Article) === null || _cell$Article2 === void 0 ? void 0 : _cell$Article2.basketId) == a.basketId;
+                        var _cell$Article3;
+                        return ((_cell$Article3 = cell.Article) === null || _cell$Article3 === void 0 ? void 0 : _cell$Article3.basketId) == a.basketId;
                       })) {
                         accessoriesMoved.push({
                           article: cell.Article,
-                          basketId: (_cell$Article3 = cell.Article) === null || _cell$Article3 === void 0 ? void 0 : _cell$Article3.basketId,
+                          basketId: (_cell$Article4 = cell.Article) === null || _cell$Article4 === void 0 ? void 0 : _cell$Article4.basketId,
                           index: cell.InUse
                         });
                       }
@@ -45246,8 +45328,8 @@ var Grid = /*#__PURE__*/function () {
       var cells = this.cells,
         accessoires = this.accessoires;
       this.cells = cells.map(function (cell) {
-        var _cell$Article4;
-        if (((_cell$Article4 = cell.Article) === null || _cell$Article4 === void 0 ? void 0 : _cell$Article4.basketId) !== basketId) return cell;
+        var _cell$Article5;
+        if (((_cell$Article5 = cell.Article) === null || _cell$Article5 === void 0 ? void 0 : _cell$Article5.basketId) !== basketId) return cell;
         var free = new Cell(cell.Index);
         free.IsDisabled = cell.IsDisabled;
         return free;
@@ -45271,11 +45353,11 @@ var Grid = /*#__PURE__*/function () {
       if (!size || this.disabledByRule || this.checkAccessoireInGridRules(accessoire)) return [];
       var freeCells = [];
       for (var i = 0; i < this.Cells.length; i++) {
-        var _cell$Article5;
+        var _cell$Article6;
         var cell = this.Cells[i];
         if (!this.getAllArticleRelations().includes(accessoire.articleCodex)) continue;
-        var ret = this.tryFitOnShelf(accessoire, cell.Index, accessoire.shelfPlanner);
-        if (((_cell$Article5 = cell.Article) === null || _cell$Article5 === void 0 ? void 0 : _cell$Article5.basketId) === accessoire.basketId) {
+        var ret = this.tryFitOnShelf(accessoire, cell.Index, accessoire.shelfPlanner, undefined, accessoire.basketId);
+        if (((_cell$Article6 = cell.Article) === null || _cell$Article6 === void 0 ? void 0 : _cell$Article6.basketId) === accessoire.basketId) {
           var _ret$canOnlyFitOn;
           if (cell.Index == cell.InUse || ret && (_ret$canOnlyFitOn = ret.canOnlyFitOn) !== null && _ret$canOnlyFitOn !== void 0 && _ret$canOnlyFitOn.includes(cell.Index) || ret && ret.type !== 'fitsOnParentRule' && cell.OnlyPlaceHolder) {
             ret = {
@@ -45400,9 +45482,9 @@ var Grid = /*#__PURE__*/function () {
           if (!neighborGrid) continue;
           if (neighborGrid.Direction === this.Direction) {
             for (var _j3 = 0; _j3 < size; _j3++) {
-              var _cell$Article6;
+              var _cell$Article7;
               var cell = neighborGrid.cells[_j3 + index];
-              if ((cell === null || cell === void 0 ? void 0 : cell.InUse) !== -1 && ((_cell$Article6 = cell.Article) === null || _cell$Article6 === void 0 ? void 0 : _cell$Article6.basketId) !== accessoire.basketId) {
+              if ((cell === null || cell === void 0 ? void 0 : cell.InUse) !== -1 && ((_cell$Article7 = cell.Article) === null || _cell$Article7 === void 0 ? void 0 : _cell$Article7.basketId) !== accessoire.basketId) {
                 _ret = true;
               }
             }
@@ -46306,7 +46388,8 @@ var DivaSetHandler = /*#__PURE__*/function () {
                       }
                       return _context3.abrupt("return", 1);
                     case 3:
-                      isPartlistExclusive = (_catalogData$getCatal = catalogData.getCatalogArticleByArticleCodex(orderline.ArticleCodex)) === null || _catalogData$getCatal === void 0 ? void 0 : _catalogData$getCatal.isPartlistExclusive;
+                      // only asked for a line of its own: a partlist line goes to its parent either way, and may come from another serie
+                      isPartlistExclusive = !orderline.IsPartlistArticle && ((_catalogData$getCatal = catalogData.getCatalogArticleByArticleCodex(orderline.ArticleCodex)) === null || _catalogData$getCatal === void 0 ? void 0 : _catalogData$getCatal.isPartlistExclusive);
                       if (!orderline.IsPartlistArticle && (!isPartlistExclusive || !orderline.RelatedToBasketID)) {
                         variantValues = catalogData.repairVariantValues(orderline.getVariantValues(set.CatalogData.isIDMFormat), orderline.ArticleCodex);
                         toLoadArticles.push({
@@ -48792,7 +48875,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
               return _context32.abrupt("return", _objectSpread$h(_objectSpread$h(_objectSpread$h({
                 isRenderedNotInSettingPalette: set.configTree.isRenderedNotInSettingPalette(configStepKey),
                 isRenderedInAccessorieStep: set.configTree.isRenderedInAccessorieStep(configStepKey),
-                visible: set.configTree.getVisibility(configStepKey, visible, set.CatalogData)
+                visible: set.configTree.getVisibility(configStepKey, visible, set)
               }, configItems), {}, {
                 paletteType: paletteType,
                 filterType: filterType,
@@ -48863,7 +48946,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
               }
               return _context33.abrupt("return", configItems);
             case 2:
-              opt = set.CatalogData.getOption((_configItems$0$option = configItems[0].optionOcd) !== null && _configItems$0$option !== void 0 ? _configItems$0$option : configItems[0].op);
+              opt = set.getCatalogOption((_configItems$0$option = configItems[0].optionOcd) !== null && _configItems$0$option !== void 0 ? _configItems$0$option : configItems[0].op, set.configTree.getTargetArticles(configStepKey)[0]);
               previewType = set.api.pricePreview;
               if (!(!opt || opt.mergeIDMToOPG || configItems[0].isOPVG || opt.showOnSeparatTabgroup || set.PlannerMode === 'BoxPlanner' || ['TEXTBOX', 'NUMBERBOX', 'RANGE'].includes(paletteType) || (_set$api$ReturnToFrom = set.api.ReturnToFromParams) !== null && _set$api$ReturnToFrom !== void 0 && _set$api$ReturnToFrom.includes('PRODUCTCREATOR'))) {
                 _context33.next = 6;
@@ -48934,7 +49017,8 @@ var DivaSetHandler = /*#__PURE__*/function () {
             case 9:
               articleConfigs[_basketId3] = {
                 config: articles[_basketId3].VisibleVariantValues,
-                articleCodex: articles[_basketId3].articleCodex
+                articleCodex: articles[_basketId3].articleCodex,
+                conflictingOptions: articles[_basketId3].conflictingOptionCodices
               };
             case 10:
               i++;
@@ -48991,7 +49075,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
     key: "getVariant",
     value: function () {
       var _getVariant = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee33(set, item, origConfigs, totalConfig, targetArticles, option, origPrice, index, previousPromise) {
-        var firstPrice, prevProm, startTime, doUseConfigs, hashVariantValues, variantValues, i, _basketId4, origConfig, key, hash, dataHash, _i9, reversingCheck, ret, endTime, calcTime, price, priceObj;
+        var firstPrice, prevProm, startTime, doUseConfigs, hashVariantValues, variantValues, i, _basketId4, origConfig, key, _origConfigs$_basketI, hash, dataHash, variantBasketIds, _i9, reversingCheck, ret, endTime, calcTime, price, priceObj;
         return _regeneratorRuntime__default["default"].wrap(function _callee33$(_context35) {
           while (1) switch (_context35.prev = _context35.next) {
             case 0:
@@ -49032,7 +49116,8 @@ var DivaSetHandler = /*#__PURE__*/function () {
                 for (key in origConfig) {
                   if (key == item.op || key == item.idmOpgOptionCodex) {
                     doUseConfigs = true;
-                  } else if (doUseConfigs) {
+                  } else if (doUseConfigs && !((_origConfigs$_basketI = origConfigs[_basketId4].conflictingOptions) !== null && _origConfigs$_basketI !== void 0 && _origConfigs$_basketI.has(key))) {
+                    // A value the partlist children disagree on would overwrite the other children, a real click keeps them.
                     variantValues[i][key] = origConfig[key];
                   }
                   hashVariantValues[i][key] = origConfig[key];
@@ -49055,34 +49140,36 @@ var DivaSetHandler = /*#__PURE__*/function () {
                 firstPrice: firstPrice
               }));
             case 24:
+              // variantValues follow origConfigs, which skips target articles the set no longer holds
+              variantBasketIds = Object.keys(origConfigs);
               _i9 = 0;
-            case 25:
+            case 26:
               if (!(_i9 < variantValues.length)) {
-                _context35.next = 31;
+                _context35.next = 32;
                 break;
               }
-              _context35.next = 28;
-              return this.updateArticlesOptionStatesOfActSet(set, variantValues[_i9], [targetArticles[_i9]], true, 'calcVariant');
-            case 28:
+              _context35.next = 29;
+              return this.updateArticlesOptionStatesOfActSet(set, variantValues[_i9], [variantBasketIds[_i9]], true, 'calcVariant');
+            case 29:
               _i9++;
-              _context35.next = 25;
+              _context35.next = 26;
               break;
-            case 31:
+            case 32:
               reversingCheck = undefined;
               if (!option.checkForReversed) {
-                _context35.next = 37;
+                _context35.next = 38;
                 break;
               }
-              _context35.next = 35;
+              _context35.next = 36;
               return this.checkForReversingChanges(set, origConfigs, option, option.checkForReversed.checkOnlyForOptions);
-            case 35:
+            case 36:
               ret = _context35.sent;
               reversingCheck = {
                 checkingForReversingChanges: option.checkForReversed.checkForReversingChanges,
                 hasReversingChanges: ret.hasReversingChanges,
                 reversingVariantValues: ret.reversingVariantValues
               };
-            case 37:
+            case 38:
               endTime = new Date();
               calcTime = endTime.getTime() - startTime.getTime();
               LOG$b.debug('calcingVariant Time from Option:' + option.codex + ' and index: ' + index + ' time is: ' + calcTime + 'ms' + targetArticles.join(';'), [].concat(hashVariantValues, _toConsumableArray__default["default"](Object.values(totalConfig))));
@@ -49101,7 +49188,7 @@ var DivaSetHandler = /*#__PURE__*/function () {
               };
               set.CatalogData.setVariantsPriceByHash(hash, priceObj);
               return _context35.abrupt("return", priceObj);
-            case 44:
+            case 45:
             case "end":
               return _context35.stop();
           }
@@ -52006,7 +52093,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               break;
             case 3:
               _context13.next = 5;
-              return Promise.resolve().then(function () { return require('./PfisterWWSHandler-c6b93520.js'); });
+              return Promise.resolve().then(function () { return require('./PfisterWWSHandler-6dbfcff4.js'); });
             case 5:
               _yield$import = _context13.sent;
               PfisterWWSHandler = _yield$import["default"];
@@ -52014,7 +52101,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               return _context13.abrupt("break", 27);
             case 9:
               _context13.next = 11;
-              return Promise.resolve().then(function () { return require('./LiviqueWWSHandler-7804d581.js'); });
+              return Promise.resolve().then(function () { return require('./LiviqueWWSHandler-ab4ce5c7.js'); });
             case 11:
               _yield$import2 = _context13.sent;
               LiviqueWWSHandler = _yield$import2["default"];
@@ -52022,7 +52109,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               return _context13.abrupt("break", 27);
             case 15:
               _context13.next = 17;
-              return Promise.resolve().then(function () { return require('./SeriousBasketHandler-534a81ba.js'); });
+              return Promise.resolve().then(function () { return require('./SeriousBasketHandler-b4461030.js'); });
             case 17:
               _yield$import3 = _context13.sent;
               SeriousWWSHandler = _yield$import3["default"];
@@ -52030,7 +52117,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               return _context13.abrupt("break", 27);
             case 21:
               _context13.next = 23;
-              return Promise.resolve().then(function () { return require('./StandardWWSHandler-eb367f31.js'); });
+              return Promise.resolve().then(function () { return require('./StandardWWSHandler-612f003d.js'); });
             case 23:
               _yield$import4 = _context13.sent;
               StandardWWSHandler = _yield$import4["default"];
@@ -53434,7 +53521,7 @@ var PlannerHandler3D = /*#__PURE__*/function () {
               //If we need real time rendering initialize the SignalR and 3D host connection Handler
               bootMark('signalr: chunk import start');
               _context3.next = 3;
-              return Promise.resolve().then(function () { return require('./Host3DSignalR-c8859493.js'); });
+              return Promise.resolve().then(function () { return require('./Host3DSignalR-c5052424.js'); });
             case 3:
               _yield$import = _context3.sent;
               Host3DSignalR = _yield$import["default"];
@@ -57881,7 +57968,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
               break;
             case 9:
               _context5.next = 11;
-              return Promise.resolve().then(function () { return require('./DivaStandardPlanner-29d25b93.js'); });
+              return Promise.resolve().then(function () { return require('./DivaStandardPlanner-90493d1b.js'); });
             case 11:
               _yield$import = _context5.sent;
               DivaStandardPlanner = _yield$import["default"];
@@ -57896,7 +57983,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
               return _context5.abrupt("break", 22);
             case 16:
               _context5.next = 18;
-              return Promise.resolve().then(function () { return require('./DivaBoxPlanner-67edb68b.js'); });
+              return Promise.resolve().then(function () { return require('./DivaBoxPlanner-93e40ff6.js'); });
             case 18:
               _yield$import2 = _context5.sent;
               DivaBoxPlanner = _yield$import2["default"];
@@ -59659,6 +59746,8 @@ var DivaWebPlanner = /*#__PURE__*/function () {
     _defineProperty__default["default"](this, "plannerConfig", void 0);
     _defineProperty__default["default"](this, "lastInitError", void 0);
     _defineProperty__default["default"](this, "actions", void 0);
+    /** The actions of whoever created this instance; it reports through them whenever no view has adopted it. */
+    _defineProperty__default["default"](this, "ownActions", void 0);
     _defineProperty__default["default"](this, "handler", void 0);
     _defineProperty__default["default"](this, "state", void 0);
     _defineProperty__default["default"](this, "_doLoadHQR", void 0);
@@ -60528,7 +60617,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
               _context18.next = 24;
               return _this.fillBaksetforOnWebPlanerConfigChange(myValues, undefined, eventKey);
             case 24:
-              _this.configuratorChangeLog('onConfigurationChange', myValues, false, !!isUserAction);
+              _this.configuratorChangeLog('onConfigurationChange', myValues, false, !!isUserAction, targetArticles);
             case 25:
             case "end":
               return _context18.stop();
@@ -60640,6 +60729,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
     });
     this.plannerConfig = Object.assign(plannerConfig, {});
     this.actions = plannerConfig.actions;
+    this.ownActions = plannerConfig.actions;
     this.state = plannerConfig.state;
     this.handler = plannerConfig.handler;
     if (typeof window !== 'undefined') window.webPlanner = this;
@@ -63288,18 +63378,38 @@ var DivaWebPlanner = /*#__PURE__*/function () {
     }()
     /*********************************END Functions in Logik called From View END *************************************/
     /*********************************** View attachment (Logik -> View) ***************************************/
-    /** Attach the view (initial mount or adoption of an existing, possibly headless instance). */
+    /**
+     * Attach the view (initial mount or adoption of an existing, possibly headless instance). With `actions`, the
+     * instance reports through the view's host actions (modals, loading, events) until the view detaches.
+     */
   }, {
     key: "attachView",
-    value: function attachView(view) {
+    value: function attachView(view, actions) {
       this.view = view;
+      if (actions) this.reportTo(actions);
     }
 
-    /** Detach the view; the instance keeps working headless and can be re-attached later. */
+    /** Detach the view; the instance keeps working headless on its creator's actions and can be re-attached later. */
   }, {
     key: "detachView",
     value: function detachView() {
       this.view = undefined;
+      // a destroyed instance gets no actions back
+      if (!this._isDestroyed) this.reportTo(this.ownActions);
+    }
+
+    /** Every holder of the host actions: this planner, its config (the basket handler shares it), the API handler and each set. */
+  }, {
+    key: "reportTo",
+    value: function reportTo(actions) {
+      var _this$api4;
+      this.actions = actions;
+      this.plannerConfig.actions = actions;
+      (_this$api4 = this.api) === null || _this$api4 === void 0 || _this$api4.setActions(actions);
+      for (var _i = 0, _Object$values = Object.values(this.sets); _i < _Object$values.length; _i++) {
+        var set = _Object$values[_i];
+        set.actions = actions;
+      }
     }
 
     /** See {@link DivaPlannerHandler.strictArtifactGeneration}. Auto-propagates. */
@@ -63716,8 +63826,8 @@ var DivaWebPlanner = /*#__PURE__*/function () {
       var actualBasketvalue = 0;
       if (set) {
         actualBasketvalue = set === null || set === void 0 ? void 0 : set.getSetPrice();
-        for (var _i = 0, _Object$values = Object.values(set.getDivaArticles()); _i < _Object$values.length; _i++) {
-          var article = _Object$values[_i];
+        for (var _i2 = 0, _Object$values2 = Object.values(set.getDivaArticles()); _i2 < _Object$values2.length; _i2++) {
+          var article = _Object$values2[_i2];
           if (article.relatedToBasketId) {
             var toAdd = {
               codex: article.configArticleCodex,
@@ -63763,6 +63873,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
     value: function configuratorChangeLog(action, myValues) {
       var isInit = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
       var isUserAction = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
+      var targetArticles = arguments.length > 4 ? arguments[4] : undefined;
       var set = this.actSet();
       var actualBasketvalue = 0;
       //handle Price
@@ -63773,15 +63884,18 @@ var DivaWebPlanner = /*#__PURE__*/function () {
       //handle user selected
       var explicitlySetConfiguration = undefined;
       if (myValues && set) {
-        var _set$CatalogData$getO, _set$CatalogData$getO2, _set$CatalogData$getO3;
+        var _set$getCatalogOption;
+        var optCodex = Object.keys(myValues)[0];
+        var opvCodex = Object.values(myValues)[0];
+        var opvObject = set.getCatalogOptionValue(opvCodex, targetArticles === null || targetArticles === void 0 ? void 0 : targetArticles[0]);
         explicitlySetConfiguration = {
-          optCodex: Object.keys(myValues)[0],
-          optName: (set === null || set === void 0 || (_set$CatalogData$getO = set.CatalogData.getOption(Object.keys(myValues)[0])) === null || _set$CatalogData$getO === void 0 ? void 0 : _set$CatalogData$getO.name) || '',
-          opvCodex: Object.values(myValues)[0],
-          opvName: (set === null || set === void 0 || (_set$CatalogData$getO2 = set.CatalogData.getOptionValue(Object.values(myValues)[0])) === null || _set$CatalogData$getO2 === void 0 ? void 0 : _set$CatalogData$getO2.name) || '',
+          optCodex: optCodex,
+          optName: ((_set$getCatalogOption = set.getCatalogOption(optCodex, targetArticles === null || targetArticles === void 0 ? void 0 : targetArticles[0])) === null || _set$getCatalogOption === void 0 ? void 0 : _set$getCatalogOption.name) || '',
+          opvCodex: opvCodex,
+          opvName: (opvObject === null || opvObject === void 0 ? void 0 : opvObject.name) || '',
           stage: 'USER_CHANGE'
         };
-        var latestColor = ((_set$CatalogData$getO3 = set.CatalogData.getOptionValue(Object.values(myValues)[0])) === null || _set$CatalogData$getO3 === void 0 ? void 0 : _set$CatalogData$getO3.colorGroups) || [];
+        var latestColor = (opvObject === null || opvObject === void 0 ? void 0 : opvObject.colorGroups) || [];
         if (latestColor.length > 0) {
           explicitlySetConfiguration.optClassification = 'COLOR';
           explicitlySetConfiguration.opvClassification = latestColor;
@@ -63791,25 +63905,26 @@ var DivaWebPlanner = /*#__PURE__*/function () {
       //handle final configuration
       var finalConfiguration = [];
       if (set) {
-        for (var _i2 = 0, _Object$values2 = Object.values(set.getDivaArticles()); _i2 < _Object$values2.length; _i2++) {
-          var article = _Object$values2[_i2];
+        for (var _i3 = 0, _Object$values3 = Object.values(set.getDivaArticles()); _i3 < _Object$values3.length; _i3++) {
+          var article = _Object$values3[_i3];
           var variantValues = article.AllVariantValues;
-          for (var _i3 = 0, _Object$entries = Object.entries(variantValues); _i3 < _Object$entries.length; _i3++) {
-            var _set$CatalogData$getO4, _set$CatalogData$getO5, _set$CatalogData$getO6, _set$CatalogData$getO7;
-            var _Object$entries$_i = _slicedToArray__default["default"](_Object$entries[_i3], 2),
+          for (var _i4 = 0, _Object$entries = Object.entries(variantValues); _i4 < _Object$entries.length; _i4++) {
+            var _set$getCatalogOption2;
+            var _Object$entries$_i = _slicedToArray__default["default"](_Object$entries[_i4], 2),
               opt = _Object$entries$_i[0],
               opv = _Object$entries$_i[1];
-            if (!set.CatalogData.getOptionValue(opv) || !((_set$CatalogData$getO4 = set.CatalogData.getOptionValue(opv)) !== null && _set$CatalogData$getO4 !== void 0 && _set$CatalogData$getO4.name)) {
+            var _opvObject = set.getCatalogOptionValue(opv, article.basketId);
+            if (!(_opvObject !== null && _opvObject !== void 0 && _opvObject.name)) {
               continue;
             }
             var finalConfigurationItem = {
               optCodex: opt,
-              optName: ((_set$CatalogData$getO5 = set.CatalogData.getOption(opt)) === null || _set$CatalogData$getO5 === void 0 ? void 0 : _set$CatalogData$getO5.name) || '',
+              optName: ((_set$getCatalogOption2 = set.getCatalogOption(opt, article.basketId)) === null || _set$getCatalogOption2 === void 0 ? void 0 : _set$getCatalogOption2.name) || '',
               opvCodex: opv,
-              opvName: ((_set$CatalogData$getO6 = set.CatalogData.getOptionValue(opv)) === null || _set$CatalogData$getO6 === void 0 ? void 0 : _set$CatalogData$getO6.name) || '',
+              opvName: _opvObject.name,
               stage: action == 'onConfigurationChange' ? 'FINAL' : 'INITIAL'
             };
-            var color = ((_set$CatalogData$getO7 = set.CatalogData.getOptionValue(opv)) === null || _set$CatalogData$getO7 === void 0 ? void 0 : _set$CatalogData$getO7.colorGroups) || [];
+            var color = _opvObject.colorGroups || [];
             if (color.length > 0) {
               finalConfigurationItem.optClassification = 'COLOR';
               finalConfigurationItem.opvClassification = color;
@@ -83963,6 +84078,7 @@ exports.keepInsideRoom = keepInsideRoom;
 exports.layersCollide = layersCollide;
 exports.loadAndRepairBasket = loadAndRepairBasket;
 exports.loadElementPartStepValues = loadElementPartStepValues;
+exports.measureUnitSymbol = measureUnitSymbol;
 exports.measureWithUnit = measureWithUnit;
 exports.moveGroupRigidly = moveGroupRigidly;
 exports.movePoints = movePoints;