@vitessce/statistical-plots 2.0.0-beta.1 → 2.0.1

package/dist/CellSetExpressionPlot.js

@@ -2,7 +2,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import React from 'react';
 import clamp from 'lodash/clamp';
 import { VegaPlot, VEGA_THEMES, DATASET_NAME } from '@vitessce/vega';
-import { colorArrayToString } from '@vitessce/sets';
+import { colorArrayToString } from '@vitessce/sets-utils';
 import { capitalize } from '@vitessce/utils';
 /**
  * Gene expression histogram displayed as a bar chart,
@@ -134,7 +134,7 @@ export default function CellSetExpressionPlot(props) {
                 orient: 'left',
                 scale: 'yscale',
                 zindex: 1,
-                title: featureValueTransformName
+                title: (featureValueTransformName && featureValueTransformName !== 'None')
                     ? [`${featureValueTransformName}-Transformed`, `Normalized ${capitalize(featureValueType)} Values`]
                     : `Normalized ${capitalize(featureValueType)} Values`,
             },

package/dist/CellSetExpressionPlotSubscriber.js

@@ -1,9 +1,9 @@
 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, registerPluginViewType, } from '@vitessce/vit-s';
+import { TitleInfo, useCoordination, useLoaders, useUrls, useReady, useGridItemSize, useFeatureSelection, useObsSetsData, useObsFeatureMatrixIndices, useFeatureLabelsData, registerPluginViewType, } from '@vitessce/vit-s';
 import { ViewType, COMPONENT_COORDINATION_TYPES } from '@vitessce/constants-internal';
 import { VALUE_TRANSFORM_OPTIONS, capitalize, getValueTransformFunction } from '@vitessce/utils';
-import { treeToObjectsBySetNames, treeToSetSizesBySetNames, mergeObsSets } from '@vitessce/sets';
+import { treeToObjectsBySetNames, treeToSetSizesBySetNames, mergeObsSets } from '@vitessce/sets-utils';
 import CellSetExpressionPlotOptions from './CellSetExpressionPlotOptions';
 import CellSetExpressionPlot from './CellSetExpressionPlot';
 import { useStyles } from './styles';
@@ -89,16 +89,19 @@ export function CellSetExpressionPlotSubscriber(props) {
     // Get data from loaders using the data hooks.
     // 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] = useFeatureLabelsData(loaders, dataset, addUrl, false, {}, {}, { featureType });
     const [{ obsIndex }, matrixIndicesStatus] = useObsFeatureMatrixIndices(loaders, dataset, addUrl, false, { obsType, featureType, featureValueType });
     const [{ obsSets: cellSets }, obsSetsStatus] = useObsSetsData(loaders, dataset, addUrl, true, {}, {}, { obsType });
     const isReady = useReady([
         featureSelectionStatus,
         matrixIndicesStatus,
         obsSetsStatus,
+        featureLabelsStatus,
     ]);
     const [expressionArr, setArr, expressionMax] = useExpressionByCellSet(expressionData, obsIndex, cellSets, additionalCellSets, geneSelection, cellSetSelection, cellSetColor, featureValueTransform, featureValueTransformCoefficient, theme);
     const firstGeneSelected = geneSelection && geneSelection.length >= 1
-        ? geneSelection[0]
+        ? (featureLabelsMap?.get(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})` : '')}`, removeGridComponent: removeGridComponent, urls: urls, theme: theme, isReady: isReady, options: (_jsx(CellSetExpressionPlotOptions, { featureValueTransform: featureValueTransform, setFeatureValueTransform: setFeatureValueTransform, featureValueTransformCoefficient: featureValueTransformCoefficient, setFeatureValueTransformCoefficient: setFeatureValueTransformCoefficient, transformOptions: transformOptions })), children: _jsx("div", { ref: containerRef, className: classes.vegaContainer, children: expressionArr ? (_jsx(CellSetExpressionPlot, { domainMax: expressionMax, colors: setArr, data: expressionArr, theme: theme, width: width, height: height, obsType: obsType, featureValueType: featureValueType, featureValueTransformName: selectedTransformName })) : (_jsxs("span", { children: ["Select a ", featureType, "."] })) }) }));

package/dist/CellSetSizesPlot.js

@@ -2,7 +2,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import React from 'react';
 import clamp from 'lodash/clamp';
 import { VegaPlot, VEGA_THEMES } from '@vitessce/vega';
-import { colorArrayToString } from '@vitessce/sets';
+import { colorArrayToString } from '@vitessce/sets-utils';
 import { capitalize } from '@vitessce/utils';
 /**
  * Cell set sizes displayed as a bar chart,

package/dist/CellSetSizesPlotSubscriber.js

@@ -2,7 +2,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import React, { useMemo } from 'react';
 import { TitleInfo, useCoordination, useLoaders, useUrls, useReady, useGridItemSize, useObsSetsData, registerPluginViewType, } from '@vitessce/vit-s';
 import { ViewType, COMPONENT_COORDINATION_TYPES } from '@vitessce/constants-internal';
-import { mergeObsSets, treeToSetSizesBySetNames } from '@vitessce/sets';
+import { mergeObsSets, treeToSetSizesBySetNames } from '@vitessce/sets-utils';
 import { capitalize } from '@vitessce/utils';
 import CellSetSizesPlot from './CellSetSizesPlot';
 import { useStyles } from './styles';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitessce/statistical-plots",
-  "version": "2.0.0-beta.1",
+  "version": "2.0.1",
   "author": "Gehlenborg Lab",
   "homepage": "http://vitessce.io",
   "repository": {
@@ -14,13 +14,13 @@
   ],
   "dependencies": {
     "@material-ui/core": "~4.12.3",
-    "@vitessce/constants-internal": "2.0.0-beta.1",
-    "@vitessce/sets": "2.0.0-beta.1",
-    "@vitessce/utils": "2.0.0-beta.1",
-    "@vitessce/vega": "2.0.0-beta.1",
-    "@vitessce/vit-s": "2.0.0-beta.1",
     "d3-array": "^2.4.0",
-    "lodash": "^4.17.21"
+    "lodash": "^4.17.21",
+    "@vitessce/constants-internal": "2.0.1",
+    "@vitessce/sets-utils": "2.0.1",
+    "@vitessce/utils": "2.0.1",
+    "@vitessce/vega": "2.0.1",
+    "@vitessce/vit-s": "2.0.1"
   },
   "devDependencies": {
     "react": "^18.0.0",