@genome-spy/app 0.88.1 → 0.90.0

package/dist/rasterExport-C_FcNBkC.js

@@ -0,0 +1,52 @@
+import { t as e } from "./rasterization-_-9JmSas.js";
+import { t } from "./rectangle-DE98gIxF.js";
+import { t as n } from "./layoutResult-D50MSHXR.js";
+import { r } from "./order-BkYCnwD7.js";
+import { t as i } from "./renderCanvas2D-DK1c9TFK.js";
+//#region ../core/src/rendering/canvas2d/rasterExport.js
+async function a(e) {
+	let t = e.mimeType ?? "image/png";
+	if (t != "image/png") throw Error(`Unsupported raster export MIME type: ${t}`);
+	let n = e.textMetrics ?? e.viewRoot.context.textMetrics;
+	await r(n, e.viewRoot);
+	let i = s({
+		...e,
+		textMetrics: n
+	});
+	return new Promise((e, n) => {
+		i.toBlob((t) => {
+			t ? e(t) : n(/* @__PURE__ */ Error("Canvas2D could not encode the raster export."));
+		}, t);
+	});
+}
+function o(e) {
+	return s({
+		...e,
+		pixelRatio: e.devicePixelRatio ?? e.pixelRatio
+	}).toDataURL("image/png");
+}
+function s(r) {
+	let a = r.logicalWidth ?? r.liveSize.width, o = r.logicalHeight ?? r.liveSize.height, s = r.pixelRatio ?? r.liveDevicePixelRatio, c, l;
+	try {
+		c = document.createElement("canvas"), c.width = Math.floor(a * s), c.height = Math.floor(o * s), l = c.getContext("2d");
+	} catch (t) {
+		throw new e("Unable to initialize a Canvas2D export context.", { cause: t });
+	}
+	if (!l) throw new e("Unable to initialize a Canvas2D export context.");
+	let u = n(r.viewRoot, t.create(0, 0, a, o), {
+		devicePixelRatio: s,
+		renderingOptions: { firstFacet: !0 }
+	});
+	return i({
+		layoutResult: u,
+		context: l,
+		width: a,
+		height: o,
+		devicePixelRatio: s,
+		background: r.clearColor ?? null,
+		paint: !0,
+		textMetrics: r.textMetrics ?? r.viewRoot.context.textMetrics
+	}), c;
+}
+//#endregion
+export { o as exportCanvas, a as exportRaster };

package/dist/rasterExport-Z7gs5346.js

@@ -0,0 +1,52 @@
+import { t as e } from "./rasterization-_-9JmSas.js";
+import { t } from "./rectangle-DE98gIxF.js";
+import { t as n } from "./layoutResult-D50MSHXR.js";
+import { r } from "./order-R043xTpC.js";
+import { t as i } from "./renderCanvas2D-IM-A9DYG.js";
+//#region ../core/src/rendering/canvas2d/rasterExport.js
+async function a(e) {
+	let t = e.mimeType ?? "image/png";
+	if (t != "image/png") throw Error(`Unsupported raster export MIME type: ${t}`);
+	let n = e.textMetrics ?? e.viewRoot.context.textMetrics;
+	await r(n, e.viewRoot);
+	let i = s({
+		...e,
+		textMetrics: n
+	});
+	return new Promise((e, n) => {
+		i.toBlob((t) => {
+			t ? e(t) : n(/* @__PURE__ */ Error("Canvas2D could not encode the raster export."));
+		}, t);
+	});
+}
+function o(e) {
+	return s({
+		...e,
+		pixelRatio: e.devicePixelRatio ?? e.pixelRatio
+	}).toDataURL("image/png");
+}
+function s(r) {
+	let a = r.logicalWidth ?? r.liveSize.width, o = r.logicalHeight ?? r.liveSize.height, s = r.pixelRatio ?? r.liveDevicePixelRatio, c, l;
+	try {
+		c = document.createElement("canvas"), c.width = Math.floor(a * s), c.height = Math.floor(o * s), l = c.getContext("2d");
+	} catch (t) {
+		throw new e("Unable to initialize a Canvas2D export context.", { cause: t });
+	}
+	if (!l) throw new e("Unable to initialize a Canvas2D export context.");
+	let u = n(r.viewRoot, t.create(0, 0, a, o), {
+		devicePixelRatio: s,
+		renderingOptions: { firstFacet: !0 }
+	});
+	return i({
+		layoutResult: u,
+		context: l,
+		width: a,
+		height: o,
+		devicePixelRatio: s,
+		background: r.clearColor ?? null,
+		paint: !0,
+		textMetrics: r.textMetrics ?? r.viewRoot.context.textMetrics
+	}), c;
+}
+//#endregion
+export { o as exportCanvas, a as exportRaster };

package/dist/rasterization-_-9JmSas.js

@@ -0,0 +1,63 @@
+//#region ../core/src/rendering/renderingModuleRegistry.js
+var e = {};
+//#endregion
+//#region ../core/src/scales/scalePosition.js
+function t(e, t = .5) {
+	if (e.type == "band" || e.type == "point") return e.bandwidth() * t;
+	if (e.type == "index" || e.type == "locus") {
+		let n = e;
+		return Math.sign(n.step()) * n.bandwidth() * t;
+	}
+	return 0;
+}
+//#endregion
+//#region ../core/src/rendering/rasterization.js
+var n = class extends Error {
+	constructor(e, t) {
+		super(e, t), this.name = "RasterizationUnavailableError";
+	}
+};
+async function r(t, r) {
+	if (t.exportRaster) try {
+		return await t.exportRaster(r);
+	} catch (e) {
+		if (!(e instanceof n)) throw e;
+	}
+	if (!e.canvasRasterExport) throw a();
+	let i;
+	try {
+		i = await e.canvasRasterExport();
+	} catch (e) {
+		throw a(e);
+	}
+	try {
+		return await i.exportRaster({
+			...r,
+			liveSize: t.surface.getLogicalCanvasSize(),
+			liveDevicePixelRatio: t.surface.getDevicePixelRatio()
+		});
+	} catch (e) {
+		throw e instanceof n ? a(e) : e;
+	}
+}
+async function i(t, r) {
+	if (t.rasterizeSvgRuns) try {
+		await t.rasterizeSvgRuns(r);
+		return;
+	} catch (e) {
+		if (!(e instanceof n)) throw e;
+	}
+	if (!e.canvasSvgRasterizer) throw new n("No raster backend supports selective SVG rasterization. Import \"@genome-spy/core/rendering/canvas.js\" to enable the Canvas2D fallback.");
+	let i;
+	try {
+		i = await e.canvasSvgRasterizer();
+	} catch (e) {
+		throw new n("No raster backend supports selective SVG rasterization.", { cause: e });
+	}
+	await i.createCanvas2DSvgRasterizer()(r);
+}
+function a(e) {
+	return new n("Raster export is unsupported because no raster rendering backend is available. Import \"@genome-spy/core/rendering/canvas.js\" to enable the Canvas2D fallback.", { cause: e });
+}
+//#endregion
+export { e as a, t as i, r as n, i as r, n as t };

package/dist/rectangle-DE98gIxF.js

@@ -0,0 +1,108 @@
+//#region ../core/src/view/layout/rectangle.js
+function e(e) {
+	return () => e;
+}
+var t = class t {
+	static create(n, r, i, a) {
+		return new t(e(n), e(r), e(i), e(a));
+	}
+	static ZERO = t.create(0, 0, 0, 0);
+	_offset(e, t) {
+		let n = this["_" + e];
+		if (t === 0) return n;
+		switch (typeof t) {
+			case "number": return () => n() + t;
+			case "function": return () => n() + t();
+			default: throw Error("Not a number of function");
+		}
+	}
+	_passThrough(e) {
+		return this._offset(e, 0);
+	}
+	constructor(e, t, n, r) {
+		this._x = e, this._y = t, this._width = n, this._height = r;
+	}
+	get x() {
+		return this._x();
+	}
+	get y() {
+		return this._y();
+	}
+	get width() {
+		return this._width();
+	}
+	get height() {
+		return this._height();
+	}
+	get x2() {
+		return this._x() + this._width();
+	}
+	get y2() {
+		return this._y() + this._height();
+	}
+	equals(e) {
+		return e ? this === e || this.x === e.x && this.y === e.y && this.width === e.width && this.height === e.height : !1;
+	}
+	modify(n) {
+		if (!Object.keys(n).length) return this;
+		let r = (t) => {
+			let r = n[t];
+			return typeof r == "number" ? e(r) : typeof r == "function" ? r : this._passThrough(t);
+		};
+		return new t(r("x"), r("y"), r("width"), r("height"));
+	}
+	translate(e, n) {
+		return e === 0 && n === 0 ? this : new t(this._offset("x", e), this._offset("y", n), this._passThrough("width"), this._passThrough("height"));
+	}
+	translateBy(e) {
+		return this.translate(e.x, e.y);
+	}
+	expand(e, n = 1) {
+		return e.left == 0 && e.top == 0 && e.right == 0 && e.bottom == 0 ? this : new t(e.left ? this._offset("x", -e.left * n) : this._passThrough("x"), e.top ? this._offset("y", -e.top * n) : this._passThrough("y"), e.width ? this._offset("width", e.width * n) : this._passThrough("width"), e.height ? this._offset("height", e.height * n) : this._passThrough("height"));
+	}
+	shrink(e) {
+		return this.expand(e, -1);
+	}
+	intersect(e) {
+		return this === e || e == null ? this : new t(() => Math.max(this.x, e.x), () => Math.max(this.y, e.y), () => Math.min(this.x2, e.x2) - Math.max(this.x, e.x), () => Math.min(this.y2, e.y2) - Math.max(this.y, e.y));
+	}
+	intersectX(e) {
+		return this === e || e == null ? this : new t(() => Math.max(this.x, e.x), this._passThrough("y"), () => Math.min(this.x2, e.x2) - Math.max(this.x, e.x), this._passThrough("height"));
+	}
+	intersectY(e) {
+		return this === e || e == null ? this : new t(this._passThrough("x"), () => Math.max(this.y, e.y), this._passThrough("width"), () => Math.min(this.y2, e.y2) - Math.max(this.y, e.y));
+	}
+	union(e) {
+		return this === e || e == null ? this : new t(() => Math.min(this.x, e.x), () => Math.min(this.y, e.y), () => Math.max(this.x2, e.x2) - Math.min(this.x, e.x), () => Math.max(this.y2, e.y2) - Math.min(this.y, e.y));
+	}
+	isDefined() {
+		return this.width >= 0 && this.height >= 0;
+	}
+	flatten() {
+		return new t(e(this.x), e(this.y), e(this.width), e(this.height));
+	}
+	containsPoint(e, t) {
+		return e >= this.x && e < this.x2 && t >= this.y && t < this.y2;
+	}
+	normalizePoint(e, t, n = !1) {
+		let r = {
+			x: (e - this.x) / this.width,
+			y: (t - this.y) / this.height
+		};
+		return n && (r.y = 1 - r.y), r;
+	}
+	denormalizePoint(e, t, n = !1) {
+		return n && (t = 1 - t), {
+			x: this.x + e * this.width,
+			y: this.y + t * this.height
+		};
+	}
+	toString() {
+		return `Rectangle: x: ${this.x}, y: ${this.y}, width: ${this.width}, height: ${this.height}`;
+	}
+	toRoundedString() {
+		return `Rectangle: x: ${Math.round(this.x)}, y: ${Math.round(this.y)}, width: ${Math.round(this.width)}, height: ${Math.round(this.height)}`;
+	}
+};
+//#endregion
+export { t };

package/dist/{renderCanvas2D-DxturTEW.js → renderCanvas2D-DK1c9TFK.js}

@@ -1,14 +1,14 @@
-import { a as e, m as t, o as n, s as r, un as i } from "./clipOptions-BWHr3aTa.js";
+import { Kt as e, a as t, m as n, o as r, s as i } from "./clipOptions-B5PibDq3.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, E as d, M as f, N as p, O as m, _ as h, a as g, c as _, d as v, f as y, g as b, h as x, i as S, k as C, l as w, m as ee, n as T, o as E, p as D, r as O, s as k, t as A, u as j, v as M, x as N, y as P } from "./order-C5CzA37O.js";
+import { A as c, E as l, F as u, I as d, M as f, N as p, S as m, _ as h, a as g, b as _, c as v, d as y, f as b, g as x, h as S, i as C, j as w, k as T, l as ee, m as E, p as D, s as O, t as k, u as A, v as j, w as M, x as N, y as P } from "./order-BkYCnwD7.js";
 //#region ../core/src/rendering/canvas2d/renderers/arrow.js
 function F(e, t) {
-	let n = e, r = t.context, i = n.encoders, a = P(n);
+	let n = e, r = t.context, i = n.encoders, a = m(n);
 	r.lineJoin = "miter";
 	let o, s;
-	return N(n, a, t, (e) => {
+	return M(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) {
 			let e = t[0];
@@ -16,41 +16,41 @@ function F(e, t) {
 			for (let e = 1; e < t.length; e++) r.lineTo(t[e].x, t[e].y);
 			r.closePath();
 		}
-		let n = u(i.fill(e.datum)), c = l(i.fillOpacity, e.datum) * t.viewOpacity;
-		n != "none" && c > 0 && (o != n && (r.fillStyle = n, o = n), r.globalAlpha = c, r.fill());
-		let d = u(i.stroke(e.datum)), f = l(i.strokeOpacity, e.datum) * t.viewOpacity;
+		let n = c(i.fill(e.datum)), u = l(i.fillOpacity, e.datum) * t.viewOpacity;
+		n != "none" && u > 0 && (o != n && (r.fillStyle = n, o = n), r.globalAlpha = u, r.fill());
+		let d = c(i.stroke(e.datum)), f = l(i.strokeOpacity, e.datum) * t.viewOpacity;
 		d != "none" && f > 0 && e.strokeWidth > 0 && (s != d && (r.strokeStyle = d, s = d), r.globalAlpha = f, r.lineWidth = e.strokeWidth, r.stroke());
 	});
 }
 //#endregion
 //#region ../core/src/rendering/canvas2d/renderers/link.js
-function I(e, n) {
-	let r = e, i = n.context, a = r.encoders, o = ee(r), s = M(r, o.shape, n.secondOrderPass);
+function I(e, t) {
+	let r = e, i = t.context, a = r.encoders, o = h(r), s = N(r, o.shape, t.secondOrderPass);
 	i.lineCap = "butt";
-	let c;
-	return x(r, o, n, (e) => {
-		let r = u(a.color(e.datum)), o = l(a.opacity, e.datum) * n.viewOpacity;
+	let u;
+	return j(r, o, t, (e) => {
+		let r = c(a.color(e.datum)), o = l(a.opacity, e.datum) * t.viewOpacity;
 		if (r == "none" || o <= 0 || e.strokeWidth <= 0) return;
-		let d = s && h(e.points[0], e.points[3], s);
+		let d = s && _(e.points[0], e.points[3], s);
 		if (d) {
-			let { normalX: e, normalY: n, offset: a, start: o, end: s } = d, l = i.createLinearGradient(e * (a - s), n * (a - s), e * (a + s), n * (a + s)), u = t(r), f = u.opacity;
-			for (let e of b(o, s)) u.opacity = f * e.opacity, l.addColorStop(e.offset, u.formatRgb());
-			i.strokeStyle = l, c = void 0;
-		} else c != r && (i.strokeStyle = r, c = r);
+			let { normalX: e, normalY: t, offset: a, start: o, end: s } = d, c = i.createLinearGradient(e * (a - s), t * (a - s), e * (a + s), t * (a + s)), l = n(r), f = l.opacity;
+			for (let e of P(o, s)) l.opacity = f * e.opacity, c.addColorStop(e.offset, l.formatRgb());
+			i.strokeStyle = c, u = void 0;
+		} else u != r && (i.strokeStyle = r, u = r);
 		i.globalAlpha = o, i.lineWidth = e.strokeWidth;
-		let [f, p, m, g] = e.points;
-		i.beginPath(), i.moveTo(f[0], f[1]), i.bezierCurveTo(p[0], p[1], m[0], m[1], g[0], g[1]), i.stroke();
+		let [f, p, m, h] = e.points;
+		i.beginPath(), i.moveTo(f[0], f[1]), i.bezierCurveTo(p[0], p[1], m[0], m[1], h[0], h[1]), i.stroke();
 	});
 }
 //#endregion
 //#region ../core/src/rendering/canvas2d/renderers/point.js
 function L(e, t) {
 	let n = e;
-	d(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 = y(n), i = t.context, a = n.encoders, o, s;
-	return D(n, r, t, (e) => {
-		let n = e.datum, r = e.lineShape, c = u(a.fill(n)), d = l(a.fillOpacity, n) * t.viewOpacity, f = u(a.stroke(n)), p = l(a.strokeOpacity, n) * t.viewOpacity;
-		r && (f == "none" || p <= 0) && (f = c, p = d), i.beginPath();
+	T(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 = S(n), i = t.context, a = n.encoders, o, s;
+	return x(n, r, t, (e) => {
+		let n = e.datum, r = e.lineShape, u = c(a.fill(n)), d = l(a.fillOpacity, n) * t.viewOpacity, f = c(a.stroke(n)), p = l(a.strokeOpacity, n) * t.viewOpacity;
+		r && (f == "none" || p <= 0) && (f = u, p = d), i.beginPath();
 		let m = e.angle != 0 && e.shape != "circle";
 		m && (i.save(), i.translate(e.x, e.y), i.rotate(e.angle * Math.PI / 180));
 		let h = m ? 0 : e.x, g = m ? 0 : e.y, _ = !0;
@@ -58,8 +58,8 @@ function L(e, t) {
 		else if (e.shape == "square") {
 			let t = e.geometryRadius * 2;
 			i.rect(h - e.geometryRadius, g - e.geometryRadius, t, t);
-		} else _ = v(e.shape, h, g, e.geometryRadius, i);
-		m && i.restore(), _ || (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" && d > 0 && (o != c && (i.fillStyle = c, o = c), R(i, d), i.fill()), f != "none" && p > 0 && e.strokeWidth > 0 && (r && i.lineCap != "butt" && (i.lineCap = "butt"), s != f && (i.strokeStyle = f, s = f), R(i, p), z(i, e.strokeWidth), i.stroke());
+		} else _ = E(e.shape, h, g, e.geometryRadius, i);
+		m && i.restore(), _ || (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 && u != "none" && d > 0 && (o != u && (i.fillStyle = u, o = u), R(i, d), i.fill()), f != "none" && p > 0 && e.strokeWidth > 0 && (r && i.lineCap != "butt" && (i.lineCap = "butt"), s != f && (i.strokeStyle = f, s = f), R(i, p), z(i, e.strokeWidth), i.stroke());
 	});
 }
 function R(e, t) {
@@ -71,20 +71,20 @@ function z(e, t) {
 //#endregion
 //#region ../core/src/rendering/canvas2d/renderers/rect.js
 function B(e, t) {
-	let n = e, r = w(n);
+	let n = e, r = b(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, d = [
+	let a = t.context, o = n.encoders, s, u, d = [
 		0,
 		0,
 		0,
 		0
-	], f = o.stroke.constant, p = o.strokeOpacity.constant, m = f ? u(o.stroke(t.data[i])) : "none", h = f && m == "none", g = !h && p ? l(o.strokeOpacity, t.data[i]) : 0;
-	return j(n, r, t, (e) => {
+	], f = o.stroke.constant, p = o.strokeOpacity.constant, m = f ? c(o.stroke(t.data[i])) : "none", h = f && m == "none", g = !h && p ? l(o.strokeOpacity, t.data[i]) : 0;
+	return D(n, r, t, (e) => {
 		r.shadow.opacity > 0 && V(e, r.shadow, t, d);
-		let n = e.opacityFactor, i = e.fill != "none" && e.fillOpacity > 0, _ = f ? m : u(o.stroke(e.datum)), v = (p ? g : l(o.strokeOpacity, e.datum)) * t.viewOpacity * n, y = !h && _ != "none" && v > 0 && e.strokeWidth > 0, b = r.hasCornerRadii && (e.radii.topLeft != 0 || e.radii.topRight != 0 || e.radii.bottomRight != 0 || e.radii.bottomLeft != 0);
-		b && (i || y) && (d[0] = e.radii.topLeft, d[1] = e.radii.topRight, d[2] = e.radii.bottomRight, d[3] = e.radii.bottomLeft, a.beginPath(), a.roundRect(e.x, e.y, e.width, e.height, d)), i && (s != e.fill && (a.fillStyle = e.fill, s = e.fill), H(a, e.fillOpacity * n), b ? a.fill() : a.fillRect(e.x, e.y, e.width, e.height)), y && (c != _ && (a.strokeStyle = _, c = _), H(a, v), U(a, e.strokeWidth), b ? a.stroke() : a.strokeRect(e.x, e.y, e.width, e.height));
+		let n = e.opacityFactor, i = e.fill != "none" && e.fillOpacity > 0, _ = f ? m : c(o.stroke(e.datum)), v = (p ? g : l(o.strokeOpacity, e.datum)) * t.viewOpacity * n, y = !h && _ != "none" && v > 0 && e.strokeWidth > 0, b = r.hasCornerRadii && (e.radii.topLeft != 0 || e.radii.topRight != 0 || e.radii.bottomRight != 0 || e.radii.bottomLeft != 0);
+		b && (i || y) && (d[0] = e.radii.topLeft, d[1] = e.radii.topRight, d[2] = e.radii.bottomRight, d[3] = e.radii.bottomLeft, a.beginPath(), a.roundRect(e.x, e.y, e.width, e.height, d)), i && (s != e.fill && (a.fillStyle = e.fill, s = e.fill), H(a, e.fillOpacity * n), b ? a.fill() : a.fillRect(e.x, e.y, e.width, e.height)), y && (u != _ && (a.strokeStyle = _, u = _), H(a, v), U(a, e.strokeWidth), b ? a.stroke() : a.strokeRect(e.x, e.y, e.width, e.height));
 	});
 }
 function V(e, t, n, r) {
@@ -106,32 +106,32 @@ function U(e, t) {
 //#region ../core/src/rendering/canvas2d/renderers/rule.js
 function W(e, t) {
 	let n = e, r = t.context, i = n.encoders;
-	r.lineCap = d(n, n.properties.strokeCap), r.setLineDash(d(n, n.properties.strokeDash) ?? []), r.lineDashOffset = d(n, n.properties.strokeDashOffset);
+	r.lineCap = T(n, n.properties.strokeCap), r.setLineDash(T(n, n.properties.strokeDash) ?? []), r.lineDashOffset = T(n, n.properties.strokeDashOffset);
 	let a;
-	return _(n, k(n), t, (e) => {
-		let n = u(i.color(e.datum)), o = l(i.opacity, e.datum) * t.viewOpacity;
+	return y(n, A(n), t, (e) => {
+		let n = c(i.color(e.datum)), o = l(i.opacity, e.datum) * t.viewOpacity;
 		n == "none" || o <= 0 || e.strokeWidth <= 0 || (a != n && (r.strokeStyle = n, a = n), r.globalAlpha = o, r.lineWidth = e.strokeWidth, r.beginPath(), r.moveTo(e.x1, e.y1), r.lineTo(e.x2, e.y2), r.stroke());
 	});
 }
 //#endregion
 //#region ../core/src/rendering/canvas2d/renderers/text.js
 function G(e, t) {
-	let n = e, r = n.properties, i = g(n), a = t.context, o = n.encoders, s = T(r.font), c = `${r.fontStyle ?? "normal"} ${S(r.fontWeight ?? "normal")} `, f = i.baseline == "baseline" ? "alphabetic" : i.baseline;
+	let n = e, r = n.properties, i = t.textMetrics ?? n.unitView.context.textMetrics, a = i.requestFont(r), o = C(i, r), s = v(n), u = t.context, d = n.encoders, f = g(r.font), p = `${r.fontStyle ?? "normal"} ${O(r.fontWeight ?? "normal")} `, m = s.baseline == "baseline" ? "alphabetic" : s.baseline;
 	[
 		r.viewportEdgeFadeWidthTop,
 		r.viewportEdgeFadeWidthRight,
 		r.viewportEdgeFadeWidthBottom,
 		r.viewportEdgeFadeWidthLeft
-	].some((e) => d(n, e) > 0) && t.warn("Canvas2D ignored unsupported text viewport edge fading.");
-	let p, m;
-	return i.logoLetters || (a.textAlign = i.align, a.textBaseline = f), E(n, i, t, (e) => {
+	].some((e) => T(n, e) > 0) && t.warn("Canvas2D ignored unsupported text viewport edge fading.");
+	let h, _;
+	return s.logoLetters || (u.textAlign = s.align, u.textBaseline = m), ee(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 = u(o.color(e.datum)), r = l(o.opacity, e.datum) * t.viewOpacity * e.fadeOpacity;
-		if (!(n == "none" || r <= 0)) if (p != n && (a.fillStyle = n, p = n), a.globalAlpha = r, m != e.size && (a.font = `${c}${e.size}px ${s}`, m = e.size), e.logoScale) {
-			a.save(), a.translate(e.x, e.y), a.rotate(e.angle * Math.PI / 180), a.translate(e.dx, e.dy);
-			let t = a.measureText(e.text).width;
-			a.scale(e.logoScale.width / t, e.logoScale.heightScale), a.textAlign = "center", a.textBaseline = "alphabetic", a.fillText(e.text, 0, O("middle", 1)), a.restore();
-		} else e.angle ? (a.save(), a.translate(e.x, e.y), a.rotate(e.angle * Math.PI / 180), a.fillText(e.text, e.dx, e.dy, e.width), a.restore()) : a.fillText(e.text, e.x + e.dx, e.y + e.dy, e.width);
+		let n = c(d.color(e.datum)), r = l(d.opacity, e.datum) * t.viewOpacity * e.fadeOpacity;
+		n == "none" || r <= 0 || (h != n && (u.fillStyle = n, h = n), u.globalAlpha = r, _ != e.size && (u.font = `${p}${e.size}px ${f}`, _ = e.size), e.logoTransform ? (u.save(), u.translate(e.x, e.y), u.rotate(e.angle * Math.PI / 180), u.translate(e.dx, e.dy), u.scale(e.logoTransform.scaleX, e.logoTransform.scaleY), u.translate(-e.logoTransform.originX, -e.logoTransform.originY), u.textAlign = "left", u.textBaseline = "alphabetic", u.fillText(e.text, 0, 0), u.restore()) : e.angle || e.scale != 1 ? (u.save(), u.translate(e.x, e.y), u.rotate(e.angle * Math.PI / 180), u.translate(e.dx, e.dy), u.scale(e.scale, e.scale), u.fillText(e.text, 0, 0), u.restore()) : u.fillText(e.text, e.x + e.dx, e.y + e.dy));
 	});
 }
 //#endregion
@@ -153,14 +153,14 @@ var J = 8, Y = 16777216, X = class extends s {
 	#n = /* @__PURE__ */ new WeakMap();
 	#r;
 	#i;
-	#a = new f();
+	#a = new u();
 	#o;
 	#s = [0, 0];
 	#c;
 	#l;
 	#u = [];
 	constructor(e, t) {
-		if (super(e), this.context = t.context, this.width = t.width, this.height = t.height, this.devicePixelRatio = t.devicePixelRatio, this.paint = t.paint, this.#r = t.markPredicate ?? (() => !0), this.#i = o(), this.#o = t.xIndexManager, this.#l = t.opacityLayers ?? [], this.#c = {
+		if (super(e), this.context = t.context, this.width = t.width, this.height = t.height, this.devicePixelRatio = t.devicePixelRatio, this.paint = t.paint, this.textMetrics = t.textMetrics, this.#r = t.markPredicate ?? (() => !0), this.#i = o(), this.#o = t.xIndexManager, this.#l = t.opacityLayers ?? [], this.#c = {
 			x: 0,
 			y: 0,
 			width: this.context.canvas.width,
@@ -173,18 +173,18 @@ var J = 8, Y = 16777216, X = class extends s {
 	getDevicePixelRatio() {
 		return this.devicePixelRatio;
 	}
-	pushView(t, n) {
-		this.paint && !this.#t.has(t) && (t.onBeforeRender(), this.#t.add(t));
-		let r = t.getOpacity();
+	pushView(e, n) {
+		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 = e(t), i = Z(n, this.devicePixelRatio, this.#c, r), a = Q(this.#l, this.#u.length, i.width, i.height);
+			let r = t(e), i = Z(n, this.devicePixelRatio, this.#c, r), a = Q(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
 			}), this.context = a, this.#c = i;
 		}
 		this.#e.push({
-			view: t,
+			view: e,
 			coords: n,
 			opacity: r
 		});
@@ -206,24 +206,24 @@ var J = 8, Y = 16777216, X = class extends s {
 	}
 	renderMark(e, t) {
 		if (!this.paint || !this.#r(e)) 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;
+		let n = this.#n.get(e.unitView);
+		if (n === void 0 && (n = e.unitView.getEffectiveOpacity(), this.#n.set(e.unitView, n)), n <= 0) return;
 		e.initializeRenderingRevisions(Object.keys(e.properties));
 		let o = t.sampleFacetRenderingOptions;
 		if (o && !e.encoders.facetIndex && (this.#i?.addCount("canvasSampleFacetOccurrences"), !q(o))) {
 			this.#i?.addCount("canvasCulledSampleFacetOccurrences");
 			return;
 		}
-		let s = this.currentCoords, l = n(t), u = r(l, e.properties.clip, s), d = C(this.width, this.height, u);
-		if (!c(d)) return;
-		let f = m(s, l, e.properties.cullByVisibleRange), h = this.#o?.prepare(e) ?? !1, g = this.context;
-		if (g.save(), u) {
-			let e = u.rect.flatten(), t = u.clipX ? e.x : 0, n = u.clipY ? e.y : 0, r = u.clipX ? e.width : this.width, i = u.clipY ? e.height : this.height;
+		let s = this.currentCoords, c = r(t), l = i(c, e.properties.clip, s), u = f(this.width, this.height, l);
+		if (!p(u)) return;
+		let m = w(s, c, e.properties.cullByVisibleRange), h = this.#o?.prepare(e) ?? !1, g = this.context;
+		if (g.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;
 			g.beginPath(), g.rect(t, n, r, i), g.clip();
 		}
 		try {
 			let n = e.getOrder?.(), r = n && n.isActive();
-			p(e, t, s, this.#a, (t, i) => {
+			d(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) => K(e, {
@@ -234,14 +234,15 @@ var J = 8, Y = 16777216, X = class extends s {
 					secondOrderPass: o,
 					start: r,
 					end: i,
-					visibleBounds: d,
-					anchorCullBounds: f,
+					visibleBounds: u,
+					anchorCullBounds: m,
 					viewOpacity: 1,
+					textMetrics: this.textMetrics,
 					warn: (t) => a(`${t} View: ${e.unitView.getPathString()}`)
 				});
 				if (!r) return c(i, o, s);
-				let l = 0, u = A(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));
+				let l = 0, d = k(i, o, s, n.predicate, n.passes);
+				for (let [e, t] of d.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 {
@@ -249,9 +250,9 @@ var J = 8, Y = 16777216, X = class extends s {
 		}
 	}
 	get currentCoords() {
-		let e = i(this.#e);
-		if (!e) throw Error("No current view in Canvas2D rendering context.");
-		return e.coords;
+		let t = e(this.#e);
+		if (!t) throw Error("No current view in Canvas2D rendering context.");
+		return t.coords;
 	}
 };
 function Z(e, t, n, r) {