fix(tooltip): merge children props

Yoctol · Mar 28, 2019 · 50a0952 · 50a0952
1 parent 9de4570
commit 50a0952
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/packages/tailor-ui-lab/src/Tooltip/Tooltip.tsx b/packages/tailor-ui-lab/src/Tooltip/Tooltip.tsx
@@ -11,9 +11,9 @@ import React, {
   useState,
 } from 'react';
 import debounce from 'lodash.debounce';
-import { animated } from 'react-spring';
-
 import { Position, Positioner, Positions } from 'tailor-ui';
+import { animated } from 'react-spring';
+import { mergeEventProps } from '@tailor-ui/utils';
 
 import { StyledTooltip, StyledTooltipProps } from './styles';
 
@@ -146,15 +146,15 @@ const Tooltip: FunctionComponent<TooltipProps> = ({
     }
   };
 
-  // TODO: compose events
   const renderChildren = ({ ref }: { ref: RefObject<HTMLElement> }) => {
     if (children instanceof Function) {
       return children({
         ref,
-        bind: {
-          onMouseEnter: handleOpen,
-          onMouseLeave: handleClose,
-        },
+        bind: (props: any) =>
+          mergeEventProps(props, {
+            onMouseEnter: handleOpen,
+            onMouseLeave: handleClose,
+          }),
       });
     }
 
@@ -164,8 +164,10 @@ const Tooltip: FunctionComponent<TooltipProps> = ({
 
     return cloneElement(children, {
       ref,
-      onMouseEnter: handleOpen,
-      onMouseLeave: handleClose,
+      ...mergeEventProps(children.props, {
+        onMouseEnter: handleOpen,
+        onMouseLeave: handleClose,
+      }),
     });
   };