react-msaview 8.4.1 → 9.1.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 +19 -10
- package/bundle/index.js +74 -74
- package/bundle/index.js.map +4 -4
- package/dist/colorSchemes.js +1 -3
- package/dist/colorSchemes.js.map +1 -1
- package/dist/columnCounts.d.ts +0 -1
- package/dist/columnCounts.js +1 -1
- package/dist/columnCounts.js.map +1 -1
- package/dist/components/Loading.js +5 -5
- package/dist/components/Loading.js.map +1 -1
- package/dist/components/MSAView.js +2 -2
- package/dist/components/MSAView.js.map +1 -1
- package/dist/components/MSAViewer.d.ts +1892 -7
- package/dist/components/MSAViewer.js +144 -202
- package/dist/components/MSAViewer.js.map +1 -1
- package/dist/components/ResizeHandles.js +4 -3
- package/dist/components/ResizeHandles.js.map +1 -1
- package/dist/components/Track.js +3 -2
- package/dist/components/Track.js.map +1 -1
- package/dist/components/controls.d.ts +11 -0
- package/dist/components/controls.js +48 -0
- package/dist/components/controls.js.map +1 -0
- package/dist/components/dialogs/AnnotationFileDialog.js +5 -16
- package/dist/components/dialogs/AnnotationFileDialog.js.map +1 -1
- package/dist/components/dialogs/ExportSVGDialog.js +5 -7
- package/dist/components/dialogs/ExportSVGDialog.js.map +1 -1
- package/dist/components/dialogs/HelpDialog.d.ts +6 -0
- package/dist/components/dialogs/HelpDialog.js +30 -0
- package/dist/components/dialogs/HelpDialog.js.map +1 -0
- package/dist/components/header/FileMenu.js +33 -7
- package/dist/components/header/FileMenu.js.map +1 -1
- package/dist/components/header/Header.js +4 -6
- package/dist/components/header/Header.js.map +1 -1
- package/dist/components/header/TreeSettingsMenu.d.ts +1 -1
- package/dist/components/header/TreeSettingsMenu.js +1 -32
- package/dist/components/header/TreeSettingsMenu.js.map +1 -1
- package/dist/components/header/ZoomControls.js +28 -44
- package/dist/components/header/ZoomControls.js.map +1 -1
- package/dist/components/header/settingsMenuItems.d.ts +1 -0
- package/dist/components/header/settingsMenuItems.js +48 -1
- package/dist/components/header/settingsMenuItems.js.map +1 -1
- package/dist/components/import/data/seq2.d.ts +0 -1
- package/dist/components/import/data/seq2.js +0 -17
- package/dist/components/import/data/seq2.js.map +1 -1
- package/dist/components/msa/MSACanvas.js +2 -1
- package/dist/components/msa/MSACanvas.js.map +1 -1
- package/dist/components/msa/MSACanvasBlock.js +2 -5
- package/dist/components/msa/MSACanvasBlock.js.map +1 -1
- package/dist/components/msa/drawFeatureSpans.d.ts +50 -11
- package/dist/components/msa/drawFeatureSpans.js +99 -56
- package/dist/components/msa/drawFeatureSpans.js.map +1 -1
- package/dist/components/msa/msaRaster.d.ts +14 -1
- package/dist/components/msa/msaRaster.js +19 -9
- package/dist/components/msa/msaRaster.js.map +1 -1
- package/dist/components/msa/renderBoxFeatureCanvasBlock.d.ts +9 -0
- package/dist/components/msa/renderBoxFeatureCanvasBlock.js +19 -8
- package/dist/components/msa/renderBoxFeatureCanvasBlock.js.map +1 -1
- package/dist/components/msa/renderHighlights.d.ts +2 -2
- package/dist/components/msa/renderHighlights.js +2 -3
- package/dist/components/msa/renderHighlights.js.map +1 -1
- package/dist/components/msa/renderMSAMouseover.js +2 -1
- package/dist/components/msa/renderMSAMouseover.js.map +1 -1
- package/dist/components/renderCtx.d.ts +1 -1
- package/dist/components/rowpanels/renderFeaturePanel.d.ts +5 -1
- package/dist/components/rowpanels/renderFeaturePanel.js +12 -5
- package/dist/components/rowpanels/renderFeaturePanel.js.map +1 -1
- package/dist/components/tracks/drawTracks.d.ts +1 -53
- package/dist/components/tracks/drawTracks.js +5 -5
- package/dist/components/tracks/drawTracks.js.map +1 -1
- package/dist/components/tree/CladeLabels.d.ts +1 -1
- package/dist/components/tree/CladeLabels.js +22 -34
- package/dist/components/tree/CladeLabels.js.map +1 -1
- package/dist/components/tree/TreeCanvas.js +4 -4
- package/dist/components/tree/TreeCanvas.js.map +1 -1
- package/dist/components/tree/TreeCanvasBlock.js +4 -4
- package/dist/components/tree/TreeCanvasBlock.js.map +1 -1
- package/dist/components/tree/TreeOverview.js +10 -5
- package/dist/components/tree/TreeOverview.js.map +1 -1
- package/dist/components/tree/TreePanel.js +6 -2
- package/dist/components/tree/TreePanel.js.map +1 -1
- package/dist/components/tree/TreeRuler.js +2 -2
- package/dist/components/tree/TreeRuler.js.map +1 -1
- package/dist/components/tree/cladeBrackets.d.ts +22 -17
- package/dist/components/tree/cladeBrackets.js +40 -9
- package/dist/components/tree/cladeBrackets.js.map +1 -1
- package/dist/components/tree/clickMap.d.ts +2 -0
- package/dist/components/tree/clickMap.js.map +1 -1
- package/dist/components/tree/ellipsize.d.ts +8 -0
- package/dist/components/tree/ellipsize.js +20 -0
- package/dist/components/tree/ellipsize.js.map +1 -0
- package/dist/components/tree/renderTreeCanvas.js +30 -32
- package/dist/components/tree/renderTreeCanvas.js.map +1 -1
- package/dist/components/tree/renderTreeMouseover.js +1 -1
- package/dist/components/tree/renderTreeMouseover.js.map +1 -1
- package/dist/components/tree/renderTreeOverview.js +4 -11
- package/dist/components/tree/renderTreeOverview.js.map +1 -1
- package/dist/constants.d.ts +6 -3
- package/dist/constants.js +16 -6
- package/dist/constants.js.map +1 -1
- package/dist/element.js +3 -6
- package/dist/element.js.map +1 -1
- package/dist/exportLayout.d.ts +39 -0
- package/dist/exportLayout.js +78 -0
- package/dist/exportLayout.js.map +1 -0
- package/dist/headlessRenderEnv.d.ts +12 -39
- package/dist/headlessRenderEnv.js +18 -12
- package/dist/headlessRenderEnv.js.map +1 -1
- package/dist/hierarchy.d.ts +5 -8
- package/dist/hierarchy.js +5 -79
- package/dist/hierarchy.js.map +1 -1
- package/dist/index.d.ts +3 -1
- package/dist/index.js +4 -1
- package/dist/index.js.map +1 -1
- package/dist/measureTextCanvas.d.ts +7 -0
- package/dist/measureTextCanvas.js +10 -8
- package/dist/measureTextCanvas.js.map +1 -1
- package/dist/model/treeModel.d.ts +14 -25
- package/dist/model/treeModel.js +16 -30
- package/dist/model/treeModel.js.map +1 -1
- package/dist/model.d.ts +108 -79
- package/dist/model.js +258 -209
- package/dist/model.js.map +1 -1
- package/dist/renderToSvg.d.ts +2 -7
- package/dist/renderToSvg.js +49 -135
- package/dist/renderToSvg.js.map +1 -1
- package/dist/svgTestUtil.d.ts +48 -48
- package/dist/tipLabels.d.ts +8 -0
- package/dist/tipLabels.js +46 -0
- package/dist/tipLabels.js.map +1 -0
- package/dist/types.d.ts +0 -1
- package/dist/version.d.ts +1 -1
- package/dist/version.js +1 -1
- package/dist/viewerSnapshot.d.ts +169 -0
- package/dist/viewerSnapshot.js +100 -0
- package/dist/viewerSnapshot.js.map +1 -0
- package/package.json +3 -3
- package/src/colorSchemes.ts +1 -4
- package/src/columnCounts.ts +1 -1
- package/src/components/Loading.tsx +19 -12
- package/src/components/MSAView.tsx +2 -2
- package/src/components/MSAViewer.tsx +276 -256
- package/src/components/ResizeHandles.tsx +10 -3
- package/src/components/Track.tsx +3 -2
- package/src/components/controls.ts +61 -0
- package/src/components/dialogs/AnnotationFileDialog.tsx +5 -21
- package/src/components/dialogs/ExportSVGDialog.tsx +8 -19
- package/src/components/dialogs/HelpDialog.tsx +79 -0
- package/src/components/header/FileMenu.tsx +33 -7
- package/src/components/header/Header.tsx +4 -6
- package/src/components/header/TreeSettingsMenu.tsx +2 -32
- package/src/components/header/ZoomControls.tsx +30 -66
- package/src/components/header/settingsMenuItems.ts +67 -0
- package/src/components/import/data/seq2.ts +0 -18
- package/src/components/msa/MSACanvas.tsx +2 -1
- package/src/components/msa/MSACanvasBlock.tsx +2 -6
- package/src/components/msa/drawFeatureSpans.ts +160 -79
- package/src/components/msa/msaRaster.ts +27 -9
- package/src/components/msa/renderBoxFeatureCanvasBlock.ts +39 -24
- package/src/components/msa/renderHighlights.ts +2 -3
- package/src/components/msa/renderMSAMouseover.ts +5 -1
- package/src/components/renderCtx.ts +0 -1
- package/src/components/rowpanels/renderFeaturePanel.ts +26 -7
- package/src/components/tracks/drawTracks.ts +5 -5
- package/src/components/tree/CladeLabels.tsx +30 -54
- package/src/components/tree/TreeCanvas.tsx +10 -4
- package/src/components/tree/TreeCanvasBlock.tsx +4 -4
- package/src/components/tree/TreeOverview.tsx +10 -5
- package/src/components/tree/TreePanel.tsx +8 -2
- package/src/components/tree/TreeRuler.tsx +7 -3
- package/src/components/tree/cladeBrackets.ts +59 -19
- package/src/components/tree/clickMap.ts +2 -0
- package/src/components/tree/ellipsize.ts +24 -0
- package/src/components/tree/renderTreeCanvas.ts +37 -36
- package/src/components/tree/renderTreeMouseover.ts +1 -1
- package/src/components/tree/renderTreeOverview.ts +7 -14
- package/src/constants.ts +17 -6
- package/src/element.ts +3 -7
- package/src/exportLayout.ts +134 -0
- package/src/headlessRenderEnv.ts +24 -11
- package/src/hierarchy.ts +5 -88
- package/src/index.ts +5 -5
- package/src/measureTextCanvas.ts +10 -8
- package/src/model/treeModel.ts +17 -34
- package/src/model.ts +296 -243
- package/src/renderToSvg.tsx +72 -209
- package/src/tipLabels.ts +51 -0
- package/src/types.ts +0 -1
- package/src/version.ts +1 -1
- package/src/viewerSnapshot.ts +147 -0
- package/dist/components/header/ZoomMenu.d.ts +0 -6
- package/dist/components/header/ZoomMenu.js +0 -37
- package/dist/components/header/ZoomMenu.js.map +0 -1
- package/src/components/header/ZoomMenu.tsx +0 -48
|
@@ -2,6 +2,7 @@ import React, { useState } from 'react';
|
|
|
2
2
|
import { Dialog, ErrorMessage } from '@jbrowse/core/ui';
|
|
3
3
|
import { Alert, Button, CircularProgress, DialogActions, DialogContent, FormControl, FormControlLabel, FormLabel, Radio, RadioGroup, Typography, useTheme, } from '@mui/material';
|
|
4
4
|
import { observer } from 'mobx-react';
|
|
5
|
+
import { exportPageSize, getLayout } from '../../exportLayout.js';
|
|
5
6
|
import Checkbox2 from '../Checkbox2.js';
|
|
6
7
|
// Run after the browser has painted. A requestAnimationFrame callback still
|
|
7
8
|
// runs *before* the frame it was queued for, so one alone hands the main thread
|
|
@@ -19,12 +20,9 @@ const ExportSVGDialog = observer(function ({ model, onClose, }) {
|
|
|
19
20
|
const [error, setError] = useState();
|
|
20
21
|
const [exporting, setExporting] = useState(false);
|
|
21
22
|
const theme = useTheme();
|
|
22
|
-
const {
|
|
23
|
+
const { turnedOnTracks, numColumns, leaves, showMsaLetters } = model;
|
|
23
24
|
const hasTracks = turnedOnTracks.length > 0;
|
|
24
|
-
const
|
|
25
|
-
const entireHeight = totalHeight +
|
|
26
|
-
(includeTracks ? totalTrackAreaHeight : 0) +
|
|
27
|
-
treeOverviewHeight;
|
|
25
|
+
const entire = exportPageSize(model, getLayout(model, { theme, exportType: 'entire', includeTracks }));
|
|
28
26
|
// the background is one raster image whatever its size, so what the figure
|
|
29
27
|
// actually costs is its residue letters: each is an svg element of its own.
|
|
30
28
|
// Past roughly this many the export runs to tens of seconds and can exhaust
|
|
@@ -56,9 +54,9 @@ const ExportSVGDialog = observer(function ({ model, onClose, }) {
|
|
|
56
54
|
React.createElement(FormControlLabel, { value: "viewport", control: React.createElement(Radio, null), label: "Current viewport only" })))),
|
|
57
55
|
isLargeExport ? (React.createElement(Alert, { severity: "warning", style: { marginTop: 8 } },
|
|
58
56
|
"The entire MSA is ",
|
|
59
|
-
Math.round(
|
|
57
|
+
Math.round(entire.width),
|
|
60
58
|
"x",
|
|
61
|
-
Math.round(
|
|
59
|
+
Math.round(entire.height),
|
|
62
60
|
" pixels and draws",
|
|
63
61
|
' ',
|
|
64
62
|
Math.round(glyphs / 1000),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExportSVGDialog.js","sourceRoot":"","sources":["../../../src/components/dialogs/ExportSVGDialog.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEvC,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;AACvD,OAAO,EACL,KAAK,EACL,MAAM,EACN,gBAAgB,EAChB,aAAa,EACb,aAAa,EACb,WAAW,EACX,gBAAgB,EAChB,SAAS,EACT,KAAK,EACL,UAAU,EACV,UAAU,EACV,QAAQ,GACT,MAAM,eAAe,CAAA;AACtB,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAErC,OAAO,SAAS,MAAM,iBAAkB,CAAA;AAIxC,4EAA4E;AAC5E,gFAAgF;AAChF,+EAA+E;AAC/E,gBAAgB;AAChB,SAAS,UAAU,CAAC,EAAc;IAChC,qBAAqB,CAAC,GAAG,EAAE;QACzB,qBAAqB,CAAC,EAAE,CAAC,CAAA;IAC3B,CAAC,CAAC,CAAA;AACJ,CAAC;AAED,MAAM,eAAe,GAAG,QAAQ,CAAC,UAAU,EACzC,KAAK,EACL,OAAO,GAIR;IACC,MAAM,CAAC,cAAc,EAAE,iBAAiB,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAA;IAC1D,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAA;IACxD,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,QAAQ,CAC1C,UAAU,CACX,CAAA;IACD,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,EAAW,CAAA;IAC7C,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAA;IACjD,MAAM,KAAK,GAAG,QAAQ,EAAE,CAAA;IACxB,MAAM,
|
|
1
|
+
{"version":3,"file":"ExportSVGDialog.js","sourceRoot":"","sources":["../../../src/components/dialogs/ExportSVGDialog.tsx"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
import React, { lazy } from 'react';
|
|
2
|
+
import { Dialog } from '@jbrowse/core/ui';
|
|
3
|
+
import { Button, DialogActions, DialogContent, Table, TableBody, TableCell, TableRow, Typography, } from '@mui/material';
|
|
4
|
+
import { version } from '../../version.js';
|
|
5
|
+
import { keyboardControls, mouseControls } from '../controls.js';
|
|
6
|
+
const AboutDialog = lazy(() => import('./AboutDialog.js'));
|
|
7
|
+
function ControlTable({ title, rows }) {
|
|
8
|
+
return (React.createElement(React.Fragment, null,
|
|
9
|
+
React.createElement(Typography, { variant: "subtitle2", sx: { mt: 1 } }, title),
|
|
10
|
+
React.createElement(Table, { size: "small", "aria-label": title },
|
|
11
|
+
React.createElement(TableBody, null, rows.map(({ label, action }) => (React.createElement(TableRow, { key: label },
|
|
12
|
+
React.createElement(TableCell, { sx: { whiteSpace: 'nowrap', fontWeight: 500 } }, label),
|
|
13
|
+
React.createElement(TableCell, null, action))))))));
|
|
14
|
+
}
|
|
15
|
+
export default function HelpDialog({ model, onClose, }) {
|
|
16
|
+
return (React.createElement(Dialog, { open: true, title: "Mouse & keyboard", onClose: onClose },
|
|
17
|
+
React.createElement(DialogContent, null,
|
|
18
|
+
React.createElement(ControlTable, { title: "Mouse", rows: mouseControls }),
|
|
19
|
+
React.createElement(ControlTable, { title: "Keyboard (click the alignment first)", rows: keyboardControls })),
|
|
20
|
+
React.createElement(DialogActions, null,
|
|
21
|
+
React.createElement(Typography, { variant: "caption", sx: { mr: 'auto', pl: 1 } },
|
|
22
|
+
"MSAView ",
|
|
23
|
+
version),
|
|
24
|
+
React.createElement(Button, { onClick: () => {
|
|
25
|
+
model.queueDialog(done => [AboutDialog, { onClose: done }]);
|
|
26
|
+
onClose();
|
|
27
|
+
} }, "About & credits"),
|
|
28
|
+
React.createElement(Button, { variant: "contained", onClick: onClose }, "Close"))));
|
|
29
|
+
}
|
|
30
|
+
//# sourceMappingURL=HelpDialog.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"HelpDialog.js","sourceRoot":"","sources":["../../../src/components/dialogs/HelpDialog.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,IAAI,EAAE,MAAM,OAAO,CAAA;AAEnC,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AACzC,OAAO,EACL,MAAM,EACN,aAAa,EACb,aAAa,EACb,KAAK,EACL,SAAS,EACT,SAAS,EACT,QAAQ,EACR,UAAU,GACX,MAAM,eAAe,CAAA;AAEtB,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAA;AAC1C,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AAKhE,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,kBAAmB,CAAC,CAAC,CAAA;AAE3D,SAAS,YAAY,CAAC,EAAE,KAAK,EAAE,IAAI,EAAsC;IACvE,OAAO,CACL;QACE,oBAAC,UAAU,IAAC,OAAO,EAAC,WAAW,EAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,IAC1C,KAAK,CACK;QACb,oBAAC,KAAK,IAAC,IAAI,EAAC,OAAO,gBAAa,KAAK;YACnC,oBAAC,SAAS,QACP,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAC/B,oBAAC,QAAQ,IAAC,GAAG,EAAE,KAAK;gBAClB,oBAAC,SAAS,IAAC,EAAE,EAAE,EAAE,UAAU,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,EAAE,IACrD,KAAK,CACI;gBACZ,oBAAC,SAAS,QAAE,MAAM,CAAa,CACtB,CACZ,CAAC,CACQ,CACN,CACP,CACJ,CAAA;AACH,CAAC;AAED,MAAM,CAAC,OAAO,UAAU,UAAU,CAAC,EACjC,KAAK,EACL,OAAO,GAIR;IACC,OAAO,CACL,oBAAC,MAAM,IAAC,IAAI,QAAC,KAAK,EAAC,kBAAkB,EAAC,OAAO,EAAE,OAAO;QACpD,oBAAC,aAAa;YACZ,oBAAC,YAAY,IAAC,KAAK,EAAC,OAAO,EAAC,IAAI,EAAE,aAAa,GAAI;YACnD,oBAAC,YAAY,IACX,KAAK,EAAC,sCAAsC,EAC5C,IAAI,EAAE,gBAAgB,GACtB,CACY;QAChB,oBAAC,aAAa;YACZ,oBAAC,UAAU,IAAC,OAAO,EAAC,SAAS,EAAC,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,EAAE;;gBAC5C,OAAO,CACL;YACb,oBAAC,MAAM,IACL,OAAO,EAAE,GAAG,EAAE;oBACZ,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,WAAW,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;oBAC3D,OAAO,EAAE,CAAA;gBACX,CAAC,sBAGM;YACT,oBAAC,MAAM,IAAC,OAAO,EAAC,WAAW,EAAC,OAAO,EAAE,OAAO,YAEnC,CACK,CACT,CACV,CAAA;AACH,CAAC"}
|
|
@@ -6,18 +6,43 @@ import FolderOpen from '@mui/icons-material/FolderOpen';
|
|
|
6
6
|
import Menu from '@mui/icons-material/Menu';
|
|
7
7
|
import PhotoCamera from '@mui/icons-material/PhotoCamera';
|
|
8
8
|
import { observer } from 'mobx-react';
|
|
9
|
+
import { maxNeighborJoiningRows } from '../../constants.js';
|
|
9
10
|
import { getAnnotationsMenu } from './getAnnotationsMenu.js';
|
|
10
11
|
const MetadataDialog = lazy(() => import('../dialogs/MetadataDialog.js'));
|
|
11
12
|
const ExportSVGDialog = lazy(() => import('../dialogs/ExportSVGDialog.js'));
|
|
13
|
+
function neighborJoiningItem(model) {
|
|
14
|
+
const rows = model.rowMap.size;
|
|
15
|
+
const tooManyRows = rows > maxNeighborJoiningRows;
|
|
16
|
+
return {
|
|
17
|
+
label: tooManyRows
|
|
18
|
+
? `Calculate neighbor joining tree (over ${maxNeighborJoiningRows} rows, use FastTree)`
|
|
19
|
+
: 'Calculate neighbor joining tree (BLOSUM62)',
|
|
20
|
+
icon: AccountTree,
|
|
21
|
+
disabled: tooManyRows || rows < 2,
|
|
22
|
+
onClick: () => {
|
|
23
|
+
try {
|
|
24
|
+
model.calculateNeighborJoiningTreeFromMSA();
|
|
25
|
+
}
|
|
26
|
+
catch (e) {
|
|
27
|
+
console.error('Failed to calculate NJ tree:', e);
|
|
28
|
+
model.addWarning(e instanceof Error ? e.message : String(e));
|
|
29
|
+
}
|
|
30
|
+
},
|
|
31
|
+
};
|
|
32
|
+
}
|
|
12
33
|
const FileMenu = observer(({ model }) => {
|
|
13
34
|
return (React.createElement(CascadingMenuButton, { "data-testid": "file_menu", tooltip: "File", menuItems: [
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
35
|
+
...(model.importForm
|
|
36
|
+
? [
|
|
37
|
+
{
|
|
38
|
+
label: 'Return to import form',
|
|
39
|
+
icon: FolderOpen,
|
|
40
|
+
onClick: () => {
|
|
41
|
+
model.reset();
|
|
42
|
+
},
|
|
43
|
+
},
|
|
44
|
+
]
|
|
45
|
+
: []),
|
|
21
46
|
{
|
|
22
47
|
label: 'Metadata',
|
|
23
48
|
icon: Assignment,
|
|
@@ -38,6 +63,7 @@ const FileMenu = observer(({ model }) => {
|
|
|
38
63
|
model,
|
|
39
64
|
}),
|
|
40
65
|
},
|
|
66
|
+
neighborJoiningItem(model),
|
|
41
67
|
{
|
|
42
68
|
label: 'Export tree (Newick)',
|
|
43
69
|
icon: AccountTree,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FileMenu.js","sourceRoot":"","sources":["../../../src/components/header/FileMenu.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,IAAI,EAAE,MAAM,OAAO,CAAA;AAEnC,OAAO,mBAAmB,MAAM,sCAAsC,CAAA;AACtE,OAAO,WAAW,MAAM,iCAAiC,CAAA;AACzD,OAAO,UAAU,MAAM,gCAAgC,CAAA;AACvD,OAAO,UAAU,MAAM,gCAAgC,CAAA;AACvD,OAAO,IAAI,MAAM,0BAA0B,CAAA;AAC3C,OAAO,WAAW,MAAM,iCAAiC,CAAA;AACzD,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAErC,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAI5D,MAAM,cAAc,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,8BAA+B,CAAC,CAAC,CAAA;AAC1E,MAAM,eAAe,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,+BAAgC,CAAC,CAAC,CAAA;AAE5E,MAAM,QAAQ,GAAG,QAAQ,CAAC,CAAC,EAAE,KAAK,EAA2B,EAAE,EAAE;IAC/D,OAAO,CACL,oBAAC,mBAAmB,mBACN,WAAW,EACvB,OAAO,EAAC,MAAM,EACd,SAAS,EAAE;YACT;
|
|
1
|
+
{"version":3,"file":"FileMenu.js","sourceRoot":"","sources":["../../../src/components/header/FileMenu.tsx"],"names":[],"mappings":"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"}
|
|
@@ -16,8 +16,7 @@ import SelectionMenu from './SelectionMenu.js';
|
|
|
16
16
|
import TreeSettingsMenu from './TreeSettingsMenu.js';
|
|
17
17
|
import UnshareableDataWarning from './UnshareableDataWarning.js';
|
|
18
18
|
import ZoomControls from './ZoomControls.js';
|
|
19
|
-
|
|
20
|
-
const AboutDialog = lazy(() => import('../dialogs/AboutDialog.js'));
|
|
19
|
+
const HelpDialog = lazy(() => import('../dialogs/HelpDialog.js'));
|
|
21
20
|
const Header = observer(function ({ model }) {
|
|
22
21
|
const [ref, { height }] = useMeasure();
|
|
23
22
|
useEffect(() => {
|
|
@@ -32,7 +31,6 @@ const Header = observer(function ({ model }) {
|
|
|
32
31
|
React.createElement(TreeSettingsMenu, { model: model }),
|
|
33
32
|
React.createElement(MSASettingsMenu, { model: model }),
|
|
34
33
|
React.createElement(ZoomControls, { model: model }),
|
|
35
|
-
React.createElement(ZoomMenu, { model: model }),
|
|
36
34
|
React.createElement(GappynessSlider, { model: model }),
|
|
37
35
|
React.createElement(GoToBox, { model: model }),
|
|
38
36
|
React.createElement("div", { style: { paddingLeft: 20, margin: 'auto' } },
|
|
@@ -43,9 +41,9 @@ const Header = observer(function ({ model }) {
|
|
|
43
41
|
React.createElement(LoadWarnings, { model: model }),
|
|
44
42
|
React.createElement(UnshareableDataWarning, { model: model }),
|
|
45
43
|
React.createElement(StatusMessage, { model: model, variant: "header" }),
|
|
46
|
-
React.createElement(Tooltip, { title: "
|
|
47
|
-
React.createElement(IconButton, { "aria-label": "
|
|
48
|
-
model.queueDialog(onClose => [
|
|
44
|
+
React.createElement(Tooltip, { title: "Mouse & keyboard help" },
|
|
45
|
+
React.createElement(IconButton, { "aria-label": "Mouse & keyboard help", onClick: () => {
|
|
46
|
+
model.queueDialog(onClose => [HelpDialog, { model, onClose }]);
|
|
49
47
|
} },
|
|
50
48
|
React.createElement(Help, null)))));
|
|
51
49
|
});
|
|
@@ -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,aAAa,MAAM,qBAAsB,CAAA;AAChD,OAAO,eAAe,MAAM,sBAAuB,CAAA;AACnD,OAAO,QAAQ,MAAM,eAAgB,CAAA;AACrC,OAAO,eAAe,MAAM,sBAAuB,CAAA;AACnD,OAAO,OAAO,MAAM,cAAe,CAAA;AACnC,OAAO,cAAc,MAAM,qBAAsB,CAAA;AACjD,OAAO,YAAY,MAAM,mBAAoB,CAAA;AAC7C,OAAO,eAAe,MAAM,sBAAuB,CAAA;AACnD,OAAO,sBAAsB,MAAM,6BAA8B,CAAA;AACjE,OAAO,aAAa,MAAM,oBAAqB,CAAA;AAC/C,OAAO,gBAAgB,MAAM,uBAAwB,CAAA;AACrD,OAAO,sBAAsB,MAAM,6BAA8B,CAAA;AACjE,OAAO,YAAY,MAAM,mBAAoB,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,aAAa,MAAM,qBAAsB,CAAA;AAChD,OAAO,eAAe,MAAM,sBAAuB,CAAA;AACnD,OAAO,QAAQ,MAAM,eAAgB,CAAA;AACrC,OAAO,eAAe,MAAM,sBAAuB,CAAA;AACnD,OAAO,OAAO,MAAM,cAAe,CAAA;AACnC,OAAO,cAAc,MAAM,qBAAsB,CAAA;AACjD,OAAO,YAAY,MAAM,mBAAoB,CAAA;AAC7C,OAAO,eAAe,MAAM,sBAAuB,CAAA;AACnD,OAAO,sBAAsB,MAAM,6BAA8B,CAAA;AACjE,OAAO,aAAa,MAAM,oBAAqB,CAAA;AAC/C,OAAO,gBAAgB,MAAM,uBAAwB,CAAA;AACrD,OAAO,sBAAsB,MAAM,6BAA8B,CAAA;AACjE,OAAO,YAAY,MAAM,mBAAoB,CAAA;AAI7C,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,0BAA2B,CAAC,CAAC,CAAA;AAElE,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,SAAS,CACP,GAAG,EAAE,CAAC,GAAG,EAAE;QACT,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC,CAAA;IAC1B,CAAC,EACD,CAAC,KAAK,CAAC,CACR,CAAA;IACD,OAAO,CACL,6BAAK,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE;QACzD,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,eAAe,IAAC,KAAK,EAAE,KAAK,GAAI;QACjC,oBAAC,OAAO,IAAC,KAAK,EAAE,KAAK,GAAI;QACzB,6BAAK,KAAK,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE;YAC7C,oBAAC,sBAAsB,IAAC,KAAK,EAAE,KAAK,GAAI,CACpC;QAGN,6BAAK,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE;YACzD,oBAAC,aAAa,IAAC,KAAK,EAAE,KAAK,GAAI;YAC/B,oBAAC,cAAc,IAAC,KAAK,EAAE,KAAK,GAAI,CAC5B;QACN,oBAAC,YAAY,IAAC,KAAK,EAAE,KAAK,GAAI;QAC9B,oBAAC,sBAAsB,IAAC,KAAK,EAAE,KAAK,GAAI;QACxC,oBAAC,aAAa,IAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAC,QAAQ,GAAG;QAChD,oBAAC,OAAO,IAAC,KAAK,EAAC,uBAAuB;YACpC,oBAAC,UAAU,kBACE,uBAAuB,EAClC,OAAO,EAAE,GAAG,EAAE;oBACZ,KAAK,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,UAAU,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC,CAAA;gBAChE,CAAC;gBAED,oBAAC,IAAI,OAAG,CACG,CACL,CACN,CACP,CAAA;AACH,CAAC,CAAC,CAAA;AAEF,eAAe,MAAM,CAAA"}
|
|
@@ -2,40 +2,9 @@ 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';
|
|
6
5
|
import { treeSettingsMenuItems } from './settingsMenuItems.js';
|
|
7
6
|
const TreeSettingsMenu = observer(function ({ model, }) {
|
|
8
|
-
|
|
9
|
-
const tooManyRows = rows.length > maxNeighborJoiningRows;
|
|
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: [
|
|
11
|
-
...treeSettingsMenuItems(model),
|
|
12
|
-
...(rows.length >= 2
|
|
13
|
-
? [
|
|
14
|
-
{
|
|
15
|
-
label: 'Advanced',
|
|
16
|
-
type: 'subMenu',
|
|
17
|
-
subMenu: [
|
|
18
|
-
{
|
|
19
|
-
// the label shows the cap before a click would freeze the tab
|
|
20
|
-
label: tooManyRows
|
|
21
|
-
? `Calculate neighbor joining tree (over ${maxNeighborJoiningRows} rows, use FastTree)`
|
|
22
|
-
: 'Calculate neighbor joining tree (BLOSUM62)',
|
|
23
|
-
disabled: tooManyRows,
|
|
24
|
-
onClick: () => {
|
|
25
|
-
try {
|
|
26
|
-
model.calculateNeighborJoiningTreeFromMSA();
|
|
27
|
-
}
|
|
28
|
-
catch (e) {
|
|
29
|
-
console.error('Failed to calculate NJ tree:', e);
|
|
30
|
-
model.setError(e);
|
|
31
|
-
}
|
|
32
|
-
},
|
|
33
|
-
},
|
|
34
|
-
],
|
|
35
|
-
},
|
|
36
|
-
]
|
|
37
|
-
: []),
|
|
38
|
-
] },
|
|
7
|
+
return model.noTree ? null : (React.createElement(CascadingMenuButton, { "data-testid": "tree_settings_menu", tooltip: "Tree settings", closeAfterItemClick: false, anchorOrigin: { vertical: 'bottom', horizontal: 'left' }, transformOrigin: { vertical: 'top', horizontal: 'left' }, menuItems: treeSettingsMenuItems(model) },
|
|
39
8
|
React.createElement(AccountTree, null)));
|
|
40
9
|
});
|
|
41
10
|
export default TreeSettingsMenu;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TreeSettingsMenu.js","sourceRoot":"","sources":["../../../src/components/header/TreeSettingsMenu.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,mBAAmB,MAAM,sCAAsC,CAAA;AACtE,OAAO,WAAW,MAAM,iCAAiC,CAAA;AACzD,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAErC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"TreeSettingsMenu.js","sourceRoot":"","sources":["../../../src/components/header/TreeSettingsMenu.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,mBAAmB,MAAM,sCAAsC,CAAA;AACtE,OAAO,WAAW,MAAM,iCAAiC,CAAA;AACzD,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAErC,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAA;AAI9D,MAAM,gBAAgB,GAAG,QAAQ,CAAC,UAAU,EAC1C,KAAK,GAGN;IACC,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAC3B,oBAAC,mBAAmB,mBACN,oBAAoB,EAChC,OAAO,EAAC,eAAe,EACvB,mBAAmB,EAAE,KAAK,EAC1B,YAAY,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,EAAE,EACxD,eAAe,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,EACxD,SAAS,EAAE,qBAAqB,CAAC,KAAK,CAAC;QAEvC,oBAAC,WAAW,OAAG,CACK,CACvB,CAAA;AACH,CAAC,CAAC,CAAA;AAEF,eAAe,gBAAgB,CAAA"}
|
|
@@ -1,40 +1,12 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import CascadingMenuButton from '@jbrowse/core/ui/CascadingMenuButton';
|
|
3
|
+
import FitScreen from '@mui/icons-material/FitScreen';
|
|
4
|
+
import RestartAlt from '@mui/icons-material/RestartAlt';
|
|
3
5
|
import ZoomIn from '@mui/icons-material/ZoomIn';
|
|
4
6
|
import ZoomOut from '@mui/icons-material/ZoomOut';
|
|
5
7
|
import { IconButton, Tooltip } from '@mui/material';
|
|
6
8
|
import { observer } from 'mobx-react';
|
|
7
|
-
import { MouseScroll, MouseZoomBoth, MouseZoomHorizontal, MouseZoomVertical, } from './ScrollZoomIcons.js';
|
|
8
|
-
const scrollMode = {
|
|
9
|
-
label: 'Scrolls the alignment',
|
|
10
|
-
Icon: MouseScroll,
|
|
11
|
-
helpText: 'Ctrl+wheel zooms both axes at the cursor.',
|
|
12
|
-
};
|
|
13
|
-
const wheelModes = [
|
|
14
|
-
scrollMode,
|
|
15
|
-
{
|
|
16
|
-
label: 'Zooms both axes',
|
|
17
|
-
axis: 'both',
|
|
18
|
-
Icon: MouseZoomBoth,
|
|
19
|
-
helpText: 'Hold shift to pan while the wheel zooms.',
|
|
20
|
-
},
|
|
21
|
-
{
|
|
22
|
-
label: 'Zooms columns only',
|
|
23
|
-
axis: 'horizontal',
|
|
24
|
-
Icon: MouseZoomHorizontal,
|
|
25
|
-
helpText: 'Holds the row height, so the labels and letters stay at their size while the alignment compresses.',
|
|
26
|
-
},
|
|
27
|
-
{
|
|
28
|
-
label: 'Zooms rows only',
|
|
29
|
-
axis: 'vertical',
|
|
30
|
-
Icon: MouseZoomVertical,
|
|
31
|
-
helpText: 'Holds the column width, so the alignment stays as wide while the rows grow or shrink.',
|
|
32
|
-
},
|
|
33
|
-
];
|
|
34
9
|
const ZoomControls = observer(function ZoomControls({ model, }) {
|
|
35
|
-
const { scrollZoom, scrollZoomAxis } = model;
|
|
36
|
-
const activeAxis = scrollZoom ? scrollZoomAxis : undefined;
|
|
37
|
-
const current = wheelModes.find(m => m.axis === activeAxis) ?? scrollMode;
|
|
38
10
|
return (React.createElement(React.Fragment, null,
|
|
39
11
|
React.createElement(Tooltip, { title: "Zoom in" },
|
|
40
12
|
React.createElement(IconButton, { "aria-label": "Zoom in", onClick: () => {
|
|
@@ -46,23 +18,35 @@ const ZoomControls = observer(function ZoomControls({ model, }) {
|
|
|
46
18
|
model.zoomOut();
|
|
47
19
|
} },
|
|
48
20
|
React.createElement(ZoomOut, null))),
|
|
49
|
-
React.createElement(CascadingMenuButton, { "data-testid": "
|
|
50
|
-
{
|
|
51
|
-
|
|
52
|
-
label,
|
|
53
|
-
icon: Icon,
|
|
54
|
-
helpText,
|
|
55
|
-
type: 'radio',
|
|
56
|
-
checked: current.label === label,
|
|
21
|
+
React.createElement(CascadingMenuButton, { "data-testid": "fit_menu", tooltip: "Fit or reset zoom", menuItems: [
|
|
22
|
+
{
|
|
23
|
+
label: 'Fit to window',
|
|
57
24
|
onClick: () => {
|
|
58
|
-
model.
|
|
59
|
-
if (axis !== undefined) {
|
|
60
|
-
model.setScrollZoomAxis(axis);
|
|
61
|
-
}
|
|
25
|
+
model.fit();
|
|
62
26
|
},
|
|
63
|
-
}
|
|
27
|
+
},
|
|
28
|
+
{
|
|
29
|
+
label: 'Fit horizontally',
|
|
30
|
+
onClick: () => {
|
|
31
|
+
model.fitHorizontally();
|
|
32
|
+
},
|
|
33
|
+
},
|
|
34
|
+
{
|
|
35
|
+
label: 'Fit vertically',
|
|
36
|
+
onClick: () => {
|
|
37
|
+
model.fitVertically();
|
|
38
|
+
},
|
|
39
|
+
},
|
|
40
|
+
{ type: 'divider' },
|
|
41
|
+
{
|
|
42
|
+
label: 'Reset zoom',
|
|
43
|
+
icon: RestartAlt,
|
|
44
|
+
onClick: () => {
|
|
45
|
+
model.resetZoom();
|
|
46
|
+
},
|
|
47
|
+
},
|
|
64
48
|
] },
|
|
65
|
-
React.createElement(
|
|
49
|
+
React.createElement(FitScreen, null))));
|
|
66
50
|
});
|
|
67
51
|
export default ZoomControls;
|
|
68
52
|
//# sourceMappingURL=ZoomControls.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ZoomControls.js","sourceRoot":"","sources":["../../../src/components/header/ZoomControls.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,mBAAmB,MAAM,sCAAsC,CAAA;AACtE,OAAO,
|
|
1
|
+
{"version":3,"file":"ZoomControls.js","sourceRoot":"","sources":["../../../src/components/header/ZoomControls.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,mBAAmB,MAAM,sCAAsC,CAAA;AACtE,OAAO,SAAS,MAAM,+BAA+B,CAAA;AACrD,OAAO,UAAU,MAAM,gCAAgC,CAAA;AACvD,OAAO,MAAM,MAAM,4BAA4B,CAAA;AAC/C,OAAO,OAAO,MAAM,6BAA6B,CAAA;AACjD,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AACnD,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAIrC,MAAM,YAAY,GAAG,QAAQ,CAAC,SAAS,YAAY,CAAC,EAClD,KAAK,GAGN;IACC,OAAO,CACL;QACE,oBAAC,OAAO,IAAC,KAAK,EAAC,SAAS;YACtB,oBAAC,UAAU,kBACE,SAAS,EACpB,OAAO,EAAE,GAAG,EAAE;oBACZ,KAAK,CAAC,MAAM,EAAE,CAAA;gBAChB,CAAC;gBAED,oBAAC,MAAM,OAAG,CACC,CACL;QACV,oBAAC,OAAO,IAAC,KAAK,EAAC,UAAU;YACvB,oBAAC,UAAU,kBACE,UAAU,EACrB,OAAO,EAAE,GAAG,EAAE;oBACZ,KAAK,CAAC,OAAO,EAAE,CAAA;gBACjB,CAAC;gBAED,oBAAC,OAAO,OAAG,CACA,CACL;QACV,oBAAC,mBAAmB,mBACN,UAAU,EACtB,OAAO,EAAC,mBAAmB,EAC3B,SAAS,EAAE;gBACT;oBACE,KAAK,EAAE,eAAe;oBACtB,OAAO,EAAE,GAAG,EAAE;wBACZ,KAAK,CAAC,GAAG,EAAE,CAAA;oBACb,CAAC;iBACF;gBACD;oBACE,KAAK,EAAE,kBAAkB;oBACzB,OAAO,EAAE,GAAG,EAAE;wBACZ,KAAK,CAAC,eAAe,EAAE,CAAA;oBACzB,CAAC;iBACF;gBACD;oBACE,KAAK,EAAE,gBAAgB;oBACvB,OAAO,EAAE,GAAG,EAAE;wBACZ,KAAK,CAAC,aAAa,EAAE,CAAA;oBACvB,CAAC;iBACF;gBACD,EAAE,IAAI,EAAE,SAAS,EAAE;gBACnB;oBACE,KAAK,EAAE,YAAY;oBACnB,IAAI,EAAE,UAAU;oBAChB,OAAO,EAAE,GAAG,EAAE;wBACZ,KAAK,CAAC,SAAS,EAAE,CAAA;oBACnB,CAAC;iBACF;aACF;YAED,oBAAC,SAAS,OAAG,CACO,CACrB,CACJ,CAAA;AACH,CAAC,CAAC,CAAA;AAEF,eAAe,YAAY,CAAA"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { MsaViewModel } from '../../model.ts';
|
|
2
2
|
import type { MenuItem } from '@jbrowse/core/ui/Menu';
|
|
3
|
+
export declare function wheelSubMenu(model: MsaViewModel): MenuItem[];
|
|
3
4
|
export declare function msaSettingsMenuItems(model: MsaViewModel): MenuItem[];
|
|
4
5
|
export declare function treeSettingsMenuItems(model: MsaViewModel): MenuItem[];
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { treeOrders } from '../../constants.js';
|
|
2
|
+
import { MouseScroll, MouseZoomBoth, MouseZoomHorizontal, MouseZoomVertical, } from './ScrollZoomIcons.js';
|
|
2
3
|
function radio(label, checked, onClick) {
|
|
3
4
|
return { label, type: 'radio', checked, onClick };
|
|
4
5
|
}
|
|
@@ -31,6 +32,44 @@ function tracksSubMenu(model) {
|
|
|
31
32
|
model.toggleTrack(id);
|
|
32
33
|
}));
|
|
33
34
|
}
|
|
35
|
+
const wheelModes = [
|
|
36
|
+
{
|
|
37
|
+
label: 'Scrolls the alignment',
|
|
38
|
+
icon: MouseScroll,
|
|
39
|
+
helpText: 'Ctrl+wheel zooms both axes at the cursor.',
|
|
40
|
+
},
|
|
41
|
+
{
|
|
42
|
+
label: 'Zooms both axes',
|
|
43
|
+
axis: 'both',
|
|
44
|
+
icon: MouseZoomBoth,
|
|
45
|
+
helpText: 'Hold shift to pan while the wheel zooms.',
|
|
46
|
+
},
|
|
47
|
+
{
|
|
48
|
+
label: 'Zooms columns only',
|
|
49
|
+
axis: 'horizontal',
|
|
50
|
+
icon: MouseZoomHorizontal,
|
|
51
|
+
helpText: 'Holds the row height, so the labels and letters stay at their size while the alignment compresses.',
|
|
52
|
+
},
|
|
53
|
+
{
|
|
54
|
+
label: 'Zooms rows only',
|
|
55
|
+
axis: 'vertical',
|
|
56
|
+
icon: MouseZoomVertical,
|
|
57
|
+
helpText: 'Holds the column width, so the alignment stays as wide while the rows grow or shrink.',
|
|
58
|
+
},
|
|
59
|
+
];
|
|
60
|
+
export function wheelSubMenu(model) {
|
|
61
|
+
const active = model.scrollZoom ? model.scrollZoomAxis : undefined;
|
|
62
|
+
return wheelModes.map(({ label, axis, icon, helpText }) => ({
|
|
63
|
+
...radio(label, axis === active, () => {
|
|
64
|
+
model.setScrollZoom(axis !== undefined);
|
|
65
|
+
if (axis !== undefined) {
|
|
66
|
+
model.setScrollZoomAxis(axis);
|
|
67
|
+
}
|
|
68
|
+
}),
|
|
69
|
+
icon,
|
|
70
|
+
helpText,
|
|
71
|
+
}));
|
|
72
|
+
}
|
|
34
73
|
export function msaSettingsMenuItems(model) {
|
|
35
74
|
const { drawMsaLetters, hideGaps, bgColor, showColumnStats } = model;
|
|
36
75
|
return [
|
|
@@ -39,6 +78,11 @@ export function msaSettingsMenuItems(model) {
|
|
|
39
78
|
type: 'subMenu',
|
|
40
79
|
subMenu: tracksSubMenu(model),
|
|
41
80
|
},
|
|
81
|
+
{
|
|
82
|
+
label: 'Mouse wheel',
|
|
83
|
+
type: 'subMenu',
|
|
84
|
+
subMenu: wheelSubMenu(model),
|
|
85
|
+
},
|
|
42
86
|
{ type: 'divider' },
|
|
43
87
|
toggle('Show track values on hover', showColumnStats, arg => {
|
|
44
88
|
model.setShowColumnStats(arg);
|
|
@@ -56,7 +100,7 @@ export function msaSettingsMenuItems(model) {
|
|
|
56
100
|
];
|
|
57
101
|
}
|
|
58
102
|
export function treeSettingsMenuItems(model) {
|
|
59
|
-
const { drawTree, showBranchLen, labelsAlignRight, drawNodeBubbles, drawNodeLabels, drawLabels, showTreeOverview, treeOrder, treeRoot, rotated, } = model;
|
|
103
|
+
const { drawTree, showBranchLen, labelsAlignRight, drawNodeBubbles, drawNodeLabels, drawLabels, treeAreaWidth, showTreeOverview, treeOrder, treeRoot, rotated, } = model;
|
|
60
104
|
return [
|
|
61
105
|
{
|
|
62
106
|
label: 'Order',
|
|
@@ -119,6 +163,9 @@ export function treeSettingsMenuItems(model) {
|
|
|
119
163
|
toggle('Draw labels', drawLabels, arg => {
|
|
120
164
|
model.setDrawLabels(arg);
|
|
121
165
|
}),
|
|
166
|
+
toggle('Fit tree area to labels and tree', treeAreaWidth === undefined, arg => {
|
|
167
|
+
model.setTreeAreaWidth(arg ? undefined : model.effectiveTreeAreaWidth);
|
|
168
|
+
}),
|
|
122
169
|
];
|
|
123
170
|
}
|
|
124
171
|
//# sourceMappingURL=settingsMenuItems.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settingsMenuItems.js","sourceRoot":"","sources":["../../../src/components/header/settingsMenuItems.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;
|
|
1
|
+
{"version":3,"file":"settingsMenuItems.js","sourceRoot":"","sources":["../../../src/components/header/settingsMenuItems.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,2 @@
|
|
|
1
1
|
export declare const smallMSA = "CLUSTAL O(1.2.3) multiple sequence alignment\nUniProt/Swiss-Prot|P26898|IL2RA_SHEEP MEPSLLMWRFFVFIVVPGCVTEACHDDPPSLRNA----------MFKVLRYE----VGTM\nUniProt/Swiss-Prot|P01590|IL2RA_MOUSE MEPRLLMLGFLSLTIVPSCRAELCLYDPPEVPNA----------TFKALSYK----NGTI\nUniProt/Swiss-Prot|P41690|IL2RA_FELCA MEPSLLLWGILTFVVVHGHVTELCDENPPDIQHA----------TFKALTYK----TGTM\nUniProt/Swiss-Prot|P01589|IL2RA_HUMAN MDSYLLMWGLLTFIMVPGCQAELCDDDPPEIPHA----------TFKAMAYK----EGTM\nUniProt/Swiss-Prot|Q5MNY4|IL2RA_MACMU MDPYLLMWGLLTFITVPGCQAELCDDDPPKITHA----------TFKAVAYK----EGTM\nUniProt/Swiss-Prot|Q95118|IL2RG_BOVIN -----------------------------------LLMWGLLT-----------------\nUniProt/Swiss-Prot|P40321|IL2RG_CANFA MLKPPLPLRSLLFLQLSLLGVGLNSTVPMPNGNEDIT------PDFFLTATPSETLSVSS\nUniProt/Swiss-Prot|P26896|IL2RB_RAT MATVDLSWRLPLYILLLLLATT--------------------------------WVSAAV\nUniProt/Swiss-Prot|Q8BZM1|GLMN_MOUSE PLPLRSLLFLQLPLLGVGLNP------------------PLPLRSLLFLQLPLLGVGLNP\nUniProt/Swiss-Prot|P36835|IL2_CAPHI -----------LLGVGLNPKFLTP------------------------------------\nUniProt/Swiss-Prot|Q7JFM4|IL2_AOTVO MLKPPLPLRSLLFLQLPLLGVGLNPKFLTPSGNEDIGGKPGTGGDFFLTSTPAGTLDVST\nUniProt/Swiss-Prot|Q29416|IL2_CANFA --------------LFLQLSLLG-------------------------------------\n";
|
|
2
|
-
export declare const smallMSAOnly = "CLUSTAL O(1.2.4) multiple sequence alignment\n\n\nsp|P69905|HBA_HUMAN MVLSPADKTNVKAAWGKVGAHAGEYGAEALERMFLSFPTTKTYFPHFDLSHGSAQVKGHG\t60\nsp|P01942|HBA_MOUSE MVLSGEDKSNIKAAWGKIGGHGAEYGAEALERMFASFPTTKTYFPHFDVSHGSAQVKGHG\t60\nsp|P13786|HBAZ_CAPHI MSLTRTERTIILSLWSKISTQADVIGTETLERLFSCYPQAKTYFPHFDLHSGSAQLRAHG\t60\n * *: ::: : : *.*:. :. *:*:***:* .:* :********: ****::.**\n\nsp|P69905|HBA_HUMAN KKVADALTNAVAHVDDMPNALSALSDLHAHKLRVDPVNFKLLSHCLLVTLAAHLPAEFTP\t120\nsp|P01942|HBA_MOUSE KKVADALASAAGHLDDLPGALSALSDLHAHKLRVDPVNFKLLSHCLLVTLASHHPADFTP\t120\nsp|P13786|HBAZ_CAPHI SKVVAAVGDAVKSIDNVTSALSKLSELHAYVLRVDPVNFKFLSHCLLVTLASHFPADFTA\t120\n .**. *: .*. :*:: .*** **:***: *********:**********:* **:**\n\nsp|P69905|HBA_HUMAN AVHASLDKFLASVSTVLTSKYR\t142\nsp|P01942|HBA_MOUSE AVHASLDKFLASVSTVLTSKYR\t142\nsp|P13786|HBAZ_CAPHI DAHAAWDKFLSIVSGVLTEKYR\t142\n .**: ****: ** ***.***";
|
|
3
2
|
export declare const smallTree = "(((UniProt/Swiss-Prot|P26898|IL2RA_SHEEP:0.24036,(UniProt/Swiss-Prot|P41690|IL2RA_FELCA:0.17737,(UniProt/Swiss-Prot|P01589|IL2RA_HUMAN:0.03906,UniProt/Swiss-Prot|Q5MNY4|IL2RA_MACMU:0.03787):0.13033):0.04964):0.02189,UniProt/Swiss-Prot|P01590|IL2RA_MOUSE:0.23072):0.06814,(((UniProt/Swiss-Prot|Q95118|IL2RG_BOVIN:0.09600,UniProt/Swiss-Prot|P40321|IL2RG_CANFA:0.09845):0.25333,UniProt/Swiss-Prot|Q29416|IL2_CANFA:-0.35055):0.10231,(UniProt/Swiss-Prot|P26896|IL2RB_RAT:0.33631,UniProt/Swiss-Prot|Q7JFM4|IL2_AOTVO:-0.33631):0.10166):0.01607,(UniProt/Swiss-Prot|Q8BZM1|GLMN_MOUSE:0.32378,UniProt/Swiss-Prot|P36835|IL2_CAPHI:-0.32378):0.09999)";
|
|
@@ -12,22 +12,5 @@ UniProt/Swiss-Prot|P36835|IL2_CAPHI -----------LLGVGLNPKFLTP-------------
|
|
|
12
12
|
UniProt/Swiss-Prot|Q7JFM4|IL2_AOTVO MLKPPLPLRSLLFLQLPLLGVGLNPKFLTPSGNEDIGGKPGTGGDFFLTSTPAGTLDVST
|
|
13
13
|
UniProt/Swiss-Prot|Q29416|IL2_CANFA --------------LFLQLSLLG-------------------------------------
|
|
14
14
|
`;
|
|
15
|
-
export const smallMSAOnly = `CLUSTAL O(1.2.4) multiple sequence alignment
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
sp|P69905|HBA_HUMAN MVLSPADKTNVKAAWGKVGAHAGEYGAEALERMFLSFPTTKTYFPHFDLSHGSAQVKGHG 60
|
|
19
|
-
sp|P01942|HBA_MOUSE MVLSGEDKSNIKAAWGKIGGHGAEYGAEALERMFASFPTTKTYFPHFDVSHGSAQVKGHG 60
|
|
20
|
-
sp|P13786|HBAZ_CAPHI MSLTRTERTIILSLWSKISTQADVIGTETLERLFSCYPQAKTYFPHFDLHSGSAQLRAHG 60
|
|
21
|
-
* *: ::: : : *.*:. :. *:*:***:* .:* :********: ****::.**
|
|
22
|
-
|
|
23
|
-
sp|P69905|HBA_HUMAN KKVADALTNAVAHVDDMPNALSALSDLHAHKLRVDPVNFKLLSHCLLVTLAAHLPAEFTP 120
|
|
24
|
-
sp|P01942|HBA_MOUSE KKVADALASAAGHLDDLPGALSALSDLHAHKLRVDPVNFKLLSHCLLVTLASHHPADFTP 120
|
|
25
|
-
sp|P13786|HBAZ_CAPHI SKVVAAVGDAVKSIDNVTSALSKLSELHAYVLRVDPVNFKFLSHCLLVTLASHFPADFTA 120
|
|
26
|
-
.**. *: .*. :*:: .*** **:***: *********:**********:* **:**
|
|
27
|
-
|
|
28
|
-
sp|P69905|HBA_HUMAN AVHASLDKFLASVSTVLTSKYR 142
|
|
29
|
-
sp|P01942|HBA_MOUSE AVHASLDKFLASVSTVLTSKYR 142
|
|
30
|
-
sp|P13786|HBAZ_CAPHI DAHAAWDKFLSIVSGVLTEKYR 142
|
|
31
|
-
.**: ****: ** ***.***`;
|
|
32
15
|
export const smallTree = '(((UniProt/Swiss-Prot|P26898|IL2RA_SHEEP:0.24036,(UniProt/Swiss-Prot|P41690|IL2RA_FELCA:0.17737,(UniProt/Swiss-Prot|P01589|IL2RA_HUMAN:0.03906,UniProt/Swiss-Prot|Q5MNY4|IL2RA_MACMU:0.03787):0.13033):0.04964):0.02189,UniProt/Swiss-Prot|P01590|IL2RA_MOUSE:0.23072):0.06814,(((UniProt/Swiss-Prot|Q95118|IL2RG_BOVIN:0.09600,UniProt/Swiss-Prot|P40321|IL2RG_CANFA:0.09845):0.25333,UniProt/Swiss-Prot|Q29416|IL2_CANFA:-0.35055):0.10231,(UniProt/Swiss-Prot|P26896|IL2RB_RAT:0.33631,UniProt/Swiss-Prot|Q7JFM4|IL2_AOTVO:-0.33631):0.10166):0.01607,(UniProt/Swiss-Prot|Q8BZM1|GLMN_MOUSE:0.32378,UniProt/Swiss-Prot|P36835|IL2_CAPHI:-0.32378):0.09999)';
|
|
33
16
|
//# sourceMappingURL=seq2.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"seq2.js","sourceRoot":"","sources":["../../../../src/components/import/data/seq2.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,QAAQ,GAAG;;;;;;;;;;;;;CAavB,CAAA;AAED,MAAM,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"seq2.js","sourceRoot":"","sources":["../../../../src/components/import/data/seq2.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,QAAQ,GAAG;;;;;;;;;;;;;CAavB,CAAA;AAED,MAAM,CAAC,MAAM,SAAS,GACpB,+nBAA+nB,CAAA"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import React, { useCallback, useRef } from 'react';
|
|
2
2
|
import { observer } from 'mobx-react';
|
|
3
3
|
import { useWheelScroll } from '../../useWheelScroll.js';
|
|
4
|
+
import { alignmentAriaLabel } from '../controls.js';
|
|
4
5
|
import Loading from './Loading.js';
|
|
5
6
|
import MSACanvasBlock from './MSACanvasBlock.js';
|
|
6
7
|
import { onMsaKey } from './msaKeys.js';
|
|
@@ -23,7 +24,7 @@ const MSACanvas = observer(function ({ model }) {
|
|
|
23
24
|
onZoom,
|
|
24
25
|
scrollZoom,
|
|
25
26
|
});
|
|
26
|
-
return (React.createElement("div", { ref: ref, "data-testid": "msa_canvas", tabIndex: 0, "aria-label":
|
|
27
|
+
return (React.createElement("div", { ref: ref, "data-testid": "msa_canvas", tabIndex: 0, "aria-label": alignmentAriaLabel, onKeyDown: event => {
|
|
27
28
|
if (onMsaKey(model, event)) {
|
|
28
29
|
event.preventDefault();
|
|
29
30
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MSACanvas.js","sourceRoot":"","sources":["../../../src/components/msa/MSACanvas.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,OAAO,CAAA;AAElD,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAErC,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAA;AACxD,OAAO,OAAO,MAAM,cAAe,CAAA;AACnC,OAAO,cAAc,MAAM,qBAAsB,CAAA;AACjD,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;AAIvC,MAAM,SAAS,GAAG,QAAQ,CAAC,UAAU,EAAE,KAAK,EAA2B;IACrE,MAAM,EACJ,GAAG,EACH,aAAa,EACb,MAAM,EACN,cAAc,EACd,QAAQ,EACR,UAAU,EACV,OAAO,EACP,OAAO,GACR,GAAG,KAAK,CAAA;IACT,MAAM,GAAG,GAAG,MAAM,CAAiB,IAAI,CAAC,CAAA;IACxC,MAAM,SAAS,GAAG,WAAW,CAC3B,CAAC,CAAS,EAAE,EAAE;QACZ,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;IACpB,CAAC,EACD,CAAC,KAAK,CAAC,CACR,CAAA;IACD,MAAM,SAAS,GAAG,WAAW,CAC3B,CAAC,CAAS,EAAE,EAAE;QACZ,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;IACpB,CAAC,EACD,CAAC,KAAK,CAAC,CACR,CAAA;IACD,MAAM,MAAM,GAAG,WAAW,CACxB,CAAC,WAAmB,EAAE,OAAe,EAAE,OAAe,EAAE,EAAE;QACxD,KAAK,CAAC,SAAS,CAAC,WAAW,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,CAAC,aAAa,CAAC,CAAA;IACrE,CAAC,EACD,CAAC,KAAK,CAAC,CACR,CAAA;IACD,MAAM,EAAE,WAAW,EAAE,SAAS,EAAE,GAAG,cAAc,CAAC;QAChD,GAAG;QACH,SAAS;QACT,SAAS;QACT,MAAM;QACN,UAAU;KACX,CAAC,CAAA;IAEF,OAAO,CACL,6BACE,GAAG,EAAE,GAAG,iBAGI,YAAY,EACxB,QAAQ,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"MSACanvas.js","sourceRoot":"","sources":["../../../src/components/msa/MSACanvas.tsx"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import BaseTooltip from '@jbrowse/core/ui/BaseTooltip';
|
|
|
3
3
|
import { useTheme } from '@mui/material';
|
|
4
4
|
import { observer } from 'mobx-react';
|
|
5
5
|
import { useCanvasAutorun } from '../../useCanvasAutorun.js';
|
|
6
|
-
import { drawMsaRaster,
|
|
6
|
+
import { drawMsaRaster, rasterApplies } from './msaRaster.js';
|
|
7
7
|
import { renderBoxFeatureCanvasBlock } from './renderBoxFeatureCanvasBlock.js';
|
|
8
8
|
import { renderMSABlock } from './renderMSABlock.js';
|
|
9
9
|
import { useMsaBlockMouse } from './useMsaBlockMouse.js';
|
|
@@ -23,10 +23,7 @@ const MSACanvasBlock = observer(function ({ model, offsetX, offsetY, }) {
|
|
|
23
23
|
offsetY,
|
|
24
24
|
model,
|
|
25
25
|
});
|
|
26
|
-
|
|
27
|
-
// domain overlay paints its own boxes instead, and letter-color mode has
|
|
28
|
-
// no background to paint
|
|
29
|
-
const rasterTiles = !model.actuallyShowDomains && model.bgColor && rasterSupported();
|
|
26
|
+
const rasterTiles = rasterApplies(model);
|
|
30
27
|
if (rasterTiles) {
|
|
31
28
|
drawMsaRaster({ ctx, model, theme, offsetX, offsetY });
|
|
32
29
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MSACanvasBlock.js","sourceRoot":"","sources":["../../../src/components/msa/MSACanvasBlock.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,WAAW,MAAM,8BAA8B,CAAA;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AACxC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAErC,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAA;AAC5D,OAAO,EAAE,aAAa,EAAE,
|
|
1
|
+
{"version":3,"file":"MSACanvasBlock.js","sourceRoot":"","sources":["../../../src/components/msa/MSACanvasBlock.tsx"],"names":[],"mappings":"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"}
|