@office-kit/pptx-preview 0.8.0 → 0.9.0

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

package/dist/{src-D95l1T9U.js → src-DPHsJGe1.js}

@@ -16,11 +16,11 @@ const substituteFamily = (family) => {
 	return SANS;
 };
 const isCjk = (cp) => cp >= 12352 && cp <= 12447 || cp >= 12448 && cp <= 12543 || cp >= 19968 && cp <= 40959 || cp >= 44032 && cp <= 55215;
-const AVG_GLYPH_W_RATIO$1 = .55;
+const AVG_GLYPH_W_RATIO = .55;
 const defaultMeasurer = (text, spec) => {
 	let w = 0;
 	for (const ch of text) {
-		const ratio = isCjk(ch.codePointAt(0) ?? 0) ? 1 : AVG_GLYPH_W_RATIO$1;
+		const ratio = isCjk(ch.codePointAt(0) ?? 0) ? 1 : AVG_GLYPH_W_RATIO;
 		w += spec.sizePx * ratio;
 	}
 	const n = [...text].length;
@@ -1876,7 +1876,6 @@ const renderRun = (text, format, theme, effectivePt, _wasDefault = false) => {
 	return `<span style="${styles.join(";")}">${content}</span>`;
 };
 const LINE_HEIGHT = 1.05;
-const AVG_GLYPH_W_RATIO = .55;
 const AUTOFIT_FLOOR = .25;
 const AUTOFIT_STEP = .05;
 const underlineStyleOf = (fmt) => {
@@ -2254,33 +2253,7 @@ const resolveTextBodyModel = (pres, shape, bounds, theme, phType, measure, defau
 	if (!hasAnyText) return null;
 	const authoredAutofit = getShapeTextAutoFitParams(shape);
 	let autoFitScale = authoredAutofit?.fontScale ?? 1;
-	let lineHeightScale = 1 - (authoredAutofit?.lnSpcReduction ?? 0);
-	if (!authoredAutofit) {
-		const innerWPx = innerW / EMU_PER_PX;
-		const innerHPx = innerH / EMU_PER_PX;
-		let totalH = 0;
-		for (const para of paraData) {
-			let maxSize = defaultPt;
-			let totalChars = 0;
-			let cjkChars = 0;
-			for (const run of para.runs) {
-				if (run.sizePt > maxSize) maxSize = run.sizePt;
-				totalChars += run.text.length;
-				for (let i = 0; i < run.text.length; i++) {
-					const c = run.text.charCodeAt(i);
-					if (c >= 12352 && c <= 12447 || c >= 12448 && c <= 12543 || c >= 19968 && c <= 40959 || c >= 44032 && c <= 55215) cjkChars++;
-				}
-			}
-			if (totalChars === 0) totalChars = 1;
-			const cjkRatio = cjkChars / totalChars;
-			const glyphRatio = cjkRatio * 1 + (1 - cjkRatio) * AVG_GLYPH_W_RATIO;
-			const sizePx = maxSize * PX_PER_PT;
-			const charsPerLine = Math.max(1, Math.floor(innerWPx / Math.max(1, sizePx * glyphRatio)));
-			const lineCount = Math.max(1, Math.ceil(totalChars / charsPerLine));
-			totalH += sizePx * LINE_HEIGHT * lineCount;
-		}
-		if (totalH > innerHPx) autoFitScale = Math.max(.4, innerHPx / totalH);
-	}
+	const lineHeightScale = 1 - (authoredAutofit?.lnSpcReduction ?? 0);
 	LINE_HEIGHT * lineHeightScale;
 	const numberLabels = Array.from({ length: paraData.length }, () => null);
 	{
@@ -2655,16 +2628,20 @@ const renderValueAxis = (f, axis) => {
 	const tickLen = AXIS_TICK_LEN;
 	for (const t of ticks) if (axis.orientation === "vertical") {
 		const yp = f.plotY + f.plotH - (t - axis.min) / range * f.plotH;
+		const onRight = axis.side === "right";
+		const edgeX = onRight ? f.plotX + f.plotW : f.plotX;
 		if (showGrid) out.push(`<line x1="${px(f.plotX)}" y1="${px(yp)}" x2="${px(f.plotX + f.plotW)}" y2="${px(yp)}" stroke="${gridStroke}" stroke-width="0.5"/>`);
 		if (tickMark !== "none") {
-			const tx1 = tickMark === "in" ? f.plotX : f.plotX - tickLen;
-			const tx2 = tickMark === "out" ? f.plotX : tickMark === "cross" ? f.plotX + tickLen : f.plotX + tickLen;
+			const outward = onRight ? tickLen : -5;
+			const inward = onRight ? -5 : tickLen;
+			const tx1 = tickMark === "in" ? edgeX : edgeX + outward;
+			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 = f.plotX - 4;
+		const labelX = onRight ? edgeX + 4 : edgeX - 4;
 		const rot = axis.labelRotationDeg ?? 0;
 		const transform = rot ? ` transform="rotate(${rot} ${px(labelX)} ${px(yp)})"` : "";
-		out.push(`<text x="${px(labelX)}" y="${px(yp)}" text-anchor="end" dominant-baseline="middle" ${axisTickAttrs(axis.labelStyle)}${transform}>${escapeXml(fmtTick(t))}</text>`);
+		out.push(`<text x="${px(labelX)}" y="${px(yp)}" text-anchor="${onRight ? "start" : "end"}" dominant-baseline="middle" ${axisTickAttrs(axis.labelStyle)}${transform}>${escapeXml(fmtTick(t))}</text>`);
 	} else {
 		const xp = f.plotX + (t - axis.min) / range * f.plotW;
 		if (showGrid) out.push(`<line x1="${px(xp)}" y1="${px(f.plotY)}" x2="${px(xp)}" y2="${px(f.plotY + f.plotH)}" stroke="${gridStroke}" stroke-width="0.5"/>`);
@@ -3641,7 +3618,72 @@ const renderChart = (shape, x, y, w, h, transform, theme) => {
 	for (const s of spec.series) for (const v of s.values) if (v !== null && Number.isFinite(v)) finiteCount++;
 	let plot = "";
 	let axes = "";
-	if (isCartesian) {
+	const isCombo = isCartesian && spec.kind !== "bar" && spec.series.some((s) => s.chartKind !== void 0 && s.chartKind !== spec.kind || s.secondaryAxis === true);
+	if (isCombo) {
+		const baked = spec.series.map((s, i) => ({
+			...s,
+			color: s.color ?? colors[i % colors.length] ?? "#888"
+		}));
+		const primarySeries = baked.filter((s) => s.secondaryAxis !== true);
+		const secondarySeries = baked.filter((s) => s.secondaryAxis === true);
+		const primaryScale = seriesMinMax({
+			...spec,
+			series: primarySeries
+		});
+		const { valueAxis: _primaryOnlyAxis, ...specWithoutAxis } = spec;
+		const secondaryScale = secondarySeries.length > 0 ? seriesMinMax({
+			...specWithoutAxis,
+			series: secondarySeries
+		}) : null;
+		const N = pointCount(spec);
+		if (!spec.valueAxisHidden) axes = renderValueAxis(f, {
+			orientation: "vertical",
+			min: primaryScale.min,
+			max: primaryScale.max,
+			majorUnit: spec.valueAxis?.majorUnit ?? primaryScale.step,
+			...spec.valueAxis?.numberFormat !== void 0 ? { numberFormat: spec.valueAxis.numberFormat } : {},
+			...spec.valueAxisMajorGridlines !== void 0 ? { majorGridlines: spec.valueAxisMajorGridlines } : {},
+			...spec.valueAxisLabelStyle !== void 0 ? { labelStyle: spec.valueAxisLabelStyle } : {}
+		});
+		if (secondaryScale) 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 } : {}
+		});
+		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);
+		const groups = /* @__PURE__ */ new Map();
+		for (const s of baked) {
+			const kind = s.chartKind ?? spec.kind;
+			const secondary = s.secondaryAxis === true;
+			const key = `${kind}|${secondary ? "1" : "0"}`;
+			const group = groups.get(key);
+			if (group) group.series.push(s);
+			else groups.set(key, {
+				kind,
+				secondary,
+				series: [s]
+			});
+		}
+		const paintOrder = (g) => (g.secondary ? 2 : 0) + (g.kind === "line" || g.kind === "area" ? 1 : 0);
+		for (const group of [...groups.values()].sort((a, b) => paintOrder(a) - paintOrder(b))) {
+			const scale = group.secondary && secondaryScale ? secondaryScale : primaryScale;
+			const groupSpec = {
+				...spec,
+				series: group.series,
+				valueAxis: {
+					min: scale.min,
+					max: scale.max
+				}
+			};
+			if (group.kind === "line" || group.kind === "area") plot += renderLineChart(f, groupSpec, colors, group.kind === "area");
+			else plot += renderColumnChart(f, groupSpec, colors);
+		}
+	}
+	if (!isCombo && isCartesian) {
 		const { min, max, step } = seriesMinMax(spec);
 		const N = pointCount(spec);
 		const majorUnit = spec.valueAxis?.majorUnit ?? step;
@@ -3675,7 +3717,7 @@ const renderChart = (shape, x, y, w, h, transform, theme) => {
 		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);
 	}
-	switch (spec.kind) {
+	if (!isCombo) switch (spec.kind) {
 		case "column":
 		case "bar":
 			plot = spec.kind === "column" ? renderColumnChart(f, spec, colors) : renderBarChart(f, spec, colors);
@@ -4616,6 +4658,6 @@ const auditTextLayout = (pres, options = {}) => {
 	return issues;
 };
 //#endregion
-export { MONO as a, TIMES as c, substituteFamily as d, AVG_GLYPH_W_RATIO$1 as i, defaultMeasurer as l, renderSlideSvg as n, SANS as o, ARIAL as r, SERIF as s, auditTextLayout as t, isCjk as u };
+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-D95l1T9U.js.map
+//# sourceMappingURL=src-DPHsJGe1.js.map