pptx-react-viewer 2.21.0 → 2.21.1

package/dist/{chunk-F7SX4EUT.js → chunk-HYUJVSQJ.js}

@@ -32809,6 +32809,110 @@ function unwrapAlternateContent(container) {
   delete container["mc:AlternateContent"];
   return blocks;
 }
+function reapplyAlternateContentToTree(container, blockByNode) {
+  let working = container;
+  const groups = ensureArray3(working["p:grpSp"]);
+  if (groups.length > 0) {
+    let groupsChanged = false;
+    const nextGroups = groups.map((group2) => {
+      const next2 = reapplyAlternateContentToTree(group2, blockByNode);
+      if (next2 !== group2) {
+        groupsChanged = true;
+      }
+      return next2;
+    });
+    if (groupsChanged) {
+      working = { ...working, "p:grpSp": nextGroups };
+    }
+  }
+  const blockGroups = /* @__PURE__ */ new Map();
+  for (const tag of SHAPE_TREE_ELEMENT_TAGS) {
+    for (const node of ensureArray3(working[tag])) {
+      const block = blockByNode.get(node);
+      if (!block) {
+        continue;
+      }
+      let entries = blockGroups.get(block);
+      if (!entries) {
+        entries = [];
+        blockGroups.set(block, entries);
+      }
+      entries.push({ tag, node });
+    }
+  }
+  if (blockGroups.size === 0) {
+    return working;
+  }
+  const nextArrays = /* @__PURE__ */ new Map();
+  const arrayFor = (tag) => {
+    let arr = nextArrays.get(tag);
+    if (!arr) {
+      arr = [...ensureArray3(working[tag])];
+      nextArrays.set(tag, arr);
+    }
+    return arr;
+  };
+  const envelopes = [...ensureArray3(working["mc:AlternateContent"])];
+  for (const [block, entries] of blockGroups) {
+    for (const entry2 of entries) {
+      const arr = arrayFor(entry2.tag);
+      const idx = arr.indexOf(entry2.node);
+      if (idx !== -1) {
+        arr.splice(idx, 1);
+      }
+    }
+    const liveByTag = /* @__PURE__ */ new Map();
+    for (const entry2 of entries) {
+      let nodes = liveByTag.get(entry2.tag);
+      if (!nodes) {
+        nodes = [];
+        liveByTag.set(entry2.tag, nodes);
+      }
+      nodes.push(entry2.node);
+    }
+    const clonedAc = { ...block.rawAc };
+    if (block.selectedBranch === "choice") {
+      const choices2 = ensureArray3(clonedAc["mc:Choice"]);
+      const targetIdx = block.choiceIndex ?? 0;
+      const original = choices2[targetIdx];
+      if (original) {
+        const rebuilt = { ...original };
+        for (const tag of SHAPE_TREE_ELEMENT_TAGS) {
+          delete rebuilt[tag];
+        }
+        for (const [tag, nodes] of liveByTag) {
+          rebuilt[tag] = nodes.length === 1 ? nodes[0] : nodes;
+        }
+        const nextChoices = [...choices2];
+        nextChoices[targetIdx] = rebuilt;
+        clonedAc["mc:Choice"] = nextChoices.length === 1 ? nextChoices[0] : nextChoices;
+      }
+    } else {
+      const fallback = clonedAc["mc:Fallback"];
+      if (fallback) {
+        const rebuilt = { ...fallback };
+        for (const tag of SHAPE_TREE_ELEMENT_TAGS) {
+          delete rebuilt[tag];
+        }
+        for (const [tag, nodes] of liveByTag) {
+          rebuilt[tag] = nodes.length === 1 ? nodes[0] : nodes;
+        }
+        clonedAc["mc:Fallback"] = rebuilt;
+      }
+    }
+    envelopes.push(clonedAc);
+  }
+  const next = { ...working };
+  for (const [tag, arr] of nextArrays) {
+    if (arr.length > 0) {
+      next[tag] = arr;
+    } else {
+      delete next[tag];
+    }
+  }
+  next["mc:AlternateContent"] = envelopes.length === 1 ? envelopes[0] : envelopes;
+  return next;
+}
 function ensureArray3(val2) {
   if (!val2) {
     return [];
@@ -36074,6 +36178,37 @@ var STYLE_MATRIX_LINE_KEYS = [
   "lineCap",
   "compoundLine"
 ];
+var STYLE_MATRIX_EFFECT_KEYS = [
+  "shadowColor",
+  "shadowBlur",
+  "shadowOffsetX",
+  "shadowOffsetY",
+  "shadowOpacity",
+  "innerShadowColor",
+  "innerShadowBlur",
+  "innerShadowOffsetX",
+  "innerShadowOffsetY",
+  "innerShadowOpacity",
+  "glowColor",
+  "glowRadius",
+  "glowOpacity",
+  "softEdgeRadius",
+  "reflectionBlurRadius",
+  "reflectionStartOpacity",
+  "reflectionEndOpacity",
+  "reflectionEndPosition",
+  "reflectionDirection",
+  "reflectionRotation",
+  "reflectionDistance",
+  "scene3d",
+  "shape3d"
+];
+var EFFECT_AUTHORED_ONLY_KEYS = [
+  "blurRadius",
+  "presetShadowName",
+  "effectDagXml",
+  "effectDagTree"
+];
 function captureStyleBaseline(style, keys) {
   const baseline = {};
   for (const key2 of keys) {
@@ -36098,6 +36233,16 @@ function createLineStyleGate(style) {
   }
   return (...keys) => keys.some((key2) => style[key2] !== baseline[key2]);
 }
+function effectIsPurelyStyleMatrix(style) {
+  const baseline = style.inheritedEffectStyle;
+  if (baseline === void 0) {
+    return false;
+  }
+  if (!matchesBaseline(style, baseline, STYLE_MATRIX_EFFECT_KEYS)) {
+    return false;
+  }
+  return EFFECT_AUTHORED_ONLY_KEYS.every((key2) => style[key2] === void 0);
+}
 function applyScene3dStyle(shapeProps, style) {
   const scene3dNode = shapeProps["a:scene3d"];
   if (!scene3dNode) {
@@ -36416,14 +36561,17 @@ var PptxShapeStyleExtractor = class {
     Object.assign(style, this.context.extractEffectDagStyle(shapeProps));
     if (styleNode?.["a:effectRef"]) {
       const suppressInherited = hasEmptyDrawingChild(shapeProps, "effectLst");
-      const authored = suppressInherited ? new Set(Object.keys(style)) : void 0;
+      const authoredBefore = new Set(Object.keys(style));
       this.context.resolveThemeEffectRef(styleNode["a:effectRef"], style);
-      if (authored) {
+      if (suppressInherited) {
         for (const key2 of Object.keys(style)) {
-          if (!authored.has(key2) && key2 !== "effectRefIdx" && key2 !== "effectRefColorXml") {
+          if (!authoredBefore.has(key2) && key2 !== "effectRefIdx" && key2 !== "effectRefColorXml") {
             delete style[key2];
           }
         }
+      } else {
+        const inheritedKeys = STYLE_MATRIX_EFFECT_KEYS.filter((key2) => !authoredBefore.has(key2));
+        style.inheritedEffectStyle = captureStyleBaseline(style, inheritedKeys);
       }
     }
     const fontRef = styleNode?.["a:fontRef"];
@@ -45396,6 +45544,16 @@ var CONTAINER_LOCAL_NAME_TO_TYPE = {
 function chartContainerLocalNameToType(localName25) {
   return CONTAINER_LOCAL_NAME_TO_TYPE[localName25];
 }
+var LINE_DRAWN_CHART_TYPES = /* @__PURE__ */ new Set([
+  "line",
+  "line3D",
+  "scatter",
+  "radar",
+  "stock"
+]);
+function isLineDrawnChartType(type) {
+  return type !== void 0 && LINE_DRAWN_CHART_TYPES.has(type);
+}
 function parseChartDateCategories(seriesNode, xmlLookup) {
   const cat = xmlLookup.getChildByLocalName(seriesNode, "cat");
   const numeric = xmlLookup.getChildByLocalName(cat, "numRef") || xmlLookup.getChildByLocalName(cat, "numLit");
@@ -51294,6 +51452,77 @@ function applyChartLegendToXml(chartRoot, style, getLocalName2, resolveColor2) {
   }
   applyLegendEntries(legendNode, style.legendEntries, getLocalName2, resolveColor2);
 }
+function findKey18(obj, local, getLocalName2) {
+  return Object.keys(obj).find((k) => getLocalName2(k) === local);
+}
+function insertBeforeLn(obj, key2, value, getLocalName2) {
+  const keys = Object.keys(obj);
+  const lnIdx = keys.findIndex((k) => getLocalName2(k) === "ln");
+  const entries = keys.map((k) => [k, obj[k]]);
+  const at = lnIdx === -1 ? entries.length : lnIdx;
+  entries.splice(at, 0, [key2, value]);
+  for (const k of keys) {
+    delete obj[k];
+  }
+  for (const [k, v] of entries) {
+    obj[k] = v;
+  }
+}
+function insertFirst(obj, key2, value) {
+  const keys = Object.keys(obj);
+  const entries = keys.map((k) => [k, obj[k]]);
+  for (const k of keys) {
+    delete obj[k];
+  }
+  obj[key2] = value;
+  for (const [k, v] of entries) {
+    obj[k] = v;
+  }
+}
+function writeSeriesColorToSpPr(spPr, hex4, isLineFamily, getLocalName2, resolveColor2) {
+  const normalizedHex = hex4.replace(/^#/u, "");
+  if (isLineFamily) {
+    const lnKey = findKey18(spPr, "ln", getLocalName2) ?? "a:ln";
+    const ln = spPr[lnKey] ?? {};
+    const hadLn = Boolean(spPr[lnKey]);
+    const noFillKey2 = findKey18(ln, "noFill", getLocalName2);
+    if (noFillKey2) {
+      delete ln[noFillKey2];
+    }
+    const lnFillKey = findKey18(ln, "solidFill", getLocalName2) ?? "a:solidFill";
+    const authoredFill2 = ln[lnFillKey];
+    const fillNode2 = serializeColorChoice(
+      authoredFill2,
+      authoredFill2 ? resolveColor2(authoredFill2) : void 0,
+      normalizedHex
+    );
+    if (authoredFill2) {
+      ln[lnFillKey] = fillNode2;
+    } else {
+      insertFirst(ln, lnFillKey, fillNode2);
+    }
+    if (!hadLn) {
+      spPr[lnKey] = ln;
+    }
+    return;
+  }
+  const noFillKey = findKey18(spPr, "noFill", getLocalName2);
+  if (noFillKey) {
+    delete spPr[noFillKey];
+  }
+  const fillKey = findKey18(spPr, "solidFill", getLocalName2) ?? "a:solidFill";
+  const authoredFill = spPr[fillKey];
+  const fillNode = serializeColorChoice(
+    authoredFill,
+    authoredFill ? resolveColor2(authoredFill) : void 0,
+    normalizedHex
+  );
+  if (authoredFill) {
+    spPr[fillKey] = fillNode;
+  } else {
+    insertBeforeLn(spPr, fillKey, fillNode, getLocalName2);
+  }
+}
 var TITLE_ROLE = /* @__PURE__ */ new Set(["title", "ctrtitle"]);
 var CONTENT_ROLE = /* @__PURE__ */ new Set([
   "body",
@@ -60456,26 +60685,24 @@ var PptxHandlerRuntime23 = class _PptxHandlerRuntime7 extends PptxHandlerRuntime
             this.updateChartCacheValues(valNode, true, seriesData.values.map(String));
           }
           if (seriesData.color) {
-            const hex4 = seriesData.color.replace("#", "");
-            const spPr = this.xmlLookupService.getChildByLocalName(seriesNode, "spPr");
-            if (spPr) {
-              const solidFillKey = Object.keys(spPr).find(
-                (k) => this.compatibilityService.getXmlLocalName(k) === "solidFill"
-              ) ?? "a:solidFill";
-              const authoredFill = spPr[solidFillKey];
-              spPr[solidFillKey] = serializeColorChoice(
-                authoredFill,
-                authoredFill ? this.parseColor(authoredFill) : void 0,
-                hex4
-              );
-            } else {
-              const spPrKey = Object.keys(seriesNode).find(
-                (k) => this.compatibilityService.getXmlLocalName(k) === "spPr"
-              ) ?? "c:spPr";
-              seriesNode[spPrKey] = {
-                "a:solidFill": { "a:srgbClr": { "@_val": hex4 } }
-              };
+            const isLineFamily = isLineDrawnChartType(
+              seriesData.seriesChartType ?? chartData.chartType
+            );
+            const spPrKey = Object.keys(seriesNode).find(
+              (k) => this.compatibilityService.getXmlLocalName(k) === "spPr"
+            ) ?? "c:spPr";
+            let spPr = seriesNode[spPrKey];
+            if (!spPr) {
+              spPr = {};
+              seriesNode[spPrKey] = spPr;
             }
+            writeSeriesColorToSpPr(
+              spPr,
+              seriesData.color,
+              isLineFamily,
+              (key2) => this.compatibilityService.getXmlLocalName(key2),
+              (node) => this.parseColor(node)
+            );
           }
           if (seriesData.trendlines !== void 0) {
             applySeriesTrendlinesToXml(
@@ -60527,7 +60754,8 @@ var PptxHandlerRuntime23 = class _PptxHandlerRuntime7 extends PptxHandlerRuntime
               seriesData,
               chartData.categories,
               templateSeries,
-              chartData.dateCategories
+              chartData.dateCategories,
+              isLineDrawnChartType(seriesData.seriesChartType ?? chartData.chartType)
             );
             newSeriesXmlNodes.push(newNode);
           }
@@ -60963,8 +61191,12 @@ var PptxHandlerRuntime23 = class _PptxHandlerRuntime7 extends PptxHandlerRuntime
    * If a `templateSeries` is provided, it is deep-cloned and its data is
    * replaced with the new series data. Otherwise, a minimal structure is
    * built from scratch.
+   *
+   * @param isLineFamily - Whether the target chart family reads/writes its
+   *   series colour from `a:ln/a:solidFill` (line/line3D/scatter/radar/stock)
+   *   rather than a direct `a:solidFill`. See `isLineDrawnChartType`.
    */
-  buildNewSeriesXml(seriesIndex, seriesData, categories, templateSeries, dateCategories) {
+  buildNewSeriesXml(seriesIndex, seriesData, categories, templateSeries, dateCategories, isLineFamily = false) {
     if (templateSeries) {
       const clone3 = JSON.parse(JSON.stringify(templateSeries));
       const idxNode = this.xmlLookupService.getChildByLocalName(clone3, "idx");
@@ -60991,22 +61223,13 @@ var PptxHandlerRuntime23 = class _PptxHandlerRuntime7 extends PptxHandlerRuntime
       if (seriesData.color) {
         const spPr = this.xmlLookupService.getChildByLocalName(clone3, "spPr");
         if (spPr) {
-          const solidFillKey = Object.keys(spPr).find(
-            (k) => this.compatibilityService.getXmlLocalName(k) === "solidFill"
+          writeSeriesColorToSpPr(
+            spPr,
+            seriesData.color,
+            isLineFamily,
+            (key2) => this.compatibilityService.getXmlLocalName(key2),
+            (node) => this.parseColor(node)
           );
-          if (solidFillKey) {
-            spPr[solidFillKey] = {
-              "a:srgbClr": {
-                "@_val": seriesData.color.replace("#", "")
-              }
-            };
-          } else {
-            spPr["a:solidFill"] = {
-              "a:srgbClr": {
-                "@_val": seriesData.color.replace("#", "")
-              }
-            };
-          }
         }
       }
       return clone3;
@@ -61023,11 +61246,7 @@ var PptxHandlerRuntime23 = class _PptxHandlerRuntime7 extends PptxHandlerRuntime
           }
         }
       },
-      "c:spPr": {
-        "a:solidFill": {
-          "a:srgbClr": { "@_val": colorHex }
-        }
-      },
+      "c:spPr": isLineFamily ? { "a:ln": { "a:solidFill": { "a:srgbClr": { "@_val": colorHex } } } } : { "a:solidFill": { "a:srgbClr": { "@_val": colorHex } } },
       "c:cat": dateCategories ? {
         "c:numRef": {
           "c:numCache": {
@@ -61057,7 +61276,7 @@ var PptxHandlerRuntime23 = class _PptxHandlerRuntime7 extends PptxHandlerRuntime
     return ser;
   }
 };
-function findKey18(node, name, localName25) {
+function findKey19(node, name, localName25) {
   return Object.keys(node).find((key2) => localName25(key2) === name);
 }
 function prefixFor2(node) {
@@ -61076,7 +61295,7 @@ function setChildren(node, name, values, localName25) {
   if (values === void 0) {
     return false;
   }
-  const existing = findKey18(node, name, localName25);
+  const existing = findKey19(node, name, localName25);
   if (values.length === 0) {
     if (existing) {
       delete node[existing];
@@ -61103,7 +61322,7 @@ function applySmartArtDefinitionMetadata(node, metadata, localName25) {
   changed = setChildren(node, "title", textNodes(metadata.titles), localName25) || changed;
   changed = setChildren(node, "desc", textNodes(metadata.descriptions), localName25) || changed;
   if (metadata.categories !== void 0) {
-    const key2 = findKey18(node, "catLst", localName25);
+    const key2 = findKey19(node, "catLst", localName25);
     if (metadata.categories.length === 0) {
       if (key2) {
         delete node[key2];
@@ -61127,7 +61346,7 @@ function applySmartArtDefinitionMetadata(node, metadata, localName25) {
   return changed;
 }
 function ensureLabels(node, localName25) {
-  const key2 = findKey18(node, "styleLbl", localName25) ?? `${prefixFor2(node)}styleLbl`;
+  const key2 = findKey19(node, "styleLbl", localName25) ?? `${prefixFor2(node)}styleLbl`;
   return { key: key2, labels: objects2(node[key2]) };
 }
 function applySmartArtQuickStyleLabels(node, labels, localName25) {
@@ -61150,7 +61369,7 @@ var COLOR_LISTS = [
   ["textEffect", "txEffectClrLst"]
 ];
 function applyColorList(label, name, metadata, localName25) {
-  const key2 = findKey18(label, name, localName25) ?? `${prefixFor2(label)}${name}`;
+  const key2 = findKey19(label, name, localName25) ?? `${prefixFor2(label)}${name}`;
   const list = objects2(label[key2])[0] ?? {};
   if (metadata.method !== void 0) {
     list["@_meth"] = metadata.method;
@@ -61188,7 +61407,7 @@ function toArray3(value) {
   const obj = asObject(value);
   return obj ? [obj] : [];
 }
-function findKey19(obj, name, getLocalName2) {
+function findKey20(obj, name, getLocalName2) {
   return Object.keys(obj).find((k) => getLocalName2(k) === name);
 }
 function hex3(value) {
@@ -61230,7 +61449,7 @@ function applySmartArtColorTransform(colorsDef, transform, getLocalName2, resolv
   let mutated = false;
   mutated = applySmartArtDefinitionMetadata(colorsDef, transform, getLocalName2) || mutated;
   mutated = applySmartArtColorStyleLabels(colorsDef, transform.labels, getLocalName2) || mutated;
-  const styleLblKey = findKey19(colorsDef, "styleLbl", getLocalName2);
+  const styleLblKey = findKey20(colorsDef, "styleLbl", getLocalName2);
   if (!styleLblKey) {
     return mutated;
   }
@@ -61241,7 +61460,7 @@ function applySmartArtColorTransform(colorsDef, transform, getLocalName2, resolv
   let fillIndex = 0;
   let lineIndex = 0;
   for (const label of labels) {
-    const fillKey = findKey19(label, "fillClrLst", getLocalName2);
+    const fillKey = findKey20(label, "fillClrLst", getLocalName2);
     if (fillKey) {
       const value = transform.fillColors[fillIndex++];
       const list = asObject(label[fillKey]);
@@ -61250,7 +61469,7 @@ function applySmartArtColorTransform(colorsDef, transform, getLocalName2, resolv
         mutated = true;
       }
     }
-    const lineKey = findKey19(label, "linClrLst", getLocalName2);
+    const lineKey = findKey20(label, "linClrLst", getLocalName2);
     if (lineKey) {
       const value = transform.lineColors[lineIndex++];
       const list = asObject(label[lineKey]);
@@ -61266,11 +61485,11 @@ function localName23(key2) {
   const idx = key2.indexOf(":");
   return idx >= 0 ? key2.slice(idx + 1) : key2;
 }
-function findKey20(obj, local) {
+function findKey21(obj, local) {
   return Object.keys(obj).find((k) => localName23(k) === local);
 }
 function ensureChild(obj, local, prefixedFallback) {
-  const key2 = findKey20(obj, local) ?? prefixedFallback;
+  const key2 = findKey21(obj, local) ?? prefixedFallback;
   const existing = obj[key2];
   if (existing && typeof existing === "object" && !Array.isArray(existing)) {
     return existing;
@@ -61286,7 +61505,7 @@ function solidFill2(color2) {
   return { "a:srgbClr": { "@_val": hexValue(color2) } };
 }
 function setSolidFill(parent, color2) {
-  const key2 = findKey20(parent, "solidFill") ?? "a:solidFill";
+  const key2 = findKey21(parent, "solidFill") ?? "a:solidFill";
   parent[key2] = solidFill2(color2);
 }
 function applyShapeStyle(pt2, style) {
@@ -61303,7 +61522,7 @@ function applyShapeStyle(pt2, style) {
   }
 }
 function ensureFirstRunRPr(pt2) {
-  const tKey = findKey20(pt2, "t");
+  const tKey = findKey21(pt2, "t");
   if (!tKey) {
     return void 0;
   }
@@ -61311,7 +61530,7 @@ function ensureFirstRunRPr(pt2) {
   if (!body || typeof body !== "object" || Array.isArray(body)) {
     return void 0;
   }
-  const pKey = findKey20(body, "p");
+  const pKey = findKey21(body, "p");
   if (!pKey) {
     return void 0;
   }
@@ -61320,7 +61539,7 @@ function ensureFirstRunRPr(pt2) {
   if (!firstP || typeof firstP !== "object") {
     return void 0;
   }
-  const rKey = findKey20(firstP, "r");
+  const rKey = findKey21(firstP, "r");
   if (!rKey) {
     return void 0;
   }
@@ -62244,27 +62463,27 @@ function applySmartArtChrome(dataModel, chrome, getLocalName2) {
   if (!chrome || !chrome.backgroundColor && !chrome.outlineColor && (chrome.outlineWidth === null || chrome.outlineWidth === void 0)) {
     return;
   }
-  const findKey21 = (obj, name) => Object.keys(obj).find((k) => getLocalName2(k) === name);
+  const findKey22 = (obj, name) => Object.keys(obj).find((k) => getLocalName2(k) === name);
   if (chrome.backgroundColor) {
     const hex4 = chrome.backgroundColor.replace("#", "");
-    const bgKey = findKey21(dataModel, "bg") ?? "dgm:bg";
+    const bgKey = findKey22(dataModel, "bg") ?? "dgm:bg";
     const bg = asObject2(dataModel[bgKey]);
-    const fillKey = findKey21(bg, "solidFill") ?? "a:solidFill";
+    const fillKey = findKey22(bg, "solidFill") ?? "a:solidFill";
     bg[fillKey] = { "a:srgbClr": { "@_val": hex4 } };
     dataModel[bgKey] = bg;
   }
   const hasOutlineWidth = chrome.outlineWidth !== null && chrome.outlineWidth !== void 0;
   if (chrome.outlineColor || hasOutlineWidth) {
-    const wholeKey = findKey21(dataModel, "whole") ?? "dgm:whole";
+    const wholeKey = findKey22(dataModel, "whole") ?? "dgm:whole";
     const whole = asObject2(dataModel[wholeKey]);
-    const lnKey = findKey21(whole, "ln") ?? "a:ln";
+    const lnKey = findKey22(whole, "ln") ?? "a:ln";
     const ln = asObject2(whole[lnKey]);
     if (hasOutlineWidth) {
       ln["@_w"] = String(Math.round(chrome.outlineWidth * 12700));
     }
     if (chrome.outlineColor) {
       const hex4 = chrome.outlineColor.replace("#", "");
-      const fillKey = findKey21(ln, "solidFill") ?? "a:solidFill";
+      const fillKey = findKey22(ln, "solidFill") ?? "a:solidFill";
       ln[fillKey] = { "a:srgbClr": { "@_val": hex4 } };
     }
     whole[lnKey] = ln;
@@ -63971,155 +64190,87 @@ var PptxHandlerRuntime28 = class _PptxHandlerRuntime9 extends PptxHandlerRuntime
     }
   }
 };
-var PptxHandlerRuntime29 = class extends PptxHandlerRuntime28 {
-  /**
-   * Serialize visual effects (shadow, glow, reflection, blur, soft edge),
-   * effectDag, 3D scene, and 3D shape properties to the given spPr XML object.
-   */
-  applyEffectsAndThreeD(spPr, shapeStyle) {
-    const presetShadowXml = shapeStyle.presetShadowName ? this.buildPresetShadowXml(shapeStyle) : void 0;
-    const outerShadowXml = presetShadowXml ? void 0 : this.buildOuterShadowXml(shapeStyle);
-    const innerShadowXml = this.buildInnerShadowXml(shapeStyle);
-    const glowXml = this.buildGlowXml(shapeStyle);
-    const softEdgeXml = this.buildSoftEdgeXml(shapeStyle);
-    const reflectionXml = this.buildReflectionXml(shapeStyle);
-    const blurXml = this.buildBlurXml(shapeStyle);
-    const hasAnyEffect = outerShadowXml || presetShadowXml || innerShadowXml || glowXml || softEdgeXml || reflectionXml || blurXml;
-    if (hasAnyEffect || shapeStyle.effectListXml) {
-      const effectList = createEffectList(shapeStyle, spPr);
-      if (presetShadowXml) {
-        setEffectChild(effectList, "prstShdw", presetShadowXml);
+function writeShapeEffects(spPr, shapeStyle, ctx) {
+  if (effectIsPurelyStyleMatrix(shapeStyle)) {
+    return;
+  }
+  writeEffectList(spPr, shapeStyle, ctx);
+  writeEffectDag(spPr, shapeStyle);
+  writeScene3d(spPr, shapeStyle);
+  writeShape3d(spPr, shapeStyle);
+}
+function writeEffectList(spPr, shapeStyle, ctx) {
+  const {
+    outerShadowXml,
+    presetShadowXml,
+    innerShadowXml,
+    glowXml,
+    softEdgeXml,
+    reflectionXml,
+    blurXml
+  } = ctx;
+  const hasAnyEffect = outerShadowXml || presetShadowXml || innerShadowXml || glowXml || softEdgeXml || reflectionXml || blurXml;
+  if (hasAnyEffect || shapeStyle.effectListXml) {
+    const effectList = createEffectList(shapeStyle, spPr);
+    if (presetShadowXml) {
+      setEffectChild(effectList, "prstShdw", presetShadowXml);
+      setEffectChild(effectList, "outerShdw", void 0);
+    } else if (outerShadowXml) {
+      setEffectChild(effectList, "outerShdw", outerShadowXml);
+      setEffectChild(effectList, "prstShdw", void 0);
+    }
+    if (innerShadowXml) {
+      setEffectChild(effectList, "innerShdw", innerShadowXml);
+    }
+    if (glowXml) {
+      setEffectChild(effectList, "glow", glowXml);
+    }
+    if (softEdgeXml) {
+      setEffectChild(effectList, "softEdge", softEdgeXml);
+    }
+    if (reflectionXml) {
+      setEffectChild(effectList, "reflection", reflectionXml);
+    }
+    if (blurXml) {
+      setEffectChild(effectList, "blur", blurXml);
+    }
+    setEffectChild(spPr, "effectLst", reorderObjectKeys(effectList, EFFECT_LST_ORDER));
+  } else {
+    const effectList = effectChild(spPr, "effectLst");
+    if (effectList) {
+      if (shapeStyle.shadowColor !== void 0 && !outerShadowXml && !presetShadowXml) {
         setEffectChild(effectList, "outerShdw", void 0);
-      } else if (outerShadowXml) {
-        setEffectChild(effectList, "outerShdw", outerShadowXml);
         setEffectChild(effectList, "prstShdw", void 0);
       }
-      if (innerShadowXml) {
-        setEffectChild(effectList, "innerShdw", innerShadowXml);
+      if (shapeStyle.innerShadowColor !== void 0 && !innerShadowXml) {
+        setEffectChild(effectList, "innerShdw", void 0);
       }
-      if (glowXml) {
-        setEffectChild(effectList, "glow", glowXml);
+      if (shapeStyle.glowColor !== void 0 && !glowXml) {
+        setEffectChild(effectList, "glow", void 0);
       }
-      if (softEdgeXml) {
-        setEffectChild(effectList, "softEdge", softEdgeXml);
+      if (shapeStyle.softEdgeRadius !== void 0 && !softEdgeXml) {
+        setEffectChild(effectList, "softEdge", void 0);
       }
-      if (reflectionXml) {
-        setEffectChild(effectList, "reflection", reflectionXml);
+      if (shapeStyle.reflectionBlurRadius !== void 0 && !reflectionXml) {
+        setEffectChild(effectList, "reflection", void 0);
       }
-      if (blurXml) {
-        setEffectChild(effectList, "blur", blurXml);
+      if (shapeStyle.blurRadius !== void 0 && !blurXml) {
+        setEffectChild(effectList, "blur", void 0);
       }
-      setEffectChild(spPr, "effectLst", reorderObjectKeys(effectList, EFFECT_LST_ORDER));
-    } else {
-      const effectList = effectChild(spPr, "effectLst");
-      if (effectList) {
-        if (shapeStyle.shadowColor !== void 0 && !outerShadowXml && !presetShadowXml) {
-          setEffectChild(effectList, "outerShdw", void 0);
-          setEffectChild(effectList, "prstShdw", void 0);
-        }
-        if (shapeStyle.innerShadowColor !== void 0 && !innerShadowXml) {
-          setEffectChild(effectList, "innerShdw", void 0);
-        }
-        if (shapeStyle.glowColor !== void 0 && !glowXml) {
-          setEffectChild(effectList, "glow", void 0);
-        }
-        if (shapeStyle.softEdgeRadius !== void 0 && !softEdgeXml) {
-          setEffectChild(effectList, "softEdge", void 0);
-        }
-        if (shapeStyle.reflectionBlurRadius !== void 0 && !reflectionXml) {
-          setEffectChild(effectList, "reflection", void 0);
-        }
-        if (shapeStyle.blurRadius !== void 0 && !blurXml) {
-          setEffectChild(effectList, "blur", void 0);
-        }
-        if (Object.keys(effectList).length === 0) {
-          setEffectChild(spPr, "effectLst", void 0);
-        } else {
-          setEffectChild(spPr, "effectLst", reorderObjectKeys(effectList, EFFECT_LST_ORDER));
-        }
-      }
-    }
-    const effectDagXml = shapeStyle.effectDagTree ? serializeEffectDagContainer(shapeStyle.effectDagTree) : shapeStyle.effectDagXml;
-    if (effectDagXml) {
-      setEffectChild(spPr, "effectDag", effectDagXml);
-    }
-    if (shapeStyle.scene3d) {
-      const s3d = shapeStyle.scene3d;
-      const hasData = s3d.cameraPreset || s3d.lightRigType;
-      if (hasData) {
-        const source = spPr["a:scene3d"] ?? {};
-        const scene3dXml = { ...source };
-        scene3dXml["a:camera"] = buildScene3dCamera(s3d, source);
-        const lightRig = buildScene3dLightRig(s3d, source);
-        if (lightRig) {
-          scene3dXml["a:lightRig"] = lightRig;
-        }
-        const backdrop = buildScene3dBackdrop(s3d);
-        if (backdrop) {
-          scene3dXml["a:backdrop"] = backdrop;
-        } else {
-          delete scene3dXml["a:backdrop"];
-        }
-        spPr["a:scene3d"] = scene3dXml;
-      } else {
-        delete spPr["a:scene3d"];
-      }
-    } else if (shapeStyle.scene3d === void 0) {
-      delete spPr["a:scene3d"];
-    }
-    if (shapeStyle.shape3d) {
-      const sh3d = shapeStyle.shape3d;
-      const hasData = sh3d.extrusionHeight !== void 0 || sh3d.contourWidth !== void 0 || sh3d.presetMaterial || sh3d.bevelTopType || sh3d.bevelBottomType || sh3d.extrusionColor || sh3d.contourColor;
-      if (hasData) {
-        const sp3dXml = {};
-        if (sh3d.extrusionHeight !== void 0) {
-          sp3dXml["@_extrusionH"] = String(sh3d.extrusionHeight);
-        }
-        if (sh3d.contourWidth !== void 0) {
-          sp3dXml["@_contourW"] = String(sh3d.contourWidth);
-        }
-        if (sh3d.presetMaterial) {
-          sp3dXml["@_prstMaterial"] = sh3d.presetMaterial;
-        }
-        if (sh3d.bevelTopType) {
-          const bevelT = { "@_prst": sh3d.bevelTopType };
-          if (sh3d.bevelTopWidth !== void 0) {
-            bevelT["@_w"] = String(sh3d.bevelTopWidth);
-          }
-          if (sh3d.bevelTopHeight !== void 0) {
-            bevelT["@_h"] = String(sh3d.bevelTopHeight);
-          }
-          sp3dXml["a:bevelT"] = bevelT;
-        }
-        if (sh3d.bevelBottomType) {
-          const bevelB = { "@_prst": sh3d.bevelBottomType };
-          if (sh3d.bevelBottomWidth !== void 0) {
-            bevelB["@_w"] = String(sh3d.bevelBottomWidth);
-          }
-          if (sh3d.bevelBottomHeight !== void 0) {
-            bevelB["@_h"] = String(sh3d.bevelBottomHeight);
-          }
-          sp3dXml["a:bevelB"] = bevelB;
-        }
-        if (sh3d.extrusionColor) {
-          sp3dXml["a:extrusionClr"] = {
-            "a:srgbClr": { "@_val": sh3d.extrusionColor.replace("#", "") }
-          };
-        }
-        if (sh3d.contourColor) {
-          sp3dXml["a:contourClr"] = {
-            "a:srgbClr": { "@_val": sh3d.contourColor.replace("#", "") }
-          };
-        }
-        spPr["a:sp3d"] = sp3dXml;
+      if (Object.keys(effectList).length === 0) {
+        setEffectChild(spPr, "effectLst", void 0);
       } else {
-        delete spPr["a:sp3d"];
+        setEffectChild(spPr, "effectLst", reorderObjectKeys(effectList, EFFECT_LST_ORDER));
       }
-    } else if (shapeStyle.shape3d === void 0) {
-      delete spPr["a:sp3d"];
     }
   }
-};
+}
+function writeEffectDag(spPr, shapeStyle) {
+  const effectDagXml = shapeStyle.effectDagTree ? serializeEffectDagContainer(shapeStyle.effectDagTree) : shapeStyle.effectDagXml;
+  if (effectDagXml) {
+    setEffectChild(spPr, "effectDag", effectDagXml);
+  }
+}
 function buildSphereRot(lat, lon, rev) {
   if (lat === void 0 && lon === void 0 && rev === void 0) {
     return void 0;
@@ -64191,6 +64342,109 @@ function buildScene3dBackdrop(s3d) {
     }
   };
 }
+function writeScene3d(spPr, shapeStyle) {
+  if (shapeStyle.scene3d) {
+    const s3d = shapeStyle.scene3d;
+    const hasData = s3d.cameraPreset || s3d.lightRigType;
+    if (hasData) {
+      const source = spPr["a:scene3d"] ?? {};
+      const scene3dXml = { ...source };
+      scene3dXml["a:camera"] = buildScene3dCamera(s3d, source);
+      const lightRig = buildScene3dLightRig(s3d, source);
+      if (lightRig) {
+        scene3dXml["a:lightRig"] = lightRig;
+      }
+      const backdrop = buildScene3dBackdrop(s3d);
+      if (backdrop) {
+        scene3dXml["a:backdrop"] = backdrop;
+      } else {
+        delete scene3dXml["a:backdrop"];
+      }
+      spPr["a:scene3d"] = scene3dXml;
+    } else {
+      delete spPr["a:scene3d"];
+    }
+  } else if (shapeStyle.scene3d === void 0) {
+    delete spPr["a:scene3d"];
+  }
+}
+function writeShape3d(spPr, shapeStyle) {
+  if (shapeStyle.shape3d) {
+    const sh3d = shapeStyle.shape3d;
+    const hasData = sh3d.extrusionHeight !== void 0 || sh3d.contourWidth !== void 0 || sh3d.presetMaterial || sh3d.bevelTopType || sh3d.bevelBottomType || sh3d.extrusionColor || sh3d.contourColor;
+    if (hasData) {
+      const sp3dXml = {};
+      if (sh3d.extrusionHeight !== void 0) {
+        sp3dXml["@_extrusionH"] = String(sh3d.extrusionHeight);
+      }
+      if (sh3d.contourWidth !== void 0) {
+        sp3dXml["@_contourW"] = String(sh3d.contourWidth);
+      }
+      if (sh3d.presetMaterial) {
+        sp3dXml["@_prstMaterial"] = sh3d.presetMaterial;
+      }
+      if (sh3d.bevelTopType) {
+        const bevelT = { "@_prst": sh3d.bevelTopType };
+        if (sh3d.bevelTopWidth !== void 0) {
+          bevelT["@_w"] = String(sh3d.bevelTopWidth);
+        }
+        if (sh3d.bevelTopHeight !== void 0) {
+          bevelT["@_h"] = String(sh3d.bevelTopHeight);
+        }
+        sp3dXml["a:bevelT"] = bevelT;
+      }
+      if (sh3d.bevelBottomType) {
+        const bevelB = { "@_prst": sh3d.bevelBottomType };
+        if (sh3d.bevelBottomWidth !== void 0) {
+          bevelB["@_w"] = String(sh3d.bevelBottomWidth);
+        }
+        if (sh3d.bevelBottomHeight !== void 0) {
+          bevelB["@_h"] = String(sh3d.bevelBottomHeight);
+        }
+        sp3dXml["a:bevelB"] = bevelB;
+      }
+      if (sh3d.extrusionColor) {
+        sp3dXml["a:extrusionClr"] = {
+          "a:srgbClr": { "@_val": sh3d.extrusionColor.replace("#", "") }
+        };
+      }
+      if (sh3d.contourColor) {
+        sp3dXml["a:contourClr"] = {
+          "a:srgbClr": { "@_val": sh3d.contourColor.replace("#", "") }
+        };
+      }
+      spPr["a:sp3d"] = sp3dXml;
+    } else {
+      delete spPr["a:sp3d"];
+    }
+  } else if (shapeStyle.shape3d === void 0) {
+    delete spPr["a:sp3d"];
+  }
+}
+var PptxHandlerRuntime29 = class extends PptxHandlerRuntime28 {
+  /**
+   * Serialize visual effects (shadow, glow, reflection, blur, soft edge),
+   * effectDag, 3D scene, and 3D shape properties to the given spPr XML object.
+   *
+   * The whole body lives in {@link writeShapeEffects} as a free function so
+   * the colocated unit test can import and drive the REAL logic (it used to
+   * keep a private copy - "its mixin chain crashes on load" - which meant it
+   * could not fail when production drifted). This method only supplies the
+   * runtime-bound effect builders.
+   */
+  applyEffectsAndThreeD(spPr, shapeStyle) {
+    const presetShadowXml = shapeStyle.presetShadowName ? this.buildPresetShadowXml(shapeStyle) : void 0;
+    writeShapeEffects(spPr, shapeStyle, {
+      outerShadowXml: presetShadowXml ? void 0 : this.buildOuterShadowXml(shapeStyle),
+      presetShadowXml,
+      innerShadowXml: this.buildInnerShadowXml(shapeStyle),
+      glowXml: this.buildGlowXml(shapeStyle),
+      softEdgeXml: this.buildSoftEdgeXml(shapeStyle),
+      reflectionXml: this.buildReflectionXml(shapeStyle),
+      blurXml: this.buildBlurXml(shapeStyle)
+    });
+  }
+};
 var PptxHandlerRuntime30 = class _PptxHandlerRuntime10 extends PptxHandlerRuntime29 {
   /**
    * Build and write the text body (`p:txBody`) for shapes, text boxes,
@@ -67864,7 +68118,15 @@ function orderContainer(container, plan, getLocalName2) {
   return orderShapeTreeChildren(working, (node) => positions.get(node), getLocalName2);
 }
 function orderedTemplatePartXml(options) {
-  const { runtime, partPath, xmlObj, rootTag: rootTag2, sourceXml, getLocalName: getLocalName2 } = options;
+  const {
+    runtime,
+    partPath,
+    xmlObj,
+    rootTag: rootTag2,
+    sourceXml,
+    getLocalName: getLocalName2,
+    alternateContentBlockByRawXml
+  } = options;
   const root = xmlObj[rootTag2];
   if (!isXmlObject8(root)) {
     return xmlObj;
@@ -67877,8 +68139,9 @@ function orderedTemplatePartXml(options) {
   if (!isXmlObject8(spTree)) {
     return xmlObj;
   }
+  const rewrapped = reapplyAlternateContentToTree(spTree, alternateContentBlockByRawXml);
   const rebuilt = positionsByRuntime.get(runtime)?.get(partPath);
-  const ordered32 = rebuilt ? orderShapeTreeChildren(spTree, (node) => rebuilt.get(node), getLocalName2) : orderContainer(spTree, sourceXml ? scanSpTreeDocumentOrder(sourceXml) : [], getLocalName2);
+  const ordered32 = rebuilt ? orderShapeTreeChildren(rewrapped, (node) => rebuilt.get(node), getLocalName2) : orderContainer(rewrapped, sourceXml ? scanSpTreeDocumentOrder(sourceXml) : [], getLocalName2);
   if (ordered32 === spTree) {
     return xmlObj;
   }
@@ -68018,7 +68281,8 @@ var PptxHandlerRuntime45 = class extends PptxHandlerRuntime44 {
       xmlObj,
       rootTag: rootTag2,
       sourceXml: sourceXml ?? await this.zip.file(partPath)?.async("string"),
-      getLocalName: (key2) => this.compatibilityService.getXmlLocalName(key2)
+      getLocalName: (key2) => this.compatibilityService.getXmlLocalName(key2),
+      alternateContentBlockByRawXml: this.alternateContentBlockByRawXml
     });
   }
   getAuxiliaryMasterRelsPath(partPath) {
@@ -78048,9 +78312,20 @@ var PptxHandlerRuntime91 = class extends PptxHandlerRuntime90 {
           false
         );
       }
-      const containerType = isCombo ? chartContainerLocalNameToType(this.compatibilityService.getXmlLocalName(containerKey)) : void 0;
+      const resolvedContainerType = chartContainerLocalNameToType(
+        this.compatibilityService.getXmlLocalName(containerKey)
+      );
+      const containerType = isCombo ? resolvedContainerType : void 0;
       const axisId = resolveChartContainerValueAxisId(container, axes ?? [], this.xmlLookupService);
-      series.push(...this.buildChartSeries(seriesList, categories, containerType, axisId));
+      series.push(
+        ...this.buildChartSeries(
+          seriesList,
+          categories,
+          containerType,
+          axisId,
+          resolvedContainerType
+        )
+      );
     }
     return { categories, series };
   }
@@ -78094,9 +78369,15 @@ var PptxHandlerRuntime91 = class extends PptxHandlerRuntime90 {
    * @param categories - Pre-parsed category labels (used for fallback values).
    * @param seriesChartType - When set (combo charts), tags every series in this
    *   container with its source chart type for round-trip.
+   * @param axisId - The container's resolved value-axis id, if any.
+   * @param containerChartType - The container's actual chart type, always
+   *   resolved (unlike `seriesChartType`, which is combo-only). Used to decide
+   *   whether this container's series read their colour from a direct fill or
+   *   from the outline (`a:ln/a:solidFill`), so a plain (non-combo)
+   *   line/scatter/radar/stock chart's authored colour is not dropped.
    * @returns The series array matching `PptxChartData["series"]`.
    */
-  buildChartSeries(seriesList, categories, seriesChartType, axisId) {
+  buildChartSeries(seriesList, categories, seriesChartType, axisId, containerChartType) {
     return seriesList.map((seriesNode, seriesIndex) => {
       const seriesName = this.extractChartSeriesName(seriesNode);
       const valNode = this.xmlLookupService.getChildByLocalName(seriesNode, "val") || this.xmlLookupService.getChildByLocalName(seriesNode, "yVal");
@@ -78119,7 +78400,7 @@ var PptxHandlerRuntime91 = class extends PptxHandlerRuntime90 {
         ) ?? ""
       ).trim();
       const seriesShapeProperties = this.xmlLookupService.getChildByLocalName(seriesNode, "spPr");
-      const readsLineColor = seriesChartType === "line" || seriesChartType === "line3D" || seriesChartType === "scatter" || seriesChartType === "radar" || seriesChartType === "stock";
+      const readsLineColor = isLineDrawnChartType(containerChartType);
       const seriesColor22 = this.parseColor(
         this.xmlLookupService.getChildByLocalName(seriesShapeProperties, "solidFill")
       ) ?? (readsLineColor ? this.parseColor(