Skip to content

feat: sticky tooltips #749

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.

Sign up for GitHub

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

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

feat: sticky tooltips #749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions packages/web/src/components/Common/useClickOutside.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import { MutableRefObject, useEffect } from 'react'

/**
* Hook that alerts clicks outside of the passed ref
* Author: Ben Bud
* Source: https://stackoverflow.com/a/42234988
*/
export function useClickOutside<T extends HTMLElement | SVGElement>(
ref: MutableRefObject<T | null>,
onClickOutside: () => void,
) {
useEffect(() => {
function handleClickOutside(event: Event) {
if (event.target instanceof Node && ref.current && !ref.current.contains(event.target)) {
onClickOutside()
}
}

document.addEventListener('mousedown', handleClickOutside)

return () => {
document.removeEventListener('mousedown', handleClickOutside)
}
}, [onClickOutside, ref])
}
178 changes: 103 additions & 75 deletions packages/web/src/components/SequenceView/PeptideMarkerMutationGroup.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import React, { SVGProps, useState } from 'react'
import React, { SVGProps, useRef, useState } from 'react'

import { useTranslation } from 'react-i18next'
import { Row, Col } from 'reactstrap'
import { connect } from 'react-redux'
import { useClickOutside } from 'src/components/Common/useClickOutside'

import { AA_MIN_WIDTH_PX } from 'src/constants'

Expand Down Expand Up @@ -57,6 +58,12 @@ function PeptideMarkerMutationGroupDisconnected({
}: PeptideMarkerMutationGroupProps) {
const { t } = useTranslation()
const [showTooltip, setShowTooltip] = useState(false)
const [isClicked, setIsClicked] = useState(false)
const ref = useRef<HTMLDivElement>(null)
useClickOutside(ref, () => {
setShowTooltip(false)
setIsClicked(false)
})

const { gene, changes, codonAaRange, nucSubstitutions, nucDeletions } = group
const id = getSafeId('aa-mutation-group-marker', { seqName, gene, begin: codonAaRange.begin })
Expand All @@ -82,7 +89,24 @@ function PeptideMarkerMutationGroupDisconnected({
<g id={id}>
<rect fill="#999a" x={x - 0.5} y={-10} width={width + 1} stroke="#aaaa" strokeWidth={0.5} height={32} />
<svg x={x} y={-9.5} height={29} {...restProps}>
<g onMouseEnter={() => setShowTooltip(true)} onMouseLeave={() => setShowTooltip(false)}>
<g
onMouseEnter={() => {
if (!isClicked) {
setShowTooltip(true)
}
}}
onMouseLeave={() => {
if (!isClicked) {
setShowTooltip(false)
}
}}
onClick={() => {
if (!isClicked) {
setShowTooltip(true)
setIsClicked(true)
}
}}
>
{changes.map((change) => (
<PeptideMarkerMutation
key={change.codon}
Expand All @@ -93,94 +117,98 @@ function PeptideMarkerMutationGroupDisconnected({
))}

<Tooltip target={id} isOpen={showTooltip} wide fullWidth>
<TableSlim borderless className="mb-1">
<thead />
<tbody>
<tr>
<td colSpan={2}>
<h5>{seqName}</h5>
</td>
</tr>

<tr className="mb-2">
<td colSpan={2}>
<h6>{t('Aminoacid changes ({{count}})', { count: changes.length })}</h6>
</td>
</tr>

<>
{changesHead.map((change) => (
<tr key={change.codon}>
<td>{change.type === 'substitution' ? t('Substitution') : t('Deletion')}</td>
<td>
<AminoacidMutationBadge mutation={change} geneMap={geneMap ?? []} />
</td>
</tr>
))}
</>

{changesTail.length > 0 && (
<div ref={ref}>
<TableSlim borderless className="mb-1">
<thead />
<tbody>
<tr>
<td>{'...'}</td>
<td>{'...'}</td>
<td colSpan={2}>
<h5>{seqName}</h5>
</td>
</tr>
)}

<>
{changesTail.length > 0 &&
changesTail.map((change) => (
<tr className="mb-2">
<td colSpan={2}>
<h6>{t('Aminoacid changes ({{count}})', { count: changes.length })}</h6>
</td>
</tr>

<>
{changesHead.map((change) => (
<tr key={change.codon}>
<td>{change.type === 'substitution' ? t('Substitution') : t('Deletion')}</td>
<td>
<AminoacidMutationBadge mutation={change} geneMap={geneMap ?? []} />
</td>
</tr>
))}
</>
</>

{changesTail.length > 0 && (
<tr>
<td>{'...'}</td>
<td>{'...'}</td>
</tr>
)}

<>
{changesTail.length > 0 &&
changesTail.map((change) => (
<tr key={change.codon}>
<td>{change.type === 'substitution' ? t('Substitution') : t('Deletion')}</td>
<td>
<AminoacidMutationBadge mutation={change} geneMap={geneMap ?? []} />
</td>
</tr>
))}
</>

{totalNucChanges > 0 && (
<tr>
<td colSpan={2}>
<h6 className="mt-3">
{t('Nucleotide changes nearby ({{count}})', { count: totalNucChanges })}
</h6>
</td>
</tr>
)}

<>
{nucSubstitutions.map((mut) => (
<tr key={mut.pos}>
<td>{t('Substitution')}</td>
<td>{<NucleotideMutationBadge mutation={mut} />}</td>
</tr>
))}
</>

<>
{nucDeletions.map((del) => (
<tr key={del.start}>
<td>{t('Deletion')}</td>
<td>{formatRange(del.start, del.start + del.length)}</td>
</tr>
))}
</>

{totalNucChanges > 0 && (
<tr>
<td colSpan={2}>
<h6 className="mt-3">{t('Nucleotide changes nearby ({{count}})', { count: totalNucChanges })}</h6>
<Row noGutters className="mt-3">
<Col>
<h6>{'Context'}</h6>
</Col>
</Row>

<Row noGutters>
<Col>
<PeptideContext group={group} />
</Col>
</Row>
</td>
</tr>
)}

<>
{nucSubstitutions.map((mut) => (
<tr key={mut.pos}>
<td>{t('Substitution')}</td>
<td>{<NucleotideMutationBadge mutation={mut} />}</td>
</tr>
))}
</>

<>
{nucDeletions.map((del) => (
<tr key={del.start}>
<td>{t('Deletion')}</td>
<td>{formatRange(del.start, del.start + del.length)}</td>
</tr>
))}
</>

<tr>
<td colSpan={2}>
<Row noGutters className="mt-3">
<Col>
<h6>{'Context'}</h6>
</Col>
</Row>

<Row noGutters>
<Col>
<PeptideContext group={group} />
</Col>
</Row>
</td>
</tr>
</tbody>
</TableSlim>
</tbody>
</TableSlim>
</div>
</Tooltip>
</g>
</svg>
Expand Down