pptx-viewer-core 1.2.4 → 1.2.5

package/dist/index.js

@@ -7175,6 +7175,32 @@ function findAinkInkPayload(graphicData) {
   }
   return void 0;
 }
+function findOleObjPayload(graphicData) {
+  if (!graphicData) {
+    return void 0;
+  }
+  const direct = graphicData["p:oleObj"];
+  if (direct) {
+    return direct;
+  }
+  const altContent = graphicData["mc:AlternateContent"];
+  if (!altContent) {
+    return void 0;
+  }
+  const fallback = altContent["mc:Fallback"];
+  const fallbackOleObj = fallback?.["p:oleObj"];
+  if (fallbackOleObj) {
+    return fallbackOleObj;
+  }
+  const choices = ensureArrayLike(altContent["mc:Choice"]);
+  for (const choice of choices) {
+    const node = choice?.["p:oleObj"];
+    if (node) {
+      return node;
+    }
+  }
+  return void 0;
+}
 function decodeAinkInk(inkRoot) {
   const inkPaths = [];
   const inkColors = [];
@@ -7287,7 +7313,7 @@ var PptxGraphicFrameParser = class {
         };
       }
       if (type === "ole" && graphicData) {
-        const oleObject = graphicData["p:oleObj"];
+        const oleObject = findOleObjPayload(graphicData);
         const oleProgId = String(oleObject?.["@_progId"] || "").trim() || void 0;
         const oleName = String(oleObject?.["@_name"] || "").trim() || void 0;
         const oleClsId = String(oleObject?.["@_classid"] || "").trim() || void 0;
@@ -7378,7 +7404,7 @@ var PptxGraphicFrameParser = class {
     if (graphicData["dgm:relIds"] || uri.includes("/drawingml/2006/diagram")) {
       return "smartArt";
     }
-    if (graphicData["p:oleObj"] || uri.includes("/drawingml/2006/ole")) {
+    if (uri.includes("/presentationml/2006/ole") || uri.includes("/drawingml/2006/ole") || findOleObjPayload(graphicData)) {
       return "ole";
     }
     if (graphicData["a:videoFile"] || graphicData["a:audioFile"] || uri.includes("/drawingml/2006/media")) {
@@ -8679,6 +8705,87 @@ function parseGuideNode(node) {
   return { id, orientation, positionEmu, color };
 }
 
+// src/core/services/animation-target-reconcile.ts
+var NV_CONTAINERS = [
+  "p:nvSpPr",
+  "p:nvPicPr",
+  "p:nvCxnSpPr",
+  "p:nvGraphicFramePr",
+  "p:nvGrpSpPr"
+];
+function readCnvPrId(rawXml) {
+  if (!rawXml) {
+    return void 0;
+  }
+  for (const nvKey of NV_CONTAINERS) {
+    const nv = rawXml[nvKey];
+    const cNvPr = nv?.["p:cNvPr"];
+    const id = cNvPr?.["@_id"];
+    if (id !== void 0 && id !== null && String(id).length > 0) {
+      return String(id);
+    }
+  }
+  return void 0;
+}
+function isTemplateElementId(elementId) {
+  return elementId.startsWith("layout-") || elementId.startsWith("master-");
+}
+function collectShapeIdMap(elements) {
+  const map = /* @__PURE__ */ new Map();
+  const walk = (els) => {
+    for (const el of els) {
+      const cnvId = readCnvPrId(el.rawXml);
+      if (cnvId) {
+        el.shapeId = cnvId;
+        if (!isTemplateElementId(el.id)) {
+          map.set(cnvId, el.id);
+        }
+      }
+      if (el.type === "group" && Array.isArray(el.children)) {
+        walk(el.children);
+      }
+    }
+  };
+  walk(elements);
+  return map;
+}
+function reconcileAnimationTargets(elements, nativeAnimations, editorAnimations) {
+  const map = collectShapeIdMap(elements);
+  if (map.size === 0) {
+    return;
+  }
+  if (nativeAnimations) {
+    for (const anim of nativeAnimations) {
+      if (anim.targetId !== void 0) {
+        const resolved = map.get(anim.targetId);
+        if (resolved) {
+          anim.targetId = resolved;
+        }
+      }
+      if (anim.triggerShapeId !== void 0) {
+        const resolved = map.get(anim.triggerShapeId);
+        if (resolved) {
+          anim.triggerShapeId = resolved;
+        }
+      }
+    }
+  }
+  if (editorAnimations) {
+    for (const anim of editorAnimations) {
+      const resolvedElement = map.get(anim.elementId);
+      if (resolvedElement) {
+        anim.elementId = resolvedElement;
+      }
+      if (anim.triggerShapeId !== void 0) {
+        const resolvedTrigger = map.get(anim.triggerShapeId);
+        if (resolvedTrigger) {
+          anim.triggerShapeId = resolvedTrigger;
+        }
+      }
+    }
+  }
+}
+
 // src/core/services/PptxSlideLoaderService.ts
 var PptxSlideLoaderService = class {
   /**
@@ -8819,6 +8926,7 @@ var PptxSlideLoaderService = class {
       const transition = params.parseSlideTransition(slideXmlObj, path);
       const animations = params.parseEditorAnimations(slideXmlObj);
       const nativeAnimations = params.parseNativeAnimations(slideXmlObj);
+      reconcileAnimationTargets(elements, nativeAnimations, animations);
       const rawTiming = slideXmlObj["p:sld"]?.["p:timing"];
       const drawingGuides = parseSlideDrawingGuides(slideXmlObj);
       const customerData = await params.parseSlideCustomerData(slideXmlObj, path);
@@ -9318,6 +9426,60 @@ var PptxEditorAnimationService = class {
   }
 };
 
+// src/core/services/animation-shape-id-assign.ts
+function flattenElements(elements, out) {
+  for (const el of elements) {
+    out.push(el);
+    if (el.type === "group" && Array.isArray(el.children)) {
+      flattenElements(el.children, out);
+    }
+  }
+}
+function maxShapeId(elements) {
+  let max = 0;
+  for (const el of elements) {
+    if (el.shapeId !== void 0) {
+      const n = Number.parseInt(el.shapeId, 10);
+      if (Number.isFinite(n) && n > max) {
+        max = n;
+      }
+    }
+  }
+  return max;
+}
+function remapEditorAnimationsToShapeIds(elements, animations, reservedMaxId = 0) {
+  const flat = [];
+  flattenElements(elements, flat);
+  const byId = /* @__PURE__ */ new Map();
+  for (const el of flat) {
+    byId.set(el.id, el);
+  }
+  let nextId2 = Math.max(maxShapeId(flat), reservedMaxId) + 1;
+  const resolve = (elementId) => {
+    const el = byId.get(elementId);
+    if (!el) {
+      return void 0;
+    }
+    if (el.shapeId === void 0) {
+      el.shapeId = String(nextId2);
+      nextId2 += 1;
+    }
+    return el.shapeId;
+  };
+  return animations.map((anim) => {
+    const resolvedElement = resolve(anim.elementId);
+    const resolvedTrigger = anim.triggerShapeId !== void 0 ? resolve(anim.triggerShapeId) : void 0;
+    if (resolvedElement === void 0 && resolvedTrigger === void 0) {
+      return anim;
+    }
+    return {
+      ...anim,
+      elementId: resolvedElement ?? anim.elementId,
+      triggerShapeId: resolvedTrigger ?? anim.triggerShapeId
+    };
+  });
+}
+
 // src/core/services/native-animation-helpers.ts
 function extractSoundAction(cTn) {
   const stSnd = cTn["p:stSnd"];
@@ -10540,7 +10702,7 @@ var PptxSlideTransitionService = class {
   }
   parseSlideTransition(slideXml2) {
     const slideRoot = this.xmlLookupService.getChildByLocalName(slideXml2, "sld");
-    const transitionNode = this.xmlLookupService.getChildByLocalName(slideRoot, "transition");
+    const transitionNode = this.xmlLookupService.getChildByLocalName(slideRoot, "transition") || this.findTransitionInAlternateContent(slideRoot);
     if (!transitionNode) {
       return void 0;
     }
@@ -10612,7 +10774,8 @@ var PptxSlideTransitionService = class {
         transitionType = "morph";
       }
     }
-    const parsedDuration = Number.parseInt(String(transitionNode["@_dur"] || ""), 10);
+    const rawDuration = transitionNode["@_dur"] ?? transitionNode["@_p14:dur"];
+    const parsedDuration = Number.parseInt(String(rawDuration || ""), 10);
     const durationMs = Number.isFinite(parsedDuration) && parsedDuration > 0 ? parsedDuration : void 0;
     const advanceOnClickToken = String(transitionNode["@_advClick"] || "").trim();
     const advanceOnClick = advanceOnClickToken.length > 0 ? !["0", "false", "off"].includes(advanceOnClickToken.toLowerCase()) : void 0;
@@ -10661,6 +10824,35 @@ var PptxSlideTransitionService = class {
       rawExtLst
     };
   }
+  /**
+   * Locate a `<p:transition>` wrapped in a slide-root `mc:AlternateContent`
+   * envelope.
+   *
+   * Real PowerPoint (verified via COM-authored fixtures) wraps the
+   * transition in `mc:AlternateContent` whenever it carries an Office
+   * 2010+ attribute such as `p14:dur` (sub-second transition duration):
+   * an `mc:Choice Requires="p14"` branch carries the richer transition,
+   * and `mc:Fallback` carries a plain one for older readers. Without this
+   * unwrap, `p:sld`'s direct-child lookup for `transition` finds nothing
+   * and the whole transition (including plain ones falling back with no
+   * p14 data) is silently dropped, even though `mc:Choice` is otherwise a
+   * complete, directly usable `p:transition` node.
+   */
+  findTransitionInAlternateContent(slideRoot) {
+    const altContent = this.xmlLookupService.getChildByLocalName(slideRoot, "AlternateContent");
+    if (!altContent) {
+      return void 0;
+    }
+    const choices = this.xmlLookupService.getChildrenArrayByLocalName(altContent, "Choice");
+    for (const choice of choices) {
+      const transitionNode = this.xmlLookupService.getChildByLocalName(choice, "transition");
+      if (transitionNode) {
+        return transitionNode;
+      }
+    }
+    const fallback = this.xmlLookupService.getChildByLocalName(altContent, "Fallback");
+    return this.xmlLookupService.getChildByLocalName(fallback, "transition");
+  }
   /**
    * Detects the PowerPoint 2016+ `morph` transition stored as a p159 extension
    * inside the transition's extLst.
@@ -36615,6 +36807,22 @@ var PptxHandlerRuntime32 = class _PptxHandlerRuntime extends PptxHandlerRuntime3
 
 // src/core/core/runtime/PptxHandlerRuntimeSaveElementWriter.ts
 var PptxHandlerRuntime33 = class _PptxHandlerRuntime extends PptxHandlerRuntime32 {
+  /**
+   * Whether a shape XML represents a `<p:pic>` (picture-shaped) node.
+   *
+   * Real PowerPoint (verified via COM-authored fixtures) represents video
+   * *and* audio media as `<p:pic>` (poster-frame blip + `p:nvPr/a:videoFile`
+   * or `a:audioFile` + a `p14:media` extension) rather than the older
+   * `<p:graphicFrame>` form. A `media`-typed element's `rawXml` is
+   * therefore frequently `p:pic`-shaped, not a graphic frame; without this
+   * check it falls into the generic `shapes` bucket, which the slide
+   * writer serializes under `<p:sp>` -- corrupting the picture markup
+   * (`p:nvPicPr`/`p:blipFill`) into an invalid shape and permanently
+   * losing the media relationship on save.
+   */
+  isPictureShape(shape) {
+    return Boolean(shape["p:nvPicPr"]);
+  }
   /** Whether a shape XML represents a graphic frame. */
   isGraphicFrameShape(shape) {
     return Boolean(shape["p:nvGraphicFramePr"] || shape["a:graphic"] && shape["p:xfrm"]);
@@ -36730,6 +36938,34 @@ var PptxHandlerRuntime33 = class _PptxHandlerRuntime extends PptxHandlerRuntime3
   isTemplateElementId(elementId) {
     return elementId.startsWith("layout-") || elementId.startsWith("master-");
   }
+  /** Non-visual property containers that hold a `p:cNvPr`. */
+  static NV_CONTAINERS = [
+    "p:nvSpPr",
+    "p:nvPicPr",
+    "p:nvCxnSpPr",
+    "p:nvGraphicFramePr",
+    "p:nvGrpSpPr"
+  ];
+  /**
+   * Write an element's native shape id (`element.shapeId`) into the serialized
+   * shape's `p:cNvPr/@id`. Animation targets (`p:spTgt/@spid`) reference this
+   * id, so the two must agree for PowerPoint to bind an animation to its shape.
+   * A no-op when the element carries no `shapeId` (nothing to reconcile) or the
+   * shape XML has no cNvPr container.
+   */
+  applyShapeIdToCnvPr(shape, el) {
+    if (el.shapeId === void 0) {
+      return;
+    }
+    for (const nvKey of _PptxHandlerRuntime.NV_CONTAINERS) {
+      const nv = shape[nvKey];
+      const cNvPr = nv?.["p:cNvPr"];
+      if (cNvPr) {
+        cNvPr["@_id"] = el.shapeId;
+        return;
+      }
+    }
+  }
   /**
    * Process a single slide element during save. Handles embedding,
    * transforms, geometry, styles, text, and sorts into collectors.
@@ -36839,12 +37075,15 @@ var PptxHandlerRuntime33 = class _PptxHandlerRuntime extends PptxHandlerRuntime3
       }
       return;
     }
+    this.applyShapeIdToCnvPr(shape, el);
     if (el.type === "picture" || el.type === "image") {
       collectors.pics.push(shape);
     } else if (el.type === "connector") {
       collectors.connectors.push(shape);
     } else if (el.type === "model3d") {
       collectors.model3ds.push(shape);
+    } else if (el.type === "media" && this.isPictureShape(shape)) {
+      collectors.pics.push(shape);
     } else if (this.isGraphicFrameShape(shape)) {
       collectors.graphicFrames.push(shape);
     } else {
@@ -36883,12 +37122,17 @@ var PptxHandlerRuntime34 = class extends PptxHandlerRuntime33 {
         delete slideNode["p:transition"];
       }
     }
-    if (slide.animations !== void 0) {
-      this.applyEditorAnimations(slideNode, slide.animations);
+    const shapeIdAnimations = slide.animations !== void 0 ? remapEditorAnimationsToShapeIds(
+      slide.elements,
+      slide.animations,
+      this.maxCnvPrId(this.ensureSlideTree(xmlObj))
+    ) : void 0;
+    if (shapeIdAnimations !== void 0) {
+      this.applyEditorAnimations(slideNode, shapeIdAnimations);
     }
-    if (slide.animations && slide.animations.length > 0) {
+    if (shapeIdAnimations && shapeIdAnimations.length > 0) {
       const generatedTiming = this.animationWriteService.buildTimingXml(
-        slide.animations,
+        shapeIdAnimations,
         slide.rawTiming
       );
       if (generatedTiming) {
@@ -37041,6 +37285,40 @@ var PptxHandlerRuntime34 = class extends PptxHandlerRuntime33 {
     }
     this.zip.file(slide.id, this.builder.build(xmlObj));
   }
+  /**
+   * Largest `p:cNvPr/@id` already present anywhere in a shape tree, including
+   * the implicit `<p:spTree>` group's own reserved id. Used to seed minting of
+   * fresh animation-target shape ids so they never collide with a reserved id.
+   */
+  maxCnvPrId(spTree) {
+    let max = 0;
+    const nvContainers = [
+      "p:nvSpPr",
+      "p:nvPicPr",
+      "p:nvCxnSpPr",
+      "p:nvGraphicFramePr",
+      "p:nvGrpSpPr"
+    ];
+    const visit = (node) => {
+      for (const nvKey of nvContainers) {
+        const nv = node[nvKey];
+        const cNvPr = nv?.["p:cNvPr"];
+        if (cNvPr?.["@_id"] !== void 0) {
+          const n = Number.parseInt(String(cNvPr["@_id"]), 10);
+          if (Number.isFinite(n) && n > max) {
+            max = n;
+          }
+        }
+      }
+      for (const listKey of ["p:sp", "p:pic", "p:cxnSp", "p:graphicFrame", "p:grpSp"]) {
+        for (const child of this.ensureArray(node[listKey])) {
+          visit(child);
+        }
+      }
+    };
+    visit(spTree);
+    return max;
+  }
   /**
    * Re-wrap selected children with their original `<mc:AlternateContent>`
    * envelope (CC-4).
@@ -46759,7 +47037,22 @@ var PptxHandlerRuntime79 = class _PptxHandlerRuntime extends PptxHandlerRuntime7
         await this.enrichOleElementsWithEmbeddedData(el.children, slidePath, depth + 1);
         continue;
       }
-      if (el.type !== "ole" || el.isLinked || !el.oleTarget) {
+      if (el.type !== "ole") {
+        continue;
+      }
+      if (el.previewImage && !el.previewImageData) {
+        try {
+          const previewPath = this.resolveImagePath(slidePath, el.previewImage);
+          if (previewPath) {
+            const previewData = await this.getImageData(previewPath);
+            if (previewData) {
+              el.previewImageData = previewData;
+            }
+          }
+        } catch {
+        }
+      }
+      if (el.isLinked || !el.oleTarget) {
         continue;
       }
       try {
@@ -65439,9 +65732,11 @@ exports.pt = pt;
 exports.reResolveSlideColors = reResolveSlideColors;
 exports.readFileAsDataUrl = readFileAsDataUrl;
 exports.rebuildTableStructureInRawXml = rebuildTableStructureInRawXml;
+exports.reconcileAnimationTargets = reconcileAnimationTargets;
 exports.reflowSmartArtLayout = reflowSmartArtLayout;
 exports.relativeLuminance = relativeLuminance;
 exports.relayoutSmartArt = relayoutSmartArt;
+exports.remapEditorAnimationsToShapeIds = remapEditorAnimationsToShapeIds;
 exports.removeChartCategory = removeChartCategory;
 exports.removeChartSeries = removeChartSeries;
 exports.removeSection = removeSection;