victory-core 31.1.0 → 31.2.0

package/es/victory-animation/victory-animation.js

@@ -24,6 +24,7 @@ import PropTypes from "prop-types";
 import * as d3Ease from "d3-ease";
 import { victoryInterpolator } from "./util";
 import Timer from "../victory-util/timer";
+import isEqual from "react-fast-compare";
 
 var VictoryAnimation =
 /*#__PURE__*/
@@ -68,31 +69,35 @@ function (_React$Component) {
         this.traverseQueue();
       }
     }
-    /* lifecycle */
-
   }, {
-    key: "componentWillReceiveProps",
-    value: function componentWillReceiveProps(nextProps) {
-      /* cancel existing loop if it exists */
-      this.getTimer().unsubscribe(this.loopID);
-      /* If an object was supplied */
-
-      if (!Array.isArray(nextProps.data)) {
-        // Replace the tween queue. Could set `this.queue = [nextProps.data]`,
-        // but let's reuse the same array.
-        this.queue.length = 0;
-        this.queue.push(nextProps.data);
-        /* If an array was supplied */
-      } else {
-        var _queue;
+    key: "shouldComponentUpdate",
+    value: function shouldComponentUpdate(nextProps, nextState) {
+      var equalProps = isEqual(this.props, nextProps);
 
-        /* Extend the tween queue */
-        (_queue = this.queue).push.apply(_queue, _toConsumableArray(nextProps.data));
-      }
-      /* Start traversing the tween queue */
+      if (!equalProps) {
+        /* cancel existing loop if it exists */
+        this.getTimer().unsubscribe(this.loopID);
+        /* If an object was supplied */
+
+        if (!Array.isArray(nextProps.data)) {
+          // Replace the tween queue. Could set `this.queue = [nextProps.data]`,
+          // but let's reuse the same array.
+          this.queue.length = 0;
+          this.queue.push(nextProps.data);
+          /* If an array was supplied */
+        } else {
+          var _queue;
 
+          /* Extend the tween queue */
+          (_queue = this.queue).push.apply(_queue, _toConsumableArray(nextProps.data));
+        }
+        /* Start traversing the tween queue */
+
+
+        this.traverseQueue();
+      }
 
-      this.traverseQueue();
+      return nextState.animationInfo.animating || !equalProps;
     }
   }, {
     key: "componentWillUnmount",

package/es/victory-transition/victory-transition.js

@@ -24,6 +24,7 @@ import Collection from "../victory-util/collection";
 import Helpers from "../victory-util/helpers";
 import Timer from "../victory-util/timer";
 import Transitions from "../victory-util/transitions";
+import isEqual from "react-fast-compare";
 
 var VictoryTransition =
 /*#__PURE__*/
@@ -56,14 +57,18 @@ function (_React$Component) {
       }); //eslint-disable-line react/no-did-mount-set-state
     }
   }, {
-    key: "componentWillReceiveProps",
-    value: function componentWillReceiveProps(nextProps) {
+    key: "shouldComponentUpdate",
+    value: function shouldComponentUpdate(nextProps) {
       var _this2 = this;
 
-      this.getTimer().bypassAnimation();
-      this.setState(this.getTransitionState(this.props, nextProps), function () {
-        return _this2.getTimer().resumeAnimation();
-      });
+      if (!isEqual(this.props, nextProps)) {
+        this.getTimer().bypassAnimation();
+        this.setState(this.getTransitionState(this.props, nextProps), function () {
+          return _this2.getTimer().resumeAnimation();
+        });
+      }
+
+      return true;
     }
   }, {
     key: "componentWillUnmount",

package/es/victory-util/add-events.js

@@ -34,9 +34,18 @@ import VictoryTransition from "../victory-transition/victory-transition";
 
 var datumHasXandY = function (datum) {
   return !_isNil(datum._x) && !_isNil(datum._y);
-};
-
-export default (function (WrappedComponent) {
+}; //  used for checking state changes. Expected components can be passed in via options
+
+
+var defaultComponents = [{
+  name: "parent",
+  index: "parent"
+}, {
+  name: "data"
+}, {
+  name: "labels"
+}];
+export default (function (WrappedComponent, options) {
   return (
     /*#__PURE__*/
     function (_WrappedComponent) {
@@ -63,23 +72,73 @@ export default (function (WrappedComponent) {
         _this.cacheValues(calculatedValues);
 
         _this.externalMutations = _this.getExternalMutations(props);
+        _this.calculatedState = _this.getStateChanges(props, calculatedValues);
         return _this;
       }
 
       _createClass(addEvents, [{
-        key: "componentDidUpdate",
-        value: function componentDidUpdate() {
-          var externalMutations = this.getExternalMutations(this.props);
-
-          if (!isEqual(this.externalMutations, externalMutations)) {
+        key: "shouldComponentUpdate",
+        value: function shouldComponentUpdate(nextProps) {
+          var calculatedValues = this.getCalculatedValues(nextProps);
+          var externalMutations = this.getExternalMutations(nextProps);
+          var animating = this.props.animating || this.props.animate;
+          var newMutation = !isEqual(externalMutations, this.externalMutations);
+
+          if (animating || newMutation) {
+            this.cacheValues(calculatedValues);
             this.externalMutations = externalMutations;
-            this.applyExternalMutations(this.props, externalMutations);
+            this.applyExternalMutations(nextProps, externalMutations);
+            return true;
           }
-        }
+
+          var calculatedState = this.getStateChanges(nextProps, calculatedValues);
+
+          if (!isEqual(this.calculatedState, calculatedState)) {
+            this.calculatedState = calculatedState;
+            this.cacheValues(calculatedValues);
+            return true;
+          }
+
+          if (!isEqual(this.props, nextProps)) {
+            this.cacheValues(calculatedValues);
+            return true;
+          }
+
+          return false;
+        } // compile all state changes from own and parent state. Order doesn't matter, as any state
+        // state change should trigger a re-render
+
       }, {
-        key: "componentWillReceiveProps",
-        value: function componentWillReceiveProps(nextProps) {
-          this.cacheValues(this.getCalculatedValues(nextProps));
+        key: "getStateChanges",
+        value: function getStateChanges(props, calculatedValues) {
+          var _this2 = this;
+
+          var hasEvents = calculatedValues.hasEvents,
+              getSharedEventState = calculatedValues.getSharedEventState;
+
+          if (!hasEvents) {
+            return {};
+          }
+
+          var getState = function (key, type) {
+            var result = _defaults({}, _this2.getEventState(key, type), getSharedEventState(key, type));
+
+            return _isEmpty(result) ? undefined : result;
+          };
+
+          options = options || {};
+          var components = options.components || defaultComponents;
+          var stateChanges = components.map(function (component) {
+            if (!props.standalone && component.name === "parent") {
+              // don't check for changes on parent props for non-standalone components
+              return undefined;
+            } else {
+              return component.index !== undefined ? getState(component.index, component.name) : calculatedValues.dataKeys.map(function (key) {
+                return getState(key, component.name);
+              }).filter(Boolean);
+            }
+          }).filter(Boolean);
+          return stateChanges;
         }
       }, {
         key: "applyExternalMutations",
@@ -133,10 +192,10 @@ export default (function (WrappedComponent) {
       }, {
         key: "cacheValues",
         value: function cacheValues(obj) {
-          var _this2 = this;
+          var _this3 = this;
 
           _keys(obj).forEach(function (key) {
-            _this2[key] = obj[key];
+            _this3[key] = obj[key];
           });
         }
       }, {
@@ -222,7 +281,7 @@ export default (function (WrappedComponent) {
       }, {
         key: "renderContinuousData",
         value: function renderContinuousData(props) {
-          var _this3 = this;
+          var _this4 = this;
 
           var dataComponent = props.dataComponent,
               labelComponent = props.labelComponent,
@@ -231,7 +290,7 @@ export default (function (WrappedComponent) {
           var dataKeys = _without(this.dataKeys, "all");
 
           var labelComponents = dataKeys.reduce(function (memo, key) {
-            var labelProps = _this3.getComponentProps(labelComponent, "labels", key);
+            var labelProps = _this4.getComponentProps(labelComponent, "labels", key);
 
             if (labelProps && labelProps.text !== undefined && labelProps.text !== null) {
               memo = memo.concat(React.cloneElement(labelComponent, labelProps));
@@ -246,14 +305,14 @@ export default (function (WrappedComponent) {
       }, {
         key: "renderData",
         value: function renderData(props) {
-          var _this4 = this;
+          var _this5 = this;
 
           var shouldRenderDatum = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : datumHasXandY;
           var dataComponent = props.dataComponent,
               labelComponent = props.labelComponent,
               groupComponent = props.groupComponent;
           var dataComponents = this.dataKeys.reduce(function (validDataComponents, _dataKey, index) {
-            var dataProps = _this4.getComponentProps(dataComponent, "data", index);
+            var dataProps = _this5.getComponentProps(dataComponent, "data", index);
 
             if (shouldRenderDatum(dataProps.datum)) {
               validDataComponents.push(React.cloneElement(dataComponent, dataProps));
@@ -262,7 +321,7 @@ export default (function (WrappedComponent) {
             return validDataComponents;
           }, []);
           var labelComponents = this.dataKeys.map(function (_dataKey, index) {
-            var labelProps = _this4.getComponentProps(labelComponent, "labels", index);
+            var labelProps = _this5.getComponentProps(labelComponent, "labels", index);
 
             if (labelProps.text !== undefined && labelProps.text !== null) {
               return React.cloneElement(labelComponent, labelProps);

package/es/victory-util/axis.js

@@ -5,6 +5,7 @@ import _orderBy from "lodash/orderBy";
 import _range from "lodash/range";
 import _uniq from "lodash/uniq";
 import _invert from "lodash/invert";
+import _isObject from "lodash/isObject";
 import _isFunction from "lodash/isFunction";
 import _identity from "lodash/identity";
 
@@ -211,8 +212,10 @@ function stringTicks(props) {
 }
 
 function getDefaultTickFormat(props) {
-  var tickValues = props.tickValues,
-      stringMap = props.stringMap;
+  var tickValues = props.tickValues;
+  var axis = getAxis(props);
+  var currentAxis = getCurrentAxis(axis, props.horizontal);
+  var stringMap = props.stringMap && props.stringMap[currentAxis];
   var fallbackFormat = tickValues && !Collection.containsDates(tickValues) ? function (x) {
     return x;
   } : undefined;
@@ -240,8 +243,10 @@ function getDefaultTickFormat(props) {
 }
 
 function getTickFormat(props, scale) {
-  var tickFormat = props.tickFormat,
-      stringMap = props.stringMap;
+  var tickFormat = props.tickFormat;
+  var axis = getAxis(props);
+  var currentAxis = getCurrentAxis(axis, props.horizontal);
+  var stringMap = props.stringMap && props.stringMap[currentAxis];
 
   if (!tickFormat) {
     var defaultTickFormat = getDefaultTickFormat(props);
@@ -272,8 +277,9 @@ function getTickFormat(props, scale) {
 }
 
 function getStringTicks(props) {
-  var stringMap = props.stringMap;
   var axis = getAxis(props);
+  var currentAxis = getCurrentAxis(axis, props.horizontal);
+  var stringMap = props.stringMap && props.stringMap[currentAxis];
   var categories = Array.isArray(props.categories) ? props.categories : props.categories && props.categories[axis];
   var ticksFromCategories = categories && Collection.containsOnlyStrings(categories) ? categories.map(function (tick) {
     return stringMap[tick];
@@ -286,8 +292,10 @@ function getStringTicks(props) {
 
 function getTickArray(props) {
   var tickValues = props.tickValues,
-      tickFormat = props.tickFormat,
-      stringMap = props.stringMap;
+      tickFormat = props.tickFormat;
+  var axis = getAxis(props);
+  var currentAxis = getCurrentAxis(axis, props.horizontal);
+  var stringMap = props.stringMap && props.stringMap[currentAxis];
 
   var getTicksFromFormat = function () {
     if (!tickFormat || !Array.isArray(tickFormat)) {
@@ -314,7 +322,6 @@ function getTickArray(props) {
   var tickArray = ticks ? _uniq(ticks) : getTicksFromFormat(props);
 
   var filterArray = function (arr) {
-    var axis = getAxis(props);
     var domain = props.domain && props.domain[axis] || props.domain;
     return Array.isArray(domain) ? arr.filter(function (t) {
       return t >= Math.min.apply(Math, _toConsumableArray(domain)) && t <= Math.max.apply(Math, _toConsumableArray(domain));
@@ -410,6 +417,24 @@ function getDomain(props, axis) {
   return Domain.createDomainFunction(getDomainFromData)(props, inherentAxis);
 }
 
+function getAxisValue(props, axis) {
+  if (!props.axisValue) {
+    return undefined;
+  }
+
+  var scaleAxis = axis === "x" ? "y" : "x";
+  var scale = _isObject(props.scale) && _isFunction(props.scale[scaleAxis]) ? props.scale[scaleAxis] : undefined;
+
+  if (!scale) {
+    return undefined;
+  }
+
+  var stringMapAxis = getCurrentAxis(axis, props.horizontal) === "x" ? "y" : "x";
+  var stringMap = _isObject(props.stringMap) && props.stringMap[stringMapAxis];
+  var axisValue = stringMap && typeof props.axisValue === "string" ? stringMap[props.axisValue] : props.axisValue;
+  return scale(axisValue);
+}
+
 export default {
   getTicks: getTicks,
   getTickFormat: getTickFormat,
@@ -423,5 +448,6 @@ export default {
   getOriginSign: getOriginSign,
   getDomain: getDomain,
   isVertical: isVertical,
-  stringTicks: stringTicks
+  stringTicks: stringTicks,
+  getAxisValue: getAxisValue
 };

package/es/victory-util/data.js

@@ -338,8 +338,13 @@ function getStringsFromData(props, axis) {
   }
 
   var key = props[axis] === undefined ? axis : props[axis];
-  var accessor = Helpers.createAccessor(key);
-  var sortedData = sortData(props.data, props.sortKey, props.sortOrder);
+  var accessor = Helpers.createAccessor(key); // support immutable data
+
+  var data = props.data.reduce(function (memo, d) {
+    memo.push(parseDatum(d));
+    return memo;
+  }, []);
+  var sortedData = sortData(data, props.sortKey, props.sortOrder);
   var dataStrings = sortedData.reduce(function (dataArr, datum) {
     datum = parseDatum(datum);
     dataArr.push(accessor(datum));

package/es/victory-util/helpers.js

@@ -289,9 +289,7 @@ function reduceChildren(children, iteratee) {
       } else {
         var result = iteratee(child, childName, parent);
 
-        if (Array.isArray(result)) {
-          memo = result.reduce(combine, memo);
-        } else if (result) {
+        if (result) {
           memo = combine(memo, result);
         }
       }

package/es/victory-util/wrapper.js

@@ -128,14 +128,15 @@ export default {
   getAllEvents: function (props) {
     var components = ["groupComponent", "containerComponent", "labelComponent"];
     this.componentEvents = Events.getComponentEvents(props, components);
+    var events = props.events;
 
     if (Array.isArray(this.componentEvents)) {
       var _componentEvents;
 
-      return Array.isArray(props.events) ? (_componentEvents = this.componentEvents).concat.apply(_componentEvents, _toConsumableArray(props.events)) : this.componentEvents;
+      events = Array.isArray(props.events) ? (_componentEvents = this.componentEvents).concat.apply(_componentEvents, _toConsumableArray(props.events)) : this.componentEvents;
     }
 
-    return props.events;
+    return events || [];
   },
   getAnimationProps: function (props, child, index) {
     var _this = this;
@@ -373,9 +374,15 @@ export default {
     };
 
     var combine = function (memo, datum) {
+      var x = Array.isArray(datum) ? datum.map(function (d) {
+        return d.x;
+      }).filter(Boolean) : datum.x;
+      var y = Array.isArray(datum) ? datum.map(function (d) {
+        return d.y;
+      }).filter(Boolean) : datum.y;
       return {
-        x: datum.x !== undefined ? memo.x.concat(datum.x) : memo.x,
-        y: datum.y !== undefined ? memo.y.concat(datum.y) : memo.y
+        x: x !== undefined ? memo.x.concat(x) : memo.x,
+        y: y !== undefined ? memo.y.concat(y) : memo.y
       };
     };
 

package/lib/victory-animation/victory-animation.js

@@ -15,6 +15,8 @@ var _util = require("./util");
 
 var _timer = _interopRequireDefault(require("../victory-util/timer"));
 
+var _reactFastCompare = _interopRequireDefault(require("react-fast-compare"));
+
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = Object.defineProperty && Object.getOwnPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : {}; if (desc.get || desc.set) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } } newObj.default = obj; return newObj; } }
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -82,31 +84,35 @@ function (_React$Component) {
         this.traverseQueue();
       }
     }
-    /* lifecycle */
-
   }, {
-    key: "componentWillReceiveProps",
-    value: function componentWillReceiveProps(nextProps) {
-      /* cancel existing loop if it exists */
-      this.getTimer().unsubscribe(this.loopID);
-      /* If an object was supplied */
-
-      if (!Array.isArray(nextProps.data)) {
-        // Replace the tween queue. Could set `this.queue = [nextProps.data]`,
-        // but let's reuse the same array.
-        this.queue.length = 0;
-        this.queue.push(nextProps.data);
-        /* If an array was supplied */
-      } else {
-        var _queue;
+    key: "shouldComponentUpdate",
+    value: function shouldComponentUpdate(nextProps, nextState) {
+      var equalProps = (0, _reactFastCompare.default)(this.props, nextProps);
 
-        /* Extend the tween queue */
-        (_queue = this.queue).push.apply(_queue, _toConsumableArray(nextProps.data));
-      }
-      /* Start traversing the tween queue */
+      if (!equalProps) {
+        /* cancel existing loop if it exists */
+        this.getTimer().unsubscribe(this.loopID);
+        /* If an object was supplied */
+
+        if (!Array.isArray(nextProps.data)) {
+          // Replace the tween queue. Could set `this.queue = [nextProps.data]`,
+          // but let's reuse the same array.
+          this.queue.length = 0;
+          this.queue.push(nextProps.data);
+          /* If an array was supplied */
+        } else {
+          var _queue;
 
+          /* Extend the tween queue */
+          (_queue = this.queue).push.apply(_queue, _toConsumableArray(nextProps.data));
+        }
+        /* Start traversing the tween queue */
+
+
+        this.traverseQueue();
+      }
 
-      this.traverseQueue();
+      return nextState.animationInfo.animating || !equalProps;
     }
   }, {
     key: "componentWillUnmount",

package/lib/victory-transition/victory-transition.js

@@ -27,6 +27,8 @@ var _timer = _interopRequireDefault(require("../victory-util/timer"));
 
 var _transitions = _interopRequireDefault(require("../victory-util/transitions"));
 
+var _reactFastCompare = _interopRequireDefault(require("react-fast-compare"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
@@ -74,14 +76,18 @@ function (_React$Component) {
       }); //eslint-disable-line react/no-did-mount-set-state
     }
   }, {
-    key: "componentWillReceiveProps",
-    value: function componentWillReceiveProps(nextProps) {
+    key: "shouldComponentUpdate",
+    value: function shouldComponentUpdate(nextProps) {
       var _this2 = this;
 
-      this.getTimer().bypassAnimation();
-      this.setState(this.getTransitionState(this.props, nextProps), function () {
-        return _this2.getTimer().resumeAnimation();
-      });
+      if (!(0, _reactFastCompare.default)(this.props, nextProps)) {
+        this.getTimer().bypassAnimation();
+        this.setState(this.getTransitionState(this.props, nextProps), function () {
+          return _this2.getTimer().resumeAnimation();
+        });
+      }
+
+      return true;
     }
   }, {
     key: "componentWillUnmount",