@genome-spy/core 0.66.1 → 0.68.0

package/dist/src/view/layout/flexLayout.js

@@ -302,89 +302,3 @@ export function parseSizeDef(size) {
 
     throw new Error(`Invalid sizeDef: ${size}`);
 }
-
-// TODO: Find a better place for the following utilities: ////////////////////////////////////
-
-/**
- * Interpolates between two LocSizes
- *
- * @param {LocSize} from
- * @param {LocSize} to
- * @param {function():number} ratio
- * @returns {LocSize}
- */
-export function interpolateLocSizes(from, to, ratio) {
-    return {
-        get location() {
-            const r = ratio();
-            switch (r) {
-                case 0:
-                    return from.location;
-                case 1:
-                    return to.location;
-                default:
-                    return r * to.location + (1 - r) * from.location;
-            }
-        },
-
-        get size() {
-            const r = ratio();
-            switch (r) {
-                case 0:
-                    return from.size;
-                case 1:
-                    return to.size;
-                default:
-                    return r * to.size + (1 - r) * from.size;
-            }
-        },
-    };
-}
-
-/**
- * Wraps a LocSize and allows scrolling.
- *
- * @param {LocSize} locSize
- * @param {number | function():number} offset
- * @returns {LocSize}
- */
-export function translateLocSize(locSize, offset) {
-    const fn = isNumber(offset) ? () => offset : offset;
-    return {
-        get location() {
-            return locSize.location + fn();
-        },
-
-        get size() {
-            return locSize.size;
-        },
-    };
-}
-
-/**
- * Wraps a LocSize and allows scaling.
- *
- * @param {LocSize} locSize
- * @param {number | function():number} factor
- * @returns {LocSize}
- */
-export function scaleLocSize(locSize, factor) {
-    const fn = isNumber(factor) ? () => factor : factor;
-    return {
-        get location() {
-            return locSize.location * fn();
-        },
-
-        get size() {
-            return locSize.size * fn();
-        },
-    };
-}
-
-/**
- * @param {LocSize} locSize
- * @param {number} value
- */
-export function locSizeEncloses(locSize, value) {
-    return value >= locSize.location && value < locSize.location + locSize.size;
-}

package/dist/src/view/paramMediator.d.ts

@@ -22,6 +22,15 @@ export function isVariableParameter(param: import("../spec/parameter.js").Parame
  * @returns {param is import("../spec/parameter.js").SelectionParameter}
  */
 export function isSelectionParameter(param: import("../spec/parameter.js").Parameter): param is import("../spec/parameter.js").SelectionParameter;
+/**
+ * Computes the default value for a parameter specification.
+ *
+ * @param {Parameter} param
+ * @param {ParamMediator} [paramMediator]
+ * @param {ExprRefFunction} [exprFn]
+ * @returns {any}
+ */
+export function getDefaultParamValue(param: import("../spec/parameter.js").Parameter, paramMediator?: ParamMediator, exprFn?: ExprRefFunction): any;
 /**
  * Takes a record of properties that may have ExprRefs as values. Converts the
  * ExprRefs to getters and setups a listener that is called when any of the
@@ -97,6 +106,16 @@ export default class ParamMediator {
      * @param {string} paramName
      */
     getValue(paramName: string): any;
+    /**
+     * Subscribe to changes of a parameter's value. The listener is called only
+     * when the stored value changes. For expression parameters, the listener is
+     * called when upstream changes re-evaluate to a different value.
+     *
+     * @param {string} paramName
+     * @param {() => void} listener
+     * @returns {() => void}
+     */
+    subscribe(paramName: string, listener: () => void): () => void;
     /**
      * Get the value of a parameter from this mediator or the ancestors.
      * @param {string} paramName

package/dist/src/view/paramMediator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"paramMediator.d.ts","sourceRoot":"","sources":["../../../src/view/paramMediator.js"],"names":[],"mappings":"AA8VA;;;GAGG;AACH,6BAHW,GAAG,GACD,CAAC,IAAI,OAAO,sBAAsB,EAAE,OAAO,CAIvD;AAED;;;;;;;GAOG;AACH,+BAHa,CAAC,KADH,CAAC,GAAG,OAAO,sBAAsB,EAAE,OAAO,GAExC,CAAC,CAWb;AAED;;;GAGG;AACH,sFAFa,KAAK,IAAI,OAAO,sBAAsB,EAAE,iBAAiB,CAIrE;AAED;;;GAGG;AACH,uFAFa,KAAK,IAAI,OAAO,sBAAsB,EAAE,kBAAkB,CAItE;AAED;;;;;;;;;;GAUG;AACH,qCAF4E,CAAC,SAA/D,MAAM,CAAC,MAAM,EAAE,GAAG,GAAG,OAAO,sBAAsB,EAAE,OAAO,CAAE,iBAJhE,aAAa,SACb,CAAC,aACD,CAAC,KAAK,EAAE,CAAC,MAAM,CAAC,CAAC,EAAE,KAAK,IAAI,GAuCjB,CAAC,CACtB;AAED;;;;;;GAMG;AACH,4CAHW,MAAM,GACJ,MAAM,CAUlB;AAED;;;;;;;GAOG;AACH,2CAHW,GAAG,GACD,eAAe,CAY3B;AAldD;;;;;;;;GAQG;AACH;IA2BI;;;;;OAKG;IACH,2BALW,MAAM,aAAa,EAU7B;IA7BD;;;OAGG;IACH,0BAHU,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,IAAI,CAAC,CAAC,CAGvB;IA2Bf;;;OAGG;IACH,wEAzCqB,GAAG,KAAK,IAAI,CA2GhC;IAED;;;;;;;OAOG;IACH,eAFa,CAAC,aAJH,MAAM,gBACN,CAAC,YACD,OAAO,GACL,CAAC,KAAK,EAAE,CAAC,KAAK,IAAI,CAgC9B;IAED;;;OAGG;IACH,qBAFW,MAAM,WA1Ic,GAAG,KAAK,IAAI,CAkJ1C;IAED;;;OAGG;IACH,oBAFW,MAAM,OAIhB;IAED;;;OAGG;IACH,qBAFW,MAAM,OAKhB;IAED;;OAEG;IACH,oBACsB,WAAW,CAAC,MAAM,2CAAY,CAGnD;IAED;;;;OAIG;IACH,gCAHW,MAAM,GACJ,aAAa,CAQzB;IAID;;;;OAIG;IACH,uBAFW,MAAM,mBAuFhB;IAED;;;;OAIG;IACH,qBAFW,MAAM,OAKhB;IAED;;;;;OAKG;IACH,sBAFa,OAAO,CAiBnB;;CACJ;;;;;;;;8BA1UY,OAAO,wBAAwB,EAAE,kBAAkB,GAAG;IAAE,WAAW,EAAE,CAAC,QAAQ,EAAE,MAAM,IAAI,KAAK,IAAI,CAAC;IAAC,cAAc,EAAE,CAAC,QAAQ,EAAE,MAAM,IAAI,KAAK,IAAI,CAAC;IAAC,UAAU,EAAE,MAAM,IAAI,CAAC;IAAC,UAAU,EAAE,MAAM,MAAM,CAAA;CAAC"}
+{"version":3,"file":"paramMediator.d.ts","sourceRoot":"","sources":["../../../src/view/paramMediator.js"],"names":[],"mappings":"AAiXA;;;GAGG;AACH,6BAHW,GAAG,GACD,CAAC,IAAI,OAAO,sBAAsB,EAAE,OAAO,CAIvD;AAED;;;;;;;GAOG;AACH,+BAHa,CAAC,KADH,CAAC,GAAG,OAAO,sBAAsB,EAAE,OAAO,GAExC,CAAC,CAWb;AAED;;;GAGG;AACH,sFAFa,KAAK,IAAI,OAAO,sBAAsB,EAAE,iBAAiB,CAIrE;AAED;;;GAGG;AACH,uFAFa,KAAK,IAAI,OAAO,sBAAsB,EAAE,kBAAkB,CAItE;AAED;;;;;;;GAOG;AACH,sGAJW,aAAa,WACb,eAAe,GACb,GAAG,CAwCf;AAED;;;;;;;;;;GAUG;AACH,qCAF4E,CAAC,SAA/D,MAAM,CAAC,MAAM,EAAE,GAAG,GAAG,OAAO,sBAAsB,EAAE,OAAO,CAAE,iBAJhE,aAAa,SACb,CAAC,aACD,CAAC,KAAK,EAAE,CAAC,MAAM,CAAC,CAAC,EAAE,KAAK,IAAI,GAuCjB,CAAC,CACtB;AAED;;;;;;GAMG;AACH,4CAHW,MAAM,GACJ,MAAM,CAUlB;AAED;;;;;;;GAOG;AACH,2CAHW,GAAG,GACD,eAAe,CAY3B;AArhBD;;;;;;;;GAQG;AACH;IA2BI;;;;;OAKG;IACH,2BALW,MAAM,aAAa,EAU7B;IA7BD;;;OAGG;IACH,0BAHU,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,IAAI,CAAC,CAAC,CAGvB;IA2Bf;;;OAGG;IACH,wEAzCqB,GAAG,KAAK,IAAI,CAkGhC;IAED;;;;;;;OAOG;IACH,eAFa,CAAC,aAJH,MAAM,gBACN,CAAC,YACD,OAAO,GACL,CAAC,KAAK,EAAE,CAAC,KAAK,IAAI,CAgC9B;IAED;;;OAGG;IACH,qBAFW,MAAM,WAjIc,GAAG,KAAK,IAAI,CAyI1C;IAED;;;OAGG;IACH,oBAFW,MAAM,OAIhB;IAED;;;;;;;;OAQG;IACH,qBAJW,MAAM,YACN,MAAM,IAAI,GACR,MAAM,IAAI,CAmBtB;IAED;;;OAGG;IACH,qBAFW,MAAM,OAKhB;IAED;;OAEG;IACH,oBACsB,WAAW,CAAC,MAAM,2CAAY,CAGnD;IAED;;;;OAIG;IACH,gCAHW,MAAM,GACJ,aAAa,CAQzB;IAID;;;;OAIG;IACH,uBAFW,MAAM,mBAuFhB;IAED;;;;OAIG;IACH,qBAFW,MAAM,OAKhB;IAED;;;;;OAKG;IACH,sBAFa,OAAO,CAiBnB;;CACJ;;;;;;;;8BA7VY,OAAO,wBAAwB,EAAE,kBAAkB,GAAG;IAAE,WAAW,EAAE,CAAC,QAAQ,EAAE,MAAM,IAAI,KAAK,IAAI,CAAC;IAAC,cAAc,EAAE,CAAC,QAAQ,EAAE,MAAM,IAAI,KAAK,IAAI,CAAC;IAAC,UAAU,EAAE,MAAM,IAAI,CAAC;IAAC,UAAU,EAAE,MAAM,MAAM,CAAA;CAAC"}

package/dist/src/view/paramMediator.js

@@ -73,6 +73,7 @@ export default class ParamMediator {
 
         /** @type {ParameterSetter} */
         let setter;
+        let defaultValue;
 
         if (param.push == "outer") {
             const outerMediator = this.findMediatorForParam(name);
@@ -93,36 +94,26 @@ export default class ParamMediator {
             // support mutation (i.e. adding/removing children) in future.
             this.#allocatedSetters.set(name, setter);
         } else if ("value" in param) {
-            setter = this.allocateSetter(name, param.value);
+            defaultValue = getDefaultParamValue(param, this);
+            setter = this.allocateSetter(name, defaultValue);
         } else if ("expr" in param) {
             const expr = this.createExpression(param.expr);
             // TODO: getSetter(param) should return a setter that throws if
             // modifying the value is attempted.
-            const realSetter = this.allocateSetter(name, expr(null));
+            defaultValue = getDefaultParamValue(param, this, expr);
+            const realSetter = this.allocateSetter(name, defaultValue);
             expr.addListener(() => realSetter(expr(null)));
             // NOP
             setter = (_) => undefined;
         } else {
-            setter = this.allocateSetter(name, null);
+            defaultValue = getDefaultParamValue(param, this);
+            setter = this.allocateSetter(name, defaultValue);
         }
 
         if ("select" in param) {
-            const select = asSelectionConfig(param.select);
-            if (isPointSelectionConfig(select)) {
-                // Set initial value so that production rules in shaders can be generated, etc.
-                setter(
-                    select.toggle
-                        ? createMultiPointSelection()
-                        : createSinglePointSelection(null)
-                );
-            } else if (isIntervalSelectionConfig(select)) {
-                if (!select.encodings) {
-                    throw new Error(
-                        `Interval selection "${name}" must have encodings defined!`
-                    );
-                }
-                setter(createIntervalSelection(select.encodings));
-            }
+            defaultValue ??= getDefaultParamValue(param, this);
+            // Set initial value so that production rules in shaders can be generated, etc.
+            setter(defaultValue);
         }
 
         this.#paramConfigs.set(name, param);
@@ -189,6 +180,34 @@ export default class ParamMediator {
         return this.#paramValues.get(paramName);
     }
 
+    /**
+     * Subscribe to changes of a parameter's value. The listener is called only
+     * when the stored value changes. For expression parameters, the listener is
+     * called when upstream changes re-evaluate to a different value.
+     *
+     * @param {string} paramName
+     * @param {() => void} listener
+     * @returns {() => void}
+     */
+    subscribe(paramName, listener) {
+        validateParameterName(paramName);
+        const mediator = this.findMediatorForParam(paramName);
+        if (!mediator) {
+            throw new Error("Parameter not found: " + paramName);
+        }
+
+        const listeners = mediator.paramListeners.get(paramName) ?? new Set();
+        mediator.paramListeners.set(paramName, listeners);
+        listeners.add(listener);
+
+        return () => {
+            listeners.delete(listener);
+            if (!listeners.size) {
+                mediator.paramListeners.delete(paramName);
+            }
+        };
+    }
+
     /**
      * Get the value of a parameter from this mediator or the ancestors.
      * @param {string} paramName
@@ -391,6 +410,54 @@ export function isSelectionParameter(param) {
     return !("expr" in param || "bind" in param) && "select" in param;
 }
 
+/**
+ * Computes the default value for a parameter specification.
+ *
+ * @param {Parameter} param
+ * @param {ParamMediator} [paramMediator]
+ * @param {ExprRefFunction} [exprFn]
+ * @returns {any}
+ */
+export function getDefaultParamValue(param, paramMediator, exprFn) {
+    if ("select" in param) {
+        const select = asSelectionConfig(param.select);
+        if (isPointSelectionConfig(select)) {
+            return select.toggle
+                ? createMultiPointSelection()
+                : createSinglePointSelection(null);
+        }
+        if (isIntervalSelectionConfig(select)) {
+            if (!select.encodings) {
+                throw new Error(
+                    `Interval selection "${param.name}" must have encodings defined!`
+                );
+            }
+            return createIntervalSelection(select.encodings);
+        }
+        throw new Error(
+            `Unknown selection config for parameter "${param.name}".`
+        );
+    }
+
+    if ("expr" in param) {
+        const expr =
+            exprFn ??
+            paramMediator?.createExpression(/** @type {string} */ (param.expr));
+        if (!expr) {
+            throw new Error(
+                `Cannot evaluate expression for parameter "${param.name}".`
+            );
+        }
+        return expr(null);
+    }
+
+    if ("value" in param) {
+        return param.value;
+    }
+
+    return null;
+}
+
 /**
  * Takes a record of properties that may have ExprRefs as values. Converts the
  * ExprRefs to getters and setups a listener that is called when any of the

package/dist/src/view/testUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"testUtils.d.ts","sourceRoot":"","sources":["../../../src/view/testUtils.js"],"names":[],"mappings":"AAoBA;;;GAGG;AACH,2DAHW,OAAO,kBAAkB,EAAE,kBAAkB,6CA0DvD;AAGS,uBAAC,CAAC,SAAS,OAAO,WAAW,EAAE,OAAO,QAAQ,QAAQ,aAAa;IAAE,KAAI,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;CAAE,uBAAuB,OAAO,kBAAkB,EAAE,kBAAkB,GAAK,OAAO,CAAC,CAAC,CAAC,CAAA;AAgBhL,oCAAC,CAAC,SAAS,OAAO,WAAW,EAAE,OAAO,QAAQ,QAAQ,aAAa;IAAE,KAAI,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;CAAE,YAAY,WAAW,YAAY;IAAC,MAAM,EAAE,OAAO,CAAC;IAAC,YAAY,EAAE,OAAO,CAAA;CAAC,GAAK,OAAO,CAAC,CAAC,CAAC,CAAA;;;;;uBA9FpL,OAAO,iBAAiB,EAAE,QAAQ;;;;;0BAClC,OAAO,yBAAyB,EAAE,OAAO"}
+{"version":3,"file":"testUtils.d.ts","sourceRoot":"","sources":["../../../src/view/testUtils.js"],"names":[],"mappings":"AAoBA;;;GAGG;AACH,2DAHW,OAAO,kBAAkB,EAAE,kBAAkB,6CAoEvD;AAGS,uBAAC,CAAC,SAAS,OAAO,WAAW,EAAE,OAAO,QAAQ,QAAQ,aAAa;IAAE,KAAI,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;CAAE,uBAAuB,OAAO,kBAAkB,EAAE,kBAAkB,GAAK,OAAO,CAAC,CAAC,CAAC,CAAA;AAgBhL,oCAAC,CAAC,SAAS,OAAO,WAAW,EAAE,OAAO,QAAQ,QAAQ,aAAa;IAAE,KAAI,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;CAAE,YAAY,WAAW,YAAY;IAAC,MAAM,EAAE,OAAO,CAAC;IAAC,YAAY,EAAE,OAAO,CAAA;CAAC,GAAK,OAAO,CAAC,CAAC,CAAC,CAAA;;;;;uBAxGpL,OAAO,iBAAiB,EAAE,QAAQ;;;;;0BAClC,OAAO,yBAAyB,EAAE,OAAO"}

package/dist/src/view/testUtils.js

@@ -38,6 +38,8 @@ export function createTestViewContext(viewFactoryOptions = {}) {
         ],
     });
 
+    const dataFlow = new DataFlow();
+
     // @ts-expect-error
     const c = /** @type {ViewContext} */ ({
         createOrImportView: async function (
@@ -55,7 +57,7 @@ export function createTestViewContext(viewFactoryOptions = {}) {
             );
         },
 
-        dataFlow: new DataFlow(),
+        dataFlow,
         genomeStore,
 
         fontManager: new BmFontManager(),
@@ -66,6 +68,11 @@ export function createTestViewContext(viewFactoryOptions = {}) {
                     /** @type {(callback: () => void) => void} */ (
                         (callback) => callback()
                     ),
+                transition: (/** @type {any} */ options) => {
+                    const to = typeof options.to === "number" ? options.to : 1;
+                    options.onUpdate(to);
+                    return Promise.resolve();
+                },
             })
         ),
 
@@ -73,6 +80,9 @@ export function createTestViewContext(viewFactoryOptions = {}) {
 
         isViewConfiguredVisible: () => true,
 
+        addBroadcastListener: () => undefined,
+        removeBroadcastListener: () => undefined,
+
         //...partialContext,
     });
 

package/dist/src/view/unitView.d.ts

@@ -33,25 +33,20 @@ export default class UnitView extends View {
      * @param {Channel} channel
      */
     getDataAccessor(channel: import("../spec/channel.js").Channel): import("../types/encoder.js").Accessor<import("../spec/channel.js").Scalar>;
+    /**
+     * Returns data accessors configured for the `search` channel.
+     *
+     * @returns {import("vega-util").AccessorFn[]}
+     */
+    getSearchAccessors(): import("vega-util").AccessorFn[];
     /**
      * Returns a collector that is associated with this view.
      */
     getCollector(): import("../data/collector.js").default;
     /**
-     * Extracts the domain from the data.
-     *
-     * TODO: Optimize! Now this performs redundant work if multiple views share the same collector.
-     * Also, all relevant fields should be processed in one iteration: https://jsbench.me/y5kkqy52jo/1
-     * In fact, domain extraction could be a responsibility of the collector: As it handles data items,
-     * it extracts domains for all fields (and data types) that need extracted domains.
-     * Alternatively, extractor nodes could be added to the data flow, just like Vega does
-     * (with aggregate and extent).
-     *
-     * @param {Channel} channel
-     * @param {import("../spec/channel.js").Type} type
-     * @returns {DomainArray}
+     * Registers collector subscriptions that keep scale domains up to date.
      */
-    extractDataDomain(channel: import("../spec/channel.js").Channel, type: import("../spec/channel.js").Type): import("../utils/domainArray.js").DomainArray;
+    registerDomainSubscriptions(): void;
     getZoomLevel(): number;
     /**
      * @param {string} channel

package/dist/src/view/unitView.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"unitView.d.ts","sourceRoot":"","sources":["../../../src/view/unitView.js"],"names":[],"mappings":"AA6BA;;;;GAIG;AACH,wBAHU,MAAM,CAAC,OAAO,iBAAiB,EAAE,QAAQ,EAAE,cAAc,kBAAkB,EAAE,OAAO,CAAC,CAc7F;AAEF;IAeI;;;;;;;;OAQG;IACH,kBAPW,OAAO,iBAAiB,EAAE,QAAQ,WAClC,OAAO,yBAAyB,EAAE,OAAO,gBACzC,OAAO,oBAAoB,EAAE,OAAO,cACpC,OAAO,WAAW,EAAE,OAAO,QAC3B,MAAM,YACN,OAAO,WAAW,EAAE,WAAW,EAyCzC;IApCG,yCAAgB;IAIZ,iDAAiD;IACjD,MADW,OAAO,kBAAkB,EAAE,OAAO,CACnB;IAoKlC,2DAIC;IAgBD;;;;;OAKG;IAEH,iEA0IC;IAUD;;;;;OAKG;IACH,4IAMC;IAkBD;;OAEG;IACH,uDAEC;IAED;;;;;;;;;;;;;OAaG;IACH,uEAHW,OAAO,oBAAoB,EAAE,IAAI,iDAqB3C;IAED,uBAQC;IAgBD;;;;OAIG;IACH,8BAJW,MAAM,+DAEJ,OAAO,iBAAiB,EAAE,kBAAkB,CAKxD;;CACJ;iBAxfgB,WAAW"}
+{"version":3,"file":"unitView.d.ts","sourceRoot":"","sources":["../../../src/view/unitView.js"],"names":[],"mappings":"AA+BA;;;;GAIG;AACH,wBAHU,MAAM,CAAC,OAAO,iBAAiB,EAAE,QAAQ,EAAE,cAAc,kBAAkB,EAAE,OAAO,CAAC,CAc7F;AAEF;IAwBI;;;;;;;;OAQG;IACH,kBAPW,OAAO,iBAAiB,EAAE,QAAQ,WAClC,OAAO,yBAAyB,EAAE,OAAO,gBACzC,OAAO,oBAAoB,EAAE,OAAO,cACpC,OAAO,WAAW,EAAE,OAAO,QAC3B,MAAM,YACN,OAAO,WAAW,EAAE,WAAW,EAyCzC;IApCG,yCAAgB;IAIZ,iDAAiD;IACjD,MADW,OAAO,kBAAkB,EAAE,OAAO,CACnB;IAoKlC,2DAIC;IAoBD;;;;;OAKG;IAEH,iEAoJC;IAUD;;;;;OAKG;IACH,4IAMC;IAED;;;;OAIG;IACH,sBAFa,OAAO,WAAW,EAAE,UAAU,EAAE,CAS5C;IAkBD;;OAEG;IACH,uDAEC;IAED;;OAEG;IACH,oCA0EC;IAED,uBAQC;IAgBD;;;;OAIG;IACH,8BAJW,MAAM,+DAEJ,OAAO,iBAAiB,EAAE,kBAAkB,CAKxD;;CACJ;iBA5kBgB,WAAW"}

package/dist/src/view/unitView.js

@@ -14,7 +14,7 @@ import {
     isPrimaryPositionalChannel,
     isValueDefWithCondition,
 } from "../encoder/encoder.js";
-import createDomain from "../utils/domainArray.js";
+import { isScaleAccessor } from "../encoder/accessor.js";
 import AxisResolution from "../scales/axisResolution.js";
 import View from "./view.js";
 import {
@@ -24,8 +24,10 @@ import {
     isPointSelectionConfig,
     updateMultiPointSelection,
 } from "../selection/selection.js";
+import { getEncodingSearchFields } from "../encoder/metadataChannels.js";
 import { UNIQUE_ID_KEY } from "../data/transforms/identifier.js";
 import { createEventFilterFunction } from "../utils/expression.js";
+import { field } from "../utils/field.js";
 
 /**
  *
@@ -48,7 +50,6 @@ export const markTypes = {
 export default class UnitView extends View {
     /**
      * @typedef {import("../spec/channel.js").Channel} Channel
-     * @typedef {import("../utils/domainArray.js").DomainArray} DomainArray
      * @typedef {import("../spec/view.js").ResolutionTarget} ResolutionTarget
      * @typedef {((datum: import("../data/flowNode.js").Datum) => import("../spec/channel.js").Scalar) & { fieldDef: import("../spec/channel.js").FieldDef}} FieldAccessor
      *
@@ -60,6 +61,16 @@ export default class UnitView extends View {
      */
     #zoomLevelSetter;
 
+    /**
+     * @type {boolean}
+     */
+    #domainSubscriptionsRegistered = false;
+
+    /**
+     * @type {import("vega-util").AccessorFn[] | null}
+     */
+    #searchAccessors = null;
+
     /**
      *
      * @param {import("../spec/view.js").UnitSpec} spec
@@ -253,6 +264,10 @@ export default class UnitView extends View {
         const encoding = super.getEncoding();
         const supportedChannels = this.mark.getSupportedChannels();
         for (const channel of Object.keys(encoding)) {
+            if (channel === "key") {
+                continue;
+            }
+
             if (!supportedChannels.includes(channel)) {
                 delete encoding[channel];
             }
@@ -284,6 +299,10 @@ export default class UnitView extends View {
                 continue;
             }
 
+            if (Array.isArray(channelDef)) {
+                continue;
+            }
+
             /** @type {import("../spec/channel.js").ChannelDefWithScale} */
             let channelDefWithScale;
 
@@ -368,32 +387,38 @@ export default class UnitView extends View {
                     const resolution = new ScaleResolution(targetChannel);
                     view.resolutions[type][targetChannel] = resolution;
 
-                    resolution.addEventListener("range", (event) => {
-                        // Create if WebGLHelper is available, i.e., if not running in headless mode
+                    const updateRangeTexture = (
+                        /** @type {import("../types/scaleResolutionApi.js").ScaleResolutionEvent} */ event
+                    ) => {
+                        // Create if WebGLHelper is available, i.e., if not running in headless mode.
+                        // Domain changes can alter discrete texture sizes as well.
                         this.context.glHelper?.createRangeTexture(
                             event.scaleResolution,
                             true
                         );
+                    };
+                    resolution.addEventListener("range", updateRangeTexture);
+                    resolution.addEventListener("domain", updateRangeTexture);
+                    this.registerDisposer(() => {
+                        resolution.removeEventListener(
+                            "range",
+                            updateRangeTexture
+                        );
+                        resolution.removeEventListener(
+                            "domain",
+                            updateRangeTexture
+                        );
                     });
                 }
 
-                const dataDomainSource =
-                    this.getLayoutAncestors()
-                        // TODO: Should check until the resolved scale resolution
-                        .some(
-                            (view) => !view.options.contributesToScaleDomain
-                        ) ||
-                    (isChannelDefWithScale(channelDefWithScale) &&
-                        channelDefWithScale.contributesToScaleDomain === false)
-                        ? undefined
-                        : this.extractDataDomain.bind(this);
+                const contributesToDomain = !this.isDomainInert();
 
                 const resolution = view.resolutions[type][targetChannel];
                 const unregister = resolution.registerMember({
                     view: this,
                     channel,
                     channelDef: channelDefWithScale,
-                    dataDomainSource,
+                    contributesToDomain,
                 });
                 this.registerDisposer(() => {
                     // Unregister returns true when it removed the last member.
@@ -430,6 +455,20 @@ export default class UnitView extends View {
         return encoders[channel]?.dataAccessor;
     }
 
+    /**
+     * Returns data accessors configured for the `search` channel.
+     *
+     * @returns {import("vega-util").AccessorFn[]}
+     */
+    getSearchAccessors() {
+        if (!this.#searchAccessors) {
+            const fields = getEncodingSearchFields(this.getEncoding()) ?? [];
+            this.#searchAccessors = fields.map((fieldName) => field(fieldName));
+        }
+
+        return this.#searchAccessors;
+    }
+
     /**
      * Returns an accessor that returns a (composite) key for partitioning the data
      *
@@ -454,37 +493,82 @@ export default class UnitView extends View {
     }
 
     /**
-     * Extracts the domain from the data.
-     *
-     * TODO: Optimize! Now this performs redundant work if multiple views share the same collector.
-     * Also, all relevant fields should be processed in one iteration: https://jsbench.me/y5kkqy52jo/1
-     * In fact, domain extraction could be a responsibility of the collector: As it handles data items,
-     * it extracts domains for all fields (and data types) that need extracted domains.
-     * Alternatively, extractor nodes could be added to the data flow, just like Vega does
-     * (with aggregate and extent).
-     *
-     * @param {Channel} channel
-     * @param {import("../spec/channel.js").Type} type
-     * @returns {DomainArray}
+     * Registers collector subscriptions that keep scale domains up to date.
      */
-    extractDataDomain(channel, type) {
-        /** @type {DomainArray} */
-        let domain = createDomain(type);
-
-        (this.mark.encoders[channel]?.accessors ?? [])
-            .filter((a) => a.scaleChannel)
-            .forEach((accessor) => {
-                if (accessor.constant) {
-                    domain.extend(accessor({}));
-                } else {
-                    const collector = this.getCollector();
-                    if (collector?.completed) {
-                        collector.visitData((d) => domain.extend(accessor(d)));
-                    }
+    registerDomainSubscriptions() {
+        if (this.#domainSubscriptionsRegistered) {
+            return;
+        }
+
+        if (this.isDomainInert()) {
+            return;
+        }
+
+        const collector = this.getCollector();
+        if (!collector) {
+            return;
+        }
+
+        const encoders = this.mark.encoders;
+        if (!encoders) {
+            throw new Error("Encoders are not initialized!");
+        }
+
+        this.#domainSubscriptionsRegistered = true;
+
+        /** @type {Map<import("../scales/scaleResolution.js").default, Set<import("../types/encoder.js").ScaleAccessor>>} */
+        const accessorsByResolution = new Map();
+
+        for (const encoder of Object.values(encoders)) {
+            if (!encoder) {
+                continue;
+            }
+
+            const accessors = encoder.accessors ?? [];
+            if (accessors.length === 0) {
+                continue;
+            }
+
+            for (const accessor of accessors) {
+                if (!isScaleAccessor(accessor)) {
+                    continue;
+                }
+                if (accessor.channelDef.domainInert) {
+                    continue;
+                }
+                const resolution = this.getScaleResolution(
+                    accessor.scaleChannel
+                );
+                if (!resolution) {
+                    throw new Error(
+                        "Missing scale resolution for channel: " +
+                            accessor.scaleChannel
+                    );
+                }
+
+                let accessorsForResolution =
+                    accessorsByResolution.get(resolution);
+                if (!accessorsForResolution) {
+                    accessorsForResolution = new Set();
+                    accessorsByResolution.set(
+                        resolution,
+                        accessorsForResolution
+                    );
                 }
-            });
+                accessorsForResolution.add(accessor);
+            }
+        }
 
-        return domain;
+        for (const [resolution, accessors] of accessorsByResolution) {
+            if (accessors.size === 0) {
+                continue;
+            }
+            const unregister = resolution.registerCollectorSubscriptions(
+                collector,
+                accessors
+            );
+            this.registerDisposer(unregister);
+        }
     }
 
     getZoomLevel() {