fix(line): fix onMouseLeave firing

plouc · May 10, 2020 · f2816f4 · f2816f4
1 parent 15bc0ee
commit f2816f4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/packages/line/src/Mesh.js b/packages/line/src/Mesh.js
@@ -19,6 +19,7 @@ const Mesh = ({
     setCurrent,
     onMouseEnter,
     onMouseMove,
+    onMouseLeave,
     onClick,
     tooltip,
     debug,
@@ -51,10 +52,14 @@ const Mesh = ({
         [setCurrent, showTooltipAt, tooltip, onMouseMove]
     )
 
-    const handleMouseLeave = useCallback(() => {
-        hideTooltip()
-        setCurrent(null)
-    }, [hideTooltip, setCurrent])
+    const handleMouseLeave = useCallback(
+        (point, event) => {
+            hideTooltip()
+            setCurrent(null)
+            onMouseLeave && onMouseLeave(point, event)
+        },
+        [hideTooltip, setCurrent, onMouseLeave]
+    )
 
     const handleClick = useCallback(
         (point, event) => {
@@ -85,6 +90,7 @@ Mesh.propTypes = {
     setCurrent: PropTypes.func.isRequired,
     onMouseEnter: PropTypes.func,
     onMouseMove: PropTypes.func,
+    onMouseLeave: PropTypes.func,
     onClick: PropTypes.func,
     tooltip: PropTypes.oneOfType([PropTypes.func, PropTypes.object]).isRequired,
     debug: PropTypes.bool.isRequired,

diff --git a/packages/voronoi/src/Mesh.js b/packages/voronoi/src/Mesh.js
@@ -70,10 +70,10 @@ const Mesh = ({
                 if (currentIndex !== undefined && currentIndex !== null) {
                     previousNode = nodes[currentIndex]
                 }
-                onMouseLeave(previousNode, event)
+                previousNode && onMouseLeave(previousNode, event)
             }
         },
-        [setCurrentIndex]
+        [setCurrentIndex, currentIndex, nodes]
     )
     const handleClick = useCallback(
         event => {