fixed hover bug

justinrhodes1 · Feb 18, 2019 · 10d2a1d · 10d2a1d
1 parent 199f8fd
commit 10d2a1d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/docs/bundle.js b/docs/bundle.js
diff --git a/lib/Tooltip/index.js b/lib/Tooltip/index.js
@@ -118,7 +118,7 @@ function (_Component) {
         mount: true
       });
       if (!this.props.animation) this.setState({
-        mount: this.props.show
+        mount: false
       });
       /* eslint-disable */
     }
@@ -268,11 +268,11 @@ function (_Component) {
         margin: oneMovePropIsNeg ? adjustment : null,
         animation: show ? "rpt-".concat(animation, " 0.2s") : "rpt-".concat(animation, "-out 0.15s")
       });
-      return this.state.show && this.state.mount ? _react.default.createElement("div", {
+      return !animation && show || this.state.show && this.state.mount ? _react.default.createElement("div", {
         className: classes.join(' '),
         style: tooltipStyle,
         onAnimationEnd: function onAnimationEnd() {
-          if (!show) _this3.setState({
+          if (!show && animation) _this3.setState({
             mount: false
           });
         }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-power-tooltip",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "A powerful tooltip and menu component library for react.",
   "main": "lib/index",
   "scripts": {

diff --git a/src/lib/Tooltip/index.jsx b/src/lib/Tooltip/index.jsx
@@ -43,7 +43,7 @@ class Tooltip extends Component {
     /* eslint-disable */
     if (!this.state.hasInitialized) this.setState({ show: this.props.show, hasInitialized: true });
     if (this.props.show) this.setState({ mount: true });
-    if (!this.props.animation) this.setState({ mount: this.props.show });
+    if (!this.props.animation) this.setState({ mount: false });
     /* eslint-disable */
   }
 
@@ -185,11 +185,11 @@ class Tooltip extends Component {
       animation: show ? `rpt-${animation} 0.2s` : `rpt-${animation}-out 0.15s`
     };
 
-    return (this.state.show && this.state.mount) ? (
+    return ((!animation && show) || (this.state.show && this.state.mount)) ? (
       <div
         className={classes.join(' ')}
         style={tooltipStyle}
-        onAnimationEnd={() => { if (!show) this.setState({ mount: false }) }}
+        onAnimationEnd={() => { if (!show && animation) this.setState({ mount: false }) }}
       >
         <div
           style={{