victory-core 30.6.1 → 31.2.0

package/es/victory-util/textsize.js

@@ -11,39 +11,39 @@ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) { for (var i = 0, arr
 
 var fontDictionary = {
   "American Typewriter": 2.09,
-  "Baskerville": 2.51,
-  "Georgia": 2.27,
+  Baskerville: 2.51,
+  Georgia: 2.27,
   "Hoefler Text": 2.39,
-  "Palatino": 2.26,
+  Palatino: 2.26,
   "Times New Roman": 2.48,
-  "Arial": 2.26,
+  Arial: 2.26,
   "Gill Sans": 2.47,
   "Gill Sans 300": 2.58,
   "Helvetica Neue": 2.24,
   "Lucida Grande": 2.05,
-  "Tahoma": 2.25,
+  Tahoma: 2.25,
   "Trebuchet MS": 2.2,
-  "Verdana": 1.96,
+  Verdana: 1.96,
   "Courier New": 1.67,
-  "cursive": 1.84,
-  "fantasy": 2.09,
-  "monospace": 1.81,
-  "serif": 2.04,
+  cursive: 1.84,
+  fantasy: 2.09,
+  monospace: 1.81,
+  serif: 2.04,
   "sans-serif": 1.89
 }; //https://developer.mozilla.org/en/docs/Web/CSS/length
 // Absolute sizes in pixels for obsolete measurement units.
 
 var absoluteMeasurementUnitsToPixels = {
-  "mm": 3.8,
-  "sm": 38,
-  "pt": 1.33,
-  "pc": 16,
-  "in": 96,
-  "px": 1
+  mm: 3.8,
+  sm: 38,
+  pt: 1.33,
+  pc: 16,
+  in: 96,
+  px: 1
 };
 var relativeMeasurementUnitsCoef = {
-  "em": 1,
-  "ex": 0.5
+  em: 1,
+  ex: 0.5
 };
 var coefficients = {
   averageFontConstant: 2.1675,
@@ -88,7 +88,7 @@ var _getSizeWithRotate = function (axisSize, dependentSize, angle) {
  * @param  {string} length Css length string value.
  * @param  {number} fontSize Current text font-size.
  * @returns {number} Approximate Css length in pixels.
-*/
+ */
 
 
 var convertLengthToPixels = function (length, fontSize) {
@@ -163,7 +163,7 @@ var _approximateTextHeightInternal = function (text, style) {
  * @param {number} style.characterConstant Average pixels per glyph.
  * @param {number} style.lineHeight Line height coefficient.
  * @returns {number} Approximate text label height.
-*/
+ */
 
 
 var approximateTextSize = function (text, style) {

package/es/victory-util/transitions.js

@@ -129,10 +129,10 @@ function getInitialChildProps(animate, data) {
       return _assign({}, datum, after(datum, idx, data));
     })
   };
-}
+} // eslint-disable-next-line max-params
+
 
 function getChildBeforeLoad(animate, child, data, cb) {
-  // eslint-disable-line max-params
   animate = _assign({}, animate, {
     onEnd: cb
   });
@@ -154,10 +154,10 @@ function getChildBeforeLoad(animate, child, data, cb) {
     data: data,
     clipWidth: 0
   };
-}
+} // eslint-disable-next-line max-params
+
 
 function getChildOnLoad(animate, data, cb) {
-  // eslint-disable-line max-params
   animate = _assign({}, animate, {
     onEnd: cb
   });
@@ -178,10 +178,10 @@ function getChildOnLoad(animate, data, cb) {
     animate: animate,
     data: data
   };
-}
+} // eslint-disable-next-line max-params, max-len
+
 
 function getChildPropsOnExit(animate, child, data, exitingNodes, cb) {
-  // eslint-disable-line max-params, max-len
   // Whether or not _this_ child has exiting nodes, we want the exit-
   // transition for all children to have the same duration, delay, etc.
   var onExit = animate && animate.onExit;
@@ -203,10 +203,10 @@ function getChildPropsOnExit(animate, child, data, exitingNodes, cb) {
     animate: animate,
     data: data
   };
-}
+} // eslint-disable-next-line max-params,max-len
+
 
 function getChildPropsBeforeEnter(animate, child, data, enteringNodes, cb) {
-  // eslint-disable-line max-params,max-len
   if (enteringNodes) {
     // Perform a normal animation here, except - when it finishes - trigger
     // the transition for entering nodes.
@@ -227,10 +227,10 @@ function getChildPropsBeforeEnter(animate, child, data, enteringNodes, cb) {
     animate: animate,
     data: data
   };
-}
+} // eslint-disable-next-line max-params, max-len
+
 
 function getChildPropsOnEnter(animate, data, enteringNodes, cb) {
-  // eslint-disable-line max-params, max-len
   // Whether or not _this_ child has entering nodes, we want the entering-
   // transition for all children to have the same duration, delay, etc.
   var onEnter = animate && animate.onEnter;
@@ -302,19 +302,19 @@ function getTransitionPropsFactory(props, state, setState) {
         nodesDoneLoad: true
       });
     });
-  };
+  }; // eslint-disable-next-line max-params
+
 
   var onExit = function (nodes, child, data, animate) {
-    // eslint-disable-line max-params
     return getChildPropsOnExit(animate, child, data, nodes, function () {
       setState({
         nodesWillExit: false
       });
     });
-  };
+  }; // eslint-disable-next-line max-params
+
 
   var onEnter = function (nodes, child, data, animate) {
-    // eslint-disable-line max-params
     if (nodesShouldEnter) {
       return getChildPropsOnEnter(animate, data, nodes, function () {
         setState({
@@ -345,10 +345,10 @@ function getTransitionPropsFactory(props, state, setState) {
     } else {
       return {};
     }
-  };
+  }; // eslint-disable-next-line max-statements, complexity, max-len
+
 
   return function getTransitionProps(child, index) {
-    // eslint-disable-line max-statements, complexity, max-len
     var data = getChildData(child) || [];
 
     var animate = _defaults({}, props.animate, child.props.animate);

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;
@@ -247,9 +248,10 @@ export default {
       }
 
       stack += 1;
-      return childData.map(function (datum) {
+      return childData.map(function (datum, index) {
         return _assign({
-          stack: stack
+          stack: stack,
+          group: index
         }, datum);
       });
     };
@@ -259,7 +261,7 @@ export default {
       return c.type && c.type.role === "stack";
     }).length;
     var datasets = Helpers.reduceChildren(children, iteratee, props);
-    var group = stacked ? "eventKey" : "stack";
+    var group = stacked ? "group" : "stack";
     return _values(_groupBy(datasets, group));
   },
   getColor: function (calculatedProps, child, index) {
@@ -335,7 +337,7 @@ export default {
       if (!Domain.isDomainComponent(child) || !childProps.categories) {
         return null;
       } else {
-        var categories = childProps.categories && !Array.isArray(childProps.categories) ? childProps.categories[axis] : childProps.rops.categories;
+        var categories = childProps.categories && !Array.isArray(childProps.categories) ? childProps.categories[axis] : childProps.props.categories;
         var categoryStrings = categories && categories.filter(function (val) {
           return typeof val === "string";
         });
@@ -345,7 +347,7 @@ export default {
 
     return Helpers.reduceChildren(childComponents.slice(0), iteratee);
   },
-  getStringsFromData: function (childComponents, axis) {
+  getStringsFromData: function (childComponents) {
     var iteratee = function (child) {
       var childProps = child.props || {};
       var data;
@@ -358,27 +360,62 @@ export default {
         data = Data.getData(childProps);
       }
 
-      var attr = axis === "x" ? "xName" : "yName";
       return data.map(function (d) {
-        return d[attr];
-      }).filter(Boolean);
+        return {
+          x: d.xName,
+          y: d.yName
+        };
+      });
     };
 
-    return Helpers.reduceChildren(childComponents.slice(0), iteratee);
+    var initialMemo = {
+      x: [],
+      y: []
+    };
+
+    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: x !== undefined ? memo.x.concat(x) : memo.x,
+        y: y !== undefined ? memo.y.concat(y) : memo.y
+      };
+    };
+
+    return Helpers.reduceChildren(childComponents.slice(0), iteratee, {}, initialMemo, combine);
   },
-  getStringsFromChildren: function (props, axis, childComponents) {
+  getCategoryAndAxisStringsFromChildren: function (props, axis, childComponents) {
     var currentAxis = Helpers.getCurrentAxis(axis, props.horizontal);
-    childComponents = childComponents || React.Children.toArray(props.children);
     var categories = _isPlainObject(props.categories) ? props.categories[axis] : props.categories;
     var axisComponent = Axis.getAxisComponent(childComponents, currentAxis);
     var axisStrings = axisComponent ? Data.getStringsFromAxes(axisComponent.props, axis) : [];
     var categoryStrings = categories || this.getStringsFromCategories(childComponents, axis);
-    var dataStrings = this.getStringsFromData(childComponents, axis);
-    return _uniq(_flatten(_toConsumableArray(categoryStrings).concat(_toConsumableArray(dataStrings), _toConsumableArray(axisStrings))));
+    return _uniq(_flatten(_toConsumableArray(categoryStrings).concat(_toConsumableArray(axisStrings))));
   },
-  getCategories: function (props, axis) {
-    var propCategories = props.categories && !Array.isArray(props.categories) ? props.categories[axis] : props.categories;
-    var categories = propCategories || this.getStringsFromChildren(props, axis);
-    return categories.length > 0 ? categories : undefined;
+  getStringsFromChildren: function (props, childComponents) {
+    childComponents = childComponents || React.Children.toArray(props.children);
+    var xStrings = this.getCategoryAndAxisStringsFromChildren(props, "x", childComponents);
+    var yStrings = this.getCategoryAndAxisStringsFromChildren(props, "y", childComponents);
+    var dataStrings = this.getStringsFromData(childComponents);
+    return {
+      x: _uniq(_flatten(_toConsumableArray(xStrings).concat(_toConsumableArray(dataStrings.x)))),
+      y: _uniq(_flatten(_toConsumableArray(yStrings).concat(_toConsumableArray(dataStrings.y))))
+    };
+  },
+  getCategories: function (props) {
+    var xPropCategories = props.categories && !Array.isArray(props.categories) ? props.categories.x : props.categories;
+    var yPropCategories = props.categories && !Array.isArray(props.categories) ? props.categories.y : props.categories;
+    var fallbackRequired = !xPropCategories || !yPropCategories;
+    var fallbackProps = fallbackRequired ? this.getStringsFromChildren(props) : {};
+    var xCategories = xPropCategories || fallbackProps.x;
+    var yCategories = yPropCategories || fallbackProps.y;
+    return {
+      x: xCategories.length > 0 ? xCategories : undefined,
+      y: yCategories.length > 0 ? yCategories : undefined
+    };
   }
 };

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

@@ -129,11 +129,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;
@@ -290,6 +290,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/lib/victory-primitives/path-helpers.js

@@ -64,9 +64,9 @@ var _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 = (0, _range2.default)(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/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",

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

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+var _isNil2 = _interopRequireDefault(require("lodash/isNil"));
+
 var _isEmpty2 = _interopRequireDefault(require("lodash/isEmpty"));
 
 var _without2 = _interopRequireDefault(require("lodash/without"));
@@ -49,7 +51,11 @@ function _inherits(subClass, superClass) { if (typeof superClass !== "function"
 
 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 
-//  used for checking state changes. Expected components can be passed in via options
+var datumHasXandY = function (datum) {
+  return !(0, _isNil2.default)(datum._x) && !(0, _isNil2.default)(datum._y);
+}; //  used for checking state changes. Expected components can be passed in via options
+
+
 var defaultComponents = [{
   name: "parent",
   index: "parent"
@@ -89,39 +95,39 @@ var _default = function _default(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 (!(0, _reactFastCompare.default)(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 = !(0, _reactFastCompare.default)(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 (!(0, _isEmpty2.default)(externalMutations)) {
-            var callbacks = props.externalEventMutations.reduce(function (memo, mutation) {
-              memo = (0, _isFunction2.default)(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 (!(0, _reactFastCompare.default)(this.calculatedState, calculatedState)) {
+            this.calculatedState = calculatedState;
+            this.cacheValues(calculatedValues);
+            return true;
           }
+
+          if (!(0, _reactFastCompare.default)(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
 
@@ -137,24 +143,40 @@ var _default = function _default(WrappedComponent, options) {
             return {};
           }
 
-          options = options || {};
-          var components = options.components || defaultComponents;
-
           var getState = function (key, type) {
-            var baseState = (0, _defaults2.default)({}, _this2.getEventState(key, type), getSharedEventState(key, type));
-            return (0, _isEmpty2.default)(baseState) ? undefined : baseState;
+            var result = (0, _defaults2.default)({}, _this2.getEventState(key, type), getSharedEventState(key, type));
+            return (0, _isEmpty2.default)(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 (!(0, _isEmpty2.default)(externalMutations)) {
+            var callbacks = props.externalEventMutations.reduce(function (memo, mutation) {
+              memo = (0, _isFunction2.default)(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",
@@ -263,7 +285,8 @@ var _default = function _default(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.default.createElement(_victoryTransition.default, {
             animate: props.animate,
             animationWhitelist: animationWhitelist
@@ -297,14 +320,19 @@ var _default = function _default(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.default.cloneElement(dataComponent, dataProps);
-          });
+            if (shouldRenderDatum(dataProps.datum)) {
+              validDataComponents.push(_react.default.cloneElement(dataComponent, dataProps));
+            }
+
+            return validDataComponents;
+          }, []);
           var labelComponents = this.dataKeys.map(function (_dataKey, index) {
             var labelProps = _this5.getComponentProps(labelComponent, "labels", index);