@office-kit/pptx-preview 0.17.0 → 0.18.0

package/dist/index.js

@@ -1,2 +1,2 @@
-import { S as shapeTextRect, _ as paragraphNumberLabels, a as renderSlideSvg, b as verticalTextStyle, d as SERIF, f as TIMES, g as decimalSeparatorOf, h as substituteFamily, i as renderSlideLayoutSvg, l as MONO, n as shapeTextAnchorOffset, o as renderTextEffectsSvg, p as defaultMeasurer, r as auditTextLayout, s as ARIAL, t as shapeAutoFitScale, u as SANS, v as textUnderlineStyle, x as resolveTextBodyRect, y as textColumnsStyle } from "./src-ayE1F9lH.js";
+import { S as shapeTextRect, _ as paragraphNumberLabels, a as renderSlideSvg, b as verticalTextStyle, d as SERIF, f as TIMES, g as decimalSeparatorOf, h as substituteFamily, i as renderSlideLayoutSvg, l as MONO, n as shapeTextAnchorOffset, o as renderTextEffectsSvg, p as defaultMeasurer, r as auditTextLayout, s as ARIAL, t as shapeAutoFitScale, u as SANS, v as textUnderlineStyle, x as resolveTextBodyRect, y as textColumnsStyle } from "./src-BGzSNWjt.js";
 export { ARIAL, MONO, SANS, SERIF, TIMES, auditTextLayout, decimalSeparatorOf, defaultMeasurer, paragraphNumberLabels, renderSlideLayoutSvg as renderSlideLayoutToSvg, renderSlideSvg as renderSlideToSvg, renderTextEffectsSvg, resolveTextBodyRect, shapeAutoFitScale, shapeTextAnchorOffset, shapeTextRect, substituteFamily, textColumnsStyle, textUnderlineStyle, verticalTextStyle };

package/dist/node.js

@@ -1,4 +1,4 @@
-import { S as shapeTextRect, _ as paragraphNumberLabels, a as renderSlideSvg, b as verticalTextStyle, c as AVG_GLYPH_W_RATIO, d as SERIF, f as TIMES, g as decimalSeparatorOf, h as substituteFamily, i as renderSlideLayoutSvg, l as MONO, m as isCjk, n as shapeTextAnchorOffset, o as renderTextEffectsSvg, p as defaultMeasurer, r as auditTextLayout, s as ARIAL, t as shapeAutoFitScale, u as SANS, v as textUnderlineStyle, x as resolveTextBodyRect, y as textColumnsStyle } from "./src-ayE1F9lH.js";
+import { S as shapeTextRect, _ as paragraphNumberLabels, a as renderSlideSvg, b as verticalTextStyle, c as AVG_GLYPH_W_RATIO, d as SERIF, f as TIMES, g as decimalSeparatorOf, h as substituteFamily, i as renderSlideLayoutSvg, l as MONO, m as isCjk, n as shapeTextAnchorOffset, o as renderTextEffectsSvg, p as defaultMeasurer, r as auditTextLayout, s as ARIAL, t as shapeAutoFitScale, u as SANS, v as textUnderlineStyle, x as resolveTextBodyRect, y as textColumnsStyle } from "./src-BGzSNWjt.js";
 import { getSlideSize } from "@office-kit/pptx";
 import { Resvg } from "@resvg/resvg-js";
 import * as fontkit from "fontkit";

package/dist/{src-ayE1F9lH.js → src-BGzSNWjt.js}

@@ -2526,6 +2526,7 @@ const renderRun = (text, format, theme, effectivePt, defaultColor, _wasDefault =
 	return `<span style="${styles.join(";")}">${content}</span>`;
 };
 const LINE_HEIGHT = 1.05;
+const NO_AUTOSPACE = "text-autospace:no-autospace;";
 const AUTOFIT_FLOOR = .25;
 const AUTOFIT_STEP = .05;
 const decimalSeparatorField = (lang) => {
@@ -3272,7 +3273,7 @@ const renderTextBody = (pres, shape, bounds, theme, phType, ctx, output = "body"
 	const vertStyles = (writingMode ? `;${writingMode}${extraTransform}` : "") + colStyles;
 	const wrapStyle = effectiveBody.wrap === "none" ? "white-space:nowrap" : "word-break:break-word";
 	const content = paragraphs.join("");
-	const body = `<div xmlns="http://www.w3.org/1999/xhtml" style="display:flex;flex-direction:column;justify-content:${justify};width:100%;height:100%;box-sizing:border-box;overflow:visible;font-family:${effectiveDefaultFont};color:${defaultColor};${`translate:${model.anchorOffset.x}px ${model.anchorOffset.y}px;`}${wrapStyle}${vertStyles}">${content}</div>`;
+	const body = `<div xmlns="http://www.w3.org/1999/xhtml" style="display:flex;flex-direction:column;justify-content:${justify};width:100%;height:100%;box-sizing:border-box;overflow:visible;font-family:${effectiveDefaultFont};color:${defaultColor};${NO_AUTOSPACE}${`translate:${model.anchorOffset.x}px ${model.anchorOffset.y}px;`}${wrapStyle}${vertStyles}">${content}</div>`;
 	const foreign = `<foreignObject x="${E(innerX)}" y="${E(innerY)}" width="${E(innerW)}" height="${E(innerH)}" overflow="visible">${body}</foreignObject>`;
 	const hasCharacterEffect = bevel !== null || paraData.some((para) => para.runs.some((run) => run.fmt?.reflection !== void 0 && run.fmt.reflection !== null || run.fmt?.innerShadow !== void 0 && run.fmt.innerShadow !== null || hasPaintedTextFill(run)));
 	let reflectionOverlay = "";
@@ -3444,7 +3445,7 @@ const chartText = (f, x, y, attrs, content) => {
 	}
 	return `<text x="${px(x)}" y="${px(y)}" ${attrs}>${content}</text>`;
 };
-const layoutChart = (xEmu, yEmu, wEmu, hEmu, hasTitle, hasAxes, titleOverlay = false, legendOverlay = false, hasLegend = true, titlePx = DEFAULT_CHART_TITLE_PT * PX_PER_PT, plotAreaLayout) => {
+const layoutChart = (xEmu, yEmu, wEmu, hEmu, hasTitle, hasAxes, titleOverlay = false, legendOverlay = false, hasLegend = true, titlePx = DEFAULT_CHART_TITLE_PT * PX_PER_PT, plotAreaLayout, yAxisGutter = hasAxes ? DEFAULT_Y_AXIS_GUTTER : 0, xAxisGutter = hasAxes ? BAR_VALUE_LABEL_ROW : 0) => {
 	const x = xEmu / EMU_PER_PX;
 	const y = yEmu / EMU_PER_PX;
 	const w = wEmu / EMU_PER_PX;
@@ -3452,8 +3453,6 @@ const layoutChart = (xEmu, yEmu, wEmu, hEmu, hasTitle, hasAxes, titleOverlay = f
 	const titleStrip = hasTitle && !titleOverlay ? Math.round(titlePx * 2.4) : 0;
 	const legendStrip = hasLegend && !legendOverlay ? 18 : 0;
 	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;
@@ -3566,9 +3565,10 @@ const DEFAULT_AXIS_COLOR = "#000000";
 const DEFAULT_GRID_COLOR = "#D9D9D9";
 const AXIS_TICK_LEN = 5;
 const AXIS_MINOR_TICK_LEN = 3;
+const AXIS_LABEL_GAP = 3;
 const chartFontPx = (sizePt) => (sizePt * PX_PER_PT).toFixed(1);
 const axisTickAttrs = (style) => {
-	const sz = style?.sizePt ?? 10;
+	const sz = style?.sizePt ?? DEFAULT_AXIS_LABEL_PT;
 	const fill = style?.color ?? "#6B7280";
 	const weight = style?.bold ? " font-weight=\"600\"" : "";
 	const italic = style?.italic ? " font-style=\"italic\"" : "";
@@ -3617,7 +3617,8 @@ const renderValueAxis = (f, axis) => {
 			const tx2 = tickMark === "out" ? edgeX : edgeX + inward;
 			out.push(`<line x1="${px(tx1)}" y1="${px(yp)}" x2="${px(tx2)}" y2="${px(yp)}" stroke="${axisColor}" stroke-width="1"/>`);
 		}
-		const labelX = onRight ? edgeX + 4 : edgeX - 4;
+		const labelOffset = (tickMark === "out" || tickMark === "cross" ? tickLen : 0) + AXIS_LABEL_GAP;
+		const labelX = onRight ? edgeX + labelOffset : edgeX - labelOffset;
 		const rot = axis.labelRotationDeg ?? 0;
 		const transform = rot ? ` transform="rotate(${rot} ${px(labelX)} ${px(yp)})"` : "";
 		out.push(chartText(f, labelX, yp, `text-anchor="${onRight ? "start" : "end"}" dominant-baseline="middle" ${axisTickAttrs(axis.labelStyle)}${transform}`, `${escapeXml(fmtTick(t))}`));
@@ -3638,20 +3639,81 @@ const renderValueAxis = (f, axis) => {
 	if (axis.displayUnits) {
 		const lbl = DISPLAY_UNIT_LABEL[axis.displayUnits];
 		if (axis.orientation === "vertical") {
-			const lblX = f.plotX - 26;
+			const lblX = axis.side === "right" ? f.plotX + f.plotW + 26 : f.plotX - 26;
 			const lblY = f.plotY + f.plotH / 2;
 			out.push(chartText(f, lblX, 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)}`));
 		} else out.push(chartText(f, f.plotX + f.plotW, f.plotY + f.plotH + 22, `text-anchor="end" font-family="sans-serif" font-size="9" fill="#6B7280" font-style="italic"`, `${escapeXml(lbl)}`));
 	}
-	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 {
+	if (!axis.lineHidden) if (axis.orientation === "vertical") {
+		const spineX = axis.side === "right" ? f.plotX + f.plotW : f.plotX;
+		out.push(`<line x1="${px(spineX)}" y1="${px(f.plotY)}" x2="${px(spineX)}" 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;
 		out.push(`<line x1="${px(f.plotX)}" y1="${px(spineY)}" x2="${px(f.plotX + f.plotW)}" y2="${px(spineY)}" stroke="${axisColor}" stroke-width="1"/>`);
 	}
 	return out.join("");
 };
-const renderCategoryAxis = (f, orientation, cats, pointCount, skip = 1, labelStyle, labelRotationDeg, labelAlign, lineColor, lineHidden = false, majorTickMark = "out", minorTickMark = "none") => {
+const CATEGORY_LABEL_GAP = 6;
+const CATEGORY_LABEL_LINE_HEIGHT = 1.2;
+const MAX_BAR_CATEGORY_LABEL_SHARE = .5;
+const DEFAULT_Y_AXIS_GUTTER = 32;
+const BAR_VALUE_LABEL_ROW = 18;
+const DEFAULT_AXIS_TITLE_PT = 11;
+const DEFAULT_AXIS_LABEL_PT = 10;
+const categoryLabelFontPx = (style) => (style?.sizePt ?? DEFAULT_AXIS_LABEL_PT) * PX_PER_PT;
+const axisTitleRowPx = (style) => (style?.sizePt ?? DEFAULT_AXIS_TITLE_PT) * PX_PER_PT * CATEGORY_LABEL_LINE_HEIGHT;
+const NO_LINE_START = /* @__PURE__ */ new Set("、。，．,.)）]］」』】〉》%％!！?？:：;；ー〜…・");
+const chartLabelSegments = (text) => {
+	const segments = [];
+	let word = "";
+	for (const ch of text) if (NO_LINE_START.has(ch) && word === "" && segments.length > 0) segments[segments.length - 1] += ch;
+	else if (FULLWIDTH_CHAR_PATTERN.test(ch) && !NO_LINE_START.has(ch)) {
+		if (word !== "") segments.push(word);
+		segments.push(ch);
+		word = "";
+	} else {
+		word += ch;
+		if (/\s/u.test(ch)) {
+			segments.push(word);
+			word = "";
+		}
+	}
+	if (word !== "") segments.push(word);
+	return segments;
+};
+const wrapChartLabel = (text, maxPx, widthOf) => {
+	const lines = [];
+	let line = "";
+	for (const segment of chartLabelSegments(text)) {
+		if (line !== "" && widthOf((line + segment).trimEnd()) > maxPx) {
+			lines.push(line.trimEnd());
+			line = "";
+		}
+		line += segment;
+	}
+	if (line.trim() !== "") lines.push(line.trimEnd());
+	return lines;
+};
+const layoutBarCategoryLabels = (spec, chartWidthPx, measure) => {
+	const style = spec.categoryAxisLabelStyle;
+	const font = {
+		family: SANS,
+		sizePx: categoryLabelFontPx(style),
+		bold: style?.bold === true,
+		italic: style?.italic === true,
+		letterSpacingPx: 0
+	};
+	const widthOf = (text) => measure(text, font).widthPx;
+	const labels = Array.from({ length: pointCount(spec) }, (_, i) => spec.categories[i] ?? (i + 1).toString());
+	const maxPx = chartWidthPx * MAX_BAR_CATEGORY_LABEL_SHARE;
+	const lines = labels.map((label) => wrapChartLabel(label, maxPx, widthOf));
+	return {
+		widthPx: Math.max(0, ...lines.flatMap((ls) => ls.map(widthOf))),
+		lines
+	};
+};
+const renderCategoryAxis = (f, orientation, cats, pointCount, skip = 1, labelStyle, labelRotationDeg, labelAlign, lineColor, lineHidden = false, majorTickMark = "out", minorTickMark = "none", wrappedLabels) => {
 	const labels = [];
 	for (let i = 0; i < pointCount; i++) labels.push(cats[i] ?? (i + 1).toString());
 	const out = [];
@@ -3673,6 +3735,14 @@ const renderCategoryAxis = (f, orientation, cats, pointCount, skip = 1, labelSty
 		for (let i = 0; i < pointCount; i++) {
 			if (skip > 1 && i % skip !== 0) continue;
 			const cy = f.plotY + (pointCount - 1 - i + .5) * step;
+			const lines = wrappedLabels?.[i];
+			if (lines) {
+				const lx = f.plotX - CATEGORY_LABEL_GAP;
+				const lineH = categoryLabelFontPx(labelStyle) * CATEGORY_LABEL_LINE_HEIGHT;
+				const content = lines.length === 1 ? escapeXml(lines[0]) : lines.map((line, k) => `<tspan x="${px(lx)}" dy="${px(k === 0 ? -(lines.length - 1) * lineH / 2 : lineH)}">${escapeXml(line)}</tspan>`).join("");
+				out.push(chartText(f, lx, cy, `text-anchor="end" dominant-baseline="middle" ${axisTickAttrs(labelStyle)}`, content));
+				continue;
+			}
 			const lx = f.plotX - 4;
 			const truncated = labels[i] !== void 0 && labels[i].length > truncLen ? `${labels[i].slice(0, truncLen - 2)}…` : labels[i] ?? "";
 			const transform = labelRotationDeg && labelRotationDeg !== 0 ? ` transform="rotate(${labelRotationDeg} ${px(lx)} ${px(cy)})"` : "";
@@ -3727,16 +3797,21 @@ const seriesMinMax = (spec) => {
 	if (!Number.isFinite(min)) min = 0;
 	if (!Number.isFinite(max)) max = 1;
 	if (max === min) max = min + 1;
-	if (min > 0) min = 0;
 	if (isPercent) return {
 		min: 0,
 		max: 1,
 		step: .2
 	};
-	const step = niceStep(max - min);
-	max = (Math.floor(max / step) + 1) * step;
-	if (spec.valueAxis?.min !== void 0) min = spec.valueAxis.min;
-	if (spec.valueAxis?.max !== void 0) max = spec.valueAxis.max;
+	const authoredMin = spec.valueAxis?.min;
+	const authoredMax = spec.valueAxis?.max;
+	const lo = authoredMin ?? min;
+	const hi = authoredMax ?? max;
+	const pad = (hi - lo) / AUTO_AXIS_PAD_DIVISOR;
+	const autoMin = lo < 0 ? lo - pad : lo >= hi * AUTO_AXIS_ZERO_THRESHOLD ? lo - pad : 0;
+	const autoMax = hi > 0 ? hi + pad : hi <= lo * AUTO_AXIS_ZERO_THRESHOLD ? hi + pad : 0;
+	const step = niceStep((authoredMax ?? autoMax) - (authoredMin ?? autoMin));
+	min = authoredMin ?? snapToStep(autoMin, step, Math.floor);
+	max = authoredMax ?? snapToStep(autoMax, step, Math.ceil);
 	if (max === min) max = min + 1;
 	return {
 		min,
@@ -3744,6 +3819,10 @@ const seriesMinMax = (spec) => {
 		step
 	};
 };
+const AUTO_AXIS_PAD_DIVISOR = 20;
+const AUTO_AXIS_ZERO_THRESHOLD = 5 / 6;
+const AXIS_BOUND_PRECISION = 12;
+const snapToStep = (value, step, round) => Number((round(value / step) * step).toPrecision(AXIS_BOUND_PRECISION));
 const renderChartTitle = (f, title, style) => {
 	if (!title) return "";
 	const sz = style?.sizePt ?? DEFAULT_CHART_TITLE_PT;
@@ -4592,7 +4671,7 @@ const renderRadarChart = (f, spec, colors) => {
 	}
 	return out.join("");
 };
-const renderChart = (shape, x, y, w, h, transform, theme, groupReflected) => {
+const renderChart = (shape, x, y, w, h, transform, theme, groupReflected, measure) => {
 	let spec = null;
 	try {
 		spec = getShapeChartSpec(shape);
@@ -4612,10 +4691,13 @@ const renderChart = (shape, x, y, w, h, transform, theme, groupReflected) => {
 	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 barLabels = spec.kind === "bar" && !spec.categoryAxisHidden && spec.categoryAxisTickLabelPos !== "none" && !spec.categoryAxisLabelRotationDeg ? layoutBarCategoryLabels(spec, w / EMU_PER_PX, measure) : void 0;
+	const barValueTitleRow = spec.kind === "bar" && spec.valueAxisTitle ? axisTitleRowPx(spec.valueAxisTitleStyle) : 0;
+	const barCategoryTitleRow = spec.kind === "bar" && spec.categoryAxisTitle ? axisTitleRowPx(spec.categoryAxisTitleStyle) : 0;
 	const flip = getShapeFlip(shape);
 	const f = {
 		reflected: groupReflected !== Boolean(flip && flip.horizontal !== flip.vertical),
-		...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)
+		...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, barLabels ? Math.max(DEFAULT_Y_AXIS_GUTTER, barLabels.widthPx + CATEGORY_LABEL_GAP) + barCategoryTitleRow : void 0, barValueTitleRow > 0 ? BAR_VALUE_LABEL_ROW + barValueTitleRow : void 0)
 	};
 	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");
@@ -4640,10 +4722,11 @@ const renderChart = (shape, x, y, w, h, transform, theme, groupReflected) => {
 			...spec,
 			series: primarySeries
 		});
-		const { valueAxis: _primaryOnlyAxis, ...specWithoutAxis } = spec;
+		const secondaryAxis = spec.secondaryValueAxis;
 		const secondaryScale = secondarySeries.length > 0 ? seriesMinMax({
-			...specWithoutAxis,
-			series: secondarySeries
+			...spec,
+			series: secondarySeries,
+			valueAxis: secondaryAxis ?? {}
 		}) : null;
 		const N = pointCount(spec);
 		if (!spec.valueAxisHidden) axes = renderValueAxis(f, {
@@ -4662,14 +4745,20 @@ const renderChart = (shape, x, y, w, h, transform, theme, groupReflected) => {
 			...spec.valueAxisMajorGridlines !== void 0 ? { majorGridlines: spec.valueAxisMajorGridlines } : {},
 			...spec.valueAxisLabelStyle !== void 0 ? { labelStyle: spec.valueAxisLabelStyle } : {}
 		});
-		if (secondaryScale) axes += renderValueAxis(f, {
+		const secondaryLabelStyle = secondaryAxis?.labelStyle ?? spec.valueAxisLabelStyle;
+		if (secondaryScale && secondaryAxis?.tickLabelPos !== "none") axes += renderValueAxis(f, {
 			orientation: "vertical",
 			side: "right",
 			min: secondaryScale.min,
 			max: secondaryScale.max,
-			majorUnit: secondaryScale.step,
-			majorGridlines: false,
-			...spec.valueAxisLabelStyle !== void 0 ? { labelStyle: spec.valueAxisLabelStyle } : {}
+			majorUnit: secondaryAxis?.majorUnit ?? secondaryScale.step,
+			majorGridlines: secondaryAxis?.majorGridlines ?? false,
+			...secondaryAxis?.numberFormat !== void 0 ? { numberFormat: secondaryAxis.numberFormat } : {},
+			...secondaryAxis?.displayUnits !== void 0 ? { displayUnits: secondaryAxis.displayUnits } : {},
+			...secondaryAxis?.majorGridlineColor !== void 0 ? { majorGridlineColor: secondaryAxis.majorGridlineColor } : {},
+			...secondaryAxis?.majorTickMark !== void 0 ? { majorTickMark: secondaryAxis.majorTickMark } : {},
+			...secondaryAxis?.lineColor !== void 0 ? { lineColor: secondaryAxis.lineColor } : {},
+			...secondaryLabelStyle !== void 0 ? { labelStyle: secondaryLabelStyle } : {}
 		});
 		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();
@@ -4737,7 +4826,7 @@ const renderChart = (shape, x, y, w, h, transform, theme, groupReflected) => {
 		};
 		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, spec.categoryAxisLineHidden, spec.categoryAxisMajorTickMark, spec.categoryAxisMinorTickMark);
+		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, barLabels?.lines);
 	}
 	if (!isCombo) switch (spec.kind) {
 		case "column":
@@ -4769,19 +4858,30 @@ const renderChart = (shape, x, y, w, h, transform, theme, groupReflected) => {
 	}
 	const emptyHint = finiteCount === 0 ? chartText(f, f.plotX + f.plotW / 2, f.plotY + f.plotH / 2, `text-anchor="middle" dominant-baseline="middle" font-family="sans-serif" font-size="12" fill="#9CA3AF"`, `${escapeXml(`chart (${spec.kind}) — no data`)}`) : "";
 	const axisTitleAttrs = (style) => {
-		const sz = style?.sizePt ?? 11;
+		const sz = style?.sizePt ?? DEFAULT_AXIS_TITLE_PT;
 		const fill = style?.color ?? "#374151";
 		const weight = style?.bold === false ? "400" : "600";
 		const italicAttr = style?.italic ? " font-style=\"italic\"" : "";
 		return `font-family="sans-serif" font-size="${chartFontPx(sz)}" fill="${fill}" font-weight="${weight}"${italicAttr}`;
 	};
-	const valueAxisTitleRot = spec.valueAxisTitleRotationDeg ?? -90;
-	const valueAxisTitleSvg = spec.valueAxisTitle ? chartText(f, f.plotX - 26, f.plotY + f.plotH / 2, `text-anchor="middle" ${axisTitleAttrs(spec.valueAxisTitleStyle)} transform="rotate(${valueAxisTitleRot} ${px(f.plotX - 26)} ${px(f.plotY + f.plotH / 2)})"`, `${escapeXml(spec.valueAxisTitle)}`) : "";
-	const catTitleRot = spec.categoryAxisTitleRotationDeg ?? 0;
-	const catTitleCx = f.plotX + f.plotW / 2;
-	const catTitleCy = f.plotY + f.plotH + 28;
-	const catTitleTransform = catTitleRot !== 0 ? ` transform="rotate(${catTitleRot} ${px(catTitleCx)} ${px(catTitleCy)})"` : "";
-	const categoryAxisTitleSvg = spec.categoryAxisTitle ? chartText(f, catTitleCx, catTitleCy, `text-anchor="middle" ${axisTitleAttrs(spec.categoryAxisTitleStyle)}${catTitleTransform}`, `${escapeXml(spec.categoryAxisTitle)}`) : "";
+	const bottomTitle = {
+		x: f.plotX + f.plotW / 2,
+		y: f.plotY + f.plotH + 28
+	};
+	const sideTitle = {
+		x: barLabels ? f.plotX - CATEGORY_LABEL_GAP - barLabels.widthPx - barCategoryTitleRow / 2 : f.plotX - 26,
+		y: f.plotY + f.plotH / 2
+	};
+	const isBar = spec.kind === "bar";
+	const axisTitleSvg = (title, style, rotationDeg, side) => {
+		if (!title) return "";
+		const at = side ? sideTitle : bottomTitle;
+		const rot = rotationDeg ?? (side ? -90 : 0);
+		const transform = rot !== 0 ? ` transform="rotate(${rot} ${px(at.x)} ${px(at.y)})"` : "";
+		return chartText(f, at.x, at.y, `text-anchor="middle" ${axisTitleAttrs(style)}${transform}`, escapeXml(title));
+	};
+	const valueAxisTitleSvg = axisTitleSvg(spec.valueAxisTitle, spec.valueAxisTitleStyle, spec.valueAxisTitleRotationDeg, !isBar);
+	const categoryAxisTitleSvg = axisTitleSvg(spec.categoryAxisTitle, spec.categoryAxisTitleStyle, spec.categoryAxisTitleRotationDeg, isBar);
 	return [
 		`<g${transform}>`,
 		`<rect x="${px(f.x)}" y="${px(f.y)}" width="${px(f.w)}" height="${px(f.h)}" fill="${spec.chartAreaFill ?? "#FFFFFF"}" stroke="${spec.chartAreaStrokeColor ?? "none"}" stroke-width="0.6"${spec.roundedCorners ? " rx=\"6\" ry=\"6\"" : ""}/>`,
@@ -4929,7 +5029,7 @@ const renderTableCellText = (cell, paragraphs, cx, cy, cw, ch, color, pres, shap
 	const justify = vAnchor === "top" ? "flex-start" : vAnchor === "bottom" ? "flex-end" : "center";
 	const familyFont = escapeXml(browserFontFamily(themeFace));
 	const body = renderHtmlParagraphs(paraData, numberLabels, theme, 1, DEFAULT_BODY_PT, color).join("");
-	return `<foreignObject x="${px(innerX)}" y="${px(innerY)}" width="${px(innerW)}" height="${px(innerH)}"><div xmlns="http://www.w3.org/1999/xhtml" style="display:flex;flex-direction:column;justify-content:${justify};width:100%;height:100%;box-sizing:border-box;overflow:hidden;line-height:${LINE_HEIGHT};font-family:${familyFont};color:${color};word-break:break-word;${directionStyle}">${body}</div></foreignObject>${fillOverlay()}${bevelOverlay()}`;
+	return `<foreignObject x="${px(innerX)}" y="${px(innerY)}" width="${px(innerW)}" height="${px(innerH)}"><div xmlns="http://www.w3.org/1999/xhtml" style="display:flex;flex-direction:column;justify-content:${justify};width:100%;height:100%;box-sizing:border-box;overflow:hidden;line-height:${LINE_HEIGHT};font-family:${familyFont};color:${color};${NO_AUTOSPACE}word-break:break-word;${directionStyle}">${body}</div></foreignObject>${fillOverlay()}${bevelOverlay()}`;
 };
 const TWO_STOP_TABLE_GRADIENT_EXPONENT = 1.85;
 const TWO_STOP_TABLE_GRADIENT_SAMPLES = 16;
@@ -5516,7 +5616,7 @@ const renderShapeContent = (shape, pres, theme, ctx) => {
 	}
 	if (kind === "graphicFrame") {
 		if (isChartShape(shape)) {
-			const chartSvg = renderChart(shape, x, y, w, h, transform, theme, ctx.groupReflected);
+			const chartSvg = renderChart(shape, x, y, w, h, transform, theme, ctx.groupReflected, ctx.measure);
 			if (chartSvg) return chartSvg;
 		}
 		if (isTableShape(shape)) {
@@ -6216,4 +6316,4 @@ function shapeTextAnchorOffset(pres, shape, options = {}) {
 //#endregion
 export { shapeTextRect as S, paragraphNumberLabels as _, renderSlideSvg as a, verticalTextStyle as b, AVG_GLYPH_W_RATIO as c, SERIF as d, TIMES as f, decimalSeparatorOf as g, substituteFamily as h, renderSlideLayoutSvg as i, MONO as l, isCjk as m, shapeTextAnchorOffset as n, renderTextEffectsSvg as o, defaultMeasurer as p, auditTextLayout as r, ARIAL as s, shapeAutoFitScale as t, SANS as u, textUnderlineStyle as v, resolveTextBodyRect as x, textColumnsStyle as y };
 
-//# sourceMappingURL=src-ayE1F9lH.js.map
+//# sourceMappingURL=src-BGzSNWjt.js.map