From c7c18fc277920daf46382411e4ec7ec9da184fe0 Mon Sep 17 00:00:00 2001
From: Adam Ehlers Nyholm Thomsen <aen@atp.dk>
Date: Mon, 31 May 2021 19:34:29 +0200
Subject: [PATCH] Attempt to fix incorrect tooltip placement

---
 src/dash-table/derived/table/tooltip.ts |  2 +-
 src/dash-table/handlers/cellEvents.ts   | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/dash-table/derived/table/tooltip.ts b/src/dash-table/derived/table/tooltip.ts
index 54620dea9..f2651df32 100644
--- a/src/dash-table/derived/table/tooltip.ts
+++ b/src/dash-table/derived/table/tooltip.ts
@@ -42,7 +42,7 @@ function getSelectedTooltip(
               return (
                   !tt.if ||
                   (ifColumnId(tt.if, id) &&
-                      ifRowIndex(tt.if, row) &&
+                      ifRowIndex(tt.if, virtualized.indices[row - virtualized.offset.rows]) &&
                       ifFilter(
                           tt.if,
                           virtualized.data[row - virtualized.offset.rows]
diff --git a/src/dash-table/handlers/cellEvents.ts b/src/dash-table/handlers/cellEvents.ts
index e0b21932e..60d131893 100644
--- a/src/dash-table/handlers/cellEvents.ts
+++ b/src/dash-table/handlers/cellEvents.ts
@@ -165,13 +165,13 @@ export const handleEnter = (
     idx: number,
     i: number
 ) => {
-    const {setState, virtualized, visibleColumns} = propsFn();
+    const {setState, visibleColumns} = propsFn();
 
     setState({
         currentTooltip: {
             header: false,
             id: visibleColumns[i].id,
-            row: virtualized.indices[idx - virtualized.offset.rows]
+            row: idx
         }
     });
 };
@@ -207,15 +207,14 @@ export const handleMove = (
     idx: number,
     i: number
 ) => {
-    const {currentTooltip, setState, virtualized, visibleColumns} = propsFn();
+    const {currentTooltip, setState, visibleColumns} = propsFn();
 
     const c = visibleColumns[i];
-    const realIdx = virtualized.indices[idx - virtualized.offset.rows];
 
     if (
         currentTooltip &&
         currentTooltip.id === c.id &&
-        currentTooltip.row === realIdx &&
+        currentTooltip.row === idx &&
         !currentTooltip.header
     ) {
         return;
@@ -225,7 +224,7 @@ export const handleMove = (
         currentTooltip: {
             header: false,
             id: c.id,
-            row: realIdx
+            row: idx
         }
     });
 };