sag_components 1.0.1069 → 1.0.1070

package/dist/stories/components/Heatmap.js

@@ -93,24 +93,24 @@ const Heatmap = props => {
         duration: 0.4
       },
       onMouseEnter: e => {
-        var _barRefs$current$inde;
+        var _barRefs$current$inde, _barsContainerRef$cur;
         const barRect = (_barRefs$current$inde = barRefs.current[index]) === null || _barRefs$current$inde === void 0 ? void 0 : _barRefs$current$inde.getBoundingClientRect();
+        const parentRect = (_barsContainerRef$cur = barsContainerRef.current) === null || _barsContainerRef$cur === void 0 ? void 0 : _barsContainerRef$cur.getBoundingClientRect();
         if (barRect && e.clientX > barRect.x && e.clientX < barRect.x + barRect.width && e.clientY > barRect.y && e.clientY < barRect.y + barRect.height) {
-          var _e$nativeEvent, _e$nativeEvent2;
           setTooltip({
             label: `${item.label} - ${Math.round(item.value / totalValue * 100)}%`
           });
-          // Prevent setting tooltip position if mouse is over the tooltip element
-          if (e.target.classList.contains('TooltipContainer')) {
-            return; // Exit early if mouse is over the tooltip
-          }
-          if ((_e$nativeEvent = e.nativeEvent) !== null && _e$nativeEvent !== void 0 && _e$nativeEvent.layerX && (_e$nativeEvent2 = e.nativeEvent) !== null && _e$nativeEvent2 !== void 0 && _e$nativeEvent2.layerY) {
-            var _e$nativeEvent3, _e$nativeEvent4;
+          if (parentRect) {
+            let tooltipX = e.clientX + 10; // Default: Position to the right of the cursor
+            const tooltipWidth = 150; // Estimate tooltip width (adjust as needed)
+
+            // If tooltip would overflow, move it to the left of the cursor
+            if (tooltipX + tooltipWidth > parentRect.right) {
+              tooltipX = e.clientX - tooltipWidth - 10;
+            }
             setTooltipPosition({
-              // eslint-disable-next-line no-unsafe-optional-chaining
-              x: ((_e$nativeEvent3 = e.nativeEvent) === null || _e$nativeEvent3 === void 0 ? void 0 : _e$nativeEvent3.layerX) + 10,
-              // eslint-disable-next-line no-unsafe-optional-chaining
-              y: ((_e$nativeEvent4 = e.nativeEvent) === null || _e$nativeEvent4 === void 0 ? void 0 : _e$nativeEvent4.layerY) + 20
+              x: tooltipX,
+              y: e.clientY - 30
             });
           }
         }
@@ -123,21 +123,19 @@ const Heatmap = props => {
         }
       },
       onMouseMove: e => {
-        var _barRefs$current$inde3;
+        var _barRefs$current$inde3, _barsContainerRef$cur2;
         const barRect = (_barRefs$current$inde3 = barRefs.current[index]) === null || _barRefs$current$inde3 === void 0 ? void 0 : _barRefs$current$inde3.getBoundingClientRect();
+        const parentRect = (_barsContainerRef$cur2 = barsContainerRef.current) === null || _barsContainerRef$cur2 === void 0 ? void 0 : _barsContainerRef$cur2.getBoundingClientRect();
         if (barRect && e.clientX > barRect.x && e.clientX < barRect.x + barRect.width && e.clientY > barRect.y && e.clientY < barRect.y + barRect.height) {
-          var _e$nativeEvent5, _e$nativeEvent6;
-          // Prevent setting tooltip position if mouse is over the tooltip element
-          if (e.target.classList.contains('TooltipContainer')) {
-            return; // Exit early if mouse is over the tooltip
-          }
-          if ((_e$nativeEvent5 = e.nativeEvent) !== null && _e$nativeEvent5 !== void 0 && _e$nativeEvent5.layerX && (_e$nativeEvent6 = e.nativeEvent) !== null && _e$nativeEvent6 !== void 0 && _e$nativeEvent6.layerY) {
-            var _e$nativeEvent7, _e$nativeEvent8;
+          if (parentRect) {
+            let tooltipX = e.clientX + 10;
+            const tooltipWidth = 150;
+            if (tooltipX + tooltipWidth > parentRect.right) {
+              tooltipX = e.clientX - tooltipWidth - 10;
+            }
             setTooltipPosition({
-              // eslint-disable-next-line no-unsafe-optional-chaining
-              x: ((_e$nativeEvent7 = e.nativeEvent) === null || _e$nativeEvent7 === void 0 ? void 0 : _e$nativeEvent7.layerX) + 10,
-              // eslint-disable-next-line no-unsafe-optional-chaining
-              y: ((_e$nativeEvent8 = e.nativeEvent) === null || _e$nativeEvent8 === void 0 ? void 0 : _e$nativeEvent8.layerY) + 20
+              x: tooltipX,
+              y: e.clientY - 30
             });
           }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sag_components",
-  "version": "1.0.1069",
+  "version": "1.0.1070",
   "description": "",
   "main": "dist/index.js",
   "scripts": {