From d3c1ffe424a29d35c97ab9de687fcabbf9e013fd Mon Sep 17 00:00:00 2001
From: Chris Williams <chris_williams@airbnb.com>
Date: Tue, 17 Dec 2019 16:49:31 -0800
Subject: [PATCH 1/3] fix(XYChart, Network): Preserve passed onMouseLeave and
 onMouseMove

---
 packages/network/src/chart/Network.jsx       |  8 +++++++-
 packages/shared/src/enhancer/WithTooltip.jsx | 11 +++++++++--
 packages/xy-chart/src/chart/XYChart.jsx      |  8 ++++++--
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/packages/network/src/chart/Network.jsx b/packages/network/src/chart/Network.jsx
index 28bbc7eb..1d57cb94 100644
--- a/packages/network/src/chart/Network.jsx
+++ b/packages/network/src/chart/Network.jsx
@@ -324,6 +324,8 @@ class Network extends React.PureComponent {
       children,
       className,
       height,
+      onMouseLeave,
+      onMouseMove,
       renderLink,
       renderNode,
       renderTooltip,
@@ -335,7 +337,11 @@ class Network extends React.PureComponent {
 
     if (renderTooltip) {
       return (
-        <WithTooltip renderTooltip={renderTooltip}>
+        <WithTooltip
+          renderTooltip={renderTooltip}
+          onMouseLeave={onMouseLeave} // preserve these as WithTooltip will override them
+          onMouseMove={onMouseMove}
+        >
           <Network {...this.props} renderTooltip={null} />
         </WithTooltip>
       );
diff --git a/packages/shared/src/enhancer/WithTooltip.jsx b/packages/shared/src/enhancer/WithTooltip.jsx
index f867571d..994e60cf 100644
--- a/packages/shared/src/enhancer/WithTooltip.jsx
+++ b/packages/shared/src/enhancer/WithTooltip.jsx
@@ -20,6 +20,8 @@ export const propTypes = {
   children: PropTypes.oneOfType([PropTypes.object, PropTypes.func]).isRequired,
   className: PropTypes.string,
   HoverStyles: PropTypes.oneOfType([PropTypes.object, PropTypes.func]),
+  onMouseMove: PropTypes.func,
+  onMouseLeave: PropTypes.func,
   renderTooltip: PropTypes.func,
   styles: PropTypes.objectOf(PropTypes.oneOfType([PropTypes.string, PropTypes.number])),
   TooltipComponent: PropTypes.oneOfType([PropTypes.object, PropTypes.func]),
@@ -40,6 +42,8 @@ const defaultProps = {
     `}
     </style>
   ),
+  onMouseMove: null,
+  onMouseLeave: null,
   renderTooltip: null,
   styles: { display: 'inline-block', position: 'relative' },
   TooltipComponent: TooltipWithBounds,
@@ -62,7 +66,7 @@ class WithTooltip extends React.PureComponent {
   }
 
   handleMouseMove({ event, datum, coords, ...rest }) {
-    const { showTooltip } = this.props;
+    const { showTooltip, onMouseMove } = this.props;
     if (this.tooltipTimeout) {
       clearTimeout(this.tooltipTimeout);
     }
@@ -83,13 +87,16 @@ class WithTooltip extends React.PureComponent {
         ...rest,
       },
     });
+
+    if (onMouseMove) onMouseMove({ event, datum, coords, ...rest });
   }
 
   handleMouseLeave() {
-    const { tooltipTimeout, hideTooltip } = this.props;
+    const { tooltipTimeout, hideTooltip, onMouseLeave } = this.props;
     this.tooltipTimeout = setTimeout(() => {
       hideTooltip();
     }, tooltipTimeout);
+    if (onMouseLeave) onMouseLeave();
   }
 
   render() {
diff --git a/packages/xy-chart/src/chart/XYChart.jsx b/packages/xy-chart/src/chart/XYChart.jsx
index 60453fac..26b5c89c 100644
--- a/packages/xy-chart/src/chart/XYChart.jsx
+++ b/packages/xy-chart/src/chart/XYChart.jsx
@@ -263,10 +263,14 @@ class XYChart extends React.PureComponent {
   }
 
   render() {
-    const { renderTooltip } = this.props;
+    const { renderTooltip, onMouseLeave, onMouseMove } = this.props;
     if (renderTooltip) {
       return (
-        <WithTooltip renderTooltip={renderTooltip}>
+        <WithTooltip
+          renderTooltip={renderTooltip}
+          onMouseLeave={onMouseLeave} // preserve these as WithTooltip will override them
+          onMouseMove={onMouseMove}
+        >
           <XYChart {...this.props} renderTooltip={null} />
         </WithTooltip>
       );

From f4ad964e1f5cde9d9a08a91b84e8ca392c220f28 Mon Sep 17 00:00:00 2001
From: Chris Williams <chris_williams@airbnb.com>
Date: Tue, 17 Dec 2019 16:55:23 -0800
Subject: [PATCH 2/3] test(shared/WithTooltip): Add test for invoking passed
 mouse handlers when provided handlers are called

---
 .../shared/test/enhancer/WithTooltip.test.js  | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/packages/shared/test/enhancer/WithTooltip.test.js b/packages/shared/test/enhancer/WithTooltip.test.js
index 17f1f65b..a3c635a3 100644
--- a/packages/shared/test/enhancer/WithTooltip.test.js
+++ b/packages/shared/test/enhancer/WithTooltip.test.js
@@ -73,6 +73,44 @@ describe('<WithTooltip />', () => {
     expect(wrapper.find('#test')).toHaveLength(1);
   });
 
+  it('it should invoke the passed onMouseMove when the provided onMouseMove is invoked', () => {
+    const passedOnMouseMove = jest.fn();
+
+    let providedMouseMove;
+    const wrapper = mount(
+      <WithTooltip renderTooltip={() => null} onMouseMove={passedOnMouseMove}>
+        {({ onMouseMove }) => {
+          providedMouseMove = onMouseMove;
+
+          return <svg />;
+        }}
+      </WithTooltip>,
+    );
+
+    providedMouseMove({});
+    wrapper.update();
+    expect(passedOnMouseMove).toHaveBeenCalledTimes(1);
+  });
+
+  it('it should invoke the passed onMouseLeave when the provided onMouseLeave is invoked', () => {
+    const passedOnMouseLeave = jest.fn();
+
+    let providedMouseLeave;
+    const wrapper = mount(
+      <WithTooltip renderTooltip={() => null} onMouseLeave={passedOnMouseLeave}>
+        {({ onMouseLeave }) => {
+          providedMouseLeave = onMouseLeave;
+
+          return <svg />;
+        }}
+      </WithTooltip>,
+    );
+
+    providedMouseLeave({});
+    wrapper.update();
+    expect(passedOnMouseLeave).toHaveBeenCalledTimes(1);
+  });
+
   it('it should use the provided `coords` if passed to onMouseMove', () => {
     let mouseMove;
     const wrapper = mount(

From b6384b5d7870f827fd9cec7ab526ad1588d41ce6 Mon Sep 17 00:00:00 2001
From: Chris Williams <chris_williams@airbnb.com>
Date: Tue, 17 Dec 2019 17:07:04 -0800
Subject: [PATCH 3/3] build(XYChart): resolve @beemo/core to 1.0.8

---
 packages/xy-chart/package.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/xy-chart/package.json b/packages/xy-chart/package.json
index ad267386..7d5d3a35 100644
--- a/packages/xy-chart/package.json
+++ b/packages/xy-chart/package.json
@@ -65,6 +65,9 @@
     "react": "^15.0.0-0 || ^16.0.0-0",
     "react-dom": "^15.0.0-0 || ^16.0.0-0"
   },
+  "resolutions": {
+    "@beemo/core": "1.0.8"
+  },
   "beemo": {
     "module": "@data-ui/build-config",
     "drivers": [