diff --git a/src/Routes/SidebarRight/BarChartMonitors.react.jsx b/src/Routes/SidebarRight/BarChartMonitors.react.jsx index 6550def08..a07bd0106 100644 --- a/src/Routes/SidebarRight/BarChartMonitors.react.jsx +++ b/src/Routes/SidebarRight/BarChartMonitors.react.jsx @@ -12,14 +12,11 @@ import { Form } from 'components/common'; const { Collapsible } = Form; const Container = styled.div` - display: flex; + margin-top: 50px; height: ${({ $height }) => ($height ? `${($height)+300}px` : '70vh')}; - svg + div { - color: #000000; - } `; const PieContainer = styled.div` width: 100%; @@ -29,6 +26,7 @@ const PieContainer = styled.div` const ResponsiveBarStyle = styled(ResponsiveBar)` width: 85%; + `; const typeName = { @@ -208,9 +206,15 @@ const BarChartLayer = React.memo( }); }} onMouseLeave={() => { + setTooltipData(null); handleLegendMouseLeave(); + + }} + onMouseOut={() => { setTooltipData(null); - }}> + handleLegendMouseLeave(); + }} + > { () => buildPieDataFromTotals(data, legend, Theme.GRAPH_PALETTE), [data, legend] ); - const rowPieData = useMemo(() => (pieData.length / 5) * 60 + 60, [pieData]); + const rowPieData = useMemo(() => (pieData.length / 5) * 50 + 70, [pieData]); const handleLegendMouseEnter = useCallback(legendItem => { // const idToHighlight = legendItem; @@ -270,12 +274,19 @@ const BarChartMonitors = ({ metric }) => { const handleLegendMouseLeave = useCallback(() => { setHighlightedBars(''); + setTooltipData(null); }, []); return ( <> -
{typeName[metric]}
- +
setTooltipData(null)} >{typeName[metric]}
+ setTooltipData(null)} + onMouseOut={handleLegendMouseLeave} + onPointerLeave={handleLegendMouseLeave} + onPointerOut={handleLegendMouseLeave} + + > { ), ]} /> + + + + + {tooltipData && } + + - {tooltipData && } - - - +
+ setTooltipData(null)} > diff --git a/src/Routes/SidebarRight/CpuBarChartMonitors.jsx b/src/Routes/SidebarRight/CpuBarChartMonitors.jsx index 94a655c55..58afeb2e8 100644 --- a/src/Routes/SidebarRight/CpuBarChartMonitors.jsx +++ b/src/Routes/SidebarRight/CpuBarChartMonitors.jsx @@ -6,7 +6,8 @@ import BarChartMonitors from './BarChartMonitors.react'; const ContainerCPU = styled.div` height: 100vh; - position: relative; + + `; const CpuBarChartMonitors = ({metric}) => (