@genome-spy/core 0.48.2 → 0.50.0

package/dist/src/view/unitView.js

@@ -6,8 +6,6 @@ import TextMark from "../marks/text.js";
 
 import ScaleResolution from "./scaleResolution.js";
 import {
-    isSecondaryChannel,
-    secondaryChannels,
     isPositionalChannel,
     isChannelDefWithScale,
     primaryPositionalChannels,
@@ -18,17 +16,25 @@ import {
 import createDomain from "../utils/domainArray.js";
 import AxisResolution from "./axisResolution.js";
 import View from "./view.js";
+import { createSinglePointSelection } from "../selection/selection.js";
+import { isString } from "vega-util";
+import { UNIQUE_ID_KEY } from "../data/transforms/identifier.js";
 
 /**
  *
- * @type {Object.<string, typeof import("../marks/mark.js").default>}
+ * @type {Record<import("../spec/mark.js").MarkType, typeof import("../marks/mark.js").default>}
  * TODO: Find a proper place, make extendible
  */
 export const markTypes = {
+    // @ts-ignore TODO: fix
     point: PointMark,
+    // @ts-ignore
     rect: RectMark,
+    // @ts-ignore
     rule: RuleMark,
+    // @ts-ignore
     link: LinkMark,
+    // @ts-ignore
     text: TextMark,
 };
 
@@ -37,6 +43,7 @@ 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
      *
      */
 
@@ -84,6 +91,52 @@ export default class UnitView extends View {
         );
 
         this.needsAxes = { x: true, y: true };
+
+        this.#setupPointSelection();
+    }
+
+    #setupPointSelection() {
+        for (const [name, param] of this.paramMediator.paramConfigs) {
+            if (!("select" in param)) {
+                continue;
+            }
+
+            const select = param.select;
+            const type = isString(select) ? select : select.type;
+            if (type === "point") {
+                // Handle projection-free point selections
+
+                const none = -1;
+                let lastId = none;
+
+                const setter = this.paramMediator.getSetter(name);
+
+                const getHoveredDatum = () => {
+                    const h = this.context.getCurrentHover();
+                    return h?.mark?.unitView === this ? h.datum : null;
+                };
+
+                const on =
+                    !isString(select) && "on" in select ? select.on : "click";
+
+                this.addInteractionEventListener(
+                    ["mouseover", "pointerover"].includes(on)
+                        ? "mousemove"
+                        : "click",
+                    (rect, event) => {
+                        const datum = getHoveredDatum();
+                        const id = datum ? datum[UNIQUE_ID_KEY] : none;
+                        if (id != lastId) {
+                            lastId = id;
+                            const selection = createSinglePointSelection(
+                                getHoveredDatum()
+                            );
+                            setter(selection);
+                        }
+                    }
+                );
+            }
+        }
     }
 
     /**
@@ -115,6 +168,7 @@ export default class UnitView extends View {
      *
      * @param {ResolutionTarget} [type] If not specified, both scales and axes are resolved.
      */
+    // eslint-disable-next-line complexity
     resolve(type) {
         if (!type) {
             this.resolve("scale");
@@ -172,10 +226,11 @@ export default class UnitView extends View {
                         targetChannel
                     );
                 }
-                view.resolutions[type][targetChannel].pushUnitView(
-                    this,
-                    channel
-                );
+                view.resolutions[type][targetChannel].addMember({
+                    view: this,
+                    channel,
+                    channelDef,
+                });
             } else if (type == "scale" && isChannelWithScale(channel)) {
                 if (!view.resolutions[type][targetChannel]) {
                     const resolution = new ScaleResolution(targetChannel);
@@ -189,27 +244,36 @@ export default class UnitView extends View {
                         );
                     });
                 }
-                view.resolutions[type][targetChannel].pushUnitView(
-                    this,
-                    channel
-                );
+
+                const dataDomainSource =
+                    this.getLayoutAncestors()
+                        // TODO: Should check until the resolved scale resolution
+                        .some(
+                            (view) => !view.options.contributesToScaleDomain
+                        ) ||
+                    (isChannelDefWithScale(channelDef) &&
+                        channelDef.contributesToScaleDomain === false)
+                        ? undefined
+                        : this.extractDataDomain.bind(this);
+
+                view.resolutions[type][targetChannel].addMember({
+                    view: this,
+                    channel,
+                    channelDef,
+                    dataDomainSource,
+                });
             }
         }
     }
 
     /**
+     * Returns an accessor that accesses a field or an evaluated expression,
+     * if there is one.
      *
      * @param {Channel} channel
      */
-    getAccessor(channel) {
-        return this._cache("accessor/" + channel, () => {
-            const encoding = this.mark.encoding; // Mark provides encodings with defaults and possible modifications
-            if (encoding && encoding[channel]) {
-                return this.context.accessorFactory.createAccessor(
-                    encoding[channel]
-                );
-            }
-        });
+    getDataAccessor(channel) {
+        return this.mark.encoders[channel]?.dataAccessor;
     }
 
     /**
@@ -220,7 +284,7 @@ export default class UnitView extends View {
      */
     getFacetAccessor(whoIsAsking) {
         // TODO: Rewrite, call getFacetFields
-        const sampleAccessor = this.getAccessor("sample");
+        const sampleAccessor = this.getDataAccessor("sample");
         if (sampleAccessor) {
             return sampleAccessor;
         }
@@ -235,48 +299,6 @@ export default class UnitView extends View {
         return this.context.dataFlow.findCollectorByKey(this);
     }
 
-    /**
-     * @param {Channel} channel A primary channel
-     */
-    #validateDomainQuery(channel) {
-        if (isSecondaryChannel(channel)) {
-            throw new Error(
-                `getDomain(${channel}), must only be called for primary channels!`
-            );
-        }
-
-        const channelDef = this.mark.encoding[channel];
-        // TODO: Broken. Fix.
-        if (!isChannelDefWithScale(channelDef)) {
-            throw new Error("The channel has no scale, cannot get domain!");
-        }
-
-        return channelDef;
-    }
-
-    /**
-     * Returns the domain of the specified channel of this domain/mark.
-     *
-     * @param {import("../spec/channel.js").ChannelWithScale} channel A primary channel
-     * @returns {DomainArray}
-     */
-    getConfiguredDomain(channel) {
-        const channelDef = this.#validateDomainQuery(channel);
-
-        const specDomain =
-            channelDef && channelDef.scale && channelDef.scale.domain;
-        if (specDomain) {
-            const scaleResolution = this.getScaleResolution(
-                channelDef.resolutionChannel ?? channel
-            );
-            return createDomain(
-                channelDef.type ?? "nominal",
-                // Chrom/pos must be linearized first
-                scaleResolution.fromComplexInterval(specDomain)
-            );
-        }
-    }
-
     /**
      * Extracts the domain from the data.
      *
@@ -288,49 +310,25 @@ export default class UnitView extends View {
      * (with aggregate and extent).
      *
      * @param {Channel} channel
+     * @param {import("../spec/channel.js").Type} type
      * @returns {DomainArray}
      */
-    extractDataDomain(channel) {
-        const channelDef = this.#validateDomainQuery(channel);
-        const type = channelDef.type ?? "nominal"; // TODO: Should check that this is a channel without scale
-
-        /** @param {Channel} channel */
-        const extract = (channel) => {
-            /** @type {DomainArray} */
-            let domain;
-
-            const encodingSpec = this.mark.encoding[channel];
-
-            if (encodingSpec) {
-                const accessor =
-                    this.context.accessorFactory.createAccessor(encodingSpec);
-                if (accessor) {
-                    domain = createDomain(type);
-
-                    if (accessor.constant) {
-                        domain.extend(accessor({}));
-                    } else {
-                        const collector = this.getCollector();
-                        if (collector?.completed) {
-                            collector.visitData((d) =>
-                                domain.extend(accessor(d))
-                            );
-                        }
+    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)));
                     }
                 }
-            }
-            return domain;
-        };
-
-        let domain = extract(channel);
-
-        const secondaryChannel = secondaryChannels[channel];
-        if (secondaryChannel) {
-            const secondaryDomain = extract(secondaryChannel);
-            if (secondaryDomain) {
-                domain.extendAll(secondaryDomain);
-            }
-        }
+            });
 
         return domain;
     }

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

@@ -205,7 +205,7 @@ export default class View {
      * pass. The order is depth first, pre order.
      */
     onBeforeRender(): void;
-    render(context: ViewRenderingContext, coords: import("./layout/rectangle.js").default, options?: import("../types/rendering.js").RenderingOptions): void;
+    render(context: import("./renderingContext/viewRenderingContext.js").default, coords: import("./layout/rectangle.js").default, options?: import("../types/rendering.js").RenderingOptions): void;
     /**
      * Returns the encodings specified in this view combined with the inherited
      * encodings. However, this does not contain any defaults or inferred/adjusted/fixed

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

@@ -1 +1 @@
-{"version":3,"file":"view.d.ts","sourceRoot":"","sources":["../../../src/view/view.js"],"names":[],"mappings":"AA0BA,oBAAoB;AACpB,sCAAuC;AACvC,0BAA0B;AAC1B,sCAAuC;AAKvC;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH;IAuBI;;;;;;;;;OASG;IACH,kBARW,OAAO,iBAAiB,EAAE,QAAQ,WAClC,OAAO,yBAAyB,EAAE,OAAO,gBACzC,OAAO,oBAAoB,EAAE,OAAO,cACpC,OAAO,WAAW,EAAE,OAAO,QAC3B,MAAM,YACN,WAAW,EAmDrB;IAvED;;OAEG;IACH,wBAFmB,MAAM,KAAE,MAAM,CAEQ;IAEzC;;;;;OAKG;IACH,aAFU,IAAI,GAAG,EAAE,OAAO,uBAAuB,EAAE,OAAO,CAAC,CAEX;IAiB5C,mDAAsB;IACtB,mDAAgC;IAChC,iBAA4B;IAC5B,aAA6B;IAC7B,yCAAgB;IAEhB;QACI;;;WAGG;eADO,QAAQ,OAAO,OAAO,oBAAoB,EAAE,gBAAgB,EAAE,OAAO,sBAAsB,EAAE,OAAO,CAAC,CAAC;QAGhH;;;WAGG;cADO,QAAQ,OAAO,OAAO,oBAAoB,EAAE,wBAAwB,EAAE,OAAO,qBAAqB,EAAE,OAAO,CAAC,CAAC;MAG1H;IAID;;;;kCAhEE,OAAO;;;;kCAEP,OAAO;MAkER;IAED;;;OAGG;IACH,WAFU,OAAO,OAAO,oBAAoB,EAAE,wBAAwB,EAAE,OAAO,CAAC,CAEzC;IAEvC,4BAA4B;IAC5B,eADW,aAAa,CAGvB;IASL;;;;;OAKG;IACH,sDAEC;IAED,sBAIC;IAED;;;;OAIG;IACH,eAFa,OAAO,CAInB;IAED;;;;;OAKG;IACH,gBAFa,OAAO,CAMnB;IAED;;;;;OAKG;IACH,WAFa,cAAc,CAW1B;IAED;;OAEG;IACH,mBAFa,cAAc,CAkB1B;IAoED,+BAEC;IAED,2BAEC;IAED;;;;;;;;OAQG;IACH,aAFa,OAAO,CAMnB;IAED;;;;;;;OAOG;IACH,uBAFa,MAAM,CAMlB;IAED,wBAKC;IAkBD;;OAEG;IACH,6BAEC;IAED;;OAEG;IACH,2BAEC;IAED;;;;OAIG;IACH,yBAFW,gBAAgB,QAO1B;IAED;;;;OAIG;IACH,2BAHW,MAAM,kBACG,gBAAgB,KAAE,IAAI,QASzC;IAED;;;;;;;;OAQG;IACH,yCANW,OAAO,uBAAuB,EAAE,OAAO,SAEvC,OAAO,8BAA8B,EAAE,OAAO,aAC9C,OAAO,QAUjB;IAED;;;;;;;;;;OAUG;IACH,kCAJW,MAAM,YACN,wBAAwB,eACxB,OAAO,QAajB;IAED;;;;;;;OAOG;IACH,eAJW,OAAO,GACL,WAAW,CAmBvB;IAED;;OAEG;IACH,yBAOC;IAED;;OAEG;IACH,6BASC;IAED;;;OAGG;IACH,uBAEC;IAzbM,yJAG+C;IA4ctD;;;;;;OAMG;IACH,eAFY,OAAO,oBAAoB,EAAE,QAAQ,CAuBhD;IAED;;;;OAIG;IACH,+BAJW,IAAI,UAEM,MAAM,KAAE,GAAG,CAM/B;IAED;;;;;OAKG;IACH,6BAHW,IAAI,GACF,MAAM,EAAE,CASpB;IAED;;;;;;;;;;;;;;;OAeG;IACH,yBAFY,YAAY,CAIvB;IAED;;OAEG;IACH,4BAFW,OAAO,oBAAoB,EAAE,gBAAgB,0CAWvD;IAED;;OAEG;IACH,2BAFW,OAAO,oBAAoB,EAAE,iBAAiB,yCAWxD;IAED;;;;OAIG;IACH,iCAJW,OAAO,oBAAoB,EAAE,OAAO,GAAG,SAAS,kBAChD,OAAO,iBAAiB,EAAE,gBAAgB,GACxC,OAAO,iBAAiB,EAAE,kBAAkB,CAIxD;IAED;;;;OAIG;IACH,0CAJW,OAAO,oBAAoB,EAAE,OAAO,kBACpC,OAAO,iBAAiB,EAAE,gBAAgB,GACxC,OAAO,iBAAiB,EAAE,kBAAkB,CAQxD;IAED;;;;OAIG;IACH,8BAJW,OAAO,oBAAoB,EAAE,OAAO,kBACpC,OAAO,iBAAiB,EAAE,gBAAgB,GACxC,OAAO,iBAAiB,EAAE,kBAAkB,CAIxD;IAED;;OAEG;IACH,cAFa,MAAM,CAOlB;IAED;;OAEG;IACH,8BAEC;IAED,oBASC;IAED;;;;;;OAMG;IACH,yBANW,GAAG,wCAQb;IAED;;;;OAIG;IACH,8BAHW,MAAM,cACN,MAAM,GAAG,SAAS,GAAG,WAAW,QAiB1C;IAED,4BAEC;IAED;;;;;OAKG;IACH,iCAFW,OAAO,8BAA8B,EAAE,OAAO,QAIxD;;CACJ;AAoEM,iCAHI,GAAG,0CAGkC;0BA9uBnC,8BAAsB,IAAI;qCAG5B,IAAI,KACF,WAAW;sBAEX,eAAe,GAAG;IAC9B,SAAgB,CAAC,SAAW,IAAI,KAAE,IAAI,CAAC;IACvC,cAAqB,CAAC,SAAW,IAAI,KAAE,IAAI,CAAC;IAC5C,aAAoB,CAAC,SAAW,IAAI,KAAE,IAAI,CAAA;CAAC;;;;;UAIlC,OAAO,iBAAiB,EAAE,kBAAkB;;;;cAC5C,GAAG;;gDAGF,OAAO,uBAAuB,EAAE,OAAO,SAEvC,OAAO,8BAA8B,EAAE,OAAO;;;;;+BAG/C,OAAO;;;;+BAEP,OAAO;;0BAzCwB,oBAAoB;oBAbzC,qBAAqB;+BADlC,wBAAwB"}
+{"version":3,"file":"view.d.ts","sourceRoot":"","sources":["../../../src/view/view.js"],"names":[],"mappings":"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"}

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

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=view.test.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"view.test.d.ts","sourceRoot":"","sources":["../../../src/view/view.test.js"],"names":[],"mappings":""}

package/dist/src/view/view.test.js

@@ -10,6 +10,7 @@ import LayerView from "./layerView.js";
 
 describe("Trivial creations and initializations", () => {
     test("Fails on empty spec", async () => {
+        // @ts-expect-error
         expect(create({}, View)).rejects.toThrow();
     });
 
@@ -23,7 +24,7 @@ describe("Trivial creations and initializations", () => {
     test("Parses a more comples spec", async () => {
         const view = await create(
             {
-                concat: [
+                hconcat: [
                     {
                         layer: [{ mark: "point" }, { mark: "rect" }],
                     },
@@ -35,26 +36,28 @@ describe("Trivial creations and initializations", () => {
 
         expect(view).toBeInstanceOf(ConcatView);
         expect(view.children[0]).toBeInstanceOf(LayerView);
+        // @ts-ignore
         expect(view.children[0].children[0]).toBeInstanceOf(UnitView);
+        // @ts-ignore
         expect(view.children[0].children[0].mark).toBeInstanceOf(PointMark);
         expect(view.children[1]).toBeInstanceOf(UnitView);
         expect(view.children[2]).toBeUndefined();
     });
 
-    test("Parses and initializes a trivial spec", async () => {
-        const spec = {
-            data: { values: [1] },
-            mark: "point",
-            encoding: {
-                x: { field: "data", type: "quantitative" },
-                y: { field: "data", type: "quantitative" },
-            },
-        };
-
-        expect(createAndInitialize(spec, View)).resolves.toBeInstanceOf(
-            UnitView
-        );
-    });
+    test("Parses and initializes a trivial spec", () =>
+        expect(
+            createAndInitialize(
+                {
+                    data: { values: [1] },
+                    mark: "point",
+                    encoding: {
+                        x: { field: "data", type: "quantitative" },
+                        y: { field: "data", type: "quantitative" },
+                    },
+                },
+                View
+            )
+        ).resolves.toBeInstanceOf(UnitView));
 });
 
 describe("Test domain handling", () => {
@@ -66,6 +69,7 @@ describe("Test domain handling", () => {
         ],
     };
 
+    /** -- This should be moved to ScaleResolution's test
     test("Uses domain from the scale properties", () => {
         const spec = {
             data: dataSpec,
@@ -84,52 +88,65 @@ describe("Test domain handling", () => {
             expect(r(view.getConfiguredDomain("y"))).toEqual([0, 1000])
         );
     });
+    */
 
-    test("Includes a constant in the data domain", () => {
-        const spec = {
-            data: dataSpec,
-            mark: "point",
-            encoding: {
-                x: { datum: 123, type: "quantitative" },
-                y: { field: "a", type: "quantitative" },
+    test("Includes a constant in the data domain", () =>
+        createAndInitialize(
+            {
+                data: dataSpec,
+                mark: "point",
+                encoding: {
+                    x: { datum: 123, type: "quantitative" },
+                    y: { field: "a", type: "quantitative" },
+                },
             },
-        };
-
-        return createAndInitialize(spec, UnitView).then((view) =>
-            expect(r(view.extractDataDomain("x"))).toEqual([123, 123])
-        );
-    });
+            UnitView
+        ).then((view) =>
+            expect(r(view.extractDataDomain("x", "quantitative"))).toEqual([
+                123, 123,
+            ])
+        ));
 
-    test("Extracts domain from the data", () => {
-        const spec = {
-            data: dataSpec,
-            mark: "point",
-            encoding: {
-                x: { field: "a", type: "quantitative" },
-                y: { field: "a", type: "quantitative" },
+    test("Extracts domain from the data", () =>
+        createAndInitialize(
+            {
+                data: dataSpec,
+                mark: "point",
+                encoding: {
+                    x: { field: "a", type: "quantitative" },
+                    y: { field: "a", type: "quantitative" },
+                },
             },
-        };
-
-        return createAndInitialize(spec, UnitView).then((view) =>
-            expect(r(view.extractDataDomain("y"))).toEqual([1, 3])
-        );
-    });
+            UnitView
+        ).then((view) =>
+            expect(r(view.extractDataDomain("y", "quantitative"))).toEqual([
+                1, 3,
+            ])
+        ));
 
-    test("Extracts domain from the data when a secondary channel is being used", () => {
-        const spec = {
-            data: dataSpec,
-            mark: "rect",
-            encoding: {
-                x: { field: "a", type: "quantitative" },
-                y: { field: "a", type: "quantitative" },
-                y2: { field: "b", type: "quantitative" },
+    test("Extracts domain from conditional encoding", () =>
+        createAndInitialize(
+            {
+                params: [{ name: "p" }],
+                data: dataSpec,
+                mark: "point",
+                encoding: {
+                    size: {
+                        field: "a",
+                        type: "quantitative",
+                        condition: {
+                            param: "p",
+                            datum: 123,
+                        },
+                    },
+                },
             },
-        };
-
-        return createAndInitialize(spec, UnitView).then((view) =>
-            expect(r(view.extractDataDomain("y"))).toEqual([1, 5])
-        );
-    });
+            UnitView
+        ).then((view) =>
+            expect(r(view.extractDataDomain("size", "quantitative"))).toEqual([
+                1, 123,
+            ])
+        ));
 });
 
 describe("Utility methods", () => {
@@ -207,6 +224,7 @@ describe("Utility methods", () => {
             },
             LayerView
         ).then((view) =>
+            // @ts-ignore
             expect(view.children[0].children[0].getBaseUrl()).toEqual(
                 "https://site.com/blaa"
             )

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

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=viewFactory.test.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"viewFactory.test.d.ts","sourceRoot":"","sources":["../../../src/view/viewFactory.test.js"],"names":[],"mappings":""}

package/dist/src/view/viewFactory.test.js

@@ -11,7 +11,7 @@ test("isViewSpec", () => {
     expect(factory.isViewSpec({ layer: [] })).toBeTruthy();
     expect(factory.isViewSpec({ hconcat: [] })).toBeTruthy();
     expect(factory.isViewSpec({ vconcat: [] })).toBeTruthy();
-    expect(factory.isViewSpec({ concat: [] })).toBeTruthy();
+    expect(factory.isViewSpec({ concat: [], columns: 1 })).toBeTruthy();
 
     expect(() => factory.isViewSpec({ mark: "rect", layer: [] })).toThrow();
 });
@@ -20,6 +20,6 @@ test("Throws if importing is not allowed", () => {
     const factory = new ViewFactory({ allowImport: false });
 
     expect(() =>
-        factory.createOrImportView({ import: { url: "" } })
+        factory.createOrImportView({ import: { url: "" } }, undefined)
     ).rejects.toThrow();
 });

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

@@ -14,7 +14,7 @@ export function isFacetMapping(def: import("../spec/channel.js").FacetFieldDef |
  * Returns all marks in the order (DFS) they are rendered
  * @param {View} root
  */
-export function getMarks(root: View): import("../marks/mark.js").default[];
+export function getMarks(root: View): import("../marks/mark.js").default<import("../spec/mark.js").MarkProps>[];
 /**
  * Returns the nodes of the view hierarchy in depth-first order.
  *

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

@@ -1 +1 @@
-{"version":3,"file":"viewUtils.d.ts","sourceRoot":"","sources":["../../../src/view/viewUtils.js"],"names":[],"mappings":"AAWA;;;;GAIG;AACH,qCAHW,OAAO,oBAAoB,EAAE,UAAU,GAAG,OAAO,iBAAiB,EAAE,YAAY,yBAK1F;AAED;;;;GAIG;AACH,oCAHW,OAAO,oBAAoB,EAAE,aAAa,GAAG,OAAO,iBAAiB,EAAE,YAAY,wBAQ7F;AAED;;;GAGG;AACH,+BAFW,IAAI,wCAMd;AAED;;;;GAIG;AACH,wCAFW,IAAI,UASd;AAED;;GAEG;AACH,kDAFW,IAAI,QAiBd;AAED;;;;;;;GAOG;AACH,4CAFW,IAAI,QAUd;AAED;;;;GAIG;AACH,qCAJW,IAAI,iBACJ,OAAO,qBAAqB,EAAE,OAAO,CAAC,IAAI,CAAC,wDAcrD;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,QAAQ,OAAO,iBAAiB,EAAE,QAAQ,CAAC,CA6BvD;AAED;;GAEG;AACH,gDAFoB,IAAI,QAAE,IAAI,EAAE,KAAE,IAAI,+BAkBrC;AAED;;;;;;GAMG;AACH,4CAJW,IAAI,QACJ,MAAM,GACJ,IAAI,EAAE,CAalB;AAED;;;GAGG;AACH,0CAFW,IAAI,eAqBd;AAOD;;GAEG;AACH,gDAFW,IAAI,mDAId;AAED;;GAEG;AACH,kDAFW,OAAO,wBAAwB,EAAE,cAAc;;;EAczD;AAxBM,uCAFI,MAAM,WAE0D;iBA/O9B,WAAW;qBAFnC,eAAe"}
+{"version":3,"file":"viewUtils.d.ts","sourceRoot":"","sources":["../../../src/view/viewUtils.js"],"names":[],"mappings":"AAWA;;;;GAIG;AACH,qCAHW,OAAO,oBAAoB,EAAE,UAAU,GAAG,OAAO,iBAAiB,EAAE,YAAY,yBAK1F;AAED;;;;GAIG;AACH,oCAHW,OAAO,oBAAoB,EAAE,aAAa,GAAG,OAAO,iBAAiB,EAAE,YAAY,wBAQ7F;AAED;;;GAGG;AACH,+BAFW,IAAI,6EAMd;AAED;;;;GAIG;AACH,wCAFW,IAAI,UASd;AAED;;GAEG;AACH,kDAFW,IAAI,QAiBd;AAED;;;;;;;GAOG;AACH,4CAFW,IAAI,QAUd;AAED;;;;GAIG;AACH,qCAJW,IAAI,iBACJ,OAAO,qBAAqB,EAAE,OAAO,CAAC,IAAI,CAAC,wDAcrD;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,QAAQ,OAAO,iBAAiB,EAAE,QAAQ,CAAC,CA6BvD;AAED;;GAEG;AACH,gDAFoB,IAAI,QAAE,IAAI,EAAE,KAAE,IAAI,+BAkBrC;AAED;;;;;;GAMG;AACH,4CAJW,IAAI,QACJ,MAAM,GACJ,IAAI,EAAE,CAalB;AAED;;;GAGG;AACH,0CAFW,IAAI,eAqBd;AAOD;;GAEG;AACH,gDAFW,IAAI,mDAId;AAED;;GAEG;AACH,kDAFW,OAAO,wBAAwB,EAAE,cAAc;;;EAczD;AAxBM,uCAFI,MAAM,WAE0D;iBA/O9B,WAAW;qBAFnC,eAAe"}

package/dist/src/view/zoom.js

@@ -71,10 +71,10 @@ export function interactionToZoom(event, coords, handleZoom, hover, animator) {
 
         if (hover) {
             const e = hover.mark.encoders;
-            if (e.x && !e.x2 && !e.x.constantValue) {
+            if (e.x && !e.x2 && !e.x.constant) {
                 x = +e.x(hover.datum) * coords.width + coords.x;
             }
-            if (e.y && !e.y2 && !e.y.constantValue) {
+            if (e.y && !e.y2 && !e.y.constant) {
                 y = (1 - +e.y(hover.datum)) * coords.height + coords.y;
             }
         }

package/package.json

@@ -7,7 +7,7 @@
   },
   "contributors": [],
   "license": "MIT",
-  "version": "0.48.2",
+  "version": "0.50.0",
   "jsdelivr": "dist/bundle/index.js",
   "unpkg": "dist/bundle/index.js",
   "browser": "dist/bundle/index.js",
@@ -64,5 +64,8 @@
     "vega-scale": "^7.3.1",
     "vega-util": "^1.17.2"
   },
-  "gitHead": "f2817f82263b92e453356083f2d770b8b236f77a"
+  "devDependencies": {
+    "@types/long": "^4.0.1"
+  },
+  "gitHead": "39de1ffdcfdaefe9f34a4d6e092378ccffd267c9"
 }