@vitessce/scatterplot-embedding 4.1.0 → 4.1.1

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.
@@ -1,5 +1,5 @@
1
1
  import { i as inflate_1 } from "./pako.esm-SxljTded.js";
2
- import { B as BaseDecoder } from "./index-BPLMRXHR.js";
2
+ import { B as BaseDecoder } from "./index-DT4WpL6f.js";
3
3
  class DeflateDecoder extends BaseDecoder {
4
4
  decodeBlock(buffer) {
5
5
  return inflate_1(new Uint8Array(buffer)).buffer;
@@ -9874,6 +9874,7 @@ const CoordinationType$1 = {
9874
9874
  PIXEL_HIGHLIGHT: "pixelHighlight",
9875
9875
  // Per-image-layer
9876
9876
  TOOLTIP_CROSSHAIRS_VISIBLE: "tooltipCrosshairsVisible",
9877
+ TOOLTIP_OBS_SETS_MODE: "tooltipObsSetsMode",
9877
9878
  LEGEND_VISIBLE: "legendVisible",
9878
9879
  SPATIAL_CHANNEL_LABELS_VISIBLE: "spatialChannelLabelsVisible",
9879
9880
  SPATIAL_CHANNEL_LABELS_ORIENTATION: "spatialChannelLabelsOrientation",
@@ -10205,6 +10206,7 @@ const COMPONENT_COORDINATION_TYPES = {
10205
10206
  CoordinationType$1.SPATIAL_ORBIT_AXIS,
10206
10207
  CoordinationType$1.SPATIAL_ZOOM,
10207
10208
  CoordinationType$1.SPATIAL_CAMERA_SNAPSHOT,
10209
+ CoordinationType$1.SPATIAL_RENDERING_MODE,
10208
10210
  CoordinationType$1.OBS_FILTER,
10209
10211
  CoordinationType$1.OBS_HIGHLIGHT,
10210
10212
  CoordinationType$1.OBS_SET_SELECTION,
@@ -10272,6 +10274,7 @@ const COMPONENT_COORDINATION_TYPES = {
10272
10274
  CoordinationType$1.OBS_COLOR_ENCODING,
10273
10275
  CoordinationType$1.ADDITIONAL_OBS_SETS,
10274
10276
  CoordinationType$1.TOOLTIPS_VISIBLE,
10277
+ CoordinationType$1.TOOLTIP_OBS_SETS_MODE,
10275
10278
  CoordinationType$1.SAMPLE_TYPE,
10276
10279
  CoordinationType$1.SAMPLE_SET_SELECTION,
10277
10280
  CoordinationType$1.SAMPLE_SET_FILTER,
@@ -10323,6 +10326,7 @@ const COMPONENT_COORDINATION_TYPES = {
10323
10326
  CoordinationType$1.OBS_COLOR_ENCODING,
10324
10327
  CoordinationType$1.ADDITIONAL_OBS_SETS,
10325
10328
  CoordinationType$1.TOOLTIPS_VISIBLE,
10329
+ CoordinationType$1.TOOLTIP_OBS_SETS_MODE,
10326
10330
  CoordinationType$1.SAMPLE_TYPE,
10327
10331
  CoordinationType$1.SAMPLE_SET_SELECTION,
10328
10332
  CoordinationType$1.SAMPLE_SET_FILTER,
@@ -10404,6 +10408,7 @@ const COMPONENT_COORDINATION_TYPES = {
10404
10408
  CoordinationType$1.ADDITIONAL_OBS_SETS,
10405
10409
  CoordinationType$1.MOLECULE_HIGHLIGHT,
10406
10410
  CoordinationType$1.TOOLTIPS_VISIBLE,
10411
+ CoordinationType$1.TOOLTIP_OBS_SETS_MODE,
10407
10412
  CoordinationType$1.PHOTOMETRIC_INTERPRETATION,
10408
10413
  CoordinationType$1.ANNOTATION_STORY,
10409
10414
  CoordinationType$1.ANNOTATION_SHAPES,
@@ -10453,6 +10458,7 @@ const COMPONENT_COORDINATION_TYPES = {
10453
10458
  CoordinationType$1.ADDITIONAL_OBS_SETS,
10454
10459
  CoordinationType$1.MOLECULE_HIGHLIGHT,
10455
10460
  CoordinationType$1.TOOLTIPS_VISIBLE,
10461
+ CoordinationType$1.TOOLTIP_OBS_SETS_MODE,
10456
10462
  CoordinationType$1.FILE_UID,
10457
10463
  CoordinationType$1.SPATIAL_TARGET_C,
10458
10464
  CoordinationType$1.SPATIAL_LAYER_VISIBLE,
@@ -10536,7 +10542,8 @@ const COMPONENT_COORDINATION_TYPES = {
10536
10542
  CoordinationType$1.FEATURE_VALUE_COLORMAP_RANGE,
10537
10543
  CoordinationType$1.OBS_COLOR_ENCODING,
10538
10544
  CoordinationType$1.ADDITIONAL_OBS_SETS,
10539
- CoordinationType$1.TOOLTIPS_VISIBLE
10545
+ CoordinationType$1.TOOLTIPS_VISIBLE,
10546
+ CoordinationType$1.TOOLTIP_OBS_SETS_MODE
10540
10547
  ],
10541
10548
  [ViewType$1.OBS_SETS]: [
10542
10549
  CoordinationType$1.DATASET,
@@ -116577,22 +116584,22 @@ function addDecoder(cases, importFn) {
116577
116584
  }
116578
116585
  cases.forEach((c2) => registry$1.set(c2, importFn));
116579
116586
  }
116580
- addDecoder([void 0, 1], () => import("./raw-D55mTiBU.js").then((m2) => m2.default));
116581
- addDecoder(5, () => import("./lzw-DFI2LUrc.js").then((m2) => m2.default));
116587
+ addDecoder([void 0, 1], () => import("./raw-D7eQMEmN.js").then((m2) => m2.default));
116588
+ addDecoder(5, () => import("./lzw-CTz-2vus.js").then((m2) => m2.default));
116582
116589
  addDecoder(6, () => {
116583
116590
  throw new Error("old style JPEG compression is not supported.");
116584
116591
  });
116585
- addDecoder(7, () => import("./jpeg-BozBiXDf.js").then((m2) => m2.default));
116586
- addDecoder([8, 32946], () => import("./deflate-rRUHMvv4.js").then((m2) => m2.default));
116587
- addDecoder(32773, () => import("./packbits-CHsbj-XL.js").then((m2) => m2.default));
116592
+ addDecoder(7, () => import("./jpeg-BhxJy6Ji.js").then((m2) => m2.default));
116593
+ addDecoder([8, 32946], () => import("./deflate-C-lrlL8q.js").then((m2) => m2.default));
116594
+ addDecoder(32773, () => import("./packbits-Da4S_mTv.js").then((m2) => m2.default));
116588
116595
  addDecoder(
116589
116596
  34887,
116590
- () => import("./lerc-DcLEOuuO.js").then(async (m2) => {
116597
+ () => import("./lerc-BTOEb3Od.js").then(async (m2) => {
116591
116598
  await m2.zstd.init();
116592
116599
  return m2;
116593
116600
  }).then((m2) => m2.default)
116594
116601
  );
116595
- addDecoder(50001, () => import("./webimage-mVfjCoPU.js").then((m2) => m2.default));
116602
+ addDecoder(50001, () => import("./webimage-DPam-3kr.js").then((m2) => m2.default));
116596
116603
  function decodeRowAcc(row, stride) {
116597
116604
  let length2 = row.length - stride;
116598
116605
  let offset2 = 0;
@@ -150209,6 +150216,7 @@ class AbstractSpatialOrScatterplot extends PureComponent {
150209
150216
  };
150210
150217
  this.lastApplied = null;
150211
150218
  this.transitionEndViewState = null;
150219
+ this.finishedTransitionEndViewState = null;
150212
150220
  this.viewport = null;
150213
150221
  this.threeCamera = null;
150214
150222
  this.orbitControls = null;
@@ -150285,6 +150293,7 @@ class AbstractSpatialOrScatterplot extends PureComponent {
150285
150293
  * Called by DeckGL when a viewState transition ends.
150286
150294
  */
150287
150295
  onTransitionEnd() {
150296
+ this.finishedTransitionEndViewState = this.transitionEndViewState;
150288
150297
  this.transitionEndViewState = null;
150289
150298
  this.setState({ transitionViewState: null });
150290
150299
  }
@@ -150295,6 +150304,7 @@ class AbstractSpatialOrScatterplot extends PureComponent {
150295
150304
  * Instead, the stale transitionViewState is ignored by getDeckViewState.
150296
150305
  */
150297
150306
  onTransitionInterrupt() {
150307
+ this.finishedTransitionEndViewState = this.transitionEndViewState;
150298
150308
  this.transitionEndViewState = null;
150299
150309
  }
150300
150310
  /**
@@ -150307,6 +150317,13 @@ class AbstractSpatialOrScatterplot extends PureComponent {
150307
150317
  if (transitionViewState && transitionViewState.endViewState === this.transitionEndViewState && isSameZoomAndTarget(viewState, this.transitionEndViewState)) {
150308
150318
  return transitionViewState.viewState;
150309
150319
  }
150320
+ if (!isSameZoomAndTarget(viewState, this.finishedTransitionEndViewState)) {
150321
+ this.finishedTransitionEndViewState = null;
150322
+ }
150323
+ if (this.finishedTransitionEndViewState) {
150324
+ const { transitionDuration, transitionInterpolator, ...viewStateWithoutTransition } = viewState;
150325
+ return viewStateWithoutTransition;
150326
+ }
150310
150327
  if (viewState.transitionDuration) {
150311
150328
  return {
150312
150329
  ...viewState,
@@ -150463,7 +150480,8 @@ class AbstractSpatialOrScatterplot extends PureComponent {
150463
150480
  const canvas = deckRef?.current?.deck?.canvas;
150464
150481
  if (!canvas || !spatialCameraSnapshot)
150465
150482
  return;
150466
- const camera = new PerspectiveCamera(spatialCameraSnapshot.fovDegrees, 1, 0.1, 1e5);
150483
+ const { fovDegrees, projectionScale } = spatialCameraSnapshot;
150484
+ const camera = new PerspectiveCamera(fovDegrees, 1, Math.max(projectionScale * 1e-4, 1e-3), Math.max(projectionScale * 100, 1e5));
150467
150485
  camera.updateProjectionMatrix();
150468
150486
  const eventTarget = canvas.parentElement ?? canvas;
150469
150487
  const controls = new OrbitControls(camera, eventTarget);
@@ -150618,8 +150636,8 @@ class AbstractSpatialOrScatterplot extends PureComponent {
150618
150636
  viewState: {
150619
150637
  viewMatrix: rawViewMatrix,
150620
150638
  fovy: fovDegrees,
150621
- near: 0.1,
150622
- far: 1e5
150639
+ near: Math.max(projectionScale * 1e-4, 1e-3),
150640
+ far: Math.max(projectionScale * 100, 1e5)
150623
150641
  }
150624
150642
  });
150625
150643
  } else if (use3d) {
@@ -154070,7 +154088,10 @@ makeStyles()(() => ({
154070
154088
  bottom: "0px",
154071
154089
  left: "0px",
154072
154090
  paddingLeft: "10px",
154073
- paddingBottom: "10px"
154091
+ paddingBottom: "10px",
154092
+ // Keep long channel names within the view so they can be truncated.
154093
+ maxWidth: "90%",
154094
+ boxSizing: "border-box"
154074
154095
  },
154075
154096
  channelNamesLegendLayer: {
154076
154097
  display: "flex"
@@ -154090,6 +154111,7 @@ const DEFAULT_FEATURE_AGGREGATION_STRATEGY = "first";
154090
154111
  function EmbeddingScatterplotSubscriber(props) {
154091
154112
  const {
154092
154113
  uuid,
154114
+ viewUid: viewUidFromProps,
154093
154115
  closeButtonVisible,
154094
154116
  downloadButtonVisible,
154095
154117
  removeGridComponent,
@@ -154106,16 +154128,17 @@ function EmbeddingScatterplotSubscriber(props) {
154106
154128
  // Passed down from the ancestor <Vitessce/> or <VitS/> component.
154107
154129
  areAnnotationsEditable
154108
154130
  } = props;
154131
+ const viewUid = viewUidFromProps ?? uuid;
154109
154132
  const loaders = useLoaders();
154110
154133
  const [
154111
154134
  // eslint-disable-next-line no-unused-vars
154112
154135
  coordinationScopes,
154113
154136
  _coordinationScopesBy,
154114
154137
  coordinationValues
154115
- ] = useViewMapping(uuid);
154138
+ ] = useViewMapping(viewUid);
154116
154139
  const setComponentHover = useSetComponentHover();
154117
154140
  const setComponentViewInfo = useSetComponentViewInfo(uuid);
154118
- useAnnotationFrameCoordination(uuid, coordinationScopes, coordinationValues);
154141
+ useAnnotationFrameCoordination(viewUid, coordinationScopes, coordinationValues);
154119
154142
  const [{
154120
154143
  dataset,
154121
154144
  obsType,
@@ -154144,6 +154167,7 @@ function EmbeddingScatterplotSubscriber(props) {
154144
154167
  featureValueColormap: geneExpressionColormap,
154145
154168
  featureValueColormapRange: geneExpressionColormapRange,
154146
154169
  tooltipsVisible,
154170
+ tooltipObsSetsMode,
154147
154171
  sampleSetSelection: sampleSetSelectionFromCoordination,
154148
154172
  sampleSetColor,
154149
154173
  embeddingPointsVisible,
@@ -154192,10 +154216,10 @@ function EmbeddingScatterplotSubscriber(props) {
154192
154216
  COMPONENT_COORDINATION_TYPES[ViewType$1.SCATTERPLOT],
154193
154217
  coordinationScopes,
154194
154218
  coordinationValues,
154195
- uuid
154219
+ viewUid
154196
154220
  );
154197
154221
  const annotationEditingProps = useAnnotationEditingForView(
154198
- uuid,
154222
+ viewUid,
154199
154223
  Boolean(areAnnotationsEditable && annotationEditable && typeof annotationFrameIndex === "number")
154200
154224
  );
154201
154225
  const {
@@ -154507,7 +154531,9 @@ function EmbeddingScatterplotSubscriber(props) {
154507
154531
  observationsLabel,
154508
154532
  obsLabelsTypes,
154509
154533
  obsLabelsData,
154510
- obsSetsMembership
154534
+ obsSetsMembership,
154535
+ cellSetSelection,
154536
+ tooltipObsSetsMode
154511
154537
  );
154512
154538
  const allCellsSelected = !(deferredCellSetSelection && mergedCellSets);
154513
154539
  const getCellIsSelected = useCallback((object2, { index: index2 }) => allCellsSelected || obsColorIndices.colorIndices[index2] !== 0 ? 1 : 0, [allCellsSelected, obsColorIndices]);
@@ -154625,7 +154651,7 @@ function EmbeddingScatterplotSubscriber(props) {
154625
154651
  const annotationFrameCoordinationValues = getAnnotationFrameCoordinationValues(
154626
154652
  annotationStory,
154627
154653
  annotationFrameIndex,
154628
- uuid
154654
+ viewUid
154629
154655
  );
154630
154656
  const annotationTransitionProps = useAnnotationFrameTransition(
154631
154657
  { zoom, targetX, targetY },
@@ -154808,6 +154834,7 @@ function DualEmbeddingScatterplotSubscriber(props) {
154808
154834
  {
154809
154835
  ...props,
154810
154836
  uuid: `${uuid}-case`,
154837
+ viewUid: uuid,
154811
154838
  title: isCaseCtrl ? `Scatterplot (${embeddingType}), ${caseSampleSetSelection?.[0]?.at(-1)}` : null,
154812
154839
  sampleSetSelection: caseSampleSetSelection
154813
154840
  }
@@ -154816,6 +154843,7 @@ function DualEmbeddingScatterplotSubscriber(props) {
154816
154843
  {
154817
154844
  ...props,
154818
154845
  uuid: `${uuid}-ctrl`,
154846
+ viewUid: uuid,
154819
154847
  title: `Scatterplot (${embeddingType}), ${ctrlSampleSetSelection?.[0]?.at(-1)}`,
154820
154848
  sampleSetSelection: ctrlSampleSetSelection
154821
154849
  }
package/dist/index.js CHANGED
@@ -1,4 +1,4 @@
1
- import { D, E } from "./index-BPLMRXHR.js";
1
+ import { D, E } from "./index-DT4WpL6f.js";
2
2
  export {
3
3
  D as DualEmbeddingScatterplotSubscriber,
4
4
  E as EmbeddingScatterplotSubscriber
@@ -1,4 +1,4 @@
1
- import { B as BaseDecoder } from "./index-BPLMRXHR.js";
1
+ import { B as BaseDecoder } from "./index-DT4WpL6f.js";
2
2
  const dctZigZag = new Int32Array([
3
3
  0,
4
4
  1,
@@ -1,5 +1,5 @@
1
1
  import { i as inflate_1 } from "./pako.esm-SxljTded.js";
2
- import { g as getDefaultExportFromCjs, B as BaseDecoder } from "./index-BPLMRXHR.js";
2
+ import { g as getDefaultExportFromCjs, B as BaseDecoder } from "./index-DT4WpL6f.js";
3
3
  const LercParameters = {
4
4
  AddCompression: 1
5
5
  };
@@ -1,4 +1,4 @@
1
- import { B as BaseDecoder } from "./index-BPLMRXHR.js";
1
+ import { B as BaseDecoder } from "./index-DT4WpL6f.js";
2
2
  const MIN_BITS = 9;
3
3
  const CLEAR_CODE = 256;
4
4
  const EOI_CODE = 257;
@@ -1,4 +1,4 @@
1
- import { B as BaseDecoder } from "./index-BPLMRXHR.js";
1
+ import { B as BaseDecoder } from "./index-DT4WpL6f.js";
2
2
  class PackbitsDecoder extends BaseDecoder {
3
3
  decodeBlock(buffer) {
4
4
  const dataView = new DataView(buffer);
@@ -1,4 +1,4 @@
1
- import { B as BaseDecoder } from "./index-BPLMRXHR.js";
1
+ import { B as BaseDecoder } from "./index-DT4WpL6f.js";
2
2
  class RawDecoder extends BaseDecoder {
3
3
  decodeBlock(buffer) {
4
4
  return buffer;
@@ -1,4 +1,4 @@
1
- import { B as BaseDecoder } from "./index-BPLMRXHR.js";
1
+ import { B as BaseDecoder } from "./index-DT4WpL6f.js";
2
2
  class WebImageDecoder extends BaseDecoder {
3
3
  constructor() {
4
4
  super();
@@ -1 +1 @@
1
- {"version":3,"file":"DualEmbeddingScatterplotSubscriber.d.ts","sourceRoot":"","sources":["../src/DualEmbeddingScatterplotSubscriber.js"],"names":[],"mappings":"AASA;;;;;;;;;;;;;;;GAeG;AACH,0DAVG;IAAsB,IAAI,EAAlB,MAAM;IACQ,KAAK,EAAnB,MAAM;IACQ,kBAAkB,EAAhC,MAAM;IAEU,mBAAmB;IAErB,KAAK,EAAnB,MAAM;IACQ,kBAAkB,EAAhC,MAAM;CAEhB,OAqDA"}
1
+ {"version":3,"file":"DualEmbeddingScatterplotSubscriber.d.ts","sourceRoot":"","sources":["../src/DualEmbeddingScatterplotSubscriber.js"],"names":[],"mappings":"AASA;;;;;;;;;;;;;;;GAeG;AACH,0DAVG;IAAsB,IAAI,EAAlB,MAAM;IACQ,KAAK,EAAnB,MAAM;IACQ,kBAAkB,EAAhC,MAAM;IAEU,mBAAmB;IAErB,KAAK,EAAnB,MAAM;IACQ,kBAAkB,EAAhC,MAAM;CAEhB,OAuDA"}
@@ -31,8 +31,8 @@ export function DualEmbeddingScatterplotSubscriber(props) {
31
31
  const ctrlSampleSetSelection = useMemo(() => (sampleSetSelection?.[1]
32
32
  ? [sampleSetSelection[1]]
33
33
  : null), [sampleSetSelection]);
34
- return (_jsxs("div", { style: { width: '100%', height: '100%', display: 'flex', flexDirection: 'row' }, children: [_jsx("div", { style: { width: isCaseCtrl ? '50%' : '100%', display: 'flex', flexDirection: 'column' }, children: _jsx(EmbeddingScatterplotSubscriber, { ...props, uuid: `${uuid}-case`, title: (isCaseCtrl
34
+ return (_jsxs("div", { style: { width: '100%', height: '100%', display: 'flex', flexDirection: 'row' }, children: [_jsx("div", { style: { width: isCaseCtrl ? '50%' : '100%', display: 'flex', flexDirection: 'column' }, children: _jsx(EmbeddingScatterplotSubscriber, { ...props, uuid: `${uuid}-case`, viewUid: uuid, title: (isCaseCtrl
35
35
  ? `Scatterplot (${embeddingType}), ${caseSampleSetSelection?.[0]?.at(-1)}`
36
- : null), sampleSetSelection: caseSampleSetSelection }) }), isCaseCtrl ? (_jsx("div", { style: { width: '50%', display: 'flex', flexDirection: 'column' }, children: _jsx(EmbeddingScatterplotSubscriber, { ...props, uuid: `${uuid}-ctrl`, title: `Scatterplot (${embeddingType}), ${ctrlSampleSetSelection?.[0]?.at(-1)}`, sampleSetSelection: ctrlSampleSetSelection }) })) : null] }));
36
+ : null), sampleSetSelection: caseSampleSetSelection }) }), isCaseCtrl ? (_jsx("div", { style: { width: '50%', display: 'flex', flexDirection: 'column' }, children: _jsx(EmbeddingScatterplotSubscriber, { ...props, uuid: `${uuid}-ctrl`, viewUid: uuid, title: `Scatterplot (${embeddingType}), ${ctrlSampleSetSelection?.[0]?.at(-1)}`, sampleSetSelection: ctrlSampleSetSelection }) })) : null] }));
37
37
  }
38
38
  //# sourceMappingURL=DualEmbeddingScatterplotSubscriber.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"DualEmbeddingScatterplotSubscriber.js","sourceRoot":"","sources":["../src/DualEmbeddingScatterplotSubscriber.js"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AACvC,OAAO,EACL,eAAe,EACf,qBAAqB,GACtB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,QAAQ,EAAE,4BAA4B,EAAE,MAAM,8BAA8B,CAAC;AACtF,OAAO,EAAE,8BAA8B,EAAE,MAAM,qCAAqC,CAAC;AAGrF;;;;;;;;;;;;;;;GAeG;AACH,MAAM,UAAU,kCAAkC,CAAC,KAAK;IACtD,MAAM,EACJ,IAAI,EACJ,kBAAkB,EAAE,qBAAqB,GAC1C,GAAG,KAAK,CAAC;IAEV,MAAM,kBAAkB,GAAG,qBAAqB,CAAC,qBAAqB,CAAC,CAAC;IAExE,2CAA2C;IAC3C,MAAM,CAAC,EACL,aAAa,EACb,kBAAkB,GACnB,CAAC,GAAG,eAAe,CAAC,4BAA4B,CAAC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,kBAAkB,CAAC,CAAC;IAElG,MAAM,UAAU,GAAG,KAAK,CAAC,OAAO,CAAC,kBAAkB,CAAC,IAAI,kBAAkB,CAAC,MAAM,KAAK,CAAC,CAAC;IAExF,MAAM,sBAAsB,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAC3C,kBAAkB,EAAE,CAAC,CAAC,CAAC;QACrB,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC;QACzB,CAAC,CAAC,IAAI,CACT,EAAE,CAAC,kBAAkB,CAAC,CAAC,CAAC;IACzB,MAAM,sBAAsB,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAC3C,kBAAkB,EAAE,CAAC,CAAC,CAAC;QACrB,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC;QACzB,CAAC,CAAC,IAAI,CACT,EAAE,CAAC,kBAAkB,CAAC,CAAC,CAAC;IAEzB,OAAO,CACL,eAAK,KAAK,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,aAClF,cAAK,KAAK,EAAE,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,YAC1F,KAAC,8BAA8B,OACzB,KAAK,EACT,IAAI,EAAE,GAAG,IAAI,OAAO,EACpB,KAAK,EAAE,CAAC,UAAU;wBAChB,CAAC,CAAC,gBAAgB,aAAa,MAAM,sBAAsB,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE;wBAC1E,CAAC,CAAC,IAAI,CACP,EACD,kBAAkB,EAAE,sBAAsB,GAC1C,GACE,EACL,UAAU,CAAC,CAAC,CAAC,CACZ,cAAK,KAAK,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,YACpE,KAAC,8BAA8B,OACzB,KAAK,EACT,IAAI,EAAE,GAAG,IAAI,OAAO,EACpB,KAAK,EAAE,gBAAgB,aAAa,MAAM,sBAAsB,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,EAC/E,kBAAkB,EAAE,sBAAsB,GAC1C,GACE,CACP,CAAC,CAAC,CAAC,IAAI,IACJ,CACP,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"DualEmbeddingScatterplotSubscriber.js","sourceRoot":"","sources":["../src/DualEmbeddingScatterplotSubscriber.js"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AACvC,OAAO,EACL,eAAe,EACf,qBAAqB,GACtB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,QAAQ,EAAE,4BAA4B,EAAE,MAAM,8BAA8B,CAAC;AACtF,OAAO,EAAE,8BAA8B,EAAE,MAAM,qCAAqC,CAAC;AAGrF;;;;;;;;;;;;;;;GAeG;AACH,MAAM,UAAU,kCAAkC,CAAC,KAAK;IACtD,MAAM,EACJ,IAAI,EACJ,kBAAkB,EAAE,qBAAqB,GAC1C,GAAG,KAAK,CAAC;IAEV,MAAM,kBAAkB,GAAG,qBAAqB,CAAC,qBAAqB,CAAC,CAAC;IAExE,2CAA2C;IAC3C,MAAM,CAAC,EACL,aAAa,EACb,kBAAkB,GACnB,CAAC,GAAG,eAAe,CAAC,4BAA4B,CAAC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,kBAAkB,CAAC,CAAC;IAElG,MAAM,UAAU,GAAG,KAAK,CAAC,OAAO,CAAC,kBAAkB,CAAC,IAAI,kBAAkB,CAAC,MAAM,KAAK,CAAC,CAAC;IAExF,MAAM,sBAAsB,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAC3C,kBAAkB,EAAE,CAAC,CAAC,CAAC;QACrB,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC;QACzB,CAAC,CAAC,IAAI,CACT,EAAE,CAAC,kBAAkB,CAAC,CAAC,CAAC;IACzB,MAAM,sBAAsB,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAC3C,kBAAkB,EAAE,CAAC,CAAC,CAAC;QACrB,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC;QACzB,CAAC,CAAC,IAAI,CACT,EAAE,CAAC,kBAAkB,CAAC,CAAC,CAAC;IAEzB,OAAO,CACL,eAAK,KAAK,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,aAClF,cAAK,KAAK,EAAE,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,YAC1F,KAAC,8BAA8B,OACzB,KAAK,EACT,IAAI,EAAE,GAAG,IAAI,OAAO,EACpB,OAAO,EAAE,IAAI,EACb,KAAK,EAAE,CAAC,UAAU;wBAChB,CAAC,CAAC,gBAAgB,aAAa,MAAM,sBAAsB,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE;wBAC1E,CAAC,CAAC,IAAI,CACP,EACD,kBAAkB,EAAE,sBAAsB,GAC1C,GACE,EACL,UAAU,CAAC,CAAC,CAAC,CACZ,cAAK,KAAK,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,YACpE,KAAC,8BAA8B,OACzB,KAAK,EACT,IAAI,EAAE,GAAG,IAAI,OAAO,EACpB,OAAO,EAAE,IAAI,EACb,KAAK,EAAE,gBAAgB,aAAa,MAAM,sBAAsB,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,EAC/E,kBAAkB,EAAE,sBAAsB,GAC1C,GACE,CACP,CAAC,CAAC,CAAC,IAAI,IACJ,CACP,CAAC;AACJ,CAAC"}
@@ -1,8 +1,11 @@
1
1
  /**
2
2
  * A subscriber component for the scatterplot.
3
3
  * @param {object} props
4
- * @param {number} props.uuid The unique identifier for this component, also used as its
5
- * view uid for looking up its coordination mapping via `useViewMapping`.
4
+ * @param {number} props.uuid The unique identifier for this component.
5
+ * @param {string} props.viewUid The uid of the corresponding view in the view config layout,
6
+ * used for looking up its coordination mapping via `useViewMapping`.
7
+ * Optional, defaults to `uuid`. Differs from `uuid` when rendered by a parent
8
+ * (e.g., the dual scatterplot) that renders multiple child scatterplots for one view.
6
9
  * @param {string} props.theme The current theme name.
7
10
  * @param {function} props.removeGridComponent The callback function to pass to TitleInfo,
8
11
  * to call when the component has been removed from the grid.
@@ -12,6 +15,7 @@
12
15
  */
13
16
  export function EmbeddingScatterplotSubscriber(props: {
14
17
  uuid: number;
18
+ viewUid: string;
15
19
  theme: string;
16
20
  removeGridComponent: Function;
17
21
  title: string;
@@ -1 +1 @@
1
- {"version":3,"file":"EmbeddingScatterplotSubscriber.d.ts","sourceRoot":"","sources":["../src/EmbeddingScatterplotSubscriber.js"],"names":[],"mappings":"AAqDA;;;;;;;;;;;GAWG;AACH,sDATG;IAAsB,IAAI,EAAlB,MAAM;IAEQ,KAAK,EAAnB,MAAM;IACU,mBAAmB;IAErB,KAAK,EAAnB,MAAM;IACQ,kBAAkB,EAAhC,MAAM;CAEhB,OAitBA"}
1
+ {"version":3,"file":"EmbeddingScatterplotSubscriber.d.ts","sourceRoot":"","sources":["../src/EmbeddingScatterplotSubscriber.js"],"names":[],"mappings":"AAqDA;;;;;;;;;;;;;;GAcG;AACH,sDAZG;IAAsB,IAAI,EAAlB,MAAM;IACQ,OAAO,EAArB,MAAM;IAIQ,KAAK,EAAnB,MAAM;IACU,mBAAmB;IAErB,KAAK,EAAnB,MAAM;IACQ,kBAAkB,EAAhC,MAAM;CAEhB,OAqtBA"}
@@ -14,8 +14,11 @@ const DEFAULT_FEATURE_AGGREGATION_STRATEGY = 'first';
14
14
  /**
15
15
  * A subscriber component for the scatterplot.
16
16
  * @param {object} props
17
- * @param {number} props.uuid The unique identifier for this component, also used as its
18
- * view uid for looking up its coordination mapping via `useViewMapping`.
17
+ * @param {number} props.uuid The unique identifier for this component.
18
+ * @param {string} props.viewUid The uid of the corresponding view in the view config layout,
19
+ * used for looking up its coordination mapping via `useViewMapping`.
20
+ * Optional, defaults to `uuid`. Differs from `uuid` when rendered by a parent
21
+ * (e.g., the dual scatterplot) that renders multiple child scatterplots for one view.
19
22
  * @param {string} props.theme The current theme name.
20
23
  * @param {function} props.removeGridComponent The callback function to pass to TitleInfo,
21
24
  * to call when the component has been removed from the grid.
@@ -24,7 +27,7 @@ const DEFAULT_FEATURE_AGGREGATION_STRATEGY = 'first';
24
27
  * when using dynamic opacity mode.
25
28
  */
26
29
  export function EmbeddingScatterplotSubscriber(props) {
27
- const { uuid, closeButtonVisible, downloadButtonVisible, removeGridComponent, theme, observationsLabelOverride, title: titleOverride, helpText = ViewHelpMapping.SCATTERPLOT,
30
+ const { uuid, viewUid: viewUidFromProps, closeButtonVisible, downloadButtonVisible, removeGridComponent, theme, observationsLabelOverride, title: titleOverride, helpText = ViewHelpMapping.SCATTERPLOT,
28
31
  // Average fill density for dynamic opacity calculation.
29
32
  averageFillDensity,
30
33
  // For the dual scatterplot:
@@ -33,6 +36,7 @@ export function EmbeddingScatterplotSubscriber(props) {
33
36
  circleScaleFactor = 0.8,
34
37
  // Passed down from the ancestor <Vitessce/> or <VitS/> component.
35
38
  areAnnotationsEditable, } = props;
39
+ const viewUid = viewUidFromProps ?? uuid;
36
40
  const loaders = useLoaders();
37
41
  // useViewMapping looks up this view's coordination mapping directly from the
38
42
  // view config (by uuid), after accounting for meta-coordination, so there is
@@ -41,18 +45,18 @@ export function EmbeddingScatterplotSubscriber(props) {
41
45
  // precedence over values obtained via coordinationScopes.
42
46
  const [
43
47
  // eslint-disable-next-line no-unused-vars
44
- coordinationScopes, _coordinationScopesBy, coordinationValues,] = useViewMapping(uuid);
48
+ coordinationScopes, _coordinationScopesBy, coordinationValues,] = useViewMapping(viewUid);
45
49
  const setComponentHover = useSetComponentHover();
46
50
  const setComponentViewInfo = useSetComponentViewInfo(uuid);
47
51
  // Merge the coordination values that the current annotation frame defines for this view
48
52
  // into the coordination space, whenever the frame changes. The story itself is read-only.
49
53
  // TODO: handle the rendering of alternative views/layouts (in vit-s?)
50
- useAnnotationFrameCoordination(uuid, coordinationScopes, coordinationValues);
54
+ useAnnotationFrameCoordination(viewUid, coordinationScopes, coordinationValues);
51
55
  // Get "props" from the coordination space.
52
- const [{ dataset, obsType, featureType, featureValueType, sampleType, embeddingZoom: zoom, embeddingTargetX: targetX, embeddingTargetY: targetY, embeddingTargetZ: targetZ, embeddingType: mapping, obsFilter: cellFilter, obsHighlight: cellHighlight, featureSelection: geneSelection, obsSetSelection: cellSetSelection, obsSetColor: cellSetColor, obsColorEncoding: cellColorEncoding, additionalObsSets: additionalCellSets, embeddingObsSetPolygonsVisible: cellSetPolygonsVisible, embeddingObsSetLabelsVisible: cellSetLabelsVisible, embeddingObsSetLabelSize: cellSetLabelSize, embeddingObsRadius: cellRadiusFixed, embeddingObsRadiusMode: cellRadiusMode, embeddingObsOpacity: cellOpacityFixed, embeddingObsOpacityMode: cellOpacityMode, featureValueColormap: geneExpressionColormap, featureValueColormapRange: geneExpressionColormapRange, tooltipsVisible, sampleSetSelection: sampleSetSelectionFromCoordination, sampleSetColor, embeddingPointsVisible, embeddingContoursVisible, embeddingContoursFilled, embeddingContourPercentiles: contourPercentiles, contourColorEncoding, contourColor, featureAggregationStrategy, annotationStory, annotationShapes, annotationOverlayVisible, annotationSemanticZoom, annotationTransitionDuration, annotationEditable, annotationFrameIndex, }, { setEmbeddingZoom: setZoom, setEmbeddingTargetX: setTargetX, setEmbeddingTargetY: setTargetY, setEmbeddingTargetZ: setTargetZ, setObsFilter: setCellFilter, setObsSetSelection: setCellSetSelection, setObsHighlight: setCellHighlight, setObsSetColor: setCellSetColor, setObsColorEncoding: setCellColorEncoding, setAdditionalObsSets: setAdditionalCellSets, setEmbeddingObsSetPolygonsVisible: setCellSetPolygonsVisible, setEmbeddingObsSetLabelsVisible: setCellSetLabelsVisible, setEmbeddingObsSetLabelSize: setCellSetLabelSize, setEmbeddingObsRadius: setCellRadiusFixed, setEmbeddingObsRadiusMode: setCellRadiusMode, setEmbeddingObsOpacity: setCellOpacityFixed, setEmbeddingObsOpacityMode: setCellOpacityMode, setFeatureValueColormap: setGeneExpressionColormap, setFeatureValueColormapRange: setGeneExpressionColormapRange, setTooltipsVisible, setEmbeddingPointsVisible, setEmbeddingContoursVisible, setEmbeddingContoursFilled, setEmbeddingContourPercentiles: setContourPercentiles, setContourColorEncoding, setFeatureAggregationStrategy, setAnnotationStory, }] = useCoordination(COMPONENT_COORDINATION_TYPES[ViewType.SCATTERPLOT], coordinationScopes, coordinationValues, uuid);
56
+ const [{ dataset, obsType, featureType, featureValueType, sampleType, embeddingZoom: zoom, embeddingTargetX: targetX, embeddingTargetY: targetY, embeddingTargetZ: targetZ, embeddingType: mapping, obsFilter: cellFilter, obsHighlight: cellHighlight, featureSelection: geneSelection, obsSetSelection: cellSetSelection, obsSetColor: cellSetColor, obsColorEncoding: cellColorEncoding, additionalObsSets: additionalCellSets, embeddingObsSetPolygonsVisible: cellSetPolygonsVisible, embeddingObsSetLabelsVisible: cellSetLabelsVisible, embeddingObsSetLabelSize: cellSetLabelSize, embeddingObsRadius: cellRadiusFixed, embeddingObsRadiusMode: cellRadiusMode, embeddingObsOpacity: cellOpacityFixed, embeddingObsOpacityMode: cellOpacityMode, featureValueColormap: geneExpressionColormap, featureValueColormapRange: geneExpressionColormapRange, tooltipsVisible, tooltipObsSetsMode, sampleSetSelection: sampleSetSelectionFromCoordination, sampleSetColor, embeddingPointsVisible, embeddingContoursVisible, embeddingContoursFilled, embeddingContourPercentiles: contourPercentiles, contourColorEncoding, contourColor, featureAggregationStrategy, annotationStory, annotationShapes, annotationOverlayVisible, annotationSemanticZoom, annotationTransitionDuration, annotationEditable, annotationFrameIndex, }, { setEmbeddingZoom: setZoom, setEmbeddingTargetX: setTargetX, setEmbeddingTargetY: setTargetY, setEmbeddingTargetZ: setTargetZ, setObsFilter: setCellFilter, setObsSetSelection: setCellSetSelection, setObsHighlight: setCellHighlight, setObsSetColor: setCellSetColor, setObsColorEncoding: setCellColorEncoding, setAdditionalObsSets: setAdditionalCellSets, setEmbeddingObsSetPolygonsVisible: setCellSetPolygonsVisible, setEmbeddingObsSetLabelsVisible: setCellSetLabelsVisible, setEmbeddingObsSetLabelSize: setCellSetLabelSize, setEmbeddingObsRadius: setCellRadiusFixed, setEmbeddingObsRadiusMode: setCellRadiusMode, setEmbeddingObsOpacity: setCellOpacityFixed, setEmbeddingObsOpacityMode: setCellOpacityMode, setFeatureValueColormap: setGeneExpressionColormap, setFeatureValueColormapRange: setGeneExpressionColormapRange, setTooltipsVisible, setEmbeddingPointsVisible, setEmbeddingContoursVisible, setEmbeddingContoursFilled, setEmbeddingContourPercentiles: setContourPercentiles, setContourColorEncoding, setFeatureAggregationStrategy, setAnnotationStory, }] = useCoordination(COMPONENT_COORDINATION_TYPES[ViewType.SCATTERPLOT], coordinationScopes, coordinationValues, viewUid);
53
57
  // Props for drawing annotation shapes in this view (while authoring the story
54
58
  // via the annotation controller), and for highlighting the selected shape.
55
- const annotationEditingProps = useAnnotationEditingForView(uuid, Boolean(areAnnotationsEditable && annotationEditable && typeof annotationFrameIndex === 'number'));
59
+ const annotationEditingProps = useAnnotationEditingForView(viewUid, Boolean(areAnnotationsEditable && annotationEditable && typeof annotationFrameIndex === 'number'));
56
60
  const { embeddingZoom: initialZoom, embeddingTargetX: initialTargetX, embeddingTargetY: initialTargetY, } = useInitialCoordination(COMPONENT_COORDINATION_TYPES[ViewType.SCATTERPLOT], coordinationScopes, coordinationValues);
57
61
  const observationsLabel = observationsLabelOverride || obsType;
58
62
  const sampleSetSelection = (sampleSetSelectionFromProps
@@ -224,7 +228,7 @@ export function EmbeddingScatterplotSubscriber(props) {
224
228
  // eslint-disable-next-line react-hooks/exhaustive-deps
225
229
  }, [xRange, yRange, xExtent, yExtent, numCells,
226
230
  width, height, initialZoom, zoom, initialTargetX, initialTargetY, averageFillDensity]);
227
- const getObsInfo = useGetObsInfo(observationsLabel, obsLabelsTypes, obsLabelsData, obsSetsMembership);
231
+ const getObsInfo = useGetObsInfo(observationsLabel, obsLabelsTypes, obsLabelsData, obsSetsMembership, cellSetSelection, tooltipObsSetsMode);
228
232
  // With no set selection every observation counts as selected, matching the
229
233
  // behavior of the ID-keyed color map this replaced. Uses the deferred selection
230
234
  // so that it stays consistent with obsColorIndices within each commit.
@@ -355,7 +359,7 @@ export function EmbeddingScatterplotSubscriber(props) {
355
359
  obsSetsColumns,
356
360
  ]);
357
361
  // Animate the 2D zoom/target when they change due to the current annotation frame.
358
- const annotationFrameCoordinationValues = getAnnotationFrameCoordinationValues(annotationStory, annotationFrameIndex, uuid);
362
+ const annotationFrameCoordinationValues = getAnnotationFrameCoordinationValues(annotationStory, annotationFrameIndex, viewUid);
359
363
  const annotationTransitionProps = useAnnotationFrameTransition({ zoom, targetX, targetY }, {
360
364
  zoom: annotationFrameCoordinationValues?.[CoordinationType.EMBEDDING_ZOOM],
361
365
  targetX: annotationFrameCoordinationValues?.[CoordinationType.EMBEDDING_TARGET_X],
@@ -1 +1 @@
1
- {"version":3,"file":"EmbeddingScatterplotSubscriber.js","sourceRoot":"","sources":["../src/EmbeddingScatterplotSubscriber.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"EmbeddingScatterplotSubscriber.js","sourceRoot":"","sources":["../src/EmbeddingScatterplotSubscriber.js"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@vitessce/scatterplot-embedding",
3
- "version": "4.1.0",
3
+ "version": "4.1.1",
4
4
  "author": "HIDIVE Lab at HMS",
5
5
  "homepage": "http://vitessce.io",
6
6
  "repository": {
@@ -20,13 +20,13 @@
20
20
  "lodash-es": "^4.17.21",
21
21
  "react-aria": "^3.47.0",
22
22
  "@turf/circle": "^7.2.0",
23
- "@vitessce/styles": "4.1.0",
24
- "@vitessce/scatterplot": "4.1.0",
25
- "@vitessce/legend": "4.1.0",
26
- "@vitessce/constants-internal": "4.1.0",
27
- "@vitessce/sets-utils": "4.1.0",
28
- "@vitessce/vit-s": "4.1.0",
29
- "@vitessce/utils": "4.1.0"
23
+ "@vitessce/styles": "4.1.1",
24
+ "@vitessce/constants-internal": "4.1.1",
25
+ "@vitessce/legend": "4.1.1",
26
+ "@vitessce/scatterplot": "4.1.1",
27
+ "@vitessce/vit-s": "4.1.1",
28
+ "@vitessce/utils": "4.1.1",
29
+ "@vitessce/sets-utils": "4.1.1"
30
30
  },
31
31
  "devDependencies": {
32
32
  "react": "19.2.6",
@@ -56,6 +56,7 @@ export function DualEmbeddingScatterplotSubscriber(props) {
56
56
  <EmbeddingScatterplotSubscriber
57
57
  {...props}
58
58
  uuid={`${uuid}-case`}
59
+ viewUid={uuid}
59
60
  title={(isCaseCtrl
60
61
  ? `Scatterplot (${embeddingType}), ${caseSampleSetSelection?.[0]?.at(-1)}`
61
62
  : null
@@ -68,6 +69,7 @@ export function DualEmbeddingScatterplotSubscriber(props) {
68
69
  <EmbeddingScatterplotSubscriber
69
70
  {...props}
70
71
  uuid={`${uuid}-ctrl`}
72
+ viewUid={uuid}
71
73
  title={`Scatterplot (${embeddingType}), ${ctrlSampleSetSelection?.[0]?.at(-1)}`}
72
74
  sampleSetSelection={ctrlSampleSetSelection}
73
75
  />
@@ -54,8 +54,11 @@ const DEFAULT_FEATURE_AGGREGATION_STRATEGY = 'first';
54
54
  /**
55
55
  * A subscriber component for the scatterplot.
56
56
  * @param {object} props
57
- * @param {number} props.uuid The unique identifier for this component, also used as its
58
- * view uid for looking up its coordination mapping via `useViewMapping`.
57
+ * @param {number} props.uuid The unique identifier for this component.
58
+ * @param {string} props.viewUid The uid of the corresponding view in the view config layout,
59
+ * used for looking up its coordination mapping via `useViewMapping`.
60
+ * Optional, defaults to `uuid`. Differs from `uuid` when rendered by a parent
61
+ * (e.g., the dual scatterplot) that renders multiple child scatterplots for one view.
59
62
  * @param {string} props.theme The current theme name.
60
63
  * @param {function} props.removeGridComponent The callback function to pass to TitleInfo,
61
64
  * to call when the component has been removed from the grid.
@@ -66,6 +69,7 @@ const DEFAULT_FEATURE_AGGREGATION_STRATEGY = 'first';
66
69
  export function EmbeddingScatterplotSubscriber(props) {
67
70
  const {
68
71
  uuid,
72
+ viewUid: viewUidFromProps,
69
73
  closeButtonVisible,
70
74
  downloadButtonVisible,
71
75
  removeGridComponent,
@@ -83,6 +87,7 @@ export function EmbeddingScatterplotSubscriber(props) {
83
87
  areAnnotationsEditable,
84
88
  } = props;
85
89
 
90
+ const viewUid = viewUidFromProps ?? uuid;
86
91
  const loaders = useLoaders();
87
92
  // useViewMapping looks up this view's coordination mapping directly from the
88
93
  // view config (by uuid), after accounting for meta-coordination, so there is
@@ -92,14 +97,14 @@ export function EmbeddingScatterplotSubscriber(props) {
92
97
  const [
93
98
  // eslint-disable-next-line no-unused-vars
94
99
  coordinationScopes, _coordinationScopesBy, coordinationValues,
95
- ] = useViewMapping(uuid);
100
+ ] = useViewMapping(viewUid);
96
101
  const setComponentHover = useSetComponentHover();
97
102
  const setComponentViewInfo = useSetComponentViewInfo(uuid);
98
103
 
99
104
  // Merge the coordination values that the current annotation frame defines for this view
100
105
  // into the coordination space, whenever the frame changes. The story itself is read-only.
101
106
  // TODO: handle the rendering of alternative views/layouts (in vit-s?)
102
- useAnnotationFrameCoordination(uuid, coordinationScopes, coordinationValues);
107
+ useAnnotationFrameCoordination(viewUid, coordinationScopes, coordinationValues);
103
108
 
104
109
  // Get "props" from the coordination space.
105
110
  const [{
@@ -130,6 +135,7 @@ export function EmbeddingScatterplotSubscriber(props) {
130
135
  featureValueColormap: geneExpressionColormap,
131
136
  featureValueColormapRange: geneExpressionColormapRange,
132
137
  tooltipsVisible,
138
+ tooltipObsSetsMode,
133
139
  sampleSetSelection: sampleSetSelectionFromCoordination,
134
140
  sampleSetColor,
135
141
  embeddingPointsVisible,
@@ -176,13 +182,13 @@ export function EmbeddingScatterplotSubscriber(props) {
176
182
  setAnnotationStory,
177
183
  }] = useCoordination(
178
184
  COMPONENT_COORDINATION_TYPES[ViewType.SCATTERPLOT], coordinationScopes,
179
- coordinationValues, uuid,
185
+ coordinationValues, viewUid,
180
186
  );
181
187
 
182
188
  // Props for drawing annotation shapes in this view (while authoring the story
183
189
  // via the annotation controller), and for highlighting the selected shape.
184
190
  const annotationEditingProps = useAnnotationEditingForView(
185
- uuid,
191
+ viewUid,
186
192
  Boolean(areAnnotationsEditable && annotationEditable && typeof annotationFrameIndex === 'number'),
187
193
  );
188
194
 
@@ -459,6 +465,7 @@ export function EmbeddingScatterplotSubscriber(props) {
459
465
 
460
466
  const getObsInfo = useGetObsInfo(
461
467
  observationsLabel, obsLabelsTypes, obsLabelsData, obsSetsMembership,
468
+ cellSetSelection, tooltipObsSetsMode,
462
469
  );
463
470
 
464
471
  // With no set selection every observation counts as selected, matching the
@@ -613,7 +620,7 @@ export function EmbeddingScatterplotSubscriber(props) {
613
620
 
614
621
  // Animate the 2D zoom/target when they change due to the current annotation frame.
615
622
  const annotationFrameCoordinationValues = getAnnotationFrameCoordinationValues(
616
- annotationStory, annotationFrameIndex, uuid,
623
+ annotationStory, annotationFrameIndex, viewUid,
617
624
  );
618
625
  const annotationTransitionProps = useAnnotationFrameTransition(
619
626
  { zoom, targetX, targetY },