Skip to content

Commit 18ed279

Browse files
committed
Fixed genedist chart
1 parent e82cb7e commit 18ed279

3 files changed

Lines changed: 39 additions & 12 deletions

File tree

Eplant/views/WorldEFP/MapContainer.tsx

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { useEffect } from 'react'
22

3-
import { useTheme } from '@mui/material'
3+
import { Box, useTheme } from '@mui/material'
4+
import { alpha } from '@mui/material/styles'
45
import {
56
Map,
67
MapCameraChangedEvent,
@@ -74,17 +75,36 @@ const MapContainer = ({ activeData, state, setState }: MapContainerProps) => {
7475
></MapMarker>
7576
)
7677
})}
77-
<Legend
78+
<Box
7879
sx={(theme) => ({
7980
position: 'absolute',
8081
left: theme.spacing(2),
8182
bottom: theme.spacing(4),
8283
zIndex: 10,
84+
display: 'flex',
85+
flexDirection: 'column',
86+
alignItems: 'flex-start',
87+
gap: theme.spacing(1),
88+
padding: theme.spacing(1),
89+
borderRadius: theme.spacing(1),
90+
backgroundColor: alpha(theme.palette.background.active, 0.4),
91+
boxShadow: '0 8px 24px rgba(0, 0, 0, 0.18)',
92+
border: `1px solid ${alpha(theme.palette.background.edge, 0.7)}`,
93+
backdropFilter: 'blur(8px)',
94+
WebkitBackdropFilter: 'blur(8px)',
8395
})}
84-
colorMode={'absolute'}
85-
data={activeData.efpData}
86-
></Legend>
87-
<GeneDistributionChart data={activeData.efpData} />
96+
>
97+
<GeneDistributionChart
98+
data={activeData.efpData}
99+
containerStyle={{
100+
position: 'static',
101+
width: 'auto',
102+
height: 'auto',
103+
marginLeft: '-12px',
104+
}}
105+
/>
106+
<Legend colorMode={'absolute'} data={activeData.efpData}></Legend>
107+
</Box>
88108
</Map>
89109
)
90110
}

Eplant/views/WorldEFP/WorldEFP.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ import { useQuery } from '@tanstack/react-query'
1010
import { APIProvider } from '@vis.gl/react-google-maps'
1111

1212
import { EFPData, EFPGroup } from '../eFP/types'
13+
import GeneDistributionChart from '../eFP/Viewer/GeneDistributionChart'
1314
import MaskModal from '../eFP/Viewer/MaskModal'
1415

1516
import MapContainer from './MapContainer'
1617
import {
1718
Coordinates,
18-
WorldEFPAction,
1919
WorldEFPData,
2020
WorldEFPMicroArrayResponse,
2121
WorldEFPState,

Eplant/views/eFP/Viewer/GeneDistributionChart.tsx

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,19 @@
11
import * as React from 'react'
2-
import { SVGProps, useEffect, useMemo, useState } from 'react'
2+
import { useEffect, useState } from 'react'
33

4-
import { useDarkMode } from '@eplant/state'
5-
import { Mail } from '@mui/icons-material'
64
import { useTheme } from '@mui/material'
75

86
import { EFPData } from '../types'
97

10-
const GeneDistributionChart = ({ data }: { data: EFPData }) => {
8+
type GeneDistributionChartProps = {
9+
data: EFPData
10+
containerStyle?: React.CSSProperties
11+
}
12+
13+
const GeneDistributionChart = ({
14+
data,
15+
containerStyle,
16+
}: GeneDistributionChartProps) => {
1117
const theme = useTheme()
1218
const [geneRanking, setGeneRanking] = useState<{
1319
[key: string]: string
@@ -41,10 +47,11 @@ const GeneDistributionChart = ({ data }: { data: EFPData }) => {
4147
style={{
4248
display: 'flex',
4349
flexDirection: 'column',
44-
position: 'relative',
50+
position: 'absolute',
4551
zIndex: 10,
4652
width: '100%',
4753
height: '10%',
54+
...containerStyle,
4855
}}
4956
>
5057
{geneRanking ? (

0 commit comments

Comments
 (0)