Merge pull request #280 from FormidableLabs/bug/tooltip-rendering

fix tooltip rendering
FormidableLabs · Aug 5, 2017 · 9f9c150 · 9f9c150
2 parents f440798 + 914ea49
commit 9f9c150
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/victory-label/victory-label.js b/src/victory-label/victory-label.js
@@ -110,8 +110,9 @@ export default class VictoryLabel extends React.Component {
   shouldComponentUpdate(nextProps) {
     const attrs = this.calculateAttributes(nextProps);
     const { style, dx, dy, content, lineHeight, textAnchor, transform } = attrs;
-    const { angle, className, datum, x, y } = this.props;
+    const { angle, className, datum, x, y, active } = this.props;
     if (!Collection.allSetsEqual([
+      [active, nextProps.active],
       [angle, nextProps.angle],
       [className, nextProps.className],
       [x, nextProps.x],

diff --git a/src/victory-tooltip/victory-tooltip.js b/src/victory-tooltip/victory-tooltip.js
@@ -3,6 +3,7 @@ import PropTypes from "prop-types";
 import CustomPropTypes from "../victory-util/prop-types";
 import TextSize from "../victory-util/textsize";
 import Helpers from "../victory-util/helpers";
+import Collection from "../victory-util/collection";
 import LabelHelpers from "../victory-util/label-helpers";
 import VictoryLabel from "../victory-label/victory-label";
 import VictoryTheme from "../victory-theme/victory-theme";
@@ -121,6 +122,10 @@ export default class VictoryTooltip extends React.Component {
     }
   }];
 
+  shouldComponentUpdate(nextProps) {
+    return !Collection.areVictoryPropsEqual(this.props, nextProps);
+  }
+
   getDefaultOrientation(props) {
     const { datum, horizontal, polar } = props;
     if (!polar) {
@@ -333,7 +338,7 @@ export default class VictoryTooltip extends React.Component {
       flyoutComponent, labelComponent, groupComponent, active, renderInPortal
     } = evaluatedProps;
     if (!active) {
-      return null;
+      return renderInPortal ? <VictoryPortal>{null}</VictoryPortal> : null;
     }
     const calculatedValues = this.getCalculatedValues(evaluatedProps);
     const children = [