@vitessce/scatterplot-embedding 3.5.2 → 3.5.3

package/dist/index.js

@@ -1,4 +1,4 @@
-import { E } from "./index-b29153a1.js";
+import { E } from "./index-e8cfd624.js";
 import "react";
 import "@vitessce/vit-s";
 import "react-dom";

package/dist/{jpeg-fb8ccf5b.js → jpeg-17a85e73.js}

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

package/dist/{lerc-6a5274b2.js → lerc-c362fa1c.js}

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

package/dist/{lzw-b0644528.js → lzw-24b336d4.js}

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

package/dist/{packbits-54f0a5dc.js → packbits-44cebc8c.js}

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

package/dist/{raw-d4deb41a.js → raw-55d1ddac.js}

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

package/dist/{webimage-75b55168.js → webimage-6f2a65d0.js}

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

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

@@ -1 +1 @@
-{"version":3,"file":"EmbeddingScatterplotSubscriber.d.ts","sourceRoot":"","sources":["../src/EmbeddingScatterplotSubscriber.js"],"names":[],"mappings":"AAyCA;;;;;;;;;;;;GAYG;AACH,sDAVG;IAAsB,IAAI,EAAlB,MAAM;IACQ,KAAK,EAAnB,MAAM;IACQ,kBAAkB,EAAhC,MAAM;IAEU,mBAAmB;IAErB,KAAK,EAAnB,MAAM;IACQ,kBAAkB,EAAhC,MAAM;CAEhB,eA0gBA"}
+{"version":3,"file":"EmbeddingScatterplotSubscriber.d.ts","sourceRoot":"","sources":["../src/EmbeddingScatterplotSubscriber.js"],"names":[],"mappings":"AA0CA;;;;;;;;;;;;GAYG;AACH,sDAVG;IAAsB,IAAI,EAAlB,MAAM;IACQ,KAAK,EAAnB,MAAM;IACQ,kBAAkB,EAAhC,MAAM;IAEU,mBAAmB;IAErB,KAAK,EAAnB,MAAM;IACQ,kBAAkB,EAAhC,MAAM;CAEhB,eAihBA"}

package/dist-tsc/EmbeddingScatterplotSubscriber.js

@@ -2,7 +2,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React, { useState, useEffect, useCallback, useMemo, } from 'react';
 import { extent, quantileSorted } from 'd3-array';
 import { isEqual } from 'lodash-es';
-import { TitleInfo, useReady, useUrls, useDeckCanvasSize, useUint8FeatureSelection, useExpressionValueGetter, useGetObsInfo, useObsEmbeddingData, useObsSetsData, useFeatureSelection, useObsFeatureMatrixIndices, useFeatureLabelsData, useMultiObsLabels, useSampleSetsData, useSampleEdgesData, useCoordination, useLoaders, useSetComponentHover, useSetComponentViewInfo, useInitialCoordination, } from '@vitessce/vit-s';
+import { TitleInfo, useReady, useUrls, useDeckCanvasSize, useUint8FeatureSelection, useExpressionValueGetter, useGetObsInfo, useObsEmbeddingData, useObsSetsData, useFeatureSelection, useObsFeatureMatrixIndices, useFeatureLabelsData, useMultiObsLabels, useSampleSetsData, useSampleEdgesData, useCoordination, useLoaders, useSetComponentHover, useSetComponentViewInfo, useInitialCoordination, useExpandedFeatureLabelsMap, } from '@vitessce/vit-s';
 import { setObsSelection, mergeObsSets, getCellSetPolygons, getCellColors, stratifyArrays, } from '@vitessce/sets-utils';
 import { pluralize as plur, commaNumber } from '@vitessce/utils';
 import { Scatterplot, ScatterplotTooltipSubscriber, ScatterplotOptions, getPointSizeDevicePixels, getPointOpacity, } from '@vitessce/scatterplot';
@@ -43,7 +43,9 @@ export function EmbeddingScatterplotSubscriber(props) {
     // eslint-disable-next-line no-unused-vars
     const [expressionData, loadedFeatureSelection, featureSelectionStatus] = useFeatureSelection(loaders, dataset, false, geneSelection, { obsType, featureType, featureValueType });
     const [{ obsIndex: matrixObsIndex }, matrixIndicesStatus, matrixIndicesUrls,] = useObsFeatureMatrixIndices(loaders, dataset, false, { obsType, featureType, featureValueType });
-    const [{ featureLabelsMap }, featureLabelsStatus, featureLabelsUrls] = useFeatureLabelsData(loaders, dataset, false, {}, {}, { featureType });
+    // eslint-disable-next-line max-len
+    const [{ featureLabelsMap: featureLabelsMapOrig }, featureLabelsStatus, featureLabelsUrls] = useFeatureLabelsData(loaders, dataset, false, {}, {}, { featureType });
+    const [featureLabelsMap, expandedFeatureLabelsStatus] = useExpandedFeatureLabelsMap(featureType, featureLabelsMapOrig, { stripCuriePrefixes: true });
     const [{ sampleSets }, sampleSetsStatus, sampleSetsUrl] = useSampleSetsData(loaders, dataset, false, {}, {}, { sampleType });
     const [{ sampleEdges }, sampleEdgesStatus, sampleEdgesUrl] = useSampleEdgesData(loaders, dataset, false, {}, {}, { obsType, sampleType });
     const isReady = useReady([
@@ -51,6 +53,7 @@ export function EmbeddingScatterplotSubscriber(props) {
         obsSetsStatus,
         featureSelectionStatus,
         featureLabelsStatus,
+        expandedFeatureLabelsStatus,
         matrixIndicesStatus,
         sampleSetsStatus,
         sampleEdgesStatus,
@@ -258,7 +261,7 @@ export function EmbeddingScatterplotSubscriber(props) {
                 }, updateViewInfo: setComponentViewInfo, getExpressionValue: getExpressionValue, getCellIsSelected: getCellIsSelected, obsSetSelection: cellSetSelection, sampleSetSelection: sampleSetSelection, 
                 // InternMap data structures where keys are
                 // obsSet -> sampleSet -> arrayKey -> [].
-                stratifiedData: stratifiedData, obsSetColor: cellSetColor, sampleSetColor: sampleSetColor, contourThresholds: contourThresholds, contourColorEncoding: contourColorEncoding, contourColor: contourColor, contoursFilled: embeddingContoursFilled, embeddingPointsVisible: embeddingPointsVisible, embeddingContoursVisible: embeddingContoursVisible }), tooltipsVisible && (_jsx(ScatterplotTooltipSubscriber, { parentUuid: uuid, obsHighlight: cellHighlight, width: width, height: height, getObsInfo: getObsInfo })), _jsx(Legend, { visible: true, theme: theme, featureType: featureType, featureValueType: featureValueType, obsColorEncoding: cellColorEncoding, featureSelection: geneSelection, featureLabelsMap: featureLabelsMap, featureValueColormap: geneExpressionColormap, featureValueColormapRange: geneExpressionColormapRange, obsSetSelection: cellSetSelection, extent: expressionExtents?.[0], missing: expressionMissing?.[0], 
+                stratifiedData: stratifiedData, obsSetColor: cellSetColor, sampleSetColor: sampleSetColor, contourThresholds: contourThresholds, contourColorEncoding: contourColorEncoding, contourColor: contourColor, contoursFilled: embeddingContoursFilled, embeddingPointsVisible: embeddingPointsVisible, embeddingContoursVisible: embeddingContoursVisible }), tooltipsVisible && (_jsx(ScatterplotTooltipSubscriber, { parentUuid: uuid, obsHighlight: cellHighlight, width: width, height: height, getObsInfo: getObsInfo, featureType: featureType, featureLabelsMap: featureLabelsMap })), _jsx(Legend, { visible: true, theme: theme, featureType: featureType, featureValueType: featureValueType, obsColorEncoding: cellColorEncoding, featureSelection: geneSelection, featureLabelsMap: featureLabelsMap, featureValueColormap: geneExpressionColormap, featureValueColormapRange: geneExpressionColormapRange, obsSetSelection: cellSetSelection, extent: expressionExtents?.[0], missing: expressionMissing?.[0], 
                 // Contour percentile legend
                 pointsVisible: embeddingPointsVisible, contoursVisible: embeddingContoursVisible, contoursFilled: embeddingContoursFilled, contourPercentiles: contourPercentiles || DEFAULT_CONTOUR_PERCENTILES, contourThresholds: contourThresholds })] }));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitessce/scatterplot-embedding",
-  "version": "3.5.2",
+  "version": "3.5.3",
   "author": "HIDIVE Lab at HMS",
   "homepage": "http://vitessce.io",
   "repository": {
@@ -20,12 +20,12 @@
     "d3-array": "^2.4.0",
     "lodash-es": "^4.17.21",
     "react-aria": "^3.28.0",
-    "@vitessce/constants-internal": "3.5.2",
-    "@vitessce/legend": "3.5.2",
-    "@vitessce/scatterplot": "3.5.2",
-    "@vitessce/sets-utils": "3.5.2",
-    "@vitessce/utils": "3.5.2",
-    "@vitessce/vit-s": "3.5.2"
+    "@vitessce/constants-internal": "3.5.3",
+    "@vitessce/legend": "3.5.3",
+    "@vitessce/scatterplot": "3.5.3",
+    "@vitessce/sets-utils": "3.5.3",
+    "@vitessce/utils": "3.5.3",
+    "@vitessce/vit-s": "3.5.3"
   },
   "devDependencies": {
     "react": "^18.0.0",

package/src/EmbeddingScatterplotSubscriber.js

@@ -23,6 +23,7 @@ import {
   useSetComponentHover,
   useSetComponentViewInfo,
   useInitialCoordination,
+  useExpandedFeatureLabelsMap,
 } from '@vitessce/vit-s';
 import {
   setObsSelection, mergeObsSets, getCellSetPolygons, getCellColors,
@@ -179,10 +180,14 @@ export function EmbeddingScatterplotSubscriber(props) {
     loaders, dataset, false,
     { obsType, featureType, featureValueType },
   );
-  const [{ featureLabelsMap }, featureLabelsStatus, featureLabelsUrls] = useFeatureLabelsData(
+  // eslint-disable-next-line max-len
+  const [{ featureLabelsMap: featureLabelsMapOrig }, featureLabelsStatus, featureLabelsUrls] = useFeatureLabelsData(
     loaders, dataset, false, {}, {},
     { featureType },
   );
+  const [featureLabelsMap, expandedFeatureLabelsStatus] = useExpandedFeatureLabelsMap(
+    featureType, featureLabelsMapOrig, { stripCuriePrefixes: true },
+  );
 
   const [{ sampleSets }, sampleSetsStatus, sampleSetsUrl] = useSampleSetsData(
     loaders, dataset, false, {}, {},
@@ -199,6 +204,7 @@ export function EmbeddingScatterplotSubscriber(props) {
     obsSetsStatus,
     featureSelectionStatus,
     featureLabelsStatus,
+    expandedFeatureLabelsStatus,
     matrixIndicesStatus,
     sampleSetsStatus,
     sampleEdgesStatus,
@@ -549,6 +555,8 @@ export function EmbeddingScatterplotSubscriber(props) {
         width={width}
         height={height}
         getObsInfo={getObsInfo}
+        featureType={featureType}
+        featureLabelsMap={featureLabelsMap}
       />
       )}
       <Legend