victory-core 30.6.1 → 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-label/victory-label.js

@@ -104,11 +104,11 @@ function (_React$Component) {
       }
 
       return "".concat(child).split("\n");
-    }
+    } //eslint-disable-next-line max-params
+
   }, {
     key: "getDy",
     value: function getDy(props, style, content, lineHeight) {
-      //eslint-disable-line max-params
       style = Array.isArray(style) ? style[0] : style;
       lineHeight = this.checkLineHeight(lineHeight, lineHeight[0], 1);
       var fontSize = style.fontSize;
@@ -261,6 +261,12 @@ Object.defineProperty(VictoryLabel, "role", {
   writable: true,
   value: "label"
 });
+Object.defineProperty(VictoryLabel, "defaultStyles", {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  value: defaultStyles
+});
 Object.defineProperty(VictoryLabel, "propTypes", {
   configurable: true,
   enumerable: true,

package/es/victory-primitives/path-helpers.js

@@ -54,9 +54,9 @@ export default {
     var baseSize = 1.35 * size; // eslint-disable-line no-magic-numbers
 
     var angle = Math.PI / 5; // eslint-disable-line no-magic-numbers
+    // eslint-disable-next-line no-magic-numbers
 
     var starCoords = _range(10).map(function (index) {
-      // eslint-disable-line no-magic-numbers
       var length = index % 2 === 0 ? baseSize : baseSize / 2;
       return "".concat(length * Math.sin(angle * (index + 1)) + x, ",\n        ").concat(length * Math.cos(angle * (index + 1)) + y);
     });

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

@@ -1,3 +1,4 @@
+import _isNil from "lodash/isNil";
 import _isEmpty from "lodash/isEmpty";
 import _without from "lodash/without";
 import _pick from "lodash/pick";
@@ -29,7 +30,12 @@ function _assertThisInitialized(self) { if (self === void 0) { throw new Referen
 import React from "react";
 import Events from "./events";
 import isEqual from "react-fast-compare";
-import VictoryTransition from "../victory-transition/victory-transition"; //  used for checking state changes. Expected components can be passed in via options
+import VictoryTransition from "../victory-transition/victory-transition";
+
+var datumHasXandY = function (datum) {
+  return !_isNil(datum._x) && !_isNil(datum._y);
+}; //  used for checking state changes. Expected components can be passed in via options
+
 
 var defaultComponents = [{
   name: "parent",
@@ -66,39 +72,39 @@ export default (function (WrappedComponent, options) {
         _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;
           }
-        }
-      }, {
-        key: "componentWillReceiveProps",
-        value: function componentWillReceiveProps(nextProps) {
-          this.cacheValues(this.getCalculatedValues(nextProps));
-        }
-      }, {
-        key: "applyExternalMutations",
-        value: function applyExternalMutations(props, externalMutations) {
-          if (!_isEmpty(externalMutations)) {
-            var callbacks = props.externalEventMutations.reduce(function (memo, mutation) {
-              memo = _isFunction(mutation.callback) ? memo.concat(mutation.callback) : memo;
-              return memo;
-            }, []);
-            var compiledCallbacks = callbacks.length ? function () {
-              callbacks.forEach(function (c) {
-                return c();
-              });
-            } : undefined;
-            this.setState(externalMutations, compiledCallbacks);
+
+          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
 
@@ -114,25 +120,41 @@ export default (function (WrappedComponent, options) {
             return {};
           }
 
-          options = options || {};
-          var components = options.components || defaultComponents;
-
           var getState = function (key, type) {
-            var baseState = _defaults({}, _this2.getEventState(key, type), getSharedEventState(key, type));
+            var result = _defaults({}, _this2.getEventState(key, type), getSharedEventState(key, type));
 
-            return _isEmpty(baseState) ? undefined : baseState;
+            return _isEmpty(result) ? undefined : result;
           };
 
-          return components.map(function (component) {
+          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",
+        value: function applyExternalMutations(props, externalMutations) {
+          if (!_isEmpty(externalMutations)) {
+            var callbacks = props.externalEventMutations.reduce(function (memo, mutation) {
+              memo = _isFunction(mutation.callback) ? memo.concat(mutation.callback) : memo;
+              return memo;
+            }, []);
+            var compiledCallbacks = callbacks.length ? function () {
+              callbacks.forEach(function (c) {
+                return c();
+              });
+            } : undefined;
+            this.setState(externalMutations, compiledCallbacks);
+          }
         }
       }, {
         key: "getCalculatedValues",
@@ -248,7 +270,8 @@ export default (function (WrappedComponent, options) {
         }
       }, {
         key: "animateComponent",
-        value: function animateComponent(props, animationWhitelist) {
+        value: function animateComponent(props, defaultAnimationWhitelist) {
+          var animationWhitelist = props.animate && props.animate.animationWhitelist ? props.animate.animationWhitelist : defaultAnimationWhitelist;
           return React.createElement(VictoryTransition, {
             animate: props.animate,
             animationWhitelist: animationWhitelist
@@ -284,14 +307,19 @@ export default (function (WrappedComponent, options) {
         value: function renderData(props) {
           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.map(function (_dataKey, index) {
+          var dataComponents = this.dataKeys.reduce(function (validDataComponents, _dataKey, index) {
             var dataProps = _this5.getComponentProps(dataComponent, "data", index);
 
-            return React.cloneElement(dataComponent, dataProps);
-          });
+            if (shouldRenderDatum(dataProps.datum)) {
+              validDataComponents.push(React.cloneElement(dataComponent, dataProps));
+            }
+
+            return validDataComponents;
+          }, []);
           var labelComponents = this.dataKeys.map(function (_dataKey, index) {
             var labelProps = _this5.getComponentProps(labelComponent, "labels", index);
 

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

@@ -1,4 +1,5 @@
 import _includes from "lodash/includes";
+import _isEqual from "lodash/isEqual";
 import _isEmpty from "lodash/isEmpty";
 import _orderBy from "lodash/orderBy";
 import _property from "lodash/property";
@@ -107,12 +108,19 @@ function getEventKey(key) {
 
 
 function addEventKeys(props, data) {
+  var hasEventKeyAccessor = !!props.eventKey;
   var eventKeyAccessor = getEventKey(props.eventKey);
-  return data.map(function (datum, index) {
-    var eventKey = datum.eventKey || eventKeyAccessor(datum) || index;
-    return _assign({
-      eventKey: eventKey
-    }, datum);
+  return data.map(function (datum) {
+    if (datum.eventKey !== undefined) {
+      return datum;
+    } else if (hasEventKeyAccessor) {
+      var eventKey = eventKeyAccessor(datum);
+      return eventKey !== undefined ? _assign({
+        eventKey: eventKey
+      }, datum) : datum;
+    } else {
+      return datum;
+    }
   });
 } // Exported Functions
 
@@ -180,7 +188,8 @@ function formatData(dataset, props, expectedKeys) {
     return [];
   }
 
-  expectedKeys = Array.isArray(expectedKeys) ? expectedKeys : ["x", "y", "y0"];
+  var defaultKeys = ["x", "y", "y0"];
+  expectedKeys = Array.isArray(expectedKeys) ? expectedKeys : defaultKeys;
   var stringMap = {
     x: expectedKeys.indexOf("x") !== -1 ? createStringMap(props, "x") : undefined,
     y: expectedKeys.indexOf("y") !== -1 ? createStringMap(props, "y") : undefined,
@@ -195,7 +204,8 @@ function formatData(dataset, props, expectedKeys) {
     memo[type] = createAccessor(type);
     return memo;
   }, {});
-  var data = dataset.reduce(function (dataArr, datum, index) {
+  var preformattedData = _isEqual(expectedKeys, defaultKeys) && props.x === "_x" && props.y === "_y" && props.y0 === "_y0";
+  var data = preformattedData ? dataset : dataset.reduce(function (dataArr, datum, index) {
     // eslint-disable-line complexity
     datum = parseDatum(datum);
     var fallbackValues = {
@@ -328,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/domain.js

@@ -315,27 +315,35 @@ function getDomainWithZero(props, axis) {
     return propsDomain;
   }
 
+  var dataset = Data.getData(props);
+  var y0Min = dataset.reduce(function (min, datum) {
+    return datum._y0 < min ? datum._y0 : min;
+  }, Infinity);
+
   var ensureZero = function (domain) {
     var currentAxis = Helpers.getCurrentAxis(axis, props.horizontal);
-    var minDomain = getMinFromProps(props, axis);
-    var maxDomain = getMaxFromProps(props, axis);
 
     if (currentAxis === "x") {
       return domain;
     }
 
-    var defaultMin = minDomain || 0;
-    var defaultMax = maxDomain || 0;
-    var min = minDomain !== undefined ? minDomain : Collection.getMinValue(domain, defaultMin);
-    var max = maxDomain !== undefined ? maxDomain : Collection.getMaxValue(domain, defaultMax);
+    var defaultMin = y0Min !== Infinity ? y0Min : 0;
+    var maxDomainProp = getMaxFromProps(props, axis);
+    var minDomainProp = getMinFromProps(props, axis);
+    var max = maxDomainProp !== undefined ? maxDomainProp : Collection.getMaxValue(domain, defaultMin);
+    var min = minDomainProp !== undefined ? minDomainProp : Collection.getMinValue(domain, defaultMin);
     return getDomainFromMinMax(min, max);
   };
 
+  var getDomainFunction = function () {
+    return getDomainFromData(props, axis, dataset);
+  };
+
   var formatDomainFunction = function (domain) {
     return formatDomain(ensureZero(domain), props, axis);
   };
 
-  return createDomainFunction(null, formatDomainFunction)(props, axis);
+  return createDomainFunction(getDomainFunction, formatDomainFunction)(props, axis);
 }
 /**
  * Returns the maxDomain from props if it exists

package/es/victory-util/events.js

@@ -413,7 +413,7 @@ export default {
 
   /* Returns an array of defaultEvents from sub-components of a given component.
    * i.e. any static `defaultEvents` on `labelComponent` will be returned
-  */
+   */
   getComponentEvents: function (props, components) {
     var events = Array.isArray(components) && components.reduce(function (memo, componentName) {
       var _memo;

package/es/victory-util/helpers.js

@@ -164,11 +164,11 @@ function evaluateStyle(style, data, active) {
 }
 
 function degreesToRadians(degrees) {
-  return degrees * (Math.PI / 180);
+  return typeof degrees === "number" ? degrees * (Math.PI / 180) : degrees;
 }
 
 function radiansToDegrees(radians) {
-  return radians / (Math.PI / 180);
+  return typeof radians === "number" ? radians / (Math.PI / 180) : radians;
 }
 
 function getRadius(props) {
@@ -249,12 +249,21 @@ function getCurrentAxis(axis, horizontal) {
  * @param {Array} children: an array of child components
  * @param {Function} iteratee: a function with arguments "child", "childName", and "parent"
  * @param {Object} parentProps: props from the parent that are applied to children
+ * @param {any}  initialMemo: The object in which the iteration results are combined.
+ * @param {Function} combine: Combines the result of the iteratee with the current memo
+ *   to the memo for the next iteration step
  * @returns {Array} returns an array of results from calling the iteratee on all nested children
  */
 
+/* eslint-disable max-params */
+
 
 function reduceChildren(children, iteratee) {
   var parentProps = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+  var initialMemo = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
+  var combine = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : function (memo, item) {
+    return memo.concat(item);
+  };
   var sharedProps = ["data", "domain", "categories", "polar", "startAngle", "endAngle", "minDomain", "maxDomain"];
 
   var traverseChildren = function (childArray, names, parent) {
@@ -276,14 +285,17 @@ function reduceChildren(children, iteratee) {
         });
 
         var nestedResults = traverseChildren(nestedChildren, _childNames, child);
-        memo = memo.concat(nestedResults);
+        memo = combine(memo, nestedResults);
       } else {
         var result = iteratee(child, childName, parent);
-        memo = result ? memo.concat(result) : memo;
+
+        if (result) {
+          memo = combine(memo, result);
+        }
       }
 
       return memo;
-    }, []);
+    }, initialMemo);
   };
 
   var childNames = children.map(function (c, i) {

package/es/victory-util/label-helpers.js

@@ -99,14 +99,12 @@ function getLabelPlacement(props) {
 }
 
 function getPolarOrientation(degrees) {
+  // eslint-disable-next-line no-magic-numbers
   if (degrees < 45 || degrees > 315) {
-    // eslint-disable-line no-magic-numbers
-    return "right";
+    return "right"; // eslint-disable-next-line no-magic-numbers
   } else if (degrees >= 45 && degrees <= 135) {
-    // eslint-disable-line no-magic-numbers
-    return "top";
+    return "top"; // eslint-disable-next-line no-magic-numbers
   } else if (degrees > 135 && degrees < 225) {
-    // eslint-disable-line no-magic-numbers
     return "left";
   } else {
     return "bottom";