From d2bdb010921ad70c2dca5d9a576daba7d5ade344 Mon Sep 17 00:00:00 2001
From: Victor Marin <36818606+mdvictor@users.noreply.github.com>
Date: Thu, 1 Sep 2022 18:57:51 +0300
Subject: [PATCH] Fixed tooltip does not change data when hovering over other
 datapoints (#54517)

---
 .../src/components/uPlot/config/addTooltipSupport.ts      | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/grafana-ui/src/components/uPlot/config/addTooltipSupport.ts b/packages/grafana-ui/src/components/uPlot/config/addTooltipSupport.ts
index d3b50653429..53823ce56c5 100644
--- a/packages/grafana-ui/src/components/uPlot/config/addTooltipSupport.ts
+++ b/packages/grafana-ui/src/components/uPlot/config/addTooltipSupport.ts
@@ -76,11 +76,15 @@ export const addTooltipSupport = ({
   const tooltipInterpolator = config.getTooltipInterpolator();
   if (tooltipInterpolator) {
     config.addHook('setCursor', (u) => {
+      if (isToolTipOpen.current) {
+        return;
+      }
+
       tooltipInterpolator(
         setFocusedSeriesIdx,
         setFocusedPointIdx,
         (clear) => {
-          if (clear && !isToolTipOpen.current) {
+          if (clear) {
             setCoords(null);
             return;
           }
@@ -90,7 +94,7 @@ export const addTooltipSupport = ({
           }
 
           const { x, y } = positionTooltip(u, rect);
-          if (x !== undefined && y !== undefined && !isToolTipOpen.current) {
+          if (x !== undefined && y !== undefined) {
             setCoords({ canvas: { x: u.cursor.left!, y: u.cursor.top! }, viewport: { x, y } });
           }
         },