@genome-spy/core 0.73.0 → 0.74.0

package/dist/src/view/view.js

@@ -20,6 +20,7 @@ import ViewParamRuntime from "../paramRuntime/viewParamRuntime.js";
 import { isExprRef } from "../paramRuntime/paramUtils.js";
 import { InternMap } from "internmap";
 import { endWithSlash } from "../utils/addBaseUrl.js";
+import { mergeConfigScopes } from "../config/mergeConfig.js";
 
 // TODO: View classes have too many responsibilities. Come up with a way
 // to separate the concerns. However, most concerns are tightly tied to
@@ -50,18 +51,36 @@ const defaultOpacityFunction = (parentOpacity) => parentOpacity;
  * @typedef {object} BroadcastMessage
  * @prop {import("../genomeSpy.js").BroadcastEventType} type Broadcast type
  * @prop {any} [payload] Anything
+ */
+
+/**
+ * Internal listener contract for view interactions.
  *
- * @callback InteractionEventListener
- * @param {import("./layout/rectangle.js").default} coords
- *      Coordinates of the view
- * @param {import("../utils/interactionEvent.js").default} event
+ * Listeners receive a single `Interaction` object. They are attached per
+ * event type and may run either in the capture phase or in the bubbling
+ * phase, depending on how the containing view routes the interaction.
  *
+ * Ordinary pointer events are routed by container views, which may do hit
+ * testing, scrollbar dispatch, zoom policy, or other view-specific work
+ * before or after child propagation. In addition, `mouseenter` and
+ * `mouseleave` are synthesized by `InteractionDispatcher` from changes in the
+ * pointed view path.
+ *
+ * `stopPropagation()` prevents further routing to later views, but it does
+ * not provide DOM-style stop-immediate semantics for sibling listeners on the
+ * same view.
+ *
+ * @callback InteractionListener
+ * @param {import("../utils/interaction.js").default} event
+ */
+
+/**
  * @typedef {object} ViewOptions
  * @prop {boolean} [blockEncodingInheritance]
  *      Don't inherit encodings from parent. Default: false.
- * @prop {boolean} [layersChildren]
- *      View's children are layered on top of each other and they have the same
- *      coordinates as their parent.
+ * @prop {"own" | "inherit"} [layoutSizeParams]
+ *      Whether the view should introduce local layout-driven width/height params.
+ *      Default: "own".
  */
 /**
  * @template {import("../spec/view.js").ViewSpec} [TSpec=import("../spec/view.js").ViewSpec]
@@ -70,23 +89,28 @@ export default class View {
     /** @type {TSpec} */
     spec;
 
+    /** @type {import("../spec/config.js").GenomeSpyConfig[]} */
+    #configScopes;
+
     /** @type {string | undefined} */
     #defaultName;
 
     /** @type {Record<string, (function(BroadcastMessage):void)[]>} */
     #broadcastHandlers = {};
 
-    /** @type {Record<string, InteractionEventListener[]>} */
-    #capturingInteractionEventListeners = {};
+    /** @type {Record<string, InteractionListener[]>} */
+    #capturingInteractionListeners = {};
 
-    /** @type {Record<string, InteractionEventListener[]>} */
-    #nonCapturingInteractionEventListeners = {};
+    /** @type {Record<string, InteractionListener[]>} */
+    #bubblingInteractionListeners = {};
 
     /** @type {(value: number) => void} */
     #widthSetter;
 
     /** @type {(value: number) => void} */
     #heightSetter;
+    // TODO: Consider replacing param-backed layout size with built-in layout
+    // signals. That would avoid width/height shadowing rules altogether.
 
     /** @type {boolean} */
     #hasRendered = false;
@@ -135,6 +159,21 @@ export default class View {
         this.#defaultName = name;
         this.spec = spec;
 
+        if (dataParent && /** @type {any} */ (spec).theme !== undefined) {
+            throw new Error(
+                '"theme" is only supported at the root specification. Use "config" and "style" for subtree customization.'
+            );
+        }
+
+        const inheritedScopes = dataParent
+            ? dataParent.getConfigScopes()
+            : [context.getBaseConfig()];
+        const localScope = spec.config;
+        this.#configScopes =
+            /** @type {import("../spec/config.js").GenomeSpyConfig[]} */ (
+                [...inheritedScopes, localScope].filter((scope) => !!scope)
+            );
+
         this.resolutions = {
             /**
              * Channel-specific scale resolutions
@@ -152,6 +191,7 @@ export default class View {
 
         this.options = {
             blockEncodingInheritance: false,
+            layoutSizeParams: "own",
             ...options,
         };
 
@@ -179,18 +219,27 @@ export default class View {
             }
         }
 
-        // All descendants of a layer view have the same coordinates - no need to redefine.
-        if (!this.layoutParent?.options.layeredChildren) {
-            // Width and height can be overriden by the view spec. Typically it
-            // doesn't make much sense, but it's used in the App's SampleView
-            // to set the height to sample facets' height.
-            const allocateIfFree = (/** @type {string} */ name) =>
-                this.paramRuntime.findRuntimeForParam(name)
-                    ? undefined
-                    : this.paramRuntime.allocateSetter(name, 0);
-            this.#heightSetter = allocateIfFree("height");
-            this.#widthSetter = allocateIfFree("width");
+        if (this.options.layoutSizeParams !== "inherit") {
+            // Layout-driven size params must exist before marks and child views
+            // bind expressions in subclass constructors.
+            this.#widthSetter = this.#createLayoutSizeSetter("width");
+            this.#heightSetter = this.#createLayoutSizeSetter("height");
+        }
+    }
+
+    /**
+     * @param {"width" | "height"} name
+     * @returns {(value: number) => void}
+     */
+    #createLayoutSizeSetter(name) {
+        if (
+            this.paramRuntime.hasLocalParam(name) ||
+            this.paramRuntime.hasConfiguredParamInScopeChain(name)
+        ) {
+            return undefined;
         }
+
+        return this.paramRuntime.allocateSetter(name, 0);
     }
 
     /**
@@ -216,6 +265,43 @@ export default class View {
         return this.#defaultName;
     }
 
+    getConfig() {
+        return /** @type {import("../spec/config.js").GenomeSpyConfig} */ (
+            mergeConfigScopes(this.#configScopes)
+        );
+    }
+
+    getCursorSpec() {
+        return this.spec.cursor;
+    }
+
+    getCursor() {
+        const cursor = this.getCursorSpec();
+        return isExprRef(cursor)
+            ? this.paramRuntime.evaluateAndGet(cursor.expr)
+            : cursor;
+    }
+
+    /**
+     * @param {() => void} listener
+     * @param {(disposer: () => void) => void} [registerDisposer]
+     */
+    watchCursor(listener, registerDisposer) {
+        const cursor = this.getCursorSpec();
+        if (!isExprRef(cursor)) {
+            return;
+        }
+
+        this.paramRuntime.watchExpression(cursor.expr, listener, {
+            scopeOwned: false,
+            registerDisposer,
+        });
+    }
+
+    getConfigScopes() {
+        return this.#configScopes.slice();
+    }
+
     /**
      * Returns the coords of the view. If view has been faceted, returns the coords
      * of an arbitrary facet. If all or specific facet coords are needed, use `facetCoords`.
@@ -318,7 +404,7 @@ export default class View {
 
             if (scale) {
                 // Note: this and all ancestral views need to be refreshed when the domain is changed.
-                let steps = 0;
+                let steps;
                 if (isDiscrete(scale.type)) {
                     steps = scale.domain().length;
                 } else if (["locus", "index"].includes(scale.type)) {
@@ -478,7 +564,6 @@ export default class View {
     #getAncestors(prop) {
         /** @type {View[]} */
         const ancestors = [];
-        // eslint-disable-next-line consistent-this
         let view = /** @type {View} */ (this);
         do {
             ancestors.push(view);
@@ -541,38 +626,40 @@ export default class View {
     }
 
     /**
-     * Handles an interactionEvent
+     * Invokes this view's listeners for the current interaction phase.
+     *
+     * This method does not route the event to children or parents. Container
+     * subclasses implement that routing in `propagateInteraction(...)`
+     * and call `handleInteraction(...)` when the current phase reaches
+     * this view.
      *
-     * @param {import("./layout/rectangle.js").default} coords
-     *      Coordinates of the view
-     * @param {import("../utils/interactionEvent.js").default} event
+     * @param {import("../utils/interaction.js").default} event
      * @param {boolean} capturing
-     * @protected
      */
-    handleInteractionEvent(coords, event, capturing) {
+    handleInteraction(event, capturing) {
         const listenersByType = capturing
-            ? this.#capturingInteractionEventListeners
-            : this.#nonCapturingInteractionEventListeners;
+            ? this.#capturingInteractionListeners
+            : this.#bubblingInteractionListeners;
         for (const listener of listenersByType[event.type] || []) {
-            listener(coords, event);
+            listener(event);
         }
     }
 
     /**
-     * Add an "interaction" event listener that mimics DOM's event model inside
-     * the view hierarchy.
+     * Registers an internal interaction listener.
      *
-     * This is intended for GenomeSpy's internal use. It allows the views to handle
-     * low level interactions such as dragging, wheeling, etc.
+     * Interaction listeners are internal view-hierarchy hooks, not part of
+     * the supported embed API. They receive the refactored `Interaction`
+     * object directly, without the removed legacy `coords` argument.
      *
      * @param {string} type
-     * @param {InteractionEventListener} listener
+     * @param {InteractionListener} listener
      * @param {boolean} [useCapture]
      */
-    addInteractionEventListener(type, listener, useCapture) {
+    addInteractionListener(type, listener, useCapture) {
         const listenersByType = useCapture
-            ? this.#capturingInteractionEventListeners
-            : this.#nonCapturingInteractionEventListeners;
+            ? this.#capturingInteractionListeners
+            : this.#bubblingInteractionListeners;
         let listeners = listenersByType[type];
         if (!listeners) {
             listeners = [];
@@ -583,14 +670,16 @@ export default class View {
     }
 
     /**
+     * Removes a previously registered interaction listener.
+     *
      * @param {string} type
-     * @param {InteractionEventListener} listener
+     * @param {InteractionListener} listener
      * @param {boolean} [useCapture]
      */
-    removeInteractionEventListener(type, listener, useCapture) {
+    removeInteractionListener(type, listener, useCapture) {
         const listenersByType = useCapture
-            ? this.#capturingInteractionEventListeners
-            : this.#nonCapturingInteractionEventListeners;
+            ? this.#capturingInteractionListeners
+            : this.#bubblingInteractionListeners;
         let listeners = listenersByType?.[type];
         if (listeners) {
             const index = listeners.indexOf(listener);
@@ -945,9 +1034,9 @@ export default class View {
      * Broadcasts a message to views that include the given (x, y) point.
      * This is mainly intended for mouse events.
      *
-     * @param {import("../utils/interactionEvent.js").default} event
+     * @param {import("../utils/interaction.js").default} event
      */
-    propagateInteractionEvent(event) {
+    propagateInteraction(event) {
         // Subclasses must implement proper handling
     }
 }

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

@@ -3,6 +3,9 @@ export const VIEW_ROOT_NAME: "viewRoot";
  * @typedef {object} ViewFactoryOptions
  * @property {boolean} [allowImport] allows imports from urls
  * @property {boolean} [wrapRoot]
+ *
+ * @typedef {object} CreateViewOptions
+ * @property {"own" | "inherit"} [layoutSizeParams]
  */
 /**
  *
@@ -18,15 +21,16 @@ export class ViewFactory {
      * @param {SpecGuard} specGuard
      * @param {Factory} factory
      */
-    addViewType(specGuard: (spec: import("../spec/view.js").ViewSpec) => boolean, factory: (spec: import("../spec/view.js").ViewSpec, context: import("../types/viewContext.js").default, layoutParent?: import("./containerView.js").default, dataParent?: import("./view.js").default, defaultName?: string) => View): void;
+    addViewType(specGuard: (spec: import("../spec/view.js").ViewSpec) => boolean, factory: (spec: import("../spec/view.js").ViewSpec, context: import("../types/viewContext.js").default, layoutParent?: import("./containerView.js").default, dataParent?: import("./view.js").default, defaultName?: string, options?: CreateViewOptions) => View): void;
     /**
      * @param {ViewSpec} spec
      * @param {ViewContext} context
      * @param {import("./containerView.js").default} [layoutParent]
      * @param {import("./view.js").default} [dataParent]
      * @param {string} [defaultName]
+     * @param {CreateViewOptions} [options]
      */
-    createView(spec: import("../spec/view.js").ViewSpec, context: import("../types/viewContext.js").default, layoutParent?: import("./containerView.js").default, dataParent?: import("./view.js").default, defaultName?: string): View<import("../spec/view.js").ViewSpec>;
+    createView(spec: import("../spec/view.js").ViewSpec, context: import("../types/viewContext.js").default, layoutParent?: import("./containerView.js").default, dataParent?: import("./view.js").default, defaultName?: string, options?: CreateViewOptions): View<import("../spec/view.js").ViewSpec>;
     /**
      *
      * @param {ViewSpec} spec
@@ -43,8 +47,9 @@ export class ViewFactory {
      * @param {import("./view.js").default} [dataParent]
      * @param {string} [defaultName]
      * @param {(spec: ViewSpec) => void} [validator]
+     * @param {CreateViewOptions} [options]
      */
-    createOrImportView(spec: import("../spec/view.js").ViewSpec | import("../spec/view.js").ImportSpec, context: import("../types/viewContext.js").default, layoutParent?: import("./containerView.js").default, dataParent?: import("./view.js").default, defaultName?: string, validator?: (spec: import("../spec/view.js").ViewSpec) => void): Promise<View<import("../spec/view.js").ViewSpec>>;
+    createOrImportView(spec: import("../spec/view.js").ViewSpec | import("../spec/view.js").ImportSpec, context: import("../types/viewContext.js").default, layoutParent?: import("./containerView.js").default, dataParent?: import("./view.js").default, defaultName?: string, validator?: (spec: import("../spec/view.js").ViewSpec) => void, options?: CreateViewOptions): Promise<View<import("../spec/view.js").ViewSpec>>;
     #private;
 }
 export type ViewFactoryOptions = {
@@ -54,6 +59,9 @@ export type ViewFactoryOptions = {
     allowImport?: boolean;
     wrapRoot?: boolean;
 };
+export type CreateViewOptions = {
+    layoutSizeParams?: "own" | "inherit";
+};
 import View from "./view.js";
 export { isConcatSpec, isFacetSpec, isHConcatSpec, isImportSpec, isLayerSpec, isUnitSpec, isVConcatSpec } from "./viewSpecGuards.js";
 //# sourceMappingURL=viewFactory.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"viewFactory.d.ts","sourceRoot":"","sources":["../../../src/view/viewFactory.js"],"names":[],"mappings":"AA0BA,6BAA8B,UAAU,CAAC;AAEzC;;;;GAIG;AAEH;;GAEG;AACH;IAiBI;;OAEG;IACH,sBAFW,kBAAkB,EA0D5B;IAvDG,2CAA2C;IAC3C,SADW,QAAQ,CAAC,kBAAkB,CAAC,CAKtC;IAoDL;;;OAGG;IACH,qEAxEiC,OAAO,yHAC2B,OAAO,oBAAoB,EAAE,OAAO,eAAe,OAAO,WAAW,EAAE,OAAO,gBAAgB,MAAM,KAAK,IAAI,QAyE/K;IAED;;;;;;OAMG;IACH,wHAJW,OAAO,oBAAoB,EAAE,OAAO,eACpC,OAAO,WAAW,EAAE,OAAO,gBAC3B,MAAM,4CAyBhB;IAED;;;;OAIG;IACH,sDAFa,IAAI,sCAAY,CAU5B;IAED;;;;;;;;;;OAUG;IACH,yBAPW,qCAAW,OAAO,iBAAiB,EAAE,UAAU,qEAE/C,OAAO,oBAAoB,EAAE,OAAO,eACpC,OAAO,WAAW,EAAE,OAAO,gBAC3B,MAAM,cACN,CAAC,IAAI,oCAAU,KAAK,IAAI,qDAiGlC;;CACJ;;;;;kBAvPa,OAAO;eACP,OAAO;;iBA9BJ,WAAW"}
+{"version":3,"file":"viewFactory.d.ts","sourceRoot":"","sources":["../../../src/view/viewFactory.js"],"names":[],"mappings":"AA2BA,6BAA8B,UAAU,CAAC;AAEzC;;;;;;;GAOG;AAEH;;GAEG;AACH;IAiBI;;OAEG;IACH,sBAFW,kBAAkB,EAoE5B;IAjEG,2CAA2C;IAC3C,SADW,QAAQ,CAAC,kBAAkB,CAAC,CAKtC;IA8DL;;;OAGG;IACH,qEAlFiC,OAAO,yHAC2B,OAAO,oBAAoB,EAAE,OAAO,eAAe,OAAO,WAAW,EAAE,OAAO,gBAAgB,MAAM,YAAY,iBAAiB,KAAK,IAAI,QAmF5M;IAED;;;;;;;OAOG;IACH,wHALW,OAAO,oBAAoB,EAAE,OAAO,eACpC,OAAO,WAAW,EAAE,OAAO,gBAC3B,MAAM,YACN,iBAAiB,4CA0B3B;IAED;;;;OAIG;IACH,sDAFa,IAAI,sCAAY,CAU5B;IAED;;;;;;;;;;;OAWG;IACH,yBARW,qCAAW,OAAO,iBAAiB,EAAE,UAAU,qEAE/C,OAAO,oBAAoB,EAAE,OAAO,eACpC,OAAO,WAAW,EAAE,OAAO,gBAC3B,MAAM,cACN,CAAC,IAAI,oCAAU,KAAK,IAAI,YACxB,iBAAiB,qDAqG3B;;CACJ;;;;;kBA3Qa,OAAO;eACP,OAAO;;;uBAGP,KAAK,GAAG,SAAS;;iBAlCd,WAAW"}

package/dist/src/view/viewFactory.js

@@ -10,6 +10,7 @@ import ContainerView from "./containerView.js";
 import ViewError from "./viewError.js";
 import { isSelectionParameter } from "../paramRuntime/paramUtils.js";
 import { asSelectionConfig } from "../selection/selection.js";
+import { resolveImportedSpecConfig } from "../config/resolveConfig.js";
 import {
     markViewAsNonAddressable,
     registerImportInstance,
@@ -30,6 +31,9 @@ export const VIEW_ROOT_NAME = "viewRoot";
  * @typedef {object} ViewFactoryOptions
  * @property {boolean} [allowImport] allows imports from urls
  * @property {boolean} [wrapRoot]
+ *
+ * @typedef {object} CreateViewOptions
+ * @property {"own" | "inherit"} [layoutSizeParams]
  */
 
 /**
@@ -46,7 +50,7 @@ export class ViewFactory {
      * @typedef {import("../spec/view.js").ConcatSpec} ConcatSpec
      *
      * @typedef {(spec: ViewSpec) => boolean} SpecGuard
-     * @typedef {(spec: ViewSpec, context: ViewContext, layoutParent?: import("./containerView.js").default, dataParent?: import("./view.js").default, defaultName?: string) => View} Factory
+     * @typedef {(spec: ViewSpec, context: ViewContext, layoutParent?: import("./containerView.js").default, dataParent?: import("./view.js").default, defaultName?: string, options?: CreateViewOptions) => View} Factory
      */
 
     /** @type {Map<SpecGuard, Factory>} */
@@ -70,19 +74,21 @@ export class ViewFactory {
                  *   context: ViewContext,
                  *   layoutParent?: import("./containerView.js").default,
                  *   dataParent?: import("./view.js").default,
-                 *   defaultName?: string
+                 *   defaultName?: string,
+                 *   options?: CreateViewOptions
                  * ) => View} */
                 ViewClass
             ) =>
             /** @type {Factory} */
-            (spec, context, layoutParent, dataParent, defaultName) =>
+            (spec, context, layoutParent, dataParent, defaultName, options) =>
                 /** @type {View} */ (
                     new ViewClass(
                         spec,
                         context,
                         layoutParent,
                         dataParent,
-                        defaultName
+                        defaultName,
+                        options
                     )
                 );
 
@@ -90,7 +96,14 @@ export class ViewFactory {
         this.addViewType(
             isMultiscaleSpec,
             /** @type {Factory} */ (
-                (spec, context, layoutParent, dataParent, defaultName) =>
+                (
+                    spec,
+                    context,
+                    layoutParent,
+                    dataParent,
+                    defaultName,
+                    options
+                ) =>
                     /** @type {View} */ (
                         new LayerView(
                             normalizeMultiscaleSpec(
@@ -101,7 +114,8 @@ export class ViewFactory {
                             context,
                             layoutParent,
                             dataParent,
-                            defaultName
+                            defaultName,
+                            options
                         )
                     )
             )
@@ -127,8 +141,9 @@ export class ViewFactory {
      * @param {import("./containerView.js").default} [layoutParent]
      * @param {import("./view.js").default} [dataParent]
      * @param {string} [defaultName]
+     * @param {CreateViewOptions} [options]
      */
-    createView(spec, context, layoutParent, dataParent, defaultName) {
+    createView(spec, context, layoutParent, dataParent, defaultName, options) {
         for (const [guard, factory] of this.#types) {
             if (guard(spec)) {
                 return factory(
@@ -136,7 +151,8 @@ export class ViewFactory {
                     context,
                     layoutParent,
                     dataParent,
-                    defaultName
+                    defaultName,
+                    options
                 );
             }
         }
@@ -178,6 +194,7 @@ export class ViewFactory {
      * @param {import("./view.js").default} [dataParent]
      * @param {string} [defaultName]
      * @param {(spec: ViewSpec) => void} [validator]
+     * @param {CreateViewOptions} [options]
      */
     async createOrImportView(
         spec,
@@ -185,7 +202,8 @@ export class ViewFactory {
         layoutParent,
         dataParent,
         defaultName,
-        validator
+        validator,
+        options
     ) {
         /** @type {ViewSpec} */
         let viewSpec;
@@ -244,9 +262,11 @@ export class ViewFactory {
                 hasIntervalSelection(viewSpec)) &&
             defaultName === VIEW_ROOT_NAME
         ) {
+            const wrappedChild = { ...viewSpec };
+            delete (/** @type {any} */ (wrappedChild).theme);
             viewSpec = {
                 name: "implicitRoot",
-                vconcat: [viewSpec],
+                vconcat: [wrappedChild],
             };
             isImplicitRoot = true;
         }
@@ -256,7 +276,8 @@ export class ViewFactory {
             context,
             layoutParent,
             dataParent,
-            defaultName
+            defaultName,
+            options
         );
 
         if (importScopeName !== undefined) {
@@ -310,6 +331,11 @@ function applyParamsToImportedSpec(importedSpec, importSpec) {
         importedSpec.visible = importSpec.visible;
     }
 
+    importedSpec.config = resolveImportedSpecConfig(
+        importSpec.config,
+        importedSpec.config
+    );
+
     const params = isArray(importSpec.params)
         ? importSpec.params
         : isObject(importSpec.params)

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

@@ -1 +1 @@
-{"version":3,"file":"viewUtils.d.ts","sourceRoot":"","sources":["../../../src/view/viewUtils.js"],"names":[],"mappings":"AAUA;;;;GAIG;AACH,qCAHW,OAAO,oBAAoB,EAAE,UAAU,GAAG,OAAO,iBAAiB,EAAE,YAAY,GAC9E,IAAI,IAAI,aAAa,CAIjC;AAED;;;;GAIG;AACH,oCAHW,OAAO,oBAAoB,EAAE,aAAa,GAAG,OAAO,iBAAiB,EAAE,YAAY,GACjF,IAAI,IAAI,YAAY,CAOhC;AAED;;;GAGG;AACH,+BAFW,IAAI,6EAMd;AAED;;;;GAIG;AACH,wCAFW,IAAI,8CASd;AAED;;GAEG;AACH,kDAFW,IAAI,QAiBd;AAED;;;;;;;GAOG;AACH,4CAFW,IAAI,QAUd;AAED;;;;GAIG;AACH,0DAJW,OAAO,CAAC,OAAO,kBAAkB,EAAE,OAAO,CAAC,EAAE,mBAC7C,MAAM,OAAO,GACX,OAAO,CAAC,IAAI,CAAC,CAmBzB;AAED;;;GAGG;AACH,wCAFW,IAAI;UAGO,QAAQ;aAAW,OAAO,oBAAoB,EAAE,OAAO;WAAS,OAAO,oBAAoB,EAAE,KAAK;UAAQ,OAAO,oBAAoB,EAAE,IAAI;IAqBhK;AAED;;;;;GAKG;AACH,2CALW,OAAO,iBAAiB,EAAE,UAAU,WACpC,MAAM,eACN,OAAO,yBAAyB,EAAE,OAAO,GACvC,OAAO,CAAC,OAAO,iBAAiB,EAAE,QAAQ,CAAC,CAoCvD;AAED;;GAEG;AACH,yCAFW,CAAS,IAAI,EAAJ,IAAI,EAAE,IAAM,EAAN,IAAI,EAAE,KAAE,IAAI,+BAkBrC;AAED;;;GAGG;AACH,0CAFW,IAAI,eAqBd;AAED;;GAEG;AACH,8CAFW,OAAO,WAAW,EAAE,OAAO;;;EAoBrC;iBA1P4C,WAAW;qBAFnC,eAAe"}
+{"version":3,"file":"viewUtils.d.ts","sourceRoot":"","sources":["../../../src/view/viewUtils.js"],"names":[],"mappings":"AAUA;;;;GAIG;AACH,qCAHW,OAAO,oBAAoB,EAAE,UAAU,GAAG,OAAO,iBAAiB,EAAE,YAAY,GAC9E,IAAI,IAAI,aAAa,CAIjC;AAED;;;;GAIG;AACH,oCAHW,OAAO,oBAAoB,EAAE,aAAa,GAAG,OAAO,iBAAiB,EAAE,YAAY,GACjF,IAAI,IAAI,YAAY,CAOhC;AAED;;;GAGG;AACH,+BAFW,IAAI,6EAMd;AAED;;;;GAIG;AACH,wCAFW,IAAI,8CASd;AAED;;GAEG;AACH,kDAFW,IAAI,QAiBd;AAED;;;;;;;GAOG;AACH,4CAFW,IAAI,QAUd;AAED;;;;GAIG;AACH,0DAJW,OAAO,CAAC,OAAO,kBAAkB,EAAE,OAAO,CAAC,EAAE,mBAC7C,MAAM,OAAO,GACX,OAAO,CAAC,IAAI,CAAC,CAmBzB;AAED;;;GAGG;AACH,wCAFW,IAAI;UAGO,QAAQ;aAAW,OAAO,oBAAoB,EAAE,OAAO;WAAS,OAAO,oBAAoB,EAAE,KAAK;UAAQ,OAAO,oBAAoB,EAAE,IAAI;IAwDhK;AAED;;;;;GAKG;AACH,2CALW,OAAO,iBAAiB,EAAE,UAAU,WACpC,MAAM,eACN,OAAO,yBAAyB,EAAE,OAAO,GACvC,OAAO,CAAC,OAAO,iBAAiB,EAAE,QAAQ,CAAC,CAqCvD;AAED;;GAEG;AACH,yCAFW,CAAS,IAAI,EAAJ,IAAI,EAAE,IAAM,EAAN,IAAI,EAAE,KAAE,IAAI,+BAkBrC;AAED;;;GAGG;AACH,0CAFW,IAAI,eAqBd;AAED;;GAEG;AACH,8CAFW,OAAO,WAAW,EAAE,OAAO;;;EAoBrC;iBA9R4C,WAAW;qBAFnC,eAAe"}

package/dist/src/view/viewUtils.js

@@ -126,15 +126,50 @@ export function findEncodedFields(view) {
     view.visit((view) => {
         if (view instanceof UnitView) {
             const encoding = view.getEncoding();
-            for (const [channel, def] of Object.entries(encoding)) {
-                if (!Array.isArray(def) && isFieldDef(def) && "type" in def) {
+
+            /**
+             * @param {import("../spec/channel.js").Channel} channel
+             * @param {unknown} definition
+             */
+            const collect = (channel, definition) => {
+                if (
+                    !definition ||
+                    typeof definition !== "object" ||
+                    Array.isArray(definition)
+                ) {
+                    return;
+                }
+
+                if (isFieldDef(definition) && "type" in definition) {
                     fieldInfos.push({
                         view,
                         channel,
-                        field: def.field,
-                        type: def.type,
+                        field: definition.field,
+                        type: /** @type {import("../spec/channel.js").Type} */ (
+                            definition.type
+                        ),
                     });
                 }
+
+                if ("condition" in definition) {
+                    const { condition } = definition;
+                    if (Array.isArray(condition)) {
+                        for (const subCondition of condition) {
+                            collect(channel, subCondition);
+                        }
+                    } else {
+                        collect(channel, condition);
+                    }
+                }
+            };
+
+            for (const [channel, def] of Object.entries(encoding)) {
+                collect(
+                    /** @type {import("../spec/channel.js").Channel} */ (
+                        channel
+                    ),
+                    def
+                );
             }
             return VISIT_SKIP; // Skip sample summaries
         }
@@ -166,7 +201,8 @@ export async function loadExternalViewSpec(spec, baseUrl, viewContext) {
         );
     } catch (e) {
         throw new Error(
-            `Could not load imported view spec: ${url}. Reason: ${e.message}`
+            `Could not load imported view spec: ${url}. Reason: ${e.message}`,
+            { cause: e }
         );
     }
 

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

@@ -1,13 +1,13 @@
 export function markZoomActivity(): void;
 export function isStillZooming(): boolean;
 /**
- * @param {import("../utils/interactionEvent.js").default} event
+ * @param {import("../utils/interaction.js").default} event
  * @param {import("./layout/rectangle.js").default} coords
  * @param {(zoomEvent: ZoomEvent) => boolean | void} handleZoom
  * @param {import("../types/viewContext.js").Hover} [hover]
  * @param {import("../utils/animator.js").default} [animator]
  */
-export function interactionToZoom(event: import("../utils/interactionEvent.js").default, coords: import("./layout/rectangle.js").default, handleZoom: (zoomEvent: ZoomEvent) => boolean | void, hover?: import("../types/viewContext.js").Hover, animator?: import("../utils/animator.js").default): void;
+export function interactionToZoom(event: import("../utils/interaction.js").default, coords: import("./layout/rectangle.js").default, handleZoom: (zoomEvent: ZoomEvent) => boolean | void, hover?: import("../types/viewContext.js").Hover, animator?: import("../utils/animator.js").default): void;
 export type ZoomEvent = {
     x: number;
     y: number;

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

@@ -1 +1 @@
-{"version":3,"file":"zoom.d.ts","sourceRoot":"","sources":["../../../src/view/zoom.js"],"names":[],"mappings":"AAgCA,yCAEC;AAED,0CAGC;AAgBD;;;;;;GAMG;AACH,yCANW,OAAO,8BAA8B,EAAE,OAAO,UAC9C,OAAO,uBAAuB,EAAE,OAAO,cACvC,CAAC,SAAS,EAAE,SAAS,KAAK,OAAO,GAAG,IAAI,UACxC,OAAO,yBAAyB,EAAE,KAAK,aACvC,OAAO,sBAAsB,EAAE,OAAO,QA8LhD;;OAxPS,MAAM;OACN,MAAM;YACN,MAAM;YACN,MAAM;YACN,MAAM;;;cAUN,UAAU,CAAC,OAAO,gBAAgB,CAAC;yBACnC,UAAU,CAAC;QAAC,KAAK,EAAE,KAAK,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAC,CAAC;uBAC7C,KAAK,GAAG,SAAS;0BACjB,CAAC,GAAG,CAAC,GAAG,CAAC;;iCAVc,sBAAsB;uBAChC,wBAAwB;kBAE7B,mBAAmB"}
+{"version":3,"file":"zoom.d.ts","sourceRoot":"","sources":["../../../src/view/zoom.js"],"names":[],"mappings":"AAgCA,yCAEC;AAED,0CAGC;AAgBD;;;;;;GAMG;AACH,yCANW,OAAO,yBAAyB,EAAE,OAAO,UACzC,OAAO,uBAAuB,EAAE,OAAO,cACvC,CAAC,SAAS,EAAE,SAAS,KAAK,OAAO,GAAG,IAAI,UACxC,OAAO,yBAAyB,EAAE,KAAK,aACvC,OAAO,sBAAsB,EAAE,OAAO,QA4LhD;;OAtPS,MAAM;OACN,MAAM;YACN,MAAM;YACN,MAAM;YACN,MAAM;;;cAUN,UAAU,CAAC,OAAO,gBAAgB,CAAC;yBACnC,UAAU,CAAC;QAAC,KAAK,EAAE,KAAK,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAC,CAAC;uBAC7C,KAAK,GAAG,SAAS;0BACjB,CAAC,GAAG,CAAC,GAAG,CAAC;;iCAVc,sBAAsB;uBAChC,wBAAwB;kBAE7B,mBAAmB"}