From b7fa0300903e5526fec5dc091f97fbd7ad81f429 Mon Sep 17 00:00:00 2001
From: mikeslemmer <mikeslemmer@users.noreply.github.com>
Date: Fri, 4 Jun 2021 14:15:54 -0700
Subject: [PATCH] Making features available to onMouseEnter. This fixes issue
 1473 (#1474)

---
 src/components/interactive-map.js | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/components/interactive-map.js b/src/components/interactive-map.js
index 49bc5f76..e3afc983 100644
--- a/src/components/interactive-map.js
+++ b/src/components/interactive-map.js
@@ -215,16 +215,20 @@ function onPointerMove(event) {
     if (interactiveLayerIds || onHover) {
       features = getFeatures.call(this, event.point);
     }
-    if (onHover) {
-      // backward compatibility: v3 `onHover` interface
-      event.features = features;
-      onHover(event);
-    }
 
     const isHovering = Boolean(interactiveLayerIds && features && features.length > 0);
     const isEntering = isHovering && !this.state.isHovering;
     const isExiting = !isHovering && this.state.isHovering;
 
+    if (onHover || isEntering) {
+      event.features = features;
+
+      // backward compatibility: v3 `onHover` interface
+      if (onHover) {
+        onHover(event);
+      }
+    }
+
     if (isEntering) {
       onEvent.call(this, 'onMouseEnter', event);
     }