victory-core 36.9.2 → 37.0.0

package/lib/victory-util/wrapper.js

@@ -20,141 +20,105 @@ exports.getStringsFromChildren = getStringsFromChildren;
 exports.getStringsFromData = getStringsFromData;
 exports.getStyle = getStyle;
 exports.getWidth = getWidth;
-
 var _isPlainObject2 = _interopRequireDefault(require("lodash/isPlainObject"));
-
 var _uniqBy2 = _interopRequireDefault(require("lodash/uniqBy"));
-
 var _groupBy2 = _interopRequireDefault(require("lodash/groupBy"));
-
 var _uniq2 = _interopRequireDefault(require("lodash/uniq"));
-
 var _defaults2 = _interopRequireDefault(require("lodash/defaults"));
-
 var _react = _interopRequireDefault(require("react"));
-
 var Axis = _interopRequireWildcard(require("./axis"));
-
 var Style = _interopRequireWildcard(require("./style"));
-
 var Data = _interopRequireWildcard(require("./data"));
-
 var Domain = _interopRequireWildcard(require("./domain"));
-
 var Events = _interopRequireWildcard(require("./events"));
-
 var Collection = _interopRequireWildcard(require("./collection"));
-
 var Helpers = _interopRequireWildcard(require("./helpers"));
-
 var Scale = _interopRequireWildcard(require("./scale"));
-
 var Log = _interopRequireWildcard(require("./log"));
-
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 function addBinsToParentPropsIfHistogram(_ref) {
-  var children = _ref.children,
-      props = _ref.props,
-      childComponents = _ref.childComponents,
-      parentProps = _ref.parentProps;
-  var someChildrenAreHistograms = children.some(function (child) {
+  let {
+    children,
+    props,
+    childComponents,
+    parentProps
+  } = _ref;
+  const someChildrenAreHistograms = children.some(child => {
     return child.type && child.type.role === "histogram";
   });
-  var allChildrenAreHistograms = someChildrenAreHistograms && children.length && children.every(function (child) {
+  const allChildrenAreHistograms = someChildrenAreHistograms && children.length && children.every(child => {
     return child.type && child.type.role === "histogram";
   });
-
   if (someChildrenAreHistograms && !allChildrenAreHistograms) {
     Log.warn("VictoryHistogram only supports being stacked with other VictoryHistogram components. Check to make sure that you are only passing VictoryHistogram components to VictoryStack");
-  } // if we are stacking histograms, we need to generate explicit bins
-  // or else each histogram may end up having different bins
-
+  }
 
+  // if we are stacking histograms, we need to generate explicit bins
+  // or else each histogram may end up having different bins
   if (!allChildrenAreHistograms) {
     return parentProps;
   }
+  let childBins = props.bins || childComponents[0].props.bins;
 
-  var childBins = props.bins || childComponents[0].props.bins; // if we have explicit bins then we don't need to calculate them
-
+  // if we have explicit bins then we don't need to calculate them
   if (!Array.isArray(childBins)) {
-    var combinedData = children.reduce(function (memo, child) {
-      var xAccessor = Helpers.createAccessor(child.props.x || "x");
-      return memo.concat(child.props.data.map(function (datum) {
-        return {
-          x: xAccessor(datum)
-        };
-      }));
-    }, []); // use the same function to generate bins as VictoryHistogram but with
-    // the combined data from above, then get explicit bins from that
+    const combinedData = children.reduce((memo, child) => {
+      const xAccessor = Helpers.createAccessor(child.props.x || "x");
+      return memo.concat(child.props.data.map(datum => ({
+        x: xAccessor(datum)
+      })));
+    }, []);
 
-    var getFormattedHistogramData = children[0].type.getFormattedData;
+    // use the same function to generate bins as VictoryHistogram but with
+    // the combined data from above, then get explicit bins from that
+    const getFormattedHistogramData = children[0].type.getFormattedData;
     childBins = getFormattedHistogramData({
       data: combinedData,
       bins: childBins
-    }).reduce(function (memo, _ref2, index) {
-      var x0 = _ref2.x0,
-          x1 = _ref2.x1;
+    }).reduce((memo, _ref2, index) => {
+      let {
+        x0,
+        x1
+      } = _ref2;
       return index === 0 ? memo.concat([x0, x1]) : memo.concat(x1);
     }, []);
   }
-
-  return _objectSpread(_objectSpread({}, parentProps), {}, {
+  return {
+    ...parentProps,
     bins: childBins
-  });
+  };
 }
-
 function getDataFromChildren(props, childComponents) {
-  var polar = props.polar,
-      startAngle = props.startAngle,
-      endAngle = props.endAngle,
-      categories = props.categories,
-      minDomain = props.minDomain,
-      maxDomain = props.maxDomain;
-  var parentProps = {
-    polar: polar,
-    startAngle: startAngle,
-    endAngle: endAngle,
-    categories: categories,
-    minDomain: minDomain,
-    maxDomain: maxDomain
+  const {
+    polar,
+    startAngle,
+    endAngle,
+    categories,
+    minDomain,
+    maxDomain
+  } = props;
+  let parentProps = {
+    polar,
+    startAngle,
+    endAngle,
+    categories,
+    minDomain,
+    maxDomain
   };
-  var stack = 0;
-  var children = childComponents ? childComponents.slice(0) : _react.default.Children.toArray(props.children);
+  let stack = 0;
+  const children = childComponents ? childComponents.slice(0) : _react.default.Children.toArray(props.children);
   parentProps = addBinsToParentPropsIfHistogram({
-    children: children,
-    props: props,
-    childComponents: childComponents,
-    parentProps: parentProps
+    children,
+    props,
+    childComponents,
+    parentProps
   });
-
-  var iteratee = function (child, childName, parent) {
-    var childProps = Object.assign({}, child.props, parentProps);
-    var childData;
-    var childElement = child;
-
+  const iteratee = (child, childName, parent) => {
+    const childProps = Object.assign({}, child.props, parentProps);
+    let childData;
+    let childElement = child;
     if (!Data.isDataComponent(child)) {
       return null;
     } else if (child.type && Helpers.isFunction(child.type.getData)) {
@@ -163,272 +127,227 @@ function getDataFromChildren(props, childComponents) {
     } else {
       childData = Data.getData(childProps);
     }
-
     stack += 1;
-    return childData.map(function (datum, index) {
-      return Object.assign({
-        _stack: stack,
-        _group: index
-      }, datum);
-    });
-  };
-
-  var stacked = children.filter(function (c) {
-    return c.type && c.type.role === "stack";
-  }).length;
-
-  var combine = function (memo, val) {
-    return memo.concat((0, _uniqBy2.default)(val, "_group"));
+    return childData.map((datum, index) => Object.assign({
+      _stack: stack,
+      _group: index
+    }, datum));
   };
-
-  var datasets = Helpers.reduceChildren(children, iteratee, props, [], combine);
-  var group = stacked ? "_group" : "_stack";
+  const stacked = children.filter(c => c.type && c.type.role === "stack").length;
+  const combine = (memo, val) => memo.concat((0, _uniqBy2.default)(val, "_group"));
+  const datasets = Helpers.reduceChildren(children, iteratee, props, [], combine);
+  const group = stacked ? "_group" : "_stack";
   return Object.values((0, _groupBy2.default)(datasets, group));
 }
-
 function getData(props, childComponents) {
   if (props.data) {
     return Data.getData(props);
   }
-
   return getDataFromChildren(props, childComponents || _react.default.Children.toArray(props.children));
 }
-
 function getWidth(props, groupLength, seriesLength) {
-  var datasets = props.datasets,
-      horizontal = props.horizontal;
-  var range = horizontal ? Helpers.getRange(props, "y") : Helpers.getRange(props, "x");
-  var extent = Math.abs(range[1] - range[0]);
-  var seriesLengthValue = seriesLength !== undefined ? seriesLength : Array.isArray(datasets[0]) && datasets[0].length || 1;
-  var groupLengthValue = groupLength || datasets.length;
-  var bars = groupLengthValue * seriesLengthValue;
-  var barRatio = 0.5;
+  const {
+    datasets,
+    horizontal
+  } = props;
+  const range = horizontal ? Helpers.getRange(props, "y") : Helpers.getRange(props, "x");
+  const extent = Math.abs(range[1] - range[0]);
+  const seriesLengthValue = seriesLength !== undefined ? seriesLength : Array.isArray(datasets[0]) && datasets[0].length || 1;
+  const groupLengthValue = groupLength || datasets.length;
+  const bars = groupLengthValue * seriesLengthValue;
+  const barRatio = 0.5;
   return Math.round(barRatio * extent / bars);
 }
-
 function getDefaultDomainPadding(props, axis, childComponents) {
   if (props.polar || axis !== "x") {
     return undefined;
   }
-
-  var groupComponent = childComponents.filter(function (child) {
+  const groupComponent = childComponents.filter(child => {
     return child.type && child.type.role && child.type.role === "group";
   });
-
   if (groupComponent.length < 1) {
     return undefined;
   }
-
-  var _groupComponent$0$pro = groupComponent[0].props,
-      offset = _groupComponent$0$pro.offset,
-      children = _groupComponent$0$pro.children;
-
+  const {
+    offset,
+    children
+  } = groupComponent[0].props;
   if (!offset) {
     return undefined;
   }
-
-  var firstChild = Array.isArray(children) && children[0];
-
+  const firstChild = Array.isArray(children) && children[0];
   if (!firstChild) {
     return undefined;
   }
-
-  var barWidth = firstChild.props.barWidth;
-  var dataLength = firstChild.props.data && firstChild.props.data.length || 1;
-
+  let barWidth = firstChild.props.barWidth;
+  let dataLength = firstChild.props.data && firstChild.props.data.length || 1;
   if (firstChild && firstChild.type.role === "stack") {
-    var nestedChild = firstChild.props.children && firstChild.props.children[0];
-
+    const nestedChild = firstChild.props.children && firstChild.props.children[0];
     if (!nestedChild) {
       return undefined;
     }
-
     barWidth = nestedChild.props.barWidth;
     dataLength = firstChild.props.children.length;
   }
-
-  var width = barWidth || getWidth(props, children.length, dataLength);
+  const width = barWidth || getWidth(props, children.length, dataLength);
   return {
     x: width * children.length / 2 + (offset - width * ((children.length - 1) / 2))
   };
 }
-
 function getDomainFromChildren(props, axis, childComponents) {
   // eslint-disable-line max-statements, complexity, max-len
-  var children = childComponents ? childComponents.slice(0) : _react.default.Children.toArray(props.children);
-  var parentData = props.data ? Data.getData(props) : undefined;
-  var polar = props.polar,
-      startAngle = props.startAngle,
-      endAngle = props.endAngle,
-      categories = props.categories,
-      minDomain = props.minDomain,
-      maxDomain = props.maxDomain,
-      horizontal = props.horizontal;
-  var baseParentProps = {
-    horizontal: horizontal,
-    polar: polar,
-    startAngle: startAngle,
-    endAngle: endAngle,
-    minDomain: minDomain,
-    maxDomain: maxDomain,
-    categories: categories
+  const children = childComponents ? childComponents.slice(0) : _react.default.Children.toArray(props.children);
+  const parentData = props.data ? Data.getData(props) : undefined;
+  const {
+    polar,
+    startAngle,
+    endAngle,
+    categories,
+    minDomain,
+    maxDomain,
+    horizontal
+  } = props;
+  const baseParentProps = {
+    horizontal,
+    polar,
+    startAngle,
+    endAngle,
+    minDomain,
+    maxDomain,
+    categories
   };
-  var parentProps = parentData ? Object.assign(baseParentProps, {
+  const parentProps = parentData ? Object.assign(baseParentProps, {
     data: parentData
   }) : baseParentProps;
-
-  var iteratee = function (child) {
-    var sharedProps = Object.assign({}, child.props, parentProps);
-
+  const iteratee = child => {
+    const sharedProps = Object.assign({}, child.props, parentProps);
     if (!Domain.isDomainComponent(child)) {
       return null;
     } else if (child.type && Helpers.isFunction(child.type.getDomain)) {
       return child.props && child.type.getDomain(sharedProps, axis);
     }
-
     return Domain.getDomain(sharedProps, axis);
   };
-
-  var childDomains = Helpers.reduceChildren(children, iteratee, props);
-  var min = childDomains.length === 0 ? 0 : Collection.getMinValue(childDomains);
-  var max = childDomains.length === 0 ? 1 : Collection.getMaxValue(childDomains);
+  const childDomains = Helpers.reduceChildren(children, iteratee, props);
+  const min = childDomains.length === 0 ? 0 : Collection.getMinValue(childDomains);
+  const max = childDomains.length === 0 ? 1 : Collection.getMaxValue(childDomains);
   return [min, max];
 }
-
 function getDomain(props, axis, childComponents) {
-  var children = childComponents || _react.default.Children.toArray(props.children);
-
-  var propsDomain = Domain.getDomainFromProps(props, axis);
-  var domainPadding = getDefaultDomainPadding(props, axis, children);
-  var domain;
-
+  const children = childComponents || _react.default.Children.toArray(props.children);
+  const propsDomain = Domain.getDomainFromProps(props, axis);
+  const domainPadding = getDefaultDomainPadding(props, axis, children);
+  let domain;
   if (propsDomain) {
     domain = propsDomain;
   } else {
-    var minDomain = Domain.getMinFromProps(props, axis);
-    var maxDomain = Domain.getMaxFromProps(props, axis);
-    var dataset = (props.data || props.y) && Data.getData(props);
-    var dataDomain = dataset ? Domain.getDomainFromData(props, axis, dataset) : [];
-    var childDomain = getDomainFromChildren(props, axis, children);
-    var min = minDomain || Collection.getMinValue([].concat(_toConsumableArray(dataDomain), _toConsumableArray(childDomain)));
-    var max = maxDomain || Collection.getMaxValue([].concat(_toConsumableArray(dataDomain), _toConsumableArray(childDomain)));
+    const minDomain = Domain.getMinFromProps(props, axis);
+    const maxDomain = Domain.getMaxFromProps(props, axis);
+    const dataset = (props.data || props.y) && Data.getData(props);
+    const dataDomain = dataset ? Domain.getDomainFromData(props, axis, dataset) : [];
+    const childDomain = getDomainFromChildren(props, axis, children);
+    const min = minDomain || Collection.getMinValue([...dataDomain, ...childDomain]);
+    const max = maxDomain || Collection.getMaxValue([...dataDomain, ...childDomain]);
     domain = Domain.getDomainFromMinMax(min, max);
   }
-
   return Domain.formatDomain(domain, Object.assign({
-    domainPadding: domainPadding
+    domainPadding
   }, props), axis);
 }
-
 function getScale(props, axis, childComponents) {
   if (props.data) {
     return Scale.getBaseScale(props, axis);
   }
-
-  var children = childComponents ? childComponents.slice(0) : _react.default.Children.toArray(props.children);
-
-  var iteratee = function (child) {
-    var sharedProps = Object.assign({}, child.props, {
+  const children = childComponents ? childComponents.slice(0) : _react.default.Children.toArray(props.children);
+  const iteratee = child => {
+    const sharedProps = Object.assign({}, child.props, {
       horizontal: props.horizontal
     });
     return Scale.getScaleType(sharedProps, axis);
   };
+  const childScale = (0, _uniq2.default)(Helpers.reduceChildren(children, iteratee, props));
 
-  var childScale = (0, _uniq2.default)(Helpers.reduceChildren(children, iteratee, props)); // default to linear scale if more than one uniq scale type is given by children
-
+  // default to linear scale if more than one uniq scale type is given by children
   return childScale.length > 1 ? Scale.getScaleFromName("linear") : Scale.getScaleFromName(childScale[0]);
 }
-
 function getAllEvents(props) {
-  var components = ["groupComponent", "containerComponent", "labelComponent"];
-  var componentEvents = Events.getComponentEvents(props, components);
-  var events = props.events;
-
+  const components = ["groupComponent", "containerComponent", "labelComponent"];
+  const componentEvents = Events.getComponentEvents(props, components);
+  let events = props.events;
   if (Array.isArray(componentEvents)) {
-    events = Array.isArray(props.events) ? componentEvents.concat.apply(componentEvents, _toConsumableArray(props.events)) : componentEvents;
+    events = Array.isArray(props.events) ? componentEvents.concat(...props.events) : componentEvents;
   }
-
   return events || [];
 }
-
 function getColor(calculatedProps, child, index) {
   // check for styles first
-  var style = calculatedProps.style;
-  var colorScale = calculatedProps.colorScale,
-      color = calculatedProps.color;
-
+  const {
+    style
+  } = calculatedProps;
+  let {
+    colorScale,
+    color
+  } = calculatedProps;
   if (style && style.data && style.data.fill) {
     return style.data.fill;
   }
-
   colorScale = child.props && child.props.colorScale ? child.props.colorScale : colorScale;
   color = child.props && child.props.color ? child.props.color : color;
-
   if (!colorScale && !color) {
     return undefined;
   }
-
-  var colors = Array.isArray(colorScale) ? colorScale : Style.getColorScale(colorScale);
+  const colors = Array.isArray(colorScale) ? colorScale : Style.getColorScale(colorScale);
   return color || colors[index % colors.length];
 }
-
 function getStyle(theme, style, role) {
-  var defaultStyle = theme && theme[role] && theme[role].style ? theme[role].style : {};
+  const defaultStyle = theme && theme[role] && theme[role].style ? theme[role].style : {};
   return Helpers.getStyles(style, defaultStyle);
 }
-
 function getChildStyle(child, index, calculatedProps) {
-  var style = calculatedProps.style,
-      role = calculatedProps.role;
-  var childStyle = child.props.style || {};
-
+  const {
+    style,
+    role
+  } = calculatedProps;
+  const childStyle = child.props.style || {};
   if (Array.isArray(childStyle)) {
     return childStyle;
   }
-
-  var childRole = child.type && child.type.role;
-  var defaultFill = childRole === "stack" ? undefined : getColor(calculatedProps, child, index);
-  var defaultColor = childRole === "line" ? {
+  const childRole = child.type && child.type.role;
+  const defaultFill = childRole === "stack" ? undefined : getColor(calculatedProps, child, index);
+  const defaultColor = childRole === "line" ? {
     fill: "none",
     stroke: defaultFill
   } : {
     fill: defaultFill
   };
-  var dataWidth = role === "stack" ? {} : {
+  const dataWidth = role === "stack" ? {} : {
     width: getWidth(calculatedProps)
   };
-  var dataStyle = (0, _defaults2.default)({}, childStyle.data, Object.assign({}, dataWidth, style.data, defaultColor));
-  var labelsStyle = (0, _defaults2.default)({}, childStyle.labels, style.labels);
-  return _objectSpread(_objectSpread({}, childStyle), {}, {
+  const dataStyle = (0, _defaults2.default)({}, childStyle.data, Object.assign({}, dataWidth, style.data, defaultColor));
+  const labelsStyle = (0, _defaults2.default)({}, childStyle.labels, style.labels);
+  return {
+    ...childStyle,
     parent: style.parent,
     data: dataStyle,
     labels: labelsStyle
-  });
+  };
 }
-
 function getStringsFromCategories(childComponents, axis) {
-  var iteratee = function (child) {
-    var childProps = child.props || {};
-
+  const iteratee = child => {
+    const childProps = child.props || {};
     if (!Domain.isDomainComponent(child) || !childProps.categories) {
       return null;
     }
-
-    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";
-    });
+    const categories = childProps.categories && !Array.isArray(childProps.categories) ? childProps.categories[axis] : childProps.props.categories;
+    const categoryStrings = categories && categories.filter(val => typeof val === "string");
     return categoryStrings ? Collection.removeUndefined(categoryStrings) : [];
   };
-
   return Helpers.reduceChildren(childComponents.slice(0), iteratee);
 }
-
 function getStringsFromData(childComponents) {
-  var iteratee = function (child) {
-    var childProps = child.props || {};
-    var data;
-
+  const iteratee = child => {
+    const childProps = child.props || {};
+    let data;
     if (!Data.isDataComponent(child)) {
       return null;
     } else if (child.type && Helpers.isFunction(child.type.getData)) {
@@ -436,63 +355,49 @@ function getStringsFromData(childComponents) {
     } else {
       data = Data.getData(childProps);
     }
-
-    return data.map(function (d) {
-      return {
-        x: d.xName,
-        y: d.yName
-      };
-    });
+    return data.map(d => ({
+      x: d.xName,
+      y: d.yName
+    }));
   };
-
-  var initialMemo = {
+  const 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;
+  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);
 }
-
 function getCategoryAndAxisStringsFromChildren(props, axis, childComponents) {
-  var categories = (0, _isPlainObject2.default)(props.categories) ? props.categories[axis] : props.categories;
-  var axisComponent = Axis.getAxisComponent(childComponents, axis);
-  var axisStrings = axisComponent ? Data.getStringsFromAxes(axisComponent.props, axis) : [];
-  var categoryStrings = categories || getStringsFromCategories(childComponents, axis);
-  return (0, _uniq2.default)([].concat(_toConsumableArray(categoryStrings), _toConsumableArray(axisStrings)).flat());
+  const categories = (0, _isPlainObject2.default)(props.categories) ? props.categories[axis] : props.categories;
+  const axisComponent = Axis.getAxisComponent(childComponents, axis);
+  const axisStrings = axisComponent ? Data.getStringsFromAxes(axisComponent.props, axis) : [];
+  const categoryStrings = categories || getStringsFromCategories(childComponents, axis);
+  return (0, _uniq2.default)([...categoryStrings, ...axisStrings].flat());
 }
-
 function getStringsFromChildren(props, childComponents) {
-  var children = childComponents || _react.default.Children.toArray(props.children);
-
-  var xStrings = getCategoryAndAxisStringsFromChildren(props, "x", children);
-  var yStrings = getCategoryAndAxisStringsFromChildren(props, "y", children);
-  var dataStrings = getStringsFromData(children);
+  const children = childComponents || _react.default.Children.toArray(props.children);
+  const xStrings = getCategoryAndAxisStringsFromChildren(props, "x", children);
+  const yStrings = getCategoryAndAxisStringsFromChildren(props, "y", children);
+  const dataStrings = getStringsFromData(children);
   return {
-    x: (0, _uniq2.default)([].concat(_toConsumableArray(xStrings), _toConsumableArray(dataStrings.x)).flat()),
-    y: (0, _uniq2.default)([].concat(_toConsumableArray(yStrings), _toConsumableArray(dataStrings.y)).flat())
+    x: (0, _uniq2.default)([...xStrings, ...dataStrings.x].flat()),
+    y: (0, _uniq2.default)([...yStrings, ...dataStrings.y].flat())
   };
 }
-
 function getCategories(props, childComponents, allStrings) {
-  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 ? allStrings || getStringsFromChildren(props, childComponents) : {};
-  var xCategories = xPropCategories || fallbackProps.x;
-  var yCategories = yPropCategories || fallbackProps.y;
+  const xPropCategories = props.categories && !Array.isArray(props.categories) ? props.categories.x : props.categories;
+  const yPropCategories = props.categories && !Array.isArray(props.categories) ? props.categories.y : props.categories;
+  const fallbackRequired = !xPropCategories || !yPropCategories;
+  const fallbackProps = fallbackRequired ? allStrings || getStringsFromChildren(props, childComponents) : {};
+  const xCategories = xPropCategories || fallbackProps.x;
+  const yCategories = yPropCategories || fallbackProps.y;
   return {
     x: xCategories.length > 0 ? xCategories : undefined,
     y: yCategories.length > 0 ? yCategories : undefined