@vitessce/scatterplot 3.0.1 → 3.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (15) hide show
  1. package/dist/{deflate-162fa772.js → deflate-9421b4b7.js} +1 -1
  2. package/dist/{index-578beee3.js → index-e6103460.js} +873 -1142
  3. package/dist/index.js +1 -1
  4. package/dist/{jpeg-00fef901.js → jpeg-d5a25f84.js} +1 -1
  5. package/dist/{lerc-55d38607.js → lerc-16194edf.js} +1 -1
  6. package/dist/{lzw-c3bdd9f6.js → lzw-083aa612.js} +1 -1
  7. package/dist/{packbits-c1c71d64.js → packbits-014bd601.js} +1 -1
  8. package/dist/{raw-e1c8b3d7.js → raw-d6fe67be.js} +1 -1
  9. package/dist/{webimage-c7fc297e.js → webimage-f11362e1.js} +1 -1
  10. package/dist-tsc/ScatterplotTooltipSubscriber.js +1 -1
  11. package/dist-tsc/shared-spatial-scatterplot/AbstractSpatialOrScatterplot.d.ts.map +1 -1
  12. package/dist-tsc/shared-spatial-scatterplot/AbstractSpatialOrScatterplot.js +17 -2
  13. package/package.json +7 -7
  14. package/src/ScatterplotTooltipSubscriber.js +1 -1
  15. package/src/shared-spatial-scatterplot/AbstractSpatialOrScatterplot.js +16 -1
package/dist/index.js CHANGED
@@ -1,4 +1,4 @@
1
- import { A, E, S, a, b, f, e, d, c } from "./index-578beee3.js";
1
+ import { A, E, S, a, b, f, e, d, c } from "./index-e6103460.js";
2
2
  import "react";
3
3
  import "@vitessce/vit-s";
4
4
  import "react-dom";
package/dist/{jpeg-00fef901.js → jpeg-d5a25f84.js} RENAMED
@@ -1,4 +1,4 @@
1
- import { B as BaseDecoder } from "./index-578beee3.js";
1
+ import { B as BaseDecoder } from "./index-e6103460.js";
2
2
  import "react";
3
3
  import "@vitessce/vit-s";
4
4
  import "react-dom";
package/dist/{lerc-55d38607.js → lerc-16194edf.js} RENAMED
@@ -1,5 +1,5 @@
1
1
  import { i as inflate_1 } from "./pako.esm-68f84e2a.js";
2
- import { g as getDefaultExportFromCjs, B as BaseDecoder } from "./index-578beee3.js";
2
+ import { g as getDefaultExportFromCjs, B as BaseDecoder } from "./index-e6103460.js";
3
3
  import "react";
4
4
  import "@vitessce/vit-s";
5
5
  import "react-dom";
package/dist/{lzw-c3bdd9f6.js → lzw-083aa612.js} RENAMED
@@ -1,4 +1,4 @@
1
- import { B as BaseDecoder } from "./index-578beee3.js";
1
+ import { B as BaseDecoder } from "./index-e6103460.js";
2
2
  import "react";
3
3
  import "@vitessce/vit-s";
4
4
  import "react-dom";
package/dist/{packbits-c1c71d64.js → packbits-014bd601.js} RENAMED
@@ -1,4 +1,4 @@
1
- import { B as BaseDecoder } from "./index-578beee3.js";
1
+ import { B as BaseDecoder } from "./index-e6103460.js";
2
2
  import "react";
3
3
  import "@vitessce/vit-s";
4
4
  import "react-dom";
package/dist/{raw-e1c8b3d7.js → raw-d6fe67be.js} RENAMED
@@ -1,4 +1,4 @@
1
- import { B as BaseDecoder } from "./index-578beee3.js";
1
+ import { B as BaseDecoder } from "./index-e6103460.js";
2
2
  import "react";
3
3
  import "@vitessce/vit-s";
4
4
  import "react-dom";
package/dist/{webimage-c7fc297e.js → webimage-f11362e1.js} RENAMED
@@ -1,4 +1,4 @@
1
- import { B as BaseDecoder } from "./index-578beee3.js";
1
+ import { B as BaseDecoder } from "./index-e6103460.js";
2
2
  import "react";
3
3
  import "@vitessce/vit-s";
4
4
  import "react-dom";
package/dist-tsc/ScatterplotTooltipSubscriber.js CHANGED
@@ -8,7 +8,7 @@ export default function ScatterplotTooltipSubscriber(props) {
8
8
  const viewInfo = useComponentViewInfo(parentUuid);
9
9
  const [cellInfo, x, y] = (obsHighlight && getObsInfo ? ([
10
10
  getObsInfo(obsHighlight),
11
- ...(viewInfo && viewInfo.project ? viewInfo.project(obsHighlight) : [null, null]),
11
+ ...(viewInfo && viewInfo.projectFromId ? viewInfo.projectFromId(obsHighlight) : [null, null]),
12
12
  ]) : ([null, null, null]));
13
13
  return ((cellInfo ? (_jsx(Tooltip2D, { x: x, y: y, parentUuid: parentUuid, sourceUuid: sourceUuid, parentWidth: width, parentHeight: height, children: _jsx(TooltipContent, { info: cellInfo }) })) : null));
14
14
  }
package/dist-tsc/shared-spatial-scatterplot/AbstractSpatialOrScatterplot.d.ts.map CHANGED
@@ -1 +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,qCAkEC;IAuCD;;MAEE;IAEF,iBAAa;IAzHb;;;;;OAKG;IAEH,aALa,MAAM,EAAE,CAOpB;IAuED;;;;;OAKG;IACH,iFAqBC;IAED;;OAEG;IAEH,2BAEC;IAQD;;;OAGG;IAEH,SAHa,OAAO,CAKnB;IAED;;;OAGG;IACH,sBA2DC;CACF"}
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"}
package/dist-tsc/shared-spatial-scatterplot/AbstractSpatialOrScatterplot.js CHANGED
@@ -85,7 +85,7 @@ export default class AbstractSpatialOrScatterplot extends PureComponent {
85
85
  // eslint-disable-next-line consistent-return
86
86
  onHover(info) {
87
87
  const { coordinate, sourceLayer: layer, tile, } = info;
88
- const { setCellHighlight, cellHighlight, setComponentHover, layers, } = this.props;
88
+ const { setCellHighlight, cellHighlight, setComponentHover, layers, setHoverInfo, } = this.props;
89
89
  const hasBitmask = (layers || []).some(l => l.type === 'bitmask');
90
90
  if (!setCellHighlight || !tile) {
91
91
  return null;
@@ -94,6 +94,9 @@ export default class AbstractSpatialOrScatterplot extends PureComponent {
94
94
  if (cellHighlight && hasBitmask) {
95
95
  setCellHighlight(null);
96
96
  }
97
+ if (setHoverInfo) {
98
+ setHoverInfo(null, null);
99
+ }
97
100
  return null;
98
101
  }
99
102
  const { content, bbox, index: { z }, } = tile;
@@ -101,6 +104,9 @@ export default class AbstractSpatialOrScatterplot extends PureComponent {
101
104
  if (cellHighlight && hasBitmask) {
102
105
  setCellHighlight(null);
103
106
  }
107
+ if (setHoverInfo) {
108
+ setHoverInfo(null, null);
109
+ }
104
110
  return null;
105
111
  }
106
112
  const { data, width, height } = content;
@@ -135,6 +141,14 @@ export default class AbstractSpatialOrScatterplot extends PureComponent {
135
141
  // eslint-disable-next-line no-unused-expressions
136
142
  setCellHighlight(cellId ? String(cellId) : null);
137
143
  }
144
+ if (setHoverInfo) {
145
+ if (cellId) {
146
+ setHoverInfo(hoverData, coordinate);
147
+ }
148
+ else {
149
+ setHoverInfo(null, null);
150
+ }
151
+ }
138
152
  }
139
153
  }
140
154
  /**
@@ -149,7 +163,8 @@ export default class AbstractSpatialOrScatterplot extends PureComponent {
149
163
  if (updateViewInfo && viewport) {
150
164
  updateViewInfo({
151
165
  uuid,
152
- project: (obsId) => {
166
+ project: viewport.project,
167
+ projectFromId: (obsId) => {
153
168
  try {
154
169
  if (obsIndex && obsLocations) {
155
170
  const getObsCoords = makeGetObsCoords(obsLocations);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@vitessce/scatterplot",
3
- "version": "3.0.1",
3
+ "version": "3.1.0",
4
4
  "author": "Gehlenborg Lab",
5
5
  "homepage": "http://vitessce.io",
6
6
  "repository": {
@@ -22,12 +22,12 @@
22
22
  "d3-force": "^2.1.1",
23
23
  "d3-quadtree": "^1.0.7",
24
24
  "lodash-es": "^4.17.21",
25
- "@vitessce/constants-internal": "3.0.1",
26
- "@vitessce/icons": "3.0.1",
27
- "@vitessce/tooltip": "3.0.1",
28
- "@vitessce/utils": "3.0.1",
29
- "@vitessce/vit-s": "3.0.1",
30
- "@vitessce/gl": "3.0.1"
25
+ "@vitessce/constants-internal": "3.1.0",
26
+ "@vitessce/gl": "3.1.0",
27
+ "@vitessce/icons": "3.1.0",
28
+ "@vitessce/tooltip": "3.1.0",
29
+ "@vitessce/utils": "3.1.0",
30
+ "@vitessce/vit-s": "3.1.0"
31
31
  },
32
32
  "devDependencies": {
33
33
  "@testing-library/jest-dom": "^5.16.4",
package/src/ScatterplotTooltipSubscriber.js CHANGED
@@ -17,7 +17,7 @@ export default function ScatterplotTooltipSubscriber(props) {
17
17
  const [cellInfo, x, y] = (obsHighlight && getObsInfo ? (
18
18
  [
19
19
  getObsInfo(obsHighlight),
20
- ...(viewInfo && viewInfo.project ? viewInfo.project(obsHighlight) : [null, null]),
20
+ ...(viewInfo && viewInfo.projectFromId ? viewInfo.projectFromId(obsHighlight) : [null, null]),
21
21
  ]
22
22
  ) : ([null, null, null]));
23
23
 
package/src/shared-spatial-scatterplot/AbstractSpatialOrScatterplot.js CHANGED
@@ -99,6 +99,7 @@ export default class AbstractSpatialOrScatterplot extends PureComponent {
99
99
  } = info;
100
100
  const {
101
101
  setCellHighlight, cellHighlight, setComponentHover, layers,
102
+ setHoverInfo,
102
103
  } = this.props;
103
104
  const hasBitmask = (layers || []).some(l => l.type === 'bitmask');
104
105
  if (!setCellHighlight || !tile) {
@@ -108,6 +109,9 @@ export default class AbstractSpatialOrScatterplot extends PureComponent {
108
109
  if (cellHighlight && hasBitmask) {
109
110
  setCellHighlight(null);
110
111
  }
112
+ if (setHoverInfo) {
113
+ setHoverInfo(null, null);
114
+ }
111
115
  return null;
112
116
  }
113
117
  const {
@@ -119,6 +123,9 @@ export default class AbstractSpatialOrScatterplot extends PureComponent {
119
123
  if (cellHighlight && hasBitmask) {
120
124
  setCellHighlight(null);
121
125
  }
126
+ if (setHoverInfo) {
127
+ setHoverInfo(null, null);
128
+ }
122
129
  return null;
123
130
  }
124
131
  const { data, width, height } = content;
@@ -158,6 +165,13 @@ export default class AbstractSpatialOrScatterplot extends PureComponent {
158
165
  // eslint-disable-next-line no-unused-expressions
159
166
  setCellHighlight(cellId ? String(cellId) : null);
160
167
  }
168
+ if (setHoverInfo) {
169
+ if (cellId) {
170
+ setHoverInfo(hoverData, coordinate);
171
+ } else {
172
+ setHoverInfo(null, null);
173
+ }
174
+ }
161
175
  }
162
176
  }
163
177
 
@@ -173,7 +187,8 @@ export default class AbstractSpatialOrScatterplot extends PureComponent {
173
187
  if (updateViewInfo && viewport) {
174
188
  updateViewInfo({
175
189
  uuid,
176
- project: (obsId) => {
190
+ project: viewport.project,
191
+ projectFromId: (obsId) => {
177
192
  try {
178
193
  if (obsIndex && obsLocations) {
179
194
  const getObsCoords = makeGetObsCoords(obsLocations);