Skip to content

Commit 6d5bd34

Browse files
committed
Merge remote-tracking branch 'origin/main' into adjust_alpha
2 parents 2778425 + 6afc979 commit 6d5bd34

File tree

3 files changed

+26
-36
lines changed

3 files changed

+26
-36
lines changed

plugins/linear-comparative-view/src/LinearComparativeView/components/MinLengthSlider.tsx

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
import { useEffect, useState } from 'react'
22

3-
import { Box, Slider, Tooltip, Typography } from '@mui/material'
3+
import { Box, Slider, Typography } from '@mui/material'
44
import { observer } from 'mobx-react'
55
import { makeStyles } from 'tss-react/mui'
66

7+
import SliderTooltip from './SliderTooltip'
8+
79
import type { LinearSyntenyDisplayModel } from '../../LinearSyntenyDisplay/model'
810
import type { LinearComparativeViewModel } from '../model'
9-
import type { SliderValueLabelProps } from '@mui/material'
1011

1112
const useStyles = makeStyles()({
1213
container: {
@@ -18,21 +19,6 @@ const useStyles = makeStyles()({
1819
},
1920
})
2021

21-
function ValueLabelComponent(props: SliderValueLabelProps) {
22-
const { children, open, value } = props
23-
return (
24-
<Tooltip
25-
open={open}
26-
enterTouchDelay={0}
27-
placement="top"
28-
title={value}
29-
arrow
30-
>
31-
{children}
32-
</Tooltip>
33-
)
34-
}
35-
3622
const MinLengthSlider = observer(function ({
3723
model,
3824
}: {
@@ -89,7 +75,7 @@ const MinLengthSlider = observer(function ({
8975
size="small"
9076
style={{ minWidth: 100 }}
9177
slots={{
92-
valueLabel: ValueLabelComponent,
78+
valueLabel: SliderTooltip,
9379
}}
9480
/>
9581
</Box>

plugins/linear-comparative-view/src/LinearComparativeView/components/OpacitySlider.tsx

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
import { Box, Slider, Tooltip, Typography } from '@mui/material'
1+
import { Box, Slider, Typography } from '@mui/material'
22
import { observer } from 'mobx-react'
33
import { makeStyles } from 'tss-react/mui'
44

5+
import SliderTooltip from './SliderTooltip'
6+
57
import type { LinearSyntenyDisplayModel } from '../../LinearSyntenyDisplay/model'
68
import type { LinearComparativeViewModel } from '../model'
7-
import type { SliderValueLabelProps } from '@mui/material'
89

910
const useStyles = makeStyles()({
1011
container: {
@@ -16,21 +17,6 @@ const useStyles = makeStyles()({
1617
},
1718
})
1819

19-
function ValueLabelComponent(props: SliderValueLabelProps) {
20-
const { children, open, value } = props
21-
return (
22-
<Tooltip
23-
open={open}
24-
enterTouchDelay={0}
25-
placement="top"
26-
title={value}
27-
arrow
28-
>
29-
{children}
30-
</Tooltip>
31-
)
32-
}
33-
3420
const OpacitySlider = observer(function ({
3521
model,
3622
}: {
@@ -82,7 +68,7 @@ const OpacitySlider = observer(function ({
8268
size="small"
8369
style={{ minWidth: 100 }}
8470
slots={{
85-
valueLabel: ValueLabelComponent,
71+
valueLabel: SliderTooltip,
8672
}}
8773
valueLabelFormat={(value: number) => sliderToAlpha(value).toFixed(3)}
8874
/>
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
import { Tooltip } from '@mui/material'
2+
3+
import type { SliderValueLabelProps } from '@mui/material'
4+
5+
export default function SliderTooltip(props: SliderValueLabelProps) {
6+
const { children, open, value } = props
7+
return (
8+
<Tooltip
9+
open={open}
10+
enterTouchDelay={0}
11+
placement="top"
12+
title={value}
13+
arrow
14+
>
15+
{children}
16+
</Tooltip>
17+
)
18+
}

0 commit comments

Comments
 (0)