@office-kit/pptx-preview 0.9.6 → 0.9.8

package/dist/index.js

@@ -1,2 +1,2 @@
-import { a as MONO, c as TIMES, d as substituteFamily, l as defaultMeasurer, n as renderSlideSvg, o as SANS, r as ARIAL, s as SERIF, t as auditTextLayout } from "./src-Co9vu5ZE.js";
+import { a as MONO, c as TIMES, d as substituteFamily, l as defaultMeasurer, n as renderSlideSvg, o as SANS, r as ARIAL, s as SERIF, t as auditTextLayout } from "./src-B73Pj0gv.js";
 export { ARIAL, MONO, SANS, SERIF, TIMES, auditTextLayout, defaultMeasurer, renderSlideSvg as renderSlideToSvg, substituteFamily };

package/dist/node.js

@@ -1,4 +1,4 @@
-import { a as MONO, c as TIMES, d as substituteFamily, i as AVG_GLYPH_W_RATIO, l as defaultMeasurer, n as renderSlideSvg, o as SANS, r as ARIAL, s as SERIF, t as auditTextLayout, u as isCjk } from "./src-Co9vu5ZE.js";
+import { a as MONO, c as TIMES, d as substituteFamily, i as AVG_GLYPH_W_RATIO, l as defaultMeasurer, n as renderSlideSvg, o as SANS, r as ARIAL, s as SERIF, t as auditTextLayout, u as isCjk } from "./src-B73Pj0gv.js";
 import { getSlideSize } from "@office-kit/pptx";
 import { Resvg } from "@resvg/resvg-js";
 import * as fontkit from "fontkit";

package/dist/{src-Co9vu5ZE.js → src-B73Pj0gv.js}

@@ -2298,7 +2298,7 @@ const buildBullet = (a, para, pi) => {
 	const char = para.bulletIsPicture ? "■" : numberLabel ?? explicitChar ?? bulletChar(para.level);
 	const baseSizePx = (para.runs.find((r) => r.text !== "\n" && r.text !== "")?.sizePt ?? a.defaultPt) * PX_PER_PT * a.autoFitScale;
 	const sizePx = para.bulletDetail.sizePct !== null ? baseSizePx * para.bulletDetail.sizePct : para.bulletDetail.sizePts !== null ? para.bulletDetail.sizePts * PX_PER_PT * a.autoFitScale : baseSizePx;
-	const fillHex = para.bulletDetail.color ? resolveColor(para.bulletDetail.color, a.theme, "#000000") : a.defaultColor;
+	const fillHex = bulletFillOf(para, a.theme, a.defaultColor);
 	return {
 		text: char,
 		family: (a.resolveFamily ?? substituteFamily)(para.bulletDetail.font ?? DEFAULT_BULLET_FONT),
@@ -2307,6 +2307,11 @@ const buildBullet = (a, para, pi) => {
 		...para.bulletImageHref ? { imageHref: para.bulletImageHref } : {}
 	};
 };
+const bulletFillOf = (para, theme, defaultColor) => {
+	if (para.bulletDetail.color) return resolveColor(para.bulletDetail.color, theme, "#000000");
+	const runColor = para.runs.find((r) => r.text !== "\n" && r.text !== "")?.fmt?.color;
+	return runColor === void 0 || runColor === null ? defaultColor : resolveColor(runColor, theme, defaultColor);
+};
 const presetTextRect = (preset) => {
 	switch (preset) {
 		case "triangle": return {
@@ -2539,24 +2544,22 @@ const resolveTextBodyModel = (pres, shape, bounds, theme, phType, measure, defau
 	LINE_HEIGHT * lineHeightScale;
 	const numberLabels = Array.from({ length: paraData.length }, () => null);
 	{
-		let counter = 0;
-		let activeLevel = -1;
-		let activeType = null;
+		const counters = [];
+		const types = [];
 		for (let i = 0; i < paraData.length; i++) {
 			const para = paraData[i];
 			const num = bulletAutoNumType(para.bulletStyle);
-			if (num === null) {
-				counter = 0;
-				activeLevel = -1;
-				activeType = null;
-				continue;
+			const level = Math.max(0, para.level);
+			for (let l = num === null ? level : level + 1; l < counters.length; l++) {
+				counters[l] = 0;
+				types[l] = null;
 			}
-			if (para.level !== activeLevel || num !== activeType) {
-				counter = 1;
-				activeLevel = para.level;
-				activeType = num;
-			} else counter += 1;
-			numberLabels[i] = formatAutoNum(num, counter);
+			if (num === null) continue;
+			if (types[level] !== num) {
+				counters[level] = 1;
+				types[level] = num;
+			} else counters[level] = (counters[level] ?? 0) + 1;
+			numberLabels[i] = formatAutoNum(num, counters[level]);
 		}
 	}
 	if (authoredAutofit && autoFitScale === 1) {
@@ -2620,6 +2623,7 @@ const renderTextBody = (pres, shape, bounds, theme, phType, ctx) => {
 	const model = resolveTextBodyModel(pres, shape, bounds, theme, phType, ctx.measure, activeDeckTextColor);
 	if (model === null) return "";
 	const { paraData, numberLabels, authoredAutofit, autoFitScale, defaultPt, themeFace, effectiveDefaultFont, effectiveBody, anchor, innerX, innerY, innerW, innerH, svgTextRect } = model;
+	const defaultColor = activeDeckTextColor;
 	const paragraphs = [];
 	for (let pi = 0; pi < paraData.length; pi++) {
 		const para = paraData[pi];
@@ -2675,7 +2679,7 @@ const renderTextBody = (pres, shape, bounds, theme, phType, ctx) => {
 		} else if (showBullet) {
 			const char = para.bulletIsPicture ? "■" : numberLabel ?? explicitChar ?? bulletChar(para.level);
 			const bulletStyles = [`margin-right:${(.4 * defaultPt * PX_PER_PT * autoFitScale).toFixed(2)}px`];
-			if (para.bulletDetail.color) bulletStyles.push(`color:${resolveColor(para.bulletDetail.color, theme, "#000000")}`);
+			bulletStyles.push(`color:${bulletFillOf(para, theme, defaultColor)}`);
 			if (para.bulletDetail.sizePct !== null) bulletStyles.push(`font-size:${(para.bulletDetail.sizePct * 100).toFixed(1)}%`);
 			else if (para.bulletDetail.sizePts !== null) bulletStyles.push(`font-size:${(para.bulletDetail.sizePts * PX_PER_PT * autoFitScale).toFixed(2)}px`);
 			else bulletStyles.push(`font-size:${baseBulletPx.toFixed(2)}px`);
@@ -2685,7 +2689,6 @@ const renderTextBody = (pres, shape, bounds, theme, phType, ctx) => {
 		paragraphs.push(`<p style="${pStyles.join(";")}">${prefix}${runHtmls.join("") || "&#8203;"}</p>`);
 	}
 	const justify = ANCHOR_TO_CSS[anchor] ?? "flex-start";
-	const defaultColor = activeDeckTextColor;
 	if (ctx.mode === "svg") {
 		const svgLineScale = 1 - (authoredAutofit?.lnSpcReduction ?? 0);
 		const svgVert = verticalLayoutOf(effectiveBody.vert ?? getShapeTextDirection(shape));
@@ -4407,12 +4410,21 @@ const renderShape = (shape, pres, theme, ctx) => {
 	const transform = transforms.length > 0 ? ` transform="${transforms.join(" ")}"` : "";
 	const textRotation = (flip.vertical ? rotation + 180 : rotation) % 360;
 	const textTransform = textRotation !== 0 ? ` transform="rotate(${textRotation} ${E(cx)} ${E(cy)})"` : "";
-	const textOverlay = kind === "shape" || kind === "graphicFrame" ? renderTextBody(pres, shape, {
+	const { sx: gsx, sy: gsy } = ctx.groupScale;
+	const groupScaled = gsx !== 1 || gsy !== 1;
+	const textBounds = groupScaled ? {
+		x: x * gsx,
+		y: y * gsy,
+		w: w * gsx,
+		h: h * gsy
+	} : {
 		x,
 		y,
 		w,
 		h
-	}, theme, phType, ctx) : "";
+	};
+	const rawTextOverlay = kind === "shape" || kind === "graphicFrame" ? renderTextBody(pres, shape, textBounds, theme, phType, ctx) : "";
+	const textOverlay = rawTextOverlay !== "" && groupScaled ? `<g transform="scale(${(1 / gsx).toFixed(6)} ${(1 / gsy).toFixed(6)})">${rawTextOverlay}</g>` : rawTextOverlay;
 	if (kind === "picture") return renderPicture(shape, pres, x, y, w, h, transform, textOverlay, getShapeImageBytes(shape), getShapeImageFormat(shape));
 	if (kind === "shape" && fill.kind === "image") return renderPicture(shape, pres, x, y, w, h, transform, textOverlay, getShapeImageFillBytes(shape), getShapeImageFormat(shape));
 	if (kind === "connector") {
@@ -4469,6 +4481,8 @@ const renderShape = (shape, pres, theme, ctx) => {
 		const children = getGroupChildren(shape);
 		if (children.length === 0) return "";
 		const tParts = [];
+		let groupScaleX = 1;
+		let groupScaleY = 1;
 		if (xform && rotation !== 0) {
 			const cxG = (xform.outer.x + xform.outer.w / 2) / EMU_PER_PX;
 			const cyG = (xform.outer.y + xform.outer.h / 2) / EMU_PER_PX;
@@ -4491,13 +4505,23 @@ const renderShape = (shape, pres, theme, ctx) => {
 			const iy = xform.inner.y;
 			const iw = xform.inner.w || 1;
 			const ih = xform.inner.h || 1;
-			const sx = (ow / iw).toFixed(6);
-			const sy = (oh / ih).toFixed(6);
+			groupScaleX = ow / iw;
+			groupScaleY = oh / ih;
+			const sx = groupScaleX.toFixed(6);
+			const sy = groupScaleY.toFixed(6);
 			const tx = ((ox - ix * (ow / iw)) / EMU_PER_PX).toFixed(2);
 			const ty = ((oy - iy * (oh / ih)) / EMU_PER_PX).toFixed(2);
 			tParts.push(`translate(${tx} ${ty})`, `scale(${sx} ${sy})`);
 		}
-		return `<g${tParts.length > 0 ? ` transform="${tParts.join(" ")}"` : ""}>${children.map((c) => renderShape(c, pres, theme, ctx)).join("")}</g>`;
+		const groupTransform = tParts.length > 0 ? ` transform="${tParts.join(" ")}"` : "";
+		const childCtx = groupScaleX === 1 && groupScaleY === 1 ? ctx : {
+			...ctx,
+			groupScale: {
+				sx: ctx.groupScale.sx * groupScaleX,
+				sy: ctx.groupScale.sy * groupScaleY
+			}
+		};
+		return `<g${groupTransform}>${children.map((c) => renderShape(c, pres, theme, childCtx)).join("")}</g>`;
 	}
 	const p = paint(shape, fill, stroke, theme, phType !== null, pres);
 	if (kind === "graphicFrame") {
@@ -4716,6 +4740,10 @@ const renderSlideSvg = (pres, slide, opts = {}) => {
 	activeColorMap = getEffectiveColorMap(slide);
 	activeDeckTextColor = resolveDeckBodyTextColor(slide) ?? "#000000";
 	const ctx = {
+		groupScale: {
+			sx: 1,
+			sy: 1
+		},
 		mode: opts.textLayout ?? "foreignObject",
 		measure: opts.measureText ?? defaultMeasurer
 	};
@@ -4963,4 +4991,4 @@ const auditTextLayout = (pres, options = {}) => {
 //#endregion
 export { MONO as a, TIMES as c, substituteFamily as d, AVG_GLYPH_W_RATIO as i, defaultMeasurer as l, renderSlideSvg as n, SANS as o, ARIAL as r, SERIF as s, auditTextLayout as t, isCjk as u };
 
-//# sourceMappingURL=src-Co9vu5ZE.js.map
+//# sourceMappingURL=src-B73Pj0gv.js.map