@haniffalab/cherita-react 1.4.1 → 1.4.2
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/README.md +1 -1
- package/dist/cjs/components/controls/Controls.js +38 -30
- package/dist/cjs/components/dotplot/Dotplot.js +67 -69
- package/dist/cjs/components/dotplot/DotplotControls.js +103 -83
- package/dist/cjs/components/full-page/FullPage.js +100 -74
- package/dist/cjs/components/full-page/PlotAlert.js +45 -0
- package/dist/cjs/components/full-page/PlotTypeSelector.js +89 -44
- package/dist/cjs/components/heatmap/Heatmap.js +65 -65
- package/dist/cjs/components/heatmap/HeatmapControls.js +6 -3
- package/dist/cjs/components/icons/DotPlotIcon.js +64 -0
- package/dist/cjs/components/icons/HeatmapIcon.js +45 -0
- package/dist/cjs/components/icons/MatrixPlotIcon.1.js +57 -0
- package/dist/cjs/components/icons/MatrixPlotIcon.js +59 -0
- package/dist/cjs/components/icons/ScatterplotIcon.1.js +164 -0
- package/dist/cjs/components/icons/ScatterplotIcon.js +144 -0
- package/dist/cjs/components/icons/ViolinPlotIcon.js +42 -0
- package/dist/cjs/components/matrixplot/Matrixplot.js +65 -66
- package/dist/cjs/components/matrixplot/MatrixplotControls.js +8 -5
- package/dist/cjs/components/obs-list/ObsItem.js +258 -210
- package/dist/cjs/components/obs-list/ObsList.js +161 -133
- package/dist/cjs/components/obs-list/ObsToolbar.js +2 -3
- package/dist/cjs/components/obsm-list/ObsmList.js +53 -38
- package/dist/cjs/components/offcanvas/index.js +61 -31
- package/dist/cjs/components/pseudospatial/Pseudospatial.js +132 -76
- package/dist/cjs/components/pseudospatial/PseudospatialToolbar.js +122 -74
- package/dist/cjs/components/scatterplot/Scatterplot.js +127 -99
- package/dist/cjs/components/scatterplot/ScatterplotControls.js +45 -31
- package/dist/cjs/components/scatterplot/SpatialControls.js +140 -113
- package/dist/cjs/components/scatterplot/Toolbox.js +41 -30
- package/dist/cjs/components/search-bar/SearchBar.js +168 -121
- package/dist/cjs/components/search-bar/SearchInfo.js +76 -50
- package/dist/cjs/components/search-bar/SearchResults.js +93 -71
- package/dist/cjs/components/toolbar/Toolbar.js +46 -37
- package/dist/cjs/components/var-list/VarItem.js +115 -88
- package/dist/cjs/components/var-list/VarList.js +85 -69
- package/dist/cjs/components/var-list/VarListToolbar.js +59 -54
- package/dist/cjs/components/var-list/VarSet.js +126 -108
- package/dist/cjs/components/violin/Violin.js +109 -107
- package/dist/cjs/components/violin/ViolinControls.js +8 -5
- package/dist/cjs/constants/colorscales.js +19 -19
- package/dist/cjs/constants/constants.js +47 -47
- package/dist/cjs/context/DatasetContext.js +24 -16
- package/dist/cjs/context/FilterContext.js +11 -9
- package/dist/cjs/context/SettingsContext.js +255 -89
- package/dist/cjs/context/ZarrDataContext.js +6 -5
- package/dist/cjs/helpers/color-helper.js +2 -2
- package/dist/cjs/helpers/zarr-helper.js +3 -3
- package/dist/cjs/utils/Filter.js +16 -11
- package/dist/cjs/utils/Histogram.js +35 -33
- package/dist/cjs/utils/ImageViewer.js +11 -8
- package/dist/cjs/utils/Legend.js +37 -30
- package/dist/cjs/utils/LoadingIndicators.js +15 -13
- package/dist/cjs/utils/Resolver.js +213 -0
- package/dist/cjs/utils/Skeleton.js +10 -10
- package/dist/cjs/utils/StyledTooltip.js +44 -0
- package/dist/cjs/utils/VirtualizedList.js +34 -27
- package/dist/cjs/utils/errors.js +15 -15
- package/dist/cjs/utils/requests.js +21 -9
- package/dist/cjs/utils/search.js +4 -4
- package/dist/cjs/utils/string.js +6 -6
- package/dist/cjs/utils/zarrData.js +20 -21
- package/dist/css/cherita.css +64 -42
- package/dist/css/cherita.css.map +1 -1
- package/dist/esm/components/controls/Controls.js +43 -35
- package/dist/esm/components/dotplot/Dotplot.js +77 -78
- package/dist/esm/components/dotplot/DotplotControls.js +106 -85
- package/dist/esm/components/full-page/FullPage.js +120 -93
- package/dist/esm/components/full-page/PlotAlert.js +39 -0
- package/dist/esm/components/full-page/PlotTypeSelector.js +90 -45
- package/dist/esm/components/heatmap/Heatmap.js +75 -74
- package/dist/esm/components/heatmap/HeatmapControls.js +8 -4
- package/dist/esm/components/icons/DotPlotIcon.js +58 -0
- package/dist/esm/components/icons/HeatmapIcon.js +39 -0
- package/dist/esm/components/icons/MatrixPlotIcon.1.js +51 -0
- package/dist/esm/components/icons/MatrixPlotIcon.js +53 -0
- package/dist/esm/components/icons/ScatterplotIcon.1.js +158 -0
- package/dist/esm/components/icons/ScatterplotIcon.js +138 -0
- package/dist/esm/components/icons/ViolinPlotIcon.js +36 -0
- package/dist/esm/components/matrixplot/Matrixplot.js +75 -75
- package/dist/esm/components/matrixplot/MatrixplotControls.js +10 -6
- package/dist/esm/components/obs-list/ObsItem.js +273 -222
- package/dist/esm/components/obs-list/ObsList.js +176 -147
- package/dist/esm/components/obs-list/ObsToolbar.js +3 -3
- package/dist/esm/components/obsm-list/ObsmList.js +60 -44
- package/dist/esm/components/offcanvas/index.js +67 -37
- package/dist/esm/components/pseudospatial/Pseudospatial.js +145 -88
- package/dist/esm/components/pseudospatial/PseudospatialToolbar.js +127 -78
- package/dist/esm/components/scatterplot/Scatterplot.js +148 -119
- package/dist/esm/components/scatterplot/ScatterplotControls.js +50 -35
- package/dist/esm/components/scatterplot/SpatialControls.js +153 -125
- package/dist/esm/components/scatterplot/Toolbox.js +44 -32
- package/dist/esm/components/search-bar/SearchBar.js +180 -132
- package/dist/esm/components/search-bar/SearchInfo.js +86 -59
- package/dist/esm/components/search-bar/SearchResults.js +100 -77
- package/dist/esm/components/toolbar/Toolbar.js +49 -39
- package/dist/esm/components/var-list/VarItem.js +126 -98
- package/dist/esm/components/var-list/VarList.js +99 -82
- package/dist/esm/components/var-list/VarListToolbar.js +64 -58
- package/dist/esm/components/var-list/VarSet.js +134 -115
- package/dist/esm/components/violin/Violin.js +121 -118
- package/dist/esm/components/violin/ViolinControls.js +10 -6
- package/dist/esm/constants/colorscales.js +19 -19
- package/dist/esm/constants/constants.js +47 -47
- package/dist/esm/context/DatasetContext.js +31 -22
- package/dist/esm/context/FilterContext.js +11 -8
- package/dist/esm/context/SettingsContext.js +257 -90
- package/dist/esm/context/ZarrDataContext.js +8 -6
- package/dist/esm/helpers/color-helper.js +5 -5
- package/dist/esm/helpers/map-helper.js +2 -2
- package/dist/esm/helpers/zarr-helper.js +6 -6
- package/dist/esm/index.js +22 -22
- package/dist/esm/utils/Filter.js +22 -17
- package/dist/esm/utils/Histogram.js +39 -37
- package/dist/esm/utils/ImageViewer.js +12 -8
- package/dist/esm/utils/Legend.js +44 -36
- package/dist/esm/utils/LoadingIndicators.js +16 -13
- package/dist/esm/utils/Resolver.js +201 -0
- package/dist/esm/utils/Skeleton.js +11 -10
- package/dist/esm/utils/StyledTooltip.js +38 -0
- package/dist/esm/utils/VirtualizedList.js +35 -27
- package/dist/esm/utils/errors.js +15 -15
- package/dist/esm/utils/requests.js +24 -12
- package/dist/esm/utils/search.js +7 -7
- package/dist/esm/utils/string.js +7 -7
- package/dist/esm/utils/zarrData.js +27 -28
- package/package.json +18 -7
- package/scss/cherita-bootstrap.scss +2 -2
- package/scss/cherita.scss +43 -17
- package/scss/components/accordions.scss +4 -1
- package/scss/components/layouts.scss +15 -33
- package/scss/components/lists.scss +8 -4
- package/scss/components/plotly.scss +38 -26
- package/scss/components/plots.scss +14 -1
- package/dist/assets/images/plots/dotplot.svg +0 -152
- package/dist/assets/images/plots/heatmap.svg +0 -193
- package/dist/assets/images/plots/matrixplot.svg +0 -275
- package/dist/assets/images/plots/scatterplot.svg +0 -198
- package/dist/assets/images/plots/violin.svg +0 -50
|
@@ -1,41 +1,57 @@
|
|
|
1
1
|
const _excluded = ["show", "handleClose"],
|
|
2
2
|
_excluded2 = ["show", "handleClose", "Controls"];
|
|
3
|
+
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
4
|
+
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
5
|
+
function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
|
|
6
|
+
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
|
|
7
|
+
function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
|
|
3
8
|
function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
|
|
4
9
|
function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (-1 !== e.indexOf(n)) continue; t[n] = r[n]; } return t; }
|
|
5
|
-
import
|
|
6
|
-
import
|
|
7
|
-
import {
|
|
8
|
-
import {
|
|
9
|
-
import {
|
|
10
|
-
import {
|
|
11
|
-
import {
|
|
10
|
+
import Offcanvas from 'react-bootstrap/Offcanvas';
|
|
11
|
+
import { SELECTION_MODES } from '../../constants/constants';
|
|
12
|
+
import { ObsColsList } from '../obs-list/ObsList';
|
|
13
|
+
import { ObsmKeysList } from '../obsm-list/ObsmList';
|
|
14
|
+
import { SearchBar } from '../search-bar/SearchBar';
|
|
15
|
+
import { VarNamesList } from '../var-list/VarList';
|
|
16
|
+
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
12
17
|
export function OffcanvasObs(_ref) {
|
|
13
18
|
let {
|
|
14
19
|
show,
|
|
15
20
|
handleClose
|
|
16
21
|
} = _ref,
|
|
17
22
|
props = _objectWithoutProperties(_ref, _excluded);
|
|
18
|
-
return /*#__PURE__*/
|
|
23
|
+
return /*#__PURE__*/_jsxs(Offcanvas, {
|
|
19
24
|
show: show,
|
|
20
25
|
onHide: handleClose,
|
|
21
|
-
scroll: true
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
26
|
+
scroll: true,
|
|
27
|
+
children: [/*#__PURE__*/_jsx(Offcanvas.Header, {
|
|
28
|
+
closeButton: true,
|
|
29
|
+
children: /*#__PURE__*/_jsx(Offcanvas.Title, {
|
|
30
|
+
children: "Categories"
|
|
31
|
+
})
|
|
32
|
+
}), /*#__PURE__*/_jsx(Offcanvas.Body, {
|
|
33
|
+
className: "p-0",
|
|
34
|
+
children: /*#__PURE__*/_jsx(ObsColsList, _objectSpread({}, props))
|
|
35
|
+
})]
|
|
36
|
+
});
|
|
27
37
|
}
|
|
28
38
|
export function OffcanvasObsm(_ref2) {
|
|
29
39
|
let {
|
|
30
40
|
show,
|
|
31
41
|
handleClose
|
|
32
42
|
} = _ref2;
|
|
33
|
-
return /*#__PURE__*/
|
|
43
|
+
return /*#__PURE__*/_jsxs(Offcanvas, {
|
|
34
44
|
show: show,
|
|
35
|
-
onHide: handleClose
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
45
|
+
onHide: handleClose,
|
|
46
|
+
children: [/*#__PURE__*/_jsx(Offcanvas.Header, {
|
|
47
|
+
closeButton: true,
|
|
48
|
+
children: /*#__PURE__*/_jsx(Offcanvas.Title, {
|
|
49
|
+
children: "Embedding space"
|
|
50
|
+
})
|
|
51
|
+
}), /*#__PURE__*/_jsx(Offcanvas.Body, {
|
|
52
|
+
children: /*#__PURE__*/_jsx(ObsmKeysList, {})
|
|
53
|
+
})]
|
|
54
|
+
});
|
|
39
55
|
}
|
|
40
56
|
export function OffcanvasVars(_ref3) {
|
|
41
57
|
let {
|
|
@@ -43,21 +59,29 @@ export function OffcanvasVars(_ref3) {
|
|
|
43
59
|
handleClose,
|
|
44
60
|
mode = SELECTION_MODES.MULTIPLE
|
|
45
61
|
} = _ref3;
|
|
46
|
-
return /*#__PURE__*/
|
|
62
|
+
return /*#__PURE__*/_jsxs(Offcanvas, {
|
|
47
63
|
show: show,
|
|
48
64
|
onHide: handleClose,
|
|
49
|
-
className: "offcanvas-vars"
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
65
|
+
className: "offcanvas-vars",
|
|
66
|
+
children: [/*#__PURE__*/_jsx(Offcanvas.Header, {
|
|
67
|
+
closeButton: true,
|
|
68
|
+
children: /*#__PURE__*/_jsx(Offcanvas.Title, {
|
|
69
|
+
children: "Features"
|
|
70
|
+
})
|
|
71
|
+
}), /*#__PURE__*/_jsx(Offcanvas.Body, {
|
|
72
|
+
children: /*#__PURE__*/_jsxs("div", {
|
|
73
|
+
className: "sidebar-features",
|
|
74
|
+
children: [/*#__PURE__*/_jsx(SearchBar, {
|
|
75
|
+
searchDiseases: true
|
|
76
|
+
}), /*#__PURE__*/_jsx("div", {
|
|
77
|
+
className: "sidebar-features-list",
|
|
78
|
+
children: /*#__PURE__*/_jsx(VarNamesList, {
|
|
79
|
+
mode: mode
|
|
80
|
+
})
|
|
81
|
+
})]
|
|
82
|
+
})
|
|
83
|
+
})]
|
|
84
|
+
});
|
|
61
85
|
}
|
|
62
86
|
export function OffcanvasControls(_ref4) {
|
|
63
87
|
let {
|
|
@@ -66,10 +90,16 @@ export function OffcanvasControls(_ref4) {
|
|
|
66
90
|
Controls
|
|
67
91
|
} = _ref4,
|
|
68
92
|
props = _objectWithoutProperties(_ref4, _excluded2);
|
|
69
|
-
return /*#__PURE__*/
|
|
93
|
+
return /*#__PURE__*/_jsxs(Offcanvas, {
|
|
70
94
|
show: show,
|
|
71
|
-
onHide: handleClose
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
95
|
+
onHide: handleClose,
|
|
96
|
+
children: [/*#__PURE__*/_jsx(Offcanvas.Header, {
|
|
97
|
+
closeButton: true,
|
|
98
|
+
children: /*#__PURE__*/_jsx(Offcanvas.Title, {
|
|
99
|
+
children: "Controls"
|
|
100
|
+
})
|
|
101
|
+
}), /*#__PURE__*/_jsx(Offcanvas.Body, {
|
|
102
|
+
children: /*#__PURE__*/_jsx(Controls, _objectSpread({}, props))
|
|
103
|
+
})]
|
|
104
|
+
});
|
|
75
105
|
}
|
|
@@ -3,31 +3,32 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
|
|
|
3
3
|
function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
|
|
4
4
|
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
|
|
5
5
|
function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
|
|
6
|
-
import
|
|
7
|
-
import {
|
|
8
|
-
import
|
|
9
|
-
import
|
|
10
|
-
import
|
|
11
|
-
import
|
|
12
|
-
import {
|
|
13
|
-
import {
|
|
14
|
-
import {
|
|
15
|
-
import {
|
|
16
|
-
import {
|
|
17
|
-
import {
|
|
18
|
-
import {
|
|
19
|
-
import {
|
|
20
|
-
import {
|
|
21
|
-
|
|
6
|
+
import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
|
|
7
|
+
import { faEye, faSliders } from '@fortawesome/free-solid-svg-icons';
|
|
8
|
+
import _ from 'lodash';
|
|
9
|
+
import { Alert } from 'react-bootstrap';
|
|
10
|
+
import Plot from 'react-plotly.js';
|
|
11
|
+
import { COLOR_ENCODINGS, OBS_TYPES, PSEUDOSPATIAL_PLOT_TYPES as PLOT_TYPES } from '../../constants/constants';
|
|
12
|
+
import { useDataset } from '../../context/DatasetContext';
|
|
13
|
+
import { useFilteredData } from '../../context/FilterContext';
|
|
14
|
+
import { useSettings, useSettingsDispatch } from '../../context/SettingsContext';
|
|
15
|
+
import { rgbToHex, useColor } from '../../helpers/color-helper';
|
|
16
|
+
import { ImageViewer } from '../../utils/ImageViewer';
|
|
17
|
+
import { Legend } from '../../utils/Legend';
|
|
18
|
+
import { LoadingSpinner } from '../../utils/LoadingIndicators';
|
|
19
|
+
import { useDebouncedFetch } from '../../utils/requests';
|
|
20
|
+
import { useSelectedObs, useSelectedVar } from '../../utils/Resolver';
|
|
21
|
+
import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
|
|
22
22
|
function usePseudospatialData(plotType) {
|
|
23
|
-
|
|
24
|
-
const ENDPOINT = "pseudospatial";
|
|
23
|
+
const ENDPOINT = 'pseudospatial';
|
|
25
24
|
const dataset = useDataset();
|
|
26
25
|
const settings = useSettings();
|
|
27
26
|
const {
|
|
28
27
|
obsIndices,
|
|
29
28
|
isSliced
|
|
30
29
|
} = useFilteredData();
|
|
30
|
+
const selectedVar = useSelectedVar();
|
|
31
|
+
const selectedObs = useSelectedObs();
|
|
31
32
|
const baseParams = useMemo(() => {
|
|
32
33
|
return {
|
|
33
34
|
url: dataset.url,
|
|
@@ -36,54 +37,42 @@ function usePseudospatialData(plotType) {
|
|
|
36
37
|
obsIndices: isSliced ? [...(obsIndices || [])] : null,
|
|
37
38
|
varNamesCol: dataset.varNamesCol,
|
|
38
39
|
showColorbar: false,
|
|
39
|
-
format:
|
|
40
|
+
format: 'json'
|
|
40
41
|
};
|
|
41
42
|
}, [dataset.url, settings.pseudospatial.maskSet, settings.pseudospatial.maskValues, dataset.varNamesCol, isSliced, obsIndices]);
|
|
42
43
|
const getPlotParams = useCallback(() => {
|
|
43
44
|
if (plotType === PLOT_TYPES.GENE) {
|
|
44
|
-
var _settings$selectedVar, _settings$selectedVar2, _settings$selectedVar3, _settings$selectedVar4, _settings$selectedObs, _settings$selectedObs2, _settings$selectedObs3;
|
|
45
45
|
return _objectSpread({
|
|
46
|
-
varKey:
|
|
47
|
-
name:
|
|
48
|
-
indices:
|
|
49
|
-
} :
|
|
46
|
+
varKey: selectedVar !== null && selectedVar !== void 0 && selectedVar.isSet ? {
|
|
47
|
+
name: selectedVar === null || selectedVar === void 0 ? void 0 : selectedVar.name,
|
|
48
|
+
indices: selectedVar === null || selectedVar === void 0 ? void 0 : selectedVar.vars.map(v => v.index)
|
|
49
|
+
} : selectedVar === null || selectedVar === void 0 ? void 0 : selectedVar.index
|
|
50
50
|
}, settings.sliceBy.obs ? {
|
|
51
|
-
obsCol:
|
|
52
|
-
obsValues: !(
|
|
53
|
-
var _settings$selectedObs4;
|
|
54
|
-
return (_settings$selectedObs4 = settings.selectedObs) === null || _settings$selectedObs4 === void 0 ? void 0 : _settings$selectedObs4.codesMap[c];
|
|
55
|
-
})
|
|
51
|
+
obsCol: selectedObs,
|
|
52
|
+
obsValues: !(selectedObs !== null && selectedObs !== void 0 && selectedObs.omit.length) ? null : _.difference(selectedObs === null || selectedObs === void 0 ? void 0 : selectedObs.values, selectedObs === null || selectedObs === void 0 ? void 0 : selectedObs.omit)
|
|
56
53
|
} : {});
|
|
57
54
|
} else if (plotType === PLOT_TYPES.CATEGORICAL) {
|
|
58
|
-
var _settings$selectedObs5, _settings$selectedObs6, _settings$selectedObs7;
|
|
59
55
|
return {
|
|
60
|
-
obsCol:
|
|
61
|
-
obsValues: !(
|
|
62
|
-
var _settings$selectedObs8;
|
|
63
|
-
return (_settings$selectedObs8 = settings.selectedObs) === null || _settings$selectedObs8 === void 0 ? void 0 : _settings$selectedObs8.codesMap[c];
|
|
64
|
-
}),
|
|
56
|
+
obsCol: selectedObs,
|
|
57
|
+
obsValues: !(selectedObs !== null && selectedObs !== void 0 && selectedObs.omit.length) ? null : _.difference(selectedObs === null || selectedObs === void 0 ? void 0 : selectedObs.values, selectedObs === null || selectedObs === void 0 ? void 0 : selectedObs.omit),
|
|
65
58
|
mode: settings.pseudospatial.categoricalMode
|
|
66
59
|
};
|
|
67
|
-
} else if (plotType ===
|
|
68
|
-
var _settings$selectedObs9, _settings$selectedObs0, _settings$selectedObs1;
|
|
60
|
+
} else if (plotType === 'continuous') {
|
|
69
61
|
return {
|
|
70
|
-
obsCol:
|
|
71
|
-
obsValues: !(
|
|
72
|
-
var _settings$selectedObs10;
|
|
73
|
-
return (_settings$selectedObs10 = settings.selectedObs) === null || _settings$selectedObs10 === void 0 ? void 0 : _settings$selectedObs10.codesMap[c];
|
|
74
|
-
})
|
|
62
|
+
obsCol: selectedObs,
|
|
63
|
+
obsValues: !(selectedObs !== null && selectedObs !== void 0 && selectedObs.omit.length) ? null : _.difference(selectedObs === null || selectedObs === void 0 ? void 0 : selectedObs.values, selectedObs === null || selectedObs === void 0 ? void 0 : selectedObs.omit)
|
|
75
64
|
};
|
|
76
65
|
}
|
|
77
|
-
}, [settings.pseudospatial.categoricalMode,
|
|
66
|
+
}, [settings.pseudospatial.categoricalMode, selectedObs, selectedVar === null || selectedVar === void 0 ? void 0 : selectedVar.index, selectedVar === null || selectedVar === void 0 ? void 0 : selectedVar.isSet, selectedVar === null || selectedVar === void 0 ? void 0 : selectedVar.name, selectedVar === null || selectedVar === void 0 ? void 0 : selectedVar.vars, settings.sliceBy.obs, plotType]);
|
|
78
67
|
const params = useMemo(() => {
|
|
79
68
|
return _objectSpread(_objectSpread({}, baseParams), getPlotParams());
|
|
80
69
|
}, [baseParams, getPlotParams]);
|
|
81
|
-
return useDebouncedFetch(ENDPOINT +
|
|
70
|
+
return useDebouncedFetch(ENDPOINT + '/' + plotType, params, 500, {
|
|
82
71
|
enabled: !!plotType && !!settings.pseudospatial.maskSet
|
|
83
72
|
});
|
|
84
73
|
}
|
|
85
74
|
export function Pseudospatial(_ref) {
|
|
86
|
-
var
|
|
75
|
+
var _layout$coloraxis3, _layout$coloraxis4, _settings$pseudospati2;
|
|
87
76
|
let {
|
|
88
77
|
showLegend = true,
|
|
89
78
|
sharedScaleRange = false,
|
|
@@ -92,17 +81,33 @@ export function Pseudospatial(_ref) {
|
|
|
92
81
|
plotType,
|
|
93
82
|
setPlotType
|
|
94
83
|
} = _ref;
|
|
84
|
+
const {
|
|
85
|
+
imageUrl
|
|
86
|
+
} = useDataset();
|
|
95
87
|
const settings = useSettings();
|
|
88
|
+
const dispatch = useSettingsDispatch();
|
|
96
89
|
const [data, setData] = useState([]);
|
|
97
90
|
const [layout, setLayout] = useState({});
|
|
98
91
|
const {
|
|
99
92
|
getColor
|
|
100
93
|
} = useColor();
|
|
101
94
|
const colorscale = useRef(settings.controls.colorScale);
|
|
95
|
+
const {
|
|
96
|
+
valueMin,
|
|
97
|
+
valueMax
|
|
98
|
+
} = useFilteredData();
|
|
99
|
+
const selectedObs = useSelectedObs();
|
|
102
100
|
useEffect(() => {
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
101
|
+
if (_.keys(settings.data.pseudospatial).length && !settings.pseudospatial.maskSet) {
|
|
102
|
+
dispatch({
|
|
103
|
+
type: 'set.pseudospatial.maskSet',
|
|
104
|
+
maskSet: _.keys(settings.data.pseudospatial)[0]
|
|
105
|
+
});
|
|
106
|
+
}
|
|
107
|
+
}, [dispatch, settings.data.pseudospatial, settings.pseudospatial.maskSet]);
|
|
108
|
+
useEffect(() => {
|
|
109
|
+
setPlotType(settings.colorEncoding === COLOR_ENCODINGS.VAR ? PLOT_TYPES.GENE : (selectedObs === null || selectedObs === void 0 ? void 0 : selectedObs.type) === OBS_TYPES.CATEGORICAL || (selectedObs === null || selectedObs === void 0 ? void 0 : selectedObs.type) === OBS_TYPES.BOOLEAN ? PLOT_TYPES.CATEGORICAL : (selectedObs === null || selectedObs === void 0 ? void 0 : selectedObs.type) === OBS_TYPES.CONTINUOUS ? PLOT_TYPES.CONTINUOUS : PLOT_TYPES.MASKS);
|
|
110
|
+
}, [settings.colorEncoding, selectedObs === null || selectedObs === void 0 ? void 0 : selectedObs.type, setPlotType]);
|
|
106
111
|
const updateColorscale = useCallback(colorscale => {
|
|
107
112
|
setLayout(l => {
|
|
108
113
|
return _objectSpread(_objectSpread({}, l), {}, {
|
|
@@ -154,8 +159,8 @@ export function Pseudospatial(_ref) {
|
|
|
154
159
|
min,
|
|
155
160
|
max
|
|
156
161
|
} = {
|
|
157
|
-
min: settings.controls.range[0] * (
|
|
158
|
-
max: settings.controls.range[1] * (
|
|
162
|
+
min: settings.controls.range[0] * (valueMax - valueMin) + valueMin,
|
|
163
|
+
max: settings.controls.range[1] * (valueMax - valueMin) + valueMin
|
|
159
164
|
};
|
|
160
165
|
setData(d => {
|
|
161
166
|
return _.map(d, trace => {
|
|
@@ -183,45 +188,97 @@ export function Pseudospatial(_ref) {
|
|
|
183
188
|
});
|
|
184
189
|
});
|
|
185
190
|
}
|
|
186
|
-
}, [settings.controls.range, settings.controls.valueMax, settings.controls.valueMin,
|
|
191
|
+
}, [settings.controls.range, settings.controls.valueMax, settings.controls.valueMin, getColor, sharedScaleRange, valueMax, valueMin]);
|
|
187
192
|
const hasSelections = !!plotType && !!settings.pseudospatial.maskSet;
|
|
188
|
-
const
|
|
189
|
-
|
|
193
|
+
const images = useMemo(() => {
|
|
194
|
+
if (imageUrl) {
|
|
195
|
+
return [_objectSpread({
|
|
196
|
+
source: imageUrl,
|
|
197
|
+
xref: 'paper',
|
|
198
|
+
yref: 'paper',
|
|
199
|
+
x: 0.5,
|
|
200
|
+
y: 0.5,
|
|
201
|
+
sizex: 1,
|
|
202
|
+
sizey: 1,
|
|
203
|
+
sizing: 'contain',
|
|
204
|
+
layer: 'above',
|
|
205
|
+
xanchor: 'center',
|
|
206
|
+
yanchor: 'middle',
|
|
207
|
+
name: 'Reference Image'
|
|
208
|
+
}, settings.pseudospatial.refImg)];
|
|
209
|
+
}
|
|
210
|
+
return [];
|
|
211
|
+
}, [imageUrl, settings.pseudospatial.refImg]);
|
|
212
|
+
const modeBarButtons = useMemo(() => {
|
|
213
|
+
var _settings$pseudospati;
|
|
214
|
+
const isRefImgVisible = (_settings$pseudospati = settings.pseudospatial) === null || _settings$pseudospati === void 0 || (_settings$pseudospati = _settings$pseudospati.refImg) === null || _settings$pseudospati === void 0 ? void 0 : _settings$pseudospati.visible;
|
|
215
|
+
return [{
|
|
216
|
+
name: 'Open plot controls',
|
|
217
|
+
icon: {
|
|
218
|
+
width: 512,
|
|
219
|
+
height: 512,
|
|
220
|
+
path: faSliders.icon[4]
|
|
221
|
+
},
|
|
222
|
+
click: () => setShowControls(prev => !prev)
|
|
223
|
+
}, ...(imageUrl ? [{
|
|
224
|
+
name: isRefImgVisible ? 'Hide reference image' : 'Show reference image',
|
|
225
|
+
icon: {
|
|
226
|
+
width: 600,
|
|
227
|
+
height: 512,
|
|
228
|
+
path: faEye.icon[4]
|
|
229
|
+
},
|
|
230
|
+
click: () => dispatch({
|
|
231
|
+
type: 'toggle.pseudospatial.refImg.visible'
|
|
232
|
+
})
|
|
233
|
+
}] : [])];
|
|
234
|
+
}, [dispatch, imageUrl, setShowControls, (_settings$pseudospati2 = settings.pseudospatial) === null || _settings$pseudospati2 === void 0 || (_settings$pseudospati2 = _settings$pseudospati2.refImg) === null || _settings$pseudospati2 === void 0 ? void 0 : _settings$pseudospati2.visible]);
|
|
235
|
+
if (!_.keys(settings.data.pseudospatial).length) {
|
|
236
|
+
return /*#__PURE__*/_jsx(_Fragment, {
|
|
237
|
+
children: /*#__PURE__*/_jsx(Alert, {
|
|
238
|
+
variant: "warning",
|
|
239
|
+
children: "No pseudospatial data"
|
|
240
|
+
})
|
|
241
|
+
});
|
|
242
|
+
} else if (!serverError) {
|
|
190
243
|
var _layout$coloraxis5, _layout$coloraxis6;
|
|
191
|
-
return /*#__PURE__*/
|
|
192
|
-
className: "cherita-pseudospatial"
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
244
|
+
return /*#__PURE__*/_jsx("div", {
|
|
245
|
+
className: "cherita-pseudospatial",
|
|
246
|
+
children: /*#__PURE__*/_jsxs(_Fragment, {
|
|
247
|
+
children: [hasSelections && isPending && /*#__PURE__*/_jsx(LoadingSpinner, {}), hasSelections && /*#__PURE__*/_jsx(Plot, {
|
|
248
|
+
data: data,
|
|
249
|
+
layout: _objectSpread(_objectSpread({}, layout), {}, {
|
|
250
|
+
autosize: true,
|
|
251
|
+
height: height,
|
|
252
|
+
margin: {
|
|
253
|
+
l: 0,
|
|
254
|
+
r: 0,
|
|
255
|
+
t: 0,
|
|
256
|
+
b: 0,
|
|
257
|
+
pad: 0
|
|
258
|
+
},
|
|
259
|
+
images: images
|
|
260
|
+
}),
|
|
261
|
+
useResizeHandler: true,
|
|
262
|
+
className: "cherita-pseudospatial-plot",
|
|
263
|
+
config: {
|
|
264
|
+
displaylogo: false,
|
|
265
|
+
displayModeBar: true,
|
|
266
|
+
modeBarButtonsToAdd: modeBarButtons
|
|
267
|
+
}
|
|
268
|
+
}), hasSelections && showLegend && /*#__PURE__*/_jsx(Legend, {
|
|
269
|
+
min: layout === null || layout === void 0 || (_layout$coloraxis5 = layout.coloraxis) === null || _layout$coloraxis5 === void 0 ? void 0 : _layout$coloraxis5.cmin,
|
|
270
|
+
max: layout === null || layout === void 0 || (_layout$coloraxis6 = layout.coloraxis) === null || _layout$coloraxis6 === void 0 ? void 0 : _layout$coloraxis6.cmax,
|
|
271
|
+
addText: plotType === PLOT_TYPES.GENE ? ' - Mean expression' : plotType === PLOT_TYPES.CATEGORICAL ? ' - %' : plotType === PLOT_TYPES.CONTINUOUS ? ' - Mean value' : ''
|
|
272
|
+
})]
|
|
273
|
+
})
|
|
274
|
+
});
|
|
221
275
|
} else {
|
|
222
|
-
return /*#__PURE__*/
|
|
223
|
-
|
|
224
|
-
|
|
276
|
+
return /*#__PURE__*/_jsx(_Fragment, {
|
|
277
|
+
children: /*#__PURE__*/_jsx(Alert, {
|
|
278
|
+
variant: "danger",
|
|
279
|
+
children: serverError.message
|
|
280
|
+
})
|
|
281
|
+
});
|
|
225
282
|
}
|
|
226
283
|
}
|
|
227
284
|
|
|
@@ -229,11 +286,11 @@ export function Pseudospatial(_ref) {
|
|
|
229
286
|
export function PseudospatialImage() {
|
|
230
287
|
const dataset = useDataset();
|
|
231
288
|
if (dataset.imageUrl) {
|
|
232
|
-
return /*#__PURE__*/
|
|
289
|
+
return /*#__PURE__*/_jsx(ImageViewer, {
|
|
233
290
|
src: dataset.imageUrl,
|
|
234
291
|
alt: "Pseudospatial reference image"
|
|
235
292
|
});
|
|
236
293
|
} else {
|
|
237
|
-
return /*#__PURE__*/
|
|
294
|
+
return /*#__PURE__*/_jsx(_Fragment, {});
|
|
238
295
|
}
|
|
239
296
|
}
|