victory-chart 31.1.0 → 31.2.0

package/es/helper-methods.js

@@ -5,7 +5,7 @@ import _defaults from "lodash/defaults";
 
 /* eslint-disable no-use-before-define */
 import React from "react";
-import { Log, Helpers, Scale, Axis, Wrapper } from "victory-core";
+import { Helpers, Scale, Axis, Wrapper } from "victory-core";
 
 function getAxisProps(child, props, calculatedProps) {
   var domain = calculatedProps.domain,
@@ -24,7 +24,8 @@ function getAxisProps(child, props, calculatedProps) {
   var crossAxis = childProps.crossAxis === false ? false : true;
   var orientation = Axis.getOrientation(child, axis, originSign[otherAxis]);
   return {
-    stringMap: stringMap[currentAxis],
+    stringMap: stringMap,
+    horizontal: horizontal,
     categories: categories[currentAxis],
     startAngle: props.startAngle,
     endAngle: props.endAngle,
@@ -175,22 +176,7 @@ var getChildComponents = function (props, defaultAxes) {
     return childComponents.concat([defaultAxes.independent, defaultAxes.dependent]);
   }
 
-  var axisCount = 0;
-  return childComponents.filter(function (child) {
-    var role = child.type && child.type.role;
-    var childProps = child.props || {};
-
-    if (role !== "axis" || childProps.dependentAxis) {
-      return true;
-    } else if (axisCount < 1) {
-      axisCount++;
-      return true;
-    } else {
-      var msg = "Only one independent VictoryAxis component is allowed when " + "using the VictoryChart wrapper. Only the first axis will be used. Please compose " + "multi-axis charts manually";
-      Log.warn(msg);
-      return false;
-    }
-  });
+  return childComponents;
 };
 
 var getDefaultDomainPadding = function (childComponents, horizontal) {

package/es/victory-chart.js

@@ -1,3 +1,4 @@
+import _isEmpty from "lodash/isEmpty";
 import _assign from "lodash/assign";
 import _defaults from "lodash/defaults";
 
@@ -24,6 +25,7 @@ import { VictorySharedEvents } from "victory-shared-events";
 import { VictoryAxis } from "victory-axis";
 import { VictoryPolarAxis } from "victory-polar-axis";
 import { getChildComponents, getCalculatedProps, getChildren } from "./helper-methods";
+import isEqual from "react-fast-compare";
 var fallbackProps = {
   width: 450,
   height: 300,
@@ -49,28 +51,24 @@ function (_React$Component) {
         nodesDoneLoad: false,
         animating: true
       };
+      _this.setAnimationState = Wrapper.setAnimationState.bind(_assertThisInitialized(_this));
     }
 
-    _this.setAnimationState = Wrapper.setAnimationState.bind(_assertThisInitialized(_this));
-    _this.events = Wrapper.getAllEvents(props);
     return _this;
   }
 
   _createClass(VictoryChart, [{
-    key: "componentWillMount",
-    value: function componentWillMount() {
-      this.events = Wrapper.getAllEvents(this.props);
-    }
-  }, {
-    key: "componentWillReceiveProps",
-    value: function componentWillReceiveProps(nextProps) {
+    key: "shouldComponentUpdate",
+    value: function shouldComponentUpdate(nextProps) {
       if (this.props.animate) {
-        this.setAnimationState(this.props, nextProps);
+        if (!isEqual(this.props, nextProps)) {
+          this.setAnimationState(this.props, nextProps);
+          return false;
+        }
       }
 
-      this.events = Wrapper.getAllEvents(nextProps);
-    } // the old ones were bad
-
+      return true;
+    }
   }, {
     key: "getNewChildren",
     value: function getNewChildren(props, childComponents, calculatedProps) {
@@ -137,12 +135,13 @@ function (_React$Component) {
       var newChildren = this.getNewChildren(modifiedProps, childComponents, calculatedProps);
       var containerProps = standalone ? this.getContainerProps(modifiedProps, calculatedProps) : {};
       var container = standalone ? this.renderContainer(containerComponent, containerProps) : groupComponent;
+      var events = Wrapper.getAllEvents(props);
 
-      if (this.events) {
+      if (!_isEmpty(events)) {
         return React.createElement(VictorySharedEvents, {
           container: container,
           eventKey: eventKey,
-          events: this.events,
+          events: events,
           externalEventMutations: externalEventMutations
         }, newChildren);
       }

package/lib/helper-methods.js

@@ -41,7 +41,8 @@ function getAxisProps(child, props, calculatedProps) {
   var orientation = _victoryCore.Axis.getOrientation(child, axis, originSign[otherAxis]);
 
   return {
-    stringMap: stringMap[currentAxis],
+    stringMap: stringMap,
+    horizontal: horizontal,
     categories: categories[currentAxis],
     startAngle: props.startAngle,
     endAngle: props.endAngle,
@@ -195,24 +196,7 @@ var getChildComponents = function (props, defaultAxes) {
     return childComponents.concat([defaultAxes.independent, defaultAxes.dependent]);
   }
 
-  var axisCount = 0;
-  return childComponents.filter(function (child) {
-    var role = child.type && child.type.role;
-    var childProps = child.props || {};
-
-    if (role !== "axis" || childProps.dependentAxis) {
-      return true;
-    } else if (axisCount < 1) {
-      axisCount++;
-      return true;
-    } else {
-      var msg = "Only one independent VictoryAxis component is allowed when " + "using the VictoryChart wrapper. Only the first axis will be used. Please compose " + "multi-axis charts manually";
-
-      _victoryCore.Log.warn(msg);
-
-      return false;
-    }
-  });
+  return childComponents;
 };
 
 exports.getChildComponents = getChildComponents;

package/lib/victory-chart.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+var _isEmpty2 = _interopRequireDefault(require("lodash/isEmpty"));
+
 var _assign2 = _interopRequireDefault(require("lodash/assign"));
 
 var _defaults2 = _interopRequireDefault(require("lodash/defaults"));
@@ -23,6 +25,8 @@ var _victoryPolarAxis = require("victory-polar-axis");
 
 var _helperMethods = require("./helper-methods");
 
+var _reactFastCompare = _interopRequireDefault(require("react-fast-compare"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; var ownKeys = Object.keys(source); if (typeof Object.getOwnPropertySymbols === 'function') { ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function (sym) { return Object.getOwnPropertyDescriptor(source, sym).enumerable; })); } ownKeys.forEach(function (key) { _defineProperty(target, key, source[key]); }); } return target; }
@@ -66,28 +70,24 @@ function (_React$Component) {
         nodesDoneLoad: false,
         animating: true
       };
+      _this.setAnimationState = _victoryCore.Wrapper.setAnimationState.bind(_assertThisInitialized(_this));
     }
 
-    _this.setAnimationState = _victoryCore.Wrapper.setAnimationState.bind(_assertThisInitialized(_this));
-    _this.events = _victoryCore.Wrapper.getAllEvents(props);
     return _this;
   }
 
   _createClass(VictoryChart, [{
-    key: "componentWillMount",
-    value: function componentWillMount() {
-      this.events = _victoryCore.Wrapper.getAllEvents(this.props);
-    }
-  }, {
-    key: "componentWillReceiveProps",
-    value: function componentWillReceiveProps(nextProps) {
+    key: "shouldComponentUpdate",
+    value: function shouldComponentUpdate(nextProps) {
       if (this.props.animate) {
-        this.setAnimationState(this.props, nextProps);
+        if (!(0, _reactFastCompare.default)(this.props, nextProps)) {
+          this.setAnimationState(this.props, nextProps);
+          return false;
+        }
       }
 
-      this.events = _victoryCore.Wrapper.getAllEvents(nextProps);
-    } // the old ones were bad
-
+      return true;
+    }
   }, {
     key: "getNewChildren",
     value: function getNewChildren(props, childComponents, calculatedProps) {
@@ -157,11 +157,13 @@ function (_React$Component) {
       var containerProps = standalone ? this.getContainerProps(modifiedProps, calculatedProps) : {};
       var container = standalone ? this.renderContainer(containerComponent, containerProps) : groupComponent;
 
-      if (this.events) {
+      var events = _victoryCore.Wrapper.getAllEvents(props);
+
+      if (!(0, _isEmpty2.default)(events)) {
         return _react.default.createElement(_victorySharedEvents.VictorySharedEvents, {
           container: container,
           eventKey: eventKey,
-          events: this.events,
+          events: events,
           externalEventMutations: externalEventMutations
         }, newChildren);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "victory-chart",
-  "version": "31.1.0",
+  "version": "31.2.0",
   "description": "Chart Component for Victory",
   "keywords": [
     "data visualization",
@@ -22,10 +22,10 @@
     "lodash": "^4.17.5",
     "prop-types": "^15.5.8",
     "react-fast-compare": "^2.0.0",
-    "victory-axis": "^31.1.0",
-    "victory-core": "^31.1.0",
-    "victory-polar-axis": "^31.1.0",
-    "victory-shared-events": "^31.1.0"
+    "victory-axis": "^31.2.0",
+    "victory-core": "^31.2.0",
+    "victory-polar-axis": "^31.2.0",
+    "victory-shared-events": "^31.2.0"
   },
   "scripts": {
     "version": "nps build-libs && nps build-dists"

package/src/helper-methods.js

@@ -2,7 +2,7 @@
 /* eslint-disable no-use-before-define */
 
 import React from "react";
-import { Log, Helpers, Scale, Axis, Wrapper } from "victory-core";
+import { Helpers, Scale, Axis, Wrapper } from "victory-core";
 import { defaults, assign } from "lodash";
 
 function getAxisProps(child, props, calculatedProps) {
@@ -17,7 +17,8 @@ function getAxisProps(child, props, calculatedProps) {
   const crossAxis = childProps.crossAxis === false ? false : true;
   const orientation = Axis.getOrientation(child, axis, originSign[otherAxis]);
   return {
-    stringMap: stringMap[currentAxis],
+    stringMap,
+    horizontal,
     categories: categories[currentAxis],
     startAngle: props.startAngle,
     endAngle: props.endAngle,
@@ -162,25 +163,7 @@ const getChildComponents = (props, defaultAxes) => {
   if (axisComponents.dependent.length === 0 && axisComponents.independent.length === 0) {
     return childComponents.concat([defaultAxes.independent, defaultAxes.dependent]);
   }
-
-  let axisCount = 0;
-  return childComponents.filter((child) => {
-    const role = child.type && child.type.role;
-    const childProps = child.props || {};
-    if (role !== "axis" || childProps.dependentAxis) {
-      return true;
-    } else if (axisCount < 1) {
-      axisCount++;
-      return true;
-    } else {
-      const msg =
-        "Only one independent VictoryAxis component is allowed when " +
-        "using the VictoryChart wrapper. Only the first axis will be used. Please compose " +
-        "multi-axis charts manually";
-      Log.warn(msg);
-      return false;
-    }
-  });
+  return childComponents;
 };
 
 const getDefaultDomainPadding = (childComponents, horizontal) => {

package/src/victory-chart.js

@@ -1,4 +1,4 @@
-import { defaults, assign } from "lodash";
+import { defaults, assign, isEmpty } from "lodash";
 import PropTypes from "prop-types";
 import React from "react";
 import {
@@ -13,6 +13,7 @@ import { VictorySharedEvents } from "victory-shared-events";
 import { VictoryAxis } from "victory-axis";
 import { VictoryPolarAxis } from "victory-polar-axis";
 import { getChildComponents, getCalculatedProps, getChildren } from "./helper-methods";
+import isEqual from "react-fast-compare";
 
 const fallbackProps = {
   width: 450,
@@ -65,23 +66,20 @@ export default class VictoryChart extends React.Component {
         nodesDoneLoad: false,
         animating: true
       };
+      this.setAnimationState = Wrapper.setAnimationState.bind(this);
     }
-    this.setAnimationState = Wrapper.setAnimationState.bind(this);
-    this.events = Wrapper.getAllEvents(props);
   }
 
-  componentWillMount() {
-    this.events = Wrapper.getAllEvents(this.props);
-  }
-
-  componentWillReceiveProps(nextProps) {
+  shouldComponentUpdate(nextProps) {
     if (this.props.animate) {
-      this.setAnimationState(this.props, nextProps);
+      if (!isEqual(this.props, nextProps)) {
+        this.setAnimationState(this.props, nextProps);
+        return false;
+      }
     }
-    this.events = Wrapper.getAllEvents(nextProps);
+    return true;
   }
 
-  // the old ones were bad
   getNewChildren(props, childComponents, calculatedProps) {
     const children = getChildren(props, childComponents, calculatedProps);
     const getAnimationProps = Wrapper.getAnimationProps.bind(this);
@@ -134,12 +132,13 @@ export default class VictoryChart extends React.Component {
     const container = standalone
       ? this.renderContainer(containerComponent, containerProps)
       : groupComponent;
-    if (this.events) {
+    const events = Wrapper.getAllEvents(props);
+    if (!isEmpty(events)) {
       return (
         <VictorySharedEvents
           container={container}
           eventKey={eventKey}
-          events={this.events}
+          events={events}
           externalEventMutations={externalEventMutations}
         >
           {newChildren}