@aixa-transformation/pptx-viewer 2.0.27 → 2.0.30

package/dist/{chunk-LTBO2ZJC.mjs → chunk-JJ5MVLCK.mjs}

@@ -10184,6 +10184,9 @@ function drawingChild(node, requestedName) {
       continue;
     }
     const child20 = Array.isArray(value) ? value[0] : value;
+    if (child20 === "" || child20 === null || child20 === void 0) {
+      return {};
+    }
     if (child20 && typeof child20 === "object" && !Array.isArray(child20)) {
       return child20;
     }
@@ -12561,6 +12564,13 @@ var PptxShapeStyleExtractor = class {
       if (earlyReturn) {
         return style;
       }
+      if (!style.strokeColor && styleNode?.["a:lnRef"]) {
+        const explicitWidth = style.strokeWidth;
+        this.context.resolveThemeLineRef(styleNode["a:lnRef"], style);
+        if (explicitWidth !== void 0) {
+          style.strokeWidth = explicitWidth;
+        }
+      }
     } else if (styleNode?.["a:lnRef"]) {
       this.context.resolveThemeLineRef(styleNode["a:lnRef"], style);
     }
@@ -13543,6 +13553,20 @@ function ensureArrayLike(value) {
   }
   return Array.isArray(value) ? value : [value];
 }
+function readPositiveInteger(value) {
+  const parsed = Number.parseInt(String(value ?? ""), 10);
+  return Number.isFinite(parsed) && parsed > 0 ? parsed : 0;
+}
+function getTableGridExtent(graphicData) {
+  const table = graphicData?.["a:tbl"];
+  if (!table) {
+    return void 0;
+  }
+  const grid = table["a:tblGrid"];
+  const widthEmu = ensureArrayLike(grid?.["a:gridCol"]).reduce((sum, column) => sum + readPositiveInteger(column?.["@_w"]), 0);
+  const heightEmu = ensureArrayLike(table["a:tr"]).reduce((sum, row) => sum + readPositiveInteger(row?.["@_h"]), 0);
+  return widthEmu > 0 && heightEmu > 0 ? { widthEmu, heightEmu } : void 0;
+}
 function collectGraphicFrameExtensions(graphicData) {
   if (!graphicData) {
     return [];
@@ -13758,8 +13782,13 @@ var PptxGraphicFrameParser = class {
       const extensionXml = collectGraphicFrameExtensions(graphicData);
       if (type === "table" && graphicData) {
         const tableData = this.context.parseTableData(graphicData);
+        const tableGridExtent = getTableGridExtent(graphicData);
         return {
           ...baseElement,
+          ...tableGridExtent ? {
+            width: Math.round(tableGridExtent.widthEmu / this.context.emuPerPx),
+            height: Math.round(tableGridExtent.heightEmu / this.context.emuPerPx)
+          } : {},
           tableData,
           ...extensionXml.length > 0 ? { extensionXml } : {}
         };
@@ -36840,6 +36869,12 @@ function parseAlignmentAttr2(algn) {
   }
   return ALIGN_MAP[algn] || void 0;
 }
+function resolveParagraphAlignment(authoredAlignment, placeholderAlignment, paragraphRtl) {
+  if (authoredAlignment !== void 0 && authoredAlignment !== null) {
+    return parseAlignmentAttr2(String(authoredAlignment)) ?? "left";
+  }
+  return placeholderAlignment ?? (paragraphRtl ? "right" : "left");
+}
 function parseParagraphSpacingPx(spacingNode) {
   if (!spacingNode) {
     return void 0;
@@ -58166,7 +58201,7 @@ var PptxHandlerRuntime21 = class extends PptxHandlerRuntime20 {
    * Extract all placeholders from a layout's `p:spTree`, returning
    * their placeholder info and their transform (position/size in EMU).
    */
-  extractLayoutPlaceholders(layoutXml) {
+  extractLayoutPlaceholders(layoutXml, layoutPath) {
     const spTree = xmlPath(layoutXml, "p:sldLayout", "p:cSld", "p:spTree");
     if (!spTree) {
       return [];
@@ -58183,7 +58218,14 @@ var PptxHandlerRuntime21 = class extends PptxHandlerRuntime20 {
       if (!phInfo) {
         continue;
       }
-      const spPr = shape["p:spPr"];
+      const masterPath = layoutPath ? this.resolveMasterPathForLayout(layoutPath) : void 0;
+      const masterContext = masterPath ? this.findPlaceholderInShapeTree(
+        xmlPath(this.masterXmlMap.get(masterPath), "p:sldMaster", "p:cSld", "p:spTree"),
+        phInfo
+      ) : void 0;
+      const inheritedShape = masterContext?.shape ?? masterContext?.picture;
+      const resolvedShape = inheritedShape ? this.mergeXmlObjects(inheritedShape, shape) ?? shape : shape;
+      const spPr = resolvedShape["p:spPr"];
       const xfrm = spPr?.["a:xfrm"];
       const off = xfrm?.["a:off"];
       const ext = xfrm?.["a:ext"];
@@ -58191,7 +58233,7 @@ var PptxHandlerRuntime21 = class extends PptxHandlerRuntime20 {
       const yEmu = off ? Number(off["@_y"] || 0) : 0;
       const cxEmu = ext ? Number(ext["@_cx"] || 0) : 0;
       const cyEmu = ext ? Number(ext["@_cy"] || 0) : 0;
-      result.push({ phInfo, xEmu, yEmu, cxEmu, cyEmu, shapeXml: shape });
+      result.push({ phInfo, xEmu, yEmu, cxEmu, cyEmu, shapeXml: resolvedShape });
     }
     return result;
   }
@@ -58262,16 +58304,31 @@ var PptxHandlerRuntime21 = class extends PptxHandlerRuntime20 {
    * @returns The updated elements array.
    */
   remapElementsToNewLayout(elements2, newLayoutXml, newLayoutPath) {
-    const layoutPlaceholders = this.extractLayoutPlaceholders(newLayoutXml);
+    const layoutPlaceholders = this.extractLayoutPlaceholders(newLayoutXml, newLayoutPath);
     const targetPlaceholders = [];
     for (const lp of layoutPlaceholders) {
       targetPlaceholders.push({ ...lp, matched: false });
     }
     const resultElements = [];
     for (const element of elements2) {
-      const phInfo = this.getElementPlaceholderInfo(element);
+      const metadata = element;
+      if (metadata._layoutSwitchGenerated) continue;
+      const original = metadata._layoutSwitchOriginal ?? element;
+      const originalPhInfo = this.getElementPlaceholderInfo(original);
+      const baseElement = {
+        // Keep all current content and styling edits. Only placeholder geometry
+        // and identity come from the canonical pre-switch element.
+        ...element,
+        ...originalPhInfo ? { x: original.x, y: original.y, width: original.width, height: original.height } : {},
+        rawXml: element.rawXml ? cloneXmlObject(element.rawXml) : element.rawXml
+      };
+      baseElement._layoutSwitchOriginal = metadata._layoutSwitchOriginal ?? {
+        ...element,
+        rawXml: element.rawXml ? cloneXmlObject(element.rawXml) : element.rawXml
+      };
+      const phInfo = originalPhInfo ?? this.getElementPlaceholderInfo(baseElement);
       if (!phInfo) {
-        resultElements.push(element);
+        resultElements.push(baseElement);
         continue;
       }
       let resolvedLayoutPh;
@@ -58287,8 +58344,8 @@ var PptxHandlerRuntime21 = class extends PptxHandlerRuntime20 {
       if (resolvedLayoutPh) {
         resolvedLayoutPh.matched = true;
         const updatedElement = {
-          ...element,
-          rawXml: element.rawXml ? cloneXmlObject(element.rawXml) : element.rawXml
+          ...baseElement,
+          rawXml: baseElement.rawXml ? cloneXmlObject(baseElement.rawXml) : baseElement.rawXml
         };
         if (resolvedLayoutPh.cxEmu > 0 && resolvedLayoutPh.cyEmu > 0) {
           updatedElement.x = Math.round(resolvedLayoutPh.xEmu / EMU_PER_PX);
@@ -58310,7 +58367,7 @@ var PptxHandlerRuntime21 = class extends PptxHandlerRuntime20 {
         }
         resultElements.push(updatedElement);
       } else {
-        resultElements.push(element);
+        resultElements.push(baseElement);
       }
     }
     for (const lp of targetPlaceholders) {
@@ -58436,6 +58493,7 @@ var PptxHandlerRuntime21 = class extends PptxHandlerRuntime20 {
       text: "",
       rawXml
     };
+    element._layoutSwitchGenerated = true;
     return element;
   }
 };
@@ -67352,6 +67410,10 @@ var PptxHandlerRuntime52 = class _PptxHandlerRuntime19 extends PptxHandlerRuntim
     if (sourceIdx !== targetIdx) {
       return false;
     }
+    const specialTypes = /* @__PURE__ */ new Set(["dt", "ftr", "hdr", "sldnum"]);
+    if (source.type === void 0 && target.type !== void 0 && specialTypes.has(target.type) || target.type === void 0 && source.type !== void 0 && specialTypes.has(source.type)) {
+      return false;
+    }
     if (source.type && target.type && !typesMatch) {
       return false;
     }
@@ -69115,19 +69177,15 @@ var PptxHandlerRuntime62 = class _PptxHandlerRuntime26 extends PptxHandlerRuntim
     if (paragraphRtl !== void 0 && textStyle.rtl === void 0) {
       textStyle.rtl = paragraphRtl;
     }
-    let paraAlign = paragraphRtl ? "right" : "left";
+    const level = pPr?.["@_lvl"] === void 0 ? -1 : Number.parseInt(String(pPr["@_lvl"]), 10);
+    const normalizedLevel = level === -1 ? -1 : Number.isFinite(level) ? Math.min(Math.max(level, 0), 8) : 0;
+    const placeholderLevelStyle = ctx.effectiveLevelStyles ? ctx.effectiveLevelStyles[normalizedLevel] ?? ctx.effectiveLevelStyles[-1] ?? (normalizedLevel === -1 ? ctx.effectiveLevelStyles[0] : void 0) : void 0;
+    const paraAlign = resolveParagraphAlignment(
+      pPr?.["@_algn"],
+      placeholderLevelStyle?.alignment,
+      paragraphRtl
+    );
     if (pPr?.["@_algn"]) {
-      const alignMap = {
-        l: "left",
-        ctr: "center",
-        r: "right",
-        just: "justify",
-        justify: "justify",
-        justLow: "justLow",
-        dist: "dist",
-        thaiDist: "thaiDist"
-      };
-      paraAlign = alignMap[pPr["@_algn"]] || "left";
       if (!textStyle.align) {
         textStyle.align = paraAlign;
       }
@@ -69234,7 +69292,6 @@ var PptxHandlerRuntime62 = class _PptxHandlerRuntime26 extends PptxHandlerRuntim
       ctx.slideRelationshipMap,
       false
     );
-    const level = pPr?.["@_lvl"] === void 0 ? -1 : Number.parseInt(String(pPr["@_lvl"]), 10);
     const levelKey = level === -1 ? "a:defPPr" : `a:lvl${Number.isFinite(level) ? Math.min(Math.max(level + 1, 1), 9) : 1}pPr`;
     const inheritedLevelStyle = this.extractTextRunStyle(
       ctx.inheritedTxBody?.["a:lstStyle"]?.[levelKey]?.["a:defRPr"],
@@ -69261,31 +69318,20 @@ var PptxHandlerRuntime62 = class _PptxHandlerRuntime26 extends PptxHandlerRuntim
       ...endParagraphStyle,
       ...defaultRunStyle
     };
-    if (ctx.effectiveLevelStyles) {
-      const normalizedLevel = level === -1 ? -1 : Number.isFinite(level) ? Math.min(Math.max(level, 0), 8) : 0;
-      const phLevel = ctx.effectiveLevelStyles[normalizedLevel] ?? ctx.effectiveLevelStyles[-1] ?? (normalizedLevel === -1 ? ctx.effectiveLevelStyles[0] : void 0);
-      if (phLevel) {
-        this.applyPlaceholderLevelDefaults(mergedDefaultRunStyle, phLevel);
-        this.applyPlaceholderLevelDefaults(textStyle, phLevel);
-      }
-    }
-    if (pPr?.["@_algn"] === void 0 && textStyle.align !== void 0) {
-      paraAlign = textStyle.align;
+    if (placeholderLevelStyle) {
+      this.applyPlaceholderLevelDefaults(mergedDefaultRunStyle, placeholderLevelStyle);
+      this.applyPlaceholderLevelDefaults(textStyle, placeholderLevelStyle);
     }
     const parMarginLeft = pPr?.["@_marL"] !== void 0 ? Number.parseInt(String(pPr["@_marL"]), 10) / _PptxHandlerRuntime26.EMU_PER_PX : void 0;
     const parIndent = pPr?.["@_indent"] !== void 0 ? Number.parseInt(String(pPr["@_indent"]), 10) / _PptxHandlerRuntime26.EMU_PER_PX : void 0;
     let effectiveMarginLeft = parMarginLeft;
     let effectiveIndent = parIndent;
-    if (ctx.effectiveLevelStyles) {
-      const normalizedLevel = level === -1 ? -1 : Number.isFinite(level) ? Math.min(Math.max(level, 0), 8) : 0;
-      const phLevel = ctx.effectiveLevelStyles[normalizedLevel] ?? ctx.effectiveLevelStyles[-1] ?? (normalizedLevel === -1 ? ctx.effectiveLevelStyles[0] : void 0);
-      if (phLevel) {
-        if (effectiveMarginLeft === void 0 && phLevel.marginLeft !== void 0) {
-          effectiveMarginLeft = phLevel.marginLeft;
-        }
-        if (effectiveIndent === void 0 && phLevel.indent !== void 0) {
-          effectiveIndent = phLevel.indent;
-        }
+    if (placeholderLevelStyle) {
+      if (effectiveMarginLeft === void 0 && placeholderLevelStyle.marginLeft !== void 0) {
+        effectiveMarginLeft = placeholderLevelStyle.marginLeft;
+      }
+      if (effectiveIndent === void 0 && placeholderLevelStyle.indent !== void 0) {
+        effectiveIndent = placeholderLevelStyle.indent;
       }
     }
     return {
@@ -69478,72 +69524,49 @@ var PptxHandlerRuntime63 = class extends PptxHandlerRuntime62 {
       "mc:AlternateContent",
       "a:br"
     ]);
-    const paragraphRuns = this.ensureArray(p["a:r"]);
-    const paragraphBreaks = this.ensureArray(p["a:br"]);
-    const hasCollapsedRunBreakOrder = paragraphRuns.length > 1 && paragraphBreaks.length > 0;
-    for (const key of Object.keys(p)) {
+    for (const [key, item] of orderedSmartArtTextEntries(p)) {
       if (!contentTagSet.has(key)) {
         continue;
       }
-      const items = this.ensureArray(p[key]);
-      const breakCount = paragraphBreaks.length;
-      const insertCollapsedBreaks = key === "a:r" && hasCollapsedRunBreakOrder;
-      for (const [itemIndex, item] of items.entries()) {
-        switch (key) {
-          case "a:r": {
-            processRun(item);
-            if (insertCollapsedBreaks && itemIndex < items.length - 1) {
-              const gapCount = items.length - 1;
-              const breaksHere = Math.floor(breakCount / gapCount) + (itemIndex < breakCount % gapCount ? 1 : 0);
-              for (let breakIndex = 0; breakIndex < breaksHere; breakIndex++) {
-                parts.push("\n");
-                segments.push({
-                  text: "\n",
-                  style: { ...mergedDefaultRunStyle },
-                  isLineBreak: true
-                });
-              }
-            }
-            break;
-          }
-          case "a:fld":
-            processField(item);
-            break;
-          case "a:t": {
-            const directText2 = typeof item === "string" ? item : item !== void 0 ? String(item) : "";
-            appendRun(directText2, p["a:rPr"]);
-            break;
-          }
-          case "a14:m":
-          case "m:oMathPara":
-          case "m:oMath":
-            processMathElement(item);
-            break;
-          case "mc:AlternateContent":
-            processAlternateContent(item);
-            break;
-          case "a:br": {
-            if (hasCollapsedRunBreakOrder) {
-              break;
-            }
-            const brNode = item ?? {};
-            const brRunProps = brNode["a:rPr"];
-            const brStyle = {
-              ...mergedDefaultRunStyle,
-              ...this.extractTextRunStyle(brRunProps, paraAlign, ctx.slideRelationshipMap)
-            };
-            parts.push("\n");
-            const brSegment = {
-              text: "\n",
-              style: brStyle,
-              isLineBreak: true
-            };
-            if (brRunProps && typeof brRunProps === "object") {
-              brSegment.breakRunProperties = { ...brRunProps };
-            }
-            segments.push(brSegment);
-            break;
+      switch (key) {
+        case "a:r": {
+          processRun(item);
+          break;
+        }
+        case "a:fld":
+          processField(item);
+          break;
+        case "a:t": {
+          const directText2 = typeof item === "string" ? item : item !== void 0 ? String(item) : "";
+          appendRun(directText2, p["a:rPr"]);
+          break;
+        }
+        case "a14:m":
+        case "m:oMathPara":
+        case "m:oMath":
+          processMathElement(item);
+          break;
+        case "mc:AlternateContent":
+          processAlternateContent(item);
+          break;
+        case "a:br": {
+          const brNode = item ?? {};
+          const brRunProps = brNode["a:rPr"];
+          const brStyle = {
+            ...mergedDefaultRunStyle,
+            ...this.extractTextRunStyle(brRunProps, paraAlign, ctx.slideRelationshipMap)
+          };
+          parts.push("\n");
+          const brSegment = {
+            text: "\n",
+            style: brStyle,
+            isLineBreak: true
+          };
+          if (brRunProps && typeof brRunProps === "object") {
+            brSegment.breakRunProperties = { ...brRunProps };
           }
+          segments.push(brSegment);
+          break;
         }
       }
     }