minerva-design 1.4.0 → 1.5.0

package/dist/native/charts/src/engine/controller.js

@@ -2,29 +2,29 @@ import { toCss as e, unpackColor as t } from "./color.js";
 import { curvePoints as n } from "./curve.js";
 import { lowerBound as r } from "./data.js";
 import { decimateMinMax as i } from "./decimate.js";
-import { createScales as a, screenRect as o, toData as s, toScreen as c } from "./layout.js";
-import { buildModel as l } from "./model.js";
-import { font as u, placeLabels as d, rectOf as f, textBox as p } from "./overlay.js";
-import { collectPointLabels as m, crosshairAt as h, dotSize as g, hitTest as _, hoverMarks as v, layoutChart as y, legendShape as b, resolveAnnotations as x, sameHover as S, tooltipContent as C } from "./scene.js";
-import { createTheme as w } from "./theme.js";
-import { clampRange as T, panRange as E, sameRange as D, zoomRange as O } from "./viewport.js";
+import { createScales as a, heatCellStyle as o, screenRect as s, toData as c, toScreen as l } from "./layout.js";
+import { buildModel as u, fromPlotY as d, heatPosition as f, toPlotY as p } from "./model.js";
+import { font as m, placeLabels as h, rectOf as g, textBox as _ } from "./overlay.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";
 //#region ../charts/src/engine/controller.ts
-var k = (e) => ({
+var N = (e) => ({
 	x: [e.x[0], e.x[1]],
 	y: [e.y[0], e.y[1]]
-}), A = 6, j = 10, ee = 320, te = 20, M = (e) => {
-	let t = e.options, n = e.theme, r = w(n, t.palette), i = /* @__PURE__ */ new Map(), o = /* @__PURE__ */ new Set(), M = {}, N, P = {
+}), re = 6, ie = 10, ae = 320, P = 20, F = (e) => {
+	let t = e.options, n = e.theme, r = j(n, t.palette), i = /* @__PURE__ */ new Map(), o = /* @__PURE__ */ new Set(), s = {}, F, I = {
 		x: [0, 1],
 		y: [0, 1]
-	}, F = !1, I = 0, L = 0, ne = [], R = null, z = !0, re = "", B = !1, V = null, H = /* @__PURE__ */ new Map(), U = null, W = {
+	}, L = !1, R = 0, z = 0, oe = [], B = null, se = !0, ce = "", V = !1, H = null, U = /* @__PURE__ */ new Map(), W = null, G = {
 		time: 0,
 		x: 0,
 		y: 0
-	}, G = (e, t) => {
-		M[e]?.forEach((e) => e(t));
-	}, K = () => {
-		z = !0, B || e.onInvalidate?.();
-	}, ie = () => {
+	}, K = (e, t) => {
+		s[e]?.forEach((e) => e(t));
+	}, q = () => {
+		se = !0, V || e.onInvalidate?.();
+	}, le = () => {
 		let e = t.interaction;
 		if (e === !1) return null;
 		let n = typeof e == "object" ? e : {};
@@ -32,42 +32,75 @@ var k = (e) => ({
 			pan: n.pan ?? !0,
 			dragPoints: n.dragPoints ?? !1
 		};
-	}, q = (t, n = r.fontSize, i = 400) => e.measureText(t, u(r, n, i)), J = () => {
-		N = l(t, r, o, i);
-		let { base: e, minSpan: n } = N;
-		F ? (P = {
-			x: N.zoom.x ? T(P.x, e.x, n.x) : [...e.x],
-			y: N.zoom.y ? T(P.y, e.y, n.y) : [...e.y]
-		}, F = !D(P.x, e.x) || !D(P.y, e.y)) : P = k(e), ne = x(t.annotations, r), V && (V.event.items.every((e) => N.series[e.seriesIndex] && !N.series[e.seriesIndex].hidden && e.index < N.series[e.seriesIndex].cols.count) || Z(null)), K();
-	}, ae = () => {
+	}, J = (t, n = r.fontSize, i = 400) => e.measureText(t, m(r, n, i)), ue = () => {
+		F = u(t, r, o, i);
+		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 = () => {
 		let e = t.legend, n = t.series.filter((e) => e.name).length;
-		if (!(e === void 0 ? n > 1 : e)) return null;
-		let r = typeof e == "object" ? e : {}, i = r.position === "bottom" ? "bottom" : "top", a = [], o = 4, s = 0;
-		for (let e of N.series) {
-			let t = 14 + q(e.name, 12) + 8;
-			o + t > I - 4 && o > 4 && (o = 4, s++), a.push({
+		if (!D(e, F, n)) return null;
+		let r = typeof e == "object" ? e : {}, i = r.position === "bottom" ? "bottom" : "top", a = y(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 {
+				entries: [],
+				colors: {
+					bar: {
+						x: o,
+						y: s - 4,
+						width: n,
+						height: 8
+					},
+					stops: a.stops,
+					labels: [{
+						text: e,
+						x: o - 8,
+						y: s,
+						align: "right"
+					}, {
+						text: t,
+						x: r + 8,
+						y: s,
+						align: "left"
+					}],
+					ticks: a.labels.filter((e) => e.at > 0 && e.at < 1).map((e) => o + e.at * n),
+					caret: null
+				},
+				position: i,
+				toggle: !1,
+				height: 26
+			};
+		}
+		let o = [], s = 4, c = 0;
+		for (let e of F.series) {
+			let t = 14 + J(e.name, 12) + 8;
+			s + t > R - 4 && s > 4 && (s = 4, c++), o.push({
 				id: e.id,
 				name: e.name,
 				color: e.colorCss,
-				shape: b(e.type),
+				shape: E(e.type),
 				hidden: e.hidden,
 				box: {
-					x: o,
-					y: s * te,
+					x: s,
+					y: c * P,
 					width: t,
-					height: te
+					height: P
 				}
-			}), o += t + 10;
+			}), s += t + 10;
 		}
-		let c = (s + 1) * te + 6;
-		if (i === "bottom") for (let e of a) e.box.y += L - c + 6;
+		let l = (c + 1) * P + 6;
+		if (i === "bottom") for (let e of o) e.box.y += z - l + 6;
 		return {
-			entries: a,
+			entries: o,
+			colors: null,
 			position: i,
 			toggle: r.toggle ?? !0,
-			height: c
+			height: l
 		};
-	}, oe = (e, n, r) => {
+	}, fe = (e, n, r) => {
 		let i = t.tooltip;
 		if (i === !1) return null;
 		let a = typeof i == "object" ? i.render : void 0, o = null;
@@ -76,51 +109,53 @@ var k = (e) => ({
 			if (t === null || t === "") return null;
 			typeof t == "string" && (o = t.split("\n"));
 		}
-		let s = C(N, e, R?.layout.yTicks ?? null, R?.layout.y2Ticks ?? null), c = 0, l;
+		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;
 		if (o) {
-			for (let e of o) c = Math.max(c, q(e, 12));
+			for (let e of o) c = Math.max(c, J(e, 12));
 			l = o.length;
 		} else {
-			c = q(s.title, 12, 600) + (s.titleColor ? 14 : 0);
-			for (let e of s.rows) c = Math.max(c, (e.color ? 14 : 0) + q(e.name, 12) + 16 + q(e.value, 12, 600));
-			l = 1 + s.rows.length;
+			c = J(s.title, 12, 600) + (s.titleColor ? 14 : 0), s.subtitle && (c = Math.max(c, J(s.subtitle, 11) + (s.titleColor ? 14 : 0)));
+			let e = 0, t = 0;
+			for (let n of s.rows) e = Math.max(e, J(n.name, 12)), t = Math.max(t, J(n.value, 12, 600));
+			s.rows.length && (c = Math.max(c, u + e + 16 + t)), l = 1 + +!!s.subtitle + s.rows.length;
 		}
-		let u = Math.ceil(Math.max(c, 96) + 16 + 4), d = l * 18 + 16, f = n + 14;
-		f + u > I - 4 && (f = n - 14 - u), f = Math.max(4, Math.min(f, I - u - 4));
-		let p = Math.max(4, Math.min(r - d / 2, L - d - 4));
+		let d = Math.ceil(Math.max(c, 96) + 16 + 4), f = l * 18 + 16, p = n + 14;
+		p + d > R - 4 && (p = n - 14 - d), p = Math.max(4, Math.min(p, R - d - 4));
+		let m = Math.max(4, Math.min(r - f / 2, z - f - 4));
 		return {
 			content: s,
 			text: o,
 			box: {
-				x: f,
-				y: p,
-				width: u,
-				height: d
+				x: p,
+				y: m,
+				width: d,
+				height: f
 			},
 			lineHeight: 18,
-			padding: 8
+			padding: 8,
+			swatchWidth: u
 		};
-	}, se = () => {
-		if (I <= 0 || L <= 0) return null;
-		let e = ae(), n = e?.position === "top" ? e.height : 0, i = y({
-			model: N,
-			view: P,
+	}, pe = () => {
+		if (R <= 0 || z <= 0) return null;
+		let e = de(), n = e?.position === "top" ? e.height : 0, i = T({
+			model: F,
+			view: I,
 			theme: r,
-			width: I,
-			height: L - (e?.height ?? 0),
+			width: R,
+			height: z - (e?.height ?? 0),
 			padding: t.padding,
 			top: n,
-			measure: (e) => q(e)
-		}), a = m(N, P, i.scales, i.yTicks), o = [], s = r.fontSize + 4;
-		for (let e of ne) {
+			measure: (e) => J(e)
+		}), a = v(F, I, i.scales, i.yTicks), o = [], s = r.fontSize + 4;
+		for (let e of oe) {
 			if (e.type === "text" && e.text) {
-				o.push(p(e, i.scales, q(e.text, r.fontSize, e.weight), s));
+				o.push(_(e, i.scales, J(e.text, r.fontSize, e.weight), s));
 				continue;
 			}
 			if (e.type !== "rect" || !e.label) continue;
-			let t = f(e, i.scales);
+			let t = g(e, i.scales);
 			if (t.width <= 0 || t.height <= 0) continue;
-			let n = q(e.label, r.fontSize + 1, 600), a = e.labelPosition;
+			let n = J(e.label, r.fontSize + 1, 600), a = e.labelPosition;
 			o.push({
 				x: a.endsWith("left") ? t.x + 10 : a.endsWith("right") ? t.x + t.width - 10 - n : t.x + (t.width - n) / 2,
 				y: a.startsWith("top") ? t.y + 10 : a.startsWith("bottom") ? t.y + t.height - 10 - s : t.y + (t.height - s) / 2,
@@ -128,96 +163,102 @@ var k = (e) => ({
 				height: s
 			});
 		}
-		let c = d(a, i.plot, (e) => q(e), s - 2, o), l = {
-			width: I,
-			height: L,
+		let c = h(a, i.plot, (e) => J(e), s - 2, o), l = {
+			width: R,
+			height: z,
 			theme: r,
-			model: N,
-			view: k(P),
+			model: F,
+			view: N(I),
 			layout: i,
-			annotations: ne,
+			annotations: oe,
 			pointLabels: c,
 			legend: e,
 			hover: null,
-			dragging: null
+			dragging: null,
+			connectors: b(F, i.scales)
 		};
-		if (R = l, V) {
-			let e = h(N, i.scales, V.event, t.crosshair), n = i.scales.horizontal;
+		if (B = l, H) {
+			let n = x(F, i.scales, H.event, t.crosshair), r = i.scales.horizontal;
 			l.hover = {
-				event: V.event,
-				marks: v(N, i.scales, V.event),
-				crosshairX: n ? null : e,
-				crosshairY: n ? e : null,
-				tooltip: U?.kind === "pan" || U?.kind === "point" ? null : oe(V.event, V.x, V.y)
+				event: H.event,
+				marks: w(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)
 			};
+			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 + f(s, o.value) * a.bar.width);
 		}
-		if (U?.kind === "point") {
-			let e = N.series[U.item.seriesIndex];
+		if (W?.kind === "point") {
+			let e = F.series[W.item.seriesIndex];
 			l.dragging = {
-				x: U.x,
-				y: U.y,
-				color: U.item.color,
-				size: (e ? g(e, U.item.index) : 8) + 6
+				x: W.x,
+				y: W.y,
+				color: W.item.color,
+				size: (e ? S(e, W.item.index) : 8) + 6
 			};
 		}
-		let u = i.plot, _ = `${u.x},${u.y},${u.width},${u.height}`;
-		return _ !== re && (re = _, G("layout", { ...u })), l;
-	}, Y = () => ((z || !R) && (z = !1, R = se()), R), X = () => Y()?.layout.scales ?? null, Z = (e) => {
-		let t = !S(V?.event ?? null, e?.event ?? null);
-		V = e, K(), t && G("hover", e ? e.event : null);
+		let u = i.plot, d = `${u.x},${u.y},${u.width},${u.height}`;
+		return d !== ce && (ce = d, 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);
+		H = e, q(), t && K("hover", e ? e.event : null);
 	}, Q = (e, t, n) => {
 		let r = X();
-		return r ? _(N, r, R?.layout.xTicks ?? null, e, t, n ? 8 : 0) : null;
-	}, ce = (e, t) => {
+		return r ? C(F, r, B?.layout.xTicks ?? null, e, t, n ? 8 : 0) : null;
+	}, me = (e, t) => {
 		let n = X()?.plot;
 		return !!n && e >= n.x && e <= n.x + n.width && t >= n.y && t <= n.y + n.height;
-	}, le = (e, t) => {
+	}, he = (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));
-		return s(n, i, a);
+		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 = c(n, i, a);
+		return {
+			x: o.x,
+			y: d(F, o.y)
+		};
 	}, $ = (e, t) => {
-		let { base: n, minSpan: r } = N;
-		P = {
-			x: T(e.x, n.x, r.x),
-			y: T(e.y, n.y, r.y)
-		}, F = !D(P.x, n.x) || !D(P.y, n.y), t && G("zoom", k(P)), K();
-	}, ue = (e, t, n) => {
+		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) => {
 		let r = X();
-		if (!r || !N.zoom.x && !N.zoom.y) return;
-		let i = k(P), a = s(r, e, t);
-		N.zoom.x && (i.x = O(P.x, a.x, n)), N.zoom.y && (i.y = O(P.y, a.y, n)), $(i, !0);
-	}, de = () => {
-		F && $(k(N.base), !0);
-	}, fe = (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, pe = (e) => {
-		o.has(e) ? o.delete(e) : o.add(e), J();
-	}, me = () => {
-		let [e, t] = [...H.values()];
-		U = {
+		if (!r || !F.zoom.x && !F.zoom.y) return;
+		let i = N(I), a = c(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 = () => {
+		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 = () => {
+		let [e, t] = [...U.values()];
+		W = {
 			kind: "pinch",
-			view: k(P),
+			view: N(I),
 			distance: Math.max(1, Math.hypot(e.x - t.x, e.y - t.y)),
 			midX: (e.x + t.x) / 2,
 			midY: (e.y + t.y) / 2
 		}, Z(null);
 	};
-	return N = l(t, r, o, i), J(), {
+	return F = u(t, r, o, i), ue(), {
 		setOptions(e) {
-			if (B) return;
+			if (V) return;
 			let i = (e.palette ?? []).join() !== (t.palette ?? []).join();
-			t = e, i && (r = w(n, t.palette)), J();
+			t = e, i && (r = j(n, t.palette)), ue();
 		},
 		setTheme(e) {
-			B || (n = e, r = w(n, t.palette), J());
+			V || (n = e, r = j(n, t.palette), ue());
 		},
 		setSize(e, t) {
-			(e !== I || t !== L) && (I = Math.max(0, e), L = Math.max(0, t), K());
+			(e !== R || t !== z) && (R = Math.max(0, e), z = Math.max(0, t), q());
 		},
 		getScene: Y,
 		pointerDown: (e, t, n = {}) => {
-			if (B) return;
+			if (V) return;
 			let r = n.id ?? 0, i = !!n.touch;
-			H.set(r, {
+			U.set(r, {
 				x: e,
 				y: t,
 				startX: e,
@@ -225,12 +266,12 @@ var k = (e) => ({
 				touch: i,
 				moved: !1
 			});
-			let a = ie();
-			if (H.size === 2) {
-				a && (N.zoom.x || N.zoom.y) && U?.kind !== "point" && me();
+			let a = le();
+			if (U.size === 2) {
+				a && (F.zoom.x || F.zoom.y) && W?.kind !== "point" && be();
 				return;
 			}
-			if (H.size > 2 || !a) {
+			if (U.size > 2 || !a) {
 				if (!a && i) {
 					let n = Q(e, t, !0);
 					Z(n ? {
@@ -242,9 +283,9 @@ var k = (e) => ({
 				return;
 			}
 			if (a.dragPoints) {
-				let n = Q(e, t, i)?.items.find((e) => N.series[e.seriesIndex].type === "scatter");
+				let n = Q(e, t, i)?.items.find((e) => F.series[e.seriesIndex].type === "scatter");
 				if (n) {
-					U = {
+					W = {
 						kind: "point",
 						item: n,
 						x: e,
@@ -253,16 +294,16 @@ var k = (e) => ({
 					return;
 				}
 			}
-			if (F && a.pan && ce(e, t)) {
-				U = {
+			if (L && a.pan && me(e, t)) {
+				W = {
 					kind: "pan",
-					view: k(P),
+					view: N(I),
 					x: e,
 					y: t
 				};
 				return;
 			}
-			if (U = null, i) {
+			if (W = null, i) {
 				let n = Q(e, t, !0);
 				Z(n ? {
 					event: n,
@@ -272,35 +313,35 @@ var k = (e) => ({
 			}
 		},
 		pointerMove: (e, t, n = {}) => {
-			if (B) return;
-			let r = n.id ?? 0, i = H.get(r);
-			if (i && (i.x = e, i.y = t, !i.moved && Math.hypot(e - i.startX, t - i.startY) > (i.touch ? j : A) && (i.moved = !0)), U?.kind === "pinch" && H.size >= 2) {
-				let [e, t] = [...H.values()], n = Math.max(1, Math.hypot(e.x - t.x, e.y - t.y)), r = (e.x + t.x) / 2, i = (e.y + t.y) / 2, o = X();
+			if (V) return;
+			let r = n.id ?? 0, i = U.get(r);
+			if (i && (i.x = e, i.y = t, !i.moved && Math.hypot(e - i.startX, t - i.startY) > (i.touch ? ie : re) && (i.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, i = (e.y + t.y) / 2, o = X();
 				if (!o) return;
-				let c = a(o.plot, U.view, N.x.reverse, N.y.reverse, N.horizontal), l = U.distance / n, u = k(U.view), d = s(c, U.midX, U.midY), f = s(c, r, i);
-				N.zoom.x && (u.x = O(U.view.x, d.x, l), u.x = E(u.x, (d.x - f.x) * l)), N.zoom.y && (u.y = O(U.view.y, d.y, l), u.y = E(u.y, (d.y - f.y) * l)), $(u, !0);
+				let s = a(o.plot, W.view, F.x.reverse, F.y.reverse, F.horizontal), l = W.distance / n, u = N(W.view), d = c(s, W.midX, W.midY), f = c(s, r, i);
+				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);
 				return;
 			}
-			if (U?.kind === "point" && i) {
+			if (W?.kind === "point" && i) {
 				if (!i.moved) return;
-				U.x = e, U.y = t;
-				let n = le(e, t);
-				K(), n && G("drag", {
-					item: U.item,
+				W.x = e, W.y = t;
+				let n = he(e, t);
+				q(), n && K("drag", {
+					item: W.item,
 					x: n.x,
 					y: n.y
 				});
 				return;
 			}
-			if (U?.kind === "pan" && i) {
+			if (W?.kind === "pan" && i) {
 				if (!i.moved) return;
 				let n = X();
 				if (!n) return;
-				let r = k(U.view), a = s(n, U.x, U.y), o = s(n, e, t);
-				N.zoom.x && (r.x = E(U.view.x, a.x - o.x)), N.zoom.y && (r.y = E(U.view.y, a.y - o.y)), $(r, !0);
+				let r = N(W.view), a = c(n, W.x, W.y), o = c(n, e, t);
+				F.zoom.x && (r.x = ee(W.view.x, a.x - o.x)), F.zoom.y && (r.y = ee(W.view.y, a.y - o.y)), $(r, !0);
 				return;
 			}
-			if (!(H.size > 1) && (!i || i.touch || !n.touch)) {
+			if (!(U.size > 1) && (!i || i.touch || !n.touch)) {
 				let r = Q(e, t, !!i?.touch || !!n.touch);
 				(r || !i?.touch) && Z(r ? {
 					event: r,
@@ -310,19 +351,19 @@ var k = (e) => ({
 			}
 		},
 		pointerUp: (e, t, n = {}) => {
-			if (B) return;
-			let r = n.id ?? 0, i = H.get(r);
-			H.delete(r);
-			let a = U;
+			if (V) return;
+			let r = n.id ?? 0, i = U.get(r);
+			U.delete(r);
+			let a = W;
 			if (a?.kind === "pinch") {
-				H.size < 2 && (U = null);
+				U.size < 2 && (W = null);
 				return;
 			}
-			if (U = null, !i) return;
+			if (W = null, !i) return;
 			if (a?.kind === "point") {
 				if (i.moved) {
-					let n = le(e, t);
-					K(), n && G("drop", {
+					let n = he(e, t);
+					q(), n && K("drop", {
 						item: a.item,
 						x: n.x,
 						y: n.y
@@ -330,30 +371,30 @@ var k = (e) => ({
 					return;
 				}
 			} else if (a?.kind === "pan" && i.moved) {
-				K();
+				q();
 				return;
 			}
 			if (i.moved) {
-				i.touch && K();
+				i.touch && q();
 				return;
 			}
 			let o = Date.now();
-			if (i.touch && o - W.time < ee && Math.hypot(e - W.x, t - W.y) < 24 && F) {
-				W = {
+			if (i.touch && o - G.time < ae && Math.hypot(e - G.x, t - G.y) < 24 && L) {
+				G = {
 					time: 0,
 					x: e,
 					y: t
-				}, de();
+				}, _e();
 				return;
 			}
-			W = {
+			G = {
 				time: o,
 				x: e,
 				y: t
 			};
-			let s = fe(e, t);
+			let s = ve(e, t);
 			if (s) {
-				Y()?.legend?.toggle && pe(s.id);
+				Y()?.legend?.toggle && ye(s.id);
 				return;
 			}
 			let c = Q(e, t, i.touch);
@@ -362,32 +403,32 @@ var k = (e) => ({
 					event: c,
 					x: e,
 					y: t
-				}), G("click", c);
+				}), K("click", c);
 				return;
 			}
-			if (i.touch && Z(null), ce(e, t)) {
-				let n = le(e, t);
-				n && G("plotClick", n);
+			if (i.touch && Z(null), me(e, t)) {
+				let n = he(e, t);
+				n && K("plotClick", n);
 			}
 		},
 		pointerCancel: (e = {}) => {
-			H.delete(e.id ?? 0), (U?.kind === "point" || H.size < 2) && (U = null), K();
+			U.delete(e.id ?? 0), (W?.kind === "point" || U.size < 2) && (W = null), q();
 		},
 		pointerLeave() {
-			!U && V && Z(null);
+			!W && H && Z(null);
 		},
-		zoomAt: ue,
-		resetZoom: de,
-		getView: () => k(P),
+		zoomAt: ge,
+		resetZoom: _e,
+		getView: () => N(I),
 		setView(e) {
-			B || $({
-				x: e.x ?? P.x,
-				y: e.y ?? P.y
+			V || $({
+				x: e.x ?? I.x,
+				y: e.y ?? I.y
 			}, !1);
 		},
-		toggleSeries: pe,
+		toggleSeries: ye,
 		clearHover() {
-			V && Z(null);
+			H && Z(null);
 		},
 		getPlotRect() {
 			let e = Y()?.layout.plot;
@@ -395,28 +436,33 @@ var k = (e) => ({
 		},
 		toPixel(e, t) {
 			let n = X();
-			return n ? c(n, e, t) : null;
+			return n ? l(n, e, p(F, t)) : null;
 		},
 		fromPixel(e, t) {
 			let n = X();
-			return n ? s(n, e, t) : null;
+			if (!n) return null;
+			let r = c(n, e, t);
+			return {
+				x: r.x,
+				y: d(F, r.y)
+			};
 		},
 		on(e, t) {
-			let n = M[e];
-			return n || (n = /* @__PURE__ */ new Set(), M[e] = n), n.add(t), () => {
+			let n = s[e];
+			return n || (n = /* @__PURE__ */ new Set(), s[e] = n), n.add(t), () => {
 				n.delete(t);
 			};
 		},
 		destroy() {
-			B = !0, H.clear();
-			for (let e of Object.keys(M)) delete M[e];
+			V = !0, U.clear();
+			for (let e of Object.keys(s)) delete s[e];
 		}
 	};
-}, N = (e, t, n, i) => {
+}, I = (e, t, n, i) => {
 	if (!n) return [0, t];
 	let [a, o] = i[0] <= i[1] ? i : [i[1], i[0]];
 	return [Math.max(0, r(e, t, a) - 1), Math.min(t, r(e, t, o) + 1)];
-}, P = {
+}, L = {
 	heatmap: 0,
 	area: 1,
 	bar: 2,
@@ -424,43 +470,43 @@ var k = (e) => ({
 	candlestick: 3,
 	line: 4,
 	scatter: 5
-}, F = (e, t) => {
+}, R = (e, t) => {
 	if (!e.horizontal) return t;
 	let n = Array(t.length);
 	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;
-}, I = (r, a = {}) => {
-	let { model: s, view: l, layout: u } = r, d = u.scales, { plot: f } = u, p = d.horizontal, m = a.maxDots ?? 4e3, h = a.maxBars ?? 2e3, _ = Math.max(1, a.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) => P[e.type] - P[t.type] || e.index - t.index);
+}, z = (r, a = {}) => {
+	let { model: c, view: u, layout: d } = r, f = d.scales, { plot: p } = d, m = f.horizontal, h = a.maxDots ?? 4e3, g = a.maxBars ?? 2e3, _ = Math.max(1, a.columnWidth ?? 1), v = m ? p.y : p.x, y = v + (m ? p.height : p.width), b = [], x = c.series.filter((e) => !e.hidden && e.cols.count > 0).sort((e, t) => L[e.type] - L[t.type] || e.index - t.index);
 	for (let r of x) {
-		let { x: u, y: x, count: S, sorted: C } = r.cols;
+		let { x: d, y: x, count: C, sorted: w } = r.cols;
 		if (r.type === "line" || r.type === "area") {
-			let [e, t] = N(u, S, C, l.x), a = r.stackTop ?? x, o = n(u, a, e, t, r.curve), f = r.stackBase ? n(u, r.stackBase, e, t, r.curve).points : null, m = o.length, h = o.points, g = f;
-			if (C && m > (y - v) * 2 / _) {
-				if (f) {
-					let e = i(h, 0, m, (e) => d.xToPx(e) / _), t = new Float64Array(e.length * 2), n = new Float64Array(e.length * 2), r = 0, a = 0;
+			let [e, t] = I(d, C, w, u.x), a = r.stackTop ?? x, o = n(d, a, e, t, r.curve), s = r.stackBase ? n(d, r.stackBase, e, t, r.curve).points : null, p = o.length, h = o.points, g = s;
+			if (w && p > (y - v) * 2 / _) {
+				if (s) {
+					let e = i(h, 0, p, (e) => f.xToPx(e) / _), t = new Float64Array(e.length * 2), n = new Float64Array(e.length * 2), r = 0, a = 0;
 					for (let i = 0; i < e.length; i++) {
 						let o = e.points[i * 2];
-						for (; a < m - 1 && h[a * 2] < o;) a++;
-						t[r * 2] = o, t[r * 2 + 1] = e.points[i * 2 + 1], n[r * 2] = o, n[r * 2 + 1] = f[a * 2 + 1], r++;
+						for (; a < p - 1 && h[a * 2] < o;) a++;
+						t[r * 2] = o, t[r * 2 + 1] = e.points[i * 2 + 1], n[r * 2] = o, n[r * 2 + 1] = s[a * 2 + 1], r++;
 					}
-					h = t, g = n, m = r;
+					h = t, g = n, p = r;
 				} else {
-					let e = i(h, 0, m, (e) => d.xToPx(e) / _);
-					h = e.points, m = e.length;
+					let e = i(h, 0, p, (e) => f.xToPx(e) / _);
+					h = e.points, p = e.length;
 				}
 			}
-			let w = r.type === "area" && !!r.cols.y0 && !!g, T = [], E = [], D = [], O = [], k = [], A = [], j = () => {
-				O.length && (T.push(O), E.push(k), w && D.push(A)), O = [], k = [], A = [];
+			let S = r.type === "area" && !!r.cols.y0 && !!g, T = [], E = [], D = [], O = [], k = [], A = [], j = () => {
+				O.length && (T.push(O), E.push(k), S && D.push(A)), O = [], k = [], A = [];
 			};
-			for (let e = 0; e < m; e++) {
+			for (let e = 0; e < p; e++) {
 				let t = h[e * 2], n = h[e * 2 + 1], r = g ? g[e * 2 + 1] : 0;
 				if (!Number.isFinite(t) || !Number.isFinite(n) || !Number.isFinite(r)) {
 					j();
 					continue;
 				}
-				let i = c(d, t, n);
-				if (O.push(i.x, i.y), g && k.push(d.yToPx(r)), w) {
-					let e = c(d, t, r);
+				let i = l(f, t, n);
+				if (O.push(i.x, i.y), g && k.push(f.yToPx(r)), S) {
+					let e = l(f, t, r);
 					A.push(e.x, e.y);
 				}
 			}
@@ -469,10 +515,10 @@ var k = (e) => ({
 				seriesIndex: r.index,
 				color: r.colorCss,
 				opacity: r.opacity,
-				baseline: d.yToPx(s.baseline),
+				baseline: f.yToPx(c.baseline),
 				segments: T,
 				...g ? { bottoms: E } : {},
-				...p ? { horizontal: !0 } : {}
+				...m ? { horizontal: !0 } : {}
 			}), r.lineWidth > 0) {
 				let e = r.type === "area" ? Math.min(r.lineWidth, 2) : r.lineWidth;
 				b.push({
@@ -481,7 +527,7 @@ var k = (e) => ({
 					color: r.colorCss,
 					width: e,
 					segments: T
-				}), w && b.push({
+				}), S && b.push({
 					kind: "line",
 					seriesIndex: r.index,
 					color: r.colorCss,
@@ -492,19 +538,19 @@ var k = (e) => ({
 			continue;
 		}
 		if (r.type === "bar" && r.barBase && r.barTop) {
-			let [t, n] = N(u, S, C, l.x), i = Math.max(r.barHalfWidth / Math.abs(d.xPerPx), .5), a = [], o = [], s = n - t > h, c = NaN;
+			let [t, n] = I(d, C, w, u.x), i = Math.max(r.barHalfWidth / Math.abs(f.xPerPx), .5), a = [], o = [], s = n - t > g, c = NaN;
 			for (let l = t; l < n; l++) {
 				let t = r.barBase[l], n = r.barTop[l];
 				if (!Number.isFinite(t) || !Number.isFinite(n)) continue;
-				let f = d.xToPx(u[l] + r.barOffset);
-				if (f + i < v || f - i > y) continue;
-				let p = d.yToPx(t), m = d.yToPx(n), h = Math.min(p, m), g = Math.max(1, Math.abs(p - m)), _ = Math.floor(f);
+				let u = f.xToPx(d[l] + r.barOffset);
+				if (u + i < v || u - i > y) continue;
+				let p = f.yToPx(t), m = f.yToPx(n), h = Math.min(p, m), g = Math.max(1, Math.abs(p - m)), _ = Math.floor(u);
 				if (s && _ === 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 = _, a.push(u - i, h, i * 2, g);
 				let b = r.pointColors?.[l];
 				o.push(b ? e(b) : r.colorCss);
 			}
@@ -512,7 +558,7 @@ var k = (e) => ({
 				kind: "bars",
 				seriesIndex: r.index,
 				color: r.colorCss,
-				rects: F(d, a),
+				rects: R(f, a),
 				...r.pointColors ? { colors: o } : {},
 				radius: r.radius,
 				...r.opacity < 1 ? { opacity: r.opacity } : {}
@@ -520,86 +566,86 @@ var k = (e) => ({
 			continue;
 		}
 		if (r.type === "boxplot") {
-			b.push(...L(r, d, l.x, v, y, h));
+			b.push(...oe(r, f, u.x, v, y, g));
 			continue;
 		}
 		if (r.type === "candlestick") {
-			let [t, n] = N(u, S, C, l.x), { open: i, high: a, low: o } = r.cols, s = Math.max(r.barHalfWidth / Math.abs(d.xPerPx), 1), c = e(r.upColor), f = e(r.downColor), p = [], m = [], g = [], _ = [], w = Math.max(1, Math.ceil((n - t) / h));
-			for (let e = t; e < n; e += w) {
+			let [t, n] = I(d, C, w, u.x), { open: i, high: a, low: o } = r.cols, s = Math.max(r.barHalfWidth / Math.abs(f.xPerPx), 1), c = e(r.upColor), l = e(r.downColor), p = [], m = [], h = [], _ = [], S = Math.max(1, Math.ceil((n - t) / g));
+			for (let e = t; e < n; e += S) {
 				let t = x[e], n = i ? i[e] : t;
 				if (!Number.isFinite(t) || !Number.isFinite(n)) continue;
-				let r = d.xToPx(u[e]);
+				let r = f.xToPx(d[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);
-				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);
+				let u = t < n ? l : c, g = f.yToPx(a ? a[e] : Math.max(n, t)), b = f.yToPx(o ? o[e] : Math.min(n, t));
+				p.push(r - .5, Math.min(g, b), 1, Math.abs(b - g)), h.push(u);
+				let S = f.yToPx(n), C = f.yToPx(t);
+				m.push(r - s, Math.min(S, C), s * 2, Math.max(1, Math.abs(S - C))), _.push(u);
 			}
 			b.push({
 				kind: "bars",
 				seriesIndex: r.index,
 				color: c,
-				rects: F(d, p),
-				colors: g
+				rects: R(f, p),
+				colors: h
 			}, {
 				kind: "bars",
 				seriesIndex: r.index,
 				color: c,
-				rects: F(d, m),
+				rects: R(f, m),
 				colors: _,
 				radius: 1
 			});
 			continue;
 		}
 		if (r.type === "heatmap") {
-			let n = Math.abs(r.cellHalf.x / d.xPerPx), i = Math.abs(r.cellHalf.y / d.yPerPx), a = [], s = [], c = +(n > 3 && i > 3);
-			for (let l = 0; l < S && a.length / 4 < h * 4; l++) {
-				let p = r.cellColors?.[l];
-				if (!p) continue;
-				let m = o(d, d.xToPx(u[l]) - n, d.xToPx(u[l]) + n, d.yToPx(x[l]) - i, d.yToPx(x[l]) + 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 || (a.push(m.x + c, m.y + c, m.width - c * 2, m.height - c * 2), s.push(e(t(p))));
+			let n = Math.abs(r.cellHalf.x / f.xPerPx), i = Math.abs(r.cellHalf.y / f.yPerPx), a = [], c = [], l = o(n * 2, i * 2, r.radius), u = l.inset;
+			for (let o = 0; o < C && a.length / 4 < g * 4; o++) {
+				let l = r.cellColors?.[o];
+				if (!l) continue;
+				let m = s(f, f.xToPx(d[o]) - n, f.xToPx(d[o]) + n, f.yToPx(x[o]) - i, f.yToPx(x[o]) + i);
+				m.x + m.width < p.x || m.x > p.x + p.width || m.y + m.height < p.y || m.y > p.y + p.height || (a.push(m.x + u, m.y + u, m.width - u * 2, m.height - u * 2), c.push(e(t(l))));
 			}
 			b.push({
 				kind: "bars",
 				seriesIndex: r.index,
 				color: r.colorCss,
 				rects: a,
-				colors: s,
-				radius: r.radius
+				colors: c,
+				radius: l.radius
 			});
 			continue;
 		}
-		let w = [], T = [], E = (t) => {
+		let T = [], E = [], D = (t) => {
 			let n = r.pointColors?.[t];
 			return n ? e(n) : r.colorCss;
-		}, D = [], O = [];
-		for (let e = 0; e < S; e++) {
-			let t = u[e], n = x[e];
+		}, O = [], k = [];
+		for (let e = 0; e < C; e++) {
+			let t = d[e], n = x[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 || (D.push(e), O.push(r.x, r.y));
+			let r = l(f, t, n);
+			r.x < p.x || r.x > p.x + p.width || r.y < p.y || r.y > p.y + p.height || (O.push(e), k.push(r.x, r.y));
 		}
-		if (D.length > m) {
-			let e = Math.max(2, a.dotCell ?? r.pointSize * .8), t = Math.ceil(f.width / e) + 1, n = /* @__PURE__ */ new Map();
-			D.forEach((r, i) => {
-				let a = Math.floor((O[i * 2] - f.x) / e), o = Math.floor((O[i * 2 + 1] - f.y) / e);
+		if (O.length > h) {
+			let e = Math.max(2, a.dotCell ?? r.pointSize * .8), t = Math.ceil(p.width / e) + 1, n = /* @__PURE__ */ new Map();
+			O.forEach((r, i) => {
+				let a = Math.floor((k[i * 2] - p.x) / e), o = Math.floor((k[i * 2 + 1] - p.y) / e);
 				n.set(o * t + a, r);
 			});
-			for (let [r, i] of n) w.push(f.x + (r % t + .5) * e, f.y + (Math.floor(r / t) + .5) * e, e), T.push(E(i));
-		} else D.forEach((e, t) => {
-			w.push(O[t * 2], O[t * 2 + 1], g(r, e)), T.push(E(e));
+			for (let [r, i] of n) T.push(p.x + (r % t + .5) * e, p.y + (Math.floor(r / t) + .5) * e, e), E.push(D(i));
+		} else O.forEach((e, t) => {
+			T.push(k[t * 2], k[t * 2 + 1], S(r, e)), E.push(D(e));
 		});
 		b.push({
 			kind: "dots",
 			seriesIndex: r.index,
 			opacity: r.opacity,
-			dots: w,
-			colors: T
+			dots: T,
+			colors: E
 		});
 	}
 	return b;
-}, L = (t, n, r, i, a, o) => {
-	let { x: s, y: c, count: l, sorted: u, high: d, low: f, q1: p, q3: m, outliers: h } = t.cols, [g, _] = N(s, l, u, r), v = Math.max(t.barHalfWidth / Math.abs(n.xPerPx), 1), y = Math.max(1, t.lineWidth), b = [], x = [], S = [], C = [], w = [], T = [], E = Math.max(1, Math.ceil((_ - g) / o)), D = (e, t, n) => {
+}, oe = (t, n, r, i, a, o) => {
+	let { x: s, y: c, count: l, sorted: u, high: d, low: f, q1: p, q3: m, outliers: h } = t.cols, [g, _] = I(s, l, u, r), v = Math.max(t.barHalfWidth / Math.abs(n.xPerPx), 1), y = Math.max(1, t.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) => {
 		x.push(e - t, n - r / 2, t * 2, r);
@@ -612,8 +658,8 @@ var k = (e) => ({
 		let u = t.pointColors?.[r], g = u ? e(u) : t.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;
 		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 ee = h?.[r];
-		if (ee) for (let e of ee) {
+		let M = h?.[r];
+		if (M) for (let e of M) {
 			let r = n.horizontal ? {
 				x: n.yToPx(e),
 				y: l
@@ -621,32 +667,33 @@ var k = (e) => ({
 				x: l,
 				y: n.yToPx(e)
 			};
-			w.push(r.x, r.y, t.pointSize), T.push(g);
+			w.push(r.x, r.y, t.outlierSize), T.push(g);
 		}
 	}
 	let k = [{
 		kind: "bars",
 		seriesIndex: t.index,
 		color: t.colorCss,
-		rects: F(n, b),
+		rects: R(n, b),
 		colors: S,
 		opacity: t.opacity
 	}, {
 		kind: "bars",
 		seriesIndex: t.index,
 		color: t.colorCss,
-		rects: F(n, x),
+		rects: R(n, x),
 		colors: C
 	}];
 	return w.length && k.push({
 		kind: "dots",
 		seriesIndex: t.index,
-		opacity: .85,
+		opacity: t.outlierShape === "hollow" ? 0 : .85,
 		dots: w,
-		colors: T
+		colors: T,
+		stroke: 1.25
 	}), k;
 };
 //#endregion
-export { M as createChartController, I as scenePrimitives };
+export { F as createChartController, z as scenePrimitives };
 
 //# sourceMappingURL=controller.js.map