@genome-spy/core 0.55.0 → 0.56.1

package/dist/src/view/paramMediator.js

@@ -1,6 +1,11 @@
 import { isString } from "vega-util";
 import createFunction from "../utils/expression.js";
-import { createSinglePointSelection } from "../selection/selection.js";
+import {
+    asSelectionConfig,
+    createMultiPointSelection,
+    createSinglePointSelection,
+    isPointSelectionConfig,
+} from "../selection/selection.js";
 
 /**
  * A class that manages parameters and expressions.
@@ -100,13 +105,14 @@ export default class ParamMediator {
         }
 
         if ("select" in param) {
-            const type = isString(param.select)
-                ? param.select
-                : param.select.type;
-
-            // Set initial value so that production rules in shaders can be generated, etc.
-            if (type == "point") {
-                setter(createSinglePointSelection(null));
+            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)
+                );
             }
         }
 

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

@@ -1 +1 @@
-{"version":3,"file":"unitView.d.ts","sourceRoot":"","sources":["../../../src/view/unitView.js"],"names":[],"mappings":"AAsBA;;;;GAIG;AACH,wBAHU,OAAO,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;IAsFlC,2DAIC;IAED;;;;;OAKG;IAEH,iEA+FC;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;iBA/VgB,WAAW"}
+{"version":3,"file":"unitView.d.ts","sourceRoot":"","sources":["../../../src/view/unitView.js"],"names":[],"mappings":"AA2BA;;;;GAIG;AACH,wBAHU,OAAO,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;IAqHlC,2DAIC;IAED;;;;;OAKG;IAEH,iEA+FC;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;iBAnYgB,WAAW"}

package/dist/src/view/unitView.js

@@ -16,8 +16,13 @@ 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 {
+    asSelectionConfig,
+    createMultiPointSelection,
+    createSinglePointSelection,
+    isPointSelectionConfig,
+    updateMultiPointSelection,
+} from "../selection/selection.js";
 import { UNIQUE_ID_KEY } from "../data/transforms/identifier.js";
 
 /**
@@ -101,12 +106,12 @@ export default class UnitView extends View {
                 continue;
             }
 
-            const select = param.select;
-            const type = isString(select) ? select : select.type;
-            if (type === "point") {
+            const select = asSelectionConfig(param.select);
+
+            if (isPointSelectionConfig(select)) {
                 // Handle projection-free point selections
 
-                const none = -1;
+                const none = 0;
                 let lastId = none;
 
                 const setter = this.paramMediator.getSetter(name);
@@ -116,24 +121,55 @@ export default class UnitView extends View {
                     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;
+                const listener = (
+                    /** @type {any} */ _,
+                    /** @type {import("../utils/interactionEvent.js").default} */ event
+                ) => {
+                    const mouseEvent = /** @type {MouseEvent} */ (
+                        event.uiEvent
+                    );
+                    const datum = getHoveredDatum();
+                    const id = datum ? datum[UNIQUE_ID_KEY] : none;
+
+                    /** @type {any} */
+                    let selection;
+
+                    if (select.toggle) {
+                        const toggle = mouseEvent.shiftKey;
+
+                        if (toggle) {
+                            if (datum) {
+                                const previousSelection =
+                                    this.paramMediator.getValue(name);
+                                selection = updateMultiPointSelection(
+                                    previousSelection,
+                                    {
+                                        toggle: [datum],
+                                    }
+                                );
+                            }
+                        } else {
+                            selection = createMultiPointSelection(
+                                datum ? [datum] : null
+                            );
+                        }
+                    } else {
                         if (id != lastId) {
                             lastId = id;
-                            const selection = createSinglePointSelection(
-                                getHoveredDatum()
-                            );
-                            setter(selection);
+                            selection = createSinglePointSelection(datum);
                         }
                     }
+
+                    if (selection !== undefined) {
+                        setter(selection);
+                    }
+                };
+
+                this.addInteractionEventListener(
+                    ["mouseover", "pointerover"].includes(select.on)
+                        ? "mousemove"
+                        : "click",
+                    listener
                 );
             }
         }

package/package.json

@@ -7,7 +7,7 @@
   },
   "contributors": [],
   "license": "MIT",
-  "version": "0.55.0",
+  "version": "0.56.1",
   "jsdelivr": "dist/bundle/index.js",
   "unpkg": "dist/bundle/index.js",
   "browser": "dist/bundle/index.js",
@@ -67,5 +67,5 @@
   "devDependencies": {
     "@types/long": "^4.0.1"
   },
-  "gitHead": "ccbc48a52d371a5fc3a59dc63078e301bb452c6b"
+  "gitHead": "453d25739c7996fc60fe5fa125784c8532b40e4f"
 }