react-msaview 8.2.0 → 8.4.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 +77 -300
- package/bundle/index.js.map +4 -4
- package/dist/blockFasta.d.ts +6 -0
- package/dist/blockFasta.js +12 -0
- package/dist/blockFasta.js.map +1 -0
- package/dist/colorSchemes.d.ts +7 -0
- package/dist/colorSchemes.js +15 -0
- package/dist/colorSchemes.js.map +1 -1
- package/dist/columnCounts.d.ts +4 -3
- package/dist/columnCounts.js +11 -6
- package/dist/columnCounts.js.map +1 -1
- package/dist/components/CopyButton.d.ts +1 -1
- package/dist/components/CopyButton.js +1 -1
- package/dist/components/CopyButton.js.map +1 -1
- package/dist/components/DragHandle.js +14 -2
- package/dist/components/DragHandle.js.map +1 -1
- package/dist/components/Loading.js +10 -11
- package/dist/components/Loading.js.map +1 -1
- package/dist/components/MSAView.js +15 -9
- package/dist/components/MSAView.js.map +1 -1
- package/dist/components/MSAViewer.d.ts +39 -7
- package/dist/components/MSAViewer.js +72 -22
- package/dist/components/MSAViewer.js.map +1 -1
- package/dist/components/MetadataTable.d.ts +5 -0
- package/dist/components/MetadataTable.js +29 -0
- package/dist/components/MetadataTable.js.map +1 -0
- package/dist/components/SequenceTextArea.d.ts +11 -0
- package/dist/components/SequenceTextArea.js +40 -8
- package/dist/components/SequenceTextArea.js.map +1 -1
- package/dist/components/StatusMessage.d.ts +12 -0
- package/dist/components/StatusMessage.js +43 -0
- package/dist/components/StatusMessage.js.map +1 -0
- package/dist/components/Track.js +13 -4
- package/dist/components/Track.js.map +1 -1
- package/dist/components/VerticalScrollbar.js +6 -1
- package/dist/components/VerticalScrollbar.js.map +1 -1
- package/dist/components/dialogs/ExportSVGDialog.d.ts +3 -2
- package/dist/components/dialogs/ExportSVGDialog.js +4 -2
- package/dist/components/dialogs/ExportSVGDialog.js.map +1 -1
- package/dist/components/dialogs/FeatureDialog.js +15 -10
- package/dist/components/dialogs/FeatureDialog.js.map +1 -1
- package/dist/components/dialogs/MetadataDialog.js +5 -6
- package/dist/components/dialogs/MetadataDialog.js.map +1 -1
- package/dist/components/getVisibleLeaves.d.ts +1 -1
- package/dist/components/header/ColorSchemeMenu.d.ts +6 -0
- package/dist/components/header/ColorSchemeMenu.js +23 -5
- package/dist/components/header/ColorSchemeMenu.js.map +1 -1
- package/dist/components/header/FileMenu.js +9 -0
- package/dist/components/header/FileMenu.js.map +1 -1
- package/dist/components/header/GappynessSlider.js +15 -3
- package/dist/components/header/GappynessSlider.js.map +1 -1
- package/dist/components/header/{HeaderStatusArea.d.ts → GoToBox.d.ts} +2 -2
- package/dist/components/header/GoToBox.js +21 -0
- package/dist/components/header/GoToBox.js.map +1 -0
- package/dist/components/header/Header.js +8 -7
- package/dist/components/header/Header.js.map +1 -1
- package/dist/components/header/SelectionMenu.d.ts +12 -0
- package/dist/components/header/SelectionMenu.js +72 -0
- package/dist/components/header/SelectionMenu.js.map +1 -0
- package/dist/components/header/goTo.d.ts +20 -0
- package/dist/components/header/goTo.js +69 -0
- package/dist/components/header/goTo.js.map +1 -0
- package/dist/components/header/settingsMenuItems.js +57 -1
- package/dist/components/header/settingsMenuItems.js.map +1 -1
- package/dist/components/import/ImportForm.js +10 -4
- package/dist/components/import/ImportForm.js.map +1 -1
- package/dist/components/import/ImportFormExamples.js +19 -27
- package/dist/components/import/ImportFormExamples.js.map +1 -1
- package/dist/components/minimap/Minimap.js +6 -1
- package/dist/components/minimap/Minimap.js.map +1 -1
- package/dist/components/msa/AnnotationLegend.js +11 -5
- package/dist/components/msa/AnnotationLegend.js.map +1 -1
- package/dist/components/msa/MSACanvas.js +17 -1
- package/dist/components/msa/MSACanvas.js.map +1 -1
- package/dist/components/msa/MSACanvasBlock.js +6 -6
- package/dist/components/msa/MSACanvasBlock.js.map +1 -1
- package/dist/components/msa/msaKeys.d.ts +5 -0
- package/dist/components/msa/msaKeys.js +41 -0
- package/dist/components/msa/msaKeys.js.map +1 -0
- package/dist/components/msa/msaRaster.js +1 -0
- package/dist/components/msa/msaRaster.js.map +1 -1
- package/dist/components/msa/renderHighlights.d.ts +14 -3
- package/dist/components/msa/renderHighlights.js +29 -4
- package/dist/components/msa/renderHighlights.js.map +1 -1
- package/dist/components/msa/tileColor.js +9 -8
- package/dist/components/msa/tileColor.js.map +1 -1
- package/dist/components/msa/useMsaBlockMouse.d.ts +2 -4
- package/dist/components/msa/useMsaBlockMouse.js +34 -14
- package/dist/components/msa/useMsaBlockMouse.js.map +1 -1
- package/dist/components/overlayColors.d.ts +2 -0
- package/dist/components/overlayColors.js +3 -0
- package/dist/components/overlayColors.js.map +1 -1
- package/dist/components/rowpanels/RowPanelBlock.js +10 -14
- package/dist/components/rowpanels/RowPanelBlock.js.map +1 -1
- package/dist/components/selectionDrag.d.ts +17 -0
- package/dist/components/selectionDrag.js +30 -0
- package/dist/components/selectionDrag.js.map +1 -0
- package/dist/components/tracks/drawTracks.d.ts +1 -0
- package/dist/components/tracks/drawTracks.js +14 -2
- package/dist/components/tracks/drawTracks.js.map +1 -1
- package/dist/components/tracks/useTrackHover.d.ts +4 -6
- package/dist/components/tracks/useTrackHover.js +30 -10
- package/dist/components/tracks/useTrackHover.js.map +1 -1
- package/dist/components/tree/ScaleBarSVG.d.ts +14 -0
- package/dist/components/tree/ScaleBarSVG.js +11 -0
- package/dist/components/tree/ScaleBarSVG.js.map +1 -0
- package/dist/components/tree/TreeCanvas.js +8 -26
- package/dist/components/tree/TreeCanvas.js.map +1 -1
- package/dist/components/tree/TreeCanvasBlock.js +11 -20
- package/dist/components/tree/TreeCanvasBlock.js.map +1 -1
- package/dist/components/tree/{TreeBranchMenu.d.ts → TreeMenu.d.ts} +5 -4
- package/dist/components/tree/TreeMenu.js +48 -0
- package/dist/components/tree/TreeMenu.js.map +1 -0
- package/dist/components/tree/TreeRuler.js +3 -3
- package/dist/components/tree/TreeRuler.js.map +1 -1
- package/dist/components/tree/dialogs/TreeNodeInfoDialog.js +9 -8
- package/dist/components/tree/dialogs/TreeNodeInfoDialog.js.map +1 -1
- package/dist/components/tree/renderTreeCanvas.js +19 -9
- package/dist/components/tree/renderTreeCanvas.js.map +1 -1
- package/dist/components/tree/renderTreeMouseover.d.ts +5 -0
- package/dist/components/tree/renderTreeMouseover.js +20 -0
- package/dist/components/tree/renderTreeMouseover.js.map +1 -0
- package/dist/components/tree/useTreeHover.d.ts +3 -8
- package/dist/components/tree/useTreeHover.js +8 -10
- package/dist/components/tree/useTreeHover.js.map +1 -1
- package/dist/components/useHoverAnchor.d.ts +19 -0
- package/dist/components/useHoverAnchor.js +18 -0
- package/dist/components/useHoverAnchor.js.map +1 -0
- package/dist/constants.d.ts +3 -0
- package/dist/constants.js +12 -3
- package/dist/constants.js.map +1 -1
- package/dist/element.d.ts +7 -3
- package/dist/element.js +32 -4
- package/dist/element.js.map +1 -1
- package/dist/expandSpec.js +3 -3
- package/dist/expandSpec.js.map +1 -1
- package/dist/exportFileName.d.ts +3 -3
- package/dist/exportFileName.js +4 -4
- package/dist/exportFileName.js.map +1 -1
- package/dist/featuresLayer.d.ts +8 -0
- package/dist/featuresLayer.js +42 -0
- package/dist/featuresLayer.js.map +1 -0
- package/dist/hierarchy.d.ts +51 -0
- package/dist/hierarchy.js +125 -0
- package/dist/hierarchy.js.map +1 -1
- package/dist/index.d.ts +2 -2
- package/dist/model/DataModel.d.ts +1 -1
- package/dist/model/DataModel.js +3 -3
- package/dist/model/DataModel.js.map +1 -1
- package/dist/model/msaModel.d.ts +14 -1
- package/dist/model/msaModel.js +17 -1
- package/dist/model/msaModel.js.map +1 -1
- package/dist/model/treeModel.d.ts +12 -0
- package/dist/model/treeModel.js +14 -1
- package/dist/model/treeModel.js.map +1 -1
- package/dist/model.d.ts +285 -53
- package/dist/model.js +693 -231
- package/dist/model.js.map +1 -1
- package/dist/renderToSvg.js +2 -4
- package/dist/renderToSvg.js.map +1 -1
- package/dist/rerootTree.d.ts +33 -0
- package/dist/rerootTree.js +144 -0
- package/dist/rerootTree.js.map +1 -0
- package/dist/svgTestUtil.d.ts +172 -26
- package/dist/types.d.ts +75 -12
- package/dist/useMsaSvgFigure.d.ts +2 -1
- package/dist/useMsaSvgFigure.js +11 -4
- package/dist/useMsaSvgFigure.js.map +1 -1
- package/dist/version.d.ts +1 -1
- package/dist/version.js +1 -1
- package/dist/writeNewick.d.ts +8 -0
- package/dist/writeNewick.js +34 -0
- package/dist/writeNewick.js.map +1 -0
- package/package.json +3 -3
- package/src/blockFasta.ts +18 -0
- package/src/colorSchemes.ts +20 -0
- package/src/columnCounts.ts +14 -6
- package/src/components/CopyButton.tsx +2 -2
- package/src/components/DragHandle.tsx +21 -1
- package/src/components/Loading.tsx +14 -30
- package/src/components/MSAView.tsx +16 -9
- package/src/components/MSAViewer.tsx +121 -26
- package/src/components/MetadataTable.tsx +55 -0
- package/src/components/SequenceTextArea.tsx +54 -8
- package/src/components/StatusMessage.tsx +70 -0
- package/src/components/Track.tsx +21 -4
- package/src/components/VerticalScrollbar.tsx +7 -0
- package/src/components/dialogs/ExportSVGDialog.tsx +5 -2
- package/src/components/dialogs/FeatureDialog.tsx +59 -38
- package/src/components/dialogs/MetadataDialog.tsx +9 -8
- package/src/components/header/ColorSchemeMenu.tsx +31 -12
- package/src/components/header/FileMenu.tsx +9 -0
- package/src/components/header/GappynessSlider.tsx +17 -4
- package/src/components/header/GoToBox.tsx +50 -0
- package/src/components/header/Header.tsx +11 -8
- package/src/components/header/SelectionMenu.tsx +117 -0
- package/src/components/header/goTo.ts +75 -0
- package/src/components/header/settingsMenuItems.ts +66 -0
- package/src/components/import/ImportForm.tsx +14 -7
- package/src/components/import/ImportFormExamples.tsx +20 -28
- package/src/components/minimap/Minimap.tsx +7 -0
- package/src/components/msa/AnnotationLegend.tsx +12 -6
- package/src/components/msa/MSACanvas.tsx +19 -1
- package/src/components/msa/MSACanvasBlock.tsx +9 -11
- package/src/components/msa/msaKeys.ts +45 -0
- package/src/components/msa/msaRaster.ts +1 -0
- package/src/components/msa/renderHighlights.ts +46 -4
- package/src/components/msa/tileColor.ts +9 -8
- package/src/components/msa/useMsaBlockMouse.ts +44 -31
- package/src/components/overlayColors.ts +4 -0
- package/src/components/rowpanels/RowPanelBlock.tsx +16 -23
- package/src/components/selectionDrag.ts +42 -0
- package/src/components/tracks/drawTracks.ts +15 -2
- package/src/components/tracks/useTrackHover.ts +32 -10
- package/src/components/tree/ScaleBarSVG.tsx +30 -0
- package/src/components/tree/TreeCanvas.tsx +9 -40
- package/src/components/tree/TreeCanvasBlock.tsx +19 -39
- package/src/components/tree/TreeMenu.tsx +129 -0
- package/src/components/tree/TreeRuler.tsx +7 -13
- package/src/components/tree/dialogs/TreeNodeInfoDialog.tsx +14 -16
- package/src/components/tree/renderTreeCanvas.ts +20 -8
- package/src/components/tree/renderTreeMouseover.ts +41 -0
- package/src/components/tree/useTreeHover.ts +8 -17
- package/src/components/useHoverAnchor.ts +31 -0
- package/src/constants.ts +14 -3
- package/src/element.ts +45 -5
- package/src/expandSpec.ts +3 -3
- package/src/exportFileName.ts +4 -3
- package/src/featuresLayer.ts +48 -0
- package/src/hierarchy.ts +151 -4
- package/src/index.ts +8 -1
- package/src/model/DataModel.ts +3 -3
- package/src/model/msaModel.ts +19 -1
- package/src/model/treeModel.ts +22 -0
- package/src/model.ts +841 -272
- package/src/renderToSvg.tsx +6 -9
- package/src/rerootTree.ts +172 -0
- package/src/types.ts +92 -12
- package/src/useMsaSvgFigure.ts +11 -4
- package/src/version.ts +1 -1
- package/src/writeNewick.ts +38 -0
- package/dist/components/PortalTooltip.d.ts +0 -11
- package/dist/components/PortalTooltip.js +0 -29
- package/dist/components/PortalTooltip.js.map +0 -1
- package/dist/components/header/HeaderStatusArea.js +0 -21
- package/dist/components/header/HeaderStatusArea.js.map +0 -1
- package/dist/components/tree/TreeBranchMenu.js +0 -29
- package/dist/components/tree/TreeBranchMenu.js.map +0 -1
- package/dist/components/tree/TreeNodeMenu.d.ts +0 -13
- package/dist/components/tree/TreeNodeMenu.js +0 -41
- package/dist/components/tree/TreeNodeMenu.js.map +0 -1
- package/src/components/PortalTooltip.tsx +0 -47
- package/src/components/header/HeaderStatusArea.tsx +0 -32
- package/src/components/tree/TreeBranchMenu.tsx +0 -68
- package/src/components/tree/TreeNodeMenu.tsx +0 -95
|
@@ -2,12 +2,12 @@
|
|
|
2
2
|
// only the active scheme's column table leaves the other per-column table
|
|
3
3
|
// uncomputed.
|
|
4
4
|
export function tileColorFn(model) {
|
|
5
|
-
const {
|
|
6
|
-
if (
|
|
5
|
+
const { dynamicColorSchemeName } = model;
|
|
6
|
+
if (dynamicColorSchemeName === 'clustalx_protein_dynamic') {
|
|
7
7
|
const { colClustalX } = model;
|
|
8
8
|
return (col, letter) => colClustalX[col][letter];
|
|
9
9
|
}
|
|
10
|
-
if (
|
|
10
|
+
if (dynamicColorSchemeName === 'percent_identity_dynamic') {
|
|
11
11
|
const { colConsensus } = model;
|
|
12
12
|
return (col, letter) => {
|
|
13
13
|
const consensus = colConsensus[col];
|
|
@@ -17,14 +17,15 @@ export function tileColorFn(model) {
|
|
|
17
17
|
const { colorScheme } = model;
|
|
18
18
|
return (_col, letter) => colorScheme[letter];
|
|
19
19
|
}
|
|
20
|
-
// The
|
|
21
|
-
//
|
|
20
|
+
// The table the active scheme colors from: a dynamic scheme's per-column table,
|
|
21
|
+
// or the letter table of a static scheme or a `customColorScheme` map. A cache
|
|
22
|
+
// of rendered colors keys on its identity plus the scheme name.
|
|
22
23
|
export function tileColorTable(model) {
|
|
23
|
-
const {
|
|
24
|
-
if (
|
|
24
|
+
const { dynamicColorSchemeName } = model;
|
|
25
|
+
if (dynamicColorSchemeName === 'clustalx_protein_dynamic') {
|
|
25
26
|
return model.colClustalX;
|
|
26
27
|
}
|
|
27
|
-
if (
|
|
28
|
+
if (dynamicColorSchemeName === 'percent_identity_dynamic') {
|
|
28
29
|
return model.colConsensus;
|
|
29
30
|
}
|
|
30
31
|
return model.colorScheme;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tileColor.js","sourceRoot":"","sources":["../../../src/components/msa/tileColor.ts"],"names":[],"mappings":"AAEA,8EAA8E;AAC9E,0EAA0E;AAC1E,cAAc;AACd,MAAM,UAAU,WAAW,CAAC,KAAmB;IAC7C,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"tileColor.js","sourceRoot":"","sources":["../../../src/components/msa/tileColor.ts"],"names":[],"mappings":"AAEA,8EAA8E;AAC9E,0EAA0E;AAC1E,cAAc;AACd,MAAM,UAAU,WAAW,CAAC,KAAmB;IAC7C,MAAM,EAAE,sBAAsB,EAAE,GAAG,KAAK,CAAA;IACxC,IAAI,sBAAsB,KAAK,0BAA0B,EAAE,CAAC;QAC1D,MAAM,EAAE,WAAW,EAAE,GAAG,KAAK,CAAA;QAC7B,OAAO,CAAC,GAAW,EAAE,MAAc,EAAE,EAAE,CAAC,WAAW,CAAC,GAAG,CAAE,CAAC,MAAM,CAAC,CAAA;IACnE,CAAC;IACD,IAAI,sBAAsB,KAAK,0BAA0B,EAAE,CAAC;QAC1D,MAAM,EAAE,YAAY,EAAE,GAAG,KAAK,CAAA;QAC9B,OAAO,CAAC,GAAW,EAAE,MAAc,EAAE,EAAE;YACrC,MAAM,SAAS,GAAG,YAAY,CAAC,GAAG,CAAE,CAAA;YACpC,OAAO,MAAM,KAAK,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAA;QAClE,CAAC,CAAA;IACH,CAAC;IACD,MAAM,EAAE,WAAW,EAAE,GAAG,KAAK,CAAA;IAC7B,OAAO,CAAC,IAAY,EAAE,MAAc,EAAE,EAAE,CAAC,WAAW,CAAC,MAAM,CAAC,CAAA;AAC9D,CAAC;AAED,gFAAgF;AAChF,+EAA+E;AAC/E,gEAAgE;AAChE,MAAM,UAAU,cAAc,CAAC,KAAmB;IAChD,MAAM,EAAE,sBAAsB,EAAE,GAAG,KAAK,CAAA;IACxC,IAAI,sBAAsB,KAAK,0BAA0B,EAAE,CAAC;QAC1D,OAAO,KAAK,CAAC,WAAW,CAAA;IAC1B,CAAC;IACD,IAAI,sBAAsB,KAAK,0BAA0B,EAAE,CAAC;QAC1D,OAAO,KAAK,CAAC,YAAY,CAAA;IAC3B,CAAC;IACD,OAAO,KAAK,CAAC,WAAW,CAAA;AAC1B,CAAC"}
|
|
@@ -15,11 +15,9 @@ export declare function useMsaBlockMouse({ model, offsetX, offsetY, }: {
|
|
|
15
15
|
offsetX: number;
|
|
16
16
|
offsetY: number;
|
|
17
17
|
}): {
|
|
18
|
-
|
|
19
|
-
x: number;
|
|
20
|
-
y: number;
|
|
21
|
-
} | undefined;
|
|
18
|
+
anchor: import("../useHoverAnchor.ts").HoverAnchor<true> | undefined;
|
|
22
19
|
onMouseMove: (event: React.MouseEvent, el: HTMLElement) => void;
|
|
20
|
+
onMouseDown: (event: React.MouseEvent, el: HTMLElement) => void;
|
|
23
21
|
onClick: (event: React.MouseEvent, el: HTMLElement) => void;
|
|
24
22
|
onMouseLeave: () => void;
|
|
25
23
|
};
|
|
@@ -1,11 +1,6 @@
|
|
|
1
|
-
import {
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
return {
|
|
5
|
-
col: Math.floor((event.clientX - left + offsetX) / colWidth),
|
|
6
|
-
row: Math.floor((event.clientY - top + offsetY) / rowHeight),
|
|
7
|
-
};
|
|
8
|
-
}
|
|
1
|
+
import { useRef } from 'react';
|
|
2
|
+
import { dragSelection, maxClickTravel } from '../selectionDrag.js';
|
|
3
|
+
import { useHoverAnchor } from '../useHoverAnchor.js';
|
|
9
4
|
/**
|
|
10
5
|
* Translates pointer events over one MSA block into model column/row hover and
|
|
11
6
|
* click state, and reports where a tooltip should be anchored.
|
|
@@ -17,10 +12,20 @@ function eventToColRow({ event, el, offsetX, offsetY, colWidth, rowHeight, }) {
|
|
|
17
12
|
* and position.
|
|
18
13
|
*/
|
|
19
14
|
export function useMsaBlockMouse({ model, offsetX, offsetY, }) {
|
|
20
|
-
const
|
|
15
|
+
const { anchor, hoverAt, clearAnchor } = useHoverAnchor();
|
|
16
|
+
const downAt = useRef(undefined);
|
|
17
|
+
// The block's rect places its cells on the page. A drag keeps the mapping
|
|
18
|
+
// it started with, so each point subtracts the scroll since then.
|
|
19
|
+
function cellMapper(el) {
|
|
20
|
+
const { left, top } = el.getBoundingClientRect();
|
|
21
|
+
const { scrollX, scrollY } = model;
|
|
22
|
+
return ({ clientX, clientY }) => ({
|
|
23
|
+
col: Math.floor((clientX - left + offsetX - (model.scrollX - scrollX)) / model.colWidth),
|
|
24
|
+
row: Math.floor((clientY - top + offsetY - (model.scrollY - scrollY)) / model.rowHeight),
|
|
25
|
+
});
|
|
26
|
+
}
|
|
21
27
|
function colRow(event, el) {
|
|
22
|
-
|
|
23
|
-
return eventToColRow({ event, el, offsetX, offsetY, colWidth, rowHeight });
|
|
28
|
+
return cellMapper(el)(event);
|
|
24
29
|
}
|
|
25
30
|
// a block can extend past the alignment (the last block is a full tile wide,
|
|
26
31
|
// and the panel is taller than the rows when there are few of them), so a
|
|
@@ -33,9 +38,24 @@ export function useMsaBlockMouse({ model, offsetX, offsetY, }) {
|
|
|
33
38
|
const hit = inBounds(pos);
|
|
34
39
|
model.setMousePos(hit ? pos.col : undefined, hit ? pos.row : undefined);
|
|
35
40
|
const hasTooltip = !!model.hoveredInsertion || model.mouseOverDomains.length > 0;
|
|
36
|
-
|
|
41
|
+
hoverAt(event, hasTooltip || undefined);
|
|
42
|
+
}
|
|
43
|
+
// shift+drag selects a block; MSACanvas leaves a shifted press out of its
|
|
44
|
+
// pan
|
|
45
|
+
function onMouseDown(event, el) {
|
|
46
|
+
downAt.current = { x: event.clientX, y: event.clientY };
|
|
47
|
+
if (event.shiftKey && event.button === 0) {
|
|
48
|
+
dragSelection(model, event, cellMapper(el));
|
|
49
|
+
}
|
|
37
50
|
}
|
|
38
51
|
function onClick(event, el) {
|
|
52
|
+
const down = downAt.current;
|
|
53
|
+
downAt.current = undefined;
|
|
54
|
+
if (down &&
|
|
55
|
+
Math.hypot(event.clientX - down.x, event.clientY - down.y) >
|
|
56
|
+
maxClickTravel) {
|
|
57
|
+
return;
|
|
58
|
+
}
|
|
39
59
|
const pos = colRow(event, el);
|
|
40
60
|
const { col, row } = pos;
|
|
41
61
|
const { mouseClickCol, mouseClickRow } = model;
|
|
@@ -47,8 +67,8 @@ export function useMsaBlockMouse({ model, offsetX, offsetY, }) {
|
|
|
47
67
|
}
|
|
48
68
|
function onMouseLeave() {
|
|
49
69
|
model.setMousePos();
|
|
50
|
-
|
|
70
|
+
clearAnchor();
|
|
51
71
|
}
|
|
52
|
-
return {
|
|
72
|
+
return { anchor, onMouseMove, onMouseDown, onClick, onMouseLeave };
|
|
53
73
|
}
|
|
54
74
|
//# sourceMappingURL=useMsaBlockMouse.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useMsaBlockMouse.js","sourceRoot":"","sources":["../../../src/components/msa/useMsaBlockMouse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"useMsaBlockMouse.js","sourceRoot":"","sources":["../../../src/components/msa/useMsaBlockMouse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,OAAO,CAAA;AAE9B,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAMrD;;;;;;;;;GASG;AACH,MAAM,UAAU,gBAAgB,CAAC,EAC/B,KAAK,EACL,OAAO,EACP,OAAO,GAKR;IACC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,cAAc,EAAQ,CAAA;IAC/D,MAAM,MAAM,GAAG,MAAM,CAA2B,SAAS,CAAC,CAAA;IAE1D,0EAA0E;IAC1E,kEAAkE;IAClE,SAAS,UAAU,CAAC,EAAe;QACjC,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,qBAAqB,EAAE,CAAA;QAChD,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,KAAK,CAAA;QAClC,OAAO,CAAC,EAAE,OAAO,EAAE,OAAO,EAAe,EAAE,EAAE,CAAC,CAAC;YAC7C,GAAG,EAAE,IAAI,CAAC,KAAK,CACb,CAAC,OAAO,GAAG,IAAI,GAAG,OAAO,GAAG,CAAC,KAAK,CAAC,OAAO,GAAG,OAAO,CAAC,CAAC,GAAG,KAAK,CAAC,QAAQ,CACxE;YACD,GAAG,EAAE,IAAI,CAAC,KAAK,CACb,CAAC,OAAO,GAAG,GAAG,GAAG,OAAO,GAAG,CAAC,KAAK,CAAC,OAAO,GAAG,OAAO,CAAC,CAAC,GAAG,KAAK,CAAC,SAAS,CACxE;SACF,CAAC,CAAA;IACJ,CAAC;IAED,SAAS,MAAM,CAAC,KAAuB,EAAE,EAAe;QACtD,OAAO,UAAU,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAA;IAC9B,CAAC;IAED,6EAA6E;IAC7E,0EAA0E;IAC1E,0DAA0D;IAC1D,SAAS,QAAQ,CAAC,EAAE,GAAG,EAAE,GAAG,EAAgC;QAC1D,OAAO,GAAG,IAAI,CAAC,IAAI,GAAG,GAAG,KAAK,CAAC,UAAU,IAAI,GAAG,IAAI,CAAC,IAAI,GAAG,GAAG,KAAK,CAAC,OAAO,CAAA;IAC9E,CAAC;IAED,SAAS,WAAW,CAAC,KAAuB,EAAE,EAAe;QAC3D,MAAM,GAAG,GAAG,MAAM,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;QAC7B,MAAM,GAAG,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAA;QACzB,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;QAEvE,MAAM,UAAU,GACd,CAAC,CAAC,KAAK,CAAC,gBAAgB,IAAI,KAAK,CAAC,gBAAgB,CAAC,MAAM,GAAG,CAAC,CAAA;QAC/D,OAAO,CAAC,KAAK,EAAE,UAAU,IAAI,SAAS,CAAC,CAAA;IACzC,CAAC;IAED,0EAA0E;IAC1E,MAAM;IACN,SAAS,WAAW,CAAC,KAAuB,EAAE,EAAe;QAC3D,MAAM,CAAC,OAAO,GAAG,EAAE,CAAC,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,EAAE,KAAK,CAAC,OAAO,EAAE,CAAA;QACvD,IAAI,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACzC,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,UAAU,CAAC,EAAE,CAAC,CAAC,CAAA;QAC7C,CAAC;IACH,CAAC;IAED,SAAS,OAAO,CAAC,KAAuB,EAAE,EAAe;QACvD,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,CAAA;QAC3B,MAAM,CAAC,OAAO,GAAG,SAAS,CAAA;QAC1B,IACE,IAAI;YACJ,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC,EAAE,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC;gBACxD,cAAc,EAChB,CAAC;YACD,OAAM;QACR,CAAC;QACD,MAAM,GAAG,GAAG,MAAM,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;QAC7B,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,GAAG,CAAA;QACxB,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,GAAG,KAAK,CAAA;QAC9C,wEAAwE;QACxE,0EAA0E;QAC1E,MAAM,IAAI,GAAG,GAAG,KAAK,aAAa,IAAI,GAAG,KAAK,aAAa,CAAA;QAC3D,MAAM,IAAI,GAAG,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAA;QACnC,KAAK,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;IACxE,CAAC;IAED,SAAS,YAAY;QACnB,KAAK,CAAC,WAAW,EAAE,CAAA;QACnB,WAAW,EAAE,CAAA;IACf,CAAC;IAED,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,OAAO,EAAE,YAAY,EAAE,CAAA;AACpE,CAAC"}
|
|
@@ -3,3 +3,5 @@ export declare const treeHoverColor = "rgba(255,165,0,0.2)";
|
|
|
3
3
|
export declare const multiRowHoverColor = "rgba(255,165,0,0.15)";
|
|
4
4
|
export declare const hoverColor = "rgba(0,0,0,0.15)";
|
|
5
5
|
export declare const clickColor = "rgba(128,128,0,0.2)";
|
|
6
|
+
export declare const selectionFill = "rgba(25,118,210,0.22)";
|
|
7
|
+
export declare const selectionBorder = "rgba(25,118,210,0.95)";
|
|
@@ -13,4 +13,7 @@ export const multiRowHoverColor = 'rgba(255,165,0,0.15)';
|
|
|
13
13
|
// match or the crosshair appears to change color as it crosses the tracks.
|
|
14
14
|
export const hoverColor = 'rgba(0,0,0,0.15)';
|
|
15
15
|
export const clickColor = 'rgba(128,128,0,0.2)';
|
|
16
|
+
// the selected block, a blue that reads apart from the orange highlights
|
|
17
|
+
export const selectionFill = 'rgba(25,118,210,0.22)';
|
|
18
|
+
export const selectionBorder = 'rgba(25,118,210,0.95)';
|
|
16
19
|
//# sourceMappingURL=overlayColors.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"overlayColors.js","sourceRoot":"","sources":["../../src/components/overlayColors.ts"],"names":[],"mappings":"AAAA,iFAAiF;AACjF,gFAAgF;AAChF,gEAAgE;AAEhE,yEAAyE;AACzE,MAAM,CAAC,MAAM,cAAc,GAAG,qBAAqB,CAAA;AAEnD,+EAA+E;AAC/E,8EAA8E;AAC9E,gFAAgF;AAChF,MAAM,CAAC,MAAM,cAAc,GAAG,qBAAqB,CAAA;AACnD,MAAM,CAAC,MAAM,kBAAkB,GAAG,sBAAsB,CAAA;AAExD,gFAAgF;AAChF,4EAA4E;AAC5E,2EAA2E;AAC3E,MAAM,CAAC,MAAM,UAAU,GAAG,kBAAkB,CAAA;AAC5C,MAAM,CAAC,MAAM,UAAU,GAAG,qBAAqB,CAAA"}
|
|
1
|
+
{"version":3,"file":"overlayColors.js","sourceRoot":"","sources":["../../src/components/overlayColors.ts"],"names":[],"mappings":"AAAA,iFAAiF;AACjF,gFAAgF;AAChF,gEAAgE;AAEhE,yEAAyE;AACzE,MAAM,CAAC,MAAM,cAAc,GAAG,qBAAqB,CAAA;AAEnD,+EAA+E;AAC/E,8EAA8E;AAC9E,gFAAgF;AAChF,MAAM,CAAC,MAAM,cAAc,GAAG,qBAAqB,CAAA;AACnD,MAAM,CAAC,MAAM,kBAAkB,GAAG,sBAAsB,CAAA;AAExD,gFAAgF;AAChF,4EAA4E;AAC5E,2EAA2E;AAC3E,MAAM,CAAC,MAAM,UAAU,GAAG,kBAAkB,CAAA;AAC5C,MAAM,CAAC,MAAM,UAAU,GAAG,qBAAqB,CAAA;AAE/C,yEAAyE;AACzE,MAAM,CAAC,MAAM,aAAa,GAAG,uBAAuB,CAAA;AACpD,MAAM,CAAC,MAAM,eAAe,GAAG,uBAAuB,CAAA"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
|
-
import React
|
|
1
|
+
import React from 'react';
|
|
2
|
+
import BaseTooltip from '@jbrowse/core/ui/BaseTooltip';
|
|
2
3
|
import { useTheme } from '@mui/material';
|
|
3
4
|
import { observer } from 'mobx-react';
|
|
4
5
|
import { featureField, featureName } from '../../featureFields.js';
|
|
5
6
|
import { useCanvasAutorun } from '../../useCanvasAutorun.js';
|
|
6
|
-
import
|
|
7
|
+
import { useHoverAnchor } from '../useHoverAnchor.js';
|
|
7
8
|
import { renderRowPanel } from './renderRowPanel.js';
|
|
8
9
|
// what the cell or span under the pointer reads, which is the field a strip
|
|
9
10
|
// colors by, and a span's name, its coordinates and its encoded field
|
|
@@ -33,7 +34,7 @@ function hoverLines({ model, panel, name, x, }) {
|
|
|
33
34
|
];
|
|
34
35
|
}
|
|
35
36
|
const RowPanelBlock = observer(function ({ model, panel, offsetY, }) {
|
|
36
|
-
const
|
|
37
|
+
const { anchor, hoverAt, clearAnchor } = useHoverAnchor();
|
|
37
38
|
const theme = useTheme();
|
|
38
39
|
const { blockSize, highResScaleFactor, rowHeight } = model;
|
|
39
40
|
const width = panel.width;
|
|
@@ -65,22 +66,17 @@ const RowPanelBlock = observer(function ({ model, panel, offsetY, }) {
|
|
|
65
66
|
name,
|
|
66
67
|
x: event.clientX - left,
|
|
67
68
|
});
|
|
68
|
-
|
|
69
|
+
hoverAt(event, name === undefined || lines.length === 0
|
|
69
70
|
? undefined
|
|
70
|
-
: {
|
|
71
|
-
name,
|
|
72
|
-
lines,
|
|
73
|
-
clientX: event.clientX,
|
|
74
|
-
clientY: event.clientY,
|
|
75
|
-
});
|
|
71
|
+
: { name, lines });
|
|
76
72
|
model.setMousePos(undefined, name === undefined ? undefined : row);
|
|
77
73
|
}, onMouseLeave: () => {
|
|
78
|
-
|
|
74
|
+
clearAnchor();
|
|
79
75
|
model.setMousePos(undefined, undefined);
|
|
80
76
|
} }),
|
|
81
|
-
|
|
82
|
-
React.createElement("div", null,
|
|
83
|
-
|
|
77
|
+
anchor ? (React.createElement(BaseTooltip, { clientPoint: anchor.clientPoint },
|
|
78
|
+
React.createElement("div", null, anchor.value.name),
|
|
79
|
+
anchor.value.lines.map(line => (React.createElement("div", { key: line }, line))))) : null));
|
|
84
80
|
});
|
|
85
81
|
export default RowPanelBlock;
|
|
86
82
|
//# sourceMappingURL=RowPanelBlock.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RowPanelBlock.js","sourceRoot":"","sources":["../../../src/components/rowpanels/RowPanelBlock.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"RowPanelBlock.js","sourceRoot":"","sources":["../../../src/components/rowpanels/RowPanelBlock.tsx"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import type { MsaViewModel } from '../model.ts';
|
|
2
|
+
export declare const maxClickTravel = 3;
|
|
3
|
+
export interface ClientPoint {
|
|
4
|
+
clientX: number;
|
|
5
|
+
clientY: number;
|
|
6
|
+
}
|
|
7
|
+
/**
|
|
8
|
+
* Follows a press through the window until its release, selecting the block
|
|
9
|
+
* between the cell it started on and the cell under the pointer. The selection
|
|
10
|
+
* starts once the pointer travels past `maxClickTravel`, so a press that stays
|
|
11
|
+
* put reaches the click handlers unchanged. `cellAt` maps a client point to a
|
|
12
|
+
* visible column and row index, or a column alone to select across every row.
|
|
13
|
+
*/
|
|
14
|
+
export declare function dragSelection(model: MsaViewModel, start: ClientPoint, cellAt: (point: ClientPoint) => {
|
|
15
|
+
col: number;
|
|
16
|
+
row?: number;
|
|
17
|
+
}): void;
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
import { isAlive } from '@jbrowse/mobx-state-tree';
|
|
2
|
+
// a press that travels further than this, in px, is a drag and not a click
|
|
3
|
+
export const maxClickTravel = 3;
|
|
4
|
+
/**
|
|
5
|
+
* Follows a press through the window until its release, selecting the block
|
|
6
|
+
* between the cell it started on and the cell under the pointer. The selection
|
|
7
|
+
* starts once the pointer travels past `maxClickTravel`, so a press that stays
|
|
8
|
+
* put reaches the click handlers unchanged. `cellAt` maps a client point to a
|
|
9
|
+
* visible column and row index, or a column alone to select across every row.
|
|
10
|
+
*/
|
|
11
|
+
export function dragSelection(model, start, cellAt) {
|
|
12
|
+
const anchor = cellAt(start);
|
|
13
|
+
const { clientX, clientY } = start;
|
|
14
|
+
let dragging = false;
|
|
15
|
+
function onMove(event) {
|
|
16
|
+
dragging ||=
|
|
17
|
+
Math.hypot(event.clientX - clientX, event.clientY - clientY) >
|
|
18
|
+
maxClickTravel;
|
|
19
|
+
if (dragging && isAlive(model)) {
|
|
20
|
+
model.selectBlock(anchor, cellAt(event));
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
function onUp() {
|
|
24
|
+
window.removeEventListener('mousemove', onMove);
|
|
25
|
+
window.removeEventListener('mouseup', onUp);
|
|
26
|
+
}
|
|
27
|
+
window.addEventListener('mousemove', onMove);
|
|
28
|
+
window.addEventListener('mouseup', onUp);
|
|
29
|
+
}
|
|
30
|
+
//# sourceMappingURL=selectionDrag.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"selectionDrag.js","sourceRoot":"","sources":["../../src/components/selectionDrag.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAA;AAIlD,2EAA2E;AAC3E,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,CAAA;AAO/B;;;;;;GAMG;AACH,MAAM,UAAU,aAAa,CAC3B,KAAmB,EACnB,KAAkB,EAClB,MAA6D;IAE7D,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAAA;IAC5B,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,KAAK,CAAA;IAClC,IAAI,QAAQ,GAAG,KAAK,CAAA;IACpB,SAAS,MAAM,CAAC,KAAiB;QAC/B,QAAQ;YACN,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,GAAG,OAAO,EAAE,KAAK,CAAC,OAAO,GAAG,OAAO,CAAC;gBAC5D,cAAc,CAAA;QAChB,IAAI,QAAQ,IAAI,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YAC/B,KAAK,CAAC,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAA;QAC1C,CAAC;IACH,CAAC;IACD,SAAS,IAAI;QACX,MAAM,CAAC,mBAAmB,CAAC,WAAW,EAAE,MAAM,CAAC,CAAA;QAC/C,MAAM,CAAC,mBAAmB,CAAC,SAAS,EAAE,IAAI,CAAC,CAAA;IAC7C,CAAC;IACD,MAAM,CAAC,gBAAgB,CAAC,WAAW,EAAE,MAAM,CAAC,CAAA;IAC5C,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,IAAI,CAAC,CAAA;AAC1C,CAAC"}
|
|
@@ -35,6 +35,7 @@ export declare function drawTextTrackContent({ ctx, data, colorScheme, contrastT
|
|
|
35
35
|
blockSize: number;
|
|
36
36
|
}): void;
|
|
37
37
|
export declare function rulerStep(colWidth: number, minPixels?: number): number;
|
|
38
|
+
export declare function rulerCols(xStart: number, end: number, colWidth: number): number[];
|
|
38
39
|
export declare function drawColumnRuler({ ctx, numColumns, label, textColor, colWidth, trackHeight, offsetX, blockSize, }: {
|
|
39
40
|
ctx: RenderCtx;
|
|
40
41
|
numColumns: number;
|
|
@@ -91,6 +91,19 @@ export function rulerStep(colWidth, minPixels = 55) {
|
|
|
91
91
|
}
|
|
92
92
|
return step;
|
|
93
93
|
}
|
|
94
|
+
// The 0-based columns in [xStart, end) to label: column 1, then each column
|
|
95
|
+
// whose 1-based number is a multiple of the step. A step of 2 or more puts the
|
|
96
|
+
// first multiple at least half a step's width past column 1, which clears the
|
|
97
|
+
// two labels.
|
|
98
|
+
export function rulerCols(xStart, end, colWidth) {
|
|
99
|
+
const step = rulerStep(colWidth);
|
|
100
|
+
const cols = step > 1 && xStart <= 0 && end > 0 ? [0] : [];
|
|
101
|
+
const first = Math.max(1, Math.ceil((xStart + 1) / step)) * step;
|
|
102
|
+
for (let n = first; n <= end; n += step) {
|
|
103
|
+
cols.push(n - 1);
|
|
104
|
+
}
|
|
105
|
+
return cols;
|
|
106
|
+
}
|
|
94
107
|
const RULER_FONT_SIZE = 10;
|
|
95
108
|
const TICK_HEIGHT = 4;
|
|
96
109
|
export function drawColumnRuler({ ctx, numColumns, label, textColor, colWidth, trackHeight, offsetX, blockSize, }) {
|
|
@@ -99,7 +112,6 @@ export function drawColumnRuler({ ctx, numColumns, label, textColor, colWidth, t
|
|
|
99
112
|
blockWidth: blockSize,
|
|
100
113
|
colWidth,
|
|
101
114
|
});
|
|
102
|
-
const step = rulerStep(colWidth);
|
|
103
115
|
const end = Math.min(xEnd, numColumns);
|
|
104
116
|
setFontSize(ctx, RULER_FONT_SIZE);
|
|
105
117
|
ctx.textAlign = 'center';
|
|
@@ -107,7 +119,7 @@ export function drawColumnRuler({ ctx, numColumns, label, textColor, colWidth, t
|
|
|
107
119
|
ctx.fillStyle = textColor;
|
|
108
120
|
ctx.strokeStyle = textColor;
|
|
109
121
|
ctx.lineWidth = 1;
|
|
110
|
-
for (
|
|
122
|
+
for (const col of rulerCols(xStart, end, colWidth)) {
|
|
111
123
|
const text = label(col);
|
|
112
124
|
if (text === undefined) {
|
|
113
125
|
continue;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"drawTracks.js","sourceRoot":"","sources":["../../../src/components/tracks/drawTracks.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"drawTracks.js","sourceRoot":"","sources":["../../../src/components/tracks/drawTracks.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,8 @@ import type React from 'react';
|
|
|
3
3
|
/**
|
|
4
4
|
* Translates pointer events over a track's row into the hovered column and a
|
|
5
5
|
* tooltip anchor. The track shares the alignment's columns, so hovering it sets
|
|
6
|
-
* the model's mouse column too and the alignment's hover band follows along.
|
|
6
|
+
* the model's mouse column too and the alignment's hover band follows along. A
|
|
7
|
+
* drag along the row selects the columns it covers across every row.
|
|
7
8
|
*
|
|
8
9
|
* `tooltip` off skips the anchor, so a track whose tooltip is turned off still
|
|
9
10
|
* drives the hover band without re-rendering on every mouse move.
|
|
@@ -12,11 +13,8 @@ export declare function useTrackHover({ model, tooltip, }: {
|
|
|
12
13
|
model: MsaViewModel;
|
|
13
14
|
tooltip: boolean;
|
|
14
15
|
}): {
|
|
15
|
-
|
|
16
|
-
col: number;
|
|
17
|
-
x: number;
|
|
18
|
-
y: number;
|
|
19
|
-
} | undefined;
|
|
16
|
+
anchor: import("../useHoverAnchor.ts").HoverAnchor<number> | undefined;
|
|
20
17
|
onMouseMove: (event: React.MouseEvent, el: HTMLElement) => void;
|
|
18
|
+
onMouseDown: (event: React.MouseEvent, el: HTMLElement) => void;
|
|
21
19
|
onMouseLeave: () => void;
|
|
22
20
|
};
|
|
@@ -1,30 +1,50 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { dragSelection } from '../selectionDrag.js';
|
|
2
|
+
import { useHoverAnchor } from '../useHoverAnchor.js';
|
|
2
3
|
/**
|
|
3
4
|
* Translates pointer events over a track's row into the hovered column and a
|
|
4
5
|
* tooltip anchor. The track shares the alignment's columns, so hovering it sets
|
|
5
|
-
* the model's mouse column too and the alignment's hover band follows along.
|
|
6
|
+
* the model's mouse column too and the alignment's hover band follows along. A
|
|
7
|
+
* drag along the row selects the columns it covers across every row.
|
|
6
8
|
*
|
|
7
9
|
* `tooltip` off skips the anchor, so a track whose tooltip is turned off still
|
|
8
10
|
* drives the hover band without re-rendering on every mouse move.
|
|
9
11
|
*/
|
|
10
12
|
export function useTrackHover({ model, tooltip, }) {
|
|
11
|
-
const
|
|
13
|
+
const { anchor, hoverAt, clearAnchor } = useHoverAnchor();
|
|
12
14
|
// the blocks are laid out in column space and scrolled by a transform on
|
|
13
15
|
// their container, so the pointer's column comes off the untransformed row
|
|
16
|
+
function colAt(clientX, left) {
|
|
17
|
+
return Math.floor((clientX - left - model.scrollX) / model.colWidth);
|
|
18
|
+
}
|
|
14
19
|
function onMouseMove(event, el) {
|
|
15
|
-
const
|
|
16
|
-
const
|
|
17
|
-
const col = Math.floor((event.clientX - left - scrollX) / colWidth);
|
|
18
|
-
const hit = col >= 0 && col < numColumns;
|
|
20
|
+
const col = colAt(event.clientX, el.getBoundingClientRect().left);
|
|
21
|
+
const hit = col >= 0 && col < model.numColumns;
|
|
19
22
|
model.setMousePos(hit ? col : undefined, undefined);
|
|
20
23
|
if (tooltip) {
|
|
21
|
-
|
|
24
|
+
hoverAt(event, hit ? col : undefined);
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
// a press on a track's canvas, which leaves out the resize divider under it.
|
|
28
|
+
// The row takes the focus, so Escape reaches onMsaKey from there too
|
|
29
|
+
function onMouseDown(event, el) {
|
|
30
|
+
if (event.button === 0 && event.target instanceof HTMLCanvasElement) {
|
|
31
|
+
event.preventDefault();
|
|
32
|
+
el.focus({ preventScroll: true });
|
|
33
|
+
const { left } = el.getBoundingClientRect();
|
|
34
|
+
dragSelection(model, event, ({ clientX }) => ({
|
|
35
|
+
col: colAt(clientX, left),
|
|
36
|
+
}));
|
|
22
37
|
}
|
|
23
38
|
}
|
|
24
39
|
function onMouseLeave() {
|
|
25
|
-
|
|
40
|
+
clearAnchor();
|
|
26
41
|
model.setMousePos(undefined, undefined);
|
|
27
42
|
}
|
|
28
|
-
return {
|
|
43
|
+
return {
|
|
44
|
+
anchor: tooltip ? anchor : undefined,
|
|
45
|
+
onMouseMove,
|
|
46
|
+
onMouseDown,
|
|
47
|
+
onMouseLeave,
|
|
48
|
+
};
|
|
29
49
|
}
|
|
30
50
|
//# sourceMappingURL=useTrackHover.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useTrackHover.js","sourceRoot":"","sources":["../../../src/components/tracks/useTrackHover.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"useTrackHover.js","sourceRoot":"","sources":["../../../src/components/tracks/useTrackHover.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAKrD;;;;;;;;GAQG;AACH,MAAM,UAAU,aAAa,CAAC,EAC5B,KAAK,EACL,OAAO,GAIR;IACC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,cAAc,EAAU,CAAA;IAEjE,yEAAyE;IACzE,2EAA2E;IAC3E,SAAS,KAAK,CAAC,OAAe,EAAE,IAAY;QAC1C,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,GAAG,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAA;IACtE,CAAC;IAED,SAAS,WAAW,CAAC,KAAuB,EAAE,EAAe;QAC3D,MAAM,GAAG,GAAG,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC,qBAAqB,EAAE,CAAC,IAAI,CAAC,CAAA;QACjE,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,IAAI,GAAG,GAAG,KAAK,CAAC,UAAU,CAAA;QAC9C,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,EAAE,SAAS,CAAC,CAAA;QACnD,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;QACvC,CAAC;IACH,CAAC;IAED,6EAA6E;IAC7E,qEAAqE;IACrE,SAAS,WAAW,CAAC,KAAuB,EAAE,EAAe;QAC3D,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,YAAY,iBAAiB,EAAE,CAAC;YACpE,KAAK,CAAC,cAAc,EAAE,CAAA;YACtB,EAAE,CAAC,KAAK,CAAC,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAA;YACjC,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,qBAAqB,EAAE,CAAA;YAC3C,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC;gBAC5C,GAAG,EAAE,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC;aAC1B,CAAC,CAAC,CAAA;QACL,CAAC;IACH,CAAC;IAED,SAAS,YAAY;QACnB,WAAW,EAAE,CAAA;QACb,KAAK,CAAC,WAAW,CAAC,SAAS,EAAE,SAAS,CAAC,CAAA;IACzC,CAAC;IAED,OAAO;QACL,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS;QACpC,WAAW;QACX,WAAW;QACX,YAAY;KACb,CAAA;AACH,CAAC"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import React from 'react';
|
|
2
|
+
/**
|
|
3
|
+
* The branch-length scale bar: its label over a bracket `bar.px` wide, both
|
|
4
|
+
* resting on `y`.
|
|
5
|
+
*/
|
|
6
|
+
export default function ScaleBarSVG({ bar, marginLeft, y, color, }: {
|
|
7
|
+
bar: {
|
|
8
|
+
label: string;
|
|
9
|
+
px: number;
|
|
10
|
+
};
|
|
11
|
+
marginLeft: number;
|
|
12
|
+
y: number;
|
|
13
|
+
color: string;
|
|
14
|
+
}): React.JSX.Element;
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import React from 'react';
|
|
2
|
+
/**
|
|
3
|
+
* The branch-length scale bar: its label over a bracket `bar.px` wide, both
|
|
4
|
+
* resting on `y`.
|
|
5
|
+
*/
|
|
6
|
+
export default function ScaleBarSVG({ bar, marginLeft, y, color, }) {
|
|
7
|
+
return (React.createElement(React.Fragment, null,
|
|
8
|
+
React.createElement("text", { x: marginLeft, y: y - 9, fontSize: 10, fill: color }, bar.label),
|
|
9
|
+
React.createElement("path", { d: `M${marginLeft} ${y - 7} v6 h${bar.px} v-6`, fill: "none", stroke: color })));
|
|
10
|
+
}
|
|
11
|
+
//# sourceMappingURL=ScaleBarSVG.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ScaleBarSVG.js","sourceRoot":"","sources":["../../../src/components/tree/ScaleBarSVG.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB;;;GAGG;AACH,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,EAClC,GAAG,EACH,UAAU,EACV,CAAC,EACD,KAAK,GAMN;IACC,OAAO,CACL;QACE,8BAAM,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,IACrD,GAAG,CAAC,KAAK,CACL;QACP,8BACE,CAAC,EAAE,IAAI,UAAU,IAAI,CAAC,GAAG,CAAC,QAAQ,GAAG,CAAC,EAAE,MAAM,EAC9C,IAAI,EAAC,MAAM,EACX,MAAM,EAAE,KAAK,GACb,CACD,CACJ,CAAA;AACH,CAAC"}
|
|
@@ -3,44 +3,26 @@ import { isAlive } from '@jbrowse/mobx-state-tree';
|
|
|
3
3
|
import { observer } from 'mobx-react';
|
|
4
4
|
import { useCanvasAutorun } from '../../useCanvasAutorun.js';
|
|
5
5
|
import { useWheelScroll } from '../../useWheelScroll.js';
|
|
6
|
-
import { referenceColor, treeHoverColor } from '../overlayColors.js';
|
|
7
6
|
import CladeLabels from './CladeLabels.js';
|
|
8
7
|
import TreeCanvasBlock from './TreeCanvasBlock.js';
|
|
8
|
+
import { renderTreeMouseover } from './renderTreeMouseover.js';
|
|
9
9
|
const TreeCanvas = observer(function ({ model }) {
|
|
10
10
|
const ref = useRef(null);
|
|
11
|
-
const { height, blocksY, treeAreaWidth, scrollY } = model;
|
|
11
|
+
const { height, blocksY, treeAreaWidth, scrollY, highResScaleFactor } = model;
|
|
12
12
|
const onScrollY = useCallback((d) => {
|
|
13
13
|
model.doScrollY(d);
|
|
14
14
|
}, [model]);
|
|
15
15
|
const { onMouseDown, onMouseUp } = useWheelScroll({ ref, onScrollY });
|
|
16
|
+
const canvasWidth = treeAreaWidth * highResScaleFactor;
|
|
17
|
+
const canvasHeight = height * highResScaleFactor;
|
|
16
18
|
const mouseoverRef = useCanvasAutorun({
|
|
17
19
|
draw: ctx => {
|
|
18
20
|
if (isAlive(model)) {
|
|
19
|
-
|
|
20
|
-
ctx.resetTransform();
|
|
21
|
-
ctx.clearRect(0, 0, w, h);
|
|
22
|
-
// rows are laid out at a fixed pitch, so a row index is all that is
|
|
23
|
-
// needed to place its band (leaf.x is rowHeight*(index+0.5))
|
|
24
|
-
const fillRow = (index) => {
|
|
25
|
-
ctx.fillRect(0, index * rowHeight + sy, w, rowHeight);
|
|
26
|
-
};
|
|
27
|
-
if (referenceRowIndex !== undefined) {
|
|
28
|
-
ctx.fillStyle = referenceColor;
|
|
29
|
-
fillRow(referenceRowIndex);
|
|
30
|
-
}
|
|
31
|
-
ctx.fillStyle = treeHoverColor;
|
|
32
|
-
for (const index of hoveredRowIndices) {
|
|
33
|
-
fillRow(index);
|
|
34
|
-
}
|
|
35
|
-
if (mouseRow !== undefined &&
|
|
36
|
-
mouseRow !== referenceRowIndex &&
|
|
37
|
-
!hoveredRowIndices.includes(mouseRow)) {
|
|
38
|
-
fillRow(mouseRow);
|
|
39
|
-
}
|
|
21
|
+
renderTreeMouseover({ ctx, model });
|
|
40
22
|
}
|
|
41
23
|
},
|
|
42
|
-
width:
|
|
43
|
-
height,
|
|
24
|
+
width: canvasWidth,
|
|
25
|
+
height: canvasHeight,
|
|
44
26
|
deps: [model],
|
|
45
27
|
});
|
|
46
28
|
return (React.createElement("div", { ref: ref, onMouseDown: onMouseDown, onMouseUp: onMouseUp, style: {
|
|
@@ -57,7 +39,7 @@ const TreeCanvas = observer(function ({ model }) {
|
|
|
57
39
|
} },
|
|
58
40
|
blocksY.map(block => (React.createElement(TreeCanvasBlock, { key: block, model: model, offsetY: block }))),
|
|
59
41
|
React.createElement(CladeLabels, { model: model })),
|
|
60
|
-
React.createElement("canvas", { ref: mouseoverRef, width:
|
|
42
|
+
React.createElement("canvas", { ref: mouseoverRef, width: canvasWidth, height: canvasHeight, style: {
|
|
61
43
|
position: 'absolute',
|
|
62
44
|
top: 0,
|
|
63
45
|
left: 0,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TreeCanvas.js","sourceRoot":"","sources":["../../../src/components/tree/TreeCanvas.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,OAAO,CAAA;AAElD,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAA;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAErC,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAA;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAA;AACxD,OAAO,
|
|
1
|
+
{"version":3,"file":"TreeCanvas.js","sourceRoot":"","sources":["../../../src/components/tree/TreeCanvas.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,OAAO,CAAA;AAElD,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAA;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAErC,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAA;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAA;AACxD,OAAO,WAAW,MAAM,kBAAmB,CAAA;AAC3C,OAAO,eAAe,MAAM,sBAAuB,CAAA;AACnD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAI9D,MAAM,UAAU,GAAG,QAAQ,CAAC,UAAU,EAAE,KAAK,EAA2B;IACtE,MAAM,GAAG,GAAG,MAAM,CAAiB,IAAI,CAAC,CAAA;IACxC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,kBAAkB,EAAE,GAAG,KAAK,CAAA;IAC7E,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,EAAE,WAAW,EAAE,SAAS,EAAE,GAAG,cAAc,CAAC,EAAE,GAAG,EAAE,SAAS,EAAE,CAAC,CAAA;IAErE,MAAM,WAAW,GAAG,aAAa,GAAG,kBAAkB,CAAA;IACtD,MAAM,YAAY,GAAG,MAAM,GAAG,kBAAkB,CAAA;IAChD,MAAM,YAAY,GAAG,gBAAgB,CAAC;QACpC,IAAI,EAAE,GAAG,CAAC,EAAE;YACV,IAAI,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;gBACnB,mBAAmB,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAA;YACrC,CAAC;QACH,CAAC;QACD,KAAK,EAAE,WAAW;QAClB,MAAM,EAAE,YAAY;QACpB,IAAI,EAAE,CAAC,KAAK,CAAC;KACd,CAAC,CAAA;IAEF,OAAO,CACL,6BACE,GAAG,EAAE,GAAG,EACR,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,SAAS,EACpB,KAAK,EAAE;YACL,MAAM;YACN,QAAQ,EAAE,UAAU;YACpB,KAAK,EAAE,aAAa;SACrB;QAID,6BACE,KAAK,EAAE;gBACL,QAAQ,EAAE,UAAU;gBACpB,GAAG,EAAE,CAAC;gBACN,IAAI,EAAE,CAAC;gBACP,SAAS,EAAE,cAAc,OAAO,KAAK;gBACrC,UAAU,EAAE,WAAW;aACxB;YAEA,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CACpB,oBAAC,eAAe,IAAC,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,GAAI,CAC9D,CAAC;YACF,oBAAC,WAAW,IAAC,KAAK,EAAE,KAAK,GAAI,CACzB;QACN,gCACE,GAAG,EAAE,YAAY,EACjB,KAAK,EAAE,WAAW,EAClB,MAAM,EAAE,YAAY,EACpB,KAAK,EAAE;gBACL,QAAQ,EAAE,UAAU;gBACpB,GAAG,EAAE,CAAC;gBACN,IAAI,EAAE,CAAC;gBACP,KAAK,EAAE,aAAa;gBACpB,MAAM;gBACN,MAAM,EAAE,IAAI;gBACZ,aAAa,EAAE,MAAM;aACtB,GACD,CACE,CACP,CAAA;AACH,CAAC,CAAC,CAAA;AAEF,eAAe,UAAU,CAAA"}
|