@vitessce/comparative 4.1.3 → 4.2.0
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/{GeometryAndMeshXR-CqZrKpgj.js → GeometryAndMeshXR-CYO2tqUV.js} +1 -1
- package/dist/ReactNeuroglancer-pk3hhe45.js +68657 -0
- package/dist/{XREnterButton-CSyePMXM.js → XREnterButton-BdEVWrV7.js} +1 -1
- package/dist/{XRSceneComponents-lFaSg5aj.js → XRSceneComponents-DYeS3CwE.js} +1 -1
- package/dist/{XRWrapper-CVhBuEjL.js → XRWrapper-DbheKuSQ.js} +2 -2
- package/dist/{deflate-BXZYC1-Y.js → deflate-D76idIbp.js} +1 -1
- package/dist/{higlass-DE1ZWzP3.js → higlass-HE5ijNPv.js} +1 -1
- package/dist/{index-BW8y8e2T.js → index-CSfNzXQa.js} +125915 -124333
- package/dist/index-DOITJzp5.js +30089 -0
- package/dist/{index-DzznGedr.js → index-DeGz6Kci.js} +1 -1
- package/dist/{index-BeGaR3Mx.js → index-YJLqH5aL.js} +4 -4
- package/dist/index.min.js +20 -20
- package/dist/{jpeg-sFJJnIsn.js → jpeg-CtV9axAi.js} +1 -1
- package/dist/{lerc-BtLFACSi.js → lerc-C2iyBV3P.js} +1 -1
- package/dist/{lzw-_ihEMKTy.js → lzw-BDK3wuTu.js} +1 -1
- package/dist/{packbits-CJ9ZtM9C.js → packbits-BmhmFJpE.js} +1 -1
- package/dist/{raw-FSjtk0dS.js → raw-AV6N1HZT.js} +1 -1
- package/dist/{webimage-BmQdgUV0.js → webimage-D8fd9G2X.js} +1 -1
- package/dist/{xrStore-C-wbuI_U.js → xrStore-B_SjnbWm.js} +1 -1
- package/dist-tsc/BiomarkerSelect.d.ts +19 -1
- package/dist-tsc/BiomarkerSelect.d.ts.map +1 -1
- package/dist-tsc/BiomarkerSelect.js +46 -39
- package/dist-tsc/BiomarkerSelect.js.map +1 -1
- package/dist-tsc/ComparativeConfig.d.ts +112 -3
- package/dist-tsc/ComparativeConfig.d.ts.map +1 -1
- package/dist-tsc/ComparativeConfig.js +255 -13
- package/dist-tsc/ComparativeConfig.js.map +1 -1
- package/dist-tsc/ComparativeConfig.test.d.ts +2 -0
- package/dist-tsc/ComparativeConfig.test.d.ts.map +1 -0
- package/dist-tsc/ComparativeConfig.test.js +119 -0
- package/dist-tsc/ComparativeConfig.test.js.map +1 -0
- package/dist-tsc/ControlledComparative.d.ts +13 -3
- package/dist-tsc/ControlledComparative.d.ts.map +1 -1
- package/dist-tsc/ControlledComparative.js +32 -14
- package/dist-tsc/ControlledComparative.js.map +1 -1
- package/dist-tsc/UncontrolledComparative.d.ts.map +1 -1
- package/dist-tsc/UncontrolledComparative.js +39 -12
- package/dist-tsc/UncontrolledComparative.js.map +1 -1
- package/dist-tsc/url-params.d.ts +24 -0
- package/dist-tsc/url-params.d.ts.map +1 -0
- package/dist-tsc/url-params.js +32 -0
- package/dist-tsc/url-params.js.map +1 -0
- package/dist-tsc/url-params.test.d.ts +2 -0
- package/dist-tsc/url-params.test.d.ts.map +1 -0
- package/dist-tsc/url-params.test.js +18 -0
- package/dist-tsc/url-params.test.js.map +1 -0
- package/package.json +15 -13
- package/src/BiomarkerSelect.jsx +70 -45
- package/src/ComparativeConfig.jsx +295 -13
- package/src/ComparativeConfig.test.jsx +151 -0
- package/src/ControlledComparative.jsx +47 -13
- package/src/UncontrolledComparative.jsx +62 -16
- package/src/url-params.js +34 -0
- package/src/url-params.test.js +20 -0
- package/dist/ReactNeuroglancer-CsYUFP61.js +0 -43672
|
@@ -4,13 +4,20 @@ import { jsx as _jsx } from "react/jsx-runtime";
|
|
|
4
4
|
import React, { useMemo, useState, useCallback } from 'react';
|
|
5
5
|
import { Vitessce } from '@vitessce/all';
|
|
6
6
|
import { isEqual } from 'lodash-es';
|
|
7
|
-
import { ComparativePageComponent, generateComparativeConfig } from './ComparativeConfig.jsx';
|
|
7
|
+
import { ComparativePageComponent, generateComparativeConfig, getSelectedModality, resolveSelectedModality, withSelectedModality, } from './ComparativeConfig.jsx';
|
|
8
8
|
/**
|
|
9
9
|
* A controlled component for comparative visualization that synchronizes
|
|
10
10
|
* gene selection and sample set selection state with its parent.
|
|
11
11
|
* @param {object} props
|
|
12
|
-
*
|
|
13
|
-
*
|
|
12
|
+
* At least one of singleCellDatasetUrl or singleNucleusDatasetUrl must be provided.
|
|
13
|
+
* @param {string} [props.singleCellDatasetUrl] - URL to the single-cell
|
|
14
|
+
* comparative AnnData-Zarr store.
|
|
15
|
+
* @param {string} [props.singleNucleusDatasetUrl] - URL to the single-nucleus
|
|
16
|
+
* comparative AnnData-Zarr store.
|
|
17
|
+
* @param {string} [props.selectedModality] - The modality currently being viewed
|
|
18
|
+
* (one of 'sc-rna-seq' or 'sn-rna-seq'). By default, the first modality for which a URL was provided.
|
|
19
|
+
* @param {Function} [props.setSelectedModality] - Setter function
|
|
20
|
+
* called when the selected modality has been updated from inside.
|
|
14
21
|
* @param {string[]} props.geneSelection - Array of selected gene names.
|
|
15
22
|
* @param {Function} props.setGeneSelection - Setter function
|
|
16
23
|
* called when the gene selection has been updated from inside.
|
|
@@ -25,26 +32,32 @@ import { ComparativePageComponent, generateComparativeConfig } from './Comparati
|
|
|
25
32
|
* @returns {React.ReactElement} The comparative visualization component.
|
|
26
33
|
*/
|
|
27
34
|
export function ControlledComparative(props) {
|
|
28
|
-
const {
|
|
29
|
-
const initialConfig = useMemo(() => generateComparativeConfig(
|
|
35
|
+
const { singleCellDatasetUrl, singleNucleusDatasetUrl, selectedModality: selectedModalityProp, setSelectedModality, geneSelection, setGeneSelection, sampleSetSelection, setSampleSetSelection, theme = 'light2', debugMode = false, logLevel = undefined, } = props;
|
|
36
|
+
const initialConfig = useMemo(() => generateComparativeConfig({ singleCellDatasetUrl, singleNucleusDatasetUrl }, false), [singleCellDatasetUrl, singleNucleusDatasetUrl]);
|
|
37
|
+
// Fall back to the first available modality if the selected one is not available.
|
|
38
|
+
const selectedModality = useMemo(() => resolveSelectedModality(initialConfig.datasets.map(d => d.uid), selectedModalityProp), [initialConfig, selectedModalityProp]);
|
|
30
39
|
const [currentConfig, setCurrentConfig] = useState(null);
|
|
31
40
|
// Merge currentConfig with geneSelection and sampleSetSelection,
|
|
32
41
|
// which may have been updated from outside Vitessce (e.g., from URL params).
|
|
33
42
|
const mergedConfig = useMemo(() => {
|
|
34
43
|
if (!currentConfig) {
|
|
35
|
-
return initialConfig;
|
|
44
|
+
return withSelectedModality(initialConfig, selectedModality);
|
|
36
45
|
}
|
|
37
46
|
// Merge currentConfig with geneSelection and sampleSetSelection.
|
|
38
|
-
|
|
39
|
-
|
|
47
|
+
// Note: null is a valid value, which represents a cleared selection
|
|
48
|
+
// (e.g., after selecting "All" in the "In group" dropdown of the BiomarkerSelect UI).
|
|
49
|
+
const isValidGeneSelection = geneSelection === null || (Array.isArray(geneSelection) && geneSelection.every(g => typeof g === 'string'));
|
|
50
|
+
const isValidSampleSetSelection = sampleSetSelection === null || (Array.isArray(sampleSetSelection) && sampleSetSelection.every(s => Array.isArray(s) && s.every(t => typeof t === 'string')));
|
|
40
51
|
// Check if geneSelection or sampleSetSelection have changed before specifying a different config.uid value.
|
|
41
52
|
const prevGeneSelection = currentConfig.coordinationSpace?.featureSelection?.__comparison__;
|
|
42
53
|
const prevSampleSetSelection = currentConfig.coordinationSpace?.sampleSetSelection?.__comparison__;
|
|
54
|
+
const prevModality = getSelectedModality(currentConfig);
|
|
43
55
|
if (isEqual(prevGeneSelection, geneSelection)
|
|
44
|
-
&& isEqual(prevSampleSetSelection, sampleSetSelection)
|
|
56
|
+
&& isEqual(prevSampleSetSelection, sampleSetSelection)
|
|
57
|
+
&& prevModality === selectedModality) {
|
|
45
58
|
return currentConfig;
|
|
46
59
|
}
|
|
47
|
-
const newConfig = {
|
|
60
|
+
const newConfig = withSelectedModality({
|
|
48
61
|
...currentConfig,
|
|
49
62
|
// Note: this forces Vitessce to re-initialize the coordination space for featureSelection and sampleSetSelection,
|
|
50
63
|
// but it also causes the data to be re-loaded.
|
|
@@ -64,10 +77,9 @@ export function ControlledComparative(props) {
|
|
|
64
77
|
: currentConfig.coordinationSpace?.sampleSetSelection?.__comparison__),
|
|
65
78
|
},
|
|
66
79
|
},
|
|
67
|
-
};
|
|
68
|
-
// console.log(geneSelection, isValidGeneSelection, newConfig);
|
|
80
|
+
}, selectedModality);
|
|
69
81
|
return newConfig;
|
|
70
|
-
}, [initialConfig, currentConfig, geneSelection, sampleSetSelection]);
|
|
82
|
+
}, [initialConfig, currentConfig, geneSelection, sampleSetSelection, selectedModality]);
|
|
71
83
|
const onConfigChange = useCallback((newConfig) => {
|
|
72
84
|
// Listen for changes to the config from inside vITESSCE
|
|
73
85
|
setCurrentConfig(newConfig);
|
|
@@ -89,7 +101,13 @@ export function ControlledComparative(props) {
|
|
|
89
101
|
if (hasNewSampleSetSelection) {
|
|
90
102
|
setSampleSetSelection(newSampleSetSelection);
|
|
91
103
|
}
|
|
92
|
-
|
|
104
|
+
// Was a different modality (i.e., dataset) selected from inside Vitessce?
|
|
105
|
+
const newModality = getSelectedModality(newConfig);
|
|
106
|
+
if (typeof newModality === 'string' && newModality !== selectedModality) {
|
|
107
|
+
setSelectedModality?.(newModality);
|
|
108
|
+
}
|
|
109
|
+
}, [geneSelection, sampleSetSelection, selectedModality,
|
|
110
|
+
setGeneSelection, setSampleSetSelection, setSelectedModality]);
|
|
93
111
|
const didFirstValidation = currentConfig !== null;
|
|
94
112
|
return (_jsx("div", { children: _jsx(Vitessce, { config: mergedConfig, onConfigChange: onConfigChange, remountOnUidChange: false, validateConfig: !didFirstValidation, validateOnConfigChange: false, rowHeight: null, theme: theme, pageMode: true, debugMode: debugMode, logLevel: logLevel, children: _jsx(ComparativePageComponent, {}) }) }));
|
|
95
113
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ControlledComparative.js","sourceRoot":"","sources":["../src/ControlledComparative.jsx"],"names":[],"mappings":";AAAA,4BAA4B;AAC5B,yCAAyC;AACzC,OAAO,KAAK,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,
|
|
1
|
+
{"version":3,"file":"ControlledComparative.js","sourceRoot":"","sources":["../src/ControlledComparative.jsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UncontrolledComparative.d.ts","sourceRoot":"","sources":["../src/UncontrolledComparative.jsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"UncontrolledComparative.d.ts","sourceRoot":"","sources":["../src/UncontrolledComparative.jsx"],"names":[],"mappings":"AAqHA;;;;;;;GAOG;AACH,+CAHW,GAAC,OAWX"}
|
|
@@ -1,41 +1,68 @@
|
|
|
1
1
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
2
|
/* eslint-disable max-len */
|
|
3
3
|
/* eslint-disable react-refresh/only-export-components */
|
|
4
|
-
import React, { useState } from 'react';
|
|
4
|
+
import React, { useState, useCallback } from 'react';
|
|
5
5
|
// eslint-disable-next-line import/no-unresolved
|
|
6
6
|
import { NuqsAdapter } from 'nuqs/adapters/react';
|
|
7
|
-
import { useQueryState, parseAsString, parseAsArrayOf } from 'nuqs';
|
|
7
|
+
import { useQueryState, parseAsString, parseAsArrayOf, parseAsStringLiteral, } from 'nuqs';
|
|
8
8
|
import { ControlledComparative } from './ControlledComparative.jsx';
|
|
9
9
|
import { BiomarkerSelect } from './BiomarkerSelect.jsx';
|
|
10
|
+
import { COMPARATIVE_MODALITIES } from './ComparativeConfig.jsx';
|
|
11
|
+
import { parseAsBiomarker } from './url-params.js';
|
|
12
|
+
const MODALITY_UIDS = COMPARATIVE_MODALITIES.map(m => m.uid);
|
|
10
13
|
/**
|
|
11
14
|
* The UncontrolledComparative component is a wrapper
|
|
12
15
|
* around the ControlledComparative and BiomarkerSelect components.
|
|
13
16
|
* @param {object} props
|
|
14
|
-
*
|
|
15
|
-
*
|
|
17
|
+
* At least one of singleCellDatasetUrl or singleNucleusDatasetUrl must be provided.
|
|
18
|
+
* When both are provided, the user can switch between modalities.
|
|
19
|
+
* @param {string} [props.singleCellDatasetUrl] URL of the single-cell
|
|
20
|
+
* dataset to load, which should point to the root of an anndata-zarr store,
|
|
21
|
+
* containing comparative metadata.
|
|
22
|
+
* @param {string} [props.singleNucleusDatasetUrl] URL of the single-nucleus
|
|
23
|
+
* dataset to load, which should point to the root of an anndata-zarr store,
|
|
16
24
|
* containing comparative metadata.
|
|
17
25
|
* @param {boolean} props.enableQueryParams Whether to
|
|
18
|
-
* sync state to the URL query parameters for gene
|
|
19
|
-
* sample set selection. By default, true.
|
|
26
|
+
* sync state to the URL query parameters for feature (e.g., gene or pathway),
|
|
27
|
+
* sample set, and modality selection. By default, true.
|
|
28
|
+
* The `feature` URL param is formatted like `nodeType:label`,
|
|
29
|
+
* e.g., `?feature=gene:UMOD` or `?feature=pathway:Cell Cycle R-HSA-1640170`.
|
|
20
30
|
* @returns {JSX.Element}
|
|
21
31
|
*/
|
|
22
32
|
function UncontrolledComparativeInner(props) {
|
|
23
|
-
const {
|
|
24
|
-
const [
|
|
33
|
+
const { singleCellDatasetUrl, singleNucleusDatasetUrl, enableQueryParams = true, } = props;
|
|
34
|
+
const [biomarkerSelectionViaUrl, setBiomarkerSelectionViaUrl] = useQueryState('feature', parseAsBiomarker);
|
|
25
35
|
const [sampleSetSelectionViaUrl, setSampleSetSelectionViaUrl] = useQueryState('groups', parseAsArrayOf(parseAsArrayOf(parseAsString)));
|
|
26
|
-
const [
|
|
36
|
+
const [modalitySelectionViaUrl, setModalitySelectionViaUrl] = useQueryState('modality', parseAsStringLiteral(MODALITY_UIDS));
|
|
37
|
+
const [biomarkerSelectionNonUrl, setBiomarkerSelectionNonUrl] = useState(null);
|
|
27
38
|
const [sampleSetSelectionNonUrl, setSampleSetSelectionNonUrl] = useState([]);
|
|
39
|
+
const [modalitySelectionNonUrl, setModalitySelectionNonUrl] = useState(null);
|
|
28
40
|
// Depending on the value of enableQueryParams,
|
|
29
41
|
// we either use the state that is synced to the URL query parameters,
|
|
30
42
|
// or we use local state that is not synced to the URL.
|
|
31
|
-
const
|
|
32
|
-
const
|
|
43
|
+
const biomarkerSelection = enableQueryParams ? biomarkerSelectionViaUrl : biomarkerSelectionNonUrl;
|
|
44
|
+
const setBiomarkerSelection = enableQueryParams ? setBiomarkerSelectionViaUrl : setBiomarkerSelectionNonUrl;
|
|
33
45
|
const sampleSetSelection = enableQueryParams ? sampleSetSelectionViaUrl : sampleSetSelectionNonUrl;
|
|
34
46
|
const setSampleSetSelection = enableQueryParams ? setSampleSetSelectionViaUrl : setSampleSetSelectionNonUrl;
|
|
47
|
+
const selectedModality = enableQueryParams ? modalitySelectionViaUrl : modalitySelectionNonUrl;
|
|
48
|
+
const setSelectedModality = enableQueryParams ? setModalitySelectionViaUrl : setModalitySelectionNonUrl;
|
|
49
|
+
// The gene selection is not synced to the URL, since it is derived
|
|
50
|
+
// from the biomarker selection (e.g., the member genes of a selected pathway)
|
|
51
|
+
// by the biomarkerSelectAlt view.
|
|
52
|
+
const [geneSelection, setGeneSelection] = useState(null);
|
|
53
|
+
// When genes are selected from inside the comparative views
|
|
54
|
+
// (e.g., by clicking a point in the volcano plot), update the biomarker selection accordingly.
|
|
55
|
+
const setGeneSelectionFromComparative = useCallback((newGeneSelection) => {
|
|
56
|
+
setGeneSelection(newGeneSelection);
|
|
57
|
+
setBiomarkerSelection(Array.isArray(newGeneSelection) && newGeneSelection.length === 1
|
|
58
|
+
? { label: newGeneSelection[0], nodeType: 'gene' }
|
|
59
|
+
// Multiple genes cannot be represented by a single biomarker selection.
|
|
60
|
+
: null);
|
|
61
|
+
}, [setBiomarkerSelection]);
|
|
35
62
|
if (Array.isArray(sampleSetSelection) && sampleSetSelection.length > 2) {
|
|
36
63
|
throw new Error('groups query param array can have at most two entries.');
|
|
37
64
|
}
|
|
38
|
-
return (_jsxs("div", { children: [_jsx(BiomarkerSelect, {
|
|
65
|
+
return (_jsxs("div", { children: [_jsx(BiomarkerSelect, { singleCellDatasetUrl: singleCellDatasetUrl, singleNucleusDatasetUrl: singleNucleusDatasetUrl, selectedModality: selectedModality, setSelectedModality: setSelectedModality, biomarkerSelection: biomarkerSelection, setBiomarkerSelection: setBiomarkerSelection, geneSelection: geneSelection, setGeneSelection: setGeneSelection, sampleSetSelection: sampleSetSelection, setSampleSetSelection: setSampleSetSelection }), _jsx(ControlledComparative, { singleCellDatasetUrl: singleCellDatasetUrl, singleNucleusDatasetUrl: singleNucleusDatasetUrl, selectedModality: selectedModality, setSelectedModality: setSelectedModality, geneSelection: geneSelection, setGeneSelection: setGeneSelectionFromComparative, sampleSetSelection: sampleSetSelection, setSampleSetSelection: setSampleSetSelection })] }));
|
|
39
66
|
}
|
|
40
67
|
/**
|
|
41
68
|
* The UncontrolledComparative component is a Provider component
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UncontrolledComparative.js","sourceRoot":"","sources":["../src/UncontrolledComparative.jsx"],"names":[],"mappings":";AAAA,4BAA4B;AAC5B,yDAAyD;AACzD,OAAO,KAAK,EAAE,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"UncontrolledComparative.js","sourceRoot":"","sources":["../src/UncontrolledComparative.jsx"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Parse the value of the `feature` URL param,
|
|
3
|
+
* formatted like `nodeType:label` (e.g., `gene:UMOD` or `pathway:Cell Cycle R-HSA-1640170`).
|
|
4
|
+
* @param {string} value
|
|
5
|
+
* @returns {{ label: string, nodeType: string } | null}
|
|
6
|
+
*/
|
|
7
|
+
export function parseBiomarkerParam(value: string): {
|
|
8
|
+
label: string;
|
|
9
|
+
nodeType: string;
|
|
10
|
+
} | null;
|
|
11
|
+
/**
|
|
12
|
+
* Serialize a biomarker selection to the `feature` URL param format.
|
|
13
|
+
* @param {{ label: string, nodeType: string }} value
|
|
14
|
+
* @returns {string}
|
|
15
|
+
*/
|
|
16
|
+
export function serializeBiomarkerParam(value: {
|
|
17
|
+
label: string;
|
|
18
|
+
nodeType: string;
|
|
19
|
+
}): string;
|
|
20
|
+
export const parseAsBiomarker: import("nuqs").SingleParserBuilder<{
|
|
21
|
+
label: string;
|
|
22
|
+
nodeType: string;
|
|
23
|
+
}>;
|
|
24
|
+
//# sourceMappingURL=url-params.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"url-params.d.ts","sourceRoot":"","sources":["../src/url-params.js"],"names":[],"mappings":"AAEA;;;;;GAKG;AACH,2CAHW,MAAM,GACJ;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAYtD;AAED;;;;GAIG;AACH,+CAHW;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GACjC,MAAM,CAIlB;AAED;WAvBsB,MAAM;cAAY,MAAM;GA2B3C"}
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
import { createParser } from 'nuqs';
|
|
2
|
+
/**
|
|
3
|
+
* Parse the value of the `feature` URL param,
|
|
4
|
+
* formatted like `nodeType:label` (e.g., `gene:UMOD` or `pathway:Cell Cycle R-HSA-1640170`).
|
|
5
|
+
* @param {string} value
|
|
6
|
+
* @returns {{ label: string, nodeType: string } | null}
|
|
7
|
+
*/
|
|
8
|
+
export function parseBiomarkerParam(value) {
|
|
9
|
+
// Split at the first colon, since the label may contain colons.
|
|
10
|
+
const separatorIndex = value.indexOf(':');
|
|
11
|
+
if (separatorIndex <= 0 || separatorIndex === value.length - 1) {
|
|
12
|
+
return null;
|
|
13
|
+
}
|
|
14
|
+
return {
|
|
15
|
+
nodeType: value.slice(0, separatorIndex),
|
|
16
|
+
label: value.slice(separatorIndex + 1),
|
|
17
|
+
};
|
|
18
|
+
}
|
|
19
|
+
/**
|
|
20
|
+
* Serialize a biomarker selection to the `feature` URL param format.
|
|
21
|
+
* @param {{ label: string, nodeType: string }} value
|
|
22
|
+
* @returns {string}
|
|
23
|
+
*/
|
|
24
|
+
export function serializeBiomarkerParam(value) {
|
|
25
|
+
return `${value.nodeType}:${value.label}`;
|
|
26
|
+
}
|
|
27
|
+
export const parseAsBiomarker = createParser({
|
|
28
|
+
parse: parseBiomarkerParam,
|
|
29
|
+
serialize: serializeBiomarkerParam,
|
|
30
|
+
eq: (a, b) => a.label === b.label && a.nodeType === b.nodeType,
|
|
31
|
+
});
|
|
32
|
+
//# sourceMappingURL=url-params.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"url-params.js","sourceRoot":"","sources":["../src/url-params.js"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,MAAM,CAAC;AAEpC;;;;;GAKG;AACH,MAAM,UAAU,mBAAmB,CAAC,KAAK;IACvC,gEAAgE;IAChE,MAAM,cAAc,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAC1C,IAAI,cAAc,IAAI,CAAC,IAAI,cAAc,KAAK,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC/D,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO;QACL,QAAQ,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,cAAc,CAAC;QACxC,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,cAAc,GAAG,CAAC,CAAC;KACvC,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,uBAAuB,CAAC,KAAK;IAC3C,OAAO,GAAG,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;AAC5C,CAAC;AAED,MAAM,CAAC,MAAM,gBAAgB,GAAG,YAAY,CAAC;IAC3C,KAAK,EAAE,mBAAmB;IAC1B,SAAS,EAAE,uBAAuB;IAClC,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,QAAQ,KAAK,CAAC,CAAC,QAAQ;CAC/D,CAAC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"url-params.test.d.ts","sourceRoot":"","sources":["../src/url-params.test.js"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import { describe, it, expect } from 'vitest';
|
|
2
|
+
import { parseBiomarkerParam, serializeBiomarkerParam } from './url-params.js';
|
|
3
|
+
describe('feature URL param', () => {
|
|
4
|
+
it('parses and serializes genes and pathways', () => {
|
|
5
|
+
expect(parseBiomarkerParam('gene:UMOD')).toEqual({ nodeType: 'gene', label: 'UMOD' });
|
|
6
|
+
const pathway = { nodeType: 'pathway', label: 'Cell Cycle R-HSA-1640170' };
|
|
7
|
+
expect(parseBiomarkerParam(serializeBiomarkerParam(pathway))).toEqual(pathway);
|
|
8
|
+
});
|
|
9
|
+
it('splits at the first colon, since labels may contain colons', () => {
|
|
10
|
+
expect(parseBiomarkerParam('pathway:A: B')).toEqual({ nodeType: 'pathway', label: 'A: B' });
|
|
11
|
+
});
|
|
12
|
+
it('returns null for malformed values', () => {
|
|
13
|
+
expect(parseBiomarkerParam('UMOD')).toBeNull();
|
|
14
|
+
expect(parseBiomarkerParam(':UMOD')).toBeNull();
|
|
15
|
+
expect(parseBiomarkerParam('gene:')).toBeNull();
|
|
16
|
+
});
|
|
17
|
+
});
|
|
18
|
+
//# sourceMappingURL=url-params.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"url-params.test.js","sourceRoot":"","sources":["../src/url-params.test.js"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,mBAAmB,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAE/E,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;IACjC,EAAE,CAAC,0CAA0C,EAAE,GAAG,EAAE;QAClD,MAAM,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;QACtF,MAAM,OAAO,GAAG,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE,0BAA0B,EAAE,CAAC;QAC3E,MAAM,CAAC,mBAAmB,CAAC,uBAAuB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACjF,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4DAA4D,EAAE,GAAG,EAAE;QACpE,MAAM,CAAC,mBAAmB,CAAC,cAAc,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;IAC9F,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mCAAmC,EAAE,GAAG,EAAE;QAC3C,MAAM,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;QAC/C,MAAM,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;QAChD,MAAM,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;IAClD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@vitessce/comparative",
|
|
3
|
-
"version": "4.
|
|
3
|
+
"version": "4.2.0",
|
|
4
4
|
"author": "HIDIVE Lab at HMS",
|
|
5
5
|
"homepage": "http://vitessce.io",
|
|
6
6
|
"repository": {
|
|
@@ -22,23 +22,24 @@
|
|
|
22
22
|
"react-sticky-el": "^2.1.1",
|
|
23
23
|
"react-window": "^1.8.10",
|
|
24
24
|
"nuqs": "^2.6.0",
|
|
25
|
-
"@vitessce/abstract": "4.
|
|
26
|
-
"@vitessce/error": "4.
|
|
27
|
-
"@vitessce/all": "4.
|
|
28
|
-
"@vitessce/
|
|
29
|
-
"@vitessce/
|
|
30
|
-
"@vitessce/export-utils": "4.
|
|
31
|
-
"@vitessce/vit-s": "4.
|
|
32
|
-
"@vitessce/
|
|
33
|
-
"@vitessce/
|
|
34
|
-
"@vitessce/constants-internal": "4.
|
|
25
|
+
"@vitessce/abstract": "4.2.0",
|
|
26
|
+
"@vitessce/error": "4.2.0",
|
|
27
|
+
"@vitessce/all": "4.2.0",
|
|
28
|
+
"@vitessce/config": "4.2.0",
|
|
29
|
+
"@vitessce/constants": "4.2.0",
|
|
30
|
+
"@vitessce/export-utils": "4.2.0",
|
|
31
|
+
"@vitessce/vit-s": "4.2.0",
|
|
32
|
+
"@vitessce/zarr": "4.2.0",
|
|
33
|
+
"@vitessce/styles": "4.2.0",
|
|
34
|
+
"@vitessce/constants-internal": "4.2.0"
|
|
35
35
|
},
|
|
36
36
|
"devDependencies": {
|
|
37
37
|
"@vitejs/plugin-react": "^4.5.0",
|
|
38
38
|
"cross-env": "^7.0.0",
|
|
39
39
|
"rimraf": "^3.0.2",
|
|
40
40
|
"rollup-plugin-visualizer": "^5.8.3",
|
|
41
|
-
"vite": "^7.0.0"
|
|
41
|
+
"vite": "^7.0.0",
|
|
42
|
+
"vitest": "^3.1.4"
|
|
42
43
|
},
|
|
43
44
|
"peerDependencies": {
|
|
44
45
|
"react": "^18.0.0 || ^19.0.0",
|
|
@@ -66,7 +67,8 @@
|
|
|
66
67
|
"build": "rimraf ./dist/ && pnpm run build-lib",
|
|
67
68
|
"build-lib": "pnpm run build-lib:prod",
|
|
68
69
|
"build-lib:prod": "cross-env APP_ENV=production vite build --mode lib",
|
|
69
|
-
"build-lib:dev": "cross-env APP_ENV=development vite build --mode lib"
|
|
70
|
+
"build-lib:dev": "cross-env APP_ENV=development vite build --mode lib",
|
|
71
|
+
"test": "pnpm exec vitest --run"
|
|
70
72
|
},
|
|
71
73
|
"module": "dist/index.min.js",
|
|
72
74
|
"exports": {
|
package/src/BiomarkerSelect.jsx
CHANGED
|
@@ -3,11 +3,35 @@
|
|
|
3
3
|
import React, { useMemo, useState, useCallback } from 'react';
|
|
4
4
|
import { Vitessce } from '@vitessce/all';
|
|
5
5
|
import { isEqual } from 'lodash-es';
|
|
6
|
-
import {
|
|
6
|
+
import {
|
|
7
|
+
BiomarkerSelectPageComponent,
|
|
8
|
+
generateComparativeConfig,
|
|
9
|
+
getSelectedModality,
|
|
10
|
+
getBiomarkerSelection,
|
|
11
|
+
resolveSelectedModality,
|
|
12
|
+
mergeBiomarkerSelectConfig,
|
|
13
|
+
} from './ComparativeConfig.jsx';
|
|
7
14
|
|
|
15
|
+
/**
|
|
16
|
+
* Renders the biomarkerSelectAlt view, synchronizing
|
|
17
|
+
* biomarker selection, gene selection, sample set selection, and modality selection
|
|
18
|
+
* state with its parent.
|
|
19
|
+
* See the ControlledComparative component for documentation of the props.
|
|
20
|
+
* @param {object} props
|
|
21
|
+
* @param {{ label: string, nodeType: string } | null} [props.biomarkerSelection]
|
|
22
|
+
* The selected modality-agnostic item (e.g., gene or pathway),
|
|
23
|
+
* which is transformed into a list of genes (geneSelection) internally.
|
|
24
|
+
* @param {Function} [props.setBiomarkerSelection] Setter function
|
|
25
|
+
* called when the biomarker selection has been updated from inside.
|
|
26
|
+
*/
|
|
8
27
|
export function BiomarkerSelect(props) {
|
|
9
28
|
const {
|
|
10
|
-
|
|
29
|
+
singleCellDatasetUrl,
|
|
30
|
+
singleNucleusDatasetUrl,
|
|
31
|
+
selectedModality: selectedModalityProp,
|
|
32
|
+
setSelectedModality,
|
|
33
|
+
biomarkerSelection,
|
|
34
|
+
setBiomarkerSelection,
|
|
11
35
|
geneSelection,
|
|
12
36
|
sampleSetSelection,
|
|
13
37
|
setGeneSelection,
|
|
@@ -17,42 +41,28 @@ export function BiomarkerSelect(props) {
|
|
|
17
41
|
logLevel = undefined,
|
|
18
42
|
} = props;
|
|
19
43
|
|
|
20
|
-
const initialConfig = useMemo(() => generateComparativeConfig(
|
|
44
|
+
const initialConfig = useMemo(() => generateComparativeConfig(
|
|
45
|
+
{ singleCellDatasetUrl, singleNucleusDatasetUrl },
|
|
46
|
+
true,
|
|
47
|
+
), [singleCellDatasetUrl, singleNucleusDatasetUrl]);
|
|
48
|
+
// Fall back to the first available modality if the selected one is not available.
|
|
49
|
+
const selectedModality = useMemo(() => resolveSelectedModality(
|
|
50
|
+
initialConfig.datasets.map(d => d.uid),
|
|
51
|
+
selectedModalityProp,
|
|
52
|
+
), [initialConfig, selectedModalityProp]);
|
|
21
53
|
const [currentConfig, setCurrentConfig] = useState(null);
|
|
22
54
|
|
|
23
|
-
// Merge currentConfig with
|
|
24
|
-
//
|
|
25
|
-
const mergedConfig = useMemo(() => {
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
...currentConfig,
|
|
35
|
-
coordinationSpace: {
|
|
36
|
-
...currentConfig.coordinationSpace,
|
|
37
|
-
featureSelection: {
|
|
38
|
-
...currentConfig.coordinationSpace?.featureSelection,
|
|
39
|
-
__comparison__: (isValidGeneSelection
|
|
40
|
-
? geneSelection
|
|
41
|
-
: currentConfig.coordinationSpace?.featureSelection?.__comparison__
|
|
42
|
-
),
|
|
43
|
-
},
|
|
44
|
-
sampleSetSelection: {
|
|
45
|
-
...currentConfig.coordinationSpace?.sampleSetSelection,
|
|
46
|
-
__comparison__: (
|
|
47
|
-
isValidSampleSetSelection
|
|
48
|
-
? sampleSetSelection
|
|
49
|
-
: currentConfig.coordinationSpace?.sampleSetSelection?.__comparison__
|
|
50
|
-
),
|
|
51
|
-
},
|
|
52
|
-
},
|
|
53
|
-
};
|
|
54
|
-
return newConfig;
|
|
55
|
-
}, [initialConfig, currentConfig, geneSelection, sampleSetSelection]);
|
|
55
|
+
// Merge currentConfig with the selections that may have been
|
|
56
|
+
// updated from outside Vitessce (e.g., from URL params or ControlledComparative).
|
|
57
|
+
const mergedConfig = useMemo(() => mergeBiomarkerSelectConfig({
|
|
58
|
+
currentConfig,
|
|
59
|
+
initialConfig,
|
|
60
|
+
geneSelection,
|
|
61
|
+
sampleSetSelection,
|
|
62
|
+
biomarkerSelection,
|
|
63
|
+
selectedModality,
|
|
64
|
+
createUid: () => `biomarker-select-${Date.now()}`,
|
|
65
|
+
}), [initialConfig, currentConfig, biomarkerSelection, geneSelection, sampleSetSelection, selectedModality]);
|
|
56
66
|
|
|
57
67
|
const onConfigChange = useCallback((newConfig) => {
|
|
58
68
|
// Listen for changes to the config from inside vITESSCE
|
|
@@ -63,17 +73,16 @@ export function BiomarkerSelect(props) {
|
|
|
63
73
|
const newSampleSetSelection = newConfig.coordinationSpace?.sampleSetSelection?.__comparison__;
|
|
64
74
|
|
|
65
75
|
// Was there a new selection made from inside Vitessce?
|
|
66
|
-
// Note:
|
|
67
|
-
// (
|
|
76
|
+
// Note: unlike in ControlledComparative, here we allow CLEARING the selections
|
|
77
|
+
// (i.e., null or empty array values), since this is the UI from which
|
|
78
|
+
// selections are cleared (e.g., selecting "All" in the "In group" dropdown).
|
|
68
79
|
const hasNewGeneSelection = (
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
&& !isEqual(newFeatureSelection, geneSelection)
|
|
80
|
+
newFeatureSelection !== undefined
|
|
81
|
+
&& !isEqual(newFeatureSelection, geneSelection)
|
|
72
82
|
);
|
|
73
83
|
const hasNewSampleSetSelection = (
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
&& !isEqual(newSampleSetSelection, sampleSetSelection)
|
|
84
|
+
newSampleSetSelection !== undefined
|
|
85
|
+
&& !isEqual(newSampleSetSelection, sampleSetSelection)
|
|
77
86
|
);
|
|
78
87
|
|
|
79
88
|
if (hasNewGeneSelection) {
|
|
@@ -82,7 +91,23 @@ export function BiomarkerSelect(props) {
|
|
|
82
91
|
if (hasNewSampleSetSelection) {
|
|
83
92
|
setSampleSetSelection(newSampleSetSelection);
|
|
84
93
|
}
|
|
85
|
-
|
|
94
|
+
|
|
95
|
+
// Was a different biomarker (e.g., gene or pathway) selected from inside Vitessce?
|
|
96
|
+
const newBiomarkerSelection = getBiomarkerSelection(newConfig);
|
|
97
|
+
if (
|
|
98
|
+
newBiomarkerSelection !== undefined
|
|
99
|
+
&& !isEqual(newBiomarkerSelection, biomarkerSelection)
|
|
100
|
+
) {
|
|
101
|
+
setBiomarkerSelection?.(newBiomarkerSelection);
|
|
102
|
+
}
|
|
103
|
+
|
|
104
|
+
// Was a different modality (i.e., dataset) selected from inside Vitessce?
|
|
105
|
+
const newModality = getSelectedModality(newConfig);
|
|
106
|
+
if (typeof newModality === 'string' && newModality !== selectedModality) {
|
|
107
|
+
setSelectedModality?.(newModality);
|
|
108
|
+
}
|
|
109
|
+
}, [biomarkerSelection, geneSelection, sampleSetSelection, selectedModality,
|
|
110
|
+
setBiomarkerSelection, setGeneSelection, setSampleSetSelection, setSelectedModality]);
|
|
86
111
|
|
|
87
112
|
const didFirstValidation = currentConfig !== null;
|
|
88
113
|
|