@aixa-transformation/pptx-viewer 2.0.15 → 2.0.24

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

@@ -17151,6 +17151,11 @@ var PptxSlideLoaderService = class {
         id: path,
         rId,
         slideNumber: slideIndex + 1,
+        // Preserve the authoritative slide -> slideLayout relationship on the
+        // loaded model. The editor uses this identity to mark the current
+        // layout in the gallery and to scope layout choices to the slide's
+        // master. Without it, the gallery cannot reliably reflect PowerPoint.
+        layoutPath: layoutPathForOverride,
         hidden,
         sectionId: sectionMeta?.sectionId,
         sectionName: sectionMeta?.sectionName,
@@ -52741,6 +52746,37 @@ function parseShowProperties(showPr) {
   }
   return props;
 }
+function asArray2(value) {
+  if (value === void 0 || value === null) return [];
+  return Array.isArray(value) ? value : [value];
+}
+function resolveSlideLayoutOrder(sldMaster, relationships, resolveTarget) {
+  const layoutRelationships = relationships.filter(
+    (relationship) => String(relationship["@_Type"] ?? "").includes("/slideLayout")
+  );
+  const targetById = new Map(
+    layoutRelationships.map((relationship) => [
+      String(relationship["@_Id"] ?? ""),
+      String(relationship["@_Target"] ?? "")
+    ])
+  );
+  const orderedIds = asArray2(xmlChild(sldMaster, "p:sldLayoutIdLst")?.["p:sldLayoutId"]).map((layoutId) => xmlAttr(layoutId, "r:id")).filter((id) => Boolean(id));
+  const orderedTargets = [];
+  const usedIds = /* @__PURE__ */ new Set();
+  for (const id of orderedIds) {
+    const target = targetById.get(id);
+    if (target) {
+      orderedTargets.push(resolveTarget(target));
+      usedIds.add(id);
+    }
+  }
+  for (const relationship of layoutRelationships) {
+    const id = String(relationship["@_Id"] ?? "");
+    const target = String(relationship["@_Target"] ?? "");
+    if (target && !usedIds.has(id)) orderedTargets.push(resolveTarget(target));
+  }
+  return orderedTargets;
+}
 function parseMasterColorMap(node) {
   if (!node) {
     return void 0;
@@ -55006,7 +55042,22 @@ var PptxHandlerRuntime9 = class _PptxHandlerRuntime extends PptxHandlerRuntime8
       }
       const type = (xmlAttr(ph, "type") ?? "body").trim();
       const idx = xmlAttr(ph, "idx");
-      result.push({ type, idx });
+      const xfrm = xmlPath(sp, "p:spPr", "a:xfrm");
+      const off = xmlChild(xfrm, "a:off");
+      const ext = xmlChild(xfrm, "a:ext");
+      const emu = _PptxHandlerRuntime.EMU_PER_PX;
+      const x = off ? Number(xmlAttr(off, "x")) / emu : void 0;
+      const y = off ? Number(xmlAttr(off, "y")) / emu : void 0;
+      const width = ext ? Number(xmlAttr(ext, "cx")) / emu : void 0;
+      const height = ext ? Number(xmlAttr(ext, "cy")) / emu : void 0;
+      result.push({
+        type,
+        idx,
+        ...Number.isFinite(x) ? { x } : {},
+        ...Number.isFinite(y) ? { y } : {},
+        ...Number.isFinite(width) ? { width } : {},
+        ...Number.isFinite(height) ? { height } : {}
+      });
     }
     return result;
   }
@@ -55113,12 +55164,13 @@ var PptxHandlerRuntime9 = class _PptxHandlerRuntime extends PptxHandlerRuntime8
           const rels = this.ensureArray(
             xmlChild(relsData, "Relationships")?.["Relationship"]
           );
-          for (const rel of rels) {
-            const relType = String(rel["@_Type"] || "");
-            if (relType.includes("/slideLayout")) {
-              layoutPaths.push(this.resolveImagePath(path, String(rel["@_Target"] || "")));
-            }
-          }
+          layoutPaths.push(
+            ...resolveSlideLayoutOrder(
+              sldMaster,
+              rels,
+              (target) => this.resolveImagePath(path, target)
+            )
+          );
         }
         const layouts = [];
         for (const lp of layoutPaths) {
@@ -58120,9 +58172,13 @@ var PptxHandlerRuntime21 = class extends PptxHandlerRuntime20 {
       return [];
     }
     const result = [];
-    const shapes = this.ensureArray(spTree["p:sp"]);
+    const shapes = [
+      ...this.ensureArray(spTree["p:sp"]),
+      ...this.ensureArray(spTree["p:pic"]),
+      ...this.ensureArray(spTree["p:graphicFrame"])
+    ];
     for (const shape of shapes) {
-      const nvPr = xmlPath(shape, "p:nvSpPr", "p:nvPr");
+      const nvPr = xmlPath(shape, "p:nvSpPr", "p:nvPr") ?? xmlPath(shape, "p:nvPicPr", "p:nvPr") ?? xmlPath(shape, "p:nvGraphicFramePr", "p:nvPr");
       const phInfo = this.readPlaceholderInfoFromNvPr(nvPr);
       if (!phInfo) {
         continue;
@@ -58156,18 +58212,49 @@ var PptxHandlerRuntime21 = class extends PptxHandlerRuntime20 {
     if (type === "title" || type === "ctrtitle") {
       return "title";
     }
-    if (type === "body" || type === "obj" || type === "subtitle") {
+    if (type === "body" || type === "obj" || type === "subtitle" || type === "pic" || type === "chart" || type === "tbl" || type === "media") {
       return "content";
     }
     return type;
   }
+  preferredPlaceholderTypes(element) {
+    switch (element.type) {
+      case "image":
+        return ["pic", "obj"];
+      case "chart":
+        return ["chart", "obj"];
+      case "table":
+        return ["tbl", "obj"];
+      case "video":
+      case "audio":
+        return ["media", "obj"];
+      case "text":
+        return ["body", "subtitle", "obj"];
+      default:
+        return ["obj", "body"];
+    }
+  }
+  placeholderMatchScore(element, source, target) {
+    const sourceType = source.type || "body";
+    const targetType = target.type || "body";
+    const sourceRole = this.placeholderRole(source);
+    const targetRole = this.placeholderRole(target);
+    if (sourceRole !== targetRole) return -1;
+    let score = 0;
+    if (source.idx !== void 0 && target.idx === source.idx) score += 100;
+    if (targetType === sourceType) score += 50;
+    const preferredIndex = this.preferredPlaceholderTypes(element).indexOf(targetType);
+    if (preferredIndex >= 0) score += 30 - preferredIndex * 5;
+    if (targetType === "obj") score += 10;
+    return score;
+  }
   // ── Core layout switching logic ─────────────────────────────────────
   /**
    * Re-map slide elements to a new layout's placeholders.
    *
    * - Placeholder elements whose type matches a new-layout placeholder
    *   get their position/size updated to the new layout's values.
-   * - Placeholder elements with no match in the new layout are removed.
+   * - Placeholder elements with no match in the new layout are preserved.
    * - New-layout placeholders with no matching slide element produce
    *   empty text elements that are appended to the slide.
    * - Non-placeholder elements are left untouched.
@@ -58176,10 +58263,9 @@ var PptxHandlerRuntime21 = class extends PptxHandlerRuntime20 {
    */
   remapElementsToNewLayout(elements2, newLayoutXml, newLayoutPath) {
     const layoutPlaceholders = this.extractLayoutPlaceholders(newLayoutXml);
-    const layoutPhMap = /* @__PURE__ */ new Map();
+    const targetPlaceholders = [];
     for (const lp of layoutPlaceholders) {
-      const key = this.buildPlaceholderMatchKey(lp.phInfo);
-      layoutPhMap.set(key, { ...lp, matched: false });
+      targetPlaceholders.push({ ...lp, matched: false });
     }
     const resultElements = [];
     for (const element of elements2) {
@@ -58188,29 +58274,22 @@ var PptxHandlerRuntime21 = class extends PptxHandlerRuntime20 {
         resultElements.push(element);
         continue;
       }
-      const matchKey = this.buildPlaceholderMatchKey(phInfo);
-      const layoutPh = layoutPhMap.get(matchKey);
-      let resolvedLayoutPh = layoutPh;
-      if (!resolvedLayoutPh && phInfo.type) {
-        for (const [, lp] of layoutPhMap.entries()) {
-          if (!lp.matched && lp.phInfo.type === phInfo.type) {
-            resolvedLayoutPh = lp;
-            break;
-          }
-        }
-      }
-      if (!resolvedLayoutPh) {
-        const sourceRole = this.placeholderRole(phInfo);
-        for (const [, lp] of layoutPhMap.entries()) {
-          if (!lp.matched && this.placeholderRole(lp.phInfo) === sourceRole) {
-            resolvedLayoutPh = lp;
-            break;
-          }
+      let resolvedLayoutPh;
+      let bestScore = -1;
+      for (const candidate of targetPlaceholders) {
+        if (candidate.matched) continue;
+        const score = this.placeholderMatchScore(element, phInfo, candidate.phInfo);
+        if (score > bestScore) {
+          bestScore = score;
+          resolvedLayoutPh = candidate;
         }
       }
       if (resolvedLayoutPh) {
         resolvedLayoutPh.matched = true;
-        const updatedElement = { ...element };
+        const updatedElement = {
+          ...element,
+          rawXml: element.rawXml ? cloneXmlObject(element.rawXml) : element.rawXml
+        };
         if (resolvedLayoutPh.cxEmu > 0 && resolvedLayoutPh.cyEmu > 0) {
           updatedElement.x = Math.round(resolvedLayoutPh.xEmu / EMU_PER_PX);
           updatedElement.y = Math.round(resolvedLayoutPh.yEmu / EMU_PER_PX);
@@ -58226,10 +58305,15 @@ var PptxHandlerRuntime21 = class extends PptxHandlerRuntime20 {
             resolvedLayoutPh.cyEmu
           );
         }
+        if (updatedElement.rawXml) {
+          this.updateElementRawXmlPlaceholder(updatedElement.rawXml, resolvedLayoutPh.phInfo);
+        }
         resultElements.push(updatedElement);
+      } else {
+        resultElements.push(element);
       }
     }
-    for (const [, lp] of layoutPhMap) {
+    for (const lp of targetPlaceholders) {
       if (lp.matched) {
         continue;
       }
@@ -58251,6 +58335,24 @@ var PptxHandlerRuntime21 = class extends PptxHandlerRuntime20 {
     }
     return resultElements;
   }
+  updateElementRawXmlPlaceholder(rawXml, phInfo) {
+    const nvPr = xmlPath(rawXml, "p:nvSpPr", "p:nvPr") ?? xmlPath(rawXml, "p:nvPicPr", "p:nvPr") ?? xmlPath(rawXml, "p:nvGraphicFramePr", "p:nvPr");
+    if (!nvPr) {
+      return;
+    }
+    const ph = nvPr["p:ph"] ?? {};
+    nvPr["p:ph"] = ph;
+    if (phInfo.type) {
+      ph["@_type"] = phInfo.type;
+    } else {
+      delete ph["@_type"];
+    }
+    if (phInfo.idx !== void 0) {
+      ph["@_idx"] = phInfo.idx;
+    } else {
+      delete ph["@_idx"];
+    }
+  }
   // ── rawXml transform update ─────────────────────────────────────────
   /**
    * Update the transform (`a:xfrm`) inside an element's rawXml to
@@ -66490,7 +66592,7 @@ function ensureChild2(parent, key) {
   return created;
 }
 var NOTES_MASTER_CONTENT_TYPE = "application/vnd.openxmlformats-officedocument.presentationml.notesMaster+xml";
-function asArray2(value) {
+function asArray3(value) {
   return Array.isArray(value) ? value : value ? [value] : [];
 }
 function relationshipBase(strict) {
@@ -66537,7 +66639,7 @@ var PptxHandlerRuntime49 = class extends PptxHandlerRuntime48 {
     }
     const relsData = this.parser.parse(relsXml);
     const relsRoot = relsData["Relationships"] ?? {};
-    const relationships = asArray2(relsRoot["Relationship"]);
+    const relationships = asArray3(relsRoot["Relationship"]);
     const usedIds = new Set(relationships.map((rel) => String(rel["@_Id"] ?? "")));
     let index = 1;
     while (usedIds.has(`rId${index}`)) {
@@ -66621,7 +66723,7 @@ var PptxHandlerRuntime49 = class extends PptxHandlerRuntime48 {
     }
     const data = this.parser.parse(xml);
     const root = data["Types"] ?? {};
-    const overrides10 = asArray2(root["Override"]);
+    const overrides10 = asArray3(root["Override"]);
     if (!overrides10.some((entry) => entry["@_PartName"] === partName)) {
       overrides10.push({ "@_PartName": partName, "@_ContentType": contentType });
     }
@@ -66631,7 +66733,7 @@ var PptxHandlerRuntime49 = class extends PptxHandlerRuntime48 {
   }
 };
 var HANDOUT_MASTER_CONTENT_TYPE = "application/vnd.openxmlformats-officedocument.presentationml.handoutMaster+xml";
-function asArray3(value) {
+function asArray4(value) {
   return Array.isArray(value) ? value : value ? [value] : [];
 }
 function relationshipBase2(strict) {
@@ -66662,7 +66764,7 @@ var PptxHandlerRuntime50 = class extends PptxHandlerRuntime49 {
     }
     const relsData = this.parser.parse(relsXml);
     const relsRoot = relsData["Relationships"] ?? {};
-    const relationships = asArray3(relsRoot["Relationship"]);
+    const relationships = asArray4(relsRoot["Relationship"]);
     const target = masterPath.startsWith("ppt/") ? masterPath.slice(4) : masterPath;
     let relationship = relationships.find(
       (rel) => String(rel["@_Type"] ?? "").endsWith("/handoutMaster") && String(rel["@_Target"] ?? "").replace(/^\.\//u, "") === target
@@ -66695,7 +66797,7 @@ var PptxHandlerRuntime50 = class extends PptxHandlerRuntime49 {
     if (existingXml) {
       const data = this.parser.parse(existingXml);
       const root = data["Relationships"] ?? {};
-      const relationships = asArray3(root["Relationship"]);
+      const relationships = asArray4(root["Relationship"]);
       if (relationships.some((rel) => String(rel["@_Type"] ?? "").endsWith("/theme"))) {
         return;
       }
@@ -66806,7 +66908,7 @@ var PptxHandlerRuntime50 = class extends PptxHandlerRuntime49 {
     }
     const data = this.parser.parse(xml);
     const root = data["Types"] ?? {};
-    const overrides10 = asArray3(root["Override"]);
+    const overrides10 = asArray4(root["Override"]);
     const partName = `/${masterPath}`;
     if (!overrides10.some((entry) => entry["@_PartName"] === partName)) {
       overrides10.push({ "@_PartName": partName, "@_ContentType": HANDOUT_MASTER_CONTENT_TYPE });
@@ -76703,12 +76805,47 @@ var PptxHandlerRuntime94 = class extends PptxHandlerRuntime93 {
     const kinsoku = this.extractKinsoku();
     const customerData = await this.parsePresentationCustomerData();
     this.thumbnailData = await this.parseThumbnail() ?? null;
+    const previousEagerDecodeImages = this.eagerDecodeImages;
+    this.eagerDecodeImages = true;
+    try {
+      for (const master of slideMasters) {
+        for (const layout of master.layouts ?? []) {
+          const previewSlidePath = `ppt/slides/__layout_preview_${layout.path.split("/").pop()}`;
+          this.slideRelsMap.set(
+            previewSlidePath,
+            /* @__PURE__ */ new Map([["rIdLayoutPreview", `/${layout.path}`]])
+          );
+          this.layoutCache.delete(layout.path);
+          layout.elements = await this.getLayoutElements(previewSlidePath);
+          this.slideRelsMap.delete(previewSlidePath);
+          layout.backgroundColor ??= master.backgroundColor;
+        }
+      }
+    } finally {
+      this.eagerDecodeImages = previousEagerDecodeImages;
+    }
+    const layoutPreviewMap = new Map(
+      slideMasters.flatMap(
+        (master) => (master.layouts ?? []).map((layout) => [layout.path, layout])
+      )
+    );
+    const layoutOptions = this.getLayoutOptions().map((option) => {
+      const preview = layoutPreviewMap.get(option.path);
+      return preview ? {
+        ...option,
+        previewElements: preview.elements,
+        previewBackgroundColor: preview.backgroundColor,
+        previewWidth: presentationState.width,
+        previewHeight: presentationState.height,
+        previewPlaceholders: preview.placeholders
+      } : option;
+    });
     return new PptxLoadDataBuilder().withDimensions(
       presentationState.width,
       presentationState.height,
       this.rawSlideWidthEmu,
       this.rawSlideHeightEmu
-    ).withNotesDimensions(presentationState.notesWidthEmu, presentationState.notesHeightEmu).withSlides(slidesWithWarnings).withLayoutOptions(this.getLayoutOptions()).withHeaderFooter(headerFooter).withPresentationProperties(presentationProperties).withViewProperties(viewProperties).withCustomShows(customShows).withSections(
+    ).withNotesDimensions(presentationState.notesWidthEmu, presentationState.notesHeightEmu).withSlides(slidesWithWarnings).withLayoutOptions(layoutOptions).withHeaderFooter(headerFooter).withPresentationProperties(presentationProperties).withViewProperties(viewProperties).withCustomShows(customShows).withSections(
       presentationState.orderedSections.length > 0 ? presentationState.orderedSections : void 0
     ).withWarnings(this.compatibilityService.getWarnings()).withThemeColorMap({ ...this.themeColorMap }).withTheme(this.buildThemeObject()).withThemeOptions(themeOptions.length > 0 ? themeOptions : void 0).withTableStyleMap(tableStyleMap).withEmbeddedFonts(embeddedFonts.length > 0 ? embeddedFonts : void 0).withEmbeddedFontList(embeddedFontList).withMruColors(presentationProperties?.mruColors).withNotesMaster(notesMaster).withHandoutMaster(handoutMaster).withSlideMasters(slideMasters.length > 0 ? slideMasters : void 0).withTags(tags.length > 0 ? tags : void 0).withCustomProperties(customProperties.length > 0 ? customProperties : void 0).withCoreProperties(coreProperties).withAppProperties(appProperties).withHasMacros(this.vbaProjectBin !== null ? true : void 0).withHasDigitalSignatures(this.signatureDetection?.hasSignatures || void 0).withDigitalSignatureCount(
       this.signatureDetection?.signatureCount && this.signatureDetection.signatureCount > 0 ? this.signatureDetection.signatureCount : void 0