@vitessce/statistical-plots 4.0.4 → 4.0.6
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.
- package/dist/{deflate-DN9irvtS.js → deflate-C-0XOaix.js} +1 -1
- package/dist/{index-DKWiD0_-.js → index-CFje_HC1.js} +281 -5291
- package/dist/index.js +1 -1
- package/dist/{jpeg-DA0bMpPw.js → jpeg-HJZeqbJ9.js} +1 -1
- package/dist/{lerc-PCO9t4ZR.js → lerc-BtoOWLPL.js} +1 -1
- package/dist/{lzw-DQkfb7of.js → lzw-BS2ckxRa.js} +1 -1
- package/dist/{packbits-CuaN4bB2.js → packbits-8sTofHBF.js} +1 -1
- package/dist/{raw-CCURUeAu.js → raw-DA0bjume.js} +1 -1
- package/dist/{webimage-CUTBnRFx.js → webimage-C3yiEsf-.js} +1 -1
- package/dist-tsc/CellSetExpressionPlotSubscriber.d.ts.map +1 -1
- package/dist-tsc/CellSetExpressionPlotSubscriber.js +7 -5
- package/dist-tsc/CellSetExpressionPlotSubscriber.js.map +1 -1
- package/dist-tsc/DotPlotSubscriber.js +2 -2
- package/dist-tsc/DotPlotSubscriber.js.map +1 -1
- package/dist-tsc/dot-plot-hook.d.ts +1 -1
- package/dist-tsc/dot-plot-hook.d.ts.map +1 -1
- package/dist-tsc/dot-plot-hook.js +5 -3
- package/dist-tsc/dot-plot-hook.js.map +1 -1
- package/package.json +8 -8
- package/src/CellSetExpressionPlotSubscriber.js +8 -2
- package/src/DotPlotSubscriber.js +2 -2
- package/src/dot-plot-hook.js +4 -1
package/dist/index.js
CHANGED
|
@@ -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-
|
|
2
|
+
import { g as getDefaultExportFromCjs, B as BaseDecoder } from "./index-CFje_HC1.js";
|
|
3
3
|
const LercParameters = {
|
|
4
4
|
AddCompression: 1
|
|
5
5
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CellSetExpressionPlotSubscriber.d.ts","sourceRoot":"","sources":["../src/CellSetExpressionPlotSubscriber.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"CellSetExpressionPlotSubscriber.d.ts","sourceRoot":"","sources":["../src/CellSetExpressionPlotSubscriber.js"],"names":[],"mappings":"AA8HA;;;;;;;;;GASG;AACH,uDALG;IAAwB,mBAAmB;IACrB,kBAAkB,EAAhC,MAAM;IAEQ,KAAK,EAAnB,MAAM;CAChB,OAkNA"}
|
|
@@ -52,12 +52,14 @@ function featureSummary(geneSelection, featureAggregationStrategy) {
|
|
|
52
52
|
* @param {number} featureValueTransformCoefficient A coefficient
|
|
53
53
|
* to be used in the transform function.
|
|
54
54
|
*/
|
|
55
|
-
function useExpressionByCellSet(sampleEdges, sampleSets, sampleSetSelection, expressionData, obsIndex, cellSets, additionalCellSets, geneSelection, cellSetSelection, cellSetColor, featureValueTransform, featureValueTransformCoefficient, theme, yMinProp, featureAggregationStrategy) {
|
|
55
|
+
function useExpressionByCellSet(sampleEdges, sampleSets, sampleSetSelection, expressionData, obsIndex, cellSets, additionalCellSets, geneSelection, cellSetSelection, cellSetColor, featureValueTransform, featureValueTransformCoefficient, theme, yMinProp, featureAggregationStrategy, obsSetsColumns) {
|
|
56
56
|
const mergedCellSets = useMemo(() => mergeObsSets(cellSets, additionalCellSets), [cellSets, additionalCellSets]);
|
|
57
57
|
// From the expression matrix and the list of selected genes / cell sets,
|
|
58
58
|
// generate the array of data points for the plot.
|
|
59
59
|
const [expressionArr, expressionMax] = useMemo(() => {
|
|
60
|
-
const [stratifiedData, exprMax] = stratifyExpressionData(sampleEdges, sampleSets, sampleSetSelection, expressionData, obsIndex, mergedCellSets, geneSelection, cellSetSelection, cellSetColor, featureValueTransform, featureValueTransformCoefficient
|
|
60
|
+
const [stratifiedData, exprMax] = stratifyExpressionData(sampleEdges, sampleSets, sampleSetSelection, expressionData, obsIndex, mergedCellSets, geneSelection, cellSetSelection, cellSetColor, featureValueTransform, featureValueTransformCoefficient,
|
|
61
|
+
// Raw codes let the strata come from typed arrays when the indices match.
|
|
62
|
+
{ obsSetsColumns });
|
|
61
63
|
if (stratifiedData) {
|
|
62
64
|
const aggregateData = aggregateStratifiedExpressionData(stratifiedData, geneSelection, featureAggregationStrategy);
|
|
63
65
|
const summarizedData = summarizeStratifiedExpressionData(aggregateData, true);
|
|
@@ -69,7 +71,7 @@ function useExpressionByCellSet(sampleEdges, sampleSets, sampleSetSelection, exp
|
|
|
69
71
|
mergedCellSets, cellSetSelection, cellSetColor,
|
|
70
72
|
featureValueTransform, featureValueTransformCoefficient,
|
|
71
73
|
yMinProp, sampleEdges, sampleSets, sampleSetSelection,
|
|
72
|
-
featureAggregationStrategy,
|
|
74
|
+
featureAggregationStrategy, obsSetsColumns,
|
|
73
75
|
]);
|
|
74
76
|
// From the cell sets hierarchy and the list of selected cell sets,
|
|
75
77
|
// generate the array of set sizes data points for the bar plot.
|
|
@@ -105,7 +107,7 @@ export function CellSetExpressionPlotSubscriber(props) {
|
|
|
105
107
|
const [{ featureLabelsMap: featureLabelsMapOrig }, featureLabelsStatus, featureLabelsUrls, featureLabelsError,] = useFeatureLabelsData(loaders, dataset, false, {}, {}, { featureType });
|
|
106
108
|
const [featureLabelsMap, expandedFeatureLabelsStatus] = useExpandedFeatureLabelsMap(featureType, featureLabelsMapOrig, { stripCuriePrefixes: true });
|
|
107
109
|
const [{ obsIndex }, matrixIndicesStatus, matrixIndicesUrls, matrixIndicesError,] = useObsFeatureMatrixIndices(loaders, dataset, false, { obsType, featureType, featureValueType });
|
|
108
|
-
const [{ obsSets: cellSets }, obsSetsStatus, obsSetsUrls, obsSetsError] = useObsSetsData(loaders, dataset, true, {}, {}, { obsType });
|
|
110
|
+
const [{ obsSets: cellSets, obsSetsColumns }, obsSetsStatus, obsSetsUrls, obsSetsError,] = useObsSetsData(loaders, dataset, true, {}, {}, { obsType });
|
|
109
111
|
const [{ sampleSets }, sampleSetsStatus, sampleSetsUrls, sampleSetsError,] = useSampleSetsData(loaders, dataset, false, { setSampleSetColor }, { sampleSetColor }, { sampleType });
|
|
110
112
|
const [{ sampleEdges }, sampleEdgesStatus, sampleEdgesUrls, sampleEdgesError,] = useSampleEdgesData(loaders, dataset, false, {}, {}, { obsType, sampleType });
|
|
111
113
|
const errors = [
|
|
@@ -134,7 +136,7 @@ export function CellSetExpressionPlotSubscriber(props) {
|
|
|
134
136
|
]);
|
|
135
137
|
const featureAggregationStrategyToUse = featureAggregationStrategy
|
|
136
138
|
?? DEFAULT_FEATURE_AGGREGATION_STRATEGY;
|
|
137
|
-
const [histogramData, setArr, exprMax] = useExpressionByCellSet(sampleEdges, sampleSets, sampleSetSelection, expressionData, obsIndex, cellSets, additionalCellSets, geneSelection, cellSetSelection, cellSetColor, featureValueTransform, featureValueTransformCoefficient, theme, yMin, featureAggregationStrategyToUse);
|
|
139
|
+
const [histogramData, setArr, exprMax] = useExpressionByCellSet(sampleEdges, sampleSets, sampleSetSelection, expressionData, obsIndex, cellSets, additionalCellSets, geneSelection, cellSetSelection, cellSetColor, featureValueTransform, featureValueTransformCoefficient, theme, yMin, featureAggregationStrategyToUse, obsSetsColumns);
|
|
138
140
|
const featureSuffix = useMemo(() => {
|
|
139
141
|
const cleanedGeneSelection = geneSelection?.map(geneName => (featureLabelsMap?.get(geneName)
|
|
140
142
|
|| featureLabelsMap?.get(cleanFeatureId(geneName))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CellSetExpressionPlotSubscriber.js","sourceRoot":"","sources":["../src/CellSetExpressionPlotSubscriber.js"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AACvC,OAAO,EACL,SAAS,EACT,eAAe,EAAE,UAAU,EAC3B,OAAO,EAAE,QAAQ,EAAE,eAAe,EAClC,mBAAmB,EAAE,cAAc,EACnC,0BAA0B,EAC1B,oBAAoB,EACpB,iBAAiB,EACjB,kBAAkB,EAClB,2BAA2B,EAC3B,qBAAqB,GACtB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,QAAQ,EAAE,4BAA4B,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AACvG,OAAO,EAAE,uBAAuB,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACtF,OAAO,EACL,wBAAwB,EACxB,YAAY,EACZ,sBAAsB,EACtB,iCAAiC,GAClC,MAAM,sBAAsB,CAAC;AAC9B,OAAO,4BAA4B,MAAM,mCAAmC,CAAC;AAC7E,OAAO,qBAAqB,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EACL,iCAAiC,EACjC,iCAAiC,GAClC,MAAM,iBAAiB,CAAC;AAEzB,MAAM,oCAAoC,GAAG,OAAO,CAAC;AAErD,SAAS,cAAc,CAAC,aAAa,EAAE,0BAA0B;IAC/D,IAAI,0BAA0B,KAAK,OAAO,EAAE,CAAC;QAC3C,OAAO,aAAa,EAAE,CAAC,CAAC,CAAC,CAAC;IAC5B,CAAC;IAAC,IAAI,0BAA0B,KAAK,MAAM,EAAE,CAAC;QAC5C,OAAO,aAAa,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAC/B,CAAC;IAAC,IAAI,OAAO,0BAA0B,KAAK,QAAQ,EAAE,CAAC;QACrD,MAAM,CAAC,GAAG,0BAA0B,CAAC;QACrC,OAAO,aAAa,EAAE,CAAC,CAAC,CAAC,CAAC;IAC5B,CAAC;IAAC,IAAI,0BAA0B,KAAK,KAAK,EAAE,CAAC;QAC3C,oDAAoD;QACpD,iDAAiD;QACjD,OAAO,aAAa,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;IACpC,CAAC;IAAC,IAAI,0BAA0B,KAAK,MAAM,EAAE,CAAC;QAC5C,OAAO,WAAW,aAAa,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;IAChD,CAAC;IAAC,IAAI,0BAA0B,KAAK,YAAY,EAAE,CAAC;QAClD,OAAO,aAAa,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;IACpC,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,SAAS,sBAAsB,CAC7B,WAAW,EAAE,UAAU,EAAE,kBAAkB,EAC3C,cAAc,EAAE,QAAQ,EAAE,QAAQ,EAAE,kBAAkB,EACtD,aAAa,EAAE,gBAAgB,EAAE,YAAY,EAC7C,qBAAqB,EAAE,gCAAgC,EACvD,KAAK,EAAE,QAAQ,EAAE,0BAA0B;
|
|
1
|
+
{"version":3,"file":"CellSetExpressionPlotSubscriber.js","sourceRoot":"","sources":["../src/CellSetExpressionPlotSubscriber.js"],"names":[],"mappings":"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"}
|
|
@@ -34,7 +34,7 @@ export function DotPlotSubscriber(props) {
|
|
|
34
34
|
// TODO: support multiple feature labels using featureLabelsType coordination values.
|
|
35
35
|
const [{ featureLabelsMap }, featureLabelsStatus, featureLabelsUrl, featureLabelsError,] = useFeatureLabelsData(loaders, dataset, false, {}, {}, { featureType });
|
|
36
36
|
const [{ obsIndex }, matrixIndicesStatus, matrixIndicesUrl, matrixIndicesError,] = useObsFeatureMatrixIndices(loaders, dataset, false, { obsType, featureType, featureValueType });
|
|
37
|
-
const [{ obsSets: cellSets }, obsSetsStatus, obsSetsUrl, obsSetsError,] = useObsSetsData(loaders, dataset, true, {}, {}, { obsType });
|
|
37
|
+
const [{ obsSets: cellSets, obsSetsColumns }, obsSetsStatus, obsSetsUrl, obsSetsError,] = useObsSetsData(loaders, dataset, true, {}, {}, { obsType });
|
|
38
38
|
const [{ sampleSets }, sampleSetsStatus, sampleSetsUrl, sampleSetsError,] = useSampleSetsData(loaders, dataset, false, {}, {}, { sampleType });
|
|
39
39
|
const [{ sampleEdges }, sampleEdgesStatus, sampleEdgesUrl, sampleEdgesError,] = useSampleEdgesData(loaders, dataset, false, {}, {}, { obsType, sampleType });
|
|
40
40
|
// Consolidate error values from data hooks.
|
|
@@ -61,7 +61,7 @@ export function DotPlotSubscriber(props) {
|
|
|
61
61
|
sampleSetsUrl,
|
|
62
62
|
sampleEdgesUrl,
|
|
63
63
|
]);
|
|
64
|
-
const [resultArr, meanExpressionMax] = useExpressionSummaries(sampleEdges, sampleSets, sampleSetSelection, expressionData, obsIndex, cellSets, additionalCellSets, geneSelection, cellSetSelection, cellSetColor, featureValueTransform, featureValueTransformCoefficient, posThreshold, featureLabelsMap);
|
|
64
|
+
const [resultArr, meanExpressionMax] = useExpressionSummaries(sampleEdges, sampleSets, sampleSetSelection, expressionData, obsIndex, cellSets, additionalCellSets, geneSelection, cellSetSelection, cellSetColor, featureValueTransform, featureValueTransformCoefficient, posThreshold, featureLabelsMap, obsSetsColumns);
|
|
65
65
|
const selectedTransformName = transformOptions.find(o => o.value === featureValueTransform)?.name;
|
|
66
66
|
// eslint-disable-next-line no-unused-vars
|
|
67
67
|
const onDotSelect = useCallback((featureName, isShiftDown = false) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DotPlotSubscriber.js","sourceRoot":"","sources":["../src/DotPlotSubscriber.js"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"DotPlotSubscriber.js","sourceRoot":"","sources":["../src/DotPlotSubscriber.js"],"names":[],"mappings":"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"}
|
|
@@ -19,5 +19,5 @@
|
|
|
19
19
|
* @param {string} theme "light" or "dark" for the vitessce theme
|
|
20
20
|
* `path` and `color`.
|
|
21
21
|
*/
|
|
22
|
-
export function useExpressionSummaries(sampleEdges: any, sampleSets: any, sampleSetSelection: any, expressionData: any, obsIndex: any, cellSets: object, additionalCellSets: object, geneSelection: array, cellSetSelection: array, cellSetColor: object[], featureValueTransform: string | null, featureValueTransformCoefficient: number, posThreshold: any, featureLabelsMap: any): any[];
|
|
22
|
+
export function useExpressionSummaries(sampleEdges: any, sampleSets: any, sampleSetSelection: any, expressionData: any, obsIndex: any, cellSets: object, additionalCellSets: object, geneSelection: array, cellSetSelection: array, cellSetColor: object[], featureValueTransform: string | null, featureValueTransformCoefficient: number, posThreshold: any, featureLabelsMap: any, obsSetsColumns: any): any[];
|
|
23
23
|
//# sourceMappingURL=dot-plot-hook.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dot-plot-hook.d.ts","sourceRoot":"","sources":["../src/dot-plot-hook.js"],"names":[],"mappings":"AAYA;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,iJAbW,MAAM,sBACN,MAAM,iBAEN,KAAK,oBACL,KAAK,gBACL,MAAM,EAAE,yBACR,MAAM,GAAC,IAAI,oCAEX,MAAM,
|
|
1
|
+
{"version":3,"file":"dot-plot-hook.d.ts","sourceRoot":"","sources":["../src/dot-plot-hook.js"],"names":[],"mappings":"AAYA;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,iJAbW,MAAM,sBACN,MAAM,iBAEN,KAAK,oBACL,KAAK,gBACL,MAAM,EAAE,yBACR,MAAM,GAAC,IAAI,oCAEX,MAAM,wEAgFhB"}
|
|
@@ -25,12 +25,14 @@ import { dotStratifiedExpressionData, } from './expr-hooks.js';
|
|
|
25
25
|
* @param {string} theme "light" or "dark" for the vitessce theme
|
|
26
26
|
* `path` and `color`.
|
|
27
27
|
*/
|
|
28
|
-
export function useExpressionSummaries(sampleEdges, sampleSets, sampleSetSelection, expressionData, obsIndex, cellSets, additionalCellSets, geneSelection, cellSetSelection, cellSetColor, featureValueTransform, featureValueTransformCoefficient, posThreshold, featureLabelsMap) {
|
|
28
|
+
export function useExpressionSummaries(sampleEdges, sampleSets, sampleSetSelection, expressionData, obsIndex, cellSets, additionalCellSets, geneSelection, cellSetSelection, cellSetColor, featureValueTransform, featureValueTransformCoefficient, posThreshold, featureLabelsMap, obsSetsColumns) {
|
|
29
29
|
const mergedCellSets = useMemo(() => mergeObsSets(cellSets, additionalCellSets), [cellSets, additionalCellSets]);
|
|
30
30
|
// From the expression matrix and the list of selected genes / cell sets,
|
|
31
31
|
// generate the array of data points for the plot.
|
|
32
32
|
const [resultArr, meanExpressionMax] = useMemo(() => {
|
|
33
|
-
const [stratifiedData, exprMax] = stratifyExpressionData(sampleEdges, sampleSets, sampleSetSelection, expressionData, obsIndex, mergedCellSets, geneSelection, cellSetSelection, cellSetColor, featureValueTransform, featureValueTransformCoefficient
|
|
33
|
+
const [stratifiedData, exprMax] = stratifyExpressionData(sampleEdges, sampleSets, sampleSetSelection, expressionData, obsIndex, mergedCellSets, geneSelection, cellSetSelection, cellSetColor, featureValueTransform, featureValueTransformCoefficient,
|
|
34
|
+
// Raw codes let the strata come from typed arrays when the indices match.
|
|
35
|
+
{ obsSetsColumns });
|
|
34
36
|
if (stratifiedData) {
|
|
35
37
|
const dotData = dotStratifiedExpressionData(stratifiedData, posThreshold);
|
|
36
38
|
const geneToUuid = new Map(geneSelection?.map(gene => [gene, uuidv4()]));
|
|
@@ -63,7 +65,7 @@ export function useExpressionSummaries(sampleEdges, sampleSets, sampleSetSelecti
|
|
|
63
65
|
mergedCellSets, cellSetSelection,
|
|
64
66
|
featureValueTransform, featureValueTransformCoefficient,
|
|
65
67
|
posThreshold, featureLabelsMap,
|
|
66
|
-
sampleEdges, sampleSets, sampleSetSelection,
|
|
68
|
+
sampleEdges, sampleSets, sampleSetSelection, obsSetsColumns,
|
|
67
69
|
]);
|
|
68
70
|
return [resultArr, meanExpressionMax];
|
|
69
71
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dot-plot-hook.js","sourceRoot":"","sources":["../src/dot-plot-hook.js"],"names":[],"mappings":"AAAA,4BAA4B;AAC5B,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,EAAE,IAAI,MAAM,EAAE,MAAM,MAAM,CAAC;AACpC,OAAO,EACL,YAAY,EACZ,sBAAsB,GACvB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,2BAA2B,GAC5B,MAAM,iBAAiB,CAAC;AAEzB;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,MAAM,UAAU,sBAAsB,CACpC,WAAW,EAAE,UAAU,EAAE,kBAAkB,EAC3C,cAAc,EAAE,QAAQ,EAAE,QAAQ,EAAE,kBAAkB,EACtD,aAAa,EAAE,gBAAgB,EAAE,YAAY,EAC7C,qBAAqB,EAAE,gCAAgC,EACvD,YAAY,EAAE,gBAAgB;
|
|
1
|
+
{"version":3,"file":"dot-plot-hook.js","sourceRoot":"","sources":["../src/dot-plot-hook.js"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@vitessce/statistical-plots",
|
|
3
|
-
"version": "4.0.
|
|
3
|
+
"version": "4.0.6",
|
|
4
4
|
"author": "HIDIVE Lab at HMS",
|
|
5
5
|
"homepage": "http://vitessce.io",
|
|
6
6
|
"repository": {
|
|
@@ -28,13 +28,13 @@
|
|
|
28
28
|
"react-aria": "^3.47.0",
|
|
29
29
|
"internmap": "^2.0.3",
|
|
30
30
|
"uuid": "^9.0.0",
|
|
31
|
-
"@vitessce/
|
|
32
|
-
"@vitessce/
|
|
33
|
-
"@vitessce/
|
|
34
|
-
"@vitessce/constants-internal": "4.0.
|
|
35
|
-
"@vitessce/vit-s": "4.0.
|
|
36
|
-
"@vitessce/
|
|
37
|
-
"@vitessce/
|
|
31
|
+
"@vitessce/styles": "4.0.6",
|
|
32
|
+
"@vitessce/sets-utils": "4.0.6",
|
|
33
|
+
"@vitessce/vega": "4.0.6",
|
|
34
|
+
"@vitessce/constants-internal": "4.0.6",
|
|
35
|
+
"@vitessce/vit-s": "4.0.6",
|
|
36
|
+
"@vitessce/gl": "4.0.6",
|
|
37
|
+
"@vitessce/utils": "4.0.6"
|
|
38
38
|
},
|
|
39
39
|
"devDependencies": {
|
|
40
40
|
"react": "19.2.6",
|
|
@@ -74,6 +74,7 @@ function useExpressionByCellSet(
|
|
|
74
74
|
geneSelection, cellSetSelection, cellSetColor,
|
|
75
75
|
featureValueTransform, featureValueTransformCoefficient,
|
|
76
76
|
theme, yMinProp, featureAggregationStrategy,
|
|
77
|
+
obsSetsColumns,
|
|
77
78
|
) {
|
|
78
79
|
const mergedCellSets = useMemo(
|
|
79
80
|
() => mergeObsSets(cellSets, additionalCellSets),
|
|
@@ -88,6 +89,8 @@ function useExpressionByCellSet(
|
|
|
88
89
|
expressionData, obsIndex, mergedCellSets,
|
|
89
90
|
geneSelection, cellSetSelection, cellSetColor,
|
|
90
91
|
featureValueTransform, featureValueTransformCoefficient,
|
|
92
|
+
// Raw codes let the strata come from typed arrays when the indices match.
|
|
93
|
+
{ obsSetsColumns },
|
|
91
94
|
);
|
|
92
95
|
if (stratifiedData) {
|
|
93
96
|
const aggregateData = aggregateStratifiedExpressionData(
|
|
@@ -106,7 +109,7 @@ function useExpressionByCellSet(
|
|
|
106
109
|
mergedCellSets, cellSetSelection, cellSetColor,
|
|
107
110
|
featureValueTransform, featureValueTransformCoefficient,
|
|
108
111
|
yMinProp, sampleEdges, sampleSets, sampleSetSelection,
|
|
109
|
-
featureAggregationStrategy,
|
|
112
|
+
featureAggregationStrategy, obsSetsColumns,
|
|
110
113
|
]);
|
|
111
114
|
|
|
112
115
|
// From the cell sets hierarchy and the list of selected cell sets,
|
|
@@ -207,7 +210,9 @@ export function CellSetExpressionPlotSubscriber(props) {
|
|
|
207
210
|
loaders, dataset, false,
|
|
208
211
|
{ obsType, featureType, featureValueType },
|
|
209
212
|
);
|
|
210
|
-
const [
|
|
213
|
+
const [
|
|
214
|
+
{ obsSets: cellSets, obsSetsColumns }, obsSetsStatus, obsSetsUrls, obsSetsError,
|
|
215
|
+
] = useObsSetsData(
|
|
211
216
|
loaders, dataset, true, {}, {},
|
|
212
217
|
{ obsType },
|
|
213
218
|
);
|
|
@@ -263,6 +268,7 @@ export function CellSetExpressionPlotSubscriber(props) {
|
|
|
263
268
|
geneSelection, cellSetSelection, cellSetColor,
|
|
264
269
|
featureValueTransform, featureValueTransformCoefficient,
|
|
265
270
|
theme, yMin, featureAggregationStrategyToUse,
|
|
271
|
+
obsSetsColumns,
|
|
266
272
|
);
|
|
267
273
|
|
|
268
274
|
const featureSuffix = useMemo(() => {
|
package/src/DotPlotSubscriber.js
CHANGED
|
@@ -96,7 +96,7 @@ export function DotPlotSubscriber(props) {
|
|
|
96
96
|
{ obsType, featureType, featureValueType },
|
|
97
97
|
);
|
|
98
98
|
const [
|
|
99
|
-
{ obsSets: cellSets }, obsSetsStatus, obsSetsUrl, obsSetsError,
|
|
99
|
+
{ obsSets: cellSets, obsSetsColumns }, obsSetsStatus, obsSetsUrl, obsSetsError,
|
|
100
100
|
] = useObsSetsData(
|
|
101
101
|
loaders, dataset, true, {}, {},
|
|
102
102
|
{ obsType },
|
|
@@ -148,7 +148,7 @@ export function DotPlotSubscriber(props) {
|
|
|
148
148
|
geneSelection, cellSetSelection, cellSetColor,
|
|
149
149
|
featureValueTransform, featureValueTransformCoefficient,
|
|
150
150
|
posThreshold, featureLabelsMap,
|
|
151
|
-
|
|
151
|
+
obsSetsColumns,
|
|
152
152
|
);
|
|
153
153
|
const selectedTransformName = transformOptions.find(
|
|
154
154
|
o => o.value === featureValueTransform,
|
package/src/dot-plot-hook.js
CHANGED
|
@@ -37,6 +37,7 @@ export function useExpressionSummaries(
|
|
|
37
37
|
geneSelection, cellSetSelection, cellSetColor,
|
|
38
38
|
featureValueTransform, featureValueTransformCoefficient,
|
|
39
39
|
posThreshold, featureLabelsMap,
|
|
40
|
+
obsSetsColumns,
|
|
40
41
|
) {
|
|
41
42
|
const mergedCellSets = useMemo(
|
|
42
43
|
() => mergeObsSets(cellSets, additionalCellSets),
|
|
@@ -51,6 +52,8 @@ export function useExpressionSummaries(
|
|
|
51
52
|
expressionData, obsIndex, mergedCellSets,
|
|
52
53
|
geneSelection, cellSetSelection, cellSetColor,
|
|
53
54
|
featureValueTransform, featureValueTransformCoefficient,
|
|
55
|
+
// Raw codes let the strata come from typed arrays when the indices match.
|
|
56
|
+
{ obsSetsColumns },
|
|
54
57
|
);
|
|
55
58
|
if (stratifiedData) {
|
|
56
59
|
const dotData = dotStratifiedExpressionData(
|
|
@@ -99,7 +102,7 @@ export function useExpressionSummaries(
|
|
|
99
102
|
mergedCellSets, cellSetSelection,
|
|
100
103
|
featureValueTransform, featureValueTransformCoefficient,
|
|
101
104
|
posThreshold, featureLabelsMap,
|
|
102
|
-
sampleEdges, sampleSets, sampleSetSelection,
|
|
105
|
+
sampleEdges, sampleSets, sampleSetSelection, obsSetsColumns,
|
|
103
106
|
]);
|
|
104
107
|
|
|
105
108
|
return [resultArr, meanExpressionMax];
|