From 9288017ffe13295d70d9d0aded8df481fbf4c978 Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Sun, 11 Jun 2023 13:29:53 +0200 Subject: [PATCH] [v10.0.x] Geomap: Fix tooltip bug (#69881) Geomap: Fix tooltip bug (#69773) (cherry picked from commit 3f6d55b041320a2a96dfe875a3d0670b59b11246) Co-authored-by: Nathan Marrs --- public/app/plugins/panel/geomap/utils/tootltip.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/public/app/plugins/panel/geomap/utils/tootltip.ts b/public/app/plugins/panel/geomap/utils/tootltip.ts index 07c75dd0c5b..703f96009dd 100644 --- a/public/app/plugins/panel/geomap/utils/tootltip.ts +++ b/public/app/plugins/panel/geomap/utils/tootltip.ts @@ -32,9 +32,12 @@ export const pointerMoveListener = (evt: MapBrowserEvent, panel: Geo if (panel.state.measureMenuActive) { return true; } - if (!panel.map || panel.state.ttipOpen) { + + // Eject out of this function if map is not loaded or valid tooltip is already open + if (!panel.map || (panel.state.ttipOpen && panel.state?.ttip?.layers?.length)) { return false; } + const mouse = evt.originalEvent; const pixel = panel.map.getEventPixel(mouse); const hover = toLonLat(panel.map.getCoordinateFromPixel(pixel));