pptx-react-viewer 2.16.1 → 2.16.2

package/dist/{chunk-3NDRTC7T.js → chunk-4GX347MG.js}

@@ -107797,9 +107797,9 @@ function buildTextRunFilterChain(style) {
   return parts.length > 0 ? parts.join(" ") : void 0;
 }
 var ADVANCE_STEPS_PER_PX = 6;
+var MAX_TRACKING_PX_PER_CHAR = 1 / (2 * ADVANCE_STEPS_PER_PX);
 var MAX_CACHE_ENTRIES = 2e4;
 var measureContext;
-var advanceCache = /* @__PURE__ */ new Map();
 var trackingCache = /* @__PURE__ */ new Map();
 var fontsHookInstalled = false;
 function installFontLoadHook() {
@@ -107808,7 +107808,6 @@ function installFontLoadHook() {
   }
   fontsHookInstalled = true;
   document.fonts?.addEventListener?.("loadingdone", () => {
-    advanceCache = /* @__PURE__ */ new Map();
     trackingCache = /* @__PURE__ */ new Map();
   });
 }
@@ -107829,19 +107828,19 @@ function toCanvasFont(font) {
   const family = font.fontFamily || DEFAULT_FONT_FAMILY;
   return `${font.italic ? "italic " : ""}${font.bold ? "bold " : ""}${size}px ${family}`;
 }
-function advanceOf(ctx, canvasFont, char) {
-  const key = `${canvasFont}\0${char}`;
-  const cached = advanceCache.get(key);
-  if (cached !== void 0) {
-    return cached;
-  }
+function advancesOf(ctx, canvasFont, chars) {
   ctx.font = canvasFont;
-  const width = ctx.measureText(char).width;
-  if (advanceCache.size >= MAX_CACHE_ENTRIES) {
-    advanceCache = /* @__PURE__ */ new Map();
+  ctx.fontKerning = "none";
+  const advances = [];
+  let previous = 0;
+  let prefix = "";
+  for (const char of chars) {
+    prefix += char;
+    const width = ctx.measureText(prefix).width;
+    advances.push(width - previous);
+    previous = width;
   }
-  advanceCache.set(key, width);
-  return width;
+  return advances;
 }
 function resolveMetricTrackingPx(text2, font) {
   if (!text2) {
@@ -107858,23 +107857,57 @@ function resolveMetricTrackingPx(text2, font) {
     return 0;
   }
   const chars = [...text2];
-  ctx.font = canvasFont;
+  let powerPoint = 0;
+  for (const advance of advancesOf(ctx, canvasFont, chars)) {
+    powerPoint += Math.round(advance * ADVANCE_STEPS_PER_PX);
+  }
+  ctx.fontKerning = "auto";
   const natural = ctx.measureText(text2).width;
   if (!(natural > 0)) {
     return 0;
   }
-  let powerPoint = 0;
-  for (const char of chars) {
-    powerPoint += Math.round(advanceOf(ctx, canvasFont, char) * ADVANCE_STEPS_PER_PX);
-  }
   powerPoint /= ADVANCE_STEPS_PER_PX;
-  const tracking = (powerPoint - natural) / chars.length;
+  const limit = MAX_TRACKING_PX_PER_CHAR;
+  const raw = (powerPoint - natural) / chars.length;
+  const tracking = Math.min(limit, Math.max(-limit, raw));
   if (trackingCache.size >= MAX_CACHE_ENTRIES) {
     trackingCache = /* @__PURE__ */ new Map();
   }
   trackingCache.set(key, tracking);
   return tracking;
 }
+function isBreakBoundary(previous, next) {
+  const previousSpace = /\s/u.test(previous);
+  const nextSpace = /\s/u.test(next);
+  if (previousSpace !== nextSpace) {
+    return true;
+  }
+  return previous === "-" && next !== "-" && !nextSpace;
+}
+function splitRunForMetrics(text2, font) {
+  const chars = [...text2];
+  if (chars.length < 2 || !getMeasureContext()) {
+    return [{ text: text2, tracking: resolveMetricTrackingPx(text2, font) }];
+  }
+  const pieces = [];
+  let current = chars[0];
+  for (let i = 1; i < chars.length; i++) {
+    if (isBreakBoundary(chars[i - 1], chars[i])) {
+      pieces.push(current);
+      current = "";
+    }
+    current += chars[i];
+  }
+  pieces.push(current);
+  if (pieces.length === 1) {
+    return [{ text: text2, tracking: resolveMetricTrackingPx(text2, font) }];
+  }
+  return pieces.map((piece) => ({ text: piece, tracking: resolveMetricTrackingPx(piece, font) }));
+}
+function pieceLetterSpacing(authoredPx, tracking) {
+  const spacing = authoredPx + tracking;
+  return spacing === 0 ? void 0 : `${spacing}px`;
+}
 function resolveParagraphStrutFontSize(segments, bodyFontSize) {
   let largest;
   for (const segment of segments) {
@@ -107985,6 +108018,43 @@ function correspondingGroup(group2, candidates) {
     return sameBox(group2, candidate);
   });
 }
+var CHILD_OVERLAP_RATIO = 0.5;
+function boxOverlapRatio(a, b) {
+  const left = Math.max(a.x, b.x);
+  const top = Math.max(a.y, b.y);
+  const right = Math.min(a.x + a.width, b.x + b.width);
+  const bottom = Math.min(a.y + a.height, b.y + b.height);
+  if (right <= left || bottom <= top) {
+    return 0;
+  }
+  const intersection = (right - left) * (bottom - top);
+  const union = a.width * a.height + b.width * b.height - intersection;
+  return union > 0 ? intersection / union : 0;
+}
+function childrenPair(a, b) {
+  const morphName = getElementMorphName(a);
+  if (morphName !== void 0 && getElementMorphName(b) === morphName) {
+    return true;
+  }
+  if (a.name && a.name === b.name) {
+    return true;
+  }
+  return boxOverlapRatio(a, b) >= CHILD_OVERLAP_RATIO;
+}
+function childrenCorrespond(a, b) {
+  if (a.length !== b.length || a.length === 0) {
+    return false;
+  }
+  const unclaimed = b.map((child22) => child22);
+  for (const child22 of a) {
+    const index = unclaimed.findIndex((candidate) => childrenPair(child22, candidate));
+    if (index < 0) {
+      return false;
+    }
+    unclaimed.splice(index, 1);
+  }
+  return true;
+}
 function flattenMorphElements(elements, counterpart, offsetX = 0, offsetY = 0) {
   const out = [];
   for (const element of elements) {
@@ -107992,7 +108062,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) {
+      if (twinChildren && childrenCorrespond(children8, twinChildren)) {
         out.push(
           ...flattenMorphElements(children8, twinChildren, offsetX + element.x, offsetY + element.y)
         );
@@ -108212,6 +108282,7 @@ function interpolateOutline(from, to, t) {
   return parts.join(" ");
 }
 var MORPH_EASING = "cubic-bezier(0.4, 0, 0.2, 1)";
+var MORPH_CROSSFADE_EASING = "cubic-bezier(0.2, 0, 0.4, 1)";
 var MORPH_FADE_OUT_HOLD_PERCENT = 4;
 var MORPH_FADE_OUT_END_PERCENT = 23;
 var MORPH_FADE_IN_START_PERCENT = 42;
@@ -108532,6 +108603,69 @@ function matchMorphElementsFull(fromSlide, toSlide) {
   const unmatchedTo = toElements.filter((el) => !usedTo.has(el.id));
   return { pairs: pairs2, unmatchedFrom, unmatchedTo };
 }
+function travelledBox(from, to) {
+  const boxes = to ? [from, to] : [from];
+  return {
+    left: Math.min(...boxes.map((element) => element.x)),
+    top: Math.min(...boxes.map((element) => element.y)),
+    right: Math.max(...boxes.map((element) => element.x + element.width)),
+    bottom: Math.max(...boxes.map((element) => element.y + element.height))
+  };
+}
+function boxesOverlap(a, b) {
+  return a.left < b.right && b.left < a.right && a.top < b.bottom && b.top < a.bottom;
+}
+function buildMorphMergedOrder(outgoing, incoming, pairs2) {
+  const partnerOf = new Map(pairs2.map((pair) => [pair.toElement.id, pair.fromElement.id]));
+  const outgoingIndex = new Map(outgoing.map((element, index) => [element.id, index]));
+  const rank = /* @__PURE__ */ new Map();
+  let next = 0;
+  let cursor = 0;
+  const flushOutgoingBelow = (limit) => {
+    while (cursor < limit) {
+      const element = outgoing[cursor];
+      cursor += 1;
+      if (!rank.has(element.id)) {
+        rank.set(element.id, next);
+        next += 1;
+      }
+    }
+  };
+  for (const element of incoming) {
+    const partner = partnerOf.get(element.id);
+    const partnerIndex = partner === void 0 ? void 0 : outgoingIndex.get(partner);
+    if (partner === void 0 || partnerIndex === void 0) {
+      rank.set(element.id, next);
+      next += 1;
+      continue;
+    }
+    flushOutgoingBelow(partnerIndex + 1);
+    rank.set(element.id, rank.get(partner) ?? next);
+  }
+  flushOutgoingBelow(outgoing.length);
+  return rank;
+}
+function resolveMorphOverlayArrivals(outgoing, incoming, pairs2, holdingGhostIds) {
+  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]));
+  const ghosts = outgoing.filter((element) => holdingGhostIds.has(element.id)).map((element) => ({
+    rank: rank.get(element.id) ?? 0,
+    box: travelledBox(element, counterpart.get(element.id))
+  }));
+  const lifted = /* @__PURE__ */ new Set();
+  for (const element of incoming) {
+    if (matched.has(element.id)) {
+      continue;
+    }
+    const mine = rank.get(element.id) ?? 0;
+    const box = travelledBox(element);
+    if (ghosts.some((ghost) => ghost.rank < mine && boxesOverlap(ghost.box, box))) {
+      lifted.add(element.id);
+    }
+  }
+  return lifted;
+}
 function tokenizeText(element, mode) {
   if (!hasTextProperties(element) || !element.text) {
     return [];
@@ -108769,18 +108903,6 @@ var GEOMETRY_EPSILON = 0.5;
 function isInertMorphPair(fromElement, toElement) {
   return !morphImageCropChanged(fromElement, toElement) && Math.abs(fromElement.x - toElement.x) <= GEOMETRY_EPSILON && Math.abs(fromElement.y - toElement.y) <= GEOMETRY_EPSILON && Math.abs(fromElement.width - toElement.width) <= GEOMETRY_EPSILON && Math.abs(fromElement.height - toElement.height) <= GEOMETRY_EPSILON && (fromElement.rotation ?? 0) === (toElement.rotation ?? 0) && Boolean(fromElement.flipHorizontal) === Boolean(toElement.flipHorizontal) && Boolean(fromElement.flipVertical) === Boolean(toElement.flipVertical) && (fromElement.opacity ?? 1) === (toElement.opacity ?? 1) && !morphPairNeedsCrossfade(fromElement, toElement);
 }
-function travelledBox(from, to) {
-  const boxes = to ? [from, to] : [from];
-  return {
-    left: Math.min(...boxes.map((element) => element.x)),
-    top: Math.min(...boxes.map((element) => element.y)),
-    right: Math.max(...boxes.map((element) => element.x + element.width)),
-    bottom: Math.max(...boxes.map((element) => element.y + element.height))
-  };
-}
-function boxesOverlap(a, b) {
-  return a.left < b.right && b.left < a.right && a.top < b.bottom && b.top < a.bottom;
-}
 function resolveMorphGhostIds(outgoingElements, pairs2) {
   const counterparts = new Map(pairs2.map((pair) => [pair.fromElement.id, pair.toElement]));
   const painted = /* @__PURE__ */ new Set();
@@ -108801,6 +108923,10 @@ function crossfadeIncomingMayFadeIn(element) {
   if (image.imagePath || image.svgPath) {
     return false;
   }
+  const children8 = element.children;
+  if (children8?.length) {
+    return children8.every((child22) => crossfadeIncomingMayFadeIn(child22));
+  }
   if (!hasShapeProperties(element)) {
     return true;
   }
@@ -108834,13 +108960,15 @@ function generateMorphAnimations(pairs2, durationMs, _mode = "object", ghostIds)
     const inert = ghosted && isInertMorphPair(fromElement, toElement);
     const crossfadesIn = !inert && morphPairNeedsCrossfade(fromElement, toElement) && crossfadeIncomingMayFadeIn(toElement);
     const fromProps = [
-      `		transform: translate(${dx}px, ${dy}px) scale(${sx}, ${sy}) rotate(${fromRot}deg)${flips};`,
-      `		opacity: ${inert ? 0 : crossfadesIn ? 0 : fromOpacity};`
+      `		transform: translate(${dx}px, ${dy}px) scale(${sx}, ${sy}) rotate(${fromRot}deg)${flips};`
     ];
     const toProps = [
-      `		transform: translate(0, 0) scale(1, 1) rotate(${toRot}deg)${flips};`,
-      `		opacity: ${inert ? 0 : toOpacity};`
+      `		transform: translate(0, 0) scale(1, 1) rotate(${toRot}deg)${flips};`
     ];
+    if (!crossfadesIn) {
+      fromProps.push(`		opacity: ${inert ? 0 : fromOpacity};`);
+      toProps.push(`		opacity: ${inert ? 0 : toOpacity};`);
+    }
     const colorInterp = buildColorInterpolationProps(fromElement, toElement);
     if (colorInterp) {
       fromProps.push(`		background-color: ${colorInterp.fromBg};`);
@@ -108859,10 +108987,18 @@ ${fromProps.join("\n")}
 	to {
 ${toProps.join("\n")}
 	}
-}`;
+}${crossfadesIn ? `
+@keyframes ${safeName}-fade {
+	from {
+		opacity: 0;
+	}
+	to {
+		opacity: ${toOpacity};
+	}
+}` : ""}`;
     animations.push({
       elementId: toElement.id,
-      animation: `${safeName} ${durationMs}ms ${MORPH_EASING} forwards`,
+      animation: `${safeName} ${durationMs}ms ${MORPH_EASING} forwards${crossfadesIn ? `, ${safeName}-fade ${durationMs}ms ${MORPH_CROSSFADE_EASING} forwards` : ""}`,
       keyframes
     });
   }
@@ -108884,22 +109020,31 @@ function generateMorphGhostAnimations(pairs2, durationMs, startIndex, ghostIds)
     const fromRot = fromElement.rotation ?? 0;
     const toRot = shortestRotationTarget(fromRot, toElement.rotation ?? 0);
     const flips = `${fromElement.flipHorizontal ? " scaleX(-1)" : ""}${fromElement.flipVertical ? " scaleY(-1)" : ""}`;
+    const opacity2 = fromElement.opacity ?? 1;
     const keyframes = `
 @keyframes ${safeName} {
 	from {
 		transform-origin: center;
-		transform: translate(0, 0) scale(1, 1) rotate(${fromRot}deg)${flips};
-		opacity: ${fromElement.opacity ?? 1};
+		transform: translate(0, 0) scale(1, 1) rotate(${fromRot}deg)${flips};${fadesOut ? "" : `
+		opacity: ${opacity2};`}
 	}
 	to {
 		transform-origin: center;
-		transform: translate(${dx}px, ${dy}px) scale(${sx}, ${sy}) rotate(${toRot}deg)${flips};
-		opacity: ${fadesOut ? 0 : fromElement.opacity ?? 1};
+		transform: translate(${dx}px, ${dy}px) scale(${sx}, ${sy}) rotate(${toRot}deg)${flips};${fadesOut ? "" : `
+		opacity: ${opacity2};`}
 	}
-}`;
+}${fadesOut ? `
+@keyframes ${safeName}-fade {
+	from {
+		opacity: ${opacity2};
+	}
+	to {
+		opacity: 0;
+	}
+}` : ""}`;
     animations.push({
       elementId: fromElement.id,
-      animation: `${safeName} ${durationMs}ms ${MORPH_EASING} forwards`,
+      animation: `${safeName} ${durationMs}ms ${MORPH_EASING} forwards${fadesOut ? `, ${safeName}-fade ${durationMs}ms ${MORPH_CROSSFADE_EASING} forwards` : ""}`,
       keyframes
     });
   }
@@ -109041,6 +109186,16 @@ function generateFullMorphTransition(fromSlide, toSlide, durationMs, mode = "obj
   allAnimations.push(...fadeIns);
   return allAnimations;
 }
+var LIFTED_HIDDEN_NAME = "pptx-morph-lifted-hidden";
+var LIFTED_HIDDEN_KEYFRAMES = `
+@keyframes ${LIFTED_HIDDEN_NAME} {
+	from {
+		opacity: 0;
+	}
+	to {
+		opacity: 0;
+	}
+}`;
 function morphOptionToMode(option) {
   if (option === "byWord") {
     return "word";
@@ -109075,13 +109230,42 @@ function buildMorphTransitionPlan(fromSlide, toSlide, durationMs, mode = "object
   const outgoingElements = flattenedOutgoing.filter(
     (element) => outgoingAnimations.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)
+    ).map((candidate) => candidate.fromElement.id)
+  );
+  const lifted = resolveMorphOverlayArrivals(
+    flattenedOutgoing,
+    flattenedIncoming,
+    match.pairs,
+    holdingGhostIds
+  );
+  const overlayIncomingAnimations = /* @__PURE__ */ new Map();
+  for (const id of lifted) {
+    const animation = incomingAnimations.get(id);
+    if (animation === void 0) {
+      continue;
+    }
+    overlayIncomingAnimations.set(id, animation);
+    incomingAnimations.set(id, `${LIFTED_HIDDEN_NAME} ${durationMs}ms linear forwards`);
+  }
+  if (overlayIncomingAnimations.size > 0) {
+    keyframes.push(LIFTED_HIDDEN_KEYFRAMES);
+  }
+  const overlayIncomingElements = flattenedIncoming.filter(
+    (element) => overlayIncomingAnimations.has(element.id)
+  );
   return {
     keyframesCss: keyframes.join("\n"),
     incomingAnimations,
     outgoingAnimations,
     incomingImageAnimations,
     outgoingImageAnimations,
+    overlayIncomingAnimations,
     outgoingElements,
+    overlayIncomingElements,
     durationMs
   };
 }
@@ -109099,9 +109283,12 @@ function buildMorphAnimationRules(plan, scopeAttribute, which = "incoming", only
     }
   };
   if (only !== "image") {
-    emit(which === "incoming" ? plan.incomingAnimations : plan.outgoingAnimations, "");
+    emit(
+      which === "outgoing" ? plan.outgoingAnimations : which === "lifted" ? plan.overlayIncomingAnimations : plan.incomingAnimations,
+      ""
+    );
   }
-  emit(which === "incoming" ? plan.incomingImageAnimations : plan.outgoingImageAnimations, " img");
+  emit(which === "outgoing" ? plan.outgoingImageAnimations : plan.incomingImageAnimations, " img");
   return rules.join("\n");
 }
 function hexToRgb6(hex10) {
@@ -124063,6 +124250,7 @@ exports.parseDrawingColorOpacity = parseDrawingColorOpacity;
 exports.parsePanoseString = parsePanoseString;
 exports.parsePpactionUrl = parsePpactionUrl;
 exports.pickSupportedMimeType = pickSupportedMimeType;
+exports.pieceLetterSpacing = pieceLetterSpacing;
 exports.placeAudienceWindow = placeAudienceWindow;
 exports.placeCaretAtEnd = placeCaretAtEnd;
 exports.polygonsToSvgPath = polygonsToSvgPath;
@@ -124187,6 +124375,7 @@ exports.slideProgressPercent = slideProgressPercent;
 exports.slideStatusLabel = slideStatusLabel;
 exports.snapBoxToGrid = snapBoxToGrid;
 exports.splitCell = splitCell;
+exports.splitRunForMetrics = splitRunForMetrics;
 exports.splitSeriesByAxis = splitSeriesByAxis;
 exports.stepPresenterZoom = stepPresenterZoom;
 exports.stopAllPersistentAudio = stopAllPersistentAudio;

package/dist/{chunk-7UBDMCI7.js → chunk-CIK6XUOH.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-var chunk3NDRTC7T_js = require('./chunk-3NDRTC7T.js');
+var chunk4GX347MG_js = require('./chunk-4GX347MG.js');
 var chunk4VNS5WPM_js = require('./chunk-4VNS5WPM.js');
 var mcp = require('pptx-viewer-mcp');
 var mcpSchemas = require('pptx-viewer-mcp/schemas');
@@ -14879,7 +14879,7 @@ async function buildSlideMarkdown(slides, slideIndex2, meta3, options = {}) {
   };
   let markdown;
   try {
-    const converter = new chunk3NDRTC7T_js.PptxMarkdownConverter(
+    const converter = new chunk4GX347MG_js.PptxMarkdownConverter(
       "",
       {
         sourceName: meta3.title ?? "deck.pptx",
@@ -15471,7 +15471,7 @@ var getTheme = (ctx) => {
     name: theme?.name,
     colorScheme: theme?.colorScheme,
     fontScheme: theme?.fontScheme,
-    availablePresets: Object.keys(chunk3NDRTC7T_js.ThemePresets)
+    availablePresets: Object.keys(chunk4GX347MG_js.ThemePresets)
   };
 };
 var readExecutors = {