@vitessce/scatterplot 3.1.3 → 3.2.0

package/dist/index.js

@@ -1,4 +1,4 @@
-import { A, E, S, a, b, f, e, d, c } from "./index-8a1f373a.js";
+import { A, E, S, a, b, f, e, d, c } from "./index-2c270a1e.js";
 import "react";
 import "@vitessce/vit-s";
 import "react-dom";

package/dist/{jpeg-09198c7a.js → jpeg-46e4967f.js}

@@ -1,4 +1,4 @@
-import { B as BaseDecoder } from "./index-8a1f373a.js";
+import { B as BaseDecoder } from "./index-2c270a1e.js";
 import "react";
 import "@vitessce/vit-s";
 import "react-dom";

package/dist/{lerc-a1ea16ed.js → lerc-f7e82495.js}

@@ -1,5 +1,5 @@
 import { i as inflate_1 } from "./pako.esm-68f84e2a.js";
-import { g as getDefaultExportFromCjs, B as BaseDecoder } from "./index-8a1f373a.js";
+import { g as getDefaultExportFromCjs, B as BaseDecoder } from "./index-2c270a1e.js";
 import "react";
 import "@vitessce/vit-s";
 import "react-dom";

package/dist/{lzw-6ec4deb9.js → lzw-91120d0e.js}

@@ -1,4 +1,4 @@
-import { B as BaseDecoder } from "./index-8a1f373a.js";
+import { B as BaseDecoder } from "./index-2c270a1e.js";
 import "react";
 import "@vitessce/vit-s";
 import "react-dom";

package/dist/{packbits-26db2d36.js → packbits-ad7c6a7a.js}

@@ -1,4 +1,4 @@
-import { B as BaseDecoder } from "./index-8a1f373a.js";
+import { B as BaseDecoder } from "./index-2c270a1e.js";
 import "react";
 import "@vitessce/vit-s";
 import "react-dom";

package/dist/{raw-2ee0835f.js → raw-b9a1aa09.js}

@@ -1,4 +1,4 @@
-import { B as BaseDecoder } from "./index-8a1f373a.js";
+import { B as BaseDecoder } from "./index-2c270a1e.js";
 import "react";
 import "@vitessce/vit-s";
 import "react-dom";

package/dist/{webimage-2075fc27.js → webimage-0722f414.js}

@@ -1,4 +1,4 @@
-import { B as BaseDecoder } from "./index-8a1f373a.js";
+import { B as BaseDecoder } from "./index-2c270a1e.js";
 import "react";
 import "@vitessce/vit-s";
 import "react-dom";

package/dist-tsc/Scatterplot.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Scatterplot.d.ts","sourceRoot":"","sources":["../src/Scatterplot.js"],"names":[],"mappings":";AA6XA;;;;;;GAMG;AACH,sCAKG"}
+{"version":3,"file":"Scatterplot.d.ts","sourceRoot":"","sources":["../src/Scatterplot.js"],"names":[],"mappings":";AAmYA;;;;;;GAMG;AACH,sCAKG"}

package/dist-tsc/Scatterplot.js

@@ -2,7 +2,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
 /* eslint-disable no-param-reassign */
 import React, { forwardRef } from 'react';
 import { forceSimulation } from 'd3-force';
-import { deck, getSelectionLayers, ScaledExpressionExtension, SelectionExtension, } from '@vitessce/gl';
+import { deck, getSelectionLayer, ScaledExpressionExtension, SelectionExtension, } from '@vitessce/gl';
 import { getDefaultColor } from '@vitessce/utils';
 import { AbstractSpatialOrScatterplot, createQuadTree, forceCollideRects, getOnHoverCallback, } from './shared-spatial-scatterplot/index.js';
 const CELLS_LAYER_ID = 'scatterplot';
@@ -182,20 +182,29 @@ class Scatterplot extends AbstractSpatialOrScatterplot {
         }
         return result;
     }
-    createSelectionLayers() {
+    createSelectionLayer() {
         const { obsEmbeddingIndex: obsIndex, obsEmbedding, viewState, setCellSelection, } = this.props;
         const { tool } = this.state;
         const { cellsQuadTree } = this;
         const flipYTooltip = true;
         const getCellCoords = makeDefaultGetObsCoords(obsEmbedding);
-        return getSelectionLayers(tool, viewState.zoom, CELLS_LAYER_ID, getCellCoords, obsIndex, setCellSelection, cellsQuadTree, flipYTooltip);
+        return getSelectionLayer(tool, viewState.zoom, CELLS_LAYER_ID, [
+            {
+                getObsCoords: getCellCoords,
+                obsIndex,
+                obsQuadTree: cellsQuadTree,
+                onSelect: (obsIds) => {
+                    setCellSelection(obsIds);
+                },
+            },
+        ], flipYTooltip);
     }
     getLayers() {
         const { cellsLayer, cellSetsLayers, } = this;
         return [
             cellsLayer,
             ...cellSetsLayers,
-            ...this.createSelectionLayers(),
+            this.createSelectionLayer(),
         ];
     }
     onUpdateCellsData() {

package/dist-tsc/shared-spatial-scatterplot/AbstractSpatialOrScatterplot.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AbstractSpatialOrScatterplot.d.ts","sourceRoot":"","sources":["../../src/shared-spatial-scatterplot/AbstractSpatialOrScatterplot.js"],"names":[],"mappings":"AAKA;;;;;GAKG;AACH;IACE,wBAeC;IAZC;;;MAGC;IAED,wBAAoB;IAStB;;;;;;;OAOG;IACH;QAF0B,SAAS,EAAxB,MAAM;aAYhB;IAED;;;;;OAKG;IACH;QAF6B,QAAQ,EAA1B,MAAM;aAIhB;IAED;;;;;OAKG;IACH,uBAFW,MAAM,QAIhB;IAED;;;;;OAKG;IACH,mBAFW,MAAM,QAQhB;IAcD,qCAgFC;IAwCD;;MAEE;IAEF,iBAAa;IAxIb;;;;;OAKG;IAEH,aALa,MAAM,EAAE,CAOpB;IAqFD;;;;;OAKG;IACH,iFAsBC;IAED;;OAEG;IAEH,2BAEC;IAQD;;;OAGG;IAEH,SAHa,OAAO,CAKnB;IAED;;;OAGG;IACH,sBA2DC;CACF"}
+{"version":3,"file":"AbstractSpatialOrScatterplot.d.ts","sourceRoot":"","sources":["../../src/shared-spatial-scatterplot/AbstractSpatialOrScatterplot.js"],"names":[],"mappings":"AAKA;;;;;GAKG;AACH;IACE,wBAeC;IAZC;;;MAGC;IAED,wBAAoB;IAStB;;;;;;;OAOG;IACH;QAF0B,SAAS,EAAxB,MAAM;aAYhB;IAED;;;;;OAKG;IACH;QAF6B,QAAQ,EAA1B,MAAM;aAIhB;IAED;;;;;OAKG;IACH,uBAFW,MAAM,QAIhB;IAED;;;;;OAKG;IACH,mBAFW,MAAM,QAQhB;IAgBD,qCAgFC;IAwCD;;MAEE;IAEF,iBAAa;IA1Ib;;;;;OAKG;IAEH,aALa,MAAM,EAAE,CAOpB;IAuFD;;;;;OAKG;IACH,iFAsBC;IAED;;OAEG;IAEH,2BAEC;IAQD;;;OAGG;IAEH,SAHa,OAAO,CAKnB;IAED;;;OAGG;IACH,sBA2DC;CACF"}

package/dist-tsc/shared-spatial-scatterplot/AbstractSpatialOrScatterplot.js

@@ -33,8 +33,8 @@ export default class AbstractSpatialOrScatterplot extends PureComponent {
      * @param {object} params.viewState The next deck.gl viewState.
      */
     onViewStateChange({ viewState: nextViewState }) {
-        const { setViewState, viewState, layers, spatialAxisFixed, } = this.props;
-        const use3d = layers?.some(l => l.use3d);
+        const { setViewState, viewState, spatialAxisFixed, } = this.props;
+        const use3d = this.use3d();
         setViewState({
             ...nextViewState,
             // If the axis is fixed, just use the current target in state i.e don't change target.
@@ -82,6 +82,8 @@ export default class AbstractSpatialOrScatterplot extends PureComponent {
     getLayers() {
         return [];
     }
+    // TODO: remove this method and use the layer-level onHover instead.
+    // (e.g., see delegateHover in spatial-beta/SpatialSubscriber.js).
     // eslint-disable-next-line consistent-return
     onHover(info) {
         const { coordinate, sourceLayer: layer, tile, } = info;
@@ -205,7 +207,7 @@ export default class AbstractSpatialOrScatterplot extends PureComponent {
      * and Scatterplot components.
      */
     render() {
-        const { deckRef, viewState, uuid, hideTools, } = this.props;
+        const { deckRef, viewState, uuid, hideTools, orbitAxis, } = this.props;
         const { gl, tool } = this.state;
         const layers = this.getLayers();
         const use3d = this.use3d();
@@ -222,7 +224,7 @@ export default class AbstractSpatialOrScatterplot extends PureComponent {
                         selectLasso: showCellSelectionTools && !hideTools,
                     }, recenterOnClick: this.recenter }), _jsx(deck.DeckGL, { id: `deckgl-overlay-${uuid}`, ref: deckRef, views: [
                         use3d
-                            ? new deck.OrbitView({ id: 'orbit', controller: true, orbitAxis: 'Y' })
+                            ? new deck.OrbitView({ id: 'orbit', controller: true, orbitAxis })
                             : new deck.OrthographicView({
                                 id: 'ortho',
                             }),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitessce/scatterplot",
-  "version": "3.1.3",
+  "version": "3.2.0",
   "author": "Gehlenborg Lab",
   "homepage": "http://vitessce.io",
   "repository": {
@@ -22,12 +22,12 @@
     "d3-force": "^2.1.1",
     "d3-quadtree": "^1.0.7",
     "lodash-es": "^4.17.21",
-    "@vitessce/constants-internal": "3.1.3",
-    "@vitessce/gl": "3.1.3",
-    "@vitessce/icons": "3.1.3",
-    "@vitessce/tooltip": "3.1.3",
-    "@vitessce/utils": "3.1.3",
-    "@vitessce/vit-s": "3.1.3"
+    "@vitessce/constants-internal": "3.2.0",
+    "@vitessce/gl": "3.2.0",
+    "@vitessce/icons": "3.2.0",
+    "@vitessce/tooltip": "3.2.0",
+    "@vitessce/utils": "3.2.0",
+    "@vitessce/vit-s": "3.2.0"
   },
   "devDependencies": {
     "@testing-library/jest-dom": "^5.16.4",

package/src/Scatterplot.js

@@ -2,7 +2,7 @@
 import React, { forwardRef } from 'react';
 import { forceSimulation } from 'd3-force';
 import {
-  deck, getSelectionLayers, ScaledExpressionExtension, SelectionExtension,
+  deck, getSelectionLayer, ScaledExpressionExtension, SelectionExtension,
 } from '@vitessce/gl';
 import { getDefaultColor } from '@vitessce/utils';
 import {
@@ -222,7 +222,7 @@ class Scatterplot extends AbstractSpatialOrScatterplot {
     return result;
   }
 
-  createSelectionLayers() {
+  createSelectionLayer() {
     const {
       obsEmbeddingIndex: obsIndex,
       obsEmbedding,
@@ -233,14 +233,20 @@ class Scatterplot extends AbstractSpatialOrScatterplot {
     const { cellsQuadTree } = this;
     const flipYTooltip = true;
     const getCellCoords = makeDefaultGetObsCoords(obsEmbedding);
-    return getSelectionLayers(
+    return getSelectionLayer(
       tool,
       viewState.zoom,
       CELLS_LAYER_ID,
-      getCellCoords,
-      obsIndex,
-      setCellSelection,
-      cellsQuadTree,
+      [
+        {
+          getObsCoords: getCellCoords,
+          obsIndex,
+          obsQuadTree: cellsQuadTree,
+          onSelect: (obsIds) => {
+            setCellSelection(obsIds);
+          },
+        },
+      ],
       flipYTooltip,
     );
   }
@@ -253,7 +259,7 @@ class Scatterplot extends AbstractSpatialOrScatterplot {
     return [
       cellsLayer,
       ...cellSetsLayers,
-      ...this.createSelectionLayers(),
+      this.createSelectionLayer(),
     ];
   }
 

package/src/shared-spatial-scatterplot/AbstractSpatialOrScatterplot.js

@@ -37,9 +37,9 @@ export default class AbstractSpatialOrScatterplot extends PureComponent {
    */
   onViewStateChange({ viewState: nextViewState }) {
     const {
-      setViewState, viewState, layers, spatialAxisFixed,
+      setViewState, viewState, spatialAxisFixed,
     } = this.props;
-    const use3d = layers?.some(l => l.use3d);
+    const use3d = this.use3d();
     setViewState({
       ...nextViewState,
       // If the axis is fixed, just use the current target in state i.e don't change target.
@@ -92,6 +92,8 @@ export default class AbstractSpatialOrScatterplot extends PureComponent {
     return [];
   }
 
+  // TODO: remove this method and use the layer-level onHover instead.
+  // (e.g., see delegateHover in spatial-beta/SpatialSubscriber.js).
   // eslint-disable-next-line consistent-return
   onHover(info) {
     const {
@@ -234,7 +236,7 @@ export default class AbstractSpatialOrScatterplot extends PureComponent {
    */
   render() {
     const {
-      deckRef, viewState, uuid, hideTools,
+      deckRef, viewState, uuid, hideTools, orbitAxis,
     } = this.props;
     const { gl, tool } = this.state;
     const layers = this.getLayers();
@@ -268,7 +270,7 @@ export default class AbstractSpatialOrScatterplot extends PureComponent {
           ref={deckRef}
           views={[
             use3d
-              ? new deck.OrbitView({ id: 'orbit', controller: true, orbitAxis: 'Y' })
+              ? new deck.OrbitView({ id: 'orbit', controller: true, orbitAxis })
               : new deck.OrthographicView({
                 id: 'ortho',
               }),