@office-kit/pptx-preview 0.9.7 → 0.9.9

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-BCN48I0D.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-DRrBZ3XZ.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-BCN48I0D.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-DRrBZ3XZ.js";
 import { getSlideSize } from "@office-kit/pptx";
 import { Resvg } from "@resvg/resvg-js";
 import * as fontkit from "fontkit";

package/dist/{src-BCN48I0D.js → src-DRrBZ3XZ.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 {
@@ -2618,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];
@@ -2673,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`);
@@ -2683,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));
@@ -2776,7 +2781,7 @@ const accentSequence = (theme) => {
 	return hexes.length > 0 ? hexes : fallbacks;
 };
 const DEFAULT_CHART_TITLE_PT = 13;
-const layoutChart = (xEmu, yEmu, wEmu, hEmu, hasTitle, hasAxes, titleOverlay = false, legendOverlay = false, hasLegend = true, titlePx = DEFAULT_CHART_TITLE_PT * PX_PER_PT) => {
+const layoutChart = (xEmu, yEmu, wEmu, hEmu, hasTitle, hasAxes, titleOverlay = false, legendOverlay = false, hasLegend = true, titlePx = DEFAULT_CHART_TITLE_PT * PX_PER_PT, plotAreaLayout) => {
 	const x = xEmu / EMU_PER_PX;
 	const y = yEmu / EMU_PER_PX;
 	const w = wEmu / EMU_PER_PX;
@@ -2786,15 +2791,18 @@ const layoutChart = (xEmu, yEmu, wEmu, hEmu, hasTitle, hasAxes, titleOverlay = f
 	const padding = 8;
 	const yAxisGutter = hasAxes ? 32 : 0;
 	const xAxisGutter = hasAxes ? 18 : 0;
+	const inner = plotAreaLayout?.target === "inner" ? plotAreaLayout : void 0;
+	const plotX = inner ? x + Math.max(0, Math.min(1, inner.x)) * w : x + padding + yAxisGutter;
+	const plotY = inner ? y + Math.max(0, Math.min(1, inner.y)) * h : y + titleStrip + padding;
 	return {
 		x,
 		y,
 		w,
 		h,
-		plotX: x + padding + yAxisGutter,
-		plotY: y + titleStrip + padding,
-		plotW: Math.max(0, w - 2 * padding - yAxisGutter),
-		plotH: Math.max(0, h - titleStrip - legendStrip - xAxisGutter - 2 * padding),
+		plotX,
+		plotY,
+		plotW: inner ? Math.max(0, Math.min(x + w, x + (inner.x + inner.w) * w) - plotX) : Math.max(0, w - 2 * padding - yAxisGutter),
+		plotH: inner ? Math.max(0, Math.min(y + h, y + (inner.y + inner.h) * h) - plotY) : Math.max(0, h - titleStrip - legendStrip - xAxisGutter - 2 * padding),
 		titleY: y + (titleOverlay ? 14 : padding + titlePx * .7),
 		legendY: y + h - (legendOverlay ? 18 : legendStrip / 2)
 	};
@@ -2883,6 +2891,7 @@ const DISPLAY_UNIT_LABEL = {
 const DEFAULT_AXIS_COLOR = "#000000";
 const DEFAULT_GRID_COLOR = "#D9D9D9";
 const AXIS_TICK_LEN = 5;
+const AXIS_MINOR_TICK_LEN = 3;
 const chartFontPx = (sizePt) => (sizePt * PX_PER_PT).toFixed(1);
 const axisTickAttrs = (style) => {
 	const sz = style?.sizePt ?? 10;
@@ -2944,7 +2953,7 @@ const renderValueAxis = (f, axis) => {
 			out.push(`<text x="${px(lblX)}" y="${px(lblY)}" text-anchor="middle" font-family="sans-serif" font-size="9" fill="#6B7280" font-style="italic" transform="rotate(-90 ${px(lblX)} ${px(lblY)})">${escapeXml(lbl)}</text>`);
 		} else out.push(`<text x="${px(f.plotX + f.plotW)}" y="${px(f.plotY + f.plotH + 22)}" text-anchor="end" font-family="sans-serif" font-size="9" fill="#6B7280" font-style="italic">${escapeXml(lbl)}</text>`);
 	}
-	if (axis.orientation === "vertical") out.push(`<line x1="${px(f.plotX)}" y1="${px(f.plotY)}" x2="${px(f.plotX)}" y2="${px(f.plotY + f.plotH)}" stroke="${axisColor}" stroke-width="1"/>`);
+	if (!axis.lineHidden) if (axis.orientation === "vertical") out.push(`<line x1="${px(f.plotX)}" y1="${px(f.plotY)}" x2="${px(f.plotX)}" y2="${px(f.plotY + f.plotH)}" stroke="${axisColor}" stroke-width="1"/>`);
 	else {
 		const zeroY = f.plotY + f.plotH - (0 - axis.min) / range * f.plotH;
 		const spineY = axis.min <= 0 && axis.max >= 0 ? zeroY : f.plotY + f.plotH;
@@ -2952,7 +2961,7 @@ const renderValueAxis = (f, axis) => {
 	}
 	return out.join("");
 };
-const renderCategoryAxis = (f, orientation, cats, pointCount, skip = 1, labelStyle, labelRotationDeg, labelAlign, lineColor) => {
+const renderCategoryAxis = (f, orientation, cats, pointCount, skip = 1, labelStyle, labelRotationDeg, labelAlign, lineColor, lineHidden = false, majorTickMark = "out", minorTickMark = "none") => {
 	const labels = [];
 	for (let i = 0; i < pointCount; i++) labels.push(cats[i] ?? (i + 1).toString());
 	const out = [];
@@ -2981,22 +2990,23 @@ const renderCategoryAxis = (f, orientation, cats, pointCount, skip = 1, labelSty
 		}
 	}
 	const axisColor = lineColor ?? DEFAULT_AXIS_COLOR;
-	if (orientation === "horizontal") {
-		const baseY = f.plotY + f.plotH;
-		out.push(`<line x1="${px(f.plotX)}" y1="${px(baseY)}" x2="${px(f.plotX + f.plotW)}" y2="${px(baseY)}" stroke="${axisColor}" stroke-width="1"/>`);
-		const stepB = pointCount > 0 ? f.plotW / pointCount : 0;
-		for (let i = 0; i <= pointCount; i++) {
-			const bx = f.plotX + i * stepB;
-			out.push(`<line x1="${px(bx)}" y1="${px(baseY)}" x2="${px(bx)}" y2="${px(baseY + AXIS_TICK_LEN)}" stroke="${axisColor}" stroke-width="1"/>`);
+	const horizontal = orientation === "horizontal";
+	const edge = horizontal ? f.plotY + f.plotH : f.plotX;
+	const start = horizontal ? f.plotX : f.plotY;
+	const span = horizontal ? f.plotW : f.plotH;
+	if (!lineHidden) out.push(horizontal ? `<line x1="${px(start)}" y1="${px(edge)}" x2="${px(start + span)}" y2="${px(edge)}" stroke="${axisColor}" stroke-width="1"/>` : `<line x1="${px(edge)}" y1="${px(start)}" x2="${px(edge)}" y2="${px(start + span)}" stroke="${axisColor}" stroke-width="1"/>`);
+	const step = pointCount > 0 ? span / pointCount : 0;
+	const ticks = (mark, length, offset) => {
+		if (mark === "none") return;
+		const outward = mark === "in" ? 0 : length;
+		const inward = mark === "out" ? 0 : -length;
+		for (let i = offset; i <= pointCount; i++) {
+			const pos = start + i * step;
+			out.push(horizontal ? `<line x1="${px(pos)}" y1="${px(edge + outward)}" x2="${px(pos)}" y2="${px(edge + inward)}" stroke="${axisColor}" stroke-width="1"/>` : `<line x1="${px(edge - outward)}" y1="${px(pos)}" x2="${px(edge - inward)}" y2="${px(pos)}" stroke="${axisColor}" stroke-width="1"/>`);
 		}
-	} else {
-		out.push(`<line x1="${px(f.plotX)}" y1="${px(f.plotY)}" x2="${px(f.plotX)}" y2="${px(f.plotY + f.plotH)}" stroke="${axisColor}" stroke-width="1"/>`);
-		const stepB = pointCount > 0 ? f.plotH / pointCount : 0;
-		for (let i = 0; i <= pointCount; i++) {
-			const by = f.plotY + i * stepB;
-			out.push(`<line x1="${px(f.plotX - AXIS_TICK_LEN)}" y1="${px(by)}" x2="${px(f.plotX)}" y2="${px(by)}" stroke="${axisColor}" stroke-width="1"/>`);
-		}
-	}
+	};
+	ticks(majorTickMark, AXIS_TICK_LEN, 0);
+	ticks(minorTickMark, AXIS_MINOR_TICK_LEN, .5);
 	return out.join("");
 };
 const seriesMinMax = (spec) => {
@@ -3108,6 +3118,7 @@ const pointCount = (spec) => {
 	for (const s of spec.series) if (s.values.length > n) n = s.values.length;
 	return n;
 };
+const chartFillOpacityAttr = (opacity = 1) => opacity === 1 ? "" : ` fill-opacity="${opacity.toFixed(3)}"`;
 const renderColumnChart = (f, spec, colors) => {
 	const N = pointCount(spec);
 	if (N === 0 || spec.series.length === 0) return "";
@@ -3143,7 +3154,7 @@ const renderColumnChart = (f, spec, colors) => {
 			const y0 = f.plotY + f.plotH - (Math.max(stackedTop, stackedBase) - min) / range * f.plotH;
 			const y1 = f.plotY + f.plotH - (Math.min(stackedTop, stackedBase) - min) / range * f.plotH;
 			const h = Math.abs(y1 - y0);
-			out.push(`<rect x="${px(x0)}" y="${px(y0)}" width="${px(barW)}" height="${px(h)}" fill="${spec.series[s]?.color ?? colors[s % colors.length]}"/>`);
+			out.push(`<rect x="${px(x0)}" y="${px(y0)}" width="${px(barW)}" height="${px(h)}" fill="${spec.series[s]?.color ?? colors[s % colors.length]}"${chartFillOpacityAttr(spec.series[s]?.fillOpacity)}/>`);
 			if (showLabelFor(s) && Math.abs(v) > 0) {
 				const labelY = (y0 + y1) / 2 + 3;
 				const labelText = isPercent ? `${Math.round(v * 100)}%` : formatDataLabelValue(spec, s, v);
@@ -3164,7 +3175,7 @@ const renderColumnChart = (f, spec, colors) => {
 			const h = Math.abs(top - baseY);
 			const baseColor = spec.series[s]?.pointColors?.[c] ?? (spec.varyColors && spec.series.length === 1 ? colors[c % colors.length] : spec.series[s]?.color ?? colors[s % colors.length]);
 			const fillColor = v < 0 && spec.series[s]?.invertIfNegative ? mixHex(baseColor, "#000000", .55) : baseColor;
-			out.push(`<rect x="${px(x0)}" y="${px(y0)}" width="${px(barW)}" height="${px(h)}" fill="${fillColor}"/>`);
+			out.push(`<rect x="${px(x0)}" y="${px(y0)}" width="${px(barW)}" height="${px(h)}" fill="${fillColor}"${chartFillOpacityAttr(spec.series[s]?.fillOpacity)}/>`);
 			if (showLabelFor(s)) {
 				const pos = spec.series[s]?.dataLabels?.position ?? spec.dataLabels?.position;
 				let labelY;
@@ -3183,7 +3194,7 @@ const renderColumnChart = (f, spec, colors) => {
 			}
 		}
 	}
-	out.push(`<line x1="${px(f.plotX)}" y1="${px(baseY)}" x2="${px(f.plotX + f.plotW)}" y2="${px(baseY)}" stroke="#9CA3AF" stroke-width="0.5"/>`);
+	if (!(spec.categoryAxisHidden || spec.categoryAxisLineHidden)) out.push(`<line x1="${px(f.plotX)}" y1="${px(baseY)}" x2="${px(f.plotX + f.plotW)}" y2="${px(baseY)}" stroke="#9CA3AF" stroke-width="0.5"/>`);
 	for (let s = 0; s < spec.series.length; s++) {
 		const series = spec.series[s];
 		if (!series?.trendline) continue;
@@ -3386,7 +3397,7 @@ const renderBarChart = (f, spec, colors) => {
 			const x0 = f.plotX + (Math.min(base, stackedTop) - min) / range * f.plotW;
 			const x1 = f.plotX + (Math.max(base, stackedTop) - min) / range * f.plotW;
 			const w = Math.abs(x1 - x0);
-			out.push(`<rect x="${px(x0)}" y="${px(y0)}" width="${px(w)}" height="${px(barH)}" fill="${spec.series[s]?.color ?? colors[s % colors.length]}"/>`);
+			out.push(`<rect x="${px(x0)}" y="${px(y0)}" width="${px(w)}" height="${px(barH)}" fill="${spec.series[s]?.color ?? colors[s % colors.length]}"${chartFillOpacityAttr(spec.series[s]?.fillOpacity)}/>`);
 			if (showLabelForBar(s) && Math.abs(v) > 0) {
 				const labelX = (x0 + x1) / 2;
 				const labelText = isPercent ? `${Math.round(v * 100)}%` : formatDataLabelValue(spec, s, v);
@@ -3407,7 +3418,7 @@ const renderBarChart = (f, spec, colors) => {
 			const w = Math.abs(tip - baseX);
 			const baseColor = spec.series[s]?.pointColors?.[c] ?? (spec.varyColors && spec.series.length === 1 ? colors[c % colors.length] : spec.series[s]?.color ?? colors[s % colors.length]);
 			const fillColor = v < 0 && spec.series[s]?.invertIfNegative ? mixHex(baseColor, "#000000", .55) : baseColor;
-			out.push(`<rect x="${px(x0)}" y="${px(y0)}" width="${px(w)}" height="${px(barH)}" fill="${fillColor}"/>`);
+			out.push(`<rect x="${px(x0)}" y="${px(y0)}" width="${px(w)}" height="${px(barH)}" fill="${fillColor}"${chartFillOpacityAttr(spec.series[s]?.fillOpacity)}/>`);
 			if (showLabelForBar(s)) {
 				const pos = spec.series[s]?.dataLabels?.position ?? spec.dataLabels?.position;
 				let labelX;
@@ -3433,7 +3444,7 @@ const renderBarChart = (f, spec, colors) => {
 			}
 		}
 	}
-	out.push(`<line x1="${px(baseX)}" y1="${px(f.plotY)}" x2="${px(baseX)}" y2="${px(f.plotY + f.plotH)}" stroke="#9CA3AF" stroke-width="0.5"/>`);
+	if (!(spec.categoryAxisHidden || spec.categoryAxisLineHidden)) out.push(`<line x1="${px(baseX)}" y1="${px(f.plotY)}" x2="${px(baseX)}" y2="${px(f.plotY + f.plotH)}" stroke="#9CA3AF" stroke-width="0.5"/>`);
 	return out.join("");
 };
 const renderLineChart = (f, spec, colors, fill) => {
@@ -3448,7 +3459,7 @@ const renderLineChart = (f, spec, colors, fill) => {
 	const xAt = (c) => fill ? f.plotX + c * band : f.plotX + (c + .5) * band;
 	const baseY = f.plotY + f.plotH - (0 - min) / range * f.plotH;
 	const out = [];
-	out.push(`<line x1="${px(f.plotX)}" y1="${px(baseY)}" x2="${px(f.plotX + f.plotW)}" y2="${px(baseY)}" stroke="#E5E7EB" stroke-width="0.5"/>`);
+	if (!(spec.categoryAxisHidden || spec.categoryAxisLineHidden)) out.push(`<line x1="${px(f.plotX)}" y1="${px(baseY)}" x2="${px(f.plotX + f.plotW)}" y2="${px(baseY)}" stroke="#E5E7EB" stroke-width="0.5"/>`);
 	const accumulated = Array.from({ length: N }, () => 0);
 	const perSeries = [];
 	for (let s = 0; s < spec.series.length; s++) {
@@ -3723,14 +3734,16 @@ const renderScatterAxes = (f, spec, xB, yB) => {
 		orientation: "vertical",
 		min: yB.min,
 		max: yB.max,
+		...spec.valueAxisLineHidden !== void 0 ? { lineHidden: spec.valueAxisLineHidden } : {},
 		...spec.valueAxis?.numberFormat !== void 0 ? { numberFormat: spec.valueAxis.numberFormat } : {}
 	};
 	const xAxis = {
 		orientation: "horizontal",
 		min: xB.min,
-		max: xB.max
+		max: xB.max,
+		...spec.categoryAxisLineHidden !== void 0 ? { lineHidden: spec.categoryAxisLineHidden } : {}
 	};
-	return renderValueAxis(f, yAxis) + renderValueAxis(f, xAxis);
+	return (spec.valueAxisHidden ? "" : renderValueAxis(f, yAxis)) + (spec.categoryAxisHidden ? "" : renderValueAxis(f, xAxis));
 };
 const renderScatterChart = (f, spec, colors) => {
 	const perSeries = spec.series.map((s) => xyPoints(s));
@@ -3905,7 +3918,7 @@ const renderChart = (shape, x, y, w, h, transform, theme) => {
 	const isCartesian = spec.kind === "column" || spec.kind === "bar" || spec.kind === "line" || spec.kind === "area";
 	const hasAxes = isCartesian || spec.kind === "scatter" || spec.kind === "bubble";
 	const hasLegend = spec.legend !== void 0 && spec.legend.position !== null;
-	const f = layoutChart(x, y, w, h, !!spec.title, hasAxes, spec.titleOverlay ?? false, spec.legend?.overlay ?? false, hasLegend, (spec.titleStyle?.sizePt ?? DEFAULT_CHART_TITLE_PT) * PX_PER_PT);
+	const f = layoutChart(x, y, w, h, !!spec.title, hasAxes, spec.titleOverlay ?? false, spec.legend?.overlay ?? false, hasLegend, (spec.titleStyle?.sizePt ?? DEFAULT_CHART_TITLE_PT) * PX_PER_PT, spec.plotAreaLayout);
 	const allNamesForLegend = spec.kind === "pie" || spec.kind === "doughnut" ? Array.from(spec.categories) : spec.series.map((s) => s.name);
 	const allColorsForLegend = spec.kind === "pie" || spec.kind === "doughnut" ? spec.categories.map((_, i) => spec.series[0]?.pointColors?.[i] ?? spec.series[0]?.color ?? colors[i % colors.length] ?? "#888") : spec.series.map((s, i) => s.color ?? colors[i % colors.length] ?? "#888");
 	const hiddenSet = new Set(spec.legend?.hiddenIndices ?? []);
@@ -3940,6 +3953,9 @@ const renderChart = (shape, x, y, w, h, transform, theme) => {
 			min: primaryScale.min,
 			max: primaryScale.max,
 			majorUnit: spec.valueAxis?.majorUnit ?? primaryScale.step,
+			...spec.valueAxisLineHidden !== void 0 ? { lineHidden: spec.valueAxisLineHidden } : {},
+			...spec.valueAxisLineColor !== void 0 ? { lineColor: spec.valueAxisLineColor } : {},
+			...spec.valueAxisMajorTickMark !== void 0 ? { majorTickMark: spec.valueAxisMajorTickMark } : {},
 			...spec.valueAxis?.numberFormat !== void 0 ? { numberFormat: spec.valueAxis.numberFormat } : {},
 			...spec.valueAxisMajorGridlines !== void 0 ? { majorGridlines: spec.valueAxisMajorGridlines } : {},
 			...spec.valueAxisLabelStyle !== void 0 ? { labelStyle: spec.valueAxisLabelStyle } : {}
@@ -3953,7 +3969,7 @@ const renderChart = (shape, x, y, w, h, transform, theme) => {
 			majorGridlines: false,
 			...spec.valueAxisLabelStyle !== void 0 ? { labelStyle: spec.valueAxisLabelStyle } : {}
 		});
-		if (N > 0 && !(spec.categoryAxisHidden || spec.categoryAxisTickLabelPos === "none")) axes += renderCategoryAxis(f, "horizontal", spec.categories, N, spec.categoryAxisTickLabelSkip ?? 1, spec.categoryAxisLabelStyle, spec.categoryAxisLabelRotationDeg, spec.categoryAxisLabelAlign, spec.categoryAxisLineColor);
+		if (N > 0 && !(spec.categoryAxisHidden || spec.categoryAxisTickLabelPos === "none")) axes += renderCategoryAxis(f, "horizontal", spec.categories, N, spec.categoryAxisTickLabelSkip ?? 1, spec.categoryAxisLabelStyle, spec.categoryAxisLabelRotationDeg, spec.categoryAxisLabelAlign, spec.categoryAxisLineColor, spec.categoryAxisLineHidden, spec.categoryAxisMajorTickMark, spec.categoryAxisMinorTickMark);
 		const groups = /* @__PURE__ */ new Map();
 		for (const s of baked) {
 			const kind = s.chartKind ?? spec.kind;
@@ -3988,6 +4004,7 @@ const renderChart = (shape, x, y, w, h, transform, theme) => {
 		const majorUnit = spec.valueAxis?.majorUnit ?? step;
 		const numberFormat = spec.valueAxis?.numberFormat;
 		const axisExtras = {
+			...spec.valueAxisLineHidden !== void 0 ? { lineHidden: spec.valueAxisLineHidden } : {},
 			...majorUnit !== void 0 ? { majorUnit } : {},
 			...numberFormat !== void 0 ? { numberFormat } : {},
 			...spec.valueAxisMajorGridlines !== void 0 ? { majorGridlines: spec.valueAxisMajorGridlines } : {},
@@ -4014,7 +4031,7 @@ const renderChart = (shape, x, y, w, h, transform, theme) => {
 		};
 		if (!spec.valueAxisHidden) axes = renderValueAxis(f, valueAxis);
 		const labelsHidden = spec.categoryAxisHidden || spec.categoryAxisTickLabelPos === "none";
-		if (N > 0 && !labelsHidden) axes += renderCategoryAxis(f, spec.kind === "bar" ? "vertical" : "horizontal", spec.categories, N, spec.categoryAxisTickLabelSkip ?? 1, spec.categoryAxisLabelStyle, spec.categoryAxisLabelRotationDeg, spec.categoryAxisLabelAlign, spec.categoryAxisLineColor);
+		if (N > 0 && !labelsHidden) axes += renderCategoryAxis(f, spec.kind === "bar" ? "vertical" : "horizontal", spec.categories, N, spec.categoryAxisTickLabelSkip ?? 1, spec.categoryAxisLabelStyle, spec.categoryAxisLabelRotationDeg, spec.categoryAxisLabelAlign, spec.categoryAxisLineColor, spec.categoryAxisLineHidden, spec.categoryAxisMajorTickMark, spec.categoryAxisMinorTickMark);
 	}
 	if (!isCombo) switch (spec.kind) {
 		case "column":
@@ -4405,12 +4422,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") {
@@ -4467,6 +4493,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;
@@ -4489,13 +4517,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") {
@@ -4714,6 +4752,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
 	};
@@ -4961,4 +5003,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-BCN48I0D.js.map
+//# sourceMappingURL=src-DRrBZ3XZ.js.map