@office-kit/pptx-preview 0.9.3 → 0.9.5

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

package/dist/{src-B2rbAoIa.js → src-BqJTKEQf.js}

@@ -3060,7 +3060,7 @@ const approxLegendTextPx = (text, fontPx) => {
 	for (const ch of text) units += FULLWIDTH_CHAR_PATTERN.test(ch) ? 1 : .55;
 	return units * fontPx;
 };
-const renderChartLegend = (f, names, colors, position = "b", textStyle, markerSymbols) => {
+const renderChartLegend = (f, names, colors, position = "b", textStyle, markers) => {
 	if (names.length === 0) return "";
 	const sz = textStyle?.sizePt ?? 11;
 	const fill = textStyle?.color ?? "#374151";
@@ -3069,10 +3069,10 @@ const renderChartLegend = (f, names, colors, position = "b", textStyle, markerSy
 	const textAttrs = `font-family="sans-serif" font-size="${chartFontPx(sz)}" fill="${fill}"${weight}${italic}`;
 	const swatch = (i, swatchX, swatchY) => {
 		const color = colors[i % colors.length];
-		const sym = markerSymbols?.[i];
-		if (markerSymbols !== void 0 && sym !== "none") {
+		const marker = markers?.[i];
+		if (marker !== void 0 && marker.markerSymbol !== "none") {
 			const r = 4.5;
-			return seriesMarker(autoMarkerSymbol(sym, i), swatchX + r, swatchY + r, r, color);
+			return seriesMarker(autoMarkerSymbol(marker.markerSymbol, i), swatchX + r, swatchY + r, r, ...markerColors(marker, color));
 		}
 		return `<rect x="${px(swatchX)}" y="${px(swatchY)}" width="9" height="9" fill="${color}"/>`;
 	};
@@ -3164,7 +3164,7 @@ const renderColumnChart = (f, spec, colors) => {
 			const top = f.plotY + f.plotH - (v - min) / range * f.plotH;
 			const y0 = Math.min(top, baseY);
 			const h = Math.abs(top - baseY);
-			const baseColor = spec.varyColors && spec.series.length === 1 ? colors[c % colors.length] : spec.series[s]?.color ?? colors[s % colors.length];
+			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}"/>`);
 			if (showLabelFor(s)) {
@@ -3308,11 +3308,12 @@ const AUTO_MARKER_SYMBOLS = [
 	"dash"
 ];
 const autoMarkerSymbol = (symbol, seriesIdx) => symbol !== void 0 && symbol !== "auto" ? symbol : AUTO_MARKER_SYMBOLS[seriesIdx % AUTO_MARKER_SYMBOLS.length];
-const seriesMarker = (symbol, cx, cy, r, color) => {
+const seriesMarker = (symbol, cx, cy, r, color, lineColor = color) => {
+	const paint = lineColor === color ? `fill="${color}"` : `fill="${color}" stroke="${lineColor}" stroke-width="1"`;
 	switch (symbol) {
-		case "square": return `<rect x="${px(cx - r)}" y="${px(cy - r)}" width="${px(r * 2)}" height="${px(r * 2)}" fill="${color}"/>`;
-		case "diamond": return `<polygon points="${px(cx)},${px(cy - r)} ${px(cx + r)},${px(cy)} ${px(cx)},${px(cy + r)} ${px(cx - r)},${px(cy)}" fill="${color}"/>`;
-		case "triangle": return `<polygon points="${px(cx)},${px(cy - r)} ${px(cx + r)},${px(cy + r)} ${px(cx - r)},${px(cy + r)}" fill="${color}"/>`;
+		case "square": return `<rect x="${px(cx - r)}" y="${px(cy - r)}" width="${px(r * 2)}" height="${px(r * 2)}" ${paint}/>`;
+		case "diamond": return `<polygon points="${px(cx)},${px(cy - r)} ${px(cx + r)},${px(cy)} ${px(cx)},${px(cy + r)} ${px(cx - r)},${px(cy)}" ${paint}/>`;
+		case "triangle": return `<polygon points="${px(cx)},${px(cy - r)} ${px(cx + r)},${px(cy + r)} ${px(cx - r)},${px(cy + r)}" ${paint}/>`;
 		case "star": return `<polygon points="${(() => {
 			const pts = [];
 			for (let i = 0; i < 10; i++) {
@@ -3321,14 +3322,18 @@ const seriesMarker = (symbol, cx, cy, r, color) => {
 				pts.push(`${px(cx + rr * Math.cos(ang))},${px(cy + rr * Math.sin(ang))}`);
 			}
 			return pts.join(" ");
-		})()}" fill="${color}"/>`;
-		case "x": return `<g stroke="${color}" stroke-width="1.2" stroke-linecap="round"><line x1="${px(cx - r)}" y1="${px(cy - r)}" x2="${px(cx + r)}" y2="${px(cy + r)}"/><line x1="${px(cx - r)}" y1="${px(cy + r)}" x2="${px(cx + r)}" y2="${px(cy - r)}"/></g>`;
-		case "plus": return `<g stroke="${color}" stroke-width="1.2" stroke-linecap="round"><line x1="${px(cx - r)}" y1="${px(cy)}" x2="${px(cx + r)}" y2="${px(cy)}"/><line x1="${px(cx)}" y1="${px(cy - r)}" x2="${px(cx)}" y2="${px(cy + r)}"/></g>`;
-		case "dash": return `<line x1="${px(cx - r)}" y1="${px(cy)}" x2="${px(cx + r)}" y2="${px(cy)}" stroke="${color}" stroke-width="${Math.max(1.5, r * .6).toFixed(2)}" stroke-linecap="round"/>`;
-		case "dot": return `<circle cx="${px(cx)}" cy="${px(cy)}" r="${(r * .6).toFixed(2)}" fill="${color}"/>`;
-		default: return `<circle cx="${px(cx)}" cy="${px(cy)}" r="${px(r)}" fill="${color}"/>`;
+		})()}" ${paint}/>`;
+		case "x": return `<g stroke="${lineColor}" stroke-width="1.2" stroke-linecap="round"><line x1="${px(cx - r)}" y1="${px(cy - r)}" x2="${px(cx + r)}" y2="${px(cy + r)}"/><line x1="${px(cx - r)}" y1="${px(cy + r)}" x2="${px(cx + r)}" y2="${px(cy - r)}"/></g>`;
+		case "plus": return `<g stroke="${lineColor}" stroke-width="1.2" stroke-linecap="round"><line x1="${px(cx - r)}" y1="${px(cy)}" x2="${px(cx + r)}" y2="${px(cy)}"/><line x1="${px(cx)}" y1="${px(cy - r)}" x2="${px(cx)}" y2="${px(cy + r)}"/></g>`;
+		case "dash": return `<line x1="${px(cx - r)}" y1="${px(cy)}" x2="${px(cx + r)}" y2="${px(cy)}" stroke="${lineColor}" stroke-width="${Math.max(1.5, r * .6).toFixed(2)}" stroke-linecap="round"/>`;
+		case "dot": return `<circle cx="${px(cx)}" cy="${px(cy)}" r="${(r * .6).toFixed(2)}" ${paint}/>`;
+		default: return `<circle cx="${px(cx)}" cy="${px(cy)}" r="${px(r)}" ${paint}/>`;
 	}
 };
+const markerColors = (series, seriesColor) => {
+	const fill = series.markerColor ?? seriesColor;
+	return [fill, series.markerLineColor ?? fill];
+};
 const formatChartValue = (v) => {
 	if (!Number.isFinite(v)) return "";
 	if (Number.isInteger(v)) return String(v);
@@ -3402,7 +3407,7 @@ const renderBarChart = (f, spec, colors) => {
 			const tip = f.plotX + (v - min) / range * f.plotW;
 			const x0 = Math.min(tip, baseX);
 			const w = Math.abs(tip - baseX);
-			const baseColor = spec.varyColors && spec.series.length === 1 ? colors[c % colors.length] : spec.series[s]?.color ?? colors[s % colors.length];
+			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}"/>`);
 			if (showLabelForBar(s)) {
@@ -3518,14 +3523,14 @@ const renderLineChart = (f, spec, colors, fill) => {
 			if (!pat) return "";
 			return ` stroke-dasharray="${pat.split(" ").map((n) => (Number.parseFloat(n) * sw).toFixed(2)).join(" ")}"`;
 		})() : "";
-		out.push(`<path d="${dPath}" fill="none" stroke="${color}" stroke-width="${lineWPx.toFixed(2)}" stroke-linejoin="round" stroke-linecap="round"${dashAttr}/>`);
+		out.push(`<path d="${dPath}" fill="none" stroke="${series.lineColor ?? color}" stroke-width="${lineWPx.toFixed(2)}" stroke-linejoin="round" stroke-linecap="round"${dashAttr}/>`);
 		if (!isStacked) {
 			const explicitSymbol = series.markerSymbol !== void 0 && series.markerSymbol !== "auto" && series.markerSymbol !== "none";
 			if (series.markerSymbol !== "none" && !fill && (spec.lineMarkers === true || explicitSymbol)) {
 				const symbol = autoMarkerSymbol(series.markerSymbol, s);
 				const size = series.markerSizePt ?? 5;
 				const r = Math.max(1, size * .5);
-				for (const [xp, yp] of pts) out.push(seriesMarker(symbol, xp, yp, r, color));
+				for (const [xp, yp] of pts) out.push(seriesMarker(symbol, xp, yp, r, ...markerColors(series, color)));
 			}
 		}
 		if (series.dataLabels?.showValue ?? spec.dataLabels?.showValue ?? false) {
@@ -3760,13 +3765,14 @@ const renderScatterChart = (f, spec, colors) => {
 		if (showLine && proj.length >= 2) {
 			const d = smooth && proj.length > 2 ? smoothPath(proj) : proj.map(([xp, yp], i) => `${i === 0 ? "M" : "L"}${px(xp)},${px(yp)}`).join(" ");
 			const lineWPx = series.lineWidthEmu ? Math.max(.3, series.lineWidthEmu / EMU_PER_PX) : 1.5;
-			out.push(`<path d="${d}" fill="none" stroke="${color}" stroke-width="${lineWPx.toFixed(2)}" stroke-linejoin="round" stroke-linecap="round"/>`);
+			out.push(`<path d="${d}" fill="none" stroke="${series.lineColor ?? color}" stroke-width="${lineWPx.toFixed(2)}" stroke-linejoin="round" stroke-linecap="round"/>`);
 		}
 		const sym = series.markerSymbol;
 		if (sym === "none" ? false : showMarker || sym !== void 0 && sym !== "auto") {
 			const r = Math.max(1.5, (series.markerSizePt ?? 5) * .5);
 			const glyph = autoMarkerSymbol(sym, s);
-			for (const [xp, yp] of proj) out.push(seriesMarker(glyph, xp, yp, r, color));
+			const [markerFill, markerLine] = markerColors(series, color);
+			for (const [xp, yp] of proj) out.push(seriesMarker(glyph, xp, yp, r, markerFill, markerLine));
 		}
 	}
 	return out.join("");
@@ -3867,11 +3873,12 @@ const renderRadarChart = (f, spec, colors) => {
 		if (proj.length < 2) continue;
 		const ptsStr = proj.map(([xp, yp]) => `${px(xp)},${px(yp)}`).join(" ");
 		const lineWPx = series.lineWidthEmu ? Math.max(.3, series.lineWidthEmu / EMU_PER_PX) : 1.8;
-		out.push(filled ? `<polygon points="${ptsStr}" fill="${color}" fill-opacity="0.3" stroke="${color}" stroke-width="${lineWPx.toFixed(2)}" stroke-linejoin="round"/>` : `<polygon points="${ptsStr}" fill="none" stroke="${color}" stroke-width="${lineWPx.toFixed(2)}" stroke-linejoin="round"/>`);
+		out.push(filled ? `<polygon points="${ptsStr}" fill="${color}" fill-opacity="0.3" stroke="${series.lineColor ?? color}" stroke-width="${lineWPx.toFixed(2)}" stroke-linejoin="round"/>` : `<polygon points="${ptsStr}" fill="none" stroke="${series.lineColor ?? color}" stroke-width="${lineWPx.toFixed(2)}" stroke-linejoin="round"/>`);
 		if (showMarker) {
 			const r = Math.max(1.5, (series.markerSizePt ?? 5) * .5);
 			const glyph = autoMarkerSymbol(series.markerSymbol, s);
-			for (const [xp, yp] of proj) out.push(seriesMarker(glyph, xp, yp, r, color));
+			const [markerFill, markerLine] = markerColors(series, color);
+			for (const [xp, yp] of proj) out.push(seriesMarker(glyph, xp, yp, r, markerFill, markerLine));
 		}
 	}
 	return out.join("");
@@ -3895,7 +3902,7 @@ const renderChart = (shape, x, y, w, h, transform, theme) => {
 	const seriesNamesForLegend = allNamesForLegend.filter((_, i) => !hiddenSet.has(i));
 	const seriesColorsForLegend = allColorsForLegend.filter((_, i) => !hiddenSet.has(i));
 	const explicitMarker = (sym) => sym !== void 0 && sym !== "auto" && sym !== "none";
-	const markerSymbolsForLegend = spec.kind === "line" && (spec.lineMarkers === true || spec.series.some((s) => explicitMarker(s.markerSymbol))) ? spec.series.map((s) => s.markerSymbol).filter((_, i) => !hiddenSet.has(i)) : void 0;
+	const markersForLegend = spec.kind === "line" && (spec.lineMarkers === true || spec.series.some((s) => explicitMarker(s.markerSymbol))) ? spec.series.filter((_, i) => !hiddenSet.has(i)) : void 0;
 	let finiteCount = 0;
 	for (const s of spec.series) for (const v of s.values) if (v !== null && Number.isFinite(v)) finiteCount++;
 	let plot = "";
@@ -4052,7 +4059,7 @@ const renderChart = (shape, x, y, w, h, transform, theme) => {
 		categoryAxisTitleSvg,
 		plot,
 		emptyHint,
-		hasLegend ? renderChartLegend(f, seriesNamesForLegend, seriesColorsForLegend, spec.legend?.position ?? "b", spec.legend?.textStyle, markerSymbolsForLegend) : "",
+		hasLegend ? renderChartLegend(f, seriesNamesForLegend, seriesColorsForLegend, spec.legend?.position ?? "b", spec.legend?.textStyle, markersForLegend) : "",
 		"</g>"
 	].join("");
 };
@@ -4944,4 +4951,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-B2rbAoIa.js.map
+//# sourceMappingURL=src-BqJTKEQf.js.map