victory-core 31.1.0 → 31.2.0

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

@@ -53,9 +53,19 @@ function _assertThisInitialized(self) { if (self === void 0) { throw new Referen
 
 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 _default = function _default(WrappedComponent) {
+var defaultComponents = [{
+  name: "parent",
+  index: "parent"
+}, {
+  name: "data"
+}, {
+  name: "labels"
+}];
+
+var _default = function _default(WrappedComponent, options) {
   return (
     /*#__PURE__*/
     function (_WrappedComponent) {
@@ -85,23 +95,72 @@ var _default = function _default(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 (!(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;
           }
-        }
+
+          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
+
       }, {
-        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 = (0, _defaults2.default)({}, _this2.getEventState(key, type), getSharedEventState(key, type));
+            return (0, _isEmpty2.default)(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",
@@ -155,10 +214,10 @@ var _default = function _default(WrappedComponent) {
       }, {
         key: "cacheValues",
         value: function cacheValues(obj) {
-          var _this2 = this;
+          var _this3 = this;
 
           (0, _keys2.default)(obj).forEach(function (key) {
-            _this2[key] = obj[key];
+            _this3[key] = obj[key];
           });
         }
       }, {
@@ -237,14 +296,14 @@ var _default = function _default(WrappedComponent) {
       }, {
         key: "renderContinuousData",
         value: function renderContinuousData(props) {
-          var _this3 = this;
+          var _this4 = this;
 
           var dataComponent = props.dataComponent,
               labelComponent = props.labelComponent,
               groupComponent = props.groupComponent;
           var dataKeys = (0, _without2.default)(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.default.cloneElement(labelComponent, labelProps));
@@ -259,14 +318,14 @@ var _default = function _default(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.default.cloneElement(dataComponent, dataProps));
@@ -275,7 +334,7 @@ var _default = function _default(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.default.cloneElement(labelComponent, labelProps);

package/lib/victory-util/axis.js

@@ -19,6 +19,8 @@ var _uniq2 = _interopRequireDefault(require("lodash/uniq"));
 
 var _invert2 = _interopRequireDefault(require("lodash/invert"));
 
+var _isObject2 = _interopRequireDefault(require("lodash/isObject"));
+
 var _isFunction2 = _interopRequireDefault(require("lodash/isFunction"));
 
 var _identity2 = _interopRequireDefault(require("lodash/identity"));
@@ -229,8 +231,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.default.containsDates(tickValues) ? function (x) {
     return x;
   } : undefined;
@@ -256,8 +260,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);
@@ -287,8 +293,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.default.containsOnlyStrings(categories) ? categories.map(function (tick) {
     return stringMap[tick];
@@ -299,8 +306,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)) {
@@ -327,7 +336,6 @@ function getTickArray(props) {
   var tickArray = ticks ? (0, _uniq2.default)(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));
@@ -427,6 +435,24 @@ function getDomain(props, axis) {
   return _domain.default.createDomainFunction(getDomainFromData)(props, inherentAxis);
 }
 
+function getAxisValue(props, axis) {
+  if (!props.axisValue) {
+    return undefined;
+  }
+
+  var scaleAxis = axis === "x" ? "y" : "x";
+  var scale = (0, _isObject2.default)(props.scale) && (0, _isFunction2.default)(props.scale[scaleAxis]) ? props.scale[scaleAxis] : undefined;
+
+  if (!scale) {
+    return undefined;
+  }
+
+  var stringMapAxis = getCurrentAxis(axis, props.horizontal) === "x" ? "y" : "x";
+  var stringMap = (0, _isObject2.default)(props.stringMap) && props.stringMap[stringMapAxis];
+  var axisValue = stringMap && typeof props.axisValue === "string" ? stringMap[props.axisValue] : props.axisValue;
+  return scale(axisValue);
+}
+
 var _default = {
   getTicks: getTicks,
   getTickFormat: getTickFormat,
@@ -440,6 +466,7 @@ var _default = {
   getOriginSign: getOriginSign,
   getDomain: getDomain,
   isVertical: isVertical,
-  stringTicks: stringTicks
+  stringTicks: stringTicks,
+  getAxisValue: getAxisValue
 };
 exports.default = _default;

package/lib/victory-util/data.js

@@ -359,9 +359,14 @@ function getStringsFromData(props, axis) {
 
   var key = props[axis] === undefined ? axis : props[axis];
 
-  var accessor = _helpers.default.createAccessor(key);
+  var accessor = _helpers.default.createAccessor(key); // support immutable data
 
-  var sortedData = sortData(props.data, props.sortKey, props.sortOrder);
+
+  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/lib/victory-util/helpers.js

@@ -300,9 +300,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/lib/victory-util/wrapper.js

@@ -163,14 +163,15 @@ var _default = {
   getAllEvents: function (props) {
     var components = ["groupComponent", "containerComponent", "labelComponent"];
     this.componentEvents = _events.default.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;
@@ -409,9 +410,15 @@ var _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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "victory-core",
-  "version": "31.1.0",
+  "version": "31.2.0",
   "description": "Victory Core",
   "keywords": [
     "data visualization",

package/src/victory-animation/victory-animation.js

@@ -4,6 +4,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";
 
 export default class VictoryAnimation extends React.Component {
   static displayName = "VictoryAnimation";
@@ -98,24 +99,27 @@ export default class VictoryAnimation extends React.Component {
     }
   }
 
-  /* lifecycle */
-  componentWillReceiveProps(nextProps) {
-    /* cancel existing loop if it exists */
-    this.getTimer().unsubscribe(this.loopID);
+  shouldComponentUpdate(nextProps, nextState) {
+    const equalProps = isEqual(this.props, nextProps);
+    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 {
-      /* Extend the tween queue */
-      this.queue.push(...nextProps.data);
+      /* 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 {
+        /* Extend the tween queue */
+        this.queue.push(...nextProps.data);
+      }
+      /* Start traversing the tween queue */
+      this.traverseQueue();
     }
-    /* Start traversing the tween queue */
-    this.traverseQueue();
+    return nextState.animationInfo.animating || !equalProps;
   }
 
   componentWillUnmount() {

package/src/victory-transition/victory-transition.js

@@ -6,6 +6,7 @@ import Helpers from "../victory-util/helpers";
 import Timer from "../victory-util/timer";
 import Transitions from "../victory-util/transitions";
 import { defaults, isFunction, pick, isObject } from "lodash";
+import isEqual from "react-fast-compare";
 
 export default class VictoryTransition extends React.Component {
   static displayName = "VictoryTransition";
@@ -33,11 +34,14 @@ export default class VictoryTransition extends React.Component {
     this.setState({ nodesShouldLoad: true }); //eslint-disable-line react/no-did-mount-set-state
   }
 
-  componentWillReceiveProps(nextProps) {
-    this.getTimer().bypassAnimation();
-    this.setState(this.getTransitionState(this.props, nextProps), () =>
-      this.getTimer().resumeAnimation()
-    );
+  shouldComponentUpdate(nextProps) {
+    if (!isEqual(this.props, nextProps)) {
+      this.getTimer().bypassAnimation();
+      this.setState(this.getTransitionState(this.props, nextProps), () =>
+        this.getTimer().resumeAnimation()
+      );
+    }
+    return true;
   }
 
   componentWillUnmount() {

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

@@ -8,7 +8,14 @@ const datumHasXandY = (datum) => {
   return !isNil(datum._x) && !isNil(datum._y);
 };
 
-export default (WrappedComponent) => {
+//  used for checking state changes. Expected components can be passed in via options
+const defaultComponents = [
+  { name: "parent", index: "parent" },
+  { name: "data" },
+  { name: "labels" }
+];
+
+export default (WrappedComponent, options) => {
   return class addEvents extends WrappedComponent {
     constructor(props) {
       super(props);
@@ -22,18 +29,63 @@ export default (WrappedComponent) => {
       const calculatedValues = this.getCalculatedValues(props);
       this.cacheValues(calculatedValues);
       this.externalMutations = this.getExternalMutations(props);
+      this.calculatedState = this.getStateChanges(props, calculatedValues);
     }
 
-    componentDidUpdate() {
-      const externalMutations = this.getExternalMutations(this.props);
-      if (!isEqual(this.externalMutations, externalMutations)) {
+    shouldComponentUpdate(nextProps) {
+      const calculatedValues = this.getCalculatedValues(nextProps);
+      const externalMutations = this.getExternalMutations(nextProps);
+      const animating = this.props.animating || this.props.animate;
+      const 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;
       }
+      const 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;
     }
 
-    componentWillReceiveProps(nextProps) {
-      this.cacheValues(this.getCalculatedValues(nextProps));
+    // compile all state changes from own and parent state. Order doesn't matter, as any state
+    // state change should trigger a re-render
+    getStateChanges(props, calculatedValues) {
+      const { hasEvents, getSharedEventState } = calculatedValues;
+      if (!hasEvents) {
+        return {};
+      }
+
+      const getState = (key, type) => {
+        const result = defaults({}, this.getEventState(key, type), getSharedEventState(key, type));
+        return isEmpty(result) ? undefined : result;
+      };
+
+      options = options || {};
+      const components = options.components || defaultComponents;
+      const stateChanges = components
+        .map((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((key) => getState(key, component.name))
+                  .filter(Boolean);
+          }
+        })
+        .filter(Boolean);
+      return stateChanges;
     }
 
     applyExternalMutations(props, externalMutations) {

package/src/victory-util/axis.js

@@ -3,6 +3,7 @@ import React from "react";
 import {
   identity,
   isFunction,
+  isObject,
   invert,
   uniq,
   range,
@@ -171,7 +172,10 @@ function stringTicks(props) {
 }
 
 function getDefaultTickFormat(props) {
-  const { tickValues, stringMap } = props;
+  const { tickValues } = props;
+  const axis = getAxis(props);
+  const currentAxis = getCurrentAxis(axis, props.horizontal);
+  const stringMap = props.stringMap && props.stringMap[currentAxis];
   const fallbackFormat = tickValues && !Collection.containsDates(tickValues) ? (x) => x : undefined;
   if (!stringMap) {
     return stringTicks(props) ? (x, index) => tickValues[index] : fallbackFormat;
@@ -186,7 +190,10 @@ function getDefaultTickFormat(props) {
 }
 
 function getTickFormat(props, scale) {
-  const { tickFormat, stringMap } = props;
+  const { tickFormat } = props;
+  const axis = getAxis(props);
+  const currentAxis = getCurrentAxis(axis, props.horizontal);
+  const stringMap = props.stringMap && props.stringMap[currentAxis];
   if (!tickFormat) {
     const defaultTickFormat = getDefaultTickFormat(props);
     const scaleTickFormat =
@@ -207,8 +214,9 @@ function getTickFormat(props, scale) {
 }
 
 function getStringTicks(props) {
-  const { stringMap } = props;
   const axis = getAxis(props);
+  const currentAxis = getCurrentAxis(axis, props.horizontal);
+  const stringMap = props.stringMap && props.stringMap[currentAxis];
   const categories = Array.isArray(props.categories)
     ? props.categories
     : props.categories && props.categories[axis];
@@ -223,7 +231,10 @@ function getStringTicks(props) {
 }
 
 function getTickArray(props) {
-  const { tickValues, tickFormat, stringMap } = props;
+  const { tickValues, tickFormat } = props;
+  const axis = getAxis(props);
+  const currentAxis = getCurrentAxis(axis, props.horizontal);
+  const stringMap = props.stringMap && props.stringMap[currentAxis];
   const getTicksFromFormat = () => {
     if (!tickFormat || !Array.isArray(tickFormat)) {
       return undefined;
@@ -240,7 +251,6 @@ function getTickArray(props) {
   }
   const tickArray = ticks ? uniq(ticks) : getTicksFromFormat(props);
   const filterArray = (arr) => {
-    const axis = getAxis(props);
     const domain = (props.domain && props.domain[axis]) || props.domain;
     return Array.isArray(domain)
       ? arr.filter((t) => t >= Math.min(...domain) && t <= Math.max(...domain))
@@ -318,6 +328,25 @@ function getDomain(props, axis) {
   return Domain.createDomainFunction(getDomainFromData)(props, inherentAxis);
 }
 
+function getAxisValue(props, axis) {
+  if (!props.axisValue) {
+    return undefined;
+  }
+  const scaleAxis = axis === "x" ? "y" : "x";
+  const scale =
+    isObject(props.scale) && isFunction(props.scale[scaleAxis])
+      ? props.scale[scaleAxis]
+      : undefined;
+  if (!scale) {
+    return undefined;
+  }
+  const stringMapAxis = getCurrentAxis(axis, props.horizontal) === "x" ? "y" : "x";
+  const stringMap = isObject(props.stringMap) && props.stringMap[stringMapAxis];
+  const axisValue =
+    stringMap && typeof props.axisValue === "string" ? stringMap[props.axisValue] : props.axisValue;
+  return scale(axisValue);
+}
+
 export default {
   getTicks,
   getTickFormat,
@@ -331,5 +360,6 @@ export default {
   getOriginSign,
   getDomain,
   isVertical,
-  stringTicks
+  stringTicks,
+  getAxisValue
 };

package/src/victory-util/data.js

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

package/src/victory-util/helpers.js

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

package/src/victory-util/wrapper.js

@@ -116,12 +116,13 @@ export default {
   getAllEvents(props) {
     const components = ["groupComponent", "containerComponent", "labelComponent"];
     this.componentEvents = Events.getComponentEvents(props, components);
+    let events = props.events;
     if (Array.isArray(this.componentEvents)) {
-      return Array.isArray(props.events)
+      events = Array.isArray(props.events)
         ? this.componentEvents.concat(...props.events)
         : this.componentEvents;
     }
-    return props.events;
+    return events || [];
   },
 
   getAnimationProps(props, child, index) {
@@ -298,11 +299,14 @@ export default {
     };
 
     const initialMemo = { x: [], y: [] };
-    const combine = (memo, datum) => ({
-      x: datum.x !== undefined ? memo.x.concat(datum.x) : memo.x,
-      y: datum.y !== undefined ? memo.y.concat(datum.y) : memo.y
-    });
-
+    const combine = (memo, datum) => {
+      const x = Array.isArray(datum) ? datum.map((d) => d.x).filter(Boolean) : datum.x;
+      const y = Array.isArray(datum) ? datum.map((d) => 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);
   },