pptx-react-viewer 2.16.3 → 2.16.5

package/dist/{chunk-KMT3SLZC.mjs → chunk-247XH4EN.mjs}

@@ -11403,12 +11403,21 @@ function hexToRgbChannels(color2) {
     b: Number.parseInt(normalized.slice(4, 6), 16)
   };
 }
-function parseDrawingPercent(value) {
-  const parsed = Number.parseFloat(String(value ?? "").trim());
-  if (!Number.isFinite(parsed)) {
+function percentDivisorFor(text2) {
+  return text2.endsWith("%") ? 100 : 1e5;
+}
+function parseOoxmlPercent(value) {
+  const text2 = String(value ?? "").trim();
+  const divisor = percentDivisorFor(text2);
+  const magnitude = Number.parseFloat(divisor === 100 ? text2.slice(0, -1) : text2);
+  if (!Number.isFinite(magnitude)) {
     return void 0;
   }
-  return clampUnitInterval(parsed / 1e5);
+  return magnitude / divisor;
+}
+function parseDrawingPercent(value) {
+  const parsed = parseOoxmlPercent(value);
+  return parsed === void 0 ? void 0 : clampUnitInterval(parsed);
 }
 function scrgbLinearToSrgb8(linear) {
   const l = Math.min(1, Math.max(0, linear));
@@ -11487,11 +11496,7 @@ function hslToRgb(h, s, l) {
   };
 }
 function parseDrawingFraction(value) {
-  const parsed = Number.parseFloat(String(value ?? "").trim());
-  if (!Number.isFinite(parsed)) {
-    return void 0;
-  }
-  return parsed / 1e5;
+  return parseOoxmlPercent(value);
 }
 function parseDrawingHueDegrees(value) {
   const parsed = Number.parseFloat(String(value ?? "").trim());
@@ -19329,6 +19334,25 @@ var PptxXmlLookupService = class {
     }
     return void 0;
   }
+  /**
+   * Report whether `parent` declares a child with this local name, regardless
+   * of what the child parsed to.
+   *
+   * Valueless elements such as `a:noFill` or `a:buNone` carry their whole
+   * meaning in being present, and the parser represents them as an empty
+   * string rather than an object, so the child accessors above return
+   * `undefined` for them. Presence has to be asked for directly.
+   */
+  hasChildByLocalName(parent, localName22) {
+    if (!parent) {
+      return false;
+    }
+    if (Object.hasOwn(parent, localName22)) {
+      return true;
+    }
+    const suffix = `:${localName22}`;
+    return Object.keys(parent).some((key) => key.endsWith(suffix));
+  }
   toXmlArray(value) {
     if (Array.isArray(value)) {
       return value.filter((entry2) => this.isXmlObject(entry2));
@@ -37723,16 +37747,20 @@ function parseParagraphSpacingPx(spacingNode) {
   }
   return void 0;
 }
+function parseBulletSizePercent(buSzPct) {
+  const fraction = parseOoxmlPercent(buSzPct?.["@_val"]);
+  return fraction === void 0 ? void 0 : fraction * 100;
+}
 function parseLineSpacingMultiplier(lineSpacingNode) {
   if (!lineSpacingNode) {
     return void 0;
   }
   const spcPct = lineSpacingNode["a:spcPct"];
-  const raw = Number.parseInt(String(spcPct?.["@_val"] || ""), 10);
-  if (Number.isFinite(raw)) {
-    return Math.max(0.1, Math.min(5, raw / 1e5));
+  const multiplier = parseOoxmlPercent(spcPct?.["@_val"]);
+  if (multiplier === void 0) {
+    return void 0;
   }
-  return void 0;
+  return Math.max(0.1, Math.min(5, multiplier));
 }
 function parseLineSpacingExactPt(lineSpacingNode) {
   if (!lineSpacingNode) {
@@ -37845,14 +37873,7 @@ function parseBulletInfo(pPr, paragraphIndex = 0) {
   }
   const buFont = pPr["a:buFont"];
   const fontFamily = buFont?.["@_typeface"] ? String(buFont["@_typeface"]) : void 0;
-  const buSzPct = pPr["a:buSzPct"];
-  let sizePercent;
-  if (buSzPct?.["@_val"] !== void 0) {
-    const pctRaw = Number.parseInt(String(buSzPct["@_val"]), 10);
-    if (Number.isFinite(pctRaw)) {
-      sizePercent = pctRaw / 1e3;
-    }
-  }
+  const sizePercent = parseBulletSizePercent(pPr["a:buSzPct"]);
   const buSzPts = pPr["a:buSzPts"];
   let sizePts;
   if (buSzPts?.["@_val"] !== void 0) {
@@ -42085,7 +42106,15 @@ function getLinkedTextBoxSegments(element, allElements) {
   return segmentMap.get(element.id);
 }
 var FONT_SUBSTITUTION_MAP = {
-  // Microsoft Office default fonts
+  // Microsoft Office default fonts. The Aptos family became the Office
+  // default and its metrics were drawn to sit close to Calibri, so falling
+  // back through Calibri keeps authored line counts; the generic sans-serif
+  // chain is wider and re-wraps one-line titles.
+  Aptos: ["Calibri", "Carlito", "Liberation Sans", "Arial", "sans-serif"],
+  "Aptos Display": ["Calibri Light", "Calibri", "Carlito", "Arial", "sans-serif"],
+  "Aptos Narrow": ["Calibri", "Liberation Sans Narrow", "Arial", "sans-serif"],
+  "Aptos Serif": ["Cambria", "Caladea", "Liberation Serif", "Times New Roman", "serif"],
+  "Aptos Mono": ["Consolas", "Liberation Mono", "Courier New", "monospace"],
   Calibri: ["Carlito", "Liberation Sans", "Arial", "sans-serif"],
   "Calibri Light": ["Carlito", "Liberation Sans", "Arial", "sans-serif"],
   Cambria: ["Caladea", "Liberation Serif", "Times New Roman", "serif"],
@@ -43852,6 +43881,15 @@ function buildModernAuthorPart(authors, rawRoot) {
     }
   };
 }
+function partRelsPath(partPath) {
+  const lastSlash = partPath.lastIndexOf("/");
+  if (lastSlash < 0) {
+    return `_rels/${partPath}.rels`;
+  }
+  const directory = partPath.slice(0, lastSlash);
+  const fileName = partPath.slice(lastSlash + 1);
+  return `${directory}/_rels/${fileName}.rels`;
+}
 var unparsedNodesByRuntime = /* @__PURE__ */ new WeakMap();
 function rememberAuxiliaryMasterUnparsedNodes(runtime, partPath, nodesByTag) {
   let byPart = unparsedNodesByRuntime.get(runtime);
@@ -43864,6 +43902,26 @@ function rememberAuxiliaryMasterUnparsedNodes(runtime, partPath, nodesByTag) {
 function getAuxiliaryMasterUnparsedNodes(runtime, partPath) {
   return unparsedNodesByRuntime.get(runtime)?.get(partPath);
 }
+function createAutoNumberSequence() {
+  return { levels: /* @__PURE__ */ new Map() };
+}
+function forgetFromLevel(sequence, level) {
+  for (const recorded of sequence.levels.keys()) {
+    if (recorded >= level) {
+      sequence.levels.delete(recorded);
+    }
+  }
+}
+function breakAutoNumberRun(sequence, level) {
+  forgetFromLevel(sequence, level);
+}
+function nextAutoNumber(sequence, level, scheme, startAt) {
+  const running = sequence.levels.get(level);
+  const ordinal = running && running.scheme === scheme ? running.ordinal + 1 : startAt;
+  forgetFromLevel(sequence, level + 1);
+  sequence.levels.set(level, { scheme, ordinal });
+  return ordinal;
+}
 var CAMERA_PRESETS = /* @__PURE__ */ new Set([
   "legacyObliqueTopLeft",
   "legacyObliqueTop",
@@ -44148,6 +44206,18 @@ function applyTextBodyScene3d(bodyPr, style) {
   }
   bodyPr[existingKey ?? "a:scene3d"] = ordered(scene, ["camera", "lightRig", "backdrop", "extLst"]);
 }
+var TITLE_FAMILY = /* @__PURE__ */ new Set(["title", "ctrtitle"]);
+var BODY_FAMILY = /* @__PURE__ */ new Set(["body", "obj", "subtitle"]);
+function placeholderStyleFamily(type) {
+  const declared = (type ?? "").trim().toLowerCase() || "body";
+  if (TITLE_FAMILY.has(declared)) {
+    return "title";
+  }
+  if (BODY_FAMILY.has(declared)) {
+    return "body";
+  }
+  return declared;
+}
 var RELATIONSHIPS_NS = "http://schemas.openxmlformats.org/package/2006/relationships";
 var ensureArray9 = (value) => value === void 0 ? [] : Array.isArray(value) ? value : [value];
 var resolvePartPath2 = (source, target) => {
@@ -48405,6 +48475,45 @@ var PptxHandlerRuntime = class {
       });
     }
   }
+  /**
+   * Read a package part's relationship file into {@link slideRelsMap} and
+   * {@link externalRelsMap}, keyed by the part's own path.
+   *
+   * Lives at the root of the chain because relationships are needed by parts
+   * loaded at very different times (slides, layouts, masters, notes) and by
+   * mixins on both sides of the chain. A missing or empty `.rels` file is not
+   * an error: plenty of parts have no relationships.
+   *
+   * @param partPath - The part whose relationships these are.
+   * @param relsPath - Path of the `.rels` part; derived from `partPath` when omitted.
+   */
+  async loadPartRelationships(partPath, relsPath) {
+    const relsXml = await this.zip.file(relsPath ?? partRelsPath(partPath))?.async("string");
+    if (!relsXml) {
+      return;
+    }
+    const relsData = this.parser.parse(relsXml);
+    const relationships = relsData?.["Relationships"];
+    const raw = relationships?.["Relationship"];
+    const entries = Array.isArray(raw) ? raw : raw ? [raw] : [];
+    const targets = /* @__PURE__ */ new Map();
+    const externalIds = /* @__PURE__ */ new Set();
+    for (const entry2 of entries) {
+      const id = entry2["@_Id"];
+      const target = entry2["@_Target"];
+      if (!id || !target) {
+        continue;
+      }
+      targets.set(String(id), String(target));
+      if (String(entry2["@_TargetMode"] ?? "").toLowerCase() === "external") {
+        externalIds.add(String(id));
+      }
+    }
+    this.slideRelsMap.set(partPath, targets);
+    if (externalIds.size > 0) {
+      this.externalRelsMap.set(partPath, externalIds);
+    }
+  }
   /**
    * Restore the original (unwrapped) parser. Called during
    * `initializeLoadSession` to reset state for the next load.
@@ -50295,6 +50404,9 @@ var PptxHandlerRuntime9 = class _PptxHandlerRuntime extends PptxHandlerRuntime8
       if (!this.layoutXmlMap.has(layoutPath)) {
         this.layoutXmlMap.set(layoutPath, data);
       }
+      if (!this.slideRelsMap.has(layoutPath)) {
+        await this.loadPartRelationships(layoutPath);
+      }
       const layout = { path: layoutPath };
       const cSldName = (xmlAttr(xmlChild(sldLayout, "p:cSld"), "name") ?? "").trim();
       if (cSldName) {
@@ -50644,29 +50756,7 @@ var PptxHandlerRuntime11 = class extends PptxHandlerRuntime10 {
     return void 0;
   }
   async loadSlideRelationships(slidePath, relsPath) {
-    const relsXml = await this.zip.file(relsPath)?.async("string");
-    if (!relsXml) {
-      return;
-    }
-    const relsData = this.parser.parse(relsXml);
-    const relsMap = /* @__PURE__ */ new Map();
-    const externalIds = /* @__PURE__ */ new Set();
-    if (relsData?.Relationships?.Relationship) {
-      const rels = Array.isArray(relsData.Relationships.Relationship) ? relsData.Relationships.Relationship : [relsData.Relationships.Relationship];
-      rels.forEach((r) => {
-        if (r["@_Id"] && r["@_Target"]) {
-          const relId = String(r["@_Id"]);
-          relsMap.set(relId, String(r["@_Target"]));
-          if (String(r["@_TargetMode"] || "").toLowerCase() === "external") {
-            externalIds.add(relId);
-          }
-        }
-      });
-    }
-    this.slideRelsMap.set(slidePath, relsMap);
-    if (externalIds.size > 0) {
-      this.externalRelsMap.set(slidePath, externalIds);
-    }
+    await this.loadPartRelationships(slidePath, relsPath);
   }
   async reconcilePresentationSlidesForSave(params) {
     return await this.presentationSlidesReconciler.reconcile({
@@ -53246,14 +53336,13 @@ var PptxHandlerRuntime21 = class extends PptxHandlerRuntime20 {
   // ── Placeholder matching key ────────────────────────────────────────
   /**
    * Build a matching key for a placeholder. Placeholders match primarily
-   * by type. When both have an idx, the idx must also match.
+   * by the style family they belong to (so a `ctrTitle` slide placeholder can
+   * take the target layout's `title` slot, and `obj` can take `body`'s). When
+   * both carry an idx, the idx must also match.
    */
   buildPlaceholderMatchKey(phInfo) {
-    const type = phInfo.type || "body";
-    if (phInfo.idx !== void 0) {
-      return `${type}:${phInfo.idx}`;
-    }
-    return type;
+    const family = placeholderStyleFamily(phInfo.type);
+    return phInfo.idx !== void 0 ? `${family}:${phInfo.idx}` : family;
   }
   // ── Core layout switching logic ─────────────────────────────────────
   /**
@@ -53285,9 +53374,10 @@ var PptxHandlerRuntime21 = class extends PptxHandlerRuntime20 {
       const matchKey = this.buildPlaceholderMatchKey(phInfo);
       const layoutPh = layoutPhMap.get(matchKey);
       let resolvedLayoutPh = layoutPh;
-      if (!resolvedLayoutPh && phInfo.type) {
+      if (!resolvedLayoutPh) {
+        const family = placeholderStyleFamily(phInfo.type);
         for (const [, lp] of layoutPhMap.entries()) {
-          if (!lp.matched && lp.phInfo.type === phInfo.type) {
+          if (!lp.matched && placeholderStyleFamily(lp.phInfo.type) === family) {
             resolvedLayoutPh = lp;
             break;
           }
@@ -62558,15 +62648,16 @@ var PptxHandlerRuntime56 = class extends PptxHandlerRuntime55 {
     };
   }
   /**
-   * Build a cache-map key for a placeholder.  Prefers `idx` when present,
-   * otherwise falls back to `type`.
+   * Build a cache-map key for a placeholder, combining the style family it
+   * inherits from with `idx` when the reference carries one.
+   *
+   * Keying on the family rather than the raw attribute is what lets a slide's
+   * `<p:ph idx="14"/>` find the layout's `type="obj" idx="14"` entry instead of
+   * falling through to the master and losing the layout's own values.
    */
   buildPlaceholderDefaultsKey(phInfo) {
-    const normalizedType = phInfo.type === "ctrtitle" ? "title" : phInfo.type === "subtitle" ? "body" : phInfo.type;
-    if (phInfo.idx !== void 0) {
-      return normalizedType ? `${normalizedType}_${phInfo.idx}` : `_${phInfo.idx}`;
-    }
-    return normalizedType ?? "body";
+    const family = placeholderStyleFamily(phInfo.type);
+    return phInfo.idx !== void 0 ? `${family}_${phInfo.idx}` : family;
   }
   /**
    * Look up merged {@link PlaceholderDefaults} for a shape's placeholder
@@ -62584,8 +62675,8 @@ var PptxHandlerRuntime56 = class extends PptxHandlerRuntime55 {
     const masterPath = this.resolveMasterPathForLayout(layoutPath);
     const masterMap = masterPath ? this.masterPlaceholderDefaultsCache.get(masterPath) : void 0;
     const masterDefaults = masterMap?.get(phKey);
-    const normalizedType = this.buildPlaceholderDefaultsKey(phInfo).split("_")[0];
-    const masterTextStyleType = phInfo.type === "title" || phInfo.type === "ctrtitle" ? "title" : phInfo.type === "body" || phInfo.type === "obj" || phInfo.type === "subtitle" ? "body" : "other";
+    const normalizedType = placeholderStyleFamily(phInfo.type);
+    const masterTextStyleType = normalizedType === "title" ? "title" : normalizedType === "body" ? "body" : "other";
     const masterTextStyles = masterPath ? this.masterTxStylesCache.get(masterPath) : void 0;
     const masterTextLevels = masterTextStyleType === "title" ? masterTextStyles?.titleStyle : masterTextStyleType === "body" ? masterTextStyles?.bodyStyle : masterTextStyles?.otherStyle;
     const resolvedMasterDefaults = masterTextLevels ? {
@@ -63319,12 +63410,11 @@ var PptxHandlerRuntime59 = class extends PptxHandlerRuntime58 {
     if (Number.isFinite(spacingPointsRaw)) {
       return this.pointsToPixels(spacingPointsRaw / 100);
     }
-    const spacingPercentRaw = Number.parseInt(
-      String(spacingNode["a:spcPct"]?.["@_val"] || ""),
-      10
+    const spacingFraction = parseOoxmlPercent(
+      spacingNode["a:spcPct"]?.["@_val"]
     );
-    if (Number.isFinite(spacingPercentRaw) && typeof basisFontSizePx === "number" && basisFontSizePx > 0) {
-      return spacingPercentRaw / 1e5 * basisFontSizePx;
+    if (spacingFraction !== void 0 && typeof basisFontSizePx === "number" && basisFontSizePx > 0) {
+      return spacingFraction * basisFontSizePx;
     }
     return void 0;
   }
@@ -63332,12 +63422,11 @@ var PptxHandlerRuntime59 = class extends PptxHandlerRuntime58 {
     if (!lineSpacingNode) {
       return void 0;
     }
-    const spacingPercentRaw = Number.parseInt(
-      String(lineSpacingNode["a:spcPct"]?.["@_val"] || ""),
-      10
+    const spacingFraction = parseOoxmlPercent(
+      lineSpacingNode["a:spcPct"]?.["@_val"]
     );
-    if (Number.isFinite(spacingPercentRaw)) {
-      return Math.max(0.1, Math.min(5, spacingPercentRaw / 1e5));
+    if (spacingFraction !== void 0) {
+      return Math.max(0.1, Math.min(5, spacingFraction));
     }
     return void 0;
   }
@@ -63358,6 +63447,27 @@ var PptxHandlerRuntime59 = class extends PptxHandlerRuntime58 {
     }
     return void 0;
   }
+  /**
+   * Resolve an inherited level colour against the colour map that is active
+   * now, rather than the one that was active when the level was cached.
+   *
+   * Layout and master text styles are cached once per part; slides are parsed
+   * afterwards, each with its own `p:clrMapOvr`. Re-reading the authored
+   * choice is what makes `tx1` come out white on a slide that maps it to the
+   * light slot and black on one that does not.
+   *
+   * @param levelStyle - The inherited level style.
+   * @returns The colour to inherit, or `undefined` when the level sets none.
+   */
+  resolveLevelStyleColor(levelStyle) {
+    if (levelStyle.colorChoiceXml) {
+      const remapped = this.parseColor(levelStyle.colorChoiceXml);
+      if (remapped) {
+        return remapped;
+      }
+    }
+    return levelStyle.color;
+  }
   /**
    * Apply level-specific {@link PlaceholderTextLevelStyle} properties to a
    * {@link TextStyle} as fallback values for paragraph-level fields.
@@ -63375,8 +63485,11 @@ var PptxHandlerRuntime59 = class extends PptxHandlerRuntime58 {
     if (textStyle.italic === void 0 && levelStyle.italic !== void 0) {
       textStyle.italic = levelStyle.italic;
     }
-    if (textStyle.color === void 0 && levelStyle.color !== void 0) {
-      textStyle.color = levelStyle.color;
+    if (textStyle.color === void 0) {
+      const inheritedColor = this.resolveLevelStyleColor(levelStyle);
+      if (inheritedColor !== void 0) {
+        textStyle.color = inheritedColor;
+      }
     }
     if (textStyle.paragraphMarginLeft === void 0 && levelStyle.marginLeft !== void 0) {
       textStyle.paragraphMarginLeft = levelStyle.marginLeft;
@@ -63445,14 +63558,9 @@ var PptxHandlerRuntime60 = class extends PptxHandlerRuntime59 {
     const buFont = resolvedBulletProps["a:buFont"];
     const fontFamily = buFont?.["@_typeface"] ? String(buFont["@_typeface"]) : void 0;
     const fontInherit = resolvedBulletProps["a:buFontTx"] !== void 0;
-    const buSzPct = resolvedBulletProps["a:buSzPct"];
-    let sizePercent;
-    if (buSzPct?.["@_val"] !== void 0) {
-      const pctRaw = Number.parseInt(String(buSzPct["@_val"]), 10);
-      if (Number.isFinite(pctRaw)) {
-        sizePercent = pctRaw / 1e3;
-      }
-    }
+    const sizePercent = parseBulletSizePercent(
+      resolvedBulletProps["a:buSzPct"]
+    );
     const buSzPts = resolvedBulletProps["a:buSzPts"];
     let sizePts;
     if (buSzPts?.["@_val"] !== void 0) {
@@ -64229,13 +64337,25 @@ var PptxHandlerRuntime63 = class extends PptxHandlerRuntime62 {
       ctx.slidePath,
       ctx.effectiveLevelStyles
     );
+    const paragraphLevel = parseParagraphLevel(p["a:pPr"]);
+    const autoNumScheme = paragraphBulletInfo && !paragraphBulletInfo.none && !paragraphBulletInfo.char ? paragraphBulletInfo.autoNumType : void 0;
+    let autoNumOrdinal;
+    if (autoNumScheme) {
+      autoNumOrdinal = nextAutoNumber(
+        ctx.autoNumbering,
+        paragraphLevel,
+        autoNumScheme,
+        paragraphBulletInfo?.autoNumStartAt ?? 1
+      );
+    } else {
+      breakAutoNumberRun(ctx.autoNumbering, paragraphLevel);
+    }
     if (paragraphBulletInfo && !paragraphBulletInfo.none) {
       let bulletText;
       if (paragraphBulletInfo.char) {
         bulletText = `${paragraphBulletInfo.char} `;
-      } else if (paragraphBulletInfo.autoNumType) {
-        const startAt = paragraphBulletInfo.autoNumStartAt ?? 1;
-        bulletText = this.formatAutoNumber(paragraphBulletInfo.autoNumType, startAt + pIdx);
+      } else if (autoNumScheme && autoNumOrdinal !== void 0) {
+        bulletText = this.formatAutoNumber(autoNumScheme, autoNumOrdinal);
       } else if (paragraphBulletInfo.imageRelId) {
         bulletText = "\u{1F4CE} ";
       } else {
@@ -64743,7 +64863,8 @@ var PptxHandlerRuntime64 = class _PptxHandlerRuntime27 extends PptxHandlerRuntim
           slidePath,
           effectiveLevelStyles,
           styleFontRefColor,
-          styleFontRefTypeface
+          styleFontRefTypeface,
+          autoNumbering: createAutoNumberSequence()
         };
         paras.forEach((p, pIdx) => {
           const styleResult = this.resolveShapeParagraphStyle(p, textStyle, ctx);
@@ -66231,7 +66352,7 @@ var PptxHandlerRuntime70 = class extends PptxHandlerRuntime69 {
         try {
           const masterXmlObj = await this.resolveCachedMasterXml(masterPath);
           if (masterXmlObj) {
-            const masterRelsPath = `${masterPath.replace("slideMasters/", "slideMasters/_rels/")}.rels`;
+            const masterRelsPath = partRelsPath(masterPath);
             await this.loadSlideRelationships(masterPath, masterRelsPath);
             return this.extractBackgroundImage(masterXmlObj, masterPath, "p:sldMaster");
           }
@@ -66254,7 +66375,7 @@ var PptxHandlerRuntime70 = class extends PptxHandlerRuntime69 {
         try {
           const layoutXmlObj = await this.resolveCachedLayoutXml(layoutPath);
           if (layoutXmlObj) {
-            const layoutRelsPath = `${layoutPath.replace("slideLayouts/", "slideLayouts/_rels/")}.rels`;
+            const layoutRelsPath = partRelsPath(layoutPath);
             await this.loadSlideRelationships(layoutPath, layoutRelsPath);
             const bg = this.extractBackgroundImage(layoutXmlObj, layoutPath, "p:sldLayout");
             if (bg) {
@@ -66424,7 +66545,7 @@ var PptxHandlerRuntime71 = class extends PptxHandlerRuntime70 {
       return;
     }
     if (!this.slideRelsMap.has(layoutPath)) {
-      const layoutRelsPath = `${layoutPath.replace("slideLayouts/", "slideLayouts/_rels/")}.rels`;
+      const layoutRelsPath = partRelsPath(layoutPath);
       try {
         await this.loadSlideRelationships(layoutPath, layoutRelsPath);
       } catch {
@@ -66708,12 +66829,11 @@ var PptxHandlerRuntime72 = class _PptxHandlerRuntime31 extends PptxHandlerRuntim
     if (buFont?.["@_typeface"]) {
       style.bulletFontFamily = String(buFont["@_typeface"]);
     }
-    const buSzPct = levelProps["a:buSzPct"];
-    if (buSzPct?.["@_val"] !== void 0) {
-      const pctRaw = Number.parseInt(String(buSzPct["@_val"]), 10);
-      if (Number.isFinite(pctRaw)) {
-        style.bulletSizePercent = pctRaw / 1e3;
-      }
+    const bulletSizePercent = parseBulletSizePercent(
+      levelProps["a:buSzPct"]
+    );
+    if (bulletSizePercent !== void 0) {
+      style.bulletSizePercent = bulletSizePercent;
     }
     const buClr = levelProps["a:buClr"];
     if (buClr) {
@@ -66746,10 +66866,14 @@ var PptxHandlerRuntime72 = class _PptxHandlerRuntime31 extends PptxHandlerRuntim
       if (defRPr["@_i"] !== void 0) {
         style.italic = defRPr["@_i"] === "1";
       }
-      const color2 = this.parseColor(defRPr["a:solidFill"]);
+      const solidFill3 = defRPr["a:solidFill"];
+      const color2 = this.parseColor(solidFill3);
       if (color2) {
         style.color = color2;
       }
+      if (solidFill3) {
+        style.colorChoiceXml = solidFill3;
+      }
       const latin = defRPr["a:latin"];
       if (latin?.["@_typeface"]) {
         const typeface = String(latin["@_typeface"]);
@@ -67068,7 +67192,7 @@ var PptxHandlerRuntime74 = class extends PptxHandlerRuntime73 {
       }
       const masterXmlObj = this.parser.parse(masterXmlStr);
       this.masterXmlMap.set(masterPath, masterXmlObj);
-      const masterRelsPath = `${masterPath.replace("slideMasters/", "slideMasters/_rels/")}.rels`;
+      const masterRelsPath = partRelsPath(masterPath);
       await this.loadSlideRelationships(masterPath, masterRelsPath);
       const spTree = masterXmlObj["p:sldMaster"]?.["p:cSld"]?.["p:spTree"];
       if (!spTree) {
@@ -67286,7 +67410,7 @@ var PptxHandlerRuntime76 = class extends PptxHandlerRuntime75 {
       }
       const layoutXmlObj = this.parser.parse(layoutXmlStr);
       this.layoutXmlMap.set(layoutPath, layoutXmlObj);
-      const layoutRelsPath = `${layoutPath.replace("slideLayouts/", "slideLayouts/_rels/")}.rels`;
+      const layoutRelsPath = partRelsPath(layoutPath);
       await this.loadSlideRelationships(layoutPath, layoutRelsPath);
       const layoutClrMapOverride = this.parseLayoutClrMapOverride(layoutXmlObj);
       const prevClrMapOverride = this.currentSlideClrMapOverride;
@@ -69204,6 +69328,15 @@ var PptxHandlerRuntime83 = class extends PptxHandlerRuntime82 {
 };
 function extractDrawingShapeFill(spPr, deps) {
   const result = {};
+  if (deps.hasChild(spPr, "noFill")) {
+    result.fillNone = true;
+    const noFillShadowColor = deps.extractShadowColor(spPr);
+    if (noFillShadowColor) {
+      result.hasShadow = true;
+      result.shadowColor = noFillShadowColor;
+    }
+    return result;
+  }
   const solidFill3 = deps.getChild(spPr, "solidFill");
   if (solidFill3) {
     result.fillColor = deps.parseColor(solidFill3) ?? void 0;
@@ -69515,6 +69648,7 @@ var PptxHandlerRuntime84 = class _PptxHandlerRuntime35 extends PptxHandlerRuntim
   drawingShapeStyleDeps() {
     return {
       getChild: (node, local) => this.xmlLookupService.getChildByLocalName(node, local),
+      hasChild: (node, local) => this.xmlLookupService.hasChildByLocalName(node, local),
       getChildren: (node, local) => this.xmlLookupService.getChildrenArrayByLocalName(node, local),
       parseColor: (node) => this.parseColor(node),
       extractGradientStops: (gradFill) => this.extractGradientStops(gradFill),
@@ -108027,19 +108161,21 @@ function childrenPair(a, b) {
   }
   return boxOverlapRatio(a, b) >= CHILD_OVERLAP_RATIO;
 }
-function childrenCorrespond(a, b) {
+function correspondingChildren(a, b) {
   if (a.length !== b.length || a.length === 0) {
-    return false;
+    return void 0;
   }
   const unclaimed = b.map((child22) => child22);
+  const paired = [];
   for (const child22 of a) {
     const index = unclaimed.findIndex((candidate) => childrenPair(child22, candidate));
     if (index < 0) {
-      return false;
+      return void 0;
     }
+    paired.push([child22, unclaimed[index]]);
     unclaimed.splice(index, 1);
   }
-  return true;
+  return paired;
 }
 function flattenMorphElements(elements, counterpart, offsetX = 0, offsetY = 0) {
   const out = [];
@@ -108048,7 +108184,7 @@ function flattenMorphElements(elements, counterpart, offsetX = 0, offsetY = 0) {
     if (children8 && containsMorphNamedDescendant(element)) {
       const twin = correspondingGroup(element, counterpart);
       const twinChildren = twin ? groupChildren(twin) ?? [] : void 0;
-      if (twinChildren && childrenCorrespond(children8, twinChildren)) {
+      if (twinChildren && correspondingChildren(children8, twinChildren)) {
         out.push(
           ...flattenMorphElements(children8, twinChildren, offsetX + element.x, offsetY + element.y)
         );
@@ -108059,6 +108195,29 @@ function flattenMorphElements(elements, counterpart, offsetX = 0, offsetY = 0) {
   }
   return out;
 }
+function morphGroupChildPairs(elements, counterpart) {
+  const pairs2 = /* @__PURE__ */ new Map();
+  collectGroupChildPairs(elements, counterpart, pairs2);
+  return pairs2;
+}
+function collectGroupChildPairs(elements, counterpart, into) {
+  for (const element of elements) {
+    const children8 = groupChildren(element);
+    if (!children8 || !containsMorphNamedDescendant(element)) {
+      continue;
+    }
+    const twin = correspondingGroup(element, counterpart);
+    const twinChildren = twin ? groupChildren(twin) ?? [] : void 0;
+    const corresponded = twinChildren ? correspondingChildren(children8, twinChildren) : void 0;
+    if (!corresponded) {
+      continue;
+    }
+    for (const [child22, twinChild] of corresponded) {
+      into.set(child22.id, twinChild.id);
+    }
+    collectGroupChildPairs(children8, twinChildren ?? [], into);
+  }
+}
 var OUTLINE_SAMPLE_COUNT = 64;
 var ELLIPSE_SAMPLE_COUNT = 48;
 function resolveLength(token2, axis) {
@@ -108525,6 +108684,23 @@ function matchMorphElementsFull(fromSlide, toSlide) {
       }
     }
   }
+  const groupChildPairs = morphGroupChildPairs(fromSlide.elements, toSlide.elements);
+  if (groupChildPairs.size > 0) {
+    const toById = new Map(toElements.map((el) => [el.id, el]));
+    for (const fromEl of fromElements) {
+      if (usedFrom.has(fromEl.id)) {
+        continue;
+      }
+      const toId = groupChildPairs.get(fromEl.id);
+      const toEl = toId === void 0 ? void 0 : toById.get(toId);
+      if (!toEl || usedTo.has(toEl.id) || fromEl.type !== toEl.type) {
+        continue;
+      }
+      pairs2.push({ fromElement: fromEl, toElement: toEl });
+      usedFrom.add(fromEl.id);
+      usedTo.add(toEl.id);
+    }
+  }
   for (const fromEl of fromElements) {
     if (usedFrom.has(fromEl.id) || !fromEl.shapeId) {
       continue;
@@ -108631,7 +108807,7 @@ function buildMorphMergedOrder(outgoing, incoming, pairs2) {
   flushOutgoingBelow(outgoing.length);
   return rank;
 }
-function resolveMorphOverlayArrivals(outgoing, incoming, pairs2, holdingGhostIds) {
+function resolveMorphOverlayArrivals(outgoing, incoming, pairs2, holdingGhostIds, dissolvingInIds = /* @__PURE__ */ new Set()) {
   const rank = buildMorphMergedOrder(outgoing, incoming, pairs2);
   const matched = new Set(pairs2.map((pair) => pair.toElement.id));
   const counterpart = new Map(pairs2.map((pair) => [pair.fromElement.id, pair.toElement]));
@@ -108641,7 +108817,7 @@ function resolveMorphOverlayArrivals(outgoing, incoming, pairs2, holdingGhostIds
   }));
   const lifted = /* @__PURE__ */ new Set();
   for (const element of incoming) {
-    if (matched.has(element.id)) {
+    if (matched.has(element.id) && !dissolvingInIds.has(element.id)) {
       continue;
     }
     const mine = rank.get(element.id) ?? 0;
@@ -108706,6 +108882,21 @@ function tokenizeText(element, mode) {
   }
   return tokens;
 }
+var SAME_SLOT_OVERLAP = 0.5;
+function ownText(element) {
+  return (element.text ?? "").replace(/\s+/gu, " ").trim();
+}
+function morphTextReplacedInSlot(fromElement, toElement) {
+  if (fromElement.type !== "text" || toElement.type !== "text") {
+    return false;
+  }
+  const from = ownText(fromElement);
+  const to = ownText(toElement);
+  if (from === "" || to === "" || from === to) {
+    return false;
+  }
+  return boxOverlapRatio(fromElement, toElement) >= SAME_SLOT_OVERLAP;
+}
 function diffTokens(fromTokens, toTokens) {
   const n = fromTokens.length;
   const m = toTokens.length;
@@ -108904,6 +109095,9 @@ function resolveMorphGhostIds(outgoingElements, pairs2) {
   }
   return painted;
 }
+function morphPairIncomingFadesIn(fromElement, toElement, ghosted = true) {
+  return !(ghosted && isInertMorphPair(fromElement, toElement)) && morphPairNeedsCrossfade(fromElement, toElement) && crossfadeIncomingMayFadeIn(toElement);
+}
 function crossfadeIncomingMayFadeIn(element) {
   const image = element;
   if (image.imagePath || image.svgPath) {
@@ -108934,17 +109128,18 @@ function generateMorphAnimations(pairs2, durationMs, _mode = "object", ghostIds)
       continue;
     }
     const safeName = `pptx-morph-${index}-${toElement.id.replace(/[^a-zA-Z0-9]/gu, "")}`;
-    const dx = fromElement.x + fromElement.width / 2 - (toElement.x + toElement.width / 2);
-    const dy = fromElement.y + fromElement.height / 2 - (toElement.y + toElement.height / 2);
-    const sx = Math.max(fromElement.width, 1) / Math.max(toElement.width, 1);
-    const sy = Math.max(fromElement.height, 1) / Math.max(toElement.height, 1);
+    const inSlot = morphTextReplacedInSlot(fromElement, toElement);
+    const dx = inSlot ? 0 : fromElement.x + fromElement.width / 2 - (toElement.x + toElement.width / 2);
+    const dy = inSlot ? 0 : fromElement.y + fromElement.height / 2 - (toElement.y + toElement.height / 2);
+    const sx = inSlot ? 1 : Math.max(fromElement.width, 1) / Math.max(toElement.width, 1);
+    const sy = inSlot ? 1 : Math.max(fromElement.height, 1) / Math.max(toElement.height, 1);
     const fromOpacity = fromElement.opacity ?? 1;
     const toOpacity = toElement.opacity ?? 1;
     const toRot = toElement.rotation ?? 0;
-    const fromRot = shortestRotationTarget(toRot, fromElement.rotation ?? 0);
+    const fromRot = inSlot ? toRot : shortestRotationTarget(toRot, fromElement.rotation ?? 0);
     const flips = `${toElement.flipHorizontal ? " scaleX(-1)" : ""}${toElement.flipVertical ? " scaleY(-1)" : ""}`;
     const inert = ghosted && isInertMorphPair(fromElement, toElement);
-    const crossfadesIn = !inert && morphPairNeedsCrossfade(fromElement, toElement) && crossfadeIncomingMayFadeIn(toElement);
+    const crossfadesIn = morphPairIncomingFadesIn(fromElement, toElement, ghosted);
     const fromProps = [
       `		transform: translate(${dx}px, ${dy}px) scale(${sx}, ${sy}) rotate(${fromRot}deg)${flips};`
     ];
@@ -108997,14 +109192,18 @@ function generateMorphGhostAnimations(pairs2, durationMs, startIndex, ghostIds)
     if (ghostIds && !ghostIds.has(fromElement.id)) {
       continue;
     }
+    if (isInertMorphPair(fromElement, toElement)) {
+      continue;
+    }
     const fadesOut = morphPairNeedsCrossfade(fromElement, toElement);
     const safeName = `pptx-morph-ghost-${startIndex + index}-${fromElement.id.replace(/[^a-zA-Z0-9]/gu, "")}`;
-    const dx = toElement.x + toElement.width / 2 - (fromElement.x + fromElement.width / 2);
-    const dy = toElement.y + toElement.height / 2 - (fromElement.y + fromElement.height / 2);
-    const sx = Math.max(toElement.width, 1) / Math.max(fromElement.width, 1);
-    const sy = Math.max(toElement.height, 1) / Math.max(fromElement.height, 1);
+    const inSlot = morphTextReplacedInSlot(fromElement, toElement);
+    const dx = inSlot ? 0 : toElement.x + toElement.width / 2 - (fromElement.x + fromElement.width / 2);
+    const dy = inSlot ? 0 : toElement.y + toElement.height / 2 - (fromElement.y + fromElement.height / 2);
+    const sx = inSlot ? 1 : Math.max(toElement.width, 1) / Math.max(fromElement.width, 1);
+    const sy = inSlot ? 1 : Math.max(toElement.height, 1) / Math.max(fromElement.height, 1);
     const fromRot = fromElement.rotation ?? 0;
-    const toRot = shortestRotationTarget(fromRot, toElement.rotation ?? 0);
+    const toRot = inSlot ? fromRot : shortestRotationTarget(fromRot, toElement.rotation ?? 0);
     const flips = `${fromElement.flipHorizontal ? " scaleX(-1)" : ""}${fromElement.flipVertical ? " scaleY(-1)" : ""}`;
     const opacity2 = fromElement.opacity ?? 1;
     const keyframes = `
@@ -109202,6 +109401,7 @@ function buildMorphTransitionPlan(fromSlide, toSlide, durationMs, mode = "object
   const animations = generateFullMorphTransition(fromSlide, toSlide, durationMs, mode);
   const flattenedOutgoing = flattenMorphElements(fromSlide.elements, toSlide.elements);
   const outgoingIds = new Set(flattenedOutgoing.map((element) => element.id));
+  const ghostIds = resolveMorphGhostIds(flattenedOutgoing, match.pairs);
   const incomingAnimations = /* @__PURE__ */ new Map();
   const outgoingAnimations = /* @__PURE__ */ new Map();
   const incomingImageAnimations = /* @__PURE__ */ new Map();
@@ -109213,20 +109413,28 @@ function buildMorphTransitionPlan(fromSlide, toSlide, durationMs, mode = "object
     const target = animation.target === "image" ? isOutgoing ? outgoingImageAnimations : incomingImageAnimations : isOutgoing ? outgoingAnimations : incomingAnimations;
     target.set(animation.elementId, animation.animation);
   }
-  const outgoingElements = flattenedOutgoing.filter(
-    (element) => outgoingAnimations.has(element.id)
-  );
+  const outgoingElements = flattenedOutgoing.filter((element) => ghostIds.has(element.id));
   const flattenedIncoming = flattenMorphElements(toSlide.elements, fromSlide.elements);
   const holdingGhostIds = new Set(
     match.pairs.filter(
-      (candidate) => outgoingAnimations.has(candidate.fromElement.id) && !morphPairNeedsCrossfade(candidate.fromElement, candidate.toElement)
+      (candidate) => ghostIds.has(candidate.fromElement.id) && !morphPairNeedsCrossfade(candidate.fromElement, candidate.toElement)
     ).map((candidate) => candidate.fromElement.id)
   );
+  const dissolvingInIds = new Set(
+    match.pairs.filter(
+      (candidate) => morphPairIncomingFadesIn(
+        candidate.fromElement,
+        candidate.toElement,
+        ghostIds.has(candidate.fromElement.id)
+      )
+    ).map((candidate) => candidate.toElement.id)
+  );
   const lifted = resolveMorphOverlayArrivals(
     flattenedOutgoing,
     flattenedIncoming,
     match.pairs,
-    holdingGhostIds
+    holdingGhostIds,
+    dissolvingInIds
   );
   const overlayIncomingAnimations = /* @__PURE__ */ new Map();
   for (const id of lifted) {