-
Notifications
You must be signed in to change notification settings - Fork 60
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add bookmark highlight to overview scale bar #4266
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
111 changes: 111 additions & 0 deletions
111
plugins/grid-bookmark/src/GridBookmarkWidget/components/Highlight/OverviewHighlight.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,111 @@ | ||
| import React, { useEffect, useRef } from 'react' | ||
| import { observer } from 'mobx-react' | ||
| import { makeStyles } from 'tss-react/mui' | ||
| import { SessionWithWidgets, getSession, notEmpty } from '@jbrowse/core/util' | ||
| import { Base1DViewModel } from '@jbrowse/core/util/Base1DViewModel' | ||
| import { Tooltip } from '@mui/material' | ||
|
|
||
| // locals | ||
| import { GridBookmarkModel } from '../../model' | ||
| import { IExtendedLGV } from '../../model' | ||
|
|
||
| type LGV = IExtendedLGV | ||
|
|
||
| const useStyles = makeStyles()({ | ||
| highlight: { | ||
| height: '100%', | ||
| position: 'absolute', | ||
| }, | ||
| }) | ||
|
|
||
| const OverviewHighlight = observer(function OverviewHighlight({ | ||
| model, | ||
| overview, | ||
| }: { | ||
| model: LGV | ||
| overview: Base1DViewModel | ||
| }) { | ||
| const { classes } = useStyles() | ||
| const { cytobandOffset } = model | ||
| const session = getSession(model) as SessionWithWidgets | ||
|
|
||
| const { showBookmarkHighlights, showBookmarkLabels } = model | ||
| const assemblyNames = new Set(session.assemblyNames) | ||
|
|
||
| const bookmarkWidget = session.widgets.get( | ||
| 'GridBookmark', | ||
| ) as GridBookmarkModel | ||
|
|
||
| const bookmarks = useRef(bookmarkWidget?.bookmarks ?? []) | ||
|
|
||
| useEffect(() => { | ||
| if (!bookmarkWidget) { | ||
| const newBookmarkWidget = session.addWidget( | ||
| 'GridBookmarkWidget', | ||
| 'GridBookmark', | ||
| ) as GridBookmarkModel | ||
| bookmarks.current = newBookmarkWidget.bookmarks | ||
| } | ||
| }, [session, bookmarkWidget]) | ||
|
|
||
| return ( | ||
| <> | ||
| {showBookmarkHighlights && bookmarks.current | ||
| ? bookmarks.current | ||
| .filter(value => assemblyNames.has(value.assemblyName)) | ||
| .map(r => { | ||
| const s = overview.bpToPx({ | ||
| ...r, | ||
| coord: r.reversed ? r.end : r.start, | ||
| }) | ||
| const e = overview.bpToPx({ | ||
| ...r, | ||
| coord: r.reversed ? r.start : r.end, | ||
| }) | ||
| return s !== undefined && e !== undefined | ||
| ? { | ||
| width: Math.abs(e - s), | ||
| left: s + cytobandOffset, | ||
| highlight: r.highlight, | ||
| label: r.label, | ||
| } | ||
| : undefined | ||
| }) | ||
| .filter(notEmpty) | ||
| .map(({ left, width, highlight, label }, idx) => ( | ||
| <> | ||
| {showBookmarkLabels ? ( | ||
| <Tooltip title={label} arrow> | ||
| <div | ||
| key={`${left}_${width}_${idx}`} | ||
| className={classes.highlight} | ||
| style={{ | ||
| left, | ||
| width, | ||
| background: highlight, | ||
| borderLeft: `1px solid ${highlight}`, | ||
| borderRight: `1px solid ${highlight}`, | ||
| }} | ||
| /> | ||
| </Tooltip> | ||
| ) : ( | ||
| <div | ||
| key={`${left}_${width}_${idx}`} | ||
| className={classes.highlight} | ||
| style={{ | ||
| left, | ||
| width, | ||
| background: highlight, | ||
| borderLeft: `1px solid ${highlight}`, | ||
| borderRight: `1px solid ${highlight}`, | ||
| }} | ||
| /> | ||
| )} | ||
| </> | ||
| )) | ||
| : null} | ||
| </> | ||
| ) | ||
| }) | ||
|
|
||
| export default OverviewHighlight |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
any reason for overflow: hidden being added here?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
without it, the icon on the highlight always shows (so if you're zoomed out and the highlight is a sliver you see it)
realistically, anything you're highlighting and looking at, you'd be a close enough zoom level to make use of the icon options, i think
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
sounds good. i had this idea that possibly the link icon could even be hidden if the user is not hovering over, as the user might like it hidden for e.g. screenshot. just an idea though