react-msaview 9.1.0 → 9.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bundle/index.js +111 -115
- package/bundle/index.js.map +4 -4
- package/dist/blosum62.d.ts +3 -0
- package/dist/blosum62.js +43 -0
- package/dist/blosum62.js.map +1 -0
- package/dist/colorSchemes.js +1 -0
- package/dist/colorSchemes.js.map +1 -1
- package/dist/components/Loading.d.ts +3 -2
- package/dist/components/Loading.js +2 -2
- package/dist/components/Loading.js.map +1 -1
- package/dist/components/MSAView.d.ts +3 -2
- package/dist/components/MSAView.js +7 -4
- package/dist/components/MSAView.js.map +1 -1
- package/dist/components/MSAViewer.d.ts +64 -12
- package/dist/components/MetadataTable.d.ts +4 -1
- package/dist/components/MetadataTable.js +55 -16
- package/dist/components/MetadataTable.js.map +1 -1
- package/dist/components/Track.js +6 -0
- package/dist/components/Track.js.map +1 -1
- package/dist/components/controls.js +2 -1
- package/dist/components/controls.js.map +1 -1
- package/dist/components/dialogs/AnnotationFileDialog.js +7 -2
- package/dist/components/dialogs/AnnotationFileDialog.js.map +1 -1
- package/dist/components/dialogs/FeatureDialog.js +2 -2
- package/dist/components/dialogs/FeatureDialog.js.map +1 -1
- package/dist/components/{header/MSASettingsMenu.d.ts → dialogs/GapThresholdDialog.d.ts} +3 -2
- package/dist/components/dialogs/GapThresholdDialog.js +15 -0
- package/dist/components/dialogs/GapThresholdDialog.js.map +1 -0
- package/dist/components/{header → dialogs}/GappynessSlider.d.ts +1 -1
- package/dist/components/{header → dialogs}/GappynessSlider.js +3 -10
- package/dist/components/dialogs/GappynessSlider.js.map +1 -0
- package/dist/components/{header → dialogs}/GoToBox.d.ts +4 -2
- package/dist/components/dialogs/GoToBox.js +48 -0
- package/dist/components/dialogs/GoToBox.js.map +1 -0
- package/dist/components/dialogs/GoToDialog.d.ts +6 -0
- package/dist/components/dialogs/GoToDialog.js +10 -0
- package/dist/components/dialogs/GoToDialog.js.map +1 -0
- package/dist/components/dialogs/MetadataDialog.js +11 -3
- package/dist/components/dialogs/MetadataDialog.js.map +1 -1
- package/dist/components/dialogs/goTo.d.ts +5 -0
- package/dist/components/{header → dialogs}/goTo.js +1 -1
- package/dist/components/dialogs/goTo.js.map +1 -0
- package/dist/components/dialogs/metadataLabels.d.ts +4 -0
- package/dist/components/dialogs/metadataLabels.js +52 -0
- package/dist/components/dialogs/metadataLabels.js.map +1 -0
- package/dist/components/dialogs/metadataRecord.d.ts +1 -0
- package/dist/components/dialogs/metadataRecord.js +38 -0
- package/dist/components/dialogs/metadataRecord.js.map +1 -0
- package/dist/components/header/Header.d.ts +6 -2
- package/dist/components/header/Header.js +30 -32
- package/dist/components/header/Header.js.map +1 -1
- package/dist/components/header/{TreeSettingsMenu.d.ts → HiddenColumnsChip.d.ts} +2 -2
- package/dist/components/header/HiddenColumnsChip.js +15 -0
- package/dist/components/header/HiddenColumnsChip.js.map +1 -0
- package/dist/components/header/MenuBar.d.ts +6 -0
- package/dist/components/header/MenuBar.js +33 -0
- package/dist/components/header/MenuBar.js.map +1 -0
- package/dist/components/header/ScrollZoomCheckbox.d.ts +7 -0
- package/dist/components/header/ScrollZoomCheckbox.js +19 -0
- package/dist/components/header/ScrollZoomCheckbox.js.map +1 -0
- package/dist/components/header/ZoomControls.js +10 -30
- package/dist/components/header/ZoomControls.js.map +1 -1
- package/dist/components/header/colorSchemeMenuItems.d.ts +4 -0
- package/dist/components/header/colorSchemeMenuItems.js +106 -0
- package/dist/components/header/colorSchemeMenuItems.js.map +1 -0
- package/dist/components/header/getAnnotationsMenu.d.ts +3 -30
- package/dist/components/header/getAnnotationsMenu.js +48 -54
- package/dist/components/header/getAnnotationsMenu.js.map +1 -1
- package/dist/components/header/menuBarItems.d.ts +11 -0
- package/dist/components/header/menuBarItems.js +277 -0
- package/dist/components/header/menuBarItems.js.map +1 -0
- package/dist/components/import/ImportForm.js +12 -6
- package/dist/components/import/ImportForm.js.map +1 -1
- package/dist/components/minimap/Minimap.js +7 -3
- package/dist/components/minimap/Minimap.js.map +1 -1
- package/dist/components/minimap/MinimapSVG.js +2 -1
- package/dist/components/minimap/MinimapSVG.js.map +1 -1
- package/dist/components/minimap/minimapLayout.d.ts +12 -0
- package/dist/components/minimap/minimapLayout.js +20 -0
- package/dist/components/minimap/minimapLayout.js.map +1 -1
- package/dist/components/msa/MSACanvas.js +26 -9
- package/dist/components/msa/MSACanvas.js.map +1 -1
- package/dist/components/msa/MSACanvasBlock.js +15 -11
- package/dist/components/msa/MSACanvasBlock.js.map +1 -1
- package/dist/components/msa/MSAMouseoverCanvas.js +2 -2
- package/dist/components/msa/MSAMouseoverCanvas.js.map +1 -1
- package/dist/components/msa/WheelZoomHint.d.ts +7 -0
- package/dist/components/msa/WheelZoomHint.js +38 -0
- package/dist/components/msa/WheelZoomHint.js.map +1 -0
- package/dist/components/msa/msaKeys.js +3 -0
- package/dist/components/msa/msaKeys.js.map +1 -1
- package/dist/components/msa/msaRaster.d.ts +4 -5
- package/dist/components/msa/msaRaster.js +5 -5
- package/dist/components/msa/msaRaster.js.map +1 -1
- package/dist/components/msa/renderBoxFeatureCanvasBlock.js +22 -2
- package/dist/components/msa/renderBoxFeatureCanvasBlock.js.map +1 -1
- package/dist/components/msa/renderHighlights.d.ts +0 -3
- package/dist/components/msa/renderHighlights.js +3 -3
- package/dist/components/msa/renderHighlights.js.map +1 -1
- package/dist/components/msa/renderMSABlock.d.ts +6 -1
- package/dist/components/msa/renderMSABlock.js +44 -17
- package/dist/components/msa/renderMSABlock.js.map +1 -1
- package/dist/components/msa/tileColor.js +7 -0
- package/dist/components/msa/tileColor.js.map +1 -1
- package/dist/components/rowpanels/RowPanelBlock.js +2 -2
- package/dist/components/rowpanels/RowPanelBlock.js.map +1 -1
- package/dist/components/settings/MenuItemsForm.d.ts +10 -0
- package/dist/components/settings/MenuItemsForm.js +80 -0
- package/dist/components/settings/MenuItemsForm.js.map +1 -0
- package/dist/components/settings/SettingsPanel.d.ts +12 -0
- package/dist/components/settings/SettingsPanel.js +92 -0
- package/dist/components/settings/SettingsPanel.js.map +1 -0
- package/dist/components/{header/FileMenu.d.ts → settings/TrackList.d.ts} +2 -2
- package/dist/components/settings/TrackList.js +58 -0
- package/dist/components/settings/TrackList.js.map +1 -0
- package/dist/components/tracks/TrackBlocks.js +2 -2
- package/dist/components/tracks/TrackBlocks.js.map +1 -1
- package/dist/components/tracks/TrackTooltipContent.js +2 -1
- package/dist/components/tracks/TrackTooltipContent.js.map +1 -1
- package/dist/components/tracks/drawTracks.js +13 -6
- package/dist/components/tracks/drawTracks.js.map +1 -1
- package/dist/components/tree/TreeCanvasBlock.js +2 -2
- package/dist/components/tree/TreeCanvasBlock.js.map +1 -1
- package/dist/components/tree/TreeMenu.js +4 -6
- package/dist/components/tree/TreeMenu.js.map +1 -1
- package/dist/components/tree/TreeOverview.js +2 -2
- package/dist/components/tree/TreeOverview.js.map +1 -1
- package/dist/constants.d.ts +4 -1
- package/dist/constants.js +7 -1
- package/dist/constants.js.map +1 -1
- package/dist/darkReader.d.ts +7 -0
- package/dist/darkReader.js +42 -0
- package/dist/darkReader.js.map +1 -0
- package/dist/element.js +22 -47
- package/dist/element.js.map +1 -1
- package/dist/featurePanels.d.ts +37 -0
- package/dist/featurePanels.js +187 -0
- package/dist/featurePanels.js.map +1 -0
- package/dist/filehandleLoader.d.ts +41 -0
- package/dist/filehandleLoader.js +99 -0
- package/dist/filehandleLoader.js.map +1 -0
- package/dist/index.d.ts +3 -0
- package/dist/index.js +2 -0
- package/dist/index.js.map +1 -1
- package/dist/model/treeModel.d.ts +9 -0
- package/dist/model/treeModel.js +12 -1
- package/dist/model/treeModel.js.map +1 -1
- package/dist/model.d.ts +148 -32
- package/dist/model.js +291 -569
- package/dist/model.js.map +1 -1
- package/dist/neighborJoining.js +1 -40
- package/dist/neighborJoining.js.map +1 -1
- package/dist/renderToSvg.js +1 -13
- package/dist/renderToSvg.js.map +1 -1
- package/dist/rerootTree.d.ts +1 -0
- package/dist/rerootTree.js +7 -6
- package/dist/rerootTree.js.map +1 -1
- package/dist/schemeResidueColor.d.ts +12 -0
- package/dist/schemeResidueColor.js +33 -0
- package/dist/schemeResidueColor.js.map +1 -0
- package/dist/similarityColors.d.ts +11 -0
- package/dist/similarityColors.js +90 -0
- package/dist/similarityColors.js.map +1 -0
- package/dist/svgTestUtil.d.ts +64 -12
- package/dist/treeDisplay.d.ts +37 -0
- package/dist/treeDisplay.js +209 -0
- package/dist/treeDisplay.js.map +1 -0
- package/dist/types.d.ts +7 -3
- package/dist/useWheelScroll.d.ts +3 -1
- package/dist/useWheelScroll.js +36 -17
- package/dist/useWheelScroll.js.map +1 -1
- package/dist/util.d.ts +2 -0
- package/dist/util.js +2 -0
- package/dist/util.js.map +1 -1
- package/dist/version.d.ts +1 -1
- package/dist/version.js +1 -1
- package/dist/wheelZoom.d.ts +8 -3
- package/dist/wheelZoom.js +44 -32
- package/dist/wheelZoom.js.map +1 -1
- package/dist/zoomSnapshot.d.ts +29 -0
- package/dist/zoomSnapshot.js +47 -0
- package/dist/zoomSnapshot.js.map +1 -0
- package/package.json +11 -11
- package/src/blosum62.ts +45 -0
- package/src/colorSchemes.ts +1 -0
- package/src/components/Loading.tsx +6 -2
- package/src/components/MSAView.tsx +22 -5
- package/src/components/MetadataTable.tsx +83 -26
- package/src/components/Track.tsx +13 -0
- package/src/components/controls.ts +2 -1
- package/src/components/dialogs/AnnotationFileDialog.tsx +12 -1
- package/src/components/dialogs/FeatureDialog.tsx +2 -5
- package/src/components/dialogs/GapThresholdDialog.tsx +36 -0
- package/src/components/{header → dialogs}/GappynessSlider.tsx +3 -10
- package/src/components/{header → dialogs}/GoToBox.tsx +36 -10
- package/src/components/dialogs/GoToDialog.tsx +30 -0
- package/src/components/dialogs/MetadataDialog.tsx +32 -4
- package/src/components/{header → dialogs}/goTo.ts +1 -1
- package/src/components/dialogs/metadataLabels.ts +54 -0
- package/src/components/dialogs/metadataRecord.tsx +61 -0
- package/src/components/header/Header.tsx +75 -42
- package/src/components/header/HiddenColumnsChip.tsx +39 -0
- package/src/components/header/MenuBar.tsx +64 -0
- package/src/components/header/ScrollZoomCheckbox.tsx +46 -0
- package/src/components/header/ZoomControls.tsx +20 -35
- package/src/components/header/colorSchemeMenuItems.ts +121 -0
- package/src/components/header/getAnnotationsMenu.ts +52 -56
- package/src/components/header/menuBarItems.ts +357 -0
- package/src/components/import/ImportForm.tsx +19 -7
- package/src/components/minimap/Minimap.tsx +11 -3
- package/src/components/minimap/MinimapSVG.tsx +17 -1
- package/src/components/minimap/minimapLayout.ts +27 -0
- package/src/components/msa/MSACanvas.tsx +22 -3
- package/src/components/msa/MSACanvasBlock.tsx +18 -11
- package/src/components/msa/MSAMouseoverCanvas.tsx +2 -2
- package/src/components/msa/WheelZoomHint.tsx +56 -0
- package/src/components/msa/msaKeys.ts +3 -0
- package/src/components/msa/msaRaster.ts +6 -8
- package/src/components/msa/renderBoxFeatureCanvasBlock.ts +28 -5
- package/src/components/msa/renderHighlights.ts +3 -3
- package/src/components/msa/renderMSABlock.ts +51 -15
- package/src/components/msa/tileColor.ts +7 -0
- package/src/components/rowpanels/RowPanelBlock.tsx +2 -2
- package/src/components/settings/MenuItemsForm.tsx +225 -0
- package/src/components/settings/SettingsPanel.tsx +156 -0
- package/src/components/settings/TrackList.tsx +124 -0
- package/src/components/tracks/TrackBlocks.tsx +2 -2
- package/src/components/tracks/TrackTooltipContent.tsx +2 -1
- package/src/components/tracks/drawTracks.ts +15 -7
- package/src/components/tree/TreeCanvasBlock.tsx +2 -2
- package/src/components/tree/TreeMenu.tsx +4 -6
- package/src/components/tree/TreeOverview.tsx +2 -2
- package/src/constants.ts +9 -1
- package/src/darkReader.ts +57 -0
- package/src/element.ts +34 -57
- package/src/featurePanels.ts +269 -0
- package/src/filehandleLoader.ts +136 -0
- package/src/index.ts +4 -0
- package/src/model/treeModel.ts +13 -0
- package/src/model.ts +370 -748
- package/src/neighborJoining.ts +1 -42
- package/src/renderToSvg.tsx +1 -13
- package/src/rerootTree.ts +7 -6
- package/src/schemeResidueColor.ts +37 -0
- package/src/similarityColors.ts +112 -0
- package/src/treeDisplay.ts +278 -0
- package/src/types.ts +7 -4
- package/src/useWheelScroll.ts +43 -22
- package/src/util.ts +3 -0
- package/src/version.ts +1 -1
- package/src/wheelZoom.ts +55 -33
- package/src/zoomSnapshot.ts +80 -0
- package/dist/components/header/ColorSchemeMenu.d.ts +0 -12
- package/dist/components/header/ColorSchemeMenu.js +0 -37
- package/dist/components/header/ColorSchemeMenu.js.map +0 -1
- package/dist/components/header/FileMenu.js +0 -92
- package/dist/components/header/FileMenu.js.map +0 -1
- package/dist/components/header/GappynessSlider.js.map +0 -1
- package/dist/components/header/GoToBox.js +0 -31
- package/dist/components/header/GoToBox.js.map +0 -1
- package/dist/components/header/MSASettingsMenu.js +0 -11
- package/dist/components/header/MSASettingsMenu.js.map +0 -1
- package/dist/components/header/ScrollZoomIcons.d.ts +0 -6
- package/dist/components/header/ScrollZoomIcons.js +0 -35
- package/dist/components/header/ScrollZoomIcons.js.map +0 -1
- package/dist/components/header/TreeSettingsMenu.js +0 -11
- package/dist/components/header/TreeSettingsMenu.js.map +0 -1
- package/dist/components/header/goTo.d.ts +0 -20
- package/dist/components/header/goTo.js.map +0 -1
- package/dist/components/header/settingsMenuItems.d.ts +0 -5
- package/dist/components/header/settingsMenuItems.js +0 -171
- package/dist/components/header/settingsMenuItems.js.map +0 -1
- package/src/components/header/ColorSchemeMenu.tsx +0 -56
- package/src/components/header/FileMenu.tsx +0 -107
- package/src/components/header/MSASettingsMenu.tsx +0 -26
- package/src/components/header/ScrollZoomIcons.tsx +0 -52
- package/src/components/header/TreeSettingsMenu.tsx +0 -30
- package/src/components/header/settingsMenuItems.ts +0 -216
|
@@ -0,0 +1,277 @@
|
|
|
1
|
+
import { lazy } from 'react';
|
|
2
|
+
import { maxNeighborJoiningRows, treeOrders } from '../../constants.js';
|
|
3
|
+
import { canGoTo } from '../dialogs/GoToBox.js';
|
|
4
|
+
import { scrollZoomLabel } from './ScrollZoomCheckbox.js';
|
|
5
|
+
import { colorSchemeMenuItems } from './colorSchemeMenuItems.js';
|
|
6
|
+
import { openAnnotationFileItem } from './getAnnotationsMenu.js';
|
|
7
|
+
const AboutDialog = lazy(() => import('../dialogs/AboutDialog.js'));
|
|
8
|
+
const ExportSVGDialog = lazy(() => import('../dialogs/ExportSVGDialog.js'));
|
|
9
|
+
const GapThresholdDialog = lazy(() => import('../dialogs/GapThresholdDialog.js'));
|
|
10
|
+
const GoToDialog = lazy(() => import('../dialogs/GoToDialog.js'));
|
|
11
|
+
const HelpDialog = lazy(() => import('../dialogs/HelpDialog.js'));
|
|
12
|
+
const MetadataDialog = lazy(() => import('../dialogs/MetadataDialog.js'));
|
|
13
|
+
const tutorialsUrl = 'https://gmod.org/JBrowseMSA/tutorials/';
|
|
14
|
+
function radio(label, checked, onClick) {
|
|
15
|
+
return { label, type: 'radio', checked, onClick };
|
|
16
|
+
}
|
|
17
|
+
function toggle(label, checked, set) {
|
|
18
|
+
return {
|
|
19
|
+
label,
|
|
20
|
+
type: 'checkbox',
|
|
21
|
+
checked,
|
|
22
|
+
onClick: () => {
|
|
23
|
+
set(!checked);
|
|
24
|
+
},
|
|
25
|
+
};
|
|
26
|
+
}
|
|
27
|
+
function action(label, onClick, disabled = false) {
|
|
28
|
+
return { label, onClick, disabled };
|
|
29
|
+
}
|
|
30
|
+
function subMenu(label, items, display) {
|
|
31
|
+
return { label, type: 'subMenu', subMenu: items, display };
|
|
32
|
+
}
|
|
33
|
+
function when(cond, items) {
|
|
34
|
+
return cond ? items : [];
|
|
35
|
+
}
|
|
36
|
+
export function fileMenuItems(model) {
|
|
37
|
+
return [
|
|
38
|
+
...when(!!model.importForm, [
|
|
39
|
+
action('Open alignment…', () => {
|
|
40
|
+
model.reset();
|
|
41
|
+
}),
|
|
42
|
+
]),
|
|
43
|
+
openAnnotationFileItem(model),
|
|
44
|
+
action('Export as SVG…', () => {
|
|
45
|
+
model.queueDialog(onClose => [ExportSVGDialog, { onClose, model }]);
|
|
46
|
+
}),
|
|
47
|
+
...when(!model.tree.noTree, [
|
|
48
|
+
action('Export tree as Newick', () => {
|
|
49
|
+
model.exportNewick();
|
|
50
|
+
}),
|
|
51
|
+
]),
|
|
52
|
+
action('Alignment info…', () => {
|
|
53
|
+
model.queueDialog(onClose => [MetadataDialog, { model, onClose }]);
|
|
54
|
+
}),
|
|
55
|
+
];
|
|
56
|
+
}
|
|
57
|
+
function zoomSubMenu(model) {
|
|
58
|
+
return [
|
|
59
|
+
action('Zoom in', () => {
|
|
60
|
+
model.zoomIn();
|
|
61
|
+
}),
|
|
62
|
+
action('Zoom out', () => {
|
|
63
|
+
model.zoomOut();
|
|
64
|
+
}),
|
|
65
|
+
action('Fit to window', () => {
|
|
66
|
+
model.fit();
|
|
67
|
+
}),
|
|
68
|
+
action('Fit width', () => {
|
|
69
|
+
model.fitHorizontally();
|
|
70
|
+
}),
|
|
71
|
+
action('Fit height', () => {
|
|
72
|
+
model.fitVertically();
|
|
73
|
+
}),
|
|
74
|
+
action('Reset zoom', () => {
|
|
75
|
+
model.resetZoom();
|
|
76
|
+
}),
|
|
77
|
+
toggle(scrollZoomLabel, model.scrollZoom, arg => {
|
|
78
|
+
model.setScrollZoom(arg);
|
|
79
|
+
}),
|
|
80
|
+
];
|
|
81
|
+
}
|
|
82
|
+
const gapPresets = [100, 90, 50];
|
|
83
|
+
export function gapsSubMenu(model) {
|
|
84
|
+
const { hideGaps, allowedGappyness } = model;
|
|
85
|
+
const custom = hideGaps && !gapPresets.includes(allowedGappyness);
|
|
86
|
+
return [
|
|
87
|
+
subMenu('Gappy columns', [
|
|
88
|
+
radio('Show all columns', !hideGaps, () => {
|
|
89
|
+
model.setHideGaps(false);
|
|
90
|
+
}),
|
|
91
|
+
...gapPresets.map(pct => radio(pct === 100 ? 'Hide columns of only gaps' : `Hide ≥${pct}% gaps`, hideGaps && allowedGappyness === pct, () => {
|
|
92
|
+
model.setHideGaps(true);
|
|
93
|
+
model.setAllowedGappyness(pct);
|
|
94
|
+
})),
|
|
95
|
+
{
|
|
96
|
+
...radio(custom ? `Hide ≥${allowedGappyness}% gaps…` : 'Custom threshold…', custom, () => {
|
|
97
|
+
model.setHideGaps(true);
|
|
98
|
+
model.queueDialog(onClose => [
|
|
99
|
+
GapThresholdDialog,
|
|
100
|
+
{ model, onClose },
|
|
101
|
+
]);
|
|
102
|
+
}),
|
|
103
|
+
keepMenuOpen: false,
|
|
104
|
+
},
|
|
105
|
+
], 'select'),
|
|
106
|
+
];
|
|
107
|
+
}
|
|
108
|
+
const treeOrderLabels = {
|
|
109
|
+
branchLength: 'By branch length',
|
|
110
|
+
input: 'Input order',
|
|
111
|
+
ladderize: 'Ladderize, small clades first',
|
|
112
|
+
ladderizeReverse: 'Ladderize, large clades first',
|
|
113
|
+
};
|
|
114
|
+
function outgroupLabel(outgroup) {
|
|
115
|
+
const [first, ...rest] = outgroup;
|
|
116
|
+
return rest.length === 0
|
|
117
|
+
? `Outgroup ${first}`
|
|
118
|
+
: `Outgroup ${first} … ${rest.at(-1)}`;
|
|
119
|
+
}
|
|
120
|
+
export function treeSubMenu(model) {
|
|
121
|
+
const { drawTree, showBranchLen, labelsAlignRight, drawNodeLabels, drawLabels, treeAreaWidth, showTreeOverview, showTreeScaleBar, treeOrder, treeRoot, rotated, } = model;
|
|
122
|
+
return [
|
|
123
|
+
subMenu('Layout', [
|
|
124
|
+
radio('Phylogram', drawTree && showBranchLen, () => {
|
|
125
|
+
model.setDrawTree(true);
|
|
126
|
+
model.setShowBranchLen(true);
|
|
127
|
+
}),
|
|
128
|
+
radio('Cladogram', drawTree && !showBranchLen, () => {
|
|
129
|
+
model.setDrawTree(true);
|
|
130
|
+
model.setShowBranchLen(false);
|
|
131
|
+
}),
|
|
132
|
+
radio('Labels only', !drawTree, () => {
|
|
133
|
+
model.setDrawTree(false);
|
|
134
|
+
}),
|
|
135
|
+
], 'segmented'),
|
|
136
|
+
toggle('Tree overview', showTreeOverview, arg => {
|
|
137
|
+
model.setShowTreeOverview(arg);
|
|
138
|
+
}),
|
|
139
|
+
toggle('Scale bar', showTreeScaleBar, arg => {
|
|
140
|
+
model.setShowTreeScaleBar(arg);
|
|
141
|
+
}),
|
|
142
|
+
subMenu('Order', [
|
|
143
|
+
...treeOrders.map(order => radio(treeOrderLabels[order], treeOrder === order, () => {
|
|
144
|
+
model.setTreeOrder(order);
|
|
145
|
+
})),
|
|
146
|
+
...when(rotated.length > 0, [
|
|
147
|
+
action('Undo rotations', () => {
|
|
148
|
+
model.clearRotated();
|
|
149
|
+
}),
|
|
150
|
+
]),
|
|
151
|
+
], 'select'),
|
|
152
|
+
subMenu('Root', [
|
|
153
|
+
radio('Input root', treeRoot === undefined, () => {
|
|
154
|
+
model.setTreeRoot(undefined);
|
|
155
|
+
}),
|
|
156
|
+
radio('Midpoint', treeRoot === 'midpoint', () => {
|
|
157
|
+
model.setTreeRoot('midpoint');
|
|
158
|
+
}),
|
|
159
|
+
// "Reroot here" in a node's menu sets the outgroup, so this only
|
|
160
|
+
// reports it
|
|
161
|
+
...when(typeof treeRoot === 'object', [
|
|
162
|
+
{
|
|
163
|
+
...radio(typeof treeRoot === 'object'
|
|
164
|
+
? outgroupLabel(treeRoot.outgroup)
|
|
165
|
+
: '', true, () => { }),
|
|
166
|
+
disabled: true,
|
|
167
|
+
},
|
|
168
|
+
]),
|
|
169
|
+
], 'select'),
|
|
170
|
+
subMenu('Labels', [
|
|
171
|
+
toggle('Tip labels', drawLabels, arg => {
|
|
172
|
+
model.setDrawLabels(arg);
|
|
173
|
+
}),
|
|
174
|
+
toggle('Internal node labels', drawNodeLabels, arg => {
|
|
175
|
+
model.setDrawNodeLabels(arg);
|
|
176
|
+
}),
|
|
177
|
+
toggle('Align right', labelsAlignRight, arg => {
|
|
178
|
+
model.setLabelsAlignRight(arg);
|
|
179
|
+
}),
|
|
180
|
+
]),
|
|
181
|
+
...when(treeAreaWidth !== undefined, [
|
|
182
|
+
action('Reset tree width', () => {
|
|
183
|
+
model.setTreeAreaWidth(undefined);
|
|
184
|
+
}),
|
|
185
|
+
]),
|
|
186
|
+
];
|
|
187
|
+
}
|
|
188
|
+
export function viewMenuItems(model) {
|
|
189
|
+
return [
|
|
190
|
+
...when(canGoTo(model), [
|
|
191
|
+
action('Find row or column…', () => {
|
|
192
|
+
model.queueDialog(onClose => [GoToDialog, { model, onClose }]);
|
|
193
|
+
}),
|
|
194
|
+
]),
|
|
195
|
+
subMenu('Zoom', zoomSubMenu(model)),
|
|
196
|
+
];
|
|
197
|
+
}
|
|
198
|
+
export function trackSettingsItems(model) {
|
|
199
|
+
return [
|
|
200
|
+
toggle('Show track values on hover', model.showColumnStats, arg => {
|
|
201
|
+
model.setShowColumnStats(arg);
|
|
202
|
+
}),
|
|
203
|
+
];
|
|
204
|
+
}
|
|
205
|
+
// the settings panel's toggles for how the alignment draws
|
|
206
|
+
export function alignmentSettingsItems(model) {
|
|
207
|
+
return [
|
|
208
|
+
toggle('Show letters', model.drawMsaLetters, arg => {
|
|
209
|
+
model.setDrawMsaLetters(arg);
|
|
210
|
+
}),
|
|
211
|
+
];
|
|
212
|
+
}
|
|
213
|
+
// who colors the cells comes first, since a scheme picked while the domains
|
|
214
|
+
// fill them would otherwise change nothing on screen
|
|
215
|
+
export function colorSettingsItems(model) {
|
|
216
|
+
const { cellFill, filteredAnnotations } = model;
|
|
217
|
+
return [
|
|
218
|
+
subMenu('Fill cells with', [
|
|
219
|
+
radio('Residues', cellFill === 'residue', () => {
|
|
220
|
+
model.setCellFill('residue');
|
|
221
|
+
}),
|
|
222
|
+
...when(filteredAnnotations.length > 0, [
|
|
223
|
+
radio('Domains', cellFill === 'domain', () => {
|
|
224
|
+
model.setShowDomains(true);
|
|
225
|
+
model.setCellFill('domain');
|
|
226
|
+
}),
|
|
227
|
+
]),
|
|
228
|
+
{
|
|
229
|
+
...radio('Nothing', cellFill === 'none', () => {
|
|
230
|
+
model.setCellFill('none');
|
|
231
|
+
}),
|
|
232
|
+
helpText: 'Color the letters instead',
|
|
233
|
+
},
|
|
234
|
+
], 'segmented'),
|
|
235
|
+
{
|
|
236
|
+
type: 'subHeader',
|
|
237
|
+
label: cellFill === 'domain'
|
|
238
|
+
? 'Residue scheme: picking one takes the cells back from the domains'
|
|
239
|
+
: 'Residue scheme',
|
|
240
|
+
},
|
|
241
|
+
...colorSchemeMenuItems(model),
|
|
242
|
+
];
|
|
243
|
+
}
|
|
244
|
+
function neighborJoiningItem(model) {
|
|
245
|
+
const rows = model.rowMap.size;
|
|
246
|
+
const tooManyRows = rows > maxNeighborJoiningRows;
|
|
247
|
+
return action(tooManyRows
|
|
248
|
+
? `Build neighbor joining tree (over ${maxNeighborJoiningRows} rows, use FastTree)`
|
|
249
|
+
: model.noTree
|
|
250
|
+
? 'Build neighbor joining tree'
|
|
251
|
+
: 'Replace with neighbor joining tree', () => {
|
|
252
|
+
try {
|
|
253
|
+
model.calculateNeighborJoiningTreeFromMSA();
|
|
254
|
+
}
|
|
255
|
+
catch (e) {
|
|
256
|
+
console.error('Failed to calculate NJ tree:', e);
|
|
257
|
+
model.addWarning(e instanceof Error ? e.message : String(e));
|
|
258
|
+
}
|
|
259
|
+
}, tooManyRows || rows < 2);
|
|
260
|
+
}
|
|
261
|
+
export function toolsMenuItems(model) {
|
|
262
|
+
return [neighborJoiningItem(model)];
|
|
263
|
+
}
|
|
264
|
+
export function helpMenuItems(model) {
|
|
265
|
+
return [
|
|
266
|
+
action('Mouse & keyboard…', () => {
|
|
267
|
+
model.queueDialog(onClose => [HelpDialog, { model, onClose }]);
|
|
268
|
+
}),
|
|
269
|
+
action('Tutorials', () => {
|
|
270
|
+
window.open(tutorialsUrl, '_blank', 'noopener,noreferrer');
|
|
271
|
+
}),
|
|
272
|
+
action('About & credits…', () => {
|
|
273
|
+
model.queueDialog(onClose => [AboutDialog, { onClose }]);
|
|
274
|
+
}),
|
|
275
|
+
];
|
|
276
|
+
}
|
|
277
|
+
//# sourceMappingURL=menuBarItems.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"menuBarItems.js","sourceRoot":"","sources":["../../../src/components/header/menuBarItems.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,8 +10,8 @@ const ImportForm = observer(function ({ model }) {
|
|
|
10
10
|
const [treeFile, setTreeFile] = useState();
|
|
11
11
|
const [gffFile, setGffFile] = useState();
|
|
12
12
|
const { error } = model;
|
|
13
|
-
return (React.createElement(Container,
|
|
14
|
-
React.createElement(Box, { sx: { width: '50%', [phone]: { width: '100%' } } },
|
|
13
|
+
return (React.createElement(Container, { sx: { pt: 2, pb: 3 } },
|
|
14
|
+
React.createElement(Box, { sx: { width: '50%', mb: 2, [phone]: { width: '100%' } } },
|
|
15
15
|
error ? React.createElement(ErrorMessage, { error: error }) : null,
|
|
16
16
|
React.createElement(Typography, null, "Open an MSA file (FASTA, Stockholm, Clustal, A3M or EMF format) and/or a tree file (Newick format)."),
|
|
17
17
|
React.createElement(Typography, { color: "text.secondary" }, "An MSA alone or a tree alone is enough, and a Stockholm file with an embedded tree needs no separate tree file.")),
|
|
@@ -26,16 +26,22 @@ const ImportForm = observer(function ({ model }) {
|
|
|
26
26
|
gap: '16px',
|
|
27
27
|
},
|
|
28
28
|
} },
|
|
29
|
-
React.createElement(
|
|
29
|
+
React.createElement(Box, { sx: {
|
|
30
|
+
width: 400,
|
|
31
|
+
display: 'flex',
|
|
32
|
+
flexDirection: 'column',
|
|
33
|
+
gap: 1.5,
|
|
34
|
+
[phone]: { width: 'auto' },
|
|
35
|
+
} },
|
|
30
36
|
React.createElement("div", null,
|
|
31
37
|
React.createElement(Typography, null, "MSA file or URL"),
|
|
32
|
-
React.createElement(FileSelector, { location: msaFile, setLocation: setMsaFile })),
|
|
38
|
+
React.createElement(FileSelector, { inline: true, location: msaFile, setLocation: setMsaFile })),
|
|
33
39
|
React.createElement("div", null,
|
|
34
40
|
React.createElement(Typography, null, "Tree file or URL"),
|
|
35
|
-
React.createElement(FileSelector, { location: treeFile, setLocation: setTreeFile })),
|
|
41
|
+
React.createElement(FileSelector, { inline: true, location: treeFile, setLocation: setTreeFile })),
|
|
36
42
|
React.createElement("div", null,
|
|
37
43
|
React.createElement(Typography, null, "Annotation GFF file or URL (optional)"),
|
|
38
|
-
React.createElement(FileSelector, { location: gffFile, setLocation: setGffFile }))),
|
|
44
|
+
React.createElement(FileSelector, { inline: true, location: gffFile, setLocation: setGffFile }))),
|
|
39
45
|
React.createElement("div", null,
|
|
40
46
|
React.createElement(Button, { onClick: () => {
|
|
41
47
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ImportForm.js","sourceRoot":"","sources":["../../../src/components/import/ImportForm.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEvC,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;AAC7D,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAClE,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAErC,OAAO,kBAAkB,MAAM,yBAA0B,CAAA;AACzD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAKhC,MAAM,KAAK,GAAG,2BAA2B,CAAA;AAEzC,MAAM,UAAU,GAAG,QAAQ,CAAC,UAAU,EAAE,KAAK,EAA2B;IACtE,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,EAAgB,CAAA;IACtD,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,EAAgB,CAAA;IACxD,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,EAAgB,CAAA;IACtD,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,CAAA;IAEvB,OAAO,CACL,oBAAC,SAAS;
|
|
1
|
+
{"version":3,"file":"ImportForm.js","sourceRoot":"","sources":["../../../src/components/import/ImportForm.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import React, { useCallback } from 'react';
|
|
2
|
-
import { useTheme } from '@mui/material';
|
|
3
2
|
import { observer } from 'mobx-react';
|
|
3
|
+
import { useCanvasTheme } from '../../darkReader.js';
|
|
4
4
|
import { useCanvasAutorun } from '../../useCanvasAutorun.js';
|
|
5
5
|
import DragHandle, { scrollbarThumbFill } from '../DragHandle.js';
|
|
6
6
|
import { msaThumbnail } from '../msa/msaRaster.js';
|
|
7
|
-
import { MINIMAP_BAR_HEIGHT, getMinimapLayout } from './minimapLayout.js';
|
|
7
|
+
import { MINIMAP_BAR_HEIGHT, getMinimapLayout, minimapDomainRects, } from './minimapLayout.js';
|
|
8
8
|
const Minimap = observer(function ({ model }) {
|
|
9
9
|
const { minimapHeight, msaCanvasWidth, highResScaleFactor } = model;
|
|
10
|
-
const theme =
|
|
10
|
+
const theme = useCanvasTheme();
|
|
11
11
|
const { unit, s, w, polygonHeight, polygonPoints } = getMinimapLayout(model);
|
|
12
12
|
// the whole alignment, sampled down to the bar
|
|
13
13
|
const barWidth = Math.round(msaCanvasWidth * highResScaleFactor);
|
|
@@ -25,6 +25,10 @@ const Minimap = observer(function ({ model }) {
|
|
|
25
25
|
ctx.imageSmoothingEnabled = true;
|
|
26
26
|
ctx.drawImage(thumbnail, 0, 0, thumbnail.width, thumbnail.height, 0, 0, barWidth, barHeight);
|
|
27
27
|
}
|
|
28
|
+
for (const r of minimapDomainRects(model, barWidth, barHeight)) {
|
|
29
|
+
ctx.fillStyle = r.fill;
|
|
30
|
+
ctx.fillRect(r.x, r.y, r.w, r.h);
|
|
31
|
+
}
|
|
28
32
|
},
|
|
29
33
|
width: barWidth,
|
|
30
34
|
height: barHeight,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Minimap.js","sourceRoot":"","sources":["../../../src/components/minimap/Minimap.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,WAAW,EAAE,MAAM,OAAO,CAAA;AAE1C,OAAO,EAAE,QAAQ,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"Minimap.js","sourceRoot":"","sources":["../../../src/components/minimap/Minimap.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import { scrollbarThumbFill } from '../DragHandle.js';
|
|
3
3
|
import { canvasHref, msaThumbnail } from '../msa/msaRaster.js';
|
|
4
|
-
import { MINIMAP_BAR_HEIGHT, getMinimapLayout } from './minimapLayout.js';
|
|
4
|
+
import { MINIMAP_BAR_HEIGHT, getMinimapLayout, minimapDomainRects, } from './minimapLayout.js';
|
|
5
5
|
// The static counterpart to Minimap, for the SVG export. renderToSvg drives it
|
|
6
6
|
// through renderToStaticMarkup, so it reads the model once and never re-renders
|
|
7
7
|
// -- no observer wrapper.
|
|
@@ -13,6 +13,7 @@ export default function MinimapSVG({ model, theme, }) {
|
|
|
13
13
|
const href = canvasHref(msaThumbnail({ model, theme, height: MINIMAP_BAR_HEIGHT }));
|
|
14
14
|
return (React.createElement(React.Fragment, null,
|
|
15
15
|
href ? (React.createElement("image", { href: href, x: 0, y: 0, width: msaCanvasWidth, height: MINIMAP_BAR_HEIGHT, preserveAspectRatio: "none" })) : null,
|
|
16
|
+
minimapDomainRects(model, msaCanvasWidth, MINIMAP_BAR_HEIGHT).map(({ x, y, w, h, fill }) => (React.createElement("rect", { key: `${x},${y},${w},${fill}`, x: x, y: y, width: w, height: h, fill: fill }))),
|
|
16
17
|
React.createElement("rect", { x: 0, y: 0, width: msaCanvasWidth, height: MINIMAP_BAR_HEIGHT, stroke: theme.palette.text.secondary, fill: "none" }),
|
|
17
18
|
React.createElement("rect", { x: Math.max(0, s), y: 0, width: w, height: MINIMAP_BAR_HEIGHT, fill: scrollbarThumbFill, stroke: theme.palette.text.secondary }),
|
|
18
19
|
React.createElement("g", { transform: `translate(0 ${MINIMAP_BAR_HEIGHT})` },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MinimapSVG.js","sourceRoot":"","sources":["../../../src/components/minimap/MinimapSVG.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAmB,CAAA;AACtD,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAC9D,OAAO,
|
|
1
|
+
{"version":3,"file":"MinimapSVG.js","sourceRoot":"","sources":["../../../src/components/minimap/MinimapSVG.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAmB,CAAA;AACtD,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAC9D,OAAO,EACL,kBAAkB,EAClB,gBAAgB,EAChB,kBAAkB,GACnB,MAAM,oBAAoB,CAAA;AAK3B,+EAA+E;AAC/E,gFAAgF;AAChF,0BAA0B;AAC1B,MAAM,CAAC,OAAO,UAAU,UAAU,CAAC,EACjC,KAAK,EACL,KAAK,GAIN;IACC,MAAM,EAAE,cAAc,EAAE,GAAG,KAAK,CAAA;IAChC,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,aAAa,EAAE,GAAG,gBAAgB,CAAC,KAAK,CAAC,CAAA;IACvD,0EAA0E;IAC1E,0EAA0E;IAC1E,MAAM,IAAI,GAAG,UAAU,CACrB,YAAY,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,kBAAkB,EAAE,CAAC,CAC3D,CAAA;IAED,OAAO,CACL;QACG,IAAI,CAAC,CAAC,CAAC,CACN,+BACE,IAAI,EAAE,IAAI,EACV,CAAC,EAAE,CAAC,EACJ,CAAC,EAAE,CAAC,EACJ,KAAK,EAAE,cAAc,EACrB,MAAM,EAAE,kBAAkB,EAC1B,mBAAmB,EAAC,MAAM,GAC1B,CACH,CAAC,CAAC,CAAC,IAAI;QACP,kBAAkB,CAAC,KAAK,EAAE,cAAc,EAAE,kBAAkB,CAAC,CAAC,GAAG,CAChE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CACxB,8BACE,GAAG,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,EAC7B,CAAC,EAAE,CAAC,EACJ,CAAC,EAAE,CAAC,EACJ,KAAK,EAAE,CAAC,EACR,MAAM,EAAE,CAAC,EACT,IAAI,EAAE,IAAI,GACV,CACH,CACF;QACD,8BACE,CAAC,EAAE,CAAC,EACJ,CAAC,EAAE,CAAC,EACJ,KAAK,EAAE,cAAc,EACrB,MAAM,EAAE,kBAAkB,EAC1B,MAAM,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,EACpC,IAAI,EAAC,MAAM,GACX;QACF,8BACE,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,EACjB,CAAC,EAAE,CAAC,EACJ,KAAK,EAAE,CAAC,EACR,MAAM,EAAE,kBAAkB,EAC1B,IAAI,EAAE,kBAAkB,EACxB,MAAM,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,GACpC;QACF,2BAAG,SAAS,EAAE,eAAe,kBAAkB,GAAG;YAChD,iCAAS,IAAI,EAAE,kBAAkB,EAAE,MAAM,EAAE,aAAa,GAAI,CAC1D,CACH,CACJ,CAAA;AACH,CAAC"}
|
|
@@ -13,3 +13,15 @@ export declare function getMinimapLayout(model: MsaViewModel): {
|
|
|
13
13
|
polygonHeight: number;
|
|
14
14
|
polygonPoints: string;
|
|
15
15
|
};
|
|
16
|
+
/**
|
|
17
|
+
* The domain overlay's boxes scaled onto the minimap bar, one per row's band,
|
|
18
|
+
* in the colors the alignment draws them, so the overview shows the domains
|
|
19
|
+
* the alignment does. Empty unless the domains fill the cells.
|
|
20
|
+
*/
|
|
21
|
+
export declare function minimapDomainRects(model: MsaViewModel, width: number, height: number): {
|
|
22
|
+
x: number;
|
|
23
|
+
y: number;
|
|
24
|
+
w: number;
|
|
25
|
+
h: number;
|
|
26
|
+
fill: string;
|
|
27
|
+
}[];
|
|
@@ -16,4 +16,24 @@ export function getMinimapLayout(model) {
|
|
|
16
16
|
const polygonPoints = `${s + w},0 ${s},0 0,${polygonHeight} ${msaCanvasWidth},${polygonHeight}`;
|
|
17
17
|
return { unit, s, w, polygonHeight, polygonPoints };
|
|
18
18
|
}
|
|
19
|
+
/**
|
|
20
|
+
* The domain overlay's boxes scaled onto the minimap bar, one per row's band,
|
|
21
|
+
* in the colors the alignment draws them, so the overview shows the domains
|
|
22
|
+
* the alignment does. Empty unless the domains fill the cells.
|
|
23
|
+
*/
|
|
24
|
+
export function minimapDomainRects(model, width, height) {
|
|
25
|
+
const { cellFill, domainBands, featureColors, leaves, numColumns } = model;
|
|
26
|
+
if (cellFill !== 'domain' || numColumns <= 0 || leaves.length === 0) {
|
|
27
|
+
return [];
|
|
28
|
+
}
|
|
29
|
+
const colUnit = width / numColumns;
|
|
30
|
+
const rowUnit = height / leaves.length;
|
|
31
|
+
return leaves.flatMap((leaf, row) => (domainBands.get(leaf.data.name) ?? []).map(band => ({
|
|
32
|
+
x: band.startCol * colUnit,
|
|
33
|
+
y: row * rowUnit,
|
|
34
|
+
w: Math.max(1, (band.endCol - band.startCol) * colUnit),
|
|
35
|
+
h: Math.max(1, rowUnit),
|
|
36
|
+
fill: featureColors.get(band.annotation)?.fill ?? 'grey',
|
|
37
|
+
})));
|
|
38
|
+
}
|
|
19
39
|
//# sourceMappingURL=minimapLayout.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"minimapLayout.js","sourceRoot":"","sources":["../../../src/components/minimap/minimapLayout.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,kBAAkB,GAAG,EAAE,CAAA;AAEpC;;;;;GAKG;AACH,MAAM,UAAU,gBAAgB,CAAC,KAAmB;IAClD,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,cAAc,EAAE,GAAG,KAAK,CAAA;IACpE,MAAM,IAAI,GAAG,UAAU,GAAG,CAAC,CAAC,CAAC,CAAC,cAAc,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,CAAA;IAC7D,MAAM,CAAC,GAAG,CAAC,OAAO,GAAG,IAAI,CAAA;IACzB,6EAA6E;IAC7E,4BAA4B;IAC5B,MAAM,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,cAAc,EAAE,IAAI,CAAC,GAAG,CAAC,cAAc,GAAG,IAAI,EAAE,EAAE,CAAC,CAAC,CAAA;IACvE,MAAM,aAAa,GAAG,aAAa,GAAG,kBAAkB,CAAA;IACxD,MAAM,aAAa,GAAG,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,aAAa,IAAI,cAAc,IAAI,aAAa,EAAE,CAAA;IAC/F,OAAO,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,aAAa,EAAE,aAAa,EAAE,CAAA;AACrD,CAAC"}
|
|
1
|
+
{"version":3,"file":"minimapLayout.js","sourceRoot":"","sources":["../../../src/components/minimap/minimapLayout.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,kBAAkB,GAAG,EAAE,CAAA;AAEpC;;;;;GAKG;AACH,MAAM,UAAU,gBAAgB,CAAC,KAAmB;IAClD,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,cAAc,EAAE,GAAG,KAAK,CAAA;IACpE,MAAM,IAAI,GAAG,UAAU,GAAG,CAAC,CAAC,CAAC,CAAC,cAAc,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,CAAA;IAC7D,MAAM,CAAC,GAAG,CAAC,OAAO,GAAG,IAAI,CAAA;IACzB,6EAA6E;IAC7E,4BAA4B;IAC5B,MAAM,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,cAAc,EAAE,IAAI,CAAC,GAAG,CAAC,cAAc,GAAG,IAAI,EAAE,EAAE,CAAC,CAAC,CAAA;IACvE,MAAM,aAAa,GAAG,aAAa,GAAG,kBAAkB,CAAA;IACxD,MAAM,aAAa,GAAG,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,aAAa,IAAI,cAAc,IAAI,aAAa,EAAE,CAAA;IAC/F,OAAO,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,aAAa,EAAE,aAAa,EAAE,CAAA;AACrD,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,kBAAkB,CAChC,KAAmB,EACnB,KAAa,EACb,MAAc;IAEd,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,KAAK,CAAA;IAC1E,IAAI,QAAQ,KAAK,QAAQ,IAAI,UAAU,IAAI,CAAC,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACpE,OAAO,EAAE,CAAA;IACX,CAAC;IACD,MAAM,OAAO,GAAG,KAAK,GAAG,UAAU,CAAA;IAClC,MAAM,OAAO,GAAG,MAAM,GAAG,MAAM,CAAC,MAAM,CAAA;IACtC,OAAO,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,CAClC,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACnD,CAAC,EAAE,IAAI,CAAC,QAAQ,GAAG,OAAO;QAC1B,CAAC,EAAE,GAAG,GAAG,OAAO;QAChB,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC;QACvD,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,CAAC;QACvB,IAAI,EAAE,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,IAAI,IAAI,MAAM;KACzD,CAAC,CAAC,CACJ,CAAA;AACH,CAAC"}
|
|
@@ -1,12 +1,20 @@
|
|
|
1
1
|
import React, { useCallback, useRef } from 'react';
|
|
2
2
|
import { observer } from 'mobx-react';
|
|
3
3
|
import { useWheelScroll } from '../../useWheelScroll.js';
|
|
4
|
+
import { zoomSnapshotScale } from '../../zoomSnapshot.js';
|
|
4
5
|
import { alignmentAriaLabel } from '../controls.js';
|
|
5
6
|
import Loading from './Loading.js';
|
|
6
7
|
import MSACanvasBlock from './MSACanvasBlock.js';
|
|
8
|
+
import { WheelZoomHint, useWheelZoomHint } from './WheelZoomHint.js';
|
|
7
9
|
import { onMsaKey } from './msaKeys.js';
|
|
8
10
|
const MSACanvas = observer(function ({ model }) {
|
|
9
|
-
const { MSA, msaFilehandle, height, msaCanvasWidth, blocks2d, scrollZoom, scrollX, scrollY, } = model;
|
|
11
|
+
const { MSA, msaFilehandle, height, msaCanvasWidth, blocks2d, scrollZoom, scrollX, scrollY, zoomSnapshot, } = model;
|
|
12
|
+
const blocks = zoomSnapshot
|
|
13
|
+
? zoomSnapshot.blocksY.flatMap(by => zoomSnapshot.blocksX.map(bx => [bx, by]))
|
|
14
|
+
: blocks2d;
|
|
15
|
+
const scale = zoomSnapshot
|
|
16
|
+
? zoomSnapshotScale(model, zoomSnapshot)
|
|
17
|
+
: undefined;
|
|
10
18
|
const ref = useRef(null);
|
|
11
19
|
const onScrollX = useCallback((d) => {
|
|
12
20
|
model.doScrollX(d);
|
|
@@ -15,13 +23,19 @@ const MSACanvas = observer(function ({ model }) {
|
|
|
15
23
|
model.doScrollY(d);
|
|
16
24
|
}, [model]);
|
|
17
25
|
const onZoom = useCallback((scaleFactor, offsetX, offsetY) => {
|
|
18
|
-
model.
|
|
26
|
+
model.wheelZoomToPos(scaleFactor, offsetX, offsetY);
|
|
19
27
|
}, [model]);
|
|
28
|
+
const onZoomSettle = useCallback(() => {
|
|
29
|
+
model.endWheelZoom();
|
|
30
|
+
}, [model]);
|
|
31
|
+
const hint = useWheelZoomHint(model);
|
|
20
32
|
const { onMouseDown, onMouseUp } = useWheelScroll({
|
|
21
33
|
ref,
|
|
22
34
|
onScrollX,
|
|
23
35
|
onScrollY,
|
|
24
36
|
onZoom,
|
|
37
|
+
onZoomSettle,
|
|
38
|
+
onWheelScroll: hint.onWheelScroll,
|
|
25
39
|
scrollZoom,
|
|
26
40
|
});
|
|
27
41
|
return (React.createElement("div", { ref: ref, "data-testid": "msa_canvas", tabIndex: 0, "aria-label": alignmentAriaLabel, onKeyDown: event => {
|
|
@@ -44,13 +58,16 @@ const MSACanvas = observer(function ({ model }) {
|
|
|
44
58
|
height,
|
|
45
59
|
width: msaCanvasWidth,
|
|
46
60
|
overflow: 'hidden',
|
|
47
|
-
} },
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
61
|
+
} },
|
|
62
|
+
!MSA && !msaFilehandle ? null : MSA ? (React.createElement("div", { style: {
|
|
63
|
+
position: 'absolute',
|
|
64
|
+
top: 0,
|
|
65
|
+
left: 0,
|
|
66
|
+
transform: `translate(${scrollX}px, ${scrollY}px)${scale ? ` scale(${scale.sx}, ${scale.sy})` : ''}`,
|
|
67
|
+
transformOrigin: '0 0',
|
|
68
|
+
willChange: 'transform',
|
|
69
|
+
} }, blocks.map(([bx, by]) => (React.createElement(MSACanvasBlock, { key: `${bx}_${by}`, model: model, offsetX: bx, offsetY: by }))))) : (React.createElement(Loading, null)),
|
|
70
|
+
hint.visible ? React.createElement(WheelZoomHint, null) : null));
|
|
54
71
|
});
|
|
55
72
|
export default MSACanvas;
|
|
56
73
|
//# sourceMappingURL=MSACanvas.js.map
|
|
@@ -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,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AACnD,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,
|
|
1
|
+
{"version":3,"file":"MSACanvas.js","sourceRoot":"","sources":["../../../src/components/msa/MSACanvas.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,28 +1,31 @@
|
|
|
1
|
-
import React from 'react';
|
|
1
|
+
import React, { useRef } from 'react';
|
|
2
2
|
import BaseTooltip from '@jbrowse/core/ui/BaseTooltip';
|
|
3
|
-
import { useTheme } from '@mui/material';
|
|
4
3
|
import { observer } from 'mobx-react';
|
|
4
|
+
import { useCanvasTheme } from '../../darkReader.js';
|
|
5
5
|
import { useCanvasAutorun } from '../../useCanvasAutorun.js';
|
|
6
6
|
import { drawMsaRaster, rasterApplies } from './msaRaster.js';
|
|
7
|
-
import { renderBoxFeatureCanvasBlock } from './renderBoxFeatureCanvasBlock.js';
|
|
8
7
|
import { renderMSABlock } from './renderMSABlock.js';
|
|
9
8
|
import { useMsaBlockMouse } from './useMsaBlockMouse.js';
|
|
10
9
|
const MSACanvasBlock = observer(function ({ model, offsetX, offsetY, }) {
|
|
11
10
|
const { blockSize, highResScaleFactor } = model;
|
|
12
|
-
const theme =
|
|
11
|
+
const theme = useCanvasTheme();
|
|
13
12
|
const { anchor, onMouseMove, onMouseDown, onClick, onMouseLeave } = useMsaBlockMouse({ model, offsetX, offsetY });
|
|
14
13
|
const canvasSize = blockSize * highResScaleFactor;
|
|
14
|
+
const drawnAt = useRef(undefined);
|
|
15
15
|
const ref = useCanvasAutorun({
|
|
16
16
|
draw: ctx => {
|
|
17
|
+
// during a wheel zoom MSACanvas scales what this block drew at the
|
|
18
|
+
// snapshot, so the block redraws only when a new snapshot is taken
|
|
19
|
+
const snap = model.zoomSnapshot;
|
|
20
|
+
if (snap &&
|
|
21
|
+
(snap === drawnAt.current ||
|
|
22
|
+
snap.colWidth !== model.colWidth ||
|
|
23
|
+
snap.rowHeight !== model.rowHeight)) {
|
|
24
|
+
return;
|
|
25
|
+
}
|
|
26
|
+
drawnAt.current = snap;
|
|
17
27
|
ctx.resetTransform();
|
|
18
28
|
ctx.clearRect(0, 0, canvasSize, canvasSize);
|
|
19
|
-
renderBoxFeatureCanvasBlock({
|
|
20
|
-
ctx,
|
|
21
|
-
theme,
|
|
22
|
-
offsetX,
|
|
23
|
-
offsetY,
|
|
24
|
-
model,
|
|
25
|
-
});
|
|
26
29
|
const rasterTiles = rasterApplies(model);
|
|
27
30
|
if (rasterTiles) {
|
|
28
31
|
drawMsaRaster({ ctx, model, theme, offsetX, offsetY });
|
|
@@ -34,6 +37,7 @@ const MSACanvasBlock = observer(function ({ model, offsetX, offsetY, }) {
|
|
|
34
37
|
offsetY,
|
|
35
38
|
model,
|
|
36
39
|
rasterTiles,
|
|
40
|
+
domains: true,
|
|
37
41
|
});
|
|
38
42
|
},
|
|
39
43
|
width: canvasSize,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MSACanvasBlock.js","sourceRoot":"","sources":["../../../src/components/msa/MSACanvasBlock.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;
|
|
1
|
+
{"version":3,"file":"MSACanvasBlock.js","sourceRoot":"","sources":["../../../src/components/msa/MSACanvasBlock.tsx"],"names":[],"mappings":"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"}
|