@vitessce/statistical-plots 3.5.1 → 3.5.3

package/dist/index.js

@@ -1,4 +1,4 @@
-import { c, C, b, a, e, D, d, E, F } from "./index-5a8190d9.js";
+import { c, C, b, a, e, D, d, E, F } from "./index-00d0a4a2.js";
 import "react";
 import "@vitessce/vit-s";
 import "react-dom";

package/dist/{jpeg-c60720b8.js → jpeg-89e89436.js}

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

package/dist/{lerc-922b46fe.js → lerc-f5f67eb4.js}

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

package/dist/{lzw-401bb3ee.js → lzw-202c1994.js}

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

package/dist/{packbits-3219f1f5.js → packbits-4038eb16.js}

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

package/dist/{raw-ee5f13d0.js → raw-1068ab16.js}

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

package/dist/{webimage-9f8ff63a.js → webimage-e7e86b49.js}

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

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

@@ -1 +1 @@
-{"version":3,"file":"CellSetExpressionPlotSubscriber.d.ts","sourceRoot":"","sources":["../src/CellSetExpressionPlotSubscriber.js"],"names":[],"mappings":"AAkGA;;;;;;;;;GASG;AACH,uDALG;IAAwB,mBAAmB;IACrB,kBAAkB,EAAhC,MAAM;IAEQ,KAAK,EAAnB,MAAM;CAChB,eA2JA"}
+{"version":3,"file":"CellSetExpressionPlotSubscriber.d.ts","sourceRoot":"","sources":["../src/CellSetExpressionPlotSubscriber.js"],"names":[],"mappings":"AAmGA;;;;;;;;;GASG;AACH,uDALG;IAAwB,mBAAmB;IACrB,kBAAkB,EAAhC,MAAM;IAEQ,KAAK,EAAnB,MAAM;CAChB,eAoKA"}

package/dist-tsc/CellSetExpressionPlotSubscriber.js

@@ -1,8 +1,8 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React, { useMemo } from 'react';
-import { TitleInfo, useCoordination, useLoaders, useUrls, useReady, useGridItemSize, useFeatureSelection, useObsSetsData, useObsFeatureMatrixIndices, useFeatureLabelsData, useSampleSetsData, useSampleEdgesData, } from '@vitessce/vit-s';
+import { TitleInfo, useCoordination, useLoaders, useUrls, useReady, useGridItemSize, useFeatureSelection, useObsSetsData, useObsFeatureMatrixIndices, useFeatureLabelsData, useSampleSetsData, useSampleEdgesData, useExpandedFeatureLabelsMap, } from '@vitessce/vit-s';
 import { ViewType, COMPONENT_COORDINATION_TYPES, ViewHelpMapping } from '@vitessce/constants-internal';
-import { VALUE_TRANSFORM_OPTIONS, capitalize } from '@vitessce/utils';
+import { VALUE_TRANSFORM_OPTIONS, capitalize, cleanFeatureId } from '@vitessce/utils';
 import { treeToSetSizesBySetNames, mergeObsSets, stratifyExpressionData, aggregateStratifiedExpressionData, } from '@vitessce/sets-utils';
 import CellSetExpressionPlotOptions from './CellSetExpressionPlotOptions.js';
 import CellSetExpressionPlot from './CellSetExpressionPlot.js';
@@ -74,7 +74,9 @@ export function CellSetExpressionPlotSubscriber(props) {
     // eslint-disable-next-line no-unused-vars
     const [expressionData, loadedFeatureSelection, featureSelectionStatus] = useFeatureSelection(loaders, dataset, false, geneSelection, { obsType, featureType, featureValueType });
     // TODO: support multiple feature labels using featureLabelsType coordination values.
-    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 [{ obsIndex }, matrixIndicesStatus, matrixIndicesUrls] = useObsFeatureMatrixIndices(loaders, dataset, false, { obsType, featureType, featureValueType });
     const [{ obsSets: cellSets }, obsSetsStatus, obsSetsUrls] = useObsSetsData(loaders, dataset, true, {}, {}, { obsType });
     const [{ sampleSets }, sampleSetsStatus, sampleSetsUrls] = useSampleSetsData(loaders, dataset, false, { setSampleSetColor }, { sampleSetColor }, { sampleType });
@@ -84,6 +86,7 @@ export function CellSetExpressionPlotSubscriber(props) {
         matrixIndicesStatus,
         obsSetsStatus,
         featureLabelsStatus,
+        expandedFeatureLabelsStatus,
         sampleSetsStatus,
         sampleEdgesStatus,
     ]);
@@ -96,7 +99,9 @@ export function CellSetExpressionPlotSubscriber(props) {
     ]);
     const [histogramData, setArr, exprMax] = useExpressionByCellSet(sampleEdges, sampleSets, sampleSetSelection, expressionData, obsIndex, cellSets, additionalCellSets, geneSelection, cellSetSelection, cellSetColor, featureValueTransform, featureValueTransformCoefficient, theme, yMin);
     const firstGeneSelected = geneSelection && geneSelection.length >= 1
-        ? (featureLabelsMap?.get(geneSelection[0]) || geneSelection[0])
+        ? (featureLabelsMap?.get(geneSelection[0])
+            || featureLabelsMap?.get(cleanFeatureId(geneSelection[0]))
+            || geneSelection[0])
         : null;
     const selectedTransformName = transformOptions.find(o => o.value === featureValueTransform)?.name;
     return (_jsx(TitleInfo, { title: `Expression by ${capitalize(obsType)} Set${(firstGeneSelected ? ` (${firstGeneSelected})` : '')}`, closeButtonVisible: closeButtonVisible, downloadButtonVisible: downloadButtonVisible, removeGridComponent: removeGridComponent, urls: urls, theme: theme, isReady: isReady, helpText: helpText, options: (_jsx(CellSetExpressionPlotOptions, { featureValueTransform: featureValueTransform, setFeatureValueTransform: setFeatureValueTransform, featureValueTransformCoefficient: featureValueTransformCoefficient, setFeatureValueTransformCoefficient: setFeatureValueTransformCoefficient, transformOptions: transformOptions })), children: _jsx("div", { ref: containerRef, className: classes.vegaContainer, children: histogramData ? (_jsx(CellSetExpressionPlot, { yMin: yMin, yUnits: yUnits, jitter: jitter, cellSetSelection: cellSetSelection, sampleSetSelection: sampleSetSelection, sampleSetColor: sampleSetColor, colors: setArr, data: histogramData, exprMax: exprMax, theme: theme, width: width, height: height, obsType: obsType, featureType: featureType, featureValueType: featureValueType, featureValueTransformName: selectedTransformName })) : (_jsxs("span", { children: ["Select a ", featureType, "."] })) }) }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitessce/statistical-plots",
-  "version": "3.5.1",
+  "version": "3.5.3",
   "author": "HIDIVE Lab at HMS",
   "homepage": "http://vitessce.io",
   "repository": {
@@ -28,12 +28,12 @@
     "react-aria": "^3.28.0",
     "internmap": "^2.0.3",
     "uuid": "^9.0.0",
-    "@vitessce/constants-internal": "3.5.1",
-    "@vitessce/sets-utils": "3.5.1",
-    "@vitessce/utils": "3.5.1",
-    "@vitessce/vega": "3.5.1",
-    "@vitessce/vit-s": "3.5.1",
-    "@vitessce/gl": "3.5.1"
+    "@vitessce/constants-internal": "3.5.3",
+    "@vitessce/sets-utils": "3.5.3",
+    "@vitessce/utils": "3.5.3",
+    "@vitessce/vega": "3.5.3",
+    "@vitessce/vit-s": "3.5.3",
+    "@vitessce/gl": "3.5.3"
   },
   "devDependencies": {
     "react": "^18.0.0",

package/src/CellSetExpressionPlotSubscriber.js

@@ -8,9 +8,10 @@ import {
   useFeatureLabelsData,
   useSampleSetsData,
   useSampleEdgesData,
+  useExpandedFeatureLabelsMap,
 } from '@vitessce/vit-s';
 import { ViewType, COMPONENT_COORDINATION_TYPES, ViewHelpMapping } from '@vitessce/constants-internal';
-import { VALUE_TRANSFORM_OPTIONS, capitalize } from '@vitessce/utils';
+import { VALUE_TRANSFORM_OPTIONS, capitalize, cleanFeatureId } from '@vitessce/utils';
 import {
   treeToSetSizesBySetNames,
   mergeObsSets,
@@ -157,10 +158,14 @@ export function CellSetExpressionPlotSubscriber(props) {
     { obsType, featureType, featureValueType },
   );
   // TODO: support multiple feature labels using featureLabelsType coordination values.
-  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 [{ obsIndex }, matrixIndicesStatus, matrixIndicesUrls] = useObsFeatureMatrixIndices(
     loaders, dataset, false,
     { obsType, featureType, featureValueType },
@@ -187,6 +192,7 @@ export function CellSetExpressionPlotSubscriber(props) {
     matrixIndicesStatus,
     obsSetsStatus,
     featureLabelsStatus,
+    expandedFeatureLabelsStatus,
     sampleSetsStatus,
     sampleEdgesStatus,
   ]);
@@ -207,7 +213,11 @@ export function CellSetExpressionPlotSubscriber(props) {
   );
 
   const firstGeneSelected = geneSelection && geneSelection.length >= 1
-    ? (featureLabelsMap?.get(geneSelection[0]) || geneSelection[0])
+    ? (
+      featureLabelsMap?.get(geneSelection[0])
+      || featureLabelsMap?.get(cleanFeatureId(geneSelection[0]))
+      || geneSelection[0]
+    )
     : null;
   const selectedTransformName = transformOptions.find(
     o => o.value === featureValueTransform,