Merge pull request #90 from lklong709/PIM-44

fixes #44 - dashboard fix bug when hover pie chart
aesirxio · Jan 12, 2023 · 5174222 · 5174222
2 parents 9bf8ac8 + a254d86
commit 5174222
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/components/PieChartComponent/index.jsx b/src/components/PieChartComponent/index.jsx
@@ -29,6 +29,9 @@ const PieChartComponent = ({ data, colors, height, chartTitle, link, ...props })
   const onPieEnter = (_, index) => {
     setActiveIndex(index);
   };
+  const onPieLeave = () => {
+    setActiveIndex(-1);
+  };
   const renderActiveShape = ({
     cx,
     cy,
@@ -131,6 +134,7 @@ const PieChartComponent = ({ data, colors, height, chartTitle, link, ...props })
               fill="#8884D8"
               dataKey="value"
               onMouseEnter={onPieEnter}
+              onMouseLeave={onPieLeave}
               activeIndex={activeIndex}
               activeShape={renderActiveShape}
             >

diff --git a/src/containers/DashboardsPage/dashboard.jsx b/src/containers/DashboardsPage/dashboard.jsx
@@ -91,8 +91,8 @@ const Dashboard = observer(
               </div>
             </div>
             <Row className="gx-24 mb-24">
-              <Col lg={6}>
-                <Row className="gx-24 h-100">
+              <Col lg={6} className={`mb-5 mb-lg-0`}>
+                <Row className="gx-24 h-100 gap-5 gap-lg-0">
                   <Col lg={6}>
                     <ComponentCard
                       title={t('txt_products')}