@genome-spy/core 0.78.0 → 0.79.0

package/dist/src/fonts/textMetrics.js

@@ -0,0 +1,73 @@
+/**
+ * @typedef {import("./bmFontManager.js").BMFontMetrics} BMFontMetrics
+ * @typedef {import("../spec/font.js").FontStyle} FontStyle
+ * @typedef {import("../spec/font.js").FontWeight} FontWeight
+ * @typedef {{ metrics?: BMFontMetrics, texture?: WebGLTexture }} FontEntryLike
+ * @typedef {{
+ *     font?: string,
+ *     fontStyle?: FontStyle,
+ *     fontWeight?: FontWeight,
+ * }} FontConfig
+ * @typedef {{
+ *     getDefaultFont: () => FontEntryLike,
+ *     getFont: (
+ *         family?: string,
+ *         style?: FontStyle,
+ *         weight?: FontWeight
+ *     ) => FontEntryLike,
+ * }} FontManagerLike
+ */
+
+/**
+ * Requests a font entry and registers asynchronous loading for custom fonts.
+ *
+ * @param {FontManagerLike} fontManager
+ * @param {FontConfig} config
+ * @returns {FontEntryLike}
+ */
+export function requestFont(fontManager, config) {
+    return fontManager.getFont(
+        config.font,
+        config.fontStyle,
+        config.fontWeight
+    );
+}
+
+/**
+ * @param {BMFontMetrics} metrics
+ * @param {number} fontSize
+ */
+export function getTextHeight(metrics, fontSize) {
+    return (
+        ((metrics.capHeight + metrics.descent) / metrics.common.base) * fontSize
+    );
+}
+
+/**
+ * @param {BMFontMetrics} metrics
+ * @param {string} text
+ * @param {number} fontSize
+ */
+export function measureText(metrics, text, fontSize) {
+    return {
+        width: metrics.measureWidth(text, fontSize),
+        height: getTextHeight(metrics, fontSize),
+    };
+}
+
+/**
+ * Returns the projected text extent along a layout direction after rotation.
+ *
+ * @param {{ width: number, height: number }} size
+ * @param {number} angle
+ * @param {"horizontal" | "vertical"} direction
+ */
+export function getProjectedTextExtent(size, angle, direction) {
+    const radians = (angle * Math.PI) / 180;
+    const absSin = Math.abs(Math.sin(radians));
+    const absCos = Math.abs(Math.cos(radians));
+
+    return direction == "vertical"
+        ? size.width * absSin + size.height * absCos
+        : size.width * absCos + size.height * absSin;
+}

package/dist/src/genomeSpy/headlessBootstrap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"headlessBootstrap.d.ts","sourceRoot":"","sources":["../../../src/genomeSpy/headlessBootstrap.js"],"names":[],"mappings":"AAmEA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AACH,oDAhCW;IACN,kBAAkB,CAAC,EAAE,OAAO,wBAAwB,EAAE,kBAAkB,CAAC;IACzE,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,WAAW,CAAC,EAAE,aAAa,CAAC;IAC5B,QAAQ,CAAC,EAAE,OAAO,sBAAsB,EAAE,OAAO,CAAC;IAClD,UAAU,CAAC,EAAE,UAAU,CAAC,OAAO,iBAAiB,CAAC,CAAC;IAClD,wBAAwB,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,GAAG,EAAE,GAAG,SAAS,CAAC;IAC/D,eAAe,CAAC,EAAE,MAAM,GAAG,CAAC;IAC5B,aAAa,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,OAAO,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC;IAC9E,mBAAmB,CAAC,EAAE,MAAM,IAAI,CAAC;IACjC,oBAAoB,CAAC,EAAE,MAAM,IAAI,CAAC;IAClC,mBAAmB,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,UAAU,KAAK,IAAI,CAAC;IACnD,mBAAmB,CAAC,EAAE,CACpB,IAAI,EAAE,SAAS,GAAG,OAAO,EACzB,QAAQ,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,KACrC,IAAI,CAAC;IACV,oBAAoB,CAAC,EAAE,CACrB,IAAI,EAAE,OAAO,iBAAiB,EAAE,kBAAkB,EAClD,QAAQ,EAAE,CAAC,OAAO,EAAE,OAAO,iBAAiB,EAAE,gBAAgB,KAAK,IAAI,KACpE,IAAI,CAAC;IACV,uBAAuB,CAAC,EAAE,CACxB,IAAI,EAAE,OAAO,iBAAiB,EAAE,kBAAkB,EAClD,QAAQ,EAAE,CAAC,OAAO,EAAE,OAAO,iBAAiB,EAAE,gBAAgB,KAAK,IAAI,KACpE,IAAI,CAAC;IACV,aAAa,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,iBAAiB,EAAE,OAAO,GAAG,IAAI,KAAK,IAAI,CAAC;IACzE,uBAAuB,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,iBAAiB,EAAE,OAAO,KAAK,OAAO,CAAC;IAC/E,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC;IACpC,QAAQ,CAAC,EAAE,OAAO,sBAAsB,EAAE,OAAO,CAAC;CACnD,GACS,WAAW,CA4DvB;AAED;;;;GAIG;AACH,+CAFW,OAAO,iBAAiB,EAAE,OAAO,QAK3C;AAED;;;;;;;;;;;GAWG;AACH,2CARW,QAAQ,YACR;IACN,OAAO,CAAC,EAAE,WAAW,CAAC;IACtB,cAAc,CAAC,EAAE,UAAU,CAAC,OAAO,yBAAyB,CAAC,CAAC,CAAC,CAAC,CAAC;IACjE,eAAe,CAAC,EAAE,CAAC,QAAQ,EAAE,QAAQ,KAAK,IAAI,CAAC;CAChD,GACS,OAAO,CAAC;IAAE,IAAI,EAAE,OAAO,iBAAiB,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,WAAW,CAAA;CAAE,CAAC,CA+BtF;AAED;;;;;;;;;;;GAWG;AACH,kDARW,QAAQ,YACR;IACN,OAAO,CAAC,EAAE,WAAW,CAAC;IACtB,cAAc,CAAC,EAAE,UAAU,CAAC,OAAO,yBAAyB,CAAC,CAAC,CAAC,CAAC,CAAC;IACjE,kBAAkB,CAAC,EAAE,OAAO,wBAAwB,EAAE,kBAAkB,CAAC;CAC1E,GACS,OAAO,CAAC;IAAE,IAAI,EAAE,OAAO,iBAAiB,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,WAAW,CAAA;CAAE,CAAC,CAwBtF;;;;uBApPY,OAAO,iBAAiB,EAAE,QAAQ;;;;0BAClC,OAAO,yBAAyB,EAAE,OAAO;qBAGjC,qBAAqB;wBAClB,0BAA0B;0BACxB,2BAA2B;kCAGnB,4BAA4B"}
+{"version":3,"file":"headlessBootstrap.d.ts","sourceRoot":"","sources":["../../../src/genomeSpy/headlessBootstrap.js"],"names":[],"mappings":"AAuEA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AACH,oDAhCW;IACN,kBAAkB,CAAC,EAAE,OAAO,wBAAwB,EAAE,kBAAkB,CAAC;IACzE,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,WAAW,CAAC,EAAE,aAAa,CAAC;IAC5B,QAAQ,CAAC,EAAE,OAAO,sBAAsB,EAAE,OAAO,CAAC;IAClD,UAAU,CAAC,EAAE,UAAU,CAAC,OAAO,iBAAiB,CAAC,CAAC;IAClD,wBAAwB,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,GAAG,EAAE,GAAG,SAAS,CAAC;IAC/D,eAAe,CAAC,EAAE,MAAM,GAAG,CAAC;IAC5B,aAAa,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,OAAO,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC;IAC9E,mBAAmB,CAAC,EAAE,MAAM,IAAI,CAAC;IACjC,oBAAoB,CAAC,EAAE,MAAM,IAAI,CAAC;IAClC,mBAAmB,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,UAAU,KAAK,IAAI,CAAC;IACnD,mBAAmB,CAAC,EAAE,CACpB,IAAI,EAAE,SAAS,GAAG,OAAO,EACzB,QAAQ,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,KACrC,IAAI,CAAC;IACV,oBAAoB,CAAC,EAAE,CACrB,IAAI,EAAE,OAAO,iBAAiB,EAAE,kBAAkB,EAClD,QAAQ,EAAE,CAAC,OAAO,EAAE,OAAO,iBAAiB,EAAE,gBAAgB,KAAK,IAAI,KACpE,IAAI,CAAC;IACV,uBAAuB,CAAC,EAAE,CACxB,IAAI,EAAE,OAAO,iBAAiB,EAAE,kBAAkB,EAClD,QAAQ,EAAE,CAAC,OAAO,EAAE,OAAO,iBAAiB,EAAE,gBAAgB,KAAK,IAAI,KACpE,IAAI,CAAC;IACV,aAAa,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,iBAAiB,EAAE,OAAO,GAAG,IAAI,KAAK,IAAI,CAAC;IACzE,uBAAuB,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,iBAAiB,EAAE,OAAO,KAAK,OAAO,CAAC;IAC/E,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC;IACpC,QAAQ,CAAC,EAAE,OAAO,sBAAsB,EAAE,OAAO,CAAC;CACnD,GACS,WAAW,CA4DvB;AAED;;;;GAIG;AACH,+CAFW,OAAO,iBAAiB,EAAE,OAAO,QAK3C;AAED;;;;;;;;;;;GAWG;AACH,2CARW,QAAQ,YACR;IACN,OAAO,CAAC,EAAE,WAAW,CAAC;IACtB,cAAc,CAAC,EAAE,UAAU,CAAC,OAAO,yBAAyB,CAAC,CAAC,CAAC,CAAC,CAAC;IACjE,eAAe,CAAC,EAAE,CAAC,QAAQ,EAAE,QAAQ,KAAK,IAAI,CAAC;CAChD,GACS,OAAO,CAAC;IAAE,IAAI,EAAE,OAAO,iBAAiB,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,WAAW,CAAA;CAAE,CAAC,CAiCtF;AAED;;;;;;;;;;;GAWG;AACH,kDARW,QAAQ,YACR;IACN,OAAO,CAAC,EAAE,WAAW,CAAC;IACtB,cAAc,CAAC,EAAE,UAAU,CAAC,OAAO,yBAAyB,CAAC,CAAC,CAAC,CAAC,CAAC;IACjE,kBAAkB,CAAC,EAAE,OAAO,wBAAwB,EAAE,kBAAkB,CAAC;CAC1E,GACS,OAAO,CAAC;IAAE,IAAI,EAAE,OAAO,iBAAiB,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,WAAW,CAAA;CAAE,CAAC,CAwBtF;;;;uBA1PY,OAAO,iBAAiB,EAAE,QAAQ;;;;0BAClC,OAAO,yBAAyB,EAAE,OAAO;qBAGjC,qBAAqB;wBAClB,0BAA0B;0BACxB,2BAA2B;kCAGnB,4BAA4B"}

package/dist/src/genomeSpy/headlessBootstrap.js

@@ -15,6 +15,10 @@ import { createViewContext } from "./viewContextFactory.js";
 import { ViewFactory, VIEW_ROOT_NAME } from "../view/viewFactory.js";
 import { ensureAssembliesForView } from "../genome/assemblyPreflight.js";
 import { attachViewLevelScaleConfigs } from "../scales/viewLevelScaleConfig.js";
+import {
+    attachViewLevelAxisConfigs,
+    attachViewLevelLegendConfigs,
+} from "../scales/viewLevelGuideConfig.js";
 import {
     configureViewHierarchy,
     configureViewOpacity,
@@ -198,6 +202,8 @@ export async function createHeadlessEngine(spec, options = {}) {
     );
 
     attachViewLevelScaleConfigs(view);
+    attachViewLevelAxisConfigs(view);
+    attachViewLevelLegendConfigs(view);
     await ensureAssembliesForView(view, context.genomeStore);
     prepareViewHierarchy(view);
 

package/dist/src/genomeSpy/renderCoordinator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"renderCoordinator.d.ts","sourceRoot":"","sources":["../../../src/genomeSpy/renderCoordinator.js"],"names":[],"mappings":"AAIA;IAiBI;;;;;;;OAOG;IACH,iFANG;QAAmD,QAAQ,EAAnD,OAAO,iBAAiB,EAAE,OAAO;QACe,QAAQ,EAAxD,OAAO,sBAAsB,EAAE,OAAO;QAChB,aAAa,EAAnC,MAAM,MAAM;QACyE,SAAS,EAA9F,CAAC,IAAI,EAAE,OAAO,iBAAiB,EAAE,kBAAkB,EAAE,OAAO,CAAC,EAAE,GAAG,KAAK,IAAI;QACvD,gBAAgB,EAApC,MAAM,IAAI;KACpB,EAqBA;IAED,sBAkDC;IAED,kBAIC;IAED,iCAOC;;CACJ"}
+{"version":3,"file":"renderCoordinator.d.ts","sourceRoot":"","sources":["../../../src/genomeSpy/renderCoordinator.js"],"names":[],"mappings":"AAIA;IAiBI;;;;;;;OAOG;IACH,iFANG;QAAmD,QAAQ,EAAnD,OAAO,iBAAiB,EAAE,OAAO;QACe,QAAQ,EAAxD,OAAO,sBAAsB,EAAE,OAAO;QAChB,aAAa,EAAnC,MAAM,MAAM;QACyE,SAAS,EAA9F,CAAC,IAAI,EAAE,OAAO,iBAAiB,EAAE,kBAAkB,EAAE,OAAO,CAAC,EAAE,GAAG,KAAK,IAAI;QACvD,gBAAgB,EAApC,MAAM,IAAI;KACpB,EAqBA;IAED,sBA2BC;IA+CD,kBAIC;IAED,iCAOC;;CACJ"}

package/dist/src/genomeSpy/renderCoordinator.js

@@ -57,6 +57,29 @@ export default class RenderCoordinator {
 
         this.#broadcast("layout");
 
+        // Layout may change the root-derived canvas size. Start with a fresh
+        // size, then repeat only if the pass caused the applied canvas size to
+        // change so buffered render commands use current dimensions.
+        this.#glHelper.invalidateSize();
+        let remainingPasses = 5;
+        while (this.#computeLayoutPass()) {
+            if (!this.#glHelper.invalidateSize()) {
+                this.#onLayoutComputed();
+                this.#broadcast("layoutComputed");
+                return;
+            }
+
+            remainingPasses--;
+            if (remainingPasses == 0) {
+                throw new Error(
+                    "Layout did not settle: canvas size kept changing."
+                );
+            }
+        }
+    }
+
+    #computeLayoutPass() {
+        const root = this.#viewRoot;
         const canvasSize = this.#glHelper.getLogicalCanvasSize();
 
         if (isNaN(canvasSize.width) || isNaN(canvasSize.height)) {
@@ -64,7 +87,7 @@ export default class RenderCoordinator {
             console.log(
                 `NaN in canvas size: ${canvasSize.width}x${canvasSize.height}. Skipping computeLayout().`
             );
-            return;
+            return false;
         }
 
         const commonOptions = {
@@ -97,8 +120,7 @@ export default class RenderCoordinator {
             Rectangle.create(0, 0, canvasSize.width, canvasSize.height)
         );
 
-        this.#onLayoutComputed();
-        this.#broadcast("layoutComputed");
+        return true;
     }
 
     renderAll() {

package/dist/src/genomeSpy/viewDataInit.d.ts

@@ -19,4 +19,18 @@ export function initializeViewData(viewRoot: import("../view/view.js").default,
  * @returns {Promise<import("../data/dataFlow.js").default>}
  */
 export function initializeVisibleViewData(viewRoot: import("../view/view.js").default, dataFlow: import("../data/dataFlow.js").default, fontManager: import("../fonts/bmFontManager.js").default): Promise<import("../data/dataFlow.js").default>;
+/**
+ * Initializes dataflow/graphics for selected views while avoiding unnecessary
+ * data source reloads.
+ *
+ * If a selected view attaches downstream of an already completed collector,
+ * the collector is repropagated instead of reloading the source.
+ *
+ * @param {import("../view/view.js").default} viewRoot
+ * @param {import("../data/dataFlow.js").default} dataFlow
+ * @param {import("../fonts/bmFontManager.js").default} fontManager
+ * @param {Iterable<import("../view/view.js").default>} candidateViews
+ * @returns {Promise<import("../data/dataFlow.js").default>}
+ */
+export function initializeViewDataForViews(viewRoot: import("../view/view.js").default, dataFlow: import("../data/dataFlow.js").default, fontManager: import("../fonts/bmFontManager.js").default, candidateViews: Iterable<import("../view/view.js").default>): Promise<import("../data/dataFlow.js").default>;
 //# sourceMappingURL=viewDataInit.d.ts.map

package/dist/src/genomeSpy/viewDataInit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"viewDataInit.d.ts","sourceRoot":"","sources":["../../../src/genomeSpy/viewDataInit.js"],"names":[],"mappings":"AAOA;;;;;;;;;GASG;AACH,6CANW,OAAO,iBAAiB,EAAE,OAAO,YACjC,OAAO,qBAAqB,EAAE,OAAO,eACrC,OAAO,2BAA2B,EAAE,OAAO,mBAC3C,CAAC,QAAQ,EAAE,OAAO,qBAAqB,EAAE,OAAO,KAAK,IAAI,GACvD,OAAO,CAAC,OAAO,qBAAqB,EAAE,OAAO,CAAC,CAoC1D;AAED;;;;;;;;GAQG;AACH,oDALW,OAAO,iBAAiB,EAAE,OAAO,YACjC,OAAO,qBAAqB,EAAE,OAAO,eACrC,OAAO,2BAA2B,EAAE,OAAO,GACzC,OAAO,CAAC,OAAO,qBAAqB,EAAE,OAAO,CAAC,CA6E1D"}
+{"version":3,"file":"viewDataInit.d.ts","sourceRoot":"","sources":["../../../src/genomeSpy/viewDataInit.js"],"names":[],"mappings":"AAQA;;;;;;;;;GASG;AACH,6CANW,OAAO,iBAAiB,EAAE,OAAO,YACjC,OAAO,qBAAqB,EAAE,OAAO,eACrC,OAAO,2BAA2B,EAAE,OAAO,mBAC3C,CAAC,QAAQ,EAAE,OAAO,qBAAqB,EAAE,OAAO,KAAK,IAAI,GACvD,OAAO,CAAC,OAAO,qBAAqB,EAAE,OAAO,CAAC,CAoC1D;AAED;;;;;;;;GAQG;AACH,oDALW,OAAO,iBAAiB,EAAE,OAAO,YACjC,OAAO,qBAAqB,EAAE,OAAO,eACrC,OAAO,2BAA2B,EAAE,OAAO,GACzC,OAAO,CAAC,OAAO,qBAAqB,EAAE,OAAO,CAAC,CAqB1D;AAED;;;;;;;;;;;;GAYG;AACH,qDANW,OAAO,iBAAiB,EAAE,OAAO,YACjC,OAAO,qBAAqB,EAAE,OAAO,eACrC,OAAO,2BAA2B,EAAE,OAAO,kBAC3C,QAAQ,CAAC,OAAO,iBAAiB,EAAE,OAAO,CAAC,GACzC,OAAO,CAAC,OAAO,qBAAqB,EAAE,OAAO,CAAC,CA+E1D"}

package/dist/src/genomeSpy/viewDataInit.js

@@ -1,4 +1,5 @@
 import {
+    broadcastSubtreeDataReady,
     initializeViewSubtree,
     loadViewSubtreeData,
 } from "../data/flowInit.js";
@@ -38,6 +39,8 @@ export async function initializeViewData(
     // await fonts inside text mark graphics updates and before loading data for
     // subtrees that contain measureText transforms.
     await fontManager.waitUntilReady();
+    viewRoot.invalidateSizeCache();
+    await finalizeSubtreeGraphics(graphicsPromises);
 
     // Find all data sources and initiate loading.
     await loadViewSubtreeData(
@@ -46,8 +49,6 @@ export async function initializeViewData(
         visibilityPredicate
     );
 
-    await finalizeSubtreeGraphics(graphicsPromises);
-
     return builtDataFlow;
 }
 
@@ -65,10 +66,6 @@ export async function initializeVisibleViewData(
     dataFlow,
     fontManager
 ) {
-    // Initialize dataflow/graphics for views that have become visible since the
-    // initial load, while avoiding unnecessary data source reloads. If a view
-    // attaches downstream of an already completed collector, repropagate that
-    // collector instead of reloading the source.
     const visibilityPredicate = (
         /** @type {import("../view/view.js").default} */ view
     ) => view.isConfiguredVisible();
@@ -77,6 +74,45 @@ export async function initializeVisibleViewData(
         (view) => view.getDataInitializationState() === "none"
     );
 
+    return initializeViewDataForViews(
+        viewRoot,
+        dataFlow,
+        fontManager,
+        viewsToInitialize
+    );
+}
+
+/**
+ * Initializes dataflow/graphics for selected views while avoiding unnecessary
+ * data source reloads.
+ *
+ * If a selected view attaches downstream of an already completed collector,
+ * the collector is repropagated instead of reloading the source.
+ *
+ * @param {import("../view/view.js").default} viewRoot
+ * @param {import("../data/dataFlow.js").default} dataFlow
+ * @param {import("../fonts/bmFontManager.js").default} fontManager
+ * @param {Iterable<import("../view/view.js").default>} candidateViews
+ * @returns {Promise<import("../data/dataFlow.js").default>}
+ */
+export async function initializeViewDataForViews(
+    viewRoot,
+    dataFlow,
+    fontManager,
+    candidateViews
+) {
+    const candidates = new Set(candidateViews);
+    const visibilityPredicate = (
+        /** @type {import("../view/view.js").default} */ view
+    ) => view.isConfiguredVisible();
+    const viewsToInitialize = collectVisibleViews(
+        viewRoot,
+        visibilityPredicate
+    ).filter(
+        (view) =>
+            candidates.has(view) && view.getDataInitializationState() === "none"
+    );
+
     if (viewsToInitialize.length === 0) {
         return dataFlow;
     }
@@ -113,6 +149,8 @@ export async function initializeVisibleViewData(
     // Newly visible subtrees may introduce text marks or measureText transforms
     // that request fonts during initializeViewSubtree.
     await fontManager.waitUntilReady();
+    viewRoot.invalidateSizeCache();
+    await finalizeSubtreeGraphics(graphicsPromises);
 
     for (const collector of collectorsToRepropagate) {
         collector.repropagate();
@@ -131,8 +169,7 @@ export async function initializeVisibleViewData(
             )
         );
     }
-
-    await finalizeSubtreeGraphics(graphicsPromises);
+    broadcastSubtreeDataReady(viewRoot);
 
     return builtDataFlow;
 }

package/dist/src/genomeSpyBase.d.ts

@@ -24,6 +24,8 @@ export default class GenomeSpy {
     /** @type {(function(string):object[])[]} */
     namedDataProviders: ((arg0: string) => object[])[];
     animator: Animator;
+    /** @type {(timestamp?: number) => void} */
+    _layoutReflowTransition: (timestamp?: number) => void;
     /** @type {GenomeStore} */
     genomeStore: GenomeStore;
     /**
@@ -122,6 +124,10 @@ export default class GenomeSpy {
         height: number | undefined;
     };
     computeLayout(): void;
+    /**
+     * Recomputes layout and schedules the buffered render commands to be drawn.
+     */
+    requestLayoutReflow(): void;
     renderAll(): void;
     renderPickingFramebuffer(): void;
     getSearchableViews(): UnitView<import("./spec/view.js").UnitSpec>[];

package/dist/src/genomeSpyBase.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"genomeSpyBase.d.ts","sourceRoot":"","sources":["../../src/genomeSpyBase.js"],"names":[],"mappings":"AAgDA;;;GAGG;AAEH;IAoBI;;;;;OAKG;IAEH;;;;;OAKG;IACH,uBAJW,WAAW,qDAEX,OAAO,qBAAqB,EAAE,YAAY,EA0CpD;IAvCG,uBAA0B;IAC1B,oDAAsB;IAItB,sCAAsC;IACtC,wCAAgB;IAEhB,yBAAoC;IAEpC,4CAA4C;IAC5C,oBADW,CAAC,CAAS,IAAM,EAAN,MAAM,KAAE,MAAM,EAAE,CAAC,EAAE,CACZ;IAE5B,mBAAoD;IAEpD,0BAA0B;IAC1B,aADW,WAAW,CACM;IAE5B;;;;;OAKG;IACH,yBAFU,CAAC,IAAI,qEAAM,KAAK,OAAO,CAE8B;IAE/D,oFAAoF;IACpF,iBADW,MAAM,CAAC,MAAM,EAAE,OAAO,6BAA6B,EAAE,cAAc,CAAC,CAK9E;IAED,mBAAmB;IACnB,8EAAyB;IAIzB,YAAkC;IAatC;;;OAGG;IACH,oCAFW,CAAC,IAAI,EAAE,MAAM,KAAK,GAAG,EAAE,QAIjC;IAED;;OAEG;IACH,+BAFW,MAAM,YAShB;IAED;;;;OAIG;IACH,sBAHW,MAAM,QACN,GAAG,EAAE,QAYf;IAED;;;;OAIG;IACH,eAFW,MAAM,oFAIhB;IAED;;;OAGG;IACH,uBAHW,MAAM,YACN,CAAC,KAAK,EAAE,GAAG,KAAK,IAAI,QAI9B;IAED;;;OAGG;IACH,0BAHW,MAAM,YACN,CAAC,KAAK,EAAE,GAAG,KAAK,IAAI,QAI9B;IAED;;;;;OAKG;IACH,gBAHW,kBAAkB,YAClB,GAAG,QAMb;IAmEG,iDAAsB;IAQ1B;;OAEG;IACH,gBAqBC;IA2ND;;;OAGG;IACH,UAFa,OAAO,CAAC,OAAO,CAAC,CA2C5B;IAED,2CAiBC;IAED;;;;;OAKG;IACH,8BAFW,WAAW,iBAerB;IAED;;;;;;;OAOG;IACH,cAFa,CAAC,SAFH,CAAC,cACD,CAAS,IAAC,EAAD,CAAC,KAAE,OAAO,CAAC,MAAM,GAAG,WAAW,GAAG,OAAO,KAAK,EAAE,cAAc,CAAC,QAKlF;IAED;;;;;;;;OAQG;IACH,4BANW,MAAM,kBACN,MAAM,qBACN,MAAM,eACN,MAAM,UAuBhB;IAED;;;MAEC;IAED;eACwB,MAAM,GAAG,SAAS;gBAAU,MAAM,GAAG,SAAS;MAcrE;IAED,sBAGC;IAED,kBAEC;IAED,iCAEC;IAED,oEAYC;IAED,uFAWC;;CACJ;;;;iCA5pBY,eAAe,GAAG,QAAQ,GAAG,gBAAgB,GAAG,kBAAkB;4BAxBnC,uBAAuB;qBAP9C,qBAAqB;wBAElB,yBAAyB;qBAL5B,oBAAoB"}
+{"version":3,"file":"genomeSpyBase.d.ts","sourceRoot":"","sources":["../../src/genomeSpyBase.js"],"names":[],"mappings":"AAoDA;;;GAGG;AAEH;IAoBI;;;;;OAKG;IAEH;;;;;OAKG;IACH,uBAJW,WAAW,qDAEX,OAAO,qBAAqB,EAAE,YAAY,EA+CpD;IA5CG,uBAA0B;IAC1B,oDAAsB;IAItB,sCAAsC;IACtC,wCAAgB;IAEhB,yBAAoC;IAEpC,4CAA4C;IAC5C,oBADW,CAAC,CAAS,IAAM,EAAN,MAAM,KAAE,MAAM,EAAE,CAAC,EAAE,CACZ;IAE5B,mBAAoD;IAIpD,2CAA2C;IAC3C,yBADW,CAAC,SAAS,CAAC,EAAE,MAAM,KAAK,IAAI,CACkB;IAEzD,0BAA0B;IAC1B,aADW,WAAW,CACM;IAE5B;;;;;OAKG;IACH,yBAFU,CAAC,IAAI,qEAAM,KAAK,OAAO,CAE8B;IAE/D,oFAAoF;IACpF,iBADW,MAAM,CAAC,MAAM,EAAE,OAAO,6BAA6B,EAAE,cAAc,CAAC,CAK9E;IAED,mBAAmB;IACnB,8EAAyB;IAIzB,YAAkC;IAatC;;;OAGG;IACH,oCAFW,CAAC,IAAI,EAAE,MAAM,KAAK,GAAG,EAAE,QAIjC;IAED;;OAEG;IACH,+BAFW,MAAM,YAShB;IAED;;;;OAIG;IACH,sBAHW,MAAM,QACN,GAAG,EAAE,QAYf;IAED;;;;OAIG;IACH,eAFW,MAAM,oFAIhB;IAED;;;OAGG;IACH,uBAHW,MAAM,YACN,CAAC,KAAK,EAAE,GAAG,KAAK,IAAI,QAI9B;IAED;;;OAGG;IACH,0BAHW,MAAM,YACN,CAAC,KAAK,EAAE,GAAG,KAAK,IAAI,QAI9B;IAED;;;;;OAKG;IACH,gBAHW,kBAAkB,YAClB,GAAG,QAMb;IAmEG,iDAAsB;IAQ1B;;OAEG;IACH,gBAqBC;IA6ND;;;OAGG;IACH,UAFa,OAAO,CAAC,OAAO,CAAC,CA2C5B;IAED,2CAiBC;IAED;;;;;OAKG;IACH,8BAFW,WAAW,iBAerB;IAED;;;;;;;OAOG;IACH,cAFa,CAAC,SAFH,CAAC,cACD,CAAS,IAAC,EAAD,CAAC,KAAE,OAAO,CAAC,MAAM,GAAG,WAAW,GAAG,OAAO,KAAK,EAAE,cAAc,CAAC,QAKlF;IAED;;;;;;;;OAQG;IACH,4BANW,MAAM,kBACN,MAAM,qBACN,MAAM,eACN,MAAM,UAuBhB;IAED;;;MAEC;IAED;eACwB,MAAM,GAAG,SAAS;gBAAU,MAAM,GAAG,SAAS;MAcrE;IAED,sBAEC;IAED;;OAEG;IACH,4BAEC;IAED,kBAEC;IAED,iCAEC;IAED,oEAYC;IAED,uFAWC;;CACJ;;;;iCAzqBY,eAAe,GAAG,QAAQ,GAAG,gBAAgB,GAAG,kBAAkB;4BA5BnC,uBAAuB;qBAP9C,qBAAqB;wBAElB,yBAAyB;qBAL5B,oBAAoB"}

package/dist/src/genomeSpyBase.js

@@ -35,6 +35,10 @@ import { resolveEmbedParam } from "./paramRuntime/embedParamApi.js";
 import SingleAxisWindowedSource from "./data/sources/lazy/singleAxisWindowedSource.js";
 import { ensureAssembliesForView } from "./genome/assemblyPreflight.js";
 import { attachViewLevelScaleConfigs } from "./scales/viewLevelScaleConfig.js";
+import {
+    attachViewLevelAxisConfigs,
+    attachViewLevelLegendConfigs,
+} from "./scales/viewLevelGuideConfig.js";
 import { resolveRootGenomeConfig } from "./genome/rootGenomeConfig.js";
 import { awaitSubtreeLazyReady } from "./view/dataReadiness.js";
 import { INTERNAL_DEFAULT_CONFIG } from "./config/defaultConfig.js";
@@ -100,6 +104,11 @@ export default class GenomeSpy {
 
         this.animator = new Animator(() => this.renderAll());
 
+        // Use a stable callback identity so repeated layout requests coalesce
+        // in Animator's transition queue before the next render.
+        /** @type {(timestamp?: number) => void} */
+        this._layoutReflowTransition = () => this.computeLayout();
+
         /** @type {GenomeStore} */
         this.genomeStore = undefined;
 
@@ -441,6 +450,8 @@ export default class GenomeSpy {
         // inheritance resolved), but before any code path that may touch scales
         // (e.g. step-based sizes, dynamic opacity, encoder initialization).
         attachViewLevelScaleConfigs(this.viewRoot);
+        attachViewLevelAxisConfigs(this.viewRoot);
+        attachViewLevelLegendConfigs(this.viewRoot);
         await ensureAssembliesForView(this.viewRoot, this.genomeStore);
 
         this.#loadingStatusRegistry.set(this.viewRoot, "loading");
@@ -486,7 +497,7 @@ export default class GenomeSpy {
 
         // Allow early layout requests from view subscriptions created during initialization.
         // Layout will be recomputed anyway once launch completes.
-        context.requestLayoutReflow = this.computeLayout.bind(this);
+        context.requestLayoutReflow = this.requestLayoutReflow.bind(this);
 
         this.#setupDpr();
     }
@@ -507,7 +518,7 @@ export default class GenomeSpy {
      */
     #finalizeViewInitialization(context) {
         // Allow layout computation (in case a custom context overrode the early assignment).
-        context.requestLayoutReflow = this.computeLayout.bind(this);
+        context.requestLayoutReflow = this.requestLayoutReflow.bind(this);
 
         // Invalidate cached sizes to ensure that step-based sizes are current.
         // TODO: This should be done automatically when the domains of band/point scales are updated.
@@ -679,7 +690,13 @@ export default class GenomeSpy {
 
     computeLayout() {
         this.#renderCoordinator.computeLayout();
-        this.#glHelper.invalidateSize();
+    }
+
+    /**
+     * Recomputes layout and schedules the buffered render commands to be drawn.
+     */
+    requestLayoutReflow() {
+        this.animator.requestTransition(this._layoutReflowTransition);
     }
 
     renderAll() {

package/dist/src/gl/glslScaleGenerator.d.ts

@@ -1,3 +1,20 @@
+/**
+ * Gets the boundary values that the shader uses for discretizing scale buckets.
+ * Threshold scales expose the boundaries as their domain, while quantize scales
+ * derive them from the domain extent and range count.
+ *
+ * @param {any} scale
+ * @returns {number[]}
+ */
+export function getDiscretizingDomainForGlsl(scale: any): number[];
+/**
+ * Gets the number of buckets needed for a discrete or discretizing range
+ * texture.
+ *
+ * @param {any} scale
+ * @returns {number}
+ */
+export function getDiscreteRangeCountForGlsl(scale: any): number;
 /**
  *
  * @param {Channel} channel

package/dist/src/gl/glslScaleGenerator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"glslScaleGenerator.d.ts","sourceRoot":"","sources":["../../../src/gl/glslScaleGenerator.js"],"names":[],"mappings":"AAsDA;;;;;GAKG;AACH,kDAJW,OAAO,mBACP,MAAM,GACJ,MAAM,CAIlB;AAED;;;;;;;;;;GAUG;AAEH;;;;;;;GAOG;AACH,mDALW,OAAO,mBACP,MAAM,SACN,MAAM,GAAG,MAAM,EAAE,GAAG,MAAM,GAAG,OAAO,GAClC,aAAa,CA4CzB;AAED;;;;;;;GAOG;AACH,4DAJW,OAAO,mBACP,MAAM,GACJ,aAAa,CAkCzB;AAED;;;;;;GAMG;AACH,0CANW,OAAO,SACP,GAAG,mBACH,MAAM,+BACN,OAAO,EAAE,GACP,aAAa,CA8BzB;AACD;;;;;GAKG;AACH,qDALW,OAAO,SACP,GAAG,mBACH,MAAM,GACJ,aAAa,CAyBzB;AAED;;;;;GAKG;AACH,2CAJW,OAAO,SACP,GAAG,cACH,OAAO,oBAAoB,EAAE,UAAU;;;;;;EAsQjD;AAED;;;;GAIG;AACH,wDAHW,OAAO,YACP,OAAO,qBAAqB,EAAE,cAAc,EAAE,UA+BxD;AAmED;;GAEG;AACH,qDAFW,OAAO,6BAQjB;AAuCD;;;;GAIG;AACH,iDAHW,OAAO,qBAAqB,EAAE,SAAS,WACvC,OAAO,oBAAoB,EAAE,OAAO;mBAQjB,MAAM;sBAAoB,sBAAsB,GAAG,sBAAsB,GAAG,uBAAuB;;;;;;EAoBhI;AAED;;;;GAIG;AACH,2CAFW,MAAM,6BAIhB;AAED;;;;GAIG;AACH,sCAFW,MAAM,EAAE,WAIlB;AAMD;;;GAGG;AACH,sCAHW,MAAM,QACN,MAAM,EAAE,YAYlB;AAED;;;GAGG;AACH,2CAHW,MAAM,QACN,MAAM,EAAE,YAUlB;AAYD;;GAEG;AACH,qDAFW,MAAM,EAAE,YAIlB;AAED;;GAEG;AAEH;;;;;GAKG;AACH,+CAFW,OAAO,CAAC,MAAM,CAAC,OAAO,oBAAoB,EAAE,OAAO,EAAE,OAAO,qBAAqB,EAAE,OAAO,CAAC,CAAC,+DA4BtG;AAED;;GAEG;AACH,2CAFW,OAAO,oBAAoB,EAAE,OAAO,GAAG,OAAO,oBAAoB,EAAE,OAAO,EAAE,UAIvF;AAwBD;;;;GAIG;AACH,uCAJW,MAAM,EAAE,cACR,MAAM,EAAE,GACN,MAAM,CAgClB;AAr0BD,+BAAgC,OAAO,CAAC;AACxC,4BAA6B,UAAU,CAAC;AACxC,2BAA4B,QAAQ,CAAC;AACrC,uCAAwC,WAAW,CAAC;AACpD,oCAAqC,QAAQ,CAAC;AAC9C,qCAAsC,YAAY,CAAC;AACnD,mCAAoC,gBAAgB,CAAC;AACrD,2BAA4B,SAAS,CAAC;AACtC,uCAAwC,iBAAiB,CAAC;AAoqB1D,wCAAyC,EAAE,CAAC;AAC5C,+CAAwE;AACxE,+CAAuE;AA4GhE,uCAJI,GAAG,WACH,OAAO,GACL,MAAM,EAAE,CAQA;sBAlxBR,OAAO,oBAAoB,EAAE,OAAO;;aA+BvC,OAAO;kBACP,MAAM;0BACN,MAAM;oBACN,MAAM;oBACN,MAAM;kBACN,MAAM;kBACN,MAAM;eACN,CAAC,CAAC,EAAE,GAAG,KAAK,GAAG;;;;;8BAkfZ,MAAM,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,MAAM,CAAA;CAAE;;;;uBA0LhD,CAAC,MAAM,EAAE,OAAO,CAAC;0BAruBJ,WAAW"}
+{"version":3,"file":"glslScaleGenerator.d.ts","sourceRoot":"","sources":["../../../src/gl/glslScaleGenerator.js"],"names":[],"mappings":"AAsDA;;;;;;;GAOG;AACH,oDAHW,GAAG,GACD,MAAM,EAAE,CAQpB;AAED;;;;;;GAMG;AACH,oDAHW,GAAG,GACD,MAAM,CAUlB;AAED;;;;;GAKG;AACH,kDAJW,OAAO,mBACP,MAAM,GACJ,MAAM,CAIlB;AAED;;;;;;;;;;GAUG;AAEH;;;;;;;GAOG;AACH,mDALW,OAAO,mBACP,MAAM,SACN,MAAM,GAAG,MAAM,EAAE,GAAG,MAAM,GAAG,OAAO,GAClC,aAAa,CA4CzB;AAED;;;;;;;GAOG;AACH,4DAJW,OAAO,mBACP,MAAM,GACJ,aAAa,CAkCzB;AAED;;;;;;GAMG;AACH,0CANW,OAAO,SACP,GAAG,mBACH,MAAM,+BACN,OAAO,EAAE,GACP,aAAa,CA8BzB;AACD;;;;;GAKG;AACH,qDALW,OAAO,SACP,GAAG,mBACH,MAAM,GACJ,aAAa,CAyBzB;AAED;;;;;GAKG;AACH,2CAJW,OAAO,SACP,GAAG,cACH,OAAO,oBAAoB,EAAE,UAAU;;;;;;EA0QjD;AAED;;;;GAIG;AACH,wDAHW,OAAO,YACP,OAAO,qBAAqB,EAAE,cAAc,EAAE,UA+BxD;AAmED;;GAEG;AACH,qDAFW,OAAO,6BAQjB;AAuCD;;;;GAIG;AACH,iDAHW,OAAO,qBAAqB,EAAE,SAAS,WACvC,OAAO,oBAAoB,EAAE,OAAO;mBAQjB,MAAM;sBAAoB,sBAAsB,GAAG,sBAAsB,GAAG,uBAAuB;;;;;;EAoBhI;AAED;;;;GAIG;AACH,2CAFW,MAAM,6BAIhB;AAED;;;;GAIG;AACH,sCAFW,MAAM,EAAE,WAIlB;AAMD;;;GAGG;AACH,sCAHW,MAAM,QACN,MAAM,EAAE,YAYlB;AAED;;;GAGG;AACH,2CAHW,MAAM,QACN,MAAM,EAAE,YAUlB;AAYD;;GAEG;AACH,qDAFW,MAAM,EAAE,YAIlB;AAED;;GAEG;AAEH;;;;;GAKG;AACH,+CAFW,OAAO,CAAC,MAAM,CAAC,OAAO,oBAAoB,EAAE,OAAO,EAAE,OAAO,qBAAqB,EAAE,OAAO,CAAC,CAAC,+DA4BtG;AAED;;GAEG;AACH,2CAFW,OAAO,oBAAoB,EAAE,OAAO,GAAG,OAAO,oBAAoB,EAAE,OAAO,EAAE,UAIvF;AAwBD;;;;GAIG;AACH,uCAJW,MAAM,EAAE,cACR,MAAM,EAAE,GACN,MAAM,CAgClB;AA12BD,+BAAgC,OAAO,CAAC;AACxC,4BAA6B,UAAU,CAAC;AACxC,2BAA4B,QAAQ,CAAC;AACrC,uCAAwC,WAAW,CAAC;AACpD,oCAAqC,QAAQ,CAAC;AAC9C,qCAAsC,YAAY,CAAC;AACnD,mCAAoC,gBAAgB,CAAC;AACrD,2BAA4B,SAAS,CAAC;AACtC,uCAAwC,iBAAiB,CAAC;AAysB1D,wCAAyC,EAAE,CAAC;AAC5C,+CAAwE;AACxE,+CAAuE;AA4GhE,uCAJI,GAAG,WACH,OAAO,GACL,MAAM,EAAE,CAQA;sBAvzBR,OAAO,oBAAoB,EAAE,OAAO;;aAgEvC,OAAO;kBACP,MAAM;0BACN,MAAM;oBACN,MAAM;oBACN,MAAM;kBACN,MAAM;kBACN,MAAM;eACN,CAAC,CAAC,EAAE,GAAG,KAAK,GAAG;;;;;8BAsfZ,MAAM,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,MAAM,CAAA;CAAE;;;;uBA0LhD,CAAC,MAAM,EAAE,OAAO,CAAC;0BA1wBJ,WAAW"}

package/dist/src/gl/glslScaleGenerator.js

@@ -52,6 +52,39 @@ function splitScaleType(type) {
     };
 }
 
+/**
+ * Gets the boundary values that the shader uses for discretizing scale buckets.
+ * Threshold scales expose the boundaries as their domain, while quantize scales
+ * derive them from the domain extent and range count.
+ *
+ * @param {any} scale
+ * @returns {number[]}
+ */
+export function getDiscretizingDomainForGlsl(scale) {
+    if (scale.type === "quantize") {
+        return scale.thresholds();
+    } else {
+        return scale.domain();
+    }
+}
+
+/**
+ * Gets the number of buckets needed for a discrete or discretizing range
+ * texture.
+ *
+ * @param {any} scale
+ * @returns {number}
+ */
+export function getDiscreteRangeCountForGlsl(scale) {
+    if (scale.type === "quantize") {
+        return scale.range().length;
+    } else if (scale.type === "threshold") {
+        return scale.domain().length + 1;
+    } else {
+        return scale.domain().length;
+    }
+}
+
 /**
  *
  * @param {Channel} channel
@@ -250,7 +283,11 @@ export function generateScaleGlsl(channel, scale, channelDef) {
 
     const { hp, attributeType } = getAttributeAndArrayTypes(scale, channel);
 
-    const domainLength = scale.domain ? scale.domain().length : undefined;
+    const domainLength = scale.domain
+        ? isDiscretizing(scale.type)
+            ? getDiscretizingDomainForGlsl(scale).length
+            : scale.domain().length
+        : undefined;
 
     /** @type {string} */
     let domainUniform;
@@ -345,8 +382,8 @@ export function generateScaleGlsl(channel, scale, channelDef) {
             break;
 
         case "threshold":
+        case "quantize":
             // TODO: Quantile (it's a specialization of threshold scale)
-            // TODO: Quantize
             break;
 
         default:

package/dist/src/gl/includes/common.glsl.js

@@ -1,2 +1,2 @@
-const shader = "#define PI 3.141593\nuniform View{mediump vec2 uViewOffset;mediump vec2 uViewScale;mediump vec2 uViewportSize;lowp float uDevicePixelRatio;lowp float uViewOpacity;bool uPickingEnabled;};/***Maps a coordinate on the unit scale to a normalized device coordinate.*(0,0)is at the bottom left corner.*/vec4 unitToNdc(vec2 coord){return vec4((coord*uViewScale+uViewOffset)*2.0-1.0,0.0,1.0);}vec4 unitToNdc(float x,float y){return unitToNdc(vec2(x,y));}vec4 pixelsToNdc(vec2 coord){return unitToNdc(coord/uViewportSize);}vec4 pixelsToNdc(float x,float y){return pixelsToNdc(vec2(x,y));}float linearstep(float edge0,float edge1,float x){return clamp((x-edge0)/(edge1-edge0),0.0,1.0);}const highp uint HASH_EMPTY_KEY=0xffffffffu;highp uint hash32(highp uint key){highp uint v=key;v ^=v>>16u;v*=0x7feb352du;v ^=v>>15u;v*=0x846ca68bu;v ^=v>>16u;return v;}bool isEmptyHashTexture(highp usampler2D s){ivec2 texSize=textureSize(s,0);return texSize.x==1&&texSize.y==1&&texelFetch(s,ivec2(0,0),0).r==HASH_EMPTY_KEY;}bool hashContainsTexture(highp usampler2D s,highp uint value){ivec2 texSize=textureSize(s,0);highp uint width=uint(texSize.x);highp uint size=width*uint(texSize.y);highp uint mask=size-1u;highp uint index=hash32(value)&mask;for(highp uint probe=0u;probe<size;probe+=1u){ivec2 coord=ivec2(int(index % width),int(index/width));highp uint entry=texelFetch(s,coord,0).r;if(entry==value){return true;}if(entry==HASH_EMPTY_KEY){return false;}index=(index+1u)&mask;}return false;}/***Calculates a gamma for antialiasing opacity based on the color.*/float getGammaForColor(vec3 rgb){return mix(1.25,0.75,smoothstep(0.0,1.0,dot(rgb,vec3(0.299,0.587,0.114))));}/***Specialized linearstep for doing antialiasing*/float distanceToRatio(float d){return clamp(d*uDevicePixelRatio+0.5,0.0,1.0);}vec4 distanceToColor(float d,vec4 fill,vec4 stroke,vec4 background,float halfStrokeWidth){if(halfStrokeWidth>0.0){float sd=abs(d)-halfStrokeWidth;return mix(stroke,d<=0.0 ? fill : background,distanceToRatio(sd));}else{return mix(background,fill,distanceToRatio(-d));}}";
+const shader = "#define PI 3.141593\nuniform View{mediump vec2 uViewOffset;mediump vec2 uViewScale;mediump vec2 uViewportSize;mediump vec4 uLogicalVisibleRect;lowp vec2 uCullByVisibleRange;lowp float uDevicePixelRatio;lowp float uViewOpacity;bool uPickingEnabled;};/***Maps a coordinate on the unit scale to a normalized device coordinate.*(0,0)is at the bottom left corner.*/vec4 unitToNdc(vec2 coord){return vec4((coord*uViewScale+uViewOffset)*2.0-1.0,0.0,1.0);}vec4 unitToNdc(float x,float y){return unitToNdc(vec2(x,y));}vec4 pixelsToNdc(vec2 coord){return unitToNdc(coord/uViewportSize);}vec4 pixelsToNdc(float x,float y){return pixelsToNdc(vec2(x,y));}bool isOutsideVisibleRange(vec2 pos){return(uCullByVisibleRange.x>0.5&&(pos.x<uLogicalVisibleRect.x||pos.x>uLogicalVisibleRect.z))||(uCullByVisibleRange.y>0.5&&(pos.y<uLogicalVisibleRect.y||pos.y>uLogicalVisibleRect.w));}float linearstep(float edge0,float edge1,float x){return clamp((x-edge0)/(edge1-edge0),0.0,1.0);}const highp uint HASH_EMPTY_KEY=0xffffffffu;highp uint hash32(highp uint key){highp uint v=key;v ^=v>>16u;v*=0x7feb352du;v ^=v>>15u;v*=0x846ca68bu;v ^=v>>16u;return v;}bool isEmptyHashTexture(highp usampler2D s){ivec2 texSize=textureSize(s,0);return texSize.x==1&&texSize.y==1&&texelFetch(s,ivec2(0,0),0).r==HASH_EMPTY_KEY;}bool hashContainsTexture(highp usampler2D s,highp uint value){ivec2 texSize=textureSize(s,0);highp uint width=uint(texSize.x);highp uint size=width*uint(texSize.y);highp uint mask=size-1u;highp uint index=hash32(value)&mask;for(highp uint probe=0u;probe<size;probe+=1u){ivec2 coord=ivec2(int(index % width),int(index/width));highp uint entry=texelFetch(s,coord,0).r;if(entry==value){return true;}if(entry==HASH_EMPTY_KEY){return false;}index=(index+1u)&mask;}return false;}/***Calculates a gamma for antialiasing opacity based on the color.*/float getGammaForColor(vec3 rgb){return mix(1.25,0.75,smoothstep(0.0,1.0,dot(rgb,vec3(0.299,0.587,0.114))));}/***Specialized linearstep for doing antialiasing*/float distanceToRatio(float d){return clamp(d*uDevicePixelRatio+0.5,0.0,1.0);}vec4 distanceToColor(float d,vec4 fill,vec4 stroke,vec4 background,float halfStrokeWidth){if(halfStrokeWidth>0.0){float sd=abs(d)-halfStrokeWidth;return mix(stroke,d<=0.0 ? fill : background,distanceToRatio(sd));}else{return mix(background,fill,distanceToRatio(-d));}}";
 export default shader;

package/dist/src/gl/vertexRangeIndex.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vertexRangeIndex.d.ts","sourceRoot":"","sources":["../../../src/gl/vertexRangeIndex.js"],"names":[],"mappings":"AAKA;;;;GAIG;AAEH;;;;;;;;;;;;;;GAcG;AACH,+CARW,MAAM,UACN,CAAC,MAAM,EAAE,MAAM,CAAC,aAChB,YAAY,YACZ,YAAY,qBACZ,MAAM,mBACN,MAAM,GACJ,OAAO,yBAAyB,EAAE,MAAM,GAAG,SAAS,CA6HhE;yCA9IU,MAAM,KACJ,MAAM"}
+{"version":3,"file":"vertexRangeIndex.d.ts","sourceRoot":"","sources":["../../../src/gl/vertexRangeIndex.js"],"names":[],"mappings":"AAKA;;;;GAIG;AAEH;;;;;;;;;;;;;;GAcG;AACH,+CARW,MAAM,UACN,CAAC,MAAM,EAAE,MAAM,CAAC,aAChB,YAAY,YACZ,YAAY,qBACZ,MAAM,mBACN,MAAM,GACJ,OAAO,yBAAyB,EAAE,MAAM,GAAG,SAAS,CA+HhE;yCAhJU,MAAM,KACJ,MAAM"}

package/dist/src/gl/vertexRangeIndex.js

@@ -40,6 +40,8 @@ export function createVertexRangeIndexer(
         return undefined;
     }
 
+    const pointIndex = readStart === readEnd;
+
     const startIndices = new Array(size);
     startIndices.fill(MAX_INTEGER);
 
@@ -105,14 +107,14 @@ export function createVertexRangeIndexer(
             break;
         }
 
-        if (runX < lastStart || runX2 < runX) {
+        if (runX < lastStart || (!pointIndex && runX2 < runX)) {
             unordered = true;
             break;
         }
         lastStart = runX;
 
         const startBin = getBin(runX, false);
-        const endBin = getBin(runX2, true);
+        const endBin = pointIndex ? startBin : getBin(runX2, true);
 
         for (let bin = startBin; bin <= endBin; bin++) {
             if (startIndices[bin] > runStart) {

package/dist/src/gl/webGLHelper.d.ts

@@ -74,7 +74,7 @@ export default class WebGLHelper {
     /** @type {import("twgl.js").AttachmentOptions[]} */
     _pickingAttachmentOptions: import("twgl.js").AttachmentOptions[];
     _pickingBufferInfo: import("twgl.js").FramebufferInfo;
-    invalidateSize(): void;
+    invalidateSize(): boolean;
     /**
      * Compiles and caches a shader. The shader source is used as a cache key.
      *

package/dist/src/gl/webGLHelper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webGLHelper.d.ts","sourceRoot":"","sources":["../../../src/gl/webGLHelper.js"],"names":[],"mappings":"AA0cA;;;;GAIG;AACH,kCAJW,sBAAsB,gBACtB,WAAW,kBACX,WAAW;;;;;;EA8CrB;AAED;;;;;GAKG;AACH,0CALW,qBAAqB,WACrB,IAAI,CAAC,OAAO,SAAS,EAAE,cAAc,EAAE,KAAK,CAAC,OAC7C,MAAM,EAAE,GAAG,eAAe,YAC1B,YAAY,gBAYtB;AAED;;;;;;GAMG;AACH,qCALW,sBAAsB,mBACtB,OAAO,SAAS,EAAE,eAAe,KACjC,MAAM,KACN,MAAM,2BAWhB;AAED;;;;;GAKG;AACH,yCAJW,sBAAsB,mBACtB,OAAO,SAAS,EAAE,eAAe,SACjC,MAAM,UA4BhB;AA9hBD;IACI;;;;;;;;OAQG;IACH,uBAPW,WAAW,eACX,MAAM;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAC,2BAGrC,sBAAsB,mBACtB,MAAM,IAAI,EAoHpB;IArGG;;OAEG;IACH,mBAFU,gBAAgB,CAEQ;IAElC;;OAEG;IACH,oBAFU;QAAE,YAAY,EAAE,MAAM,CAAC;QAAC,aAAa,EAAE,MAAM,CAAC;QAAC,aAAa,EAAE,MAAM,CAAC;QAAC,cAAc,EAAE,MAAM,CAAA;KAAE,GAAG,SAAS,CAEjF;IAEnC,yBAAyB;IACzB,iBADW,MAAM,IAAI,CAC8B;IAEnD,uCAAuC;IACvC,cADW,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CACN;IAE7B,6EAA6E;IAC7E,eADW,OAAO,CAAC,OAAO,qBAAqB,EAAE,SAAS,EAAE,YAAY,CAAC,CACvC;IAElC;;OAEG;IACH,mBAFU,OAAO,CAAC,OAAO,4BAA4B,EAAE,mBAAmB,EAAE,YAAY,CAAC,CAEnD;IA8CtC,0BAAoB;IACpB,2BAAY;IAGZ,oDAAoD;IACpD,2BADW,OAAO,SAAS,EAAE,iBAAiB,EAAE,CAQ/C;IACD,sDAGC;IAmBL,uBAGC;IAED;;;;;OAKG;IACH,oBAHW,MAAM,QACN,MAAM,GAAG,MAAM,EAAE,eA2B3B;IAED,oBAkCC;IAED,iBAGC;IAED;;;;OAIG;IACH,oCAFW;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE;;;MAI3C;IAED;;;;OAIG;IACH,kCAFW;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,UAI3C;IAED;;;OAGG;IACH;;;MAEC;IAED;;;;;;;;;OASG;IACH,+BAHW,OAAO,8BAA8B,EAAE,OAAO,WAC9C,OAAO,QA2GjB;IAED;;OAEG;IACH,kCAFW,OAAO,4BAA4B,EAAE,mBAAmB,0BAwClE;CACJ;6BAxY4B,uBAAuB"}
+{"version":3,"file":"webGLHelper.d.ts","sourceRoot":"","sources":["../../../src/gl/webGLHelper.js"],"names":[],"mappings":"AA+cA;;;;GAIG;AACH,kCAJW,sBAAsB,gBACtB,WAAW,kBACX,WAAW;;;;;;EA8CrB;AAED;;;;;GAKG;AACH,0CALW,qBAAqB,WACrB,IAAI,CAAC,OAAO,SAAS,EAAE,cAAc,EAAE,KAAK,CAAC,OAC7C,MAAM,EAAE,GAAG,eAAe,YAC1B,YAAY,gBAYtB;AAED;;;;;;GAMG;AACH,qCALW,sBAAsB,mBACtB,OAAO,SAAS,EAAE,eAAe,KACjC,MAAM,KACN,MAAM,2BAWhB;AAED;;;;;GAKG;AACH,yCAJW,sBAAsB,mBACtB,OAAO,SAAS,EAAE,eAAe,SACjC,MAAM,UA4BhB;AAliBD;IACI;;;;;;;;OAQG;IACH,uBAPW,WAAW,eACX,MAAM;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAC,2BAGrC,sBAAsB,mBACtB,MAAM,IAAI,EAoHpB;IArGG;;OAEG;IACH,mBAFU,gBAAgB,CAEQ;IAElC;;OAEG;IACH,oBAFU;QAAE,YAAY,EAAE,MAAM,CAAC;QAAC,aAAa,EAAE,MAAM,CAAC;QAAC,aAAa,EAAE,MAAM,CAAC;QAAC,cAAc,EAAE,MAAM,CAAA;KAAE,GAAG,SAAS,CAEjF;IAEnC,yBAAyB;IACzB,iBADW,MAAM,IAAI,CAC8B;IAEnD,uCAAuC;IACvC,cADW,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CACN;IAE7B,6EAA6E;IAC7E,eADW,OAAO,CAAC,OAAO,qBAAqB,EAAE,SAAS,EAAE,YAAY,CAAC,CACvC;IAElC;;OAEG;IACH,mBAFU,OAAO,CAAC,OAAO,4BAA4B,EAAE,mBAAmB,EAAE,YAAY,CAAC,CAEnD;IA8CtC,0BAAoB;IACpB,2BAAY;IAGZ,oDAAoD;IACpD,2BADW,OAAO,SAAS,EAAE,iBAAiB,EAAE,CAQ/C;IACD,sDAGC;IAmBL,0BAKC;IAED;;;;;OAKG;IACH,oBAHW,MAAM,QACN,MAAM,GAAG,MAAM,EAAE,eA2B3B;IAED,oBAkCC;IAED,iBAGC;IAED;;;;OAIG;IACH,oCAFW;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE;;;MAI3C;IAED;;;;OAIG;IACH,kCAFW;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,UAI3C;IAED;;;OAGG;IACH;;;MAEC;IAED;;;;;;;;;OASG;IACH,+BAHW,OAAO,8BAA8B,EAAE,OAAO,WAC9C,OAAO,QA6GjB;IAED;;OAEG;IACH,kCAFW,OAAO,4BAA4B,EAAE,mBAAmB,0BAwClE;CACJ;6BA5Y4B,uBAAuB"}

package/dist/src/gl/webGLHelper.js

@@ -21,6 +21,7 @@ import {
     createInterpolatedColorTexture,
     createSchemeTexture,
 } from "./colorUtils.js";
+import { getDiscreteRangeCountForGlsl } from "./glslScaleGenerator.js";
 import {
     getDiscreteRangeMapper,
     isColorChannel,
@@ -161,7 +162,9 @@ export default class WebGLHelper {
 
     invalidateSize() {
         this._canvasSizeHelper.invalidate();
-        this.adjustGl();
+        // The return value tells layout code whether cached render commands may
+        // have been built against a stale logical or physical canvas size.
+        return this.adjustGl();
     }
 
     /**
@@ -290,10 +293,8 @@ export default class WebGLHelper {
         function fixCount(count, scale) {
             if (isDiscrete(scale.type)) {
                 return scale.domain().length;
-            } else if (scale.type == "threshold") {
-                return scale.domain().length + 1;
-            } else if (scale.type == "quantize") {
-                return count ?? 4;
+            } else if (scale.type == "threshold" || scale.type == "quantize") {
+                return getDiscreteRangeCountForGlsl(scale);
             } else if (scale.type == "quantile") {
                 return count ?? 4;
             }
@@ -317,7 +318,7 @@ export default class WebGLHelper {
                     texture = createDiscreteColorTexture(
                         range,
                         this.gl,
-                        scale.domain().length,
+                        getDiscreteRangeCountForGlsl(scale),
                         existingTexture
                     );
                 } else {
@@ -351,7 +352,9 @@ export default class WebGLHelper {
                 texture = createDiscreteColorTexture(
                     range,
                     this.gl,
-                    scale.domain().length,
+                    isDiscretizing(scale.type)
+                        ? getDiscreteRangeCountForGlsl(scale)
+                        : scale.domain().length,
                     existingTexture
                 );
             }
@@ -373,7 +376,9 @@ export default class WebGLHelper {
                     createDiscreteTexture(
                         range.map(mapper),
                         this.gl,
-                        scale.domain().length,
+                        isDiscretizing(scale.type)
+                            ? getDiscreteRangeCountForGlsl(scale)
+                            : scale.domain().length,
                         existingTexture
                     )
                 );