@genome-spy/core 0.63.0 → 0.64.0

package/dist/src/utils/interactionEvent.js

@@ -4,8 +4,10 @@
  * as in the DOM.
  */
 export default class InteractionEvent {
+    /** @type {MouseEvent} */
+    #primitiveMouseEventProxy;
+
     /**
-     *
      * @param {import("../view/layout/point.js").default} point Event coordinates
      *      inside the visualization canvas.
      * @param {UIEvent} uiEvent The event to be wrapped
@@ -27,10 +29,27 @@ export default class InteractionEvent {
         this.stopped = true;
     }
 
+    /**
+     * The event type string of the underlying UI event (e.g. "click", "keydown").
+     *
+     * This getter proxies and returns the `type` property from the internal `UIEvent` instance (`this.uiEvent`).
+     *
+     * @returns {string} The UI event type.
+     */
     get type() {
         return this.uiEvent.type;
     }
 
+    get proxiedMouseEvent() {
+        if (!this.#primitiveMouseEventProxy) {
+            this.#primitiveMouseEventProxy = createPrimitiveEventProxy(
+                this.mouseEvent
+            );
+        }
+
+        return this.#primitiveMouseEventProxy;
+    }
+
     get mouseEvent() {
         if (this.uiEvent instanceof MouseEvent) {
             return this.uiEvent;
@@ -39,3 +58,84 @@ export default class InteractionEvent {
         }
     }
 }
+
+/**
+ * Create a safe proxy for an event-like object that exposes only primitive
+ * (string, number, boolean, bigint, symbol, undefined) properties and null.
+ *
+ * @param {T} target The event-like object to wrap.
+ * @returns {T} A proxy exposing only primitive properties.
+ * @template T
+ */
+export function createPrimitiveEventProxy(target) {
+    /**
+     * @param {any} v
+     * @returns {boolean}
+     */
+    const isPrimitiveOrNull = (v) =>
+        v === null || (typeof v !== "object" && typeof v !== "function");
+
+    /** @type {ProxyHandler<any>} */
+    const handler = {
+        /**
+         * @param {any} target
+         * @param {PropertyKey} prop
+         * @param {any} receiver
+         */
+        get(target, prop, receiver) {
+            const value = Reflect.get(target, prop, target);
+            if (!isPrimitiveOrNull(value)) {
+                throw new Error(
+                    `Access to non-primitive property "${String(prop)}" is not allowed.`
+                );
+            }
+            return value;
+        },
+
+        getPrototypeOf() {
+            return null;
+        },
+
+        /**
+         * @param {any} target
+         * @returns {ArrayLike<string|symbol>}
+         */
+        ownKeys(target) {
+            const keys = Reflect.ownKeys(target).filter((k) =>
+                isPrimitiveOrNull(target[k])
+            );
+            return keys.map((k) => (typeof k === "symbol" ? k : String(k)));
+        },
+
+        /**
+         * @param {any} target
+         * @param {PropertyKey} prop
+         * @returns {PropertyDescriptor|undefined}
+         */
+        getOwnPropertyDescriptor(target, prop) {
+            const desc = Reflect.getOwnPropertyDescriptor(target, prop);
+            if (!desc) return undefined;
+            // hide accessor properties (getters/setters)
+            if ("get" in desc || "set" in desc) return undefined;
+            if (!isPrimitiveOrNull(desc.value)) return undefined;
+            // Preserve configurability/enumerability/writability to satisfy proxy invariants
+            return {
+                value: desc.value,
+                writable: !!desc.writable,
+                enumerable: !!desc.enumerable,
+                configurable: !!desc.configurable,
+            };
+        },
+
+        /**
+         * @param {any} target
+         * @param {PropertyKey} prop
+         * @returns {boolean} */
+        has(target, prop) {
+            if (!(prop in target)) return false;
+            return isPrimitiveOrNull(target[prop]);
+        },
+    };
+
+    return new Proxy(target, handler);
+}

package/dist/src/utils/interactionEvent.test.d.ts

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

package/dist/src/utils/interactionEvent.test.d.ts.map

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

package/dist/src/utils/interactionEvent.test.js

@@ -0,0 +1,35 @@
+import { describe, it, expect } from "vitest";
+import { createPrimitiveEventProxy } from "./interactionEvent.js";
+
+describe("createPrimitiveEventProxy", () => {
+    it("exposes primitive properties and hides non-primitives", () => {
+        const mock = {
+            type: "click",
+            clientX: 42,
+            meta: { foo: "bar" },
+            nested: { a: 1 },
+        };
+
+        /** @type {any} */
+        const proxy = createPrimitiveEventProxy(mock);
+
+        // allowed primitives
+        expect(proxy.type).toBe("click");
+        expect(proxy.clientX).toBe(42);
+
+        // non-primitive access throws
+        expect(() => proxy.meta).toThrow(/non-primitive/);
+
+        // keys enumeration hides non-primitives
+        const keys = Object.keys(proxy);
+        expect(keys).toContain("type");
+        expect(keys).not.toContain("meta");
+
+        // `in` operator respects the policy
+        expect("type" in proxy).toBe(true);
+        expect("meta" in proxy).toBe(false);
+
+        // prototype is hidden
+        expect(Object.getPrototypeOf(proxy)).toBeNull();
+    });
+});

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

@@ -48,7 +48,7 @@ export default class FacetView extends ContainerView {
     getAccessor(channel: "row" | "column"): any;
     updateFacets(): void;
     updateLabels(): void;
-    getFacetGroups(): any[];
+    getFacetGroups(): string[] | number[] | boolean[];
     /**
      * @param {import("./renderingContext/viewRenderingContext.js").default} context
      * @param {import("./layout/rectangle.js").default} coords

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

@@ -1 +1 @@
-{"version":3,"file":"facetView.d.ts","sourceRoot":"","sources":["../../../src/view/facetView.js"],"names":[],"mappings":"AAmDA;;;;;;;;;;;;;;GAcG;AACH;IACI;;;;;;;OAOG;IACH;;;;;;OAMG;IACH,kBALW,OAAO,gBAAgB,EAAE,SAAS,WAClC,OAAO,gBAAgB,EAAE,WAAW,UACpC,aAAa,QACb,MAAM,EA8BhB;IAzBG,UAAgB;IAEhB,WAEC;IAED;;;;OAIG;IACH,aAFU,MAAM,CAAC,YAAY,EAAE,QAAQ,CAAC,CAYvC;IAED,oDAAoD;IACpD,kBADY,MAAM,CAAC,YAAY,EAAE,cAAc,CAAC,CACa;IA2BjE,sBAIC;IAED;;;OAGG;IACH,qBAFW,KAAK,GAAG,QAAQ,OAwB1B;IAED,qBAyCC;IAED,qBASC;IA6BD,wBAgBC;IAOD;;;;OAIG;IACH,gBAJW,OAAO,4CAA4C,EAAE,OAAO,UAC5D,OAAO,uBAAuB,EAAE,OAAO,YACvC,OAAO,WAAW,EAAE,gBAAgB,QA2L9C;IA3KO,wBAA0B;CA4KrC;2BA/bY,QAAQ,GAAG,KAAK;;;;;;aA4CnB,OAAO,EAAE,GAAG,MAAM,EAAE,GAAG,MAAM,EAAE;;;0BA1Df,oBAAoB;qBACzB,eAAe"}
+{"version":3,"file":"facetView.d.ts","sourceRoot":"","sources":["../../../src/view/facetView.js"],"names":[],"mappings":"AAmDA;;;;;;;;;;;;;;GAcG;AACH;IACI;;;;;;;OAOG;IACH;;;;;;OAMG;IACH,kBALW,OAAO,gBAAgB,EAAE,SAAS,WAClC,OAAO,gBAAgB,EAAE,WAAW,UACpC,aAAa,QACb,MAAM,EA8BhB;IAzBG,UAAgB;IAEhB,WAEC;IAED;;;;OAIG;IACH,aAFU,MAAM,CAAC,YAAY,EAAE,QAAQ,CAAC,CAYvC;IAED,oDAAoD;IACpD,kBADY,MAAM,CAAC,YAAY,EAAE,cAAc,CAAC,CACa;IA2BjE,sBAIC;IAED;;;OAGG;IACH,qBAFW,KAAK,GAAG,QAAQ,OAwB1B;IAED,qBAyCC;IAED,qBASC;IA6BD,kDAgBC;IAOD;;;;OAIG;IACH,gBAJW,OAAO,4CAA4C,EAAE,OAAO,UAC5D,OAAO,uBAAuB,EAAE,OAAO,YACvC,OAAO,WAAW,EAAE,gBAAgB,QA2L9C;IA3KO,wBAA0B;CA4KrC;2BA/bY,QAAQ,GAAG,KAAK;;;;;;aA4CnB,OAAO,EAAE,GAAG,MAAM,EAAE,GAAG,MAAM,EAAE;;;0BA1Df,oBAAoB;qBACzB,eAAe"}

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

@@ -1 +1 @@
-{"version":3,"file":"unitView.d.ts","sourceRoot":"","sources":["../../../src/view/unitView.js"],"names":[],"mappings":"AA4BA;;;;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,EAiCzC;IA5BG,yCAAgB;IAIZ,iDAAiD;IACjD,MADW,OAAO,kBAAkB,EAAE,OAAO,CACnB;IAkHlC,2DAIC;IAgBD;;;;;OAKG;IAEH,iEAsHC;IAED;;;;;OAKG;IACH,4IAEC;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;iBAragB,WAAW"}
+{"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,EAiCzC;IA5BG,yCAAgB;IAIZ,iDAAiD;IACjD,MADW,OAAO,kBAAkB,EAAE,OAAO,CACnB;IA4JlC,2DAIC;IAgBD;;;;;OAKG;IAEH,iEAsHC;IAED;;;;;OAKG;IACH,4IAEC;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;iBAhdgB,WAAW"}

package/dist/src/view/unitView.js

@@ -25,6 +25,7 @@ import {
     updateMultiPointSelection,
 } from "../selection/selection.js";
 import { UNIQUE_ID_KEY } from "../data/transforms/identifier.js";
+import { createEventFilterFunction } from "../utils/expression.js";
 
 /**
  *
@@ -108,6 +109,16 @@ export default class UnitView extends View {
             }
 
             const select = asSelectionConfig(param.select);
+            // Normalized config has eventConfig in "on"
+            const eventConfig =
+                /** @type {import("../spec/parameter.js").EventConfig} */ (
+                    select.on
+                );
+
+            const clearEventConfig =
+                /** @type {import("../spec/parameter.js").EventConfig} */ (
+                    select.clear
+                );
 
             if (isPointSelectionConfig(select)) {
                 // Handle projection-free point selections
@@ -122,10 +133,17 @@ export default class UnitView extends View {
                     return h?.mark?.unitView === this ? h.datum : null;
                 };
 
+                const eventPredicate = eventConfig.filter
+                    ? createEventFilterFunction(eventConfig.filter)
+                    : () => true;
+
                 const listener = (
                     /** @type {any} */ _,
                     /** @type {import("../utils/interactionEvent.js").default} */ event
                 ) => {
+                    if (!eventPredicate(event.proxiedMouseEvent)) {
+                        return;
+                    }
                     const datum = getHoveredDatum();
                     const id = datum ? datum[UNIQUE_ID_KEY] : none;
 
@@ -164,11 +182,36 @@ export default class UnitView extends View {
                 };
 
                 this.addInteractionEventListener(
-                    ["mouseover", "pointerover"].includes(select.on)
+                    ["mouseover", "pointerover"].includes(eventConfig.type)
                         ? "mousemove"
-                        : "click",
+                        : eventConfig.type,
                     listener
                 );
+
+                if (clearEventConfig) {
+                    const clearPredicate = clearEventConfig.filter
+                        ? createEventFilterFunction(clearEventConfig.filter)
+                        : () => true;
+
+                    const clearListener = (
+                        /** @type {any} */ _,
+                        /** @type {import("../utils/interactionEvent.js").default} */ event
+                    ) => {
+                        if (!clearPredicate(event.proxiedMouseEvent)) {
+                            return;
+                        }
+                        lastId = none;
+                        const selection = select.toggle
+                            ? createMultiPointSelection()
+                            : createSinglePointSelection(null);
+                        setter(selection);
+                    };
+
+                    this.addInteractionEventListener(
+                        clearEventConfig.type,
+                        clearListener
+                    );
+                }
             }
         }
     }

package/package.json

@@ -7,7 +7,7 @@
   },
   "contributors": [],
   "license": "MIT",
-  "version": "0.63.0",
+  "version": "0.64.0",
   "jsdelivr": "dist/bundle/index.js",
   "unpkg": "dist/bundle/index.js",
   "browser": "dist/bundle/index.js",
@@ -44,12 +44,12 @@
     "@gmod/indexedfasta": "^2.1.1",
     "@gmod/tabix": "^1.6.1",
     "@gmod/vcf": "^6.0.0",
-    "@types/d3-array": "^3.2.1",
+    "@types/d3-array": "^3.2.2",
     "@types/d3-dsv": "^3.0.7",
     "@types/d3-ease": "^3.0.2",
     "@types/d3-format": "^3.0.4",
     "@types/d3-interpolate": "^3.0.4",
-    "@types/d3-scale": "^4.0.8",
+    "@types/d3-scale": "^4.0.9",
     "d3-array": "^3.2.4",
     "d3-color": "^3.1.0",
     "d3-ease": "^3.0.1",
@@ -59,13 +59,13 @@
     "internmap": "^2.0.3",
     "lit": "^3.3.0",
     "twgl.js": "^4.19.1",
-    "vega-expression": "^6.0.0",
-    "vega-loader": "^5.0.0",
-    "vega-scale": "^8.0.0",
-    "vega-util": "^2.0.0"
+    "vega-expression": "^6.1.0",
+    "vega-loader": "^5.1.0",
+    "vega-scale": "^8.1.0",
+    "vega-util": "^2.1.0"
   },
   "devDependencies": {
     "@types/long": "^4.0.1"
   },
-  "gitHead": "61b7ba62f15827e617d5e8321e532e4c3a2efd75"
+  "gitHead": "a1edb39d7a50b3a2b05c9ee0d860170065fd5ad6"
 }