@silurus/ooxml 0.37.0 → 0.39.0

package/dist/{renderer-DsT75h1z.js → renderer-DPbqSkJP.js}

@@ -222,24 +222,37 @@ function p(e, t) {
 function m(e, t, n, r, i, a, o, s) {
 	e.save(), e.font = `${s}px sans-serif`, e.fillStyle = "#555", o === "cat" ? (e.textAlign = "center", e.textBaseline = "bottom", e.fillText(t.slice(0, 30), n + i / 2, r + a + s + 2)) : (e.translate(n - s - 4, r + a / 2), e.rotate(-Math.PI / 2), e.textAlign = "center", e.textBaseline = "middle", e.fillText(t.slice(0, 30), 0, 0)), e.restore();
 }
-function h(e, n, r, i, a, o, s = "vertical") {
+function h(e) {
+	return e && (e === "line" || e === "stackedLine" || e === "stackedLinePct" || e === "radar" || e === "scatter") ? "line" : "fill";
+}
+function g(e, t, n, r, i, a, o) {
+	if (e.fillStyle = n, t === "line") {
+		e.strokeStyle = n;
+		let t = e.lineWidth;
+		e.lineWidth = Math.max(1.5, o * .15), e.beginPath();
+		let s = i + o / 2;
+		e.moveTo(r, s), e.lineTo(r + a, s), e.stroke(), e.lineWidth = t;
+	} else e.fillRect(r, i, a, o);
+}
+function _(e, n, r, i, a, o, s = "vertical", c) {
+	let l = h(c);
 	if (s === "horizontal") {
 		let s = Math.max(9, Math.min(12, o * .7));
 		e.font = `${s}px sans-serif`, e.textBaseline = "middle";
-		let c = n.map((e, t) => e.name || `Series ${t + 1}`), l = c.map((t) => 14 + e.measureText(t.slice(0, 30)).width), u = r + (a - (l.reduce((e, t) => e + t, 0) + 12 * Math.max(0, n.length - 1))) / 2, d = i + o / 2;
-		for (let r = 0; r < n.length; r++) e.fillStyle = t(r, n[r]), e.fillRect(u, d - s / 2, 10, s), e.fillStyle = "#333", e.textAlign = "left", e.fillText(c[r].slice(0, 30), u + 10 + 4, d), u += l[r] + 12;
+		let c = n.map((e, t) => e.name || `Series ${t + 1}`), u = c.map((t) => 14 + e.measureText(t.slice(0, 30)).width), d = r + (a - (u.reduce((e, t) => e + t, 0) + 12 * Math.max(0, n.length - 1))) / 2, f = i + o / 2;
+		for (let r = 0; r < n.length; r++) g(e, l, t(r, n[r]), d, f - s / 2, 10, s), e.fillStyle = "#333", e.textAlign = "left", e.fillText(c[r].slice(0, 30), d + 10 + 4, f), d += u[r] + 12;
 		return;
 	}
-	let c = Math.max(9, Math.min(12, o / (n.length + 1)));
-	e.font = `${c}px sans-serif`, e.textBaseline = "middle";
-	let l = c + 4, u = i + (o - l * n.length) / 2;
+	let u = Math.max(9, Math.min(12, o / (n.length + 1)));
+	e.font = `${u}px sans-serif`, e.textBaseline = "middle";
+	let d = u + 4, f = i + (o - d * n.length) / 2;
 	for (let i = 0; i < n.length; i++) {
-		e.fillStyle = t(i, n[i]), e.fillRect(r, u, 10, c), e.fillStyle = "#333", e.textAlign = "left";
+		g(e, l, t(i, n[i]), r, f, 10, u), e.fillStyle = "#333", e.textAlign = "left";
 		let a = n[i].name || `Series ${i + 1}`;
-		e.fillText(a.slice(0, 20), r + 10 + 4, u + c / 2), u += l;
+		e.fillText(a.slice(0, 20), r + 10 + 4, f + u / 2), f += d;
 	}
 }
-function g(e, t, n) {
+function v(e, t, n) {
 	if (!e.showLegend) return null;
 	let r = e.legendPos ?? "r", i = r === "l" ? "l" : r === "t" ? "t" : r === "b" ? "b" : "r";
 	return i === "r" || i === "l" ? {
@@ -252,30 +265,30 @@ function g(e, t, n) {
 		reserveH: Math.max(18, n * .08)
 	};
 }
-function _(e, t, n, r, i, a, o, s, c, l, u, d) {
+function y(e, t, n, r, i, a, o, s, c, l, u, d) {
 	if (!n) return;
 	let f = t.legendManualLayout;
 	if (f && f.xMode === "edge" && f.yMode === "edge" && f.w > 0 && f.h > 0) {
 		let n = r + f.x * a, s = i + f.y * o, c = f.w * a, l = f.h * o, u = c >= l ? "horizontal" : "vertical";
-		h(e, t.series, n, s, c, l, u);
+		_(e, t.series, n, s, c, l, u, t.chartType);
 		return;
 	}
 	switch (n.side) {
 		case "r":
-			h(e, t.series, r + a - n.reserveW + 4, c, n.reserveW - 8, u);
+			_(e, t.series, r + a - n.reserveW + 4, c, n.reserveW - 8, u, "vertical", t.chartType);
 			break;
 		case "l":
-			h(e, t.series, r + 4, c, n.reserveW - 8, u);
+			_(e, t.series, r + 4, c, n.reserveW - 8, u, "vertical", t.chartType);
 			break;
 		case "t":
-			h(e, t.series, s, i + d, l, n.reserveH, "horizontal");
+			_(e, t.series, s, i + d, l, n.reserveH, "horizontal", t.chartType);
 			break;
 		case "b":
-			h(e, t.series, s, i + o - n.reserveH, l, n.reserveH, "horizontal");
+			_(e, t.series, s, i + o - n.reserveH, l, n.reserveH, "horizontal", t.chartType);
 			break;
 	}
 }
-function v(e, t, n, r, i, a, o) {
+function b(e, t, n, r, i, a, o) {
 	if (t === "none" || !t) return;
 	let s = o ? Math.max(4, o + 2) : 4, c = e.strokeStyle, l = e.lineWidth;
 	if (e.strokeStyle = a ?? "#888", e.lineWidth = o ?? 1, e.beginPath(), n === "val") {
@@ -287,16 +300,16 @@ function v(e, t, n, r, i, a, o) {
 	}
 	e.stroke(), e.strokeStyle = c, e.lineWidth = l;
 }
-function y(e, t, n) {
+function x(e, t, n) {
 	return e.titleFontSizeHpt ? e.titleFontSizeHpt / 100 * n : Math.max(10, t * .085);
 }
-function b(e, t, n) {
+function S(e, t, n) {
 	return e ? e / 100 * n : Math.max(8, t * .045);
 }
-function x(e, t, n, r, i, a) {
+function C(e, t, n, r, i, a) {
 	t.title && (e.font = `bold ${a}px ${t.titleFontFace ? `"${t.titleFontFace}", Calibri, Arial, sans-serif` : "Calibri, Arial, sans-serif"}`, e.fillStyle = t.titleFontColor ? `#${t.titleFontColor}` : "#333", e.textAlign = "center", e.textBaseline = "top", e.fillText(t.title, n + i / 2, r));
 }
-function S(e) {
+function w(e) {
 	if (e.categories.length > 0) return e.categories;
 	let t = e.series[0];
 	if (t?.categories && t.categories.length > 0) return t.categories;
@@ -304,7 +317,7 @@ function S(e) {
 	for (let t of e.series) t.values.length > n && (n = t.values.length);
 	return n > 0 ? Array.from({ length: n }, (e, t) => String(t + 1)) : [];
 }
-function C(e, t, n, r, i, a, o, s, c) {
+function T(e, t, n, r, i, a, o, s, c) {
 	let l = s ?? "outEnd";
 	if (e.fillStyle = c ? `#${c}` : "#333", o === "vertical") {
 		let o = n + a / 2;
@@ -314,23 +327,23 @@ function C(e, t, n, r, i, a, o, s, c) {
 		l === "inBase" ? (e.textAlign = "left", e.textBaseline = "middle", e.fillText(t, n + 4, o)) : l === "inEnd" ? (e.textAlign = "right", e.textBaseline = "middle", e.fillText(t, n + i - 4, o)) : l === "ctr" ? (e.textAlign = "center", e.textBaseline = "middle", e.fillText(t, n + i / 2, o)) : (e.textAlign = "left", e.textBaseline = "middle", e.fillText(t, n + i + 2, o));
 	}
 }
-function w(e, n, r, o) {
-	let { x: s, y: l, w: u, h: d } = r, f = n.chartType === "clusteredBarH" || n.chartType === "stackedBarH" || n.chartType === "stackedBarHPct", p = n.chartType.startsWith("stacked"), h = n.chartType === "stackedBarPct" || n.chartType === "stackedBarHPct", v = n.series.filter((e) => e.seriesType !== "line"), b = n.series.filter((e) => e.seriesType === "line"), w = S(n), T = w.length;
-	if (T === 0) return;
-	let E = n.title ? y(n, d, o) : 0, D = n.title ? d * .02 : 0, O = n.title ? d * .025 : 0, k = n.title ? E + D + O : 0, A = g(n, u, d), j = A?.side === "r" ? A.reserveW : 0, M = A?.side === "l" ? A.reserveW : 0, N = A?.side === "t" ? A.reserveH : 0, P = A?.side === "b" ? A.reserveH : 0, F = Math.max(8, Math.min(10, d * .045)), I = n.catAxisTitle ? F + 4 : 0, L = n.valAxisTitle ? F + 4 : 0, R = {
+function E(e, n, r, o) {
+	let { x: s, y: l, w: u, h: d } = r, f = n.chartType === "clusteredBarH" || n.chartType === "stackedBarH" || n.chartType === "stackedBarHPct", p = n.chartType.startsWith("stacked"), h = n.chartType === "stackedBarPct" || n.chartType === "stackedBarHPct", g = n.series.filter((e) => e.seriesType !== "line"), _ = n.series.filter((e) => e.seriesType === "line"), b = w(n), S = b.length;
+	if (S === 0) return;
+	let E = n.title ? x(n, d, o) : 0, D = n.title ? d * .02 : 0, O = n.title ? d * .025 : 0, k = n.title ? E + D + O : 0, A = v(n, u, d), j = A?.side === "r" ? A.reserveW : 0, M = A?.side === "l" ? A.reserveW : 0, N = A?.side === "t" ? A.reserveH : 0, P = A?.side === "b" ? A.reserveH : 0, F = Math.max(8, Math.min(10, d * .045)), I = n.catAxisTitle ? F + 4 : 0, L = n.valAxisTitle ? F + 4 : 0, R = {
 		t: k + N + d * .02,
 		r: j + u * .03,
 		b: d * .14 + I + P,
 		l: u * .12 + L + M
 	};
-	f && (R.l = (n.catAxisHidden ? u * .03 : u * .22) + L + M, R.b = (n.valAxisHidden ? d * .02 : d * .08) + I + P), x(e, n, s, l + D, u, E);
+	f && (R.l = (n.catAxisHidden ? u * .03 : u * .22) + L + M, R.b = (n.valAxisHidden ? d * .02 : d * .08) + I + P), C(e, n, s, l + D, u, E);
 	let z = n.plotAreaManualLayout, B, V, H, U;
 	if (z && z.w != null && z.h != null ? (B = s + z.x * u, V = l + z.y * d, H = z.w * u, U = z.h * d) : (B = s + R.l, V = l + R.t, H = u - R.l - R.r, U = d - R.t - R.b), H <= 0 || U <= 0) return;
 	n.plotAreaBg && (e.fillStyle = `#${n.plotAreaBg}`, e.fillRect(B, V, H, U));
 	let W = 0;
-	for (let e = 0; e < T; e++) {
+	for (let e = 0; e < S; e++) {
 		let t = 0;
-		for (let n of v) {
+		for (let n of g) {
 			let r = n.values[e] ?? 0;
 			p ? t += Math.abs(r) : W = Math.max(W, Math.abs(r));
 		}
@@ -348,32 +361,32 @@ function w(e, n, r, o) {
 			e.strokeStyle = t === 0 ? "#aaa" : q, e.lineWidth = t === 0 ? 1 : .5, e.beginPath(), e.moveTo(B, n), e.lineTo(B + H, n), e.stroke(), e.textAlign = "right", e.fillText(i, B - 4, n);
 		}
 	}
-	e.strokeStyle = "#aaa", e.lineWidth = 1, f ? (e.beginPath(), e.moveTo(B, V), e.lineTo(B, V + U), e.stroke()) : (e.beginPath(), e.moveTo(B, V + U), e.lineTo(B + H, V + U), e.stroke());
-	let Y = f ? U / T : H / T, X = p ? 1 : Math.max(1, v.length), Z = p ? 0 : n.barOverlap ?? 0, Q = n.barGapWidth ?? 150, $ = Y / (1 + (X - 1) * (1 - Z / 100) + Q / 100), ee = p ? 0 : $ * (1 - Z / 100), te = (Y - ($ + (X - 1) * ee)) / 2;
-	for (let r = 0; r < T; r++) {
+	e.strokeStyle = "#aaa", e.lineWidth = 1, f ? !n.valAxisHidden && !n.valAxisLineHidden && (e.beginPath(), e.moveTo(B, V), e.lineTo(B, V + U), e.stroke()) : !n.catAxisHidden && !n.catAxisLineHidden && (e.beginPath(), e.moveTo(B, V + U), e.lineTo(B + H, V + U), e.stroke());
+	let Y = f ? U / S : H / S, X = p ? 1 : Math.max(1, g.length), Z = p ? 0 : n.barOverlap ?? 0, Q = n.barGapWidth ?? 150, $ = Y / (1 + (X - 1) * (1 - Z / 100) + Q / 100), ee = p ? 0 : $ * (1 - Z / 100), te = (Y - ($ + (X - 1) * ee)) / 2;
+	for (let r = 0; r < S; r++) {
 		let i = 0, a = 0;
 		if (h) {
-			for (let e of v) a += Math.abs(e.values[r] ?? 0);
+			for (let e of g) a += Math.abs(e.values[r] ?? 0);
 			a === 0 && (a = 1);
 		}
-		for (let s = 0; s < v.length; s++) {
-			let l = v[s], u = l.values[r] ?? 0, d = h ? Math.abs(u) / a * 100 : Math.abs(u), m = t(s, l);
+		for (let s = 0; s < g.length; s++) {
+			let l = g[s], u = l.values[r] ?? 0, d = h ? Math.abs(u) / a * 100 : Math.abs(u), m = t(s, l);
 			if (f) {
-				let t = p ? s : v.length - 1 - s, a = p ? V + (T - 1 - r) * Y + te : V + (T - 1 - r) * Y + te + t * ee, u = d / K * H, f = p ? B + i / K * H : B;
-				e.fillStyle = m, e.fillRect(f, a, u, $), n.showDataLabels && d > 0 && (e.font = `bold ${n.dataLabelFontSizeHpt ? n.dataLabelFontSizeHpt / 100 * o : Math.max(7, Math.min(11, $ * .6))}px sans-serif`, C(e, h ? `${Math.round(d)}%` : c(d, n.dataLabelFormatCode ?? l.valFormatCode ?? null), f, a, u, $, "horizontal", n.dataLabelPosition ?? null, n.dataLabelFontColor ?? null));
+				let t = p ? s : g.length - 1 - s, a = p ? V + (S - 1 - r) * Y + te : V + (S - 1 - r) * Y + te + t * ee, u = d / K * H, f = p ? B + i / K * H : B;
+				e.fillStyle = m, e.fillRect(f, a, u, $), n.showDataLabels && d > 0 && (e.font = `bold ${n.dataLabelFontSizeHpt ? n.dataLabelFontSizeHpt / 100 * o : Math.max(7, Math.min(11, $ * .6))}px sans-serif`, T(e, h ? `${Math.round(d)}%` : c(d, n.dataLabelFormatCode ?? l.valFormatCode ?? null), f, a, u, $, "horizontal", n.dataLabelPosition ?? null, n.dataLabelFontColor ?? null));
 			} else {
 				let t = p ? B + r * Y + te : B + r * Y + te + s * ee, a = d / K * U, u = V + U - (p ? i + d : d) / K * U;
-				e.fillStyle = m, e.fillRect(t, u, $, a), n.showDataLabels && d > 0 && (e.font = `bold ${n.dataLabelFontSizeHpt ? n.dataLabelFontSizeHpt / 100 * o : Math.max(7, Math.min(11, $ * .6))}px sans-serif`, C(e, h ? `${Math.round(d)}%` : c(d, n.dataLabelFormatCode ?? l.valFormatCode ?? null), t, u, a, $, "vertical", n.dataLabelPosition ?? null, n.dataLabelFontColor ?? null));
+				e.fillStyle = m, e.fillRect(t, u, $, a), n.showDataLabels && d > 0 && (e.font = `bold ${n.dataLabelFontSizeHpt ? n.dataLabelFontSizeHpt / 100 * o : Math.max(7, Math.min(11, $ * .6))}px sans-serif`, T(e, h ? `${Math.round(d)}%` : c(d, n.dataLabelFormatCode ?? l.valFormatCode ?? null), t, u, a, $, "vertical", n.dataLabelPosition ?? null, n.dataLabelFontColor ?? null));
 			}
 			p && (i += d);
 		}
 	}
 	if (!n.catAxisHidden) {
 		e.fillStyle = "#555", e.font = `${Math.max(8, Math.min(11, Y * .5))}px sans-serif`;
-		for (let t = 0; t < T; t++) {
-			let n = (w[t] ?? "").toString().slice(0, 12);
+		for (let t = 0; t < S; t++) {
+			let n = (b[t] ?? "").toString().slice(0, 12);
 			if (f) {
-				let r = V + (T - 1 - t) * Y + Y / 2;
+				let r = V + (S - 1 - t) * Y + Y / 2;
 				e.textAlign = "right", e.textBaseline = "middle", e.fillText(n, B - 4, r);
 			} else {
 				let r = B + t * Y + Y / 2;
@@ -381,11 +394,11 @@ function w(e, n, r, o) {
 			}
 		}
 	}
-	if (b.length > 0 && !f) for (let n = 0; n < b.length; n++) {
-		let r = b[n], i = t(v.length + n, r);
+	if (_.length > 0 && !f) for (let n = 0; n < _.length; n++) {
+		let r = _[n], i = t(g.length + n, r);
 		e.strokeStyle = i, e.lineWidth = 2, e.setLineDash([]), e.beginPath();
 		let a = !1;
-		for (let t = 0; t < T; t++) {
+		for (let t = 0; t < S; t++) {
 			let n = r.values[t];
 			if (n == null) {
 				a = !1;
@@ -394,28 +407,28 @@ function w(e, n, r, o) {
 			let i = B + t * Y + Y / 2, o = V + U - n / K * U;
 			a ? e.lineTo(i, o) : (e.moveTo(i, o), a = !0);
 		}
-		if (e.stroke(), r.showMarker !== !1) for (let t = 0; t < T; t++) {
+		if (e.stroke(), r.showMarker !== !1) for (let t = 0; t < S; t++) {
 			let n = r.values[t];
 			if (n == null) continue;
 			let a = B + t * Y + Y / 2, o = V + U - n / K * U;
 			e.fillStyle = i, e.beginPath(), e.arc(a, o, 3, 0, Math.PI * 2), e.fill();
 		}
 	}
-	_(e, f && !p ? {
+	y(e, f && !p ? {
 		...n,
 		series: [...n.series].reverse()
 	} : n, A, s, l, u, d, B, V, H, U, k + 2), n.catAxisTitle && m(e, n.catAxisTitle, B, V, H, U, "cat", F), n.valAxisTitle && m(e, n.valAxisTitle, B, V, H, U, "val", F);
 }
-function T(e, n, r, l) {
-	let { x: u, y: d, w: f, h: p } = r, h = S(n), C = h.length;
-	if (C === 0) return;
-	let w = n.title ? y(n, p, l) : 0, T = n.title ? p * .045 : 0, E = n.title ? p * .035 : 0, D = n.title ? w + T + E : 0, O = g(n, f, p), k = O?.side === "r" ? O.reserveW : 0, A = O?.side === "l" ? O.reserveW : 0, j = O?.side === "t" ? O.reserveH : 0, M = O?.side === "b" ? O.reserveH : 0, N = b(n.catAxisFontSizeHpt, p, l), P = b(n.valAxisFontSizeHpt, p, l), F = Math.max(N, P), I = n.catAxisTitle ? F + 4 : 0, L = n.valAxisTitle ? F + 4 : 0, R = {
+function D(e, n, r, l) {
+	let { x: u, y: d, w: f, h: p } = r, h = w(n), g = h.length;
+	if (g === 0) return;
+	let _ = n.title ? x(n, p, l) : 0, T = n.title ? p * .045 : 0, E = n.title ? p * .035 : 0, D = n.title ? _ + T + E : 0, O = v(n, f, p), k = O?.side === "r" ? O.reserveW : 0, A = O?.side === "l" ? O.reserveW : 0, j = O?.side === "t" ? O.reserveH : 0, M = O?.side === "b" ? O.reserveH : 0, N = S(n.catAxisFontSizeHpt, p, l), P = S(n.valAxisFontSizeHpt, p, l), F = Math.max(N, P), I = n.catAxisTitle ? F + 4 : 0, L = n.valAxisTitle ? F + 4 : 0, R = {
 		t: D + j + P / 2 + 2,
 		r: k + f * .05,
 		b: N + 12 + I + M,
 		l: P * 2.2 + 10 + L + A
 	};
-	x(e, n, u, d + T, f, w);
+	C(e, n, u, d + T, f, _);
 	let z = u + R.l, B = d + R.t, V = f - R.l - R.r, H = p - R.t - R.b;
 	if (V <= 0 || H <= 0) return;
 	n.plotAreaBg && (e.fillStyle = `#${n.plotAreaBg}`, e.fillRect(z, B, V, H));
@@ -424,22 +437,22 @@ function T(e, n, r, l) {
 	isFinite(U) || (U = 0, W = 1), n.valMin == null ? U > 0 && (U = 0) : U = n.valMin, n.valMax == null ? W < 0 && (W = 0) : W = n.valMax, W === U && (W = U + 1);
 	let G = i(W - U), K = n.valMin ?? o(U, G), q = n.valMax ?? a(W, G), J = q - K;
 	if (J === 0) return;
-	let Y = (e) => B + H - (e - K) / J * H, X = n.catAxisCrossBetween === "midCat" ? (e) => z + (C === 1 ? V / 2 : e / (C - 1) * V) : (e) => z + (e + .5) / C * V;
+	let Y = (e) => B + H - (e - K) / J * H, X = n.catAxisCrossBetween === "midCat" ? (e) => z + (g === 1 ? V / 2 : e / (g - 1) * V) : (e) => z + (e + .5) / g * V;
 	if (!n.valAxisHidden) {
 		let t = Math.round((q - K) / G);
 		e.font = `${P}px sans-serif`, e.textBaseline = "middle";
 		for (let r = 0; r <= t; r++) {
 			let t = K + r * G, i = Y(t);
-			e.strokeStyle = t === 0 ? "#aaa" : "#e0e0e0", e.lineWidth = t === 0 ? 1 : .5, e.beginPath(), e.moveTo(z, i), e.lineTo(z + V, i), e.stroke(), v(e, n.valAxisMajorTickMark, "val", z, i), e.fillStyle = "#555", e.textAlign = "right", e.fillText(c(t, n.valAxisFormatCode), z - 6, i);
+			e.strokeStyle = t === 0 ? "#aaa" : "#e0e0e0", e.lineWidth = t === 0 ? 1 : .5, e.beginPath(), e.moveTo(z, i), e.lineTo(z + V, i), e.stroke(), b(e, n.valAxisMajorTickMark, "val", z, i), e.fillStyle = "#555", e.textAlign = "right", e.fillText(c(t, n.valAxisFormatCode), z - 6, i);
 		}
 	}
-	e.strokeStyle = "#aaa", e.lineWidth = 1, e.beginPath(), e.moveTo(z, B + H), e.lineTo(z + V, B + H), e.stroke(), n.valAxisHidden || (e.beginPath(), e.moveTo(z, B), e.lineTo(z, B + H), e.stroke());
-	let Z = Math.max(1, 2.25 * l), Q = Math.max(2, 2.5 * l), $ = b(n.dataLabelFontSizeHpt, p, l);
+	e.strokeStyle = "#aaa", e.lineWidth = 1, !n.catAxisHidden && !n.catAxisLineHidden && (e.beginPath(), e.moveTo(z, B + H), e.lineTo(z + V, B + H), e.stroke()), !n.valAxisHidden && !n.valAxisLineHidden && (e.beginPath(), e.moveTo(z, B), e.lineTo(z, B + H), e.stroke());
+	let Z = Math.max(1, 2.25 * l), Q = Math.max(2, 2.5 * l), $ = S(n.dataLabelFontSizeHpt, p, l);
 	for (let r = 0; r < n.series.length; r++) {
 		let i = n.series[r], a = t(r, i);
 		e.strokeStyle = a, e.lineWidth = Z, e.setLineDash([]), e.beginPath();
 		let o = !1;
-		for (let t = 0; t < C; t++) {
+		for (let t = 0; t < g; t++) {
 			let n = i.values[t];
 			if (n == null) {
 				o = !1;
@@ -450,7 +463,7 @@ function T(e, n, r, l) {
 		}
 		e.stroke(), e.fillStyle = a;
 		let c = i.showMarker !== !1;
-		for (let t = 0; t < C; t++) {
+		for (let t = 0; t < g; t++) {
 			let r = i.values[t];
 			if (r != null && (c && (e.beginPath(), e.arc(X(t), Y(r), Q, 0, Math.PI * 2), e.fill()), n.showDataLabels)) {
 				e.font = `${$}px sans-serif`, e.fillStyle = "#333", e.textAlign = "center", e.textBaseline = "bottom";
@@ -460,30 +473,30 @@ function T(e, n, r, l) {
 		}
 	}
 	if (!n.catAxisHidden) {
-		let t = Math.max(1, Math.ceil(C / 8));
+		let t = Math.max(1, Math.ceil(g / 8));
 		e.fillStyle = "#555", e.textAlign = "center", e.textBaseline = "top", e.font = `${N}px sans-serif`;
-		for (let r = 0; r < C; r += t) {
+		for (let r = 0; r < g; r += t) {
 			let t = X(r);
-			v(e, n.catAxisMajorTickMark, "cat", B + H, t), e.fillStyle = "#555", e.fillText((h[r] ?? "").toString().slice(0, 10), t, B + H + 5);
+			b(e, n.catAxisMajorTickMark, "cat", B + H, t), e.fillStyle = "#555", e.fillText((h[r] ?? "").toString().slice(0, 10), t, B + H + 5);
 		}
 	}
-	_(e, n, O, u, d, f, p, z, B, V, H, D + 2), n.catAxisTitle && m(e, n.catAxisTitle, z, B, V, H, "cat", F), n.valAxisTitle && m(e, n.valAxisTitle, z, B, V, H, "val", F);
+	y(e, n, O, u, d, f, p, z, B, V, H, D + 2), n.catAxisTitle && m(e, n.catAxisTitle, z, B, V, H, "cat", F), n.valAxisTitle && m(e, n.valAxisTitle, z, B, V, H, "val", F);
 }
-function E(e, n, o, s) {
-	let { x: l, y: u, w: d, h: f } = o, p = S(n), h = p.length;
+function O(e, n, o, s) {
+	let { x: l, y: u, w: d, h: f } = o, p = w(n), h = p.length;
 	if (h === 0) return;
-	let v = n.chartType === "stackedArea" || n.chartType === "stackedAreaPct", b = n.title ? y(n, f, s) : 0, C = n.title ? f * .035 : 0, w = n.title ? f * .035 : 0, T = n.title ? b + C + w : 0, E = g(n, d, f), D = E?.side === "r" ? E.reserveW : 0, O = E?.side === "l" ? E.reserveW : 0, k = E?.side === "t" ? E.reserveH : 0, A = E?.side === "b" ? E.reserveH : 0, j = Math.max(8, Math.min(10, f * .045)), M = n.catAxisTitle ? j + 4 : 0, N = n.valAxisTitle ? j + 4 : 0, P = {
+	let g = n.chartType === "stackedArea" || n.chartType === "stackedAreaPct", _ = n.title ? x(n, f, s) : 0, b = n.title ? f * .035 : 0, S = n.title ? f * .035 : 0, T = n.title ? _ + b + S : 0, E = v(n, d, f), D = E?.side === "r" ? E.reserveW : 0, O = E?.side === "l" ? E.reserveW : 0, k = E?.side === "t" ? E.reserveH : 0, A = E?.side === "b" ? E.reserveH : 0, j = Math.max(8, Math.min(10, f * .045)), M = n.catAxisTitle ? j + 4 : 0, N = n.valAxisTitle ? j + 4 : 0, P = {
 		t: T + k + f * .02,
 		r: D + d * .05,
 		b: f * .14 + M + A,
 		l: d * .12 + N + O
 	};
-	x(e, n, l, u + C, d, b);
+	C(e, n, l, u + b, d, _);
 	let F = l + P.l, I = u + P.t, L = d - P.l - P.r, R = f - P.t - P.b;
 	if (L <= 0 || R <= 0) return;
 	n.plotAreaBg && (e.fillStyle = `#${n.plotAreaBg}`, e.fillRect(F, I, L, R));
 	let z = 0;
-	for (let e = 0; e < h; e++) if (v) {
+	for (let e = 0; e < h; e++) if (g) {
 		let t = 0;
 		for (let r of n.series) t += r.values[e] ?? 0;
 		z = Math.max(z, t);
@@ -498,11 +511,11 @@ function E(e, n, o, s) {
 			e.strokeStyle = r === 0 ? "#aaa" : "#e0e0e0", e.lineWidth = r === 0 ? 1 : .5, e.beginPath(), e.moveTo(F, i), e.lineTo(F + L, i), e.stroke(), e.fillStyle = "#555", e.textAlign = "right", e.fillText(c(t, n.valAxisFormatCode), F - 4, i);
 		}
 	}
-	e.strokeStyle = "#aaa", e.lineWidth = 1, e.beginPath(), e.moveTo(F, I + R), e.lineTo(F + L, I + R), e.stroke();
-	let W = v ? Array(h).fill(0) : null;
+	!n.catAxisHidden && !n.catAxisLineHidden && (e.strokeStyle = "#aaa", e.lineWidth = 1, e.beginPath(), e.moveTo(F, I + R), e.lineTo(F + L, I + R), e.stroke());
+	let W = g ? Array(h).fill(0) : null;
 	for (let i = n.series.length - 1; i >= 0; i--) {
 		let a = n.series[i], o = t(i, a), s = I + R;
-		if (e.beginPath(), v && W) {
+		if (e.beginPath(), g && W) {
 			for (let t = 0; t < h; t++) {
 				let n = (a.values[t] ?? 0) + W[t], r = H(t), i = U(n);
 				t === 0 ? e.moveTo(r, i) : e.lineTo(r, i);
@@ -521,16 +534,16 @@ function E(e, n, o, s) {
 		e.fillStyle = "#555", e.textAlign = "center", e.textBaseline = "top", e.font = `${Math.max(8, Math.min(11, L / h * .8))}px sans-serif`;
 		for (let n = 0; n < h; n += t) e.fillText((p[n] ?? "").toString().slice(0, 10), H(n), I + R + 3);
 	}
-	_(e, n, E, l, u, d, f, F, I, L, R, T + 2), n.catAxisTitle && m(e, n.catAxisTitle, F, I, L, R, "cat", j), n.valAxisTitle && m(e, n.valAxisTitle, F, I, L, R, "val", j);
+	y(e, n, E, l, u, d, f, F, I, L, R, T + 2), n.catAxisTitle && m(e, n.catAxisTitle, F, I, L, R, "cat", j), n.valAxisTitle && m(e, n.valAxisTitle, F, I, L, R, "val", j);
 }
-function D(t, r, i, a, o) {
+function k(t, r, i, a, o) {
 	let { x: s, y: c, w: l, h: u } = i, d = r.series[0];
 	if (!d) return;
 	let f = d.categories && d.categories.length > 0 ? d.categories : r.categories, p = d.values.map((e) => Math.abs(e ?? 0)), m = p.reduce((e, t) => e + t, 0);
 	if (m === 0) return;
-	let h = r.title ? y(r, u, o) : 0, g = r.title ? u * .035 : 0, v = r.title ? u * .035 : 0, b = r.title ? h + g + v : 0;
-	x(t, r, s, c + g, l, h);
-	let S = r.showLegend ? (() => {
+	let h = r.title ? x(r, u, o) : 0, g = r.title ? u * .035 : 0, _ = r.title ? u * .035 : 0, v = r.title ? h + g + _ : 0;
+	C(t, r, s, c + g, l, h);
+	let b = r.showLegend ? (() => {
 		let e = r.legendPos ?? "r", t = e === "l" ? "l" : e === "t" ? "t" : e === "b" ? "b" : "r";
 		return t === "r" || t === "l" ? {
 			side: t,
@@ -541,7 +554,7 @@ function D(t, r, i, a, o) {
 			reserveW: 0,
 			reserveH: Math.max(18, u * .08)
 		};
-	})() : null, C = S?.side === "r" ? S.reserveW : 0, w = S?.side === "l" ? S.reserveW : 0, T = S?.side === "t" ? S.reserveH : 0, E = S?.side === "b" ? S.reserveH : 0, D = l - C - w, O = u - b - T - E - u * .02, k = s + w + D / 2, A = c + b + T + u * .02 + O / 2, j = Math.min(D, O) * .42, M = a ? j * .5 : 0, N = -Math.PI / 2;
+	})() : null, S = b?.side === "r" ? b.reserveW : 0, w = b?.side === "l" ? b.reserveW : 0, T = b?.side === "t" ? b.reserveH : 0, E = b?.side === "b" ? b.reserveH : 0, D = l - S - w, O = u - v - T - E - u * .02, k = s + w + D / 2, A = c + v + T + u * .02 + O / 2, j = Math.min(D, O) * .42, M = a ? j * .5 : 0, N = -Math.PI / 2;
 	for (let e = 0; e < p.length; e++) {
 		let i = p[e] / m * Math.PI * 2, o = n(e, d);
 		if (t.beginPath(), t.moveTo(k, A), t.arc(k, A, j, N, N + i), t.closePath(), t.fillStyle = o, t.fill(), t.strokeStyle = "#fff", t.lineWidth = 1, t.stroke(), r.showDataLabels && i > .15) {
@@ -550,24 +563,24 @@ function D(t, r, i, a, o) {
 		}
 		N += i;
 	}
-	if (a && (t.beginPath(), t.arc(k, A, M, 0, Math.PI * 2), t.fillStyle = "#fff", t.fill()), S) {
+	if (a && (t.beginPath(), t.arc(k, A, M, 0, Math.PI * 2), t.fillStyle = "#fff", t.fill()), b) {
 		let n = p.map((t, n) => ({
 			name: (f[n] ?? `Item ${n + 1}`).toString(),
 			color: d.dataPointColors?.[n] ?? d.color ?? e[n % e.length],
 			values: []
 		})), i = k - D / 2;
-		_(t, {
+		y(t, {
 			...r,
 			series: n
-		}, S, s, c, l, u, i, A - O / 2, D, O, b + 2);
+		}, b, s, c, l, u, i, A - O / 2, D, O, v + 2);
 	}
 }
-function O(e, n, o, c) {
-	let { x: l, y: u, w: d, h: f } = o, p = S(n), m = p.length;
+function A(e, n, o, c) {
+	let { x: l, y: u, w: d, h: f } = o, p = w(n), m = p.length;
 	if (m < 3) return;
-	let h = n.title ? y(n, f, c) : 0, v = n.title ? f * .035 : 0, C = n.title ? f * .035 : 0, w = n.title ? h + v + C : 0, T = g(n, d, f), E = T?.side === "r" ? T.reserveW : 0, D = T?.side === "l" ? T.reserveW : 0, O = T?.side === "t" ? T.reserveH : 0, k = T?.side === "b" ? T.reserveH : 0;
-	x(e, n, l, u + v, d, h);
-	let A = d - E - D, j = f - w - O - k - f * .02, M = l + D + A / 2, N = u + w + O + f * .02 + j / 2, P = Math.min(A, j) * .38, F = 0;
+	let h = n.title ? x(n, f, c) : 0, g = n.title ? f * .035 : 0, _ = n.title ? f * .035 : 0, b = n.title ? h + g + _ : 0, T = v(n, d, f), E = T?.side === "r" ? T.reserveW : 0, D = T?.side === "l" ? T.reserveW : 0, O = T?.side === "t" ? T.reserveH : 0, k = T?.side === "b" ? T.reserveH : 0;
+	C(e, n, l, u + g, d, h);
+	let A = d - E - D, j = f - b - O - k - f * .02, M = l + D + A / 2, N = u + b + O + f * .02 + j / 2, P = Math.min(A, j) * .38, F = 0;
 	for (let e of n.series) for (let t of e.values) F = Math.max(F, t ?? 0);
 	n.valMax != null && (F = n.valMax), F === 0 && (F = 1);
 	let I = i(F), L = n.valMax ?? a(F, I), R = -Math.PI / 2, z = (e) => R + e / m * Math.PI * 2, B = Math.round(L / I);
@@ -587,7 +600,7 @@ function O(e, n, o, c) {
 		e.beginPath(), e.moveTo(M, N), e.lineTo(M + Math.cos(n) * P, N + Math.sin(n) * P), e.stroke();
 	}
 	if (!n.valAxisHidden) {
-		e.font = `${b(n.valAxisFontSizeHpt, f, c)}px sans-serif`, e.fillStyle = "#555", e.textAlign = "right", e.textBaseline = "middle";
+		e.font = `${S(n.valAxisFontSizeHpt, f, c)}px sans-serif`, e.fillStyle = "#555", e.textAlign = "right", e.textBaseline = "middle";
 		for (let t = 1; t <= B; t++) {
 			let n = t / B * L, r = t / B * P;
 			e.fillText(s(n), M - 3, N - r);
@@ -598,36 +611,54 @@ function O(e, n, o, c) {
 		let n = z(t), r = M + Math.cos(n) * (P + 12), i = N + Math.sin(n) * (P + 12);
 		e.textAlign = Math.cos(n) < -.1 ? "right" : Math.cos(n) > .1 ? "left" : "center", e.fillText((p[t] ?? "").toString().slice(0, 12), r, i);
 	}
+	let V = n.radarStyle === "filled", H = Math.max(2, P * .025);
 	for (let i = 0; i < n.series.length; i++) {
-		let a = n.series[i], o = t(i, a);
+		let a = n.series[i], o = t(i, a), s = [];
+		for (let e = 0; e < m; e++) {
+			let t = a.values[e];
+			if (t == null) {
+				s.push(null);
+				continue;
+			}
+			let n = t / L, r = z(e);
+			s.push([M + Math.cos(r) * P * n, N + Math.sin(r) * P * n]);
+		}
 		e.beginPath();
-		for (let t = 0; t < m; t++) {
-			let n = (a.values[t] ?? 0) / L, r = z(t), i = M + Math.cos(r) * P * n, o = N + Math.sin(r) * P * n;
-			t === 0 ? e.moveTo(i, o) : e.lineTo(i, o);
+		let c = !1;
+		for (let t of s) {
+			if (t == null) {
+				c = !1;
+				continue;
+			}
+			c ? e.lineTo(t[0], t[1]) : (e.moveTo(t[0], t[1]), c = !0);
+		}
+		let l = s.every((e) => e != null);
+		if (V && l ? (e.closePath(), e.fillStyle = r(o, .25), e.fill()) : l && e.closePath(), e.strokeStyle = o, e.lineWidth = 2, e.stroke(), !V && a.showMarker !== !1) {
+			e.fillStyle = o;
+			for (let t of s) t != null && (e.beginPath(), e.arc(t[0], t[1], H, 0, Math.PI * 2), e.fill());
 		}
-		e.closePath(), e.fillStyle = r(o, .25), e.fill(), e.strokeStyle = o, e.lineWidth = 2, e.stroke();
 	}
-	_(e, n, T, l, u, d, f, M - A / 2, N - j / 2, A, j, w + 2);
+	y(e, n, T, l, u, d, f, M - A / 2, N - j / 2, A, j, b + 2);
 }
-function k(e, n, r, a) {
-	let { x: o, y: s, w: l, h: u } = r, d = n.title ? y(n, u, a) : 0, f = n.title ? u * .035 : 0, p = n.title ? u * .035 : 0, h = n.title ? d + f + p : 0, b = g(n, l, u), S = b?.side === "r" ? b.reserveW : 0, C = b?.side === "l" ? b.reserveW : 0, w = b?.side === "t" ? b.reserveH : 0, T = b?.side === "b" ? b.reserveH : 0, E = Math.max(8, Math.min(10, u * .045)), D = n.catAxisTitle ? E + 4 : 0, O = n.valAxisTitle ? E + 4 : 0;
+function j(e, n, r, a) {
+	let { x: o, y: s, w: l, h: u } = r, d = n.title ? x(n, u, a) : 0, f = n.title ? u * .035 : 0, p = n.title ? u * .035 : 0, h = n.title ? d + f + p : 0, g = v(n, l, u), _ = g?.side === "r" ? g.reserveW : 0, S = g?.side === "l" ? g.reserveW : 0, w = g?.side === "t" ? g.reserveH : 0, T = g?.side === "b" ? g.reserveH : 0, E = Math.max(8, Math.min(10, u * .045)), D = n.catAxisTitle ? E + 4 : 0, O = n.valAxisTitle ? E + 4 : 0;
 	if (n.title) {
 		let t = n.titleManualLayout;
-		t && (t.x !== void 0 || t.y !== void 0) ? x(e, n, o + t.x * l, s + t.y * u, (t.w ?? .5) * l, d) : x(e, n, o, s + f, l, d);
+		t && (t.x !== void 0 || t.y !== void 0) ? C(e, n, o + t.x * l, s + t.y * u, (t.w ?? .5) * l, d) : C(e, n, o, s + f, l, d);
 	}
-	let k = n.plotAreaManualLayout, N, F, I, L;
-	if (k && k.w != null && k.h != null) N = o + k.x * l, F = s + k.y * u, I = k.w * l, L = k.h * u;
+	let k = n.plotAreaManualLayout, A, j, F, L;
+	if (k && k.w != null && k.h != null) A = o + k.x * l, j = s + k.y * u, F = k.w * l, L = k.h * u;
 	else {
 		let e = {
 			t: h + w + u * .02,
-			r: S + l * .05,
+			r: _ + l * .05,
 			b: (n.catAxisHidden ? u * .04 : u * .12) + D + T,
-			l: (n.valAxisHidden ? l * .04 : l * .12) + O + C
+			l: (n.valAxisHidden ? l * .04 : l * .12) + O + S
 		};
-		N = o + e.l, F = s + e.t, I = l - e.l - e.r, L = u - e.t - e.b;
+		A = o + e.l, j = s + e.t, F = l - e.l - e.r, L = u - e.t - e.b;
 	}
-	if (I <= 0 || L <= 0) return;
-	n.plotAreaBg && (e.fillStyle = `#${n.plotAreaBg}`, e.fillRect(N, F, I, L));
+	if (F <= 0 || L <= 0) return;
+	n.plotAreaBg && (e.fillStyle = `#${n.plotAreaBg}`, e.fillRect(A, j, F, L));
 	let R = [], z = [];
 	for (let e of n.series) {
 		let t = e.categories ?? [];
@@ -647,7 +678,7 @@ function k(e, n, r, a) {
 		let e = i(H - V);
 		e > 0 && (n.catAxisMin ?? (V = Math.floor(V / e) * e), n.catAxisMax ?? (H = Math.ceil(H / e) * e));
 	}
-	let G = (e) => N + (e - V) / (H - V) * I, K = (e) => F + L - (e - U) / (W - U) * L;
+	let G = (e) => A + (e - V) / (H - V) * F, K = (e) => j + L - (e - U) / (W - U) * L;
 	if (!n.valAxisHidden) {
 		let t = Math.max(8, Math.min(11, L / 20));
 		e.font = `${n.valAxisFontBold ? "bold " : ""}${t}px sans-serif`;
@@ -656,18 +687,18 @@ function k(e, n, r, a) {
 			let i = U + t * r;
 			if (i > W + r * .01) break;
 			let a = K(i);
-			e.strokeStyle = "#e0e0e0", e.lineWidth = .5, e.beginPath(), e.moveTo(N, a), e.lineTo(N + I, a), e.stroke(), e.fillStyle = "#555", e.textAlign = "right", e.textBaseline = "middle", e.fillText(c(i, n.valAxisFormatCode), N - 4, a);
+			e.strokeStyle = "#e0e0e0", e.lineWidth = .5, e.beginPath(), e.moveTo(A, a), e.lineTo(A + F, a), e.stroke(), e.fillStyle = "#555", e.textAlign = "right", e.textBaseline = "middle", e.fillText(c(i, n.valAxisFormatCode), A - 4, a);
 			let o = n.valAxisLineColor ? `#${n.valAxisLineColor}` : void 0, s = n.valAxisLineWidthEmu ? Math.max(.5, n.valAxisLineWidthEmu / 12700) : void 0;
-			v(e, n.valAxisMajorTickMark, "val", N, a, o, s);
+			b(e, n.valAxisMajorTickMark, "val", A, a, o, s);
 		}
 	}
-	let q = F + L;
-	if (n.catAxisCrossesAt != null) q = P(K(n.catAxisCrossesAt), F, F + L);
+	let q = j + L;
+	if (n.catAxisCrossesAt != null) q = I(K(n.catAxisCrossesAt), j, j + L);
 	else {
 		let e = n.catAxisCrosses ?? "autoZero";
-		e === "autoZero" && U < 0 && W > 0 ? q = P(K(0), F, F + L) : e === "min" ? q = F + L : e === "max" && (q = F);
+		e === "autoZero" && U < 0 && W > 0 ? q = I(K(0), j, j + L) : e === "min" ? q = j + L : e === "max" && (q = j);
 	}
-	if (e.save(), e.strokeStyle = n.catAxisLineColor ? `#${n.catAxisLineColor}` : "#888", e.lineWidth = n.catAxisLineWidthEmu ? Math.max(.5, n.catAxisLineWidthEmu / 12700) : 1, e.lineCap = "butt", e.beginPath(), e.moveTo(N, q), e.lineTo(N + I, q), e.stroke(), e.restore(), n.valAxisHidden || (e.save(), e.strokeStyle = n.valAxisLineColor ? `#${n.valAxisLineColor}` : "#888", e.lineWidth = n.valAxisLineWidthEmu ? Math.max(.5, n.valAxisLineWidthEmu / 12700) : 1, e.beginPath(), e.moveTo(N, F), e.lineTo(N, F + L), e.stroke(), e.restore()), !n.catAxisHidden) {
+	if (!n.catAxisHidden && !n.catAxisLineHidden && (e.save(), e.strokeStyle = n.catAxisLineColor ? `#${n.catAxisLineColor}` : "#888", e.lineWidth = n.catAxisLineWidthEmu ? Math.max(.5, n.catAxisLineWidthEmu / 12700) : 1, e.lineCap = "butt", e.beginPath(), e.moveTo(A, q), e.lineTo(A + F, q), e.stroke(), e.restore()), !n.valAxisHidden && !n.valAxisLineHidden && (e.save(), e.strokeStyle = n.valAxisLineColor ? `#${n.valAxisLineColor}` : "#888", e.lineWidth = n.valAxisLineWidthEmu ? Math.max(.5, n.valAxisLineWidthEmu / 12700) : 1, e.beginPath(), e.moveTo(A, j), e.lineTo(A, j + L), e.stroke(), e.restore()), !n.catAxisHidden) {
 		let t = Math.max(8, Math.min(11, L / 20));
 		e.font = `${n.catAxisFontBold ? "bold " : ""}${t}px sans-serif`;
 		let r = i(H - V), a = Math.round((H - V) / r) + 1;
@@ -678,13 +709,13 @@ function k(e, n, r, a) {
 			let a = G(i);
 			e.fillText(c(i, n.catAxisFormatCode), a, q + 4);
 			let o = n.catAxisLineColor ? `#${n.catAxisLineColor}` : void 0, s = n.catAxisLineWidthEmu ? Math.max(.5, n.catAxisLineWidthEmu / 12700) : void 0;
-			v(e, n.catAxisMajorTickMark, "cat", q, a, o, s);
+			b(e, n.catAxisMajorTickMark, "cat", q, a, o, s);
 		}
 	}
 	let J = n.chartType === "bubble", Y = J ? "marker" : n.scatterStyle ?? "marker", X = Y === "line" || Y === "lineMarker" || Y === "lineNoMarker", Z = Y === "smooth" || Y === "smoothMarker" || Y === "smoothNoMarker", Q = Y === "lineNoMarker" || Y === "smoothNoMarker";
 	for (let r = 0; r < n.series.length; r++) {
 		let i = n.series[r], o = t(r, i), s = i.categories ?? [];
-		for (let t of i.errBars ?? []) j(e, i, t, s, B, G, K, o);
+		for (let t of i.errBars ?? []) N(e, i, t, s, B, G, K, o);
 		if (X || Z) {
 			let t = [];
 			for (let e = 0; e < i.values.length; e++) {
@@ -709,7 +740,7 @@ function k(e, n, r, a) {
 			let t = 0;
 			if (J && i.bubbleSizes && i.bubbleSizes.length > 0) {
 				let e = Math.max(0, ...i.bubbleSizes.filter((e) => e != null));
-				e > 0 && (t = Math.min(I, L) / Math.max(8, i.values.length * 1.6) / Math.sqrt(e));
+				e > 0 && (t = Math.min(F, L) / Math.max(8, i.values.length * 1.6) / Math.sqrt(e));
 			}
 			for (let n = 0; n < i.values.length; n++) {
 				let r = i.values[n];
@@ -722,14 +753,14 @@ function k(e, n, r, a) {
 					e != null && e > 0 && (d = Math.sqrt(e) * t * 2 / a);
 				}
 				let f = l?.markerFill ?? l?.color ?? i.markerFill ?? o, p = l?.markerLine ?? i.markerLine ?? null;
-				A(e, G(c), K(r), u, d, f, p, a);
+				M(e, G(c), K(r), u, d, f, p, a);
 			}
 		}
-		M(e, i, s, B, G, K, L, a);
+		P(e, i, s, B, G, K, L, a);
 	}
-	_(e, n, b, o, s, l, u, N, F, I, L, h + 2), n.catAxisTitle && m(e, n.catAxisTitle, N, F, I, L, "cat", E), n.valAxisTitle && m(e, n.valAxisTitle, N, F, I, L, "val", E);
+	y(e, n, g, o, s, l, u, A, j, F, L, h + 2), n.catAxisTitle && m(e, n.catAxisTitle, A, j, F, L, "cat", E), n.valAxisTitle && m(e, n.valAxisTitle, A, j, F, L, "val", E);
 }
-function A(e, t, n, r, i, a, o, s) {
+function M(e, t, n, r, i, a, o, s) {
 	let c = Math.max(2, i * s), l = c / 2, u = a.startsWith("#") ? a : `#${a}`, d = o ? o.startsWith("#") ? o : `#${o}` : null;
 	switch (e.save(), e.fillStyle = u, d && (e.strokeStyle = d, e.lineWidth = 1), r) {
 		case "square":
@@ -769,8 +800,8 @@ function A(e, t, n, r, i, a, o, s) {
 	}
 	e.restore();
 }
-function j(e, t, n, r, i, a, o, s) {
-	e.save(), e.strokeStyle = n.color ? `#${n.color}` : s, e.lineWidth = n.lineWidthEmu ? Math.max(.5, n.lineWidthEmu / 12700) : 1, e.setLineDash(F(n.dash));
+function N(e, t, n, r, i, a, o, s) {
+	e.save(), e.strokeStyle = n.color ? `#${n.color}` : s, e.lineWidth = n.lineWidthEmu ? Math.max(.5, n.lineWidthEmu / 12700) : 1, e.setLineDash(L(n.dash));
 	let c = n.barType === "plus" || n.barType === "both", l = n.barType === "minus" || n.barType === "both", u = n.dir === "x", d = e.lineWidth * 1.5;
 	for (let s = 0; s < t.values.length; s++) {
 		let f = t.values[s];
@@ -792,7 +823,7 @@ function j(e, t, n, r, i, a, o, s) {
 	}
 	e.restore();
 }
-function M(e, t, n, r, i, a, o, s) {
+function P(e, t, n, r, i, a, o, s) {
 	let l = t.dataLabelOverrides ?? [];
 	if (l.length === 0 && !t.seriesDataLabels) return;
 	let u = t.seriesDataLabels;
@@ -810,10 +841,10 @@ function M(e, t, n, r, i, a, o, s) {
 			if (u.showCatName && !r && e.push(n[d] ?? ""), u.showSerName && e.push(t.name), u.showVal && e.push(c(f, u.formatCode ?? null)), h = e.filter(Boolean).join(" "), !h) continue;
 		} else continue;
 		let g = m?.position ?? u?.position ?? "r", _ = m?.fontSizeHpt ?? u?.fontSizeHpt, v = _ ? _ / 100 * s : Math.max(9, Math.min(11, o / 25)), y = m?.fontColor ?? u?.fontColor, b = m?.fontBold ?? u?.fontBold ?? !1;
-		N(e, i(p), a(f), h, g, v, y, b);
+		F(e, i(p), a(f), h, g, v, y, b);
 	}
 }
-function N(e, t, n, r, i, a, o, s) {
+function F(e, t, n, r, i, a, o, s) {
 	e.save(), e.font = `${s ? "bold " : ""}${a}px sans-serif`, e.fillStyle = o ? `#${o}` : "#333";
 	let c = a * .6, l = t, u = n;
 	switch (i) {
@@ -841,10 +872,10 @@ function N(e, t, n, r, i, a, o, s) {
 	for (let t of d) e.fillText(t, l, m), m += f;
 	e.restore();
 }
-function P(e, t, n) {
+function I(e, t, n) {
 	return e < t ? t : e > n ? n : e;
 }
-function F(e) {
+function L(e) {
 	if (!e) return [];
 	switch (e) {
 		case "solid": return [];
@@ -879,7 +910,7 @@ function F(e) {
 		default: return [];
 	}
 }
-function I(e, t, n) {
+function R(e, t, n) {
 	let { x: r, y: a, w: o, h: s } = n, c = t.valAxisHidden ? o * .01 : o * .11, l = o * .01, u = s * .12, d = s * .14, f = r + c, p = a + u, m = o - c - l, h = s - u - d, g = t.series[0]?.values ?? [], _ = t.categories, v = _.length;
 	if (v === 0) return;
 	let y = new Set(t.subtotalIndices), b = 0, x = [];
@@ -913,25 +944,26 @@ function I(e, t, n) {
 			e.beginPath(), e.moveTo(f, n), e.lineTo(f + m, n), e.stroke(), e.fillText(t.toLocaleString(), f - 4, n);
 		}
 	}
-	e.strokeStyle = "#bbb", e.lineWidth = 1, e.beginPath(), t.valAxisHidden ? t.catAxisHidden || (e.moveTo(f, p + h), e.lineTo(f + m, p + h)) : (e.moveTo(f, p), e.lineTo(f, p + h), e.lineTo(f + m, p + h)), e.stroke();
-	let M = m / v, N = M / (1 + (t.barGapWidth ?? 150) / 100);
+	let M = !t.valAxisHidden && !t.valAxisLineHidden, N = !t.catAxisHidden && !t.catAxisLineHidden;
+	(M || N) && (e.strokeStyle = "#bbb", e.lineWidth = 1, e.beginPath(), M ? (e.moveTo(f, p), e.lineTo(f, p + h), N && e.lineTo(f + m, p + h)) : N && (e.moveTo(f, p + h), e.lineTo(f + m, p + h)), e.stroke());
+	let P = m / v, F = P / (1 + (t.barGapWidth ?? 150) / 100);
 	x.forEach((n, r) => {
-		let i = f + M * r + (M - N) / 2, a = p + h * (1 - (n.end - D) / O), o = p + h * (1 - (n.start - D) / O), c = Math.max(1, o - a);
-		if (n.isSub ? (e.fillStyle = "#196ECA", e.fillRect(i, a, N, c)) : (e.strokeStyle = n.isPos ? "#5BA4E6" : "#E46970", e.lineWidth = 1.5, e.strokeRect(i + .75, a + .75, N - 1.5, c - 1.5)), r < v - 1) {
-			let t = f + M * (r + 1) + (M - N) / 2, s = n.isPos ? a : o;
-			e.strokeStyle = "#ccc", e.lineWidth = .8, e.setLineDash([3, 3]), e.beginPath(), e.moveTo(i + N, s), e.lineTo(t, s), e.stroke(), e.setLineDash([]);
+		let i = f + P * r + (P - F) / 2, a = p + h * (1 - (n.end - D) / O), o = p + h * (1 - (n.start - D) / O), c = Math.max(1, o - a);
+		if (n.isSub ? (e.fillStyle = "#196ECA", e.fillRect(i, a, F, c)) : (e.strokeStyle = n.isPos ? "#5BA4E6" : "#E46970", e.lineWidth = 1.5, e.strokeRect(i + .75, a + .75, F - 1.5, c - 1.5)), r < v - 1) {
+			let t = f + P * (r + 1) + (P - F) / 2, s = n.isPos ? a : o;
+			e.strokeStyle = "#ccc", e.lineWidth = .8, e.setLineDash([3, 3]), e.beginPath(), e.moveTo(i + F, s), e.lineTo(t, s), e.stroke(), e.setLineDash([]);
 		}
 		let l = g[r] ?? 0, u = l < 0 ? `△ ${Math.abs(l).toLocaleString()}` : l.toLocaleString(), d = t.series[0]?.dataLabelColors?.[r] ?? null;
-		e.fillStyle = d ? `#${d}` : t.dataLabelFontColor ? `#${t.dataLabelFontColor}` : "#595959", e.font = `bold ${Math.round(s * .044)}px sans-serif`, e.textAlign = "center", l < 0 ? (e.textBaseline = "top", e.fillText(u, i + N / 2, o + 3)) : (e.textBaseline = "bottom", e.fillText(u, i + N / 2, a - 3));
+		e.fillStyle = d ? `#${d}` : t.dataLabelFontColor ? `#${t.dataLabelFontColor}` : "#595959", e.font = `bold ${Math.round(s * .044)}px sans-serif`, e.textAlign = "center", l < 0 ? (e.textBaseline = "top", e.fillText(u, i + F / 2, o + 3)) : (e.textBaseline = "bottom", e.fillText(u, i + F / 2, a - 3));
 	}), e.textAlign = "center", e.textBaseline = "top", e.fillStyle = "#666", e.font = `${Math.round(s * .038)}px sans-serif`;
-	let P = p + h + 4;
+	let I = p + h + 4;
 	for (let t = 0; t < v; t++) {
-		let n = f + M * t + M / 2;
-		_[t].split(/\s+/).forEach((t, r) => e.fillText(t, n, P + r * (j + 2)));
+		let n = f + P * t + P / 2;
+		_[t].split(/\s+/).forEach((t, r) => e.fillText(t, n, I + r * (j + 2)));
 	}
 	e.restore();
 }
-function L(e, t, n, r = 1.333) {
+function z(e, t, n, r = 1.333) {
 	let { x: i, y: a, w: o, h: s } = n;
 	if (t.chartBg && (e.fillStyle = `#${t.chartBg}`, e.fillRect(i, a, o, s)), t.series.length === 0) {
 		e.fillStyle = "#888", e.font = "12px sans-serif", e.textAlign = "center", e.textBaseline = "middle", e.fillText("(no data)", i + o / 2, a + s / 2);
@@ -944,36 +976,36 @@ function L(e, t, n, r = 1.333) {
 		case "stackedBarH":
 		case "stackedBarPct":
 		case "stackedBarHPct":
-			w(e, t, n, r);
+			E(e, t, n, r);
 			break;
 		case "line":
 		case "stackedLine":
 		case "stackedLinePct":
-			T(e, t, n, r);
+			D(e, t, n, r);
 			break;
 		case "area":
 		case "stackedArea":
 		case "stackedAreaPct":
-			E(e, t, n, r);
+			O(e, t, n, r);
 			break;
 		case "pie":
-			D(e, t, n, !1, r);
+			k(e, t, n, !1, r);
 			break;
 		case "doughnut":
-			D(e, t, n, !0, r);
+			k(e, t, n, !0, r);
 			break;
 		case "radar":
-			O(e, t, n, r);
+			A(e, t, n, r);
 			break;
 		case "scatter":
 		case "bubble":
-			k(e, t, n, r);
+			j(e, t, n, r);
 			break;
 		case "waterfall":
-			I(e, t, n);
+			R(e, t, n);
 			break;
 		default: e.fillStyle = "#888", e.font = "11px sans-serif", e.textAlign = "center", e.textBaseline = "middle", e.fillText(`Chart: ${t.chartType}`, i + o / 2, a + s / 2);
 	}
 }
 //#endregion
-export { L as t };
+export { z as t };