minerva-design 1.5.0 → 1.6.0

package/dist/charts/engine/controller.js

@@ -2,29 +2,29 @@ import { lowerBound as e } from "./data.js";
 import { toCss as t, unpackColor as n } from "./color.js";
 import { curvePoints as r } from "./curve.js";
 import { createScales as i, heatCellStyle as a, screenRect as o, toData as s, toScreen as c } from "./layout.js";
-import { buildModel as l, fromPlotY as u, heatPosition as d, toPlotY as f } from "./model.js";
-import { font as p, placeLabels as m, rectOf as h, textBox as g } from "./overlay.js";
-import { decimateMinMax as _ } from "./decimate.js";
-import { collectPointLabels as v, colorLegend as y, connectorSegments as b, crosshairAt as x, dotSize as S, hitTest as C, hoverMarks as w, layoutChart as T, legendShape as E, legendShown as D, resolveAnnotations as O, sameHover as k, tooltipContent as A } from "./scene.js";
-import { createTheme as j } from "./theme.js";
-import { clampRange as M, panRange as ee, sameRange as te, zoomRange as ne } from "./viewport.js";
+import { buildModel as l, fromPlotX as u, fromPlotY as d, heatPosition as f, toPlotX as p, toPlotY as m, viewFromValues as h, viewToValues as g } from "./model.js";
+import { font as _, placeLabels as v, rectOf as y, textBox as b } from "./overlay.js";
+import { decimateMinMax as x } from "./decimate.js";
+import { collectPointLabels as S, colorLegend as C, connectorSegments as w, crosshairAt as T, dependencyArrows as E, dotSize as D, hitTest as O, hoverMarks as k, layoutChart as A, legendShape as ee, legendShown as te, resolveAnnotations as ne, resolveDependencies as re, sameHover as ie, tooltipContent as ae } from "./scene.js";
+import { createTheme as oe } from "./theme.js";
+import { clampRange as se, panRange as j, sameRange as M, zoomRange as ce } from "./viewport.js";
 //#region src/engine/controller.ts
 var N = (e) => ({
 	x: [e.x[0], e.x[1]],
 	y: [e.y[0], e.y[1]]
-}), re = 6, ie = 10, ae = 320, P = 20, F = (e) => {
-	let t = e.options, n = e.theme, r = j(n, t.palette), a = /* @__PURE__ */ new Map(), o = /* @__PURE__ */ new Set(), _ = {}, F, I = {
+}), le = 6, ue = 10, de = 320, P = 20, F = (e) => {
+	let t = e.options, n = e.theme, r = oe(n, t.palette), a = /* @__PURE__ */ new Map(), o = /* @__PURE__ */ new Set(), x = {}, F, I = {
 		x: [0, 1],
 		y: [0, 1]
-	}, L = !1, R = 0, z = 0, oe = [], B = null, se = !0, ce = "", V = !1, H = null, U = /* @__PURE__ */ new Map(), W = null, G = {
+	}, L = !1, R = 0, z = 0, fe = [], pe = [], B = null, me = !0, he = "", V = !1, H = null, U = /* @__PURE__ */ new Map(), W = null, G = {
 		time: 0,
 		x: 0,
 		y: 0
 	}, K = (e, t) => {
-		_[e]?.forEach((e) => e(t));
+		x[e]?.forEach((e) => e(t));
 	}, q = () => {
-		se = !0, V || e.onInvalidate?.();
-	}, le = () => {
+		me = !0, V || e.onInvalidate?.();
+	}, ge = () => {
 		let e = t.interaction;
 		if (e === !1) return null;
 		let n = typeof e == "object" ? e : {};
@@ -32,17 +32,17 @@ var N = (e) => ({
 			pan: n.pan ?? !0,
 			dragPoints: n.dragPoints ?? !1
 		};
-	}, J = (t, n = r.fontSize, i = 400) => e.measureText(t, p(r, n, i)), ue = () => {
+	}, J = (t, n = r.fontSize, i = 400) => e.measureText(t, _(r, n, i)), _e = () => {
 		F = l(t, r, o, a);
 		let { base: e, minSpan: n } = F;
 		L ? (I = {
-			x: F.zoom.x ? M(I.x, e.x, n.x) : [...e.x],
-			y: F.zoom.y ? M(I.y, e.y, n.y) : [...e.y]
-		}, L = !te(I.x, e.x) || !te(I.y, e.y)) : I = N(e), oe = O(t.annotations, r, F.y.type === "log" ? Math.log10 : void 0), H && (H.event.items.every((e) => F.series[e.seriesIndex] && !F.series[e.seriesIndex].hidden && e.index < F.series[e.seriesIndex].cols.count) || Z(null)), q();
-	}, de = () => {
+			x: F.zoom.x ? se(I.x, e.x, n.x) : [...e.x],
+			y: F.zoom.y ? se(I.y, e.y, n.y) : [...e.y]
+		}, L = !M(I.x, e.x) || !M(I.y, e.y)) : I = N(e), fe = ne(t.annotations, r, F.y.type === "log" ? Math.log10 : void 0, F.x.type === "log" ? Math.log10 : void 0), pe = re(t.dependencies, r), H && (H.event.items.every((e) => F.series[e.seriesIndex] && !F.series[e.seriesIndex].hidden && e.index < F.series[e.seriesIndex].cols.count) || Z(null)), q();
+	}, ve = () => {
 		let e = t.legend, n = t.series.filter((e) => e.name).length;
-		if (!D(e, F, n)) return null;
-		let r = typeof e == "object" ? e : {}, i = r.position === "bottom" ? "bottom" : "top", a = y(F);
+		if (!te(e, F, n)) return null;
+		let r = typeof e == "object" ? e : {}, i = r.position === "bottom" ? "bottom" : "top", a = C(F);
 		if (a) {
 			let e = a.labels[0]?.text ?? "", t = a.labels[a.labels.length - 1]?.text ?? "", n = Math.max(60, Math.min(160, R * .32)), r = R - 4 - J(t, 11) - 8, o = r - n, s = (i === "bottom" ? z - P : 0) + P / 2;
 			return {
@@ -81,7 +81,7 @@ var N = (e) => ({
 				id: e.id,
 				name: e.name,
 				color: e.colorCss,
-				shape: E(e.type),
+				shape: ee(e.type),
 				hidden: e.hidden,
 				box: {
 					x: s,
@@ -100,7 +100,7 @@ var N = (e) => ({
 			toggle: r.toggle ?? !0,
 			height: l
 		};
-	}, fe = (e, n, r) => {
+	}, ye = (e, n, r) => {
 		let i = t.tooltip;
 		if (i === !1) return null;
 		let a = typeof i == "object" ? i.render : void 0, o = null;
@@ -109,7 +109,7 @@ var N = (e) => ({
 			if (t === null || t === "") return null;
 			typeof t == "string" && (o = t.split("\n"));
 		}
-		let s = A(F, e, B?.layout.yTicks ?? null, B?.layout.y2Ticks ?? null), c = 0, l, u = s.rows.some((e) => e.color) ? 14 : 0;
+		let s = ae(F, e, B?.layout.yTicks ?? null, B?.layout.y2Ticks ?? null), c = 0, l, u = s.rows.some((e) => e.color) ? 14 : 0;
 		if (o) {
 			for (let e of o) c = Math.max(c, J(e, 12));
 			l = o.length;
@@ -135,9 +135,9 @@ var N = (e) => ({
 			padding: 8,
 			swatchWidth: u
 		};
-	}, pe = () => {
+	}, be = () => {
 		if (R <= 0 || z <= 0) return null;
-		let e = de(), n = e?.position === "top" ? e.height : 0, i = T({
+		let e = ve(), n = e?.position === "top" ? e.height : 0, i = A({
 			model: F,
 			view: I,
 			theme: r,
@@ -146,14 +146,14 @@ var N = (e) => ({
 			padding: t.padding,
 			top: n,
 			measure: (e) => J(e)
-		}), a = v(F, I, i.scales, i.yTicks), o = [], s = r.fontSize + 4;
-		for (let e of oe) {
+		}), a = S(F, I, i.scales, i.yTicks), o = [], s = r.fontSize + 4;
+		for (let e of fe) {
 			if (e.type === "text" && e.text) {
-				o.push(g(e, i.scales, J(e.text, r.fontSize, e.weight), s));
+				o.push(b(e, i.scales, J(e.text, r.fontSize, e.weight), s));
 				continue;
 			}
 			if (e.type !== "rect" || !e.label) continue;
-			let t = h(e, i.scales);
+			let t = y(e, i.scales);
 			if (t.width <= 0 || t.height <= 0) continue;
 			let n = J(e.label, r.fontSize + 1, 600), a = e.labelPosition;
 			o.push({
@@ -163,31 +163,32 @@ var N = (e) => ({
 				height: s
 			});
 		}
-		let c = m(a, i.plot, (e) => J(e), s - 2, o), l = {
+		let c = v(a, i.plot, (e) => J(e), s - 2, o), l = {
 			width: R,
 			height: z,
 			theme: r,
 			model: F,
 			view: N(I),
 			layout: i,
-			annotations: oe,
+			annotations: fe,
 			pointLabels: c,
 			legend: e,
 			hover: null,
 			dragging: null,
-			connectors: b(F, i.scales)
+			connectors: w(F, i.scales),
+			arrows: E(F, i.scales, pe)
 		};
 		if (B = l, H) {
-			let n = x(F, i.scales, H.event, t.crosshair), r = i.scales.horizontal;
+			let n = T(F, i.scales, H.event, t.crosshair), r = i.scales.horizontal;
 			l.hover = {
 				event: H.event,
-				marks: w(F, i.scales, H.event),
+				marks: k(F, i.scales, H.event),
 				crosshairX: r ? null : n,
 				crosshairY: r ? n : null,
-				tooltip: W?.kind === "pan" || W?.kind === "point" ? null : fe(H.event, H.x, H.y)
+				tooltip: W?.kind === "pan" || W?.kind === "point" ? null : ye(H.event, H.x, H.y)
 			};
 			let a = e?.colors, o = H.event.items[0], s = o ? F.series[o.seriesIndex] : void 0;
-			a && o && s?.type === "heatmap" && o.value !== void 0 && (a.caret = a.bar.x + d(s, o.value) * a.bar.width);
+			a && o && s?.type === "heatmap" && o.value !== void 0 && (a.caret = a.bar.x + f(s, o.value) * a.bar.width);
 		}
 		if (W?.kind === "point") {
 			let e = F.series[W.item.seriesIndex];
@@ -195,44 +196,44 @@ var N = (e) => ({
 				x: W.x,
 				y: W.y,
 				color: W.item.color,
-				size: (e ? S(e, W.item.index) : 8) + 6
+				size: (e ? D(e, W.item.index) : 8) + 6
 			};
 		}
-		let u = i.plot, f = `${u.x},${u.y},${u.width},${u.height}`;
-		return f !== ce && (ce = f, K("layout", { ...u })), l;
-	}, Y = () => ((se || !B) && (se = !1, B = pe()), B), X = () => Y()?.layout.scales ?? null, Z = (e) => {
-		let t = !k(H?.event ?? null, e?.event ?? null);
+		let u = i.plot, d = `${u.x},${u.y},${u.width},${u.height}`;
+		return d !== he && (he = d, K("layout", { ...u })), l;
+	}, Y = () => ((me || !B) && (me = !1, B = be()), B), X = () => Y()?.layout.scales ?? null, Z = (e) => {
+		let t = !ie(H?.event ?? null, e?.event ?? null);
 		H = e, q(), t && K("hover", e ? e.event : null);
 	}, Q = (e, t, n) => {
 		let r = X();
-		return r ? C(F, r, B?.layout.xTicks ?? null, e, t, n ? 8 : 0) : null;
-	}, me = (e, t) => {
+		return r ? O(F, r, B?.layout.xTicks ?? null, e, t, n ? 8 : 0) : null;
+	}, xe = (e, t) => {
 		let n = X()?.plot;
 		return !!n && e >= n.x && e <= n.x + n.width && t >= n.y && t <= n.y + n.height;
-	}, he = (e, t) => {
+	}, Se = (e, t) => {
 		let n = X();
 		if (!n) return null;
 		let { plot: r } = n, i = Math.max(r.x, Math.min(r.x + r.width, e)), a = Math.max(r.y, Math.min(r.y + r.height, t)), o = s(n, i, a);
 		return {
-			x: o.x,
-			y: u(F, o.y)
+			x: u(F, o.x),
+			y: d(F, o.y)
 		};
 	}, $ = (e, t) => {
 		let { base: n, minSpan: r } = F;
 		I = {
-			x: M(e.x, n.x, r.x),
-			y: M(e.y, n.y, r.y)
-		}, L = !te(I.x, n.x) || !te(I.y, n.y), t && K("zoom", N(I)), q();
-	}, ge = (e, t, n) => {
+			x: se(e.x, n.x, r.x),
+			y: se(e.y, n.y, r.y)
+		}, L = !M(I.x, n.x) || !M(I.y, n.y), t && K("zoom", g(F, I)), q();
+	}, Ce = (e, t, n) => {
 		let r = X();
 		if (!r || !F.zoom.x && !F.zoom.y) return;
 		let i = N(I), a = s(r, e, t);
-		F.zoom.x && (i.x = ne(I.x, a.x, n)), F.zoom.y && (i.y = ne(I.y, a.y, n)), $(i, !0);
-	}, _e = () => {
+		F.zoom.x && (i.x = ce(I.x, a.x, n)), F.zoom.y && (i.y = ce(I.y, a.y, n)), $(i, !0);
+	}, we = () => {
 		L && $(N(F.base), !0);
-	}, ve = (e, t) => Y()?.legend?.entries.find((n) => e >= n.box.x && e <= n.box.x + n.box.width && t >= n.box.y && t <= n.box.y + n.box.height) ?? null, ye = (e) => {
-		o.has(e) ? o.delete(e) : o.add(e), ue();
-	}, be = () => {
+	}, Te = (e, t) => Y()?.legend?.entries.find((n) => e >= n.box.x && e <= n.box.x + n.box.width && t >= n.box.y && t <= n.box.y + n.box.height) ?? null, Ee = (e) => {
+		o.has(e) ? o.delete(e) : o.add(e), _e();
+	}, De = () => {
 		let [e, t] = [...U.values()];
 		W = {
 			kind: "pinch",
@@ -242,14 +243,14 @@ var N = (e) => ({
 			midY: (e.y + t.y) / 2
 		}, Z(null);
 	};
-	return F = l(t, r, o, a), ue(), {
+	return F = l(t, r, o, a), _e(), {
 		setOptions(e) {
 			if (V) return;
 			let i = (e.palette ?? []).join() !== (t.palette ?? []).join();
-			t = e, i && (r = j(n, t.palette)), ue();
+			t = e, i && (r = oe(n, t.palette)), _e();
 		},
 		setTheme(e) {
-			V || (n = e, r = j(n, t.palette), ue());
+			V || (n = e, r = oe(n, t.palette), _e());
 		},
 		setSize(e, t) {
 			(e !== R || t !== z) && (R = Math.max(0, e), z = Math.max(0, t), q());
@@ -266,9 +267,9 @@ var N = (e) => ({
 				touch: i,
 				moved: !1
 			});
-			let a = le();
+			let a = ge();
 			if (U.size === 2) {
-				a && (F.zoom.x || F.zoom.y) && W?.kind !== "point" && be();
+				a && (F.zoom.x || F.zoom.y) && W?.kind !== "point" && De();
 				return;
 			}
 			if (U.size > 2 || !a) {
@@ -294,7 +295,7 @@ var N = (e) => ({
 					return;
 				}
 			}
-			if (L && a.pan && me(e, t)) {
+			if (L && a.pan && xe(e, t)) {
 				W = {
 					kind: "pan",
 					view: N(I),
@@ -315,17 +316,17 @@ var N = (e) => ({
 		pointerMove: (e, t, n = {}) => {
 			if (V) return;
 			let r = n.id ?? 0, a = U.get(r);
-			if (a && (a.x = e, a.y = t, !a.moved && Math.hypot(e - a.startX, t - a.startY) > (a.touch ? ie : re) && (a.moved = !0)), W?.kind === "pinch" && U.size >= 2) {
+			if (a && (a.x = e, a.y = t, !a.moved && Math.hypot(e - a.startX, t - a.startY) > (a.touch ? ue : le) && (a.moved = !0)), W?.kind === "pinch" && U.size >= 2) {
 				let [e, t] = [...U.values()], n = Math.max(1, Math.hypot(e.x - t.x, e.y - t.y)), r = (e.x + t.x) / 2, a = (e.y + t.y) / 2, o = X();
 				if (!o) return;
 				let c = i(o.plot, W.view, F.x.reverse, F.y.reverse, F.horizontal), l = W.distance / n, u = N(W.view), d = s(c, W.midX, W.midY), f = s(c, r, a);
-				F.zoom.x && (u.x = ne(W.view.x, d.x, l), u.x = ee(u.x, (d.x - f.x) * l)), F.zoom.y && (u.y = ne(W.view.y, d.y, l), u.y = ee(u.y, (d.y - f.y) * l)), $(u, !0);
+				F.zoom.x && (u.x = ce(W.view.x, d.x, l), u.x = j(u.x, (d.x - f.x) * l)), F.zoom.y && (u.y = ce(W.view.y, d.y, l), u.y = j(u.y, (d.y - f.y) * l)), $(u, !0);
 				return;
 			}
 			if (W?.kind === "point" && a) {
 				if (!a.moved) return;
 				W.x = e, W.y = t;
-				let n = he(e, t);
+				let n = Se(e, t);
 				q(), n && K("drag", {
 					item: W.item,
 					x: n.x,
@@ -338,7 +339,7 @@ var N = (e) => ({
 				let n = X();
 				if (!n) return;
 				let r = N(W.view), i = s(n, W.x, W.y), o = s(n, e, t);
-				F.zoom.x && (r.x = ee(W.view.x, i.x - o.x)), F.zoom.y && (r.y = ee(W.view.y, i.y - o.y)), $(r, !0);
+				F.zoom.x && (r.x = j(W.view.x, i.x - o.x)), F.zoom.y && (r.y = j(W.view.y, i.y - o.y)), $(r, !0);
 				return;
 			}
 			if (!(U.size > 1) && (!a || a.touch || !n.touch)) {
@@ -362,7 +363,7 @@ var N = (e) => ({
 			if (W = null, !i) return;
 			if (a?.kind === "point") {
 				if (i.moved) {
-					let n = he(e, t);
+					let n = Se(e, t);
 					q(), n && K("drop", {
 						item: a.item,
 						x: n.x,
@@ -379,12 +380,12 @@ var N = (e) => ({
 				return;
 			}
 			let o = Date.now();
-			if (i.touch && o - G.time < ae && Math.hypot(e - G.x, t - G.y) < 24 && L) {
+			if (i.touch && o - G.time < de && Math.hypot(e - G.x, t - G.y) < 24 && L) {
 				G = {
 					time: 0,
 					x: e,
 					y: t
-				}, _e();
+				}, we();
 				return;
 			}
 			G = {
@@ -392,9 +393,9 @@ var N = (e) => ({
 				x: e,
 				y: t
 			};
-			let s = ve(e, t);
+			let s = Te(e, t);
 			if (s) {
-				Y()?.legend?.toggle && ye(s.id);
+				Y()?.legend?.toggle && Ee(s.id);
 				return;
 			}
 			let c = Q(e, t, i.touch);
@@ -406,8 +407,8 @@ var N = (e) => ({
 				}), K("click", c);
 				return;
 			}
-			if (i.touch && Z(null), me(e, t)) {
-				let n = he(e, t);
+			if (i.touch && Z(null), xe(e, t)) {
+				let n = Se(e, t);
 				n && K("plotClick", n);
 			}
 		},
@@ -417,16 +418,13 @@ var N = (e) => ({
 		pointerLeave() {
 			!W && H && Z(null);
 		},
-		zoomAt: ge,
-		resetZoom: _e,
-		getView: () => N(I),
+		zoomAt: Ce,
+		resetZoom: we,
+		getView: () => g(F, I),
 		setView(e) {
-			V || $({
-				x: e.x ?? I.x,
-				y: e.y ?? I.y
-			}, !1);
+			V || $(h(F, e, I), !1);
 		},
-		toggleSeries: ye,
+		toggleSeries: Ee,
 		clearHover() {
 			H && Z(null);
 		},
@@ -436,26 +434,26 @@ var N = (e) => ({
 		},
 		toPixel(e, t) {
 			let n = X();
-			return n ? c(n, e, f(F, t)) : null;
+			return n ? c(n, p(F, e), m(F, t)) : null;
 		},
 		fromPixel(e, t) {
 			let n = X();
 			if (!n) return null;
 			let r = s(n, e, t);
 			return {
-				x: r.x,
-				y: u(F, r.y)
+				x: u(F, r.x),
+				y: d(F, r.y)
 			};
 		},
 		on(e, t) {
-			let n = _[e];
-			return n || (n = /* @__PURE__ */ new Set(), _[e] = n), n.add(t), () => {
+			let n = x[e];
+			return n || (n = /* @__PURE__ */ new Set(), x[e] = n), n.add(t), () => {
 				n.delete(t);
 			};
 		},
 		destroy() {
 			V = !0, U.clear();
-			for (let e of Object.keys(_)) delete _[e];
+			for (let e of Object.keys(x)) delete x[e];
 		}
 	};
 }, I = (t, n, r, i) => {
@@ -476,14 +474,14 @@ var N = (e) => ({
 	for (let e = 0; e < t.length; e += 4) n[e] = t[e + 1], n[e + 1] = t[e], n[e + 2] = t[e + 3], n[e + 3] = t[e + 2];
 	return n;
 }, z = (e, i = {}) => {
-	let { model: s, view: l, layout: u } = e, d = u.scales, { plot: f } = u, p = d.horizontal, m = i.maxDots ?? 4e3, h = i.maxBars ?? 2e3, g = Math.max(1, i.columnWidth ?? 1), v = p ? f.y : f.x, y = v + (p ? f.height : f.width), b = [], x = s.series.filter((e) => !e.hidden && e.cols.count > 0).sort((e, t) => L[e.type] - L[t.type] || e.index - t.index);
-	for (let e of x) {
-		let { x: u, y: x, count: C, sorted: w } = e.cols;
+	let { model: s, view: l, layout: u } = e, d = u.scales, { plot: f } = u, p = d.horizontal, m = i.maxDots ?? 4e3, h = i.maxBars ?? 2e3, g = Math.max(1, i.columnWidth ?? 1), _ = p ? f.y : f.x, v = _ + (p ? f.height : f.width), y = [], b = s.series.filter((e) => !e.hidden && e.cols.count > 0).sort((e, t) => L[e.type] - L[t.type] || e.index - t.index);
+	for (let e of b) {
+		let { x: u, y: b, count: S, sorted: C } = e.cols;
 		if (e.type === "line" || e.type === "area") {
-			let [t, n] = I(u, C, w, l.x), i = e.stackTop ?? x, a = r(u, i, t, n, e.curve), o = e.stackBase ? r(u, e.stackBase, t, n, e.curve).points : null, f = a.length, m = a.points, h = o;
-			if (w && f > (y - v) * 2 / g) {
+			let [t, n] = I(u, S, C, l.x), i = e.stackTop ?? b, a = r(u, i, t, n, e.curve), o = e.stackBase ? r(u, e.stackBase, t, n, e.curve).points : null, f = a.length, m = a.points, h = o;
+			if (C && f > (v - _) * 2 / g) {
 				if (o) {
-					let e = _(m, 0, f, (e) => d.xToPx(e) / g), t = new Float64Array(e.length * 2), n = new Float64Array(e.length * 2), r = 0, i = 0;
+					let e = x(m, 0, f, (e) => d.xToPx(e) / g), t = new Float64Array(e.length * 2), n = new Float64Array(e.length * 2), r = 0, i = 0;
 					for (let a = 0; a < e.length; a++) {
 						let s = e.points[a * 2];
 						for (; i < f - 1 && m[i * 2] < s;) i++;
@@ -491,26 +489,26 @@ var N = (e) => ({
 					}
 					m = t, h = n, f = r;
 				} else {
-					let e = _(m, 0, f, (e) => d.xToPx(e) / g);
+					let e = x(m, 0, f, (e) => d.xToPx(e) / g);
 					m = e.points, f = e.length;
 				}
 			}
-			let S = e.type === "area" && !!e.cols.y0 && !!h, T = [], E = [], D = [], O = [], k = [], A = [], j = () => {
-				O.length && (T.push(O), E.push(k), S && D.push(A)), O = [], k = [], A = [];
+			let w = e.type === "area" && !!e.cols.y0 && !!h, T = [], E = [], D = [], O = [], k = [], A = [], ee = () => {
+				O.length && (T.push(O), E.push(k), w && D.push(A)), O = [], k = [], A = [];
 			};
 			for (let e = 0; e < f; e++) {
 				let t = m[e * 2], n = m[e * 2 + 1], r = h ? h[e * 2 + 1] : 0;
 				if (!Number.isFinite(t) || !Number.isFinite(n) || !Number.isFinite(r)) {
-					j();
+					ee();
 					continue;
 				}
 				let i = c(d, t, n);
-				if (O.push(i.x, i.y), h && k.push(d.yToPx(r)), S) {
+				if (O.push(i.x, i.y), h && k.push(d.yToPx(r)), w) {
 					let e = c(d, t, r);
 					A.push(e.x, e.y);
 				}
 			}
-			if (j(), e.type === "area" && b.push({
+			if (ee(), e.type === "area" && y.push({
 				kind: "area",
 				seriesIndex: e.index,
 				color: e.colorCss,
@@ -521,13 +519,13 @@ var N = (e) => ({
 				...p ? { horizontal: !0 } : {}
 			}), e.lineWidth > 0) {
 				let t = e.type === "area" ? Math.min(e.lineWidth, 2) : e.lineWidth;
-				b.push({
+				y.push({
 					kind: "line",
 					seriesIndex: e.index,
 					color: e.colorCss,
 					width: t,
 					segments: T
-				}), S && b.push({
+				}), w && y.push({
 					kind: "line",
 					seriesIndex: e.index,
 					color: e.colorCss,
@@ -538,23 +536,23 @@ var N = (e) => ({
 			continue;
 		}
 		if (e.type === "bar" && e.barBase && e.barTop) {
-			let [n, r] = I(u, C, w, l.x), i = Math.max(e.barHalfWidth / Math.abs(d.xPerPx), .5), a = [], o = [], s = r - n > h, c = NaN;
+			let [n, r] = I(u, S, C, l.x), i = Math.max(e.barHalfWidth / Math.abs(d.xPerPx), .5), a = [], o = [], s = r - n > h, c = NaN;
 			for (let l = n; l < r; l++) {
 				let n = e.barBase[l], r = e.barTop[l];
 				if (!Number.isFinite(n) || !Number.isFinite(r)) continue;
 				let f = d.xToPx(u[l] + e.barOffset);
-				if (f + i < v || f - i > y) continue;
-				let p = d.yToPx(n), m = d.yToPx(r), h = Math.min(p, m), g = Math.max(1, Math.abs(p - m)), _ = Math.floor(f);
-				if (s && _ === c && a.length) {
+				if (f + i < _ || f - i > v) continue;
+				let p = d.yToPx(n), m = d.yToPx(r), h = Math.min(p, m), g = Math.max(1, Math.abs(p - m)), y = Math.floor(f);
+				if (s && y === c && a.length) {
 					let e = a.length - 4, t = Math.max(a[e + 1] + a[e + 3], h + g);
 					a[e + 1] = Math.min(a[e + 1], h), a[e + 3] = t - a[e + 1];
 					continue;
 				}
-				c = _, a.push(f - i, h, i * 2, g);
+				c = y, a.push(f - i, h, i * 2, g);
 				let b = e.pointColors?.[l];
 				o.push(b ? t(b) : e.colorCss);
 			}
-			b.push({
+			y.push({
 				kind: "bars",
 				seriesIndex: e.index,
 				color: e.colorCss,
@@ -566,22 +564,22 @@ var N = (e) => ({
 			continue;
 		}
 		if (e.type === "boxplot") {
-			b.push(...oe(e, d, l.x, v, y, h));
+			y.push(...fe(e, d, l.x, _, v, h));
 			continue;
 		}
 		if (e.type === "candlestick") {
-			let [n, r] = I(u, C, w, l.x), { open: i, high: a, low: o } = e.cols, s = Math.max(e.barHalfWidth / Math.abs(d.xPerPx), 1), c = t(e.upColor), f = t(e.downColor), p = [], m = [], g = [], _ = [], S = Math.max(1, Math.ceil((r - n) / h));
-			for (let e = n; e < r; e += S) {
-				let t = x[e], n = i ? i[e] : t;
+			let [n, r] = I(u, S, C, l.x), { open: i, high: a, low: o } = e.cols, s = Math.max(e.barHalfWidth / Math.abs(d.xPerPx), 1), c = t(e.upColor), f = t(e.downColor), p = [], m = [], g = [], x = [], w = Math.max(1, Math.ceil((r - n) / h));
+			for (let e = n; e < r; e += w) {
+				let t = b[e], n = i ? i[e] : t;
 				if (!Number.isFinite(t) || !Number.isFinite(n)) continue;
 				let r = d.xToPx(u[e]);
-				if (r + s < v || r - s > y) continue;
-				let l = t < n ? f : c, h = d.yToPx(a ? a[e] : Math.max(n, t)), b = d.yToPx(o ? o[e] : Math.min(n, t));
-				p.push(r - .5, Math.min(h, b), 1, Math.abs(b - h)), g.push(l);
+				if (r + s < _ || r - s > v) continue;
+				let l = t < n ? f : c, h = d.yToPx(a ? a[e] : Math.max(n, t)), y = d.yToPx(o ? o[e] : Math.min(n, t));
+				p.push(r - .5, Math.min(h, y), 1, Math.abs(y - h)), g.push(l);
 				let S = d.yToPx(n), C = d.yToPx(t);
-				m.push(r - s, Math.min(S, C), s * 2, Math.max(1, Math.abs(S - C))), _.push(l);
+				m.push(r - s, Math.min(S, C), s * 2, Math.max(1, Math.abs(S - C))), x.push(l);
 			}
-			b.push({
+			y.push({
 				kind: "bars",
 				seriesIndex: e.index,
 				color: c,
@@ -592,20 +590,20 @@ var N = (e) => ({
 				seriesIndex: e.index,
 				color: c,
 				rects: R(d, m),
-				colors: _,
+				colors: x,
 				radius: 1
 			});
 			continue;
 		}
 		if (e.type === "heatmap") {
 			let r = Math.abs(e.cellHalf.x / d.xPerPx), i = Math.abs(e.cellHalf.y / d.yPerPx), s = [], c = [], l = a(r * 2, i * 2, e.radius), p = l.inset;
-			for (let a = 0; a < C && s.length / 4 < h * 4; a++) {
+			for (let a = 0; a < S && s.length / 4 < h * 4; a++) {
 				let l = e.cellColors?.[a];
 				if (!l) continue;
-				let m = o(d, d.xToPx(u[a]) - r, d.xToPx(u[a]) + r, d.yToPx(x[a]) - i, d.yToPx(x[a]) + i);
+				let m = o(d, d.xToPx(u[a]) - r, d.xToPx(u[a]) + r, d.yToPx(b[a]) - i, d.yToPx(b[a]) + i);
 				m.x + m.width < f.x || m.x > f.x + f.width || m.y + m.height < f.y || m.y > f.y + f.height || (s.push(m.x + p, m.y + p, m.width - p * 2, m.height - p * 2), c.push(t(n(l))));
 			}
-			b.push({
+			y.push({
 				kind: "bars",
 				seriesIndex: e.index,
 				color: e.colorCss,
@@ -615,12 +613,12 @@ var N = (e) => ({
 			});
 			continue;
 		}
-		let T = [], E = [], D = (n) => {
+		let w = [], T = [], E = (n) => {
 			let r = e.pointColors?.[n];
 			return r ? t(r) : e.colorCss;
 		}, O = [], k = [];
-		for (let e = 0; e < C; e++) {
-			let t = u[e], n = x[e];
+		for (let e = 0; e < S; e++) {
+			let t = u[e], n = b[e];
 			if (!Number.isFinite(t) || !Number.isFinite(n)) continue;
 			let r = c(d, t, n);
 			r.x < f.x || r.x > f.x + f.width || r.y < f.y || r.y > f.y + f.height || (O.push(e), k.push(r.x, r.y));
@@ -631,20 +629,20 @@ var N = (e) => ({
 				let a = Math.floor((k[i * 2] - f.x) / t), o = Math.floor((k[i * 2 + 1] - f.y) / t);
 				r.set(o * n + a, e);
 			});
-			for (let [e, i] of r) T.push(f.x + (e % n + .5) * t, f.y + (Math.floor(e / n) + .5) * t, t), E.push(D(i));
+			for (let [e, i] of r) w.push(f.x + (e % n + .5) * t, f.y + (Math.floor(e / n) + .5) * t, t), T.push(E(i));
 		} else O.forEach((t, n) => {
-			T.push(k[n * 2], k[n * 2 + 1], S(e, t)), E.push(D(t));
+			w.push(k[n * 2], k[n * 2 + 1], D(e, t)), T.push(E(t));
 		});
-		b.push({
+		y.push({
 			kind: "dots",
 			seriesIndex: e.index,
 			opacity: e.opacity,
-			dots: T,
-			colors: E
+			dots: w,
+			colors: T
 		});
 	}
-	return b;
-}, oe = (e, n, r, i, a, o) => {
+	return y;
+}, fe = (e, n, r, i, a, o) => {
 	let { x: s, y: c, count: l, sorted: u, high: d, low: f, q1: p, q3: m, outliers: h } = e.cols, [g, _] = I(s, l, u, r), v = Math.max(e.barHalfWidth / Math.abs(n.xPerPx), 1), y = Math.max(1, e.lineWidth), b = [], x = [], S = [], C = [], w = [], T = [], E = Math.max(1, Math.ceil((_ - g) / o)), D = (e, t, n) => {
 		x.push(e - y / 2, Math.min(t, n), y, Math.abs(t - n));
 	}, O = (e, t, n, r = y) => {
@@ -655,11 +653,11 @@ var N = (e) => ({
 		if (!Number.isFinite(o)) continue;
 		let l = n.xToPx(s[r] + e.barOffset);
 		if (l + v < i || l - v > a) continue;
-		let u = e.pointColors?.[r], g = u ? t(u) : e.colorCss, _ = n.yToPx(f && Number.isFinite(f[r]) ? f[r] : o), E = n.yToPx(d && Number.isFinite(d[r]) ? d[r] : o), k = n.yToPx(p && Number.isFinite(p[r]) ? p[r] : o), A = n.yToPx(m && Number.isFinite(m[r]) ? m[r] : o), j = x.length;
+		let u = e.pointColors?.[r], g = u ? t(u) : e.colorCss, _ = n.yToPx(f && Number.isFinite(f[r]) ? f[r] : o), E = n.yToPx(d && Number.isFinite(d[r]) ? d[r] : o), k = n.yToPx(p && Number.isFinite(p[r]) ? p[r] : o), A = n.yToPx(m && Number.isFinite(m[r]) ? m[r] : o), ee = x.length;
 		b.push(l - v, Math.min(k, A), v * 2, Math.abs(k - A)), S.push(g), D(l, _, k), D(l, A, E), D(l - v, k, A), D(l + v, k, A), O(l, v / 2, _), O(l, v / 2, E), O(l, v, k), O(l, v, A), O(l, v, n.yToPx(o), Math.max(2, y * 1.6));
-		for (let e = j; e < x.length; e += 4) C.push(g);
-		let M = h?.[r];
-		if (M) for (let t of M) {
+		for (let e = ee; e < x.length; e += 4) C.push(g);
+		let te = h?.[r];
+		if (te) for (let t of te) {
 			let r = n.horizontal ? {
 				x: n.yToPx(t),
 				y: l