react-msaview 6.4.2 → 7.0.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/README.md +6 -5
- package/bundle/index.js +100 -101
- package/bundle/index.js.map +4 -4
- package/dist/components/Loading.js +2 -2
- package/dist/components/Loading.js.map +1 -1
- package/dist/components/MSAViewer.d.ts +10 -2
- package/dist/components/MSAViewer.js +90 -2
- package/dist/components/MSAViewer.js.map +1 -1
- package/dist/components/ResizeHandles.d.ts +3 -3
- package/dist/components/ResizeHandles.js +28 -21
- package/dist/components/ResizeHandles.js.map +1 -1
- package/dist/components/dialogs/{InterProScanDialog.d.ts → AnnotationFileDialog.d.ts} +2 -2
- package/dist/components/dialogs/AnnotationFileDialog.js +92 -0
- package/dist/components/dialogs/AnnotationFileDialog.js.map +1 -0
- package/dist/components/dialogs/FeatureDialog.js +13 -9
- package/dist/components/dialogs/FeatureDialog.js.map +1 -1
- package/dist/components/header/Header.js +4 -0
- package/dist/components/header/Header.js.map +1 -1
- package/dist/components/header/HeaderStatusArea.js +0 -2
- package/dist/components/header/HeaderStatusArea.js.map +1 -1
- package/dist/components/header/LoadWarnings.d.ts +6 -0
- package/dist/components/header/LoadWarnings.js +36 -0
- package/dist/components/header/LoadWarnings.js.map +1 -0
- package/dist/components/header/MultiAlignmentSelector.js +0 -0
- package/dist/components/header/MultiAlignmentSelector.js.map +1 -1
- package/dist/components/header/TreeSettingsMenu.js +9 -1
- package/dist/components/header/TreeSettingsMenu.js.map +1 -1
- package/dist/components/header/UnshareableDataWarning.d.ts +6 -0
- package/dist/components/header/UnshareableDataWarning.js +42 -0
- package/dist/components/header/UnshareableDataWarning.js.map +1 -0
- package/dist/components/header/getAnnotationsMenu.js +14 -14
- package/dist/components/header/getAnnotationsMenu.js.map +1 -1
- package/dist/components/import/ImportForm.js +1 -1
- package/dist/components/import/ImportForm.js.map +1 -1
- package/dist/components/import/ImportFormExamples.js +2 -6
- package/dist/components/import/ImportFormExamples.js.map +1 -1
- package/dist/components/import/util.js +3 -0
- package/dist/components/import/util.js.map +1 -1
- package/dist/components/msa/MSACanvasBlock.js +4 -5
- package/dist/components/msa/MSACanvasBlock.js.map +1 -1
- package/dist/components/msa/msaRaster.d.ts +13 -3
- package/dist/components/msa/msaRaster.js +173 -61
- package/dist/components/msa/msaRaster.js.map +1 -1
- package/dist/components/msa/renderHighlights.d.ts +39 -1
- package/dist/components/msa/renderHighlights.js +71 -6
- package/dist/components/msa/renderHighlights.js.map +1 -1
- package/dist/components/msa/renderMSABlock.d.ts +1 -2
- package/dist/components/msa/renderMSABlock.js +24 -28
- package/dist/components/msa/renderMSABlock.js.map +1 -1
- package/dist/components/msa/renderMSAMouseover.js +9 -30
- package/dist/components/msa/renderMSAMouseover.js.map +1 -1
- package/dist/components/renderCtx.d.ts +1 -1
- package/dist/components/tracks/TrackBlocks.js +10 -11
- package/dist/components/tracks/TrackBlocks.js.map +1 -1
- package/dist/components/tracks/drawTracks.d.ts +26 -8
- package/dist/components/tracks/drawTracks.js +123 -13
- package/dist/components/tracks/drawTracks.js.map +1 -1
- package/dist/components/tree/TreeCanvas.js +2 -3
- package/dist/components/tree/TreeCanvas.js.map +1 -1
- package/dist/components/tree/TreeCanvasBlock.js +4 -2
- package/dist/components/tree/TreeCanvasBlock.js.map +1 -1
- package/dist/components/tree/TreeRuler.js +13 -3
- package/dist/components/tree/TreeRuler.js.map +1 -1
- package/dist/components/tree/renderTreeCanvas.d.ts +0 -1
- package/dist/components/tree/renderTreeCanvas.js +70 -30
- package/dist/components/tree/renderTreeCanvas.js.map +1 -1
- package/dist/components/tree/scaleBar.d.ts +10 -0
- package/dist/components/tree/scaleBar.js +24 -0
- package/dist/components/tree/scaleBar.js.map +1 -0
- package/dist/constants.d.ts +3 -1
- package/dist/constants.js +18 -1
- package/dist/constants.js.map +1 -1
- package/dist/fetchUtils.d.ts +7 -7
- package/dist/fetchUtils.js +4 -32
- package/dist/fetchUtils.js.map +1 -1
- package/dist/hierarchy.d.ts +2 -1
- package/dist/hierarchy.js +16 -10
- package/dist/hierarchy.js.map +1 -1
- package/dist/index.d.ts +2 -1
- package/dist/index.js +8 -2
- package/dist/index.js.map +1 -1
- package/dist/model/DataModel.js +5 -2
- package/dist/model/DataModel.js.map +1 -1
- package/dist/model.d.ts +454 -177
- package/dist/model.js +1180 -511
- package/dist/model.js.map +1 -1
- package/dist/renderToStaticMarkup.d.ts +11 -0
- package/dist/renderToStaticMarkup.js +30 -7
- package/dist/renderToStaticMarkup.js.map +1 -1
- package/dist/renderToSvg.js +25 -19
- package/dist/renderToSvg.js.map +1 -1
- package/dist/rowCoordinateCalculations.d.ts +25 -25
- package/dist/rowCoordinateCalculations.js +12 -36
- package/dist/rowCoordinateCalculations.js.map +1 -1
- package/dist/seqPosToGlobalCol.js +3 -1
- package/dist/seqPosToGlobalCol.js.map +1 -1
- package/dist/svgTestUtil.d.ts +144 -82
- package/dist/types.d.ts +97 -3
- package/dist/util.d.ts +11 -4
- package/dist/util.js +30 -10
- package/dist/util.js.map +1 -1
- package/dist/version.d.ts +1 -1
- package/dist/version.js +1 -1
- package/dist/wuss.d.ts +14 -0
- package/dist/wuss.js +55 -0
- package/dist/wuss.js.map +1 -0
- package/package.json +10 -8
- package/src/components/Loading.tsx +12 -2
- package/src/components/MSAViewer.tsx +106 -2
- package/src/components/ResizeHandles.tsx +31 -31
- package/src/components/dialogs/AnnotationFileDialog.tsx +162 -0
- package/src/components/dialogs/FeatureDialog.tsx +13 -9
- package/src/components/header/Header.tsx +4 -0
- package/src/components/header/HeaderStatusArea.tsx +0 -5
- package/src/components/header/LoadWarnings.tsx +49 -0
- package/src/components/header/MultiAlignmentSelector.tsx +0 -0
- package/src/components/header/TreeSettingsMenu.tsx +9 -1
- package/src/components/header/UnshareableDataWarning.tsx +58 -0
- package/src/components/header/getAnnotationsMenu.ts +16 -17
- package/src/components/import/ImportForm.tsx +2 -2
- package/src/components/import/ImportFormExamples.tsx +2 -6
- package/src/components/import/util.ts +3 -0
- package/src/components/msa/MSACanvasBlock.tsx +4 -5
- package/src/components/msa/msaRaster.ts +216 -59
- package/src/components/msa/renderHighlights.ts +103 -5
- package/src/components/msa/renderMSABlock.ts +25 -36
- package/src/components/msa/renderMSAMouseover.ts +9 -39
- package/src/components/renderCtx.ts +1 -0
- package/src/components/tracks/TrackBlocks.tsx +10 -13
- package/src/components/tracks/drawTracks.ts +165 -17
- package/src/components/tree/TreeCanvas.tsx +2 -3
- package/src/components/tree/TreeCanvasBlock.tsx +4 -2
- package/src/components/tree/TreeRuler.tsx +38 -3
- package/src/components/tree/renderTreeCanvas.ts +79 -35
- package/src/components/tree/scaleBar.ts +23 -0
- package/src/constants.ts +20 -1
- package/src/fetchUtils.ts +7 -40
- package/src/hierarchy.ts +20 -11
- package/src/index.ts +18 -2
- package/src/model/DataModel.ts +6 -2
- package/src/model.ts +1352 -616
- package/src/rawImports.d.ts +9 -0
- package/src/renderToStaticMarkup.ts +34 -7
- package/src/renderToSvg.tsx +33 -27
- package/src/rowCoordinateCalculations.ts +15 -59
- package/src/seqPosToGlobalCol.ts +3 -1
- package/src/types.ts +131 -4
- package/src/util.ts +31 -14
- package/src/version.ts +1 -1
- package/src/wuss.ts +62 -0
- package/dist/components/dialogs/InterProScanDialog.js +0 -137
- package/dist/components/dialogs/InterProScanDialog.js.map +0 -1
- package/dist/components/dialogs/InterProScanFileDialog.d.ts +0 -7
- package/dist/components/dialogs/InterProScanFileDialog.js +0 -64
- package/dist/components/dialogs/InterProScanFileDialog.js.map +0 -1
- package/dist/launchInterProScan.d.ts +0 -13
- package/dist/launchInterProScan.js +0 -110
- package/dist/launchInterProScan.js.map +0 -1
- package/dist/useColorContrast.d.ts +0 -10
- package/dist/useColorContrast.js +0 -13
- package/dist/useColorContrast.js.map +0 -1
- package/src/clustalX.test.ts +0 -74
- package/src/colSpace.test.ts +0 -67
- package/src/collapseLogic.test.ts +0 -115
- package/src/colorSchemes.docs.test.ts +0 -57
- package/src/columnCounts.test.ts +0 -73
- package/src/columnStats.test.ts +0 -94
- package/src/columnTracks.test.ts +0 -97
- package/src/components/dialogs/InterProScanDialog.tsx +0 -214
- package/src/components/dialogs/InterProScanFileDialog.tsx +0 -138
- package/src/components/minimap/minimapLayout.test.ts +0 -71
- package/src/components/msa/msaRaster.test.ts +0 -145
- package/src/components/msa/renderBoxFeatureCanvasBlock.test.ts +0 -51
- package/src/components/tree/renderTreeCanvas.test.ts +0 -296
- package/src/dataInitialized.test.ts +0 -42
- package/src/domainBands.test.ts +0 -122
- package/src/domainLetterColor.test.ts +0 -80
- package/src/exportFileName.test.ts +0 -40
- package/src/fetchUtils.test.ts +0 -83
- package/src/flatToTree.test.ts +0 -51
- package/src/hierarchy.test.ts +0 -228
- package/src/highlights.test.ts +0 -70
- package/src/impgRender.test.tsx +0 -68
- package/src/largeTree.test.ts +0 -67
- package/src/launchInterProScan.ts +0 -167
- package/src/loadErrorDisplay.test.tsx +0 -102
- package/src/modelFilehandleLoaders.test.ts +0 -137
- package/src/modelReset.test.ts +0 -120
- package/src/neighborJoining.test.ts +0 -164
- package/src/parseAsn1.test.ts +0 -36
- package/src/propertyConservation.test.ts +0 -36
- package/src/renderColumnTracksSvg.test.tsx +0 -108
- package/src/renderDomainsSvg.test.tsx +0 -118
- package/src/renderHighlightsSvg.test.tsx +0 -85
- package/src/renderMinimapSvg.test.tsx +0 -62
- package/src/renderRasterSvg.test.tsx +0 -144
- package/src/renderSequenceLogoSvg.test.tsx +0 -165
- package/src/renderToSvg.test.tsx +0 -65
- package/src/reset.test.ts +0 -61
- package/src/rowCoordinateCalculations.test.ts +0 -211
- package/src/rowSpace.test.ts +0 -46
- package/src/segmentOverlay.test.ts +0 -70
- package/src/seqPosToGlobalCol.test.ts +0 -59
- package/src/sequenceLogo.test.ts +0 -88
- package/src/setFontSize.test.ts +0 -33
- package/src/stripDefault.test.ts +0 -48
- package/src/stripDefaultSnapshot.test.ts +0 -87
- package/src/treeMetadata.test.ts +0 -39
- package/src/useCanvasAutorun.test.tsx +0 -98
- package/src/useColorContrast.ts +0 -18
- package/src/viewChrome.test.tsx +0 -134
- package/src/wheelZoom.test.ts +0 -46
|
@@ -26,9 +26,9 @@ const Reset = observer(function ({ model, error, }) {
|
|
|
26
26
|
} }, "Return to import form")));
|
|
27
27
|
});
|
|
28
28
|
const Loading = observer(function ({ model }) {
|
|
29
|
-
const { isLoading, dataInitialized, error, msaFilehandle, treeFilehandle } = model;
|
|
29
|
+
const { isLoading, dataInitialized, error, resetCount, msaFilehandle, treeFilehandle, } = model;
|
|
30
30
|
const hasPendingFilehandle = !!(msaFilehandle || treeFilehandle);
|
|
31
|
-
return (React.createElement("div", null, React.createElement(ErrorBoundary, { FallbackComponent: e => React.createElement(Reset, { model: model, error: e.error }) }, dataInitialized ? (isLoading ? (React.createElement(LoadingSpinner, { model: model })) : (React.createElement(MSAView, { model: model }))) : error ? (React.createElement(Reset, { model: model, error: error })) : hasPendingFilehandle || isLoading ? (React.createElement(LoadingSpinner, { model: model })) : (React.createElement(ImportForm, { model: model })))));
|
|
31
|
+
return (React.createElement("div", null, React.createElement(ErrorBoundary, { key: resetCount, FallbackComponent: e => React.createElement(Reset, { model: model, error: e.error }) }, dataInitialized ? (isLoading ? (React.createElement(LoadingSpinner, { model: model })) : (React.createElement(MSAView, { model: model }))) : error ? (React.createElement(Reset, { model: model, error: error })) : hasPendingFilehandle || isLoading ? (React.createElement(LoadingSpinner, { model: model })) : (React.createElement(ImportForm, { model: model })))));
|
|
32
32
|
});
|
|
33
33
|
export default Loading;
|
|
34
34
|
//# sourceMappingURL=Loading.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Loading.js","sourceRoot":"","sources":["../../src/components/Loading.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAA;AAC9D,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAErC,OAAO,OAAO,MAAM,cAAe,CAAA;AACnC,OAAO,UAAU,MAAM,wBAAyB,CAAA;AAIhD,MAAM,cAAc,GAAG,QAAQ,CAAC,UAAU,EAAE,KAAK,EAA2B;IAC1E,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,CAAA;IACxB,OAAO,CACL,6BACE,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QAEtE,6BACE,KAAK,EAAC,IAAI,EACV,MAAM,EAAC,IAAI,EACX,OAAO,EAAC,WAAW,EACnB,KAAK,EAAC,4BAA4B;YAElC,mCACG,0DAA0D,CACrD;YACR,gCACE,EAAE,EAAC,IAAI,EACP,EAAE,EAAC,IAAI,EACP,CAAC,EAAC,IAAI,EACN,MAAM,EAAC,MAAM,EACb,WAAW,EAAC,GAAG,EACf,IAAI,EAAC,MAAM,GACX;YACF,8BACE,CAAC,EAAC,yBAAyB,EAC3B,MAAM,EAAC,SAAS,EAChB,WAAW,EAAC,GAAG,EACf,IAAI,EAAC,MAAM,EACX,aAAa,EAAC,OAAO,EACrB,KAAK,EAAE;oBACL,SAAS,EAAE,4BAA4B;oBACvC,eAAe,EAAE,QAAQ;iBAC1B,GACD,CACE;QACN,oBAAC,UAAU,IAAC,OAAO,EAAC,IAAI,IAAE,MAAM,EAAE,GAAG,IAAI,YAAY,CAAc;QAClE,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,CAClB,oBAAC,MAAM,IACL,OAAO,EAAC,UAAU,EAClB,IAAI,EAAC,OAAO,EACZ,OAAO,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,aAG3B,CACV,CAAC,CAAC,CAAC,IAAI,CACJ,CACP,CAAA;AACH,CAAC,CAAC,CAAA;AAEF,MAAM,KAAK,GAAG,QAAQ,CAAC,UAAU,EAC/B,KAAK,EACL,KAAK,GAIN;IACC,OAAO,CACL;QACE,oBAAC,YAAY,IAAC,KAAK,EAAE,KAAK,GAAI;QAC9B,oBAAC,MAAM,IACL,OAAO,EAAC,WAAW,EACnB,KAAK,EAAC,SAAS,EACf,OAAO,EAAE,GAAG,EAAE;gBACZ,KAAK,CAAC,KAAK,EAAE,CAAA;YACf,CAAC,4BAGM,CACL,CACP,CAAA;AACH,CAAC,CAAC,CAAA;AAEF,MAAM,OAAO,GAAG,QAAQ,CAAC,UAAU,EAAE,KAAK,EAA2B;IACnE,MAAM,
|
|
1
|
+
{"version":3,"file":"Loading.js","sourceRoot":"","sources":["../../src/components/Loading.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
-
import type { ColumnTrackSpec, Highlight } from '../types.ts';
|
|
2
|
+
import type { ColumnTrackSpec, Highlight, ResidueMapping } from '../types.ts';
|
|
3
3
|
import type { FileLocation as FileLocationType } from '@jbrowse/core/util/types';
|
|
4
4
|
interface MSAViewerProps {
|
|
5
5
|
msa?: string;
|
|
@@ -14,6 +14,12 @@ interface MSAViewerProps {
|
|
|
14
14
|
colWidth?: number;
|
|
15
15
|
/** initial per-row pixel height */
|
|
16
16
|
rowHeight?: number;
|
|
17
|
+
/**
|
|
18
|
+
* hide columns at least this percent gaps (default 100, i.e. hide nothing).
|
|
19
|
+
* A deep family's alignment is mostly insertions carried by a few members;
|
|
20
|
+
* dropping those columns is what makes the rest readable
|
|
21
|
+
*/
|
|
22
|
+
allowedGappyness?: number;
|
|
17
23
|
/** alignment columns (0-based) to highlight with a persistent overlay */
|
|
18
24
|
highlightColumns?: number[];
|
|
19
25
|
/**
|
|
@@ -26,6 +32,8 @@ interface MSAViewerProps {
|
|
|
26
32
|
relativeTo?: string;
|
|
27
33
|
/** tracks supplied as data: per-column bar values or a text row (see docs/layers.md) */
|
|
28
34
|
columnTracks?: ColumnTrackSpec[];
|
|
35
|
+
/** which residue of which structure each row's residues are (see docs/layers.md) */
|
|
36
|
+
residueMappings?: ResidueMapping[];
|
|
29
37
|
/** draw the phylogenetic tree (default true); false leaves a labels-only gutter */
|
|
30
38
|
drawTree?: boolean;
|
|
31
39
|
/** fixed width (px) of the tree/label area */
|
|
@@ -33,5 +41,5 @@ interface MSAViewerProps {
|
|
|
33
41
|
/** auto-size the tree/label area to the labels (used when drawTree is false) */
|
|
34
42
|
autoTreeAreaWidth?: boolean;
|
|
35
43
|
}
|
|
36
|
-
export default function MSAViewer({ msa, tree, gff, msaFilehandle, treeFilehandle, gffFilehandle, colorScheme, height, colWidth, rowHeight, highlightColumns, highlights, relativeTo, columnTracks, drawTree, treeAreaWidth, autoTreeAreaWidth, }: MSAViewerProps): React.JSX.Element;
|
|
44
|
+
export default function MSAViewer({ msa, tree, gff, msaFilehandle, treeFilehandle, gffFilehandle, colorScheme, height, colWidth, rowHeight, allowedGappyness, highlightColumns, highlights, relativeTo, columnTracks, residueMappings, drawTree, treeAreaWidth, autoTreeAreaWidth, }: MSAViewerProps): React.JSX.Element;
|
|
37
45
|
export {};
|
|
@@ -1,11 +1,12 @@
|
|
|
1
|
-
import React, { useEffect, useState } from 'react';
|
|
1
|
+
import React, { useEffect, useRef, useState } from 'react';
|
|
2
2
|
import { createJBrowseTheme } from '@jbrowse/core/ui/theme';
|
|
3
3
|
import useMeasure from '@jbrowse/core/util/useMeasure';
|
|
4
|
+
import { destroy, isAlive } from '@jbrowse/mobx-state-tree';
|
|
4
5
|
import { ThemeProvider } from '@mui/material/styles';
|
|
5
6
|
import MSAModelF from '../model.js';
|
|
6
7
|
import Loading from './Loading.js';
|
|
7
8
|
const theme = createJBrowseTheme();
|
|
8
|
-
export default function MSAViewer({ msa, tree, gff, msaFilehandle, treeFilehandle, gffFilehandle, colorScheme, height, colWidth, rowHeight, highlightColumns, highlights, relativeTo, columnTracks, drawTree, treeAreaWidth, autoTreeAreaWidth, }) {
|
|
9
|
+
export default function MSAViewer({ msa, tree, gff, msaFilehandle, treeFilehandle, gffFilehandle, colorScheme, height, colWidth, rowHeight, allowedGappyness, highlightColumns, highlights, relativeTo, columnTracks, residueMappings, drawTree, treeAreaWidth, autoTreeAreaWidth, }) {
|
|
9
10
|
// lazy initializer: the model is created exactly once from the initial props
|
|
10
11
|
// (a stable MST instance — not a value safe to recompute, so not useMemo)
|
|
11
12
|
const [model] = useState(() => MSAModelF().create({
|
|
@@ -20,20 +21,107 @@ export default function MSAViewer({ msa, tree, gff, msaFilehandle, treeFilehandl
|
|
|
20
21
|
...(height ? { height } : {}),
|
|
21
22
|
...(colWidth ? { colWidth } : {}),
|
|
22
23
|
...(rowHeight ? { rowHeight } : {}),
|
|
24
|
+
...(allowedGappyness !== undefined ? { allowedGappyness } : {}),
|
|
23
25
|
...(highlightColumns ? { highlightColumns } : {}),
|
|
24
26
|
...(highlights ? { highlights } : {}),
|
|
25
27
|
...(relativeTo ? { relativeTo } : {}),
|
|
26
28
|
...(columnTracks ? { columnTracks } : {}),
|
|
29
|
+
...(residueMappings ? { residueMappings } : {}),
|
|
27
30
|
...(drawTree !== undefined ? { drawTree } : {}),
|
|
28
31
|
...(treeAreaWidth ? { treeAreaWidth } : {}),
|
|
29
32
|
...(autoTreeAreaWidth ? { autoTreeAreaWidth } : {}),
|
|
30
33
|
}));
|
|
34
|
+
const destroyTimer = useRef(undefined);
|
|
31
35
|
const [ref, { width }] = useMeasure();
|
|
32
36
|
useEffect(() => {
|
|
33
37
|
if (width) {
|
|
34
38
|
model.setWidth(width);
|
|
35
39
|
}
|
|
36
40
|
}, [model, width]);
|
|
41
|
+
// The props below stay live after mount: change one and it drives the model,
|
|
42
|
+
// so a host can put a control on the viewer -- an expand button, a diff
|
|
43
|
+
// toggle, a color-scheme picker -- without remounting it and re-fetching its
|
|
44
|
+
// alignment. Each effect depends only on its own prop, so a change the user
|
|
45
|
+
// makes inside the viewer (picking a scheme from the menu, dragging a row
|
|
46
|
+
// taller) survives the host's next render rather than being snapped back.
|
|
47
|
+
// Data props are not among them: new msa/tree/gff is a different alignment,
|
|
48
|
+
// which is a new model, which React spells `key`.
|
|
49
|
+
useEffect(() => {
|
|
50
|
+
if (height !== undefined) {
|
|
51
|
+
model.setHeight(height);
|
|
52
|
+
}
|
|
53
|
+
}, [model, height]);
|
|
54
|
+
useEffect(() => {
|
|
55
|
+
if (colorScheme !== undefined) {
|
|
56
|
+
model.setColorSchemeName(colorScheme);
|
|
57
|
+
}
|
|
58
|
+
}, [model, colorScheme]);
|
|
59
|
+
useEffect(() => {
|
|
60
|
+
if (colWidth !== undefined) {
|
|
61
|
+
model.setColWidth(colWidth);
|
|
62
|
+
}
|
|
63
|
+
}, [model, colWidth]);
|
|
64
|
+
useEffect(() => {
|
|
65
|
+
if (rowHeight !== undefined) {
|
|
66
|
+
model.setRowHeight(rowHeight);
|
|
67
|
+
}
|
|
68
|
+
}, [model, rowHeight]);
|
|
69
|
+
useEffect(() => {
|
|
70
|
+
if (allowedGappyness !== undefined) {
|
|
71
|
+
model.setAllowedGappyness(allowedGappyness);
|
|
72
|
+
}
|
|
73
|
+
}, [model, allowedGappyness]);
|
|
74
|
+
useEffect(() => {
|
|
75
|
+
if (drawTree !== undefined) {
|
|
76
|
+
model.setDrawTree(drawTree);
|
|
77
|
+
}
|
|
78
|
+
}, [model, drawTree]);
|
|
79
|
+
useEffect(() => {
|
|
80
|
+
if (treeAreaWidth !== undefined) {
|
|
81
|
+
model.setTreeAreaWidth(treeAreaWidth);
|
|
82
|
+
}
|
|
83
|
+
}, [model, treeAreaWidth]);
|
|
84
|
+
// unguarded: dropping the prop is how a host turns the reference diff back off
|
|
85
|
+
useEffect(() => {
|
|
86
|
+
model.drawRelativeTo(relativeTo);
|
|
87
|
+
}, [model, relativeTo]);
|
|
88
|
+
// the data layers, keyed by content: a host that computes one inline hands a
|
|
89
|
+
// new array on every render, and replacing the model's copy each time would
|
|
90
|
+
// redraw the overlay for nothing
|
|
91
|
+
const highlightsKey = JSON.stringify(highlights ?? []);
|
|
92
|
+
useEffect(() => {
|
|
93
|
+
model.setHighlights(JSON.parse(highlightsKey));
|
|
94
|
+
}, [model, highlightsKey]);
|
|
95
|
+
const columnTracksKey = JSON.stringify(columnTracks ?? []);
|
|
96
|
+
useEffect(() => {
|
|
97
|
+
model.setColumnTracks(JSON.parse(columnTracksKey));
|
|
98
|
+
}, [model, columnTracksKey]);
|
|
99
|
+
const residueMappingsKey = JSON.stringify(residueMappings ?? []);
|
|
100
|
+
useEffect(() => {
|
|
101
|
+
model.setResidueMappings(JSON.parse(residueMappingsKey));
|
|
102
|
+
}, [model, residueMappingsKey]);
|
|
103
|
+
const highlightColumnsKey = JSON.stringify(highlightColumns ?? null);
|
|
104
|
+
useEffect(() => {
|
|
105
|
+
model.setHighlightedColumns(JSON.parse(highlightColumnsKey) ?? undefined);
|
|
106
|
+
}, [model, highlightColumnsKey]);
|
|
107
|
+
// the model owns a matchMedia listener and whatever fetches its filehandles
|
|
108
|
+
// started, so an unmounted viewer that keeps its model keeps those too. The
|
|
109
|
+
// destroy is deferred by a tick because React's StrictMode mounts, unmounts
|
|
110
|
+
// and remounts with the same state: the remount's effect cancels it
|
|
111
|
+
useEffect(() => {
|
|
112
|
+
if (destroyTimer.current !== undefined) {
|
|
113
|
+
clearTimeout(destroyTimer.current);
|
|
114
|
+
destroyTimer.current = undefined;
|
|
115
|
+
}
|
|
116
|
+
return () => {
|
|
117
|
+
destroyTimer.current = setTimeout(() => {
|
|
118
|
+
destroyTimer.current = undefined;
|
|
119
|
+
if (isAlive(model)) {
|
|
120
|
+
destroy(model);
|
|
121
|
+
}
|
|
122
|
+
});
|
|
123
|
+
};
|
|
124
|
+
}, [model]);
|
|
37
125
|
return (React.createElement(ThemeProvider, { theme: theme },
|
|
38
126
|
React.createElement("div", { ref: ref },
|
|
39
127
|
React.createElement(Loading, { model: model }))));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MSAViewer.js","sourceRoot":"","sources":["../../src/components/MSAViewer.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;
|
|
1
|
+
{"version":3,"file":"MSAViewer.js","sourceRoot":"","sources":["../../src/components/MSAViewer.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import type { MsaViewModel } from '../model.ts';
|
|
3
|
-
import type {
|
|
3
|
+
import type { BasicTrack } from '../types.ts';
|
|
4
4
|
export declare const VerticalResizeHandle: ({ model, }: {
|
|
5
5
|
model: MsaViewModel;
|
|
6
6
|
}) => React.JSX.Element;
|
|
7
7
|
export declare const HorizontalResizeHandle: ({ model, }: {
|
|
8
8
|
model: MsaViewModel;
|
|
9
9
|
}) => React.JSX.Element;
|
|
10
|
-
export declare const TrackResizeHandle: ({ model,
|
|
10
|
+
export declare const TrackResizeHandle: ({ model, track, }: {
|
|
11
11
|
model: MsaViewModel;
|
|
12
|
-
|
|
12
|
+
track: BasicTrack;
|
|
13
13
|
}) => React.JSX.Element | null;
|
|
@@ -13,31 +13,38 @@ export const HorizontalResizeHandle = observer(function ({ model, }) {
|
|
|
13
13
|
}, [model]);
|
|
14
14
|
return (React.createElement(DragHandle, { axis: "y", variant: "resizer", getStart: () => model.height, onDrag: onDrag, style: { width: '100%', height: model.resizeHandleWidth } }));
|
|
15
15
|
});
|
|
16
|
-
// The
|
|
17
|
-
// so conservation and property conservation stay directly
|
|
18
|
-
// keeps its own, being taller by default. Text tracks are
|
|
19
|
-
// alignment row tall and follow rowHeight, so the zoom
|
|
20
|
-
// them.
|
|
21
|
-
const
|
|
22
|
-
bar: {
|
|
23
|
-
|
|
24
|
-
set: (model, height) => {
|
|
25
|
-
model.setConservationTrackHeight(height);
|
|
26
|
-
},
|
|
16
|
+
// The volatile behind each resizable kind of computed track. Both bar tracks
|
|
17
|
+
// write one height so conservation and property conservation stay directly
|
|
18
|
+
// comparable; the logo keeps its own, being taller by default. Text tracks are
|
|
19
|
+
// absent: they are one alignment row tall and follow rowHeight, so the zoom
|
|
20
|
+
// controls already size them.
|
|
21
|
+
const setTrackHeight = {
|
|
22
|
+
bar: (model, height) => {
|
|
23
|
+
model.setConservationTrackHeight(height);
|
|
27
24
|
},
|
|
28
|
-
logo: {
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
25
|
+
logo: (model, height) => {
|
|
26
|
+
model.setSequenceLogoTrackHeight(height);
|
|
27
|
+
},
|
|
28
|
+
arc: (model, height) => {
|
|
29
|
+
model.setArcTrackHeight(height);
|
|
33
30
|
},
|
|
34
31
|
};
|
|
35
|
-
export const TrackResizeHandle = observer(function ({ model,
|
|
36
|
-
const height =
|
|
32
|
+
export const TrackResizeHandle = observer(function ({ model, track, }) {
|
|
33
|
+
const { id, kind, height } = track.model;
|
|
34
|
+
const setHeight = setTrackHeight[kind];
|
|
35
|
+
// a data track carries its own height, so its handle resizes that track --
|
|
36
|
+
// dragging one used to resize every track of its kind instead
|
|
37
|
+
const ownHeight = model.columnTracks.some(t => t.id === id);
|
|
37
38
|
const onDrag = useCallback((delta, startHeight) => {
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
39
|
+
const next = Math.max(10, startHeight + delta);
|
|
40
|
+
if (ownHeight) {
|
|
41
|
+
model.setColumnTrackHeight(id, next);
|
|
42
|
+
}
|
|
43
|
+
else {
|
|
44
|
+
setTrackHeight[kind]?.(model, next);
|
|
45
|
+
}
|
|
46
|
+
}, [model, id, kind, ownHeight]);
|
|
47
|
+
return setHeight ? (React.createElement(DragHandle, { axis: "y", variant: "resizer", getStart: () => height, onDrag: onDrag, style: {
|
|
41
48
|
position: 'absolute',
|
|
42
49
|
bottom: 0,
|
|
43
50
|
left: 0,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ResizeHandles.js","sourceRoot":"","sources":["../../src/components/ResizeHandles.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,WAAW,EAAE,MAAM,OAAO,CAAA;AAE1C,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAErC,OAAO,UAAU,MAAM,iBAAkB,CAAA;AAKzC,MAAM,CAAC,MAAM,oBAAoB,GAAG,QAAQ,CAAC,UAAU,EACrD,KAAK,GAGN;IACC,MAAM,MAAM,GAAG,WAAW,CACxB,CAAC,KAAa,EAAE,UAAkB,EAAE,EAAE;QACpC,KAAK,CAAC,gBAAgB,CAAC,UAAU,GAAG,KAAK,CAAC,CAAA;IAC5C,CAAC,EACD,CAAC,KAAK,CAAC,CACR,CAAA;IACD,OAAO,CACL,oBAAC,UAAU,IACT,IAAI,EAAC,GAAG,EACR,OAAO,EAAC,SAAS,EACjB,QAAQ,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,aAAa,EACnC,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,iBAAiB,EAAE,GACzC,CACH,CAAA;AACH,CAAC,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,sBAAsB,GAAG,QAAQ,CAAC,UAAU,EACvD,KAAK,GAGN;IACC,MAAM,MAAM,GAAG,WAAW,CACxB,CAAC,KAAa,EAAE,WAAmB,EAAE,EAAE;QACrC,KAAK,CAAC,SAAS,CAAC,WAAW,GAAG,KAAK,CAAC,CAAA;IACtC,CAAC,EACD,CAAC,KAAK,CAAC,CACR,CAAA;IACD,OAAO,CACL,oBAAC,UAAU,IACT,IAAI,EAAC,GAAG,EACR,OAAO,EAAC,SAAS,EACjB,QAAQ,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,MAAM,EAC5B,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,iBAAiB,EAAE,GACzD,CACH,CAAA;AACH,CAAC,CAAC,CAAA;AAEF
|
|
1
|
+
{"version":3,"file":"ResizeHandles.js","sourceRoot":"","sources":["../../src/components/ResizeHandles.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import type { MsaViewModel } from '../../model.ts';
|
|
3
|
-
declare const
|
|
3
|
+
declare const AnnotationFileDialog: ({ handleClose, model, }: {
|
|
4
4
|
handleClose: () => void;
|
|
5
5
|
model: MsaViewModel;
|
|
6
6
|
}) => React.JSX.Element;
|
|
7
|
-
export default
|
|
7
|
+
export default AnnotationFileDialog;
|
|
@@ -0,0 +1,92 @@
|
|
|
1
|
+
import React, { useState } from 'react';
|
|
2
|
+
import { Dialog, ErrorMessage } from '@jbrowse/core/ui';
|
|
3
|
+
import { Button, DialogActions, DialogContent, FormControl, FormControlLabel, Radio, RadioGroup, TextField, Typography, } from '@mui/material';
|
|
4
|
+
import { observer } from 'mobx-react';
|
|
5
|
+
import { annotationsToGFF, interProScanResponseToAnnotations, } from 'msa-parsers';
|
|
6
|
+
// GFF3 as the CLI writes it, or the JSON an InterProScan run returns. Both
|
|
7
|
+
// arrive as text and the model keeps GFF, so the JSON is converted on the way
|
|
8
|
+
// in rather than given a second path through the model
|
|
9
|
+
function toGFF(text) {
|
|
10
|
+
const trimmed = text.trimStart();
|
|
11
|
+
if (!trimmed.startsWith('{')) {
|
|
12
|
+
return text;
|
|
13
|
+
}
|
|
14
|
+
const response = JSON.parse(trimmed);
|
|
15
|
+
return annotationsToGFF(interProScanResponseToAnnotations(response));
|
|
16
|
+
}
|
|
17
|
+
async function fetchText(url) {
|
|
18
|
+
const response = await fetch(url);
|
|
19
|
+
if (!response.ok) {
|
|
20
|
+
throw new Error(`HTTP ${response.status} fetching ${url} ${await response.text()}`);
|
|
21
|
+
}
|
|
22
|
+
return response.text();
|
|
23
|
+
}
|
|
24
|
+
const AnnotationFileDialog = observer(function ({ handleClose, model, }) {
|
|
25
|
+
const [file, setFile] = useState();
|
|
26
|
+
const [choice, setChoice] = useState('file');
|
|
27
|
+
const [url, setUrl] = useState('');
|
|
28
|
+
const [error, setError] = useState();
|
|
29
|
+
const [loading, setLoading] = useState(false);
|
|
30
|
+
// the error is shown here rather than notified: the standalone app and the
|
|
31
|
+
// MSAViewer component have no jbrowse session to notify, and asking one for
|
|
32
|
+
// its notify() threw out of the success path into the catch, which threw
|
|
33
|
+
// again on the same missing session
|
|
34
|
+
return (React.createElement(Dialog, { maxWidth: "xl", title: "Open annotation file", onClose: () => {
|
|
35
|
+
handleClose();
|
|
36
|
+
}, open: true },
|
|
37
|
+
React.createElement(DialogContent, null,
|
|
38
|
+
error ? React.createElement(ErrorMessage, { error: error }) : null,
|
|
39
|
+
React.createElement(Typography, null, "Open a GFF3 file of annotations, such as the one `react-msaview-cli interpro` writes, or the JSON an InterProScan run returns."),
|
|
40
|
+
React.createElement("div", { style: { display: 'flex', margin: 30 } },
|
|
41
|
+
React.createElement(FormControl, { component: "fieldset" },
|
|
42
|
+
React.createElement(RadioGroup, { value: choice, onChange: event => {
|
|
43
|
+
setChoice(event.target.value);
|
|
44
|
+
} },
|
|
45
|
+
React.createElement(FormControlLabel, { value: "url", control: React.createElement(Radio, null), label: "URL" }),
|
|
46
|
+
React.createElement(FormControlLabel, { value: "file", control: React.createElement(Radio, null), label: "File" }))),
|
|
47
|
+
choice === 'url' ? (React.createElement("div", null,
|
|
48
|
+
React.createElement(Typography, null, "Open an annotation file from a URL"),
|
|
49
|
+
React.createElement(TextField, { label: "URL", value: url, onChange: event => {
|
|
50
|
+
setUrl(event.target.value);
|
|
51
|
+
} }))) : (React.createElement("div", { style: { paddingTop: 20 } },
|
|
52
|
+
React.createElement(Typography, null, "Open an annotation file from your local drive"),
|
|
53
|
+
React.createElement(Button, { variant: "outlined", component: "label" },
|
|
54
|
+
"Choose File",
|
|
55
|
+
React.createElement("input", { type: "file", hidden: true, onChange: ({ target }) => {
|
|
56
|
+
const chosen = target.files?.[0];
|
|
57
|
+
if (chosen) {
|
|
58
|
+
setFile(chosen);
|
|
59
|
+
}
|
|
60
|
+
} })),
|
|
61
|
+
file ? React.createElement(Typography, null, file.name) : null)))),
|
|
62
|
+
React.createElement(DialogActions, null,
|
|
63
|
+
React.createElement(Button, { variant: "contained", color: "primary", disabled: loading, onClick: () => {
|
|
64
|
+
// eslint-disable-next-line @typescript-eslint/no-floating-promises
|
|
65
|
+
;
|
|
66
|
+
(async () => {
|
|
67
|
+
setLoading(true);
|
|
68
|
+
setError(undefined);
|
|
69
|
+
try {
|
|
70
|
+
const text = await (choice === 'file' && file
|
|
71
|
+
? file.text()
|
|
72
|
+
: fetchText(url));
|
|
73
|
+
// through the model's own GFF text, so the annotations travel
|
|
74
|
+
// in the snapshot and the shared URL like every other layer.
|
|
75
|
+
// Setting them straight onto the volatile left a view whose
|
|
76
|
+
// link opened without them
|
|
77
|
+
model.setGFF(toGFF(text));
|
|
78
|
+
model.setShowDomains(true);
|
|
79
|
+
handleClose();
|
|
80
|
+
}
|
|
81
|
+
catch (e) {
|
|
82
|
+
console.error(e);
|
|
83
|
+
setError(e);
|
|
84
|
+
}
|
|
85
|
+
finally {
|
|
86
|
+
setLoading(false);
|
|
87
|
+
}
|
|
88
|
+
})();
|
|
89
|
+
} }, "Open annotations"))));
|
|
90
|
+
});
|
|
91
|
+
export default AnnotationFileDialog;
|
|
92
|
+
//# sourceMappingURL=AnnotationFileDialog.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"AnnotationFileDialog.js","sourceRoot":"","sources":["../../../src/components/dialogs/AnnotationFileDialog.tsx"],"names":[],"mappings":"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"}
|
|
@@ -3,17 +3,21 @@ import { Dialog } from '@jbrowse/core/ui';
|
|
|
3
3
|
import { Button, Checkbox, DialogContent, Table, TableBody, TableCell, TableHead, TableRow, } from '@mui/material';
|
|
4
4
|
import { observer } from 'mobx-react';
|
|
5
5
|
const Toggles = observer(function ({ model }) {
|
|
6
|
-
|
|
6
|
+
// the accessions the file has, not the ones the filter map happens to hold:
|
|
7
|
+
// that map now carries only what the reader turned off, and before that it
|
|
8
|
+
// accumulated every accession of every file opened in this view
|
|
9
|
+
const { annotationTypes } = model;
|
|
10
|
+
const setAll = (shown) => {
|
|
11
|
+
for (const accession of annotationTypes.keys()) {
|
|
12
|
+
model.setFilter(accession, shown);
|
|
13
|
+
}
|
|
14
|
+
};
|
|
7
15
|
return (React.createElement("div", null,
|
|
8
16
|
React.createElement(Button, { onClick: () => {
|
|
9
|
-
|
|
10
|
-
model.setFilter(key, true);
|
|
11
|
-
}
|
|
17
|
+
setAll(true);
|
|
12
18
|
} }, "Toggle all on"),
|
|
13
19
|
React.createElement(Button, { onClick: () => {
|
|
14
|
-
|
|
15
|
-
model.setFilter(key, false);
|
|
16
|
-
}
|
|
20
|
+
setAll(false);
|
|
17
21
|
} }, "Toggle all off")));
|
|
18
22
|
});
|
|
19
23
|
const FeatureTable = observer(function ({ model }) {
|
|
@@ -35,8 +39,8 @@ const FeatureTable = observer(function ({ model }) {
|
|
|
35
39
|
React.createElement(TableCell, null, "description"))),
|
|
36
40
|
React.createElement(TableBody, null, [...annotationTypes.values()].map(({ accession, name, description }) => (React.createElement(TableRow, { key: accession },
|
|
37
41
|
React.createElement(TableCell, { padding: "checkbox" },
|
|
38
|
-
React.createElement(Checkbox, { checked: model.
|
|
39
|
-
model.setFilter(accession,
|
|
42
|
+
React.createElement(Checkbox, { checked: !model.turnedOffFeatures.get(accession), onChange: () => {
|
|
43
|
+
model.setFilter(accession, !!model.turnedOffFeatures.get(accession));
|
|
40
44
|
} })),
|
|
41
45
|
React.createElement(TableCell, null,
|
|
42
46
|
React.createElement("div", { style: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FeatureDialog.js","sourceRoot":"","sources":["../../../src/components/dialogs/FeatureDialog.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AACzC,OAAO,EACL,MAAM,EACN,QAAQ,EACR,aAAa,EACb,KAAK,EACL,SAAS,EACT,SAAS,EACT,SAAS,EACT,QAAQ,GACT,MAAM,eAAe,CAAA;AACtB,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAIrC,MAAM,OAAO,GAAG,QAAQ,CAAC,UAAU,EAAE,KAAK,EAA2B;IACnE,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"FeatureDialog.js","sourceRoot":"","sources":["../../../src/components/dialogs/FeatureDialog.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AACzC,OAAO,EACL,MAAM,EACN,QAAQ,EACR,aAAa,EACb,KAAK,EACL,SAAS,EACT,SAAS,EACT,SAAS,EACT,QAAQ,GACT,MAAM,eAAe,CAAA;AACtB,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAIrC,MAAM,OAAO,GAAG,QAAQ,CAAC,UAAU,EAAE,KAAK,EAA2B;IACnE,4EAA4E;IAC5E,2EAA2E;IAC3E,gEAAgE;IAChE,MAAM,EAAE,eAAe,EAAE,GAAG,KAAK,CAAA;IACjC,MAAM,MAAM,GAAG,CAAC,KAAc,EAAE,EAAE;QAChC,KAAK,MAAM,SAAS,IAAI,eAAe,CAAC,IAAI,EAAE,EAAE,CAAC;YAC/C,KAAK,CAAC,SAAS,CAAC,SAAS,EAAE,KAAK,CAAC,CAAA;QACnC,CAAC;IACH,CAAC,CAAA;IACD,OAAO,CACL;QACE,oBAAC,MAAM,IACL,OAAO,EAAE,GAAG,EAAE;gBACZ,MAAM,CAAC,IAAI,CAAC,CAAA;YACd,CAAC,oBAGM;QAET,oBAAC,MAAM,IACL,OAAO,EAAE,GAAG,EAAE;gBACZ,MAAM,CAAC,KAAK,CAAC,CAAA;YACf,CAAC,qBAGM,CACL,CACP,CAAA;AACH,CAAC,CAAC,CAAA;AAEF,MAAM,YAAY,GAAG,QAAQ,CAAC,UAAU,EAAE,KAAK,EAA2B;IACxE,MAAM,EAAE,eAAe,EAAE,WAAW,EAAE,WAAW,EAAE,GAAG,KAAK,CAAA;IAC3D,MAAM,MAAM,GAAG,IAAI,GAAG,EAAkB,CAAA;IACxC,KAAK,MAAM,KAAK,IAAI,WAAW,EAAE,CAAC;QAChC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAA;IACrE,CAAC;IACD,OAAO,CACL;QACE,oBAAC,OAAO,IAAC,KAAK,EAAE,KAAK,GAAI;QACzB,oBAAC,KAAK,IAAC,IAAI,EAAC,OAAO;YACjB,oBAAC,SAAS;gBACR,oBAAC,QAAQ;oBACP,oBAAC,SAAS,IAAC,OAAO,EAAC,UAAU,GAAG;oBAChC,oBAAC,SAAS,gBAAkB;oBAC5B,oBAAC,SAAS,oBAAsB;oBAChC,oBAAC,SAAS,eAAiB;oBAC3B,oBAAC,SAAS,gBAAkB;oBAC5B,oBAAC,SAAS,sBAAwB,CACzB,CACD;YACZ,oBAAC,SAAS,QACP,CAAC,GAAG,eAAe,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAChC,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC,CACpC,oBAAC,QAAQ,IAAC,GAAG,EAAE,SAAS;gBACtB,oBAAC,SAAS,IAAC,OAAO,EAAC,UAAU;oBAC3B,oBAAC,QAAQ,IACP,OAAO,EAAE,CAAC,KAAK,CAAC,iBAAiB,CAAC,GAAG,CAAC,SAAS,CAAC,EAChD,QAAQ,EAAE,GAAG,EAAE;4BACb,KAAK,CAAC,SAAS,CACb,SAAS,EACT,CAAC,CAAC,KAAK,CAAC,iBAAiB,CAAC,GAAG,CAAC,SAAS,CAAC,CACzC,CAAA;wBACH,CAAC,GACD,CACQ;gBACZ,oBAAC,SAAS;oBACR,6BACE,KAAK,EAAE;4BACL,KAAK,EAAE,EAAE;4BACT,MAAM,EAAE,EAAE;4BACV,UAAU,EAAE,WAAW,CAAC,SAAS,CAAC;yBACnC,GACD,CACQ;gBACZ,oBAAC,SAAS,QAAE,SAAS,CAAa;gBAClC,oBAAC,SAAS,QAAE,IAAI,CAAa;gBAC7B,oBAAC,SAAS,QAAE,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAa;gBAC9C,oBAAC,SAAS,QAAE,WAAW,CAAa,CAC3B,CACZ,CACF,CACS,CACN,CACP,CACJ,CAAA;AACH,CAAC,CAAC,CAAA;AAEF,MAAM,iBAAiB,GAAG,QAAQ,CAAC,UAAU,EAC3C,OAAO,EACP,KAAK,GAIN;IACC,OAAO,CACL,oBAAC,MAAM,IACL,OAAO,EAAE,GAAG,EAAE;YACZ,OAAO,EAAE,CAAA;QACX,CAAC,EACD,IAAI,QACJ,KAAK,EAAC,iBAAiB,EACvB,QAAQ,EAAC,IAAI;QAEb,oBAAC,aAAa;YACZ,oBAAC,YAAY,IAAC,KAAK,EAAE,KAAK,GAAI,CAChB,CACT,CACV,CAAA;AACH,CAAC,CAAC,CAAA;AAEF,eAAe,iBAAiB,CAAA"}
|
|
@@ -8,9 +8,11 @@ import FileMenu from './FileMenu.js';
|
|
|
8
8
|
import GappynessSlider from './GappynessSlider.js';
|
|
9
9
|
import HeaderInfoArea from './HeaderInfoArea.js';
|
|
10
10
|
import HeaderStatusArea from './HeaderStatusArea.js';
|
|
11
|
+
import LoadWarnings from './LoadWarnings.js';
|
|
11
12
|
import MSASettingsMenu from './MSASettingsMenu.js';
|
|
12
13
|
import MultiAlignmentSelector from './MultiAlignmentSelector.js';
|
|
13
14
|
import TreeSettingsMenu from './TreeSettingsMenu.js';
|
|
15
|
+
import UnshareableDataWarning from './UnshareableDataWarning.js';
|
|
14
16
|
import ZoomControls from './ZoomControls.js';
|
|
15
17
|
import ZoomMenu from './ZoomMenu.js';
|
|
16
18
|
const AboutDialog = lazy(() => import('../dialogs/AboutDialog.js'));
|
|
@@ -31,6 +33,8 @@ const Header = observer(function ({ model }) {
|
|
|
31
33
|
React.createElement(MultiAlignmentSelector, { model: model })),
|
|
32
34
|
React.createElement(HeaderInfoArea, { model: model }),
|
|
33
35
|
React.createElement(Spacer, null),
|
|
36
|
+
React.createElement(LoadWarnings, { model: model }),
|
|
37
|
+
React.createElement(UnshareableDataWarning, { model: model }),
|
|
34
38
|
React.createElement(HeaderStatusArea, { model: model }),
|
|
35
39
|
React.createElement(Tooltip, { title: "About" },
|
|
36
40
|
React.createElement(IconButton, { "aria-label": "About", onClick: () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Header.js","sourceRoot":"","sources":["../../../src/components/header/Header.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAE9C,OAAO,UAAU,MAAM,+BAA+B,CAAA;AACtD,OAAO,IAAI,MAAM,0BAA0B,CAAA;AAC3C,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AACnD,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAErC,OAAO,eAAe,MAAM,sBAAuB,CAAA;AACnD,OAAO,QAAQ,MAAM,eAAgB,CAAA;AACrC,OAAO,eAAe,MAAM,sBAAuB,CAAA;AACnD,OAAO,cAAc,MAAM,qBAAsB,CAAA;AACjD,OAAO,gBAAgB,MAAM,uBAAwB,CAAA;AACrD,OAAO,eAAe,MAAM,sBAAuB,CAAA;AACnD,OAAO,sBAAsB,MAAM,6BAA8B,CAAA;AACjE,OAAO,gBAAgB,MAAM,uBAAwB,CAAA;AACrD,OAAO,YAAY,MAAM,mBAAoB,CAAA;AAC7C,OAAO,QAAQ,MAAM,eAAgB,CAAA;AAIrC,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,2BAA4B,CAAC,CAAC,CAAA;AAEpE,MAAM,MAAM,GAAG,QAAQ,CAAC,UAAU,EAAE,KAAK,EAA2B;IAClE,MAAM,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,CAAC,GAAG,UAAU,EAAE,CAAA;IACtC,SAAS,CAAC,GAAG,EAAE;QACb,KAAK,CAAC,eAAe,CAAC,MAAM,IAAI,CAAC,CAAC,CAAA;IACpC,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAA;IACnB,OAAO,CACL,6BAAK,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE;QACvC,oBAAC,QAAQ,IAAC,KAAK,EAAE,KAAK,GAAI;QAC1B,oBAAC,eAAe,IAAC,KAAK,EAAE,KAAK,GAAI;QACjC,oBAAC,gBAAgB,IAAC,KAAK,EAAE,KAAK,GAAI;QAClC,oBAAC,eAAe,IAAC,KAAK,EAAE,KAAK,GAAI;QACjC,oBAAC,YAAY,IAAC,KAAK,EAAE,KAAK,GAAI;QAC9B,oBAAC,QAAQ,IAAC,KAAK,EAAE,KAAK,GAAI;QAC1B,oBAAC,eAAe,IAAC,KAAK,EAAE,KAAK,GAAI;QACjC,6BAAK,KAAK,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE;YAC7C,oBAAC,sBAAsB,IAAC,KAAK,EAAE,KAAK,GAAI,CACpC;QACN,oBAAC,cAAc,IAAC,KAAK,EAAE,KAAK,GAAI;QAChC,oBAAC,MAAM,OAAG;QACV,oBAAC,gBAAgB,IAAC,KAAK,EAAE,KAAK,GAAI;QAClC,oBAAC,OAAO,IAAC,KAAK,EAAC,OAAO;YACpB,oBAAC,UAAU,kBACE,OAAO,EAClB,OAAO,EAAE,GAAG,EAAE;oBACZ,KAAK,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,WAAW,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC,CAAA;gBAC1D,CAAC;gBAED,oBAAC,IAAI,OAAG,CACG,CACL,CACN,CACP,CAAA;AACH,CAAC,CAAC,CAAA;AAEF,SAAS,MAAM;IACb,OAAO,6BAAK,KAAK,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,GAAI,CAAA;AACpC,CAAC;AAED,eAAe,MAAM,CAAA"}
|
|
1
|
+
{"version":3,"file":"Header.js","sourceRoot":"","sources":["../../../src/components/header/Header.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAE9C,OAAO,UAAU,MAAM,+BAA+B,CAAA;AACtD,OAAO,IAAI,MAAM,0BAA0B,CAAA;AAC3C,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AACnD,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAErC,OAAO,eAAe,MAAM,sBAAuB,CAAA;AACnD,OAAO,QAAQ,MAAM,eAAgB,CAAA;AACrC,OAAO,eAAe,MAAM,sBAAuB,CAAA;AACnD,OAAO,cAAc,MAAM,qBAAsB,CAAA;AACjD,OAAO,gBAAgB,MAAM,uBAAwB,CAAA;AACrD,OAAO,YAAY,MAAM,mBAAoB,CAAA;AAC7C,OAAO,eAAe,MAAM,sBAAuB,CAAA;AACnD,OAAO,sBAAsB,MAAM,6BAA8B,CAAA;AACjE,OAAO,gBAAgB,MAAM,uBAAwB,CAAA;AACrD,OAAO,sBAAsB,MAAM,6BAA8B,CAAA;AACjE,OAAO,YAAY,MAAM,mBAAoB,CAAA;AAC7C,OAAO,QAAQ,MAAM,eAAgB,CAAA;AAIrC,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,2BAA4B,CAAC,CAAC,CAAA;AAEpE,MAAM,MAAM,GAAG,QAAQ,CAAC,UAAU,EAAE,KAAK,EAA2B;IAClE,MAAM,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,CAAC,GAAG,UAAU,EAAE,CAAA;IACtC,SAAS,CAAC,GAAG,EAAE;QACb,KAAK,CAAC,eAAe,CAAC,MAAM,IAAI,CAAC,CAAC,CAAA;IACpC,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAA;IACnB,OAAO,CACL,6BAAK,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE;QACvC,oBAAC,QAAQ,IAAC,KAAK,EAAE,KAAK,GAAI;QAC1B,oBAAC,eAAe,IAAC,KAAK,EAAE,KAAK,GAAI;QACjC,oBAAC,gBAAgB,IAAC,KAAK,EAAE,KAAK,GAAI;QAClC,oBAAC,eAAe,IAAC,KAAK,EAAE,KAAK,GAAI;QACjC,oBAAC,YAAY,IAAC,KAAK,EAAE,KAAK,GAAI;QAC9B,oBAAC,QAAQ,IAAC,KAAK,EAAE,KAAK,GAAI;QAC1B,oBAAC,eAAe,IAAC,KAAK,EAAE,KAAK,GAAI;QACjC,6BAAK,KAAK,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE;YAC7C,oBAAC,sBAAsB,IAAC,KAAK,EAAE,KAAK,GAAI,CACpC;QACN,oBAAC,cAAc,IAAC,KAAK,EAAE,KAAK,GAAI;QAChC,oBAAC,MAAM,OAAG;QACV,oBAAC,YAAY,IAAC,KAAK,EAAE,KAAK,GAAI;QAC9B,oBAAC,sBAAsB,IAAC,KAAK,EAAE,KAAK,GAAI;QACxC,oBAAC,gBAAgB,IAAC,KAAK,EAAE,KAAK,GAAI;QAClC,oBAAC,OAAO,IAAC,KAAK,EAAC,OAAO;YACpB,oBAAC,UAAU,kBACE,OAAO,EAClB,OAAO,EAAE,GAAG,EAAE;oBACZ,KAAK,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,WAAW,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC,CAAA;gBAC1D,CAAC;gBAED,oBAAC,IAAI,OAAG,CACG,CACL,CACN,CACP,CAAA;AACH,CAAC,CAAC,CAAA;AAEF,SAAS,MAAM;IACb,OAAO,6BAAK,KAAK,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,GAAI,CAAA;AACpC,CAAC;AAED,eAAe,MAAM,CAAA"}
|
|
@@ -15,8 +15,6 @@ const HeaderStatusArea = observer(({ model }) => {
|
|
|
15
15
|
return status ? (React.createElement(Typography, { className: classes.margin },
|
|
16
16
|
React.createElement(LoadingEllipses, { message: status.msg, component: "span" }),
|
|
17
17
|
' ',
|
|
18
|
-
status.url ? (React.createElement("a", { href: status.url, target: "_blank", rel: "noreferrer" }, "(status)")) : null,
|
|
19
|
-
' ',
|
|
20
18
|
status.onCancel ? (React.createElement(Button, { size: "small", onClick: () => status.onCancel?.() }, "Cancel")) : null)) : null;
|
|
21
19
|
});
|
|
22
20
|
export default HeaderStatusArea;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HeaderStatusArea.js","sourceRoot":"","sources":["../../../src/components/header/HeaderStatusArea.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAA;AACzD,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAIrC,MAAM,SAAS,GAAG,UAAU,EAAE,CAAC;IAC7B,MAAM,EAAE;QACN,MAAM,EAAE,MAAM;QACd,UAAU,EAAE,EAAE;KACf;CACF,CAAC,CAAA;AAEF,MAAM,gBAAgB,GAAG,QAAQ,CAAC,CAAC,EAAE,KAAK,EAA2B,EAAE,EAAE;IACvE,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,CAAA;IACxB,MAAM,EAAE,OAAO,EAAE,GAAG,SAAS,EAAE,CAAA;IAC/B,OAAO,MAAM,CAAC,CAAC,CAAC,CACd,oBAAC,UAAU,IAAC,SAAS,EAAE,OAAO,CAAC,MAAM;QACnC,oBAAC,eAAe,IAAC,OAAO,EAAE,MAAM,CAAC,GAAG,EAAE,SAAS,EAAC,MAAM,GAAG;QAAC,GAAG;QAC5D,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"HeaderStatusArea.js","sourceRoot":"","sources":["../../../src/components/header/HeaderStatusArea.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAA;AACzD,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAIrC,MAAM,SAAS,GAAG,UAAU,EAAE,CAAC;IAC7B,MAAM,EAAE;QACN,MAAM,EAAE,MAAM;QACd,UAAU,EAAE,EAAE;KACf;CACF,CAAC,CAAA;AAEF,MAAM,gBAAgB,GAAG,QAAQ,CAAC,CAAC,EAAE,KAAK,EAA2B,EAAE,EAAE;IACvE,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,CAAA;IACxB,MAAM,EAAE,OAAO,EAAE,GAAG,SAAS,EAAE,CAAA;IAC/B,OAAO,MAAM,CAAC,CAAC,CAAC,CACd,oBAAC,UAAU,IAAC,SAAS,EAAE,OAAO,CAAC,MAAM;QACnC,oBAAC,eAAe,IAAC,OAAO,EAAE,MAAM,CAAC,GAAG,EAAE,SAAS,EAAC,MAAM,GAAG;QAAC,GAAG;QAC5D,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CACjB,oBAAC,MAAM,IAAC,IAAI,EAAC,OAAO,EAAC,OAAO,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,aAE9C,CACV,CAAC,CAAC,CAAC,IAAI,CACG,CACd,CAAC,CAAC,CAAC,IAAI,CAAA;AACV,CAAC,CAAC,CAAA;AAEF,eAAe,gBAAgB,CAAA"}
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
import React from 'react';
|
|
2
|
+
import { makeStyles } from '@jbrowse/core/util/tss-react';
|
|
3
|
+
import Warning from '@mui/icons-material/Warning';
|
|
4
|
+
import { Tooltip, Typography } from '@mui/material';
|
|
5
|
+
import { observer } from 'mobx-react';
|
|
6
|
+
const useStyles = makeStyles()(theme => ({
|
|
7
|
+
warning: {
|
|
8
|
+
display: 'flex',
|
|
9
|
+
alignItems: 'center',
|
|
10
|
+
gap: 4,
|
|
11
|
+
margin: 'auto',
|
|
12
|
+
marginLeft: 10,
|
|
13
|
+
whiteSpace: 'nowrap',
|
|
14
|
+
color: theme.palette.warning.main,
|
|
15
|
+
cursor: 'pointer',
|
|
16
|
+
},
|
|
17
|
+
}));
|
|
18
|
+
// An optional layer that failed -- a 404 on the annotations, a row-metadata
|
|
19
|
+
// file that is not JSON -- used to go to `error`, which takes dataInitialized
|
|
20
|
+
// down with it and replaces a perfectly good alignment with an error screen.
|
|
21
|
+
// It says so here instead, and the reader dismisses it.
|
|
22
|
+
const LoadWarnings = observer(function ({ model }) {
|
|
23
|
+
const { warnings } = model;
|
|
24
|
+
const { classes } = useStyles();
|
|
25
|
+
if (warnings.length === 0) {
|
|
26
|
+
return null;
|
|
27
|
+
}
|
|
28
|
+
return (React.createElement(Tooltip, { title: `${warnings.join(' ')} (click to dismiss)` },
|
|
29
|
+
React.createElement(Typography, { component: "div", className: classes.warning, onClick: () => {
|
|
30
|
+
model.clearWarnings();
|
|
31
|
+
} },
|
|
32
|
+
React.createElement(Warning, { fontSize: "small" }),
|
|
33
|
+
warnings.length > 1 ? `${warnings.length} warnings` : 'Warning')));
|
|
34
|
+
});
|
|
35
|
+
export default LoadWarnings;
|
|
36
|
+
//# sourceMappingURL=LoadWarnings.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"LoadWarnings.js","sourceRoot":"","sources":["../../../src/components/header/LoadWarnings.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAA;AACzD,OAAO,OAAO,MAAM,6BAA6B,CAAA;AACjD,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AACnD,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAIrC,MAAM,SAAS,GAAG,UAAU,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IACvC,OAAO,EAAE;QACP,OAAO,EAAE,MAAM;QACf,UAAU,EAAE,QAAQ;QACpB,GAAG,EAAE,CAAC;QACN,MAAM,EAAE,MAAM;QACd,UAAU,EAAE,EAAE;QACd,UAAU,EAAE,QAAQ;QACpB,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI;QACjC,MAAM,EAAE,SAAS;KAClB;CACF,CAAC,CAAC,CAAA;AAEH,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,wDAAwD;AACxD,MAAM,YAAY,GAAG,QAAQ,CAAC,UAAU,EAAE,KAAK,EAA2B;IACxE,MAAM,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAA;IAC1B,MAAM,EAAE,OAAO,EAAE,GAAG,SAAS,EAAE,CAAA;IAC/B,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1B,OAAO,IAAI,CAAA;IACb,CAAC;IACD,OAAO,CACL,oBAAC,OAAO,IAAC,KAAK,EAAE,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,qBAAqB;QACxD,oBAAC,UAAU,IACT,SAAS,EAAC,KAAK,EACf,SAAS,EAAE,OAAO,CAAC,OAAO,EAC1B,OAAO,EAAE,GAAG,EAAE;gBACZ,KAAK,CAAC,aAAa,EAAE,CAAA;YACvB,CAAC;YAED,oBAAC,OAAO,IAAC,QAAQ,EAAC,OAAO,GAAG;YAC3B,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,MAAM,WAAW,CAAC,CAAC,CAAC,SAAS,CACrD,CACL,CACX,CAAA;AACH,CAAC,CAAC,CAAA;AAEF,eAAe,YAAY,CAAA"}
|
|
Binary file
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MultiAlignmentSelector.js","sourceRoot":"","sources":["../../../src/components/header/MultiAlignmentSelector.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AACnD,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAIrC,MAAM,sBAAsB,GAAG,QAAQ,CAAC,UAAU,EAChD,KAAK,GAGN;IACC,MAAM,EAAE,gBAAgB,EAAE,cAAc,EAAE,GAAG,KAAK,CAAA;IAClD,8EAA8E;IAC9E,6EAA6E;IAC7E,2EAA2E;IAC3E,sEAAsE;IACtE,MAAM,IAAI,GAAG,IAAI,GAAG,EAAkB,CAAA;IACtC,OAAO,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CACjC,oBAAC,SAAS,IACR,MAAM,QACN,OAAO,EAAC,UAAU,EAClB,KAAK,EAAE,gBAAgB,EACvB,IAAI,EAAC,OAAO,EACZ,QAAQ,EAAE,KAAK,CAAC,EAAE;YAChB,KAAK,CAAC,mBAAmB,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"MultiAlignmentSelector.js","sourceRoot":"","sources":["../../../src/components/header/MultiAlignmentSelector.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AACnD,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAIrC,MAAM,sBAAsB,GAAG,QAAQ,CAAC,UAAU,EAChD,KAAK,GAGN;IACC,MAAM,EAAE,gBAAgB,EAAE,cAAc,EAAE,GAAG,KAAK,CAAA;IAClD,8EAA8E;IAC9E,6EAA6E;IAC7E,2EAA2E;IAC3E,sEAAsE;IACtE,MAAM,IAAI,GAAG,IAAI,GAAG,EAAkB,CAAA;IACtC,OAAO,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CACjC,oBAAC,SAAS,IACR,MAAM,QACN,OAAO,EAAC,UAAU,EAClB,KAAK,EAAE,gBAAgB,EACvB,IAAI,EAAC,OAAO,EACZ,QAAQ,EAAE,KAAK,CAAC,EAAE;YAChB,KAAK,CAAC,mBAAmB,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QAChD,CAAC,IAEA,cAAc,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;QACpC,MAAM,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;QAC/B,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAA;QACvB,OAAO,CACL,oBAAC,QAAQ,IAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,IAAI,CAAC,EAAE,EAAE,KAAK,EAAE,KAAK,IAC7D,MAAM,CACE,CACZ,CAAA;IACH,CAAC,CAAC,CACQ,CACb,CAAC,CAAC,CAAC,IAAI,CAAA;AACV,CAAC,CAAC,CAAA;AACF,eAAe,sBAAsB,CAAA"}
|
|
@@ -2,9 +2,11 @@ import React from 'react';
|
|
|
2
2
|
import CascadingMenuButton from '@jbrowse/core/ui/CascadingMenuButton';
|
|
3
3
|
import AccountTree from '@mui/icons-material/AccountTree';
|
|
4
4
|
import { observer } from 'mobx-react';
|
|
5
|
+
import { maxNeighborJoiningRows } from '../../constants.js';
|
|
5
6
|
import { treeSettingsMenuItems } from './settingsMenuItems.js';
|
|
6
7
|
const TreeSettingsMenu = observer(function ({ model, }) {
|
|
7
8
|
const { rows } = model;
|
|
9
|
+
const tooManyRows = rows.length > maxNeighborJoiningRows;
|
|
8
10
|
return (React.createElement(CascadingMenuButton, { "data-testid": "tree_settings_menu", tooltip: "Tree settings", closeAfterItemClick: false, anchorOrigin: { vertical: 'bottom', horizontal: 'left' }, transformOrigin: { vertical: 'top', horizontal: 'left' }, menuItems: [
|
|
9
11
|
...treeSettingsMenuItems(model),
|
|
10
12
|
...(rows.length >= 2
|
|
@@ -14,7 +16,13 @@ const TreeSettingsMenu = observer(function ({ model, }) {
|
|
|
14
16
|
type: 'subMenu',
|
|
15
17
|
subMenu: [
|
|
16
18
|
{
|
|
17
|
-
label
|
|
19
|
+
// the cap shows in the label rather than arriving as an
|
|
20
|
+
// error after the click, since the click is what would
|
|
21
|
+
// freeze the tab
|
|
22
|
+
label: tooManyRows
|
|
23
|
+
? `Calculate neighbor joining tree (over ${maxNeighborJoiningRows} rows, use FastTree)`
|
|
24
|
+
: 'Calculate neighbor joining tree (BLOSUM62)',
|
|
25
|
+
disabled: tooManyRows,
|
|
18
26
|
onClick: () => {
|
|
19
27
|
try {
|
|
20
28
|
model.calculateNeighborJoiningTreeFromMSA();
|