@genome-spy/app 1.2.0 → 1.3.0

package/dist/{parquetRead-0hFIa3Cc.js → parquetRead-D-yY8njE.js}

@@ -394,11 +394,7 @@ function _e(e, t) {
 	}
 	for (let t = 1; t < e.length; t++) {
 		let { logical_type: r, name: i, num_children: a, type: o } = e[t];
-		if (a) {
-			t += a;
-			continue;
-		}
-		o === "BYTE_ARRAY" && !r && (e[t].logical_type = n.get(i));
+		a ? t += a : o === "BYTE_ARRAY" && !r && (e[t].logical_type = n.get(i));
 	}
 }
 //#endregion
@@ -1188,9 +1184,7 @@ function K(e, t, n, r = 0) {
 		let l = s.path.join("."), u = e.get(l);
 		if (!u) throw Error("parquet list column missing values");
 		a && q(u, r), e.set(i, u), e.delete(l);
-		return;
-	}
-	if (re(t)) {
+	} else if (re(t)) {
 		let s = t.children[0].element.name;
 		K(e, t.children[0].children[0], n, o + 1), K(e, t.children[0].children[1], n, o + 1);
 		let c = e.get(`${i}.${s}.key`), l = e.get(`${i}.${s}.value`);
@@ -1199,9 +1193,7 @@ function K(e, t, n, r = 0) {
 		if (c.length !== l.length) throw Error("parquet map column key/value length mismatch");
 		let u = st(c, l, o);
 		a && q(u, r), e.delete(`${i}.${s}.key`), e.delete(`${i}.${s}.value`), e.set(i, u);
-		return;
-	}
-	if (t.children.length) {
+	} else if (t.children.length) {
 		let o = t.element.repetition_type === "REQUIRED" ? r : r + 1, s = {};
 		for (let r of t.children) {
 			K(e, r, n, o);

package/dist/{rasterExport-jeRVq6kY.js → rasterExport-B-WrX1pa.js}

@@ -1,8 +1,8 @@
-import { t as e } from "./rasterization-DFj3Cvx4.js";
-import { t } from "./rectangle-Dl4Dy0hS.js";
-import { t as n } from "./layoutResult-D50MSHXR.js";
-import { r } from "./order-DmMoZsi1.js";
-import { t as i } from "./renderCanvas2D-Bfm1NHFu.js";
+import { t as e } from "./rasterization-QktH8Sn2.js";
+import { t } from "./rectangle-BAdoDPXu.js";
+import { n } from "./color-uTRRsy8i.js";
+import { r } from "./order-BpJnq_nV.js";
+import { t as i } from "./renderCanvas2D-CsRO78Pq.js";
 //#region ../core/src/rendering/canvas2d/rasterExport.js
 async function a(e) {
 	let t = e.mimeType ?? "image/png";

package/dist/{rasterExport-DxvowWjH.js → rasterExport-C_vx4Jwd.js}

@@ -1,8 +1,8 @@
 import { t as e } from "./rasterization-CFogVB3B.js";
 import { t } from "./rectangle-DZTR6NFQ.js";
-import { t as n } from "./layoutResult-D50MSHXR.js";
-import { r } from "./order-BVvkjDRT.js";
-import { t as i } from "./renderCanvas2D-DVjhp834.js";
+import { n } from "./color-jETn8xK_.js";
+import { r } from "./order-BnKzKjt4.js";
+import { t as i } from "./renderCanvas2D-Y7pkRzbC.js";
 //#region ../core/src/rendering/canvas2d/rasterExport.js
 async function a(e) {
 	let t = e.mimeType ?? "image/png";

package/dist/{rasterization-DFj3Cvx4.js → rasterization-QktH8Sn2.js}

@@ -8,7 +8,7 @@ function e(e, t = .5) {
 	return 0;
 }
 function t(e, t, n) {
-	if ("gapMapping" in e) {
+	if (e.type === "index" || e.type === "locus") {
 		let r = e;
 		return r.gapMapping(n)?.invertPoint(t).value ?? r.invert(t);
 	}

package/dist/{rectangle-Dl4Dy0hS.js → rectangle-BAdoDPXu.js}

@@ -1,39 +1,39 @@
-import { Tt as e, c as t, dt as n, ft as r, it as i, u as a } from "./clipOptions-DElJ8dTZ.js";
+import { _t as e, c as t, jt as n, u as r, ut as i, vt as a } from "./clipOptions-clBEbkjv.js";
 //#region ../core/src/marks/markUtils.js
 var o = Symbol("half-open interval peer");
 function s(e) {
 	return e?.[o];
 }
-function c(e, t) {
-	let r = n(t), s = i(e[t]), c = i(e[r]);
-	s && c && ["index", "locus"].includes(s.type) && (e[t] = a(e[t], {
-		...e[t],
-		[o]: r
-	}), e[r] = a(e[r], {
-		...e[r],
-		[o]: t
+function c(t, n) {
+	let a = e(n), s = i(t[n]), c = i(t[a]);
+	s && c && ["index", "locus"].includes(s.type) && (t[n] = r(t[n], {
+		...t[n],
+		[o]: a
+	}), t[a] = r(t[a], {
+		...t[a],
+		[o]: n
 	}));
 }
 function l(t) {
 	for (let r of ["x", "y"]) {
-		let a = n(r), o = t[r], s = t[a];
-		if (o && s && e(o) && !i(o) && i(s)) throw Error(`Cannot combine encoding.${r}.value with scale-backed encoding.${a}. Use encoding.${r}.datum for a constant data-domain endpoint, or use encoding.${a}.value for a visual-domain endpoint.`);
+		let a = e(r), o = t[r], s = t[a];
+		if (o && s && n(o) && !i(o) && i(s)) throw Error(`Cannot combine encoding.${r}.value with scale-backed encoding.${a}. Use encoding.${r}.datum for a constant data-domain endpoint, or use encoding.${a}.value for a visual-domain endpoint.`);
 	}
 }
 function u(t, i, o = !1) {
-	let s = n(i);
+	let s = e(i);
 	c(t, i);
-	let l = t[i] && a(t[i], { ...t[i] }), u = t[s] && a(t[s], { ...t[s] });
-	if (!(e(l) || e(u))) {
+	let l = t[i] && r(t[i], { ...t[i] }), u = t[s] && r(t[s], { ...t[s] });
+	if (!(n(l) || n(u))) {
 		if (l) {
-			if (!r(t[i])) return;
+			if (!a(t[i])) return;
 			if (!u) {
 				if (l.type == "quantitative") u = {
 					datum: 0,
 					domainInert: !0
 				};
 				else {
-					u = a(l, { ...l });
+					u = r(l, { ...l });
 					let e = (1 - (l.band ?? 1)) / 2;
 					l.band = 0 + e, u.band = o ? l.band : 1 - e;
 				}
@@ -47,13 +47,13 @@ function u(t, i, o = !1) {
 }
 function d(t, i) {
 	c(t, i);
-	let o = n(i), s = t[i], l = t[o];
-	if (!s || !l || e(s) || e(l) || !r(s) || !r(l) || !["index", "locus"].includes(s.type)) return;
+	let o = e(i), s = t[i], l = t[o];
+	if (!s || !l || n(s) || n(l) || !a(s) || !a(l) || !["index", "locus"].includes(s.type)) return;
 	let u = s.band, d = l.band, f = u ?? d ?? 0;
-	t[i] = a(s, {
+	t[i] = r(s, {
 		...s,
 		band: f
-	}), t[o] = a(l, {
+	}), t[o] = r(l, {
 		...l,
 		band: d ?? f
 	});
@@ -62,23 +62,26 @@ function f(e, t) {
 	let n = i(e);
 	n && (n.resolutionChannel = t);
 }
-function p(n, r) {
-	n.stroke || (r ? n.stroke = { value: null } : (n.stroke = t(n.color), f(n.stroke, "color"))), e(n.stroke) && n.stroke.value === null && (n.strokeWidth = { value: 0 }), n.strokeOpacity || (n.strokeOpacity = t(n.opacity), f(n.strokeOpacity, "opacity"));
+function p(e, n) {
+	e[n] = t(e.color), f(e[n], "color");
 }
-function m(n, r) {
-	e(n.fill) && n.fill.value === null ? n.fillOpacity = { value: 0 } : n.fill || (n.fill = t(n.color), f(n.fill, "color"), !r && !n.fillOpacity && (n.fillOpacity = { value: 0 })), n.fillOpacity || (r ? (n.fillOpacity = t(n.opacity), f(n.fillOpacity, "opacity")) : n.fillOpacity = { value: 0 });
+function m(e, r) {
+	e.stroke || (r ? e.stroke = { value: null } : p(e, "stroke")), n(e.stroke) && e.stroke.value === null && (e.strokeWidth = { value: 0 }), e.strokeOpacity || (e.strokeOpacity = t(e.opacity), f(e.strokeOpacity, "opacity"));
 }
-function h(e, t) {
+function h(e, r) {
+	n(e.fill) && e.fill.value === null ? e.fillOpacity = { value: 0 } : e.fill || (p(e, "fill"), !r && !e.fillOpacity && (e.fillOpacity = { value: 0 })), e.fillOpacity || (r ? (e.fillOpacity = t(e.opacity), f(e.fillOpacity, "opacity")) : e.fillOpacity = { value: 0 });
+}
+function g(e, t) {
 	return e.properties.clamp === !0 || e.properties.clamp === t;
 }
 //#endregion
 //#region ../core/src/view/layout/rectangle.js
-function g(e) {
+function _(e) {
 	return () => e;
 }
-var _ = class e {
+var v = class e {
 	static create(t, n, r, i) {
-		return new e(g(t), g(n), g(r), g(i));
+		return new e(_(t), _(n), _(r), _(i));
 	}
 	static unionAll(t) {
 		if (!t.length) return;
@@ -130,7 +133,7 @@ var _ = class e {
 		if (!Object.keys(t).length) return this;
 		let n = (e) => {
 			let n = t[e];
-			return typeof n == "number" ? g(n) : typeof n == "function" ? n : this._passThrough(e);
+			return typeof n == "number" ? _(n) : typeof n == "function" ? n : this._passThrough(e);
 		};
 		return new e(n("x"), n("y"), n("width"), n("height"));
 	}
@@ -162,7 +165,7 @@ var _ = class e {
 		return this.width >= 0 && this.height >= 0;
 	}
 	flatten() {
-		return new e(g(this.x), g(this.y), g(this.width), g(this.height));
+		return new e(_(this.x), _(this.y), _(this.width), _(this.height));
 	}
 	containsPoint(e, t) {
 		return e >= this.x && e < this.x2 && t >= this.y && t < this.y2;
@@ -188,4 +191,4 @@ var _ = class e {
 	}
 };
 //#endregion
-export { m as a, s as c, u as i, h as l, o as n, d as o, c as r, p as s, _ as t, l as u };
+export { u as a, m as c, l as d, p as i, s as l, o as n, h as o, c as r, d as s, v as t, g as u };

package/dist/{renderCanvas2D-Bfm1NHFu.js → renderCanvas2D-CsRO78Pq.js}

@@ -1,13 +1,14 @@
-import { Pt as e, a as t, in as n, o as r, s as i } from "./clipOptions-DElJ8dTZ.js";
+import { Sn as e, a as t, o as n, s as r } from "./clipOptions-clBEbkjv.js";
+import { s as i } from "./flowNode-BSjy0Wz3.js";
 import { t as a } from "./warning-CpIIpk8e.js";
 import { n as o } from "./performanceProfiler-CPLEjApa.js";
-import { n as s } from "./layoutResult-D50MSHXR.js";
-import { A as c, C as l, D as u, I as d, L as f, M as p, N as m, O as h, P as g, S as _, T as v, _ as y, a as b, b as ee, c as x, d as S, g as C, h as w, i as T, j as E, l as D, m as O, p as k, s as A, t as j, u as M, v as N, x as P, y as F } from "./order-DmMoZsi1.js";
+import { r as s } from "./color-uTRRsy8i.js";
+import { C as c, D as l, F as u, L as d, M as f, N as p, O as m, P as h, R as g, S as _, T as v, _ as y, a as b, b as x, c as S, d as ee, g as C, h as w, i as T, j as E, k as D, l as O, m as k, p as A, s as j, t as M, u as N, v as P, x as F, y as I } from "./order-BpJnq_nV.js";
 //#region ../core/src/rendering/canvas2d/renderers/arrow.js
-function I(e, t) {
-	let n = e, r = t.context, i = n.encoders, a = l(n);
+function L(e, t) {
+	let n = e, r = t.context, i = n.encoders, a = c(n);
 	r.lineJoin = "miter";
-	let o = h(i.fill, t), s = h(i.stroke, t), c, d;
+	let o = m(i.fill, t), s = m(i.stroke, t), u, d;
 	return v(n, a, t, (e) => {
 		e.headShapeFallback && t.warn(`Canvas2D rendered unsupported arrow headShape "${a.headShape}" as a triangle.`), r.beginPath();
 		for (let t of e.boundaryLoops) {
@@ -16,32 +17,32 @@ function I(e, t) {
 			for (let e = 1; e < t.length; e++) r.lineTo(t[e].x, t[e].y);
 			r.closePath();
 		}
-		let n = o ?? E(i.fill(e.datum)), l = u(i.fillOpacity, e.datum) * t.viewOpacity;
-		n != "none" && l > 0 && (c != n && (r.fillStyle = n, c = n), r.globalAlpha = l, r.fill());
-		let f = s ?? E(i.stroke(e.datum)), p = u(i.strokeOpacity, e.datum) * t.viewOpacity;
-		f != "none" && p > 0 && e.strokeWidth > 0 && (d != f && (r.strokeStyle = f, d = f), r.globalAlpha = p, r.lineWidth = e.strokeWidth, r.stroke());
+		let n = o ?? f(i.fill(e.datum)), c = l(i.fillOpacity, e.datum) * t.viewOpacity;
+		n != "none" && c > 0 && (u != n && (r.fillStyle = n, u = n), r.globalAlpha = c, r.fill());
+		let p = s ?? f(i.stroke(e.datum)), m = l(i.strokeOpacity, e.datum) * t.viewOpacity;
+		p != "none" && m > 0 && e.strokeWidth > 0 && (d != p && (r.strokeStyle = p, d = p), r.globalAlpha = m, r.lineWidth = e.strokeWidth, r.stroke());
 	}, s);
 }
 //#endregion
 //#region ../core/src/rendering/canvas2d/renderers/link.js
-function L(t, n) {
-	let r = t, i = n.context, a = 1 / n.devicePixelRatio, o = r.encoders, s = N(r), c = _(r, s.shape, n.secondOrderPass);
+function R(t, n) {
+	let r = t, i = n.context, a = 1 / n.devicePixelRatio, o = r.encoders, s = P(r), c = _(r, s.shape, n.secondOrderPass);
 	i.lineCap = "butt", i.lineJoin = "miter", i.miterLimit = 2;
-	let l = h(o.color, n), d;
-	return F(r, s, n, (t) => {
-		let r = l ?? E(o.color(t.datum)), s = u(o.opacity, t.datum) * n.viewOpacity;
+	let u = m(o.color, n), d;
+	return I(r, s, n, (t) => {
+		let r = u ?? f(o.color(t.datum)), s = l(o.opacity, t.datum) * n.viewOpacity;
 		if (r == "none" || s <= 0 || t.strokeWidth <= 0) return;
-		let f = c && t.geometry.type == "cubic" && P(t.geometry.points[0], t.geometry.points[3], c);
-		if (f) {
-			let { normalX: t, normalY: n, offset: a, start: o, end: s } = f, c = i.createLinearGradient(t * (a - s), n * (a - s), t * (a + s), n * (a + s)), l = e(r), u = l.opacity;
-			for (let e of ee(o, s)) l.opacity = u * e.opacity, c.addColorStop(e.offset, l.formatRgb());
+		let p = c && t.geometry.type == "cubic" && F(t.geometry.points[0], t.geometry.points[3], c);
+		if (p) {
+			let { normalX: t, normalY: n, offset: a, start: o, end: s } = p, c = i.createLinearGradient(t * (a - s), n * (a - s), t * (a + s), n * (a + s)), l = e(r), u = l.opacity;
+			for (let e of x(o, s)) l.opacity = u * e.opacity, c.addColorStop(e.offset, l.formatRgb());
 			i.strokeStyle = c, d = void 0;
 		} else d != r && (i.strokeStyle = r, d = r);
 		i.globalAlpha = s * Math.min(t.strokeWidth / a, 1), i.lineWidth = Math.max(t.strokeWidth, a);
-		let { geometry: p } = t, m = p.points[0];
-		if (i.beginPath(), i.moveTo(m[0], m[1]), p.type == "orthogonal") for (let e of p.points.slice(1)) i.lineTo(e[0], e[1]);
+		let { geometry: m } = t, h = m.points[0];
+		if (i.beginPath(), i.moveTo(h[0], h[1]), m.type == "orthogonal") for (let e of m.points.slice(1)) i.lineTo(e[0], e[1]);
 		else {
-			let [, e, t, n] = p.points;
+			let [, e, t, n] = m.points;
 			i.bezierCurveTo(e[0], e[1], t[0], t[1], n[0], n[1]);
 		}
 		i.stroke();
@@ -49,50 +50,50 @@ function L(t, n) {
 }
 //#endregion
 //#region ../core/src/rendering/canvas2d/renderers/point.js
-function R(e, t) {
+function z(e, t) {
 	let n = e;
-	c(n, n.properties.fillGradientStrength) && t.warn("Canvas2D ignored unsupported point property fillGradientStrength."), n.properties.geometricZoomBound && t.warn("Canvas2D ignored unsupported point property geometricZoomBound.");
-	let r = C(n), i = t.context, a = n.encoders, o = h(a.fill, t), s = h(a.stroke, t), l, d;
+	E(n, n.properties.fillGradientStrength) && t.warn("Canvas2D ignored unsupported point property fillGradientStrength."), n.properties.geometricZoomBound && t.warn("Canvas2D ignored unsupported point property geometricZoomBound.");
+	let r = C(n), i = t.context, a = n.encoders, o = D(a.fill), s = D(a.stroke), c = m(a.fill, t), u = m(a.stroke, t), d, p;
 	return y(n, r, t, (e) => {
-		let n = e.datum, r = e.lineShape, c = o ?? E(a.fill(n)), f = u(a.fillOpacity, n) * t.viewOpacity, p = s ?? E(a.stroke(n)), m = u(a.strokeOpacity, n) * t.viewOpacity;
-		r && (p == "none" || m <= 0) && (p = c, m = f), i.beginPath();
-		let h = e.angle != 0 && e.shape != "circle";
-		h && (i.save(), i.translate(e.x, e.y), i.rotate(e.angle * Math.PI / 180));
-		let g = h ? 0 : e.x, _ = h ? 0 : e.y, v = !0;
-		if (e.shape == "circle") i.arc(g, _, e.geometryRadius, 0, Math.PI * 2);
-		else if (e.shape == "square") {
-			let t = e.geometryRadius * 2;
-			i.rect(g - e.geometryRadius, _ - e.geometryRadius, t, t);
-		} else v = w(e.shape, g, _, e.geometryRadius, i);
-		h && i.restore(), v || (t.warn(`Canvas2D rendered unsupported point shape "${e.shape}" as a circle.`), i.arc(e.x, e.y, e.geometryRadius, 0, Math.PI * 2)), !r && c != "none" && f > 0 && (l != c && (i.fillStyle = c, l = c), z(i, f), i.fill()), p != "none" && m > 0 && e.strokeWidth > 0 && (r && i.lineCap != "butt" && (i.lineCap = "butt"), d != p && (i.strokeStyle = p, d = p), z(i, m), B(i, e.strokeWidth), i.stroke());
+		let n = e.datum, r = e.lineShape, m = c ?? f(a.fill(n)), h = l(a.fillOpacity, n) * t.viewOpacity, g = u ?? f(a.stroke(n)), _ = l(a.strokeOpacity, n) * t.viewOpacity, v = e.strokeWidth > 0 && _ > 0 ? _ * s(g) : 0;
+		r && v <= 0 && (g = m, _ = h, v = h * o(m));
+		let y = !r && h * o(m) > 0, b = v < 1 ? e.radius : e.geometryRadius;
+		B(i, e, y ? b : e.geometryRadius, t.warn), y && (d != m && (i.fillStyle = m, d = m), V(i, h), i.fill()), v > 0 && e.strokeWidth > 0 && (y && b != e.geometryRadius && B(i, e, e.geometryRadius, t.warn), r && i.lineCap != "butt" && (i.lineCap = "butt"), p != g && (i.strokeStyle = g, p = g), V(i, _), H(i, e.strokeWidth), i.stroke());
 	});
 }
-function z(e, t) {
+function B(e, t, n, r) {
+	e.beginPath();
+	let i = t.angle != 0 && t.shape != "circle";
+	i && (e.save(), e.translate(t.x, t.y), e.rotate(t.angle * Math.PI / 180));
+	let a = i ? 0 : t.x, o = i ? 0 : t.y, s = !0;
+	t.shape == "circle" ? e.arc(a, o, n, 0, Math.PI * 2) : t.shape == "square" ? e.rect(a - n, o - n, n * 2, n * 2) : s = w(t.shape, a, o, n, e), i && e.restore(), s || (r(`Canvas2D rendered unsupported point shape "${t.shape}" as a circle.`), e.arc(t.x, t.y, n, 0, Math.PI * 2));
+}
+function V(e, t) {
 	e.globalAlpha != t && (e.globalAlpha = t);
 }
-function B(e, t) {
+function H(e, t) {
 	e.lineWidth != t && (e.lineWidth = t);
 }
 //#endregion
 //#region ../core/src/rendering/canvas2d/renderers/rect.js
-function V(e, t) {
-	let n = e, r = k(n);
+function U(e, t) {
+	let n = e, r = A(n);
 	r.hatch != "none" && t.warn("Canvas2D ignored unsupported rect hatch.");
 	let i = t.start ?? 0;
 	if (i === (t.end ?? t.data.length)) return 0;
-	let a = t.context, o = n.encoders, s, c, l = [
+	let a = t.context, o = n.encoders, s, c, u = [
 		0,
 		0,
 		0,
 		0
-	], d = o.strokeOpacity.constant, f = h(o.stroke, t), p = f == "none", m = !p && d ? u(o.strokeOpacity, t.data[i]) : 0;
-	return O(n, r, t, (e) => {
-		r.shadow.opacity > 0 && H(e, r.shadow, t, l);
-		let n = e.opacityFactor, i = e.fill != "none" && e.fillOpacity > 0, h = f ?? E(o.stroke(e.datum)), g = (d ? m : u(o.strokeOpacity, e.datum)) * t.viewOpacity * n, _ = !p && h != "none" && g > 0 && e.strokeWidth > 0, v = r.hasCornerRadii && (e.radii.topLeft != 0 || e.radii.topRight != 0 || e.radii.bottomRight != 0 || e.radii.bottomLeft != 0);
-		v && (i || _) && (l[0] = e.radii.topLeft, l[1] = e.radii.topRight, l[2] = e.radii.bottomRight, l[3] = e.radii.bottomLeft, a.beginPath(), a.roundRect(e.x, e.y, e.width, e.height, l)), i && (s != e.fill && (a.fillStyle = e.fill, s = e.fill), U(a, e.fillOpacity * n), v ? a.fill() : a.fillRect(e.x, e.y, e.width, e.height)), _ && (c != h && (a.strokeStyle = h, c = h), U(a, g), W(a, e.strokeWidth), v ? a.stroke() : a.strokeRect(e.x, e.y, e.width, e.height));
+	], d = o.strokeOpacity.constant, p = m(o.stroke, t), h = p == "none", g = !h && d ? l(o.strokeOpacity, t.data[i]) : 0;
+	return k(n, r, t, (e) => {
+		r.shadow.opacity > 0 && W(e, r.shadow, t, u);
+		let n = e.opacityFactor, i = e.fill != "none" && e.fillOpacity > 0, m = p ?? f(o.stroke(e.datum)), _ = (d ? g : l(o.strokeOpacity, e.datum)) * t.viewOpacity * n, v = !h && m != "none" && _ > 0 && e.strokeWidth > 0, y = r.hasCornerRadii && (e.radii.topLeft != 0 || e.radii.topRight != 0 || e.radii.bottomRight != 0 || e.radii.bottomLeft != 0);
+		y && (i || v) && (u[0] = e.radii.topLeft, u[1] = e.radii.topRight, u[2] = e.radii.bottomRight, u[3] = e.radii.bottomLeft, a.beginPath(), a.roundRect(e.x, e.y, e.width, e.height, u)), i && (s != e.fill && (a.fillStyle = e.fill, s = e.fill), G(a, e.fillOpacity * n), y ? a.fill() : a.fillRect(e.x, e.y, e.width, e.height)), v && (c != m && (a.strokeStyle = m, c = m), G(a, _), K(a, e.strokeWidth), y ? a.stroke() : a.strokeRect(e.x, e.y, e.width, e.height));
 	});
 }
-function H(e, t, n, r) {
+function W(e, t, n, r) {
 	let { context: i, devicePixelRatio: a, visibleBounds: o } = n, s = e.strokeWidth / 2, c = e.x - s, l = e.y - s, u = e.width + s * 2, d = e.height + s * 2;
 	r[0] = e.radii.topLeft + s, r[1] = e.radii.topRight + s, r[2] = e.radii.bottomRight + s, r[3] = e.radii.bottomLeft + s, i.save();
 	try {
@@ -101,58 +102,58 @@ function H(e, t, n, r) {
 		i.restore();
 	}
 }
-function U(e, t) {
+function G(e, t) {
 	e.globalAlpha != t && (e.globalAlpha = t);
 }
-function W(e, t) {
+function K(e, t) {
 	e.lineWidth != t && (e.lineWidth = t);
 }
 //#endregion
 //#region ../core/src/rendering/canvas2d/renderers/rule.js
-function G(e, t) {
+function q(e, t) {
 	let n = e, r = t.context, i = n.encoders;
-	r.lineCap = c(n, n.properties.strokeCap), r.setLineDash(c(n, n.properties.strokeDash) ?? []), r.lineDashOffset = c(n, n.properties.strokeDashOffset);
-	let a = h(i.color, t), o;
-	return S(n, M(n), t, (e) => {
-		let n = a ?? E(i.color(e.datum)), s = u(i.opacity, e.datum) * t.viewOpacity;
-		n == "none" || s <= 0 || e.strokeWidth <= 0 || (o != n && (r.strokeStyle = n, o = n), r.globalAlpha = s, r.lineWidth = e.strokeWidth, r.beginPath(), r.moveTo(e.x1, e.y1), r.lineTo(e.x2, e.y2), r.stroke());
+	r.lineCap = E(n, n.properties.strokeCap), r.setLineDash(E(n, n.properties.strokeDash) ?? []), r.lineDashOffset = E(n, n.properties.strokeDashOffset);
+	let a = n.getType() === "rule", o = m(i.fill, t), s;
+	return ee(n, N(n), t, (e) => {
+		let n = o ?? f(i.fill(e.datum)), c = l(i.opacity, e.datum) * t.viewOpacity;
+		c <= 0 || (r.beginPath(), r.moveTo(e.x1, e.y1), r.lineTo(e.x2, e.y2), e.strokeWidth > 0 && (r.strokeStyle = e.stroke, s = e.stroke, r.globalAlpha = c * e.strokeOpacity, r.lineWidth = e.size + 2 * e.strokeWidth, r.stroke()), n !== "none" && (s !== n && (r.strokeStyle = n, s = n), r.globalAlpha = c * (a ? l(i.fillOpacity, e.datum) : 1), r.lineWidth = e.size, r.stroke()));
 	});
 }
 //#endregion
 //#region ../core/src/rendering/canvas2d/renderers/text.js
-function K(e, t) {
-	let n = e, r = n.properties, i = t.textMetrics ?? n.unitView.context.textMetrics, a = i.requestFont(r), o = T(i, r), s = x(n), l = t.context, d = n.encoders, f = b(r.font), p = `${r.fontStyle ?? "normal"} ${A(r.fontWeight ?? "normal")} `, m = s.baseline == "baseline" ? "alphabetic" : s.baseline;
+function J(e, t) {
+	let n = e, r = n.properties, i = t.textMetrics ?? n.unitView.context.textMetrics, a = i.requestFont(r), o = T(i, r), s = S(n), c = t.context, u = n.encoders, d = b(r.font), p = `${r.fontStyle ?? "normal"} ${j(r.fontWeight ?? "normal")} `, h = s.baseline == "baseline" ? "alphabetic" : s.baseline;
 	[
 		r.viewportEdgeFadeWidthTop,
 		r.viewportEdgeFadeWidthRight,
 		r.viewportEdgeFadeWidthBottom,
 		r.viewportEdgeFadeWidthLeft
-	].some((e) => c(n, e) > 0) && t.warn("Canvas2D ignored unsupported text viewport edge fading.");
-	let g = h(d.color, t), _, v;
-	return s.logoLetters || (l.textAlign = s.align, l.textBaseline = m), D(n, s, {
+	].some((e) => E(n, e) > 0) && t.warn("Canvas2D ignored unsupported text viewport edge fading.");
+	let g = m(u.color, t), _, v;
+	return s.logoLetters || (c.textAlign = s.align, c.textBaseline = h), O(n, s, {
 		...t,
 		fontMeasurement: a,
 		measureLogoInkBounds: o
 	}, (e) => {
 		e.multiCharacterLogo && t.warn("Canvas2D stretches multi-character logo text as a single glyph cell.");
-		let n = g ?? E(d.color(e.datum)), r = u(d.opacity, e.datum) * t.viewOpacity * e.fadeOpacity;
-		n == "none" || r <= 0 || (_ != n && (l.fillStyle = n, _ = n), l.globalAlpha = r, v != e.size && (l.font = `${p}${e.size}px ${f}`, v = e.size), e.logoTransform ? (l.save(), l.translate(e.x, e.y), l.rotate(e.angle * Math.PI / 180), l.translate(e.dx, e.dy), l.scale(e.logoTransform.scaleX, e.logoTransform.scaleY), l.translate(-e.logoTransform.originX, -e.logoTransform.originY), l.textAlign = "left", l.textBaseline = "alphabetic", l.fillText(e.text, 0, 0), l.restore()) : e.angle || e.scale != 1 ? (l.save(), l.translate(e.x, e.y), l.rotate(e.angle * Math.PI / 180), l.translate(e.dx, e.dy), l.scale(e.scale, e.scale), l.fillText(e.text, 0, 0), l.restore()) : l.fillText(e.text, e.x + e.dx, e.y + e.dy));
+		let n = g ?? f(u.color(e.datum)), r = l(u.opacity, e.datum) * t.viewOpacity * e.fadeOpacity;
+		n == "none" || r <= 0 || (_ != n && (c.fillStyle = n, _ = n), c.globalAlpha = r, v != e.size && (c.font = `${p}${e.size}px ${d}`, v = e.size), e.logoTransform ? (c.save(), c.translate(e.x, e.y), c.rotate(e.angle * Math.PI / 180), c.translate(e.dx, e.dy), c.scale(e.logoTransform.scaleX, e.logoTransform.scaleY), c.translate(-e.logoTransform.originX, -e.logoTransform.originY), c.textAlign = "left", c.textBaseline = "alphabetic", c.fillText(e.text, 0, 0), c.restore()) : e.angle || e.scale != 1 ? (c.save(), c.translate(e.x, e.y), c.rotate(e.angle * Math.PI / 180), c.translate(e.dx, e.dy), c.scale(e.scale, e.scale), c.fillText(e.text, 0, 0), c.restore()) : c.fillText(e.text, e.x + e.dx, e.y + e.dy));
 	});
 }
 //#endregion
 //#region ../core/src/rendering/canvas2d/renderers/index.js
-function q(e, t) {
-	return (t.start ?? 0) === (t.end ?? t.data.length) ? 0 : e.getType() == "arrow" ? I(e, t) : e.getType() == "link" ? L(e, t) : e.getType() == "rect" ? V(e, t) : e.getType() == "point" ? R(e, t) : e.getType() == "rule" || e.getType() == "tick" ? G(e, t) : e.getType() == "text" ? K(e, t) : (t.warn(`Canvas2D rendering is not implemented for mark type "${e.getType()}".`), 0);
+function Y(e, t) {
+	return (t.start ?? 0) === (t.end ?? t.data.length) ? 0 : e.getType() == "arrow" ? L(e, t) : e.getType() == "link" ? R(e, t) : e.getType() == "rect" ? U(e, t) : e.getType() == "point" ? z(e, t) : e.getType() == "rule" || e.getType() == "tick" ? q(e, t) : e.getType() == "text" ? J(e, t) : (t.warn(`Canvas2D rendering is not implemented for mark type "${e.getType()}".`), 0);
 }
 //#endregion
 //#region ../core/src/rendering/sampleFacet.js
-function J(e) {
+function X(e) {
 	let t = e.pixelToUnit, n = e.locSize.location * t, r = e.locSize.size * t;
 	return !(n > 1 || n + r < 0);
 }
 //#endregion
 //#region ../core/src/rendering/canvas2d/canvas2DViewRenderingContext.js
-var Y = 8, X = 16777216, Z = class extends s {
+var Z = 8, Q = 16777216, te = class extends s {
 	#e = [];
 	#t = /* @__PURE__ */ new WeakSet();
 	#n = /* @__PURE__ */ new WeakMap();
@@ -182,7 +183,7 @@ var Y = 8, X = 16777216, Z = class extends s {
 		this.paint && !this.#t.has(e) && (e.onBeforeRender(), this.#t.add(e));
 		let r = e.getOpacity();
 		if (this.paint && r > 0 && r !== 1) {
-			let r = t(e), i = Q(n, this.devicePixelRatio, this.#c, r), a = te(this.#l, this.#u.length, i.width, i.height);
+			let r = t(e), i = ne(n, this.devicePixelRatio, this.#c, r), a = re(this.#l, this.#u.length, i.width, i.height);
 			a.setTransform(this.devicePixelRatio, 0, 0, this.devicePixelRatio, -i.x, -i.y), this.#u.push({
 				context: this.context,
 				bounds: this.#c
@@ -211,27 +212,27 @@ var Y = 8, X = 16777216, Z = class extends s {
 	}
 	renderMark(e, t) {
 		if (!this.paint || !this.#r(e)) return;
-		let n = this.#n.get(e.unitView);
-		if (n === void 0 && (n = e.unitView.getEffectiveOpacity(), this.#n.set(e.unitView, n)), n <= 0) return;
+		let i = this.#n.get(e.unitView);
+		if (i === void 0 && (i = e.unitView.getEffectiveOpacity(), this.#n.set(e.unitView, i)), i <= 0) return;
 		e.initializeRenderingRevisions(Object.keys(e.properties));
 		let o = t.sampleFacetRenderingOptions;
-		if (o && !e.encoders.facetIndex && (this.#i?.addCount("canvasSampleFacetOccurrences"), !J(o))) {
+		if (o && !e.encoders.facetIndex && (this.#i?.addCount("canvasSampleFacetOccurrences"), !X(o))) {
 			this.#i?.addCount("canvasCulledSampleFacetOccurrences");
 			return;
 		}
-		let s = this.currentCoords, c = r(t), l = i(c, e.properties.clip, s), u = m(this.width, this.height, l);
-		if (!g(u)) return;
-		let d = p(s, c, e.properties.cullByVisibleRange), h = this.#o?.prepare(e) ?? !1, _ = this.context;
+		let s = this.currentCoords, c = n(t), l = r(c, e.properties.clip, s), d = h(this.width, this.height, l);
+		if (!u(d)) return;
+		let f = p(s, c, e.properties.cullByVisibleRange), m = this.#o?.prepare(e) ?? !1, _ = this.context;
 		if (_.save(), l) {
 			let e = l.rect.flatten(), t = l.clipX ? e.x : 0, n = l.clipY ? e.y : 0, r = l.clipX ? e.width : this.width, i = l.clipY ? e.height : this.height;
 			_.beginPath(), _.rect(t, n, r, i), _.clip();
 		}
 		try {
 			let n = e.getOrder?.(), r = n && n.isActive();
-			f(e, t, s, this.#a, (t, i) => {
+			g(e, t, s, this.#a, (t, i) => {
 				let o = 0, s = i.length;
-				h && this.#o.query(i, this.#s) && (o = this.#s[0], s = this.#s[1]);
-				let c = (n, r, i, o = !1) => q(e, {
+				m && this.#o.query(i, this.#s) && (o = this.#s[0], s = this.#s[1]);
+				let c = (n, r, i, o = !1) => Y(e, {
 					context: _,
 					devicePixelRatio: this.devicePixelRatio,
 					coords: t,
@@ -239,15 +240,15 @@ var Y = 8, X = 16777216, Z = class extends s {
 					secondOrderPass: o,
 					start: r,
 					end: i,
-					visibleBounds: u,
-					anchorCullBounds: d,
+					visibleBounds: d,
+					anchorCullBounds: f,
 					viewOpacity: 1,
 					textMetrics: this.textMetrics,
 					warn: (t) => a(`${t} View: ${e.unitView.getPathString()}`)
 				});
 				if (!r) return c(i, o, s);
-				let l = 0, f = j(i, o, s, n.predicate, n.passes);
-				for (let [e, t] of f.entries()) t.length > 0 && (l += c(t, 0, t.length, e === 1));
+				let l = 0, u = M(i, o, s, n.predicate, n.passes);
+				for (let [e, t] of u.entries()) t.length > 0 && (l += c(t, 0, t.length, e === 1));
 				return l;
 			}, (t) => a(`Canvas2D could not resolve sample facet index ${t}. View: ${e.unitView.getPathString()}`));
 		} finally {
@@ -255,12 +256,12 @@ var Y = 8, X = 16777216, Z = class extends s {
 		}
 	}
 	get currentCoords() {
-		let e = n(this.#e);
+		let e = i(this.#e);
 		if (!e) throw Error("No current view in Canvas2D rendering context.");
 		return e.coords;
 	}
 };
-function Q(e, t, n, r) {
+function ne(e, t, n, r) {
 	let i = n.x + n.width, a = n.y + n.height, o = r.clipX ? $(Math.floor(e.x * t), n.x, i) : n.x, s = r.clipY ? $(Math.floor(e.y * t), n.y, a) : n.y, c = r.clipX ? $(Math.ceil((e.x + e.width) * t), o, i) : i, l = r.clipY ? $(Math.ceil((e.y + e.height) * t), s, a) : a;
 	return {
 		x: o,
@@ -269,8 +270,8 @@ function Q(e, t, n, r) {
 		height: l - s
 	};
 }
-function te(e, t, n, r) {
-	let i = n * r, a = e[t], o = e.reduce((e, n, r) => r === t ? e : e + n.canvas.width * n.canvas.height, 0), s = t < Y && o + i <= X;
+function re(e, t, n, r) {
+	let i = n * r, a = e[t], o = e.reduce((e, n, r) => r === t ? e : e + n.canvas.width * n.canvas.height, 0), s = t < Z && o + i <= Q;
 	if (!a || !s) {
 		if (a = document.createElement("canvas").getContext("2d"), !a) throw Error("Unable to create a Canvas2D view group.");
 		s && (e[t] = a);
@@ -282,9 +283,9 @@ function $(e, t, n) {
 }
 //#endregion
 //#region ../core/src/rendering/canvas2d/renderCanvas2D.js
-function ne(e) {
-	let t = new Z({ picking: !1 }, e);
+function ie(e) {
+	let t = new te({ picking: !1 }, e);
 	e.layoutResult.collectRenderCommands(t);
 }
 //#endregion
-export { J as n, ne as t };
+export { X as n, ie as t };