@genome-spy/core 0.56.0 → 0.56.1

package/dist/src/selection/selection.d.ts

@@ -51,13 +51,13 @@ export function isMultiPointSelection(selection: import("../types/selectionTypes
  */
 export function isProjectedSelection(selection: import("../types/selectionTypes.js").Selection): selection is import("../types/selectionTypes.js").ProjectedSelection;
 /**
- * @param {any} config
- * @returns {config is import("../spec/parameter.js").PointSelectionConfig}
+ * @param {import("../spec/parameter.js").SelectionTypeOrConfig} typeOrConfig
+ * @returns {import("../spec/parameter.js").SelectionConfig}
  */
-export function isPointSelectionConfig(config: any): config is import("../spec/parameter.js").PointSelectionConfig;
+export function asSelectionConfig(typeOrConfig: import("../spec/parameter.js").SelectionTypeOrConfig): import("../spec/parameter.js").SelectionConfig;
 /**
- * @param {string | import("../spec/parameter.js").PointSelectionConfig} config
- * @returns {boolean}
+ * @param {import("../spec/parameter.js").SelectionConfig} config
+ * @returns {config is import("../spec/parameter.js").PointSelectionConfig}
  */
-export function isTogglingEnabledInPointSelectionConfig(config: string | import("../spec/parameter.js").PointSelectionConfig): boolean;
+export function isPointSelectionConfig(config: import("../spec/parameter.js").SelectionConfig): config is import("../spec/parameter.js").PointSelectionConfig;
 //# sourceMappingURL=selection.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"selection.d.ts","sourceRoot":"","sources":["../../../src/selection/selection.js"],"names":[],"mappings":"AAGA;;;GAGG;AACH,kDAHW,OAAO,qBAAqB,EAAE,KAAK,GACjC,OAAO,4BAA4B,EAAE,oBAAoB,CAQrE;AAED;;;GAGG;AACH,iDAHW,OAAO,qBAAqB,EAAE,KAAK,EAAE,GACnC,OAAO,4BAA4B,EAAE,mBAAmB,CAQpE;AAED;;;;;;;GAOG;AACH,qDAJW,OAAO,4BAA4B,EAAE,mBAAmB,2BACxD,QAAQ,OAAO,KAAK,GAAG,QAAQ,GAAG,QAAQ,EAAE,SAAS,OAAO,qBAAqB,EAAE,KAAK,CAAC,CAAC,CAAC,GACzF,OAAO,4BAA4B,EAAE,mBAAmB,CA2BpE;AAED;;;;GAIG;AACH,yCAJW,OAAO,4BAA4B,EAAE,SAAS,SAC9C,OAAO,qBAAqB,EAAE,KAAK,UACnC,OAAO,WAkBjB;AAED;;GAEG;AACH,oDAFW;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,OAAO,CAAA;CAAC,UAM1C;AAED;;;GAGG;AACH,4CAHW,OAAO,4BAA4B,EAAE,SAAS,oEAKxD;AAED;;;GAGG;AACH,kDAHW,OAAO,4BAA4B,EAAE,SAAS,0EAKxD;AAED;;;GAGG;AACH,iDAHW,OAAO,4BAA4B,EAAE,SAAS,yEAKxD;AAED;;;GAGG;AACH,gDAHW,OAAO,4BAA4B,EAAE,SAAS,wEAKxD;AAED;;;GAGG;AACH,+CAHW,GAAG,iEAUb;AAED;;;GAGG;AACH,gEAHW,MAAM,GAAG,OAAO,sBAAsB,EAAE,oBAAoB,GAC1D,OAAO,CAOnB"}
+{"version":3,"file":"selection.d.ts","sourceRoot":"","sources":["../../../src/selection/selection.js"],"names":[],"mappings":"AAGA;;;GAGG;AACH,kDAHW,OAAO,qBAAqB,EAAE,KAAK,GACjC,OAAO,4BAA4B,EAAE,oBAAoB,CAQrE;AAED;;;GAGG;AACH,iDAHW,OAAO,qBAAqB,EAAE,KAAK,EAAE,GACnC,OAAO,4BAA4B,EAAE,mBAAmB,CAQpE;AAED;;;;;;;GAOG;AACH,qDAJW,OAAO,4BAA4B,EAAE,mBAAmB,2BACxD,QAAQ,OAAO,KAAK,GAAG,QAAQ,GAAG,QAAQ,EAAE,SAAS,OAAO,qBAAqB,EAAE,KAAK,CAAC,CAAC,CAAC,GACzF,OAAO,4BAA4B,EAAE,mBAAmB,CA2BpE;AAED;;;;GAIG;AACH,yCAJW,OAAO,4BAA4B,EAAE,SAAS,SAC9C,OAAO,qBAAqB,EAAE,KAAK,UACnC,OAAO,WAkBjB;AAED;;GAEG;AACH,oDAFW;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,OAAO,CAAA;CAAC,UAM1C;AAED;;;GAGG;AACH,4CAHW,OAAO,4BAA4B,EAAE,SAAS,oEAKxD;AAED;;;GAGG;AACH,kDAHW,OAAO,4BAA4B,EAAE,SAAS,0EAKxD;AAED;;;GAGG;AACH,iDAHW,OAAO,4BAA4B,EAAE,SAAS,yEAKxD;AAED;;;GAGG;AACH,gDAHW,OAAO,4BAA4B,EAAE,SAAS,wEAKxD;AAED;;;GAGG;AACH,gDAHW,OAAO,sBAAsB,EAAE,qBAAqB,GAClD,OAAO,sBAAsB,EAAE,eAAe,CAiB1D;AAED;;;GAGG;AACH,+CAHW,OAAO,sBAAsB,EAAE,eAAe,iEAKxD"}

package/dist/src/selection/selection.js

@@ -125,25 +125,30 @@ export function isProjectedSelection(selection) {
 }
 
 /**
- * @param {any} config
- * @returns {config is import("../spec/parameter.js").PointSelectionConfig}
+ * @param {import("../spec/parameter.js").SelectionTypeOrConfig} typeOrConfig
+ * @returns {import("../spec/parameter.js").SelectionConfig}
  */
-export function isPointSelectionConfig(config) {
-    return (
-        config != null &&
-        typeof config !== "string" &&
-        "type" in config &&
-        config.type === "point"
-    );
+export function asSelectionConfig(typeOrConfig) {
+    const config =
+        typeof typeOrConfig === "string"
+            ? { type: typeOrConfig }
+            : typeOrConfig;
+
+    // Set some default
+    if (isPointSelectionConfig(config)) {
+        config.on ??= "click";
+        if (config.on === "click") {
+            config.toggle = true;
+        }
+    }
+
+    return config;
 }
 
 /**
- * @param {string | import("../spec/parameter.js").PointSelectionConfig} config
- * @returns {boolean}
+ * @param {import("../spec/parameter.js").SelectionConfig} config
+ * @returns {config is import("../spec/parameter.js").PointSelectionConfig}
  */
-export function isTogglingEnabledInPointSelectionConfig(config) {
-    if (!isPointSelectionConfig(config)) {
-        return false;
-    }
-    return config.toggle ?? config.on === "click";
+export function isPointSelectionConfig(config) {
+    return config && config.type == "point";
 }

package/dist/src/spec/parameter.d.ts

@@ -253,4 +253,7 @@ export interface SelectionParameter<T extends SelectionType = SelectionType>
         */
 }
 
+export type SelectionConfig = PointSelectionConfig | IntervalSelectionConfig;
+export type SelectionTypeOrConfig = SelectionType | SelectionConfig;
+
 export type Parameter = VariableParameter | SelectionParameter;

package/dist/src/view/paramMediator.js

@@ -1,10 +1,10 @@
 import { isString } from "vega-util";
 import createFunction from "../utils/expression.js";
 import {
+    asSelectionConfig,
     createMultiPointSelection,
     createSinglePointSelection,
     isPointSelectionConfig,
-    isTogglingEnabledInPointSelectionConfig,
 } from "../selection/selection.js";
 
 /**
@@ -105,11 +105,11 @@ export default class ParamMediator {
         }
 
         if ("select" in param) {
-            const select = param.select;
+            const select = asSelectionConfig(param.select);
             if (isPointSelectionConfig(select)) {
                 // Set initial value so that production rules in shaders can be generated, etc.
                 setter(
-                    isTogglingEnabledInPointSelectionConfig(select)
+                    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":"AA4BA;;;;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;IAoHlC,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"}
+{"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

@@ -17,13 +17,12 @@ import createDomain from "../utils/domainArray.js";
 import AxisResolution from "./axisResolution.js";
 import View from "./view.js";
 import {
+    asSelectionConfig,
     createMultiPointSelection,
     createSinglePointSelection,
     isPointSelectionConfig,
-    isTogglingEnabledInPointSelectionConfig,
     updateMultiPointSelection,
 } from "../selection/selection.js";
-import { isString } from "vega-util";
 import { UNIQUE_ID_KEY } from "../data/transforms/identifier.js";
 
 /**
@@ -107,11 +106,12 @@ export default class UnitView extends View {
                 continue;
             }
 
-            const select = param.select;
+            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);
@@ -121,55 +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,
-                        /** @type {import("../utils/interactionEvent.js").default} */ event
-                    ) => {
-                        const mouseEvent = /** @type {MouseEvent} */ (
-                            event.uiEvent
-                        );
-                        const datum = getHoveredDatum();
-                        const id = datum ? datum[UNIQUE_ID_KEY] : none;
-
-                        if (isTogglingEnabledInPointSelectionConfig(select)) {
-                            const toggle = mouseEvent.shiftKey;
-
-                            if (toggle) {
-                                if (datum) {
-                                    const previousSelection =
-                                        this.paramMediator.getValue(name);
-                                    setter(
-                                        updateMultiPointSelection(
-                                            previousSelection,
-                                            {
-                                                toggle: [datum],
-                                            }
-                                        )
-                                    );
-                                }
-                            } else {
-                                setter(
-                                    createMultiPointSelection(
-                                        datum ? [datum] : null
-                                    )
+                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 {
-                            if (id != lastId) {
-                                lastId = id;
-                                const selection =
-                                    createSinglePointSelection(datum);
-                                setter(selection);
-                            }
+                            selection = createMultiPointSelection(
+                                datum ? [datum] : null
+                            );
                         }
+                    } else {
+                        if (id != lastId) {
+                            lastId = id;
+                            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.56.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": "3b83e28aecd08d1362bb373929823dc69cf9b705"
+  "gitHead": "453d25739c7996fc60fe5fa125784c8532b40e4f"
 }