victory-group 36.9.2 → 37.0.0

package/es/helper-methods.js

@@ -1,242 +1,217 @@
-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 _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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure 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 _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 _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
-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; }
-
 /* eslint-disable no-use-before-define */
 import React from "react";
 import { Data, Helpers, Scale, Wrapper } from "victory-core";
 import isEqual from "react-fast-compare";
-var fallbackProps = {
+const fallbackProps = {
   width: 450,
   height: 300,
   padding: 50,
   offset: 0
-}; // eslint-disable-next-line max-statements
+};
 
+// eslint-disable-next-line max-statements
 export function getCalculatedProps(initialProps, childComponents) {
-  var role = "group";
-  var props = Helpers.modifyProps(initialProps, fallbackProps, role);
-  var style = Wrapper.getStyle(props.theme, props.style, role);
-  var offset = props.offset,
-      colorScale = props.colorScale,
-      color = props.color,
-      polar = props.polar,
-      horizontal = props.horizontal;
-  var categories = props.categories || Wrapper.getCategories(props, childComponents, null);
-  var datasets = props.datasets || Wrapper.getDataFromChildren(props, null);
-  var domain = {
+  const role = "group";
+  const props = Helpers.modifyProps(initialProps, fallbackProps, role);
+  const style = Wrapper.getStyle(props.theme, props.style, role);
+  const {
+    offset,
+    colorScale,
+    color,
+    polar,
+    horizontal
+  } = props;
+  const categories = props.categories || Wrapper.getCategories(props, childComponents, null);
+  const datasets = props.datasets || Wrapper.getDataFromChildren(props, null);
+  const domain = {
     x: Wrapper.getDomain(Object.assign({}, props, {
-      categories: categories
+      categories
     }), "x", childComponents),
     y: Wrapper.getDomain(Object.assign({}, props, {
-      categories: categories
+      categories
     }), "y", childComponents)
   };
-  var range = props.range || {
+  const range = props.range || {
     x: Helpers.getRange(props, "x"),
     y: Helpers.getRange(props, "y")
   };
-  var baseScale = {
+  const baseScale = {
     x: Scale.getScaleFromProps(props, "x") || Wrapper.getScale(props, "x"),
     y: Scale.getScaleFromProps(props, "y") || Wrapper.getScale(props, "y")
   };
-  var scale = {
+  const scale = {
     x: baseScale.x.domain(domain.x).range(props.horizontal ? range.y : range.x),
     y: baseScale.y.domain(domain.y).range(props.horizontal ? range.x : range.y)
   };
-  var origin = polar ? props.origin : Helpers.getPolarOrigin(props);
-  var padding = Helpers.getPadding(props);
+  const origin = polar ? props.origin : Helpers.getPolarOrigin(props);
+  const padding = Helpers.getPadding(props);
   return {
-    datasets: datasets,
-    categories: categories,
-    range: range,
-    domain: domain,
-    horizontal: horizontal,
-    scale: scale,
-    style: style,
-    colorScale: colorScale,
-    color: color,
-    offset: offset,
-    origin: origin,
-    padding: padding
+    datasets,
+    categories,
+    range,
+    domain,
+    horizontal,
+    scale,
+    style,
+    colorScale,
+    color,
+    offset,
+    origin,
+    padding
   };
-} // We need to remove sharedEvents in order to memoize the calculated data
-// With shared events, the props change on every event, and every value is re-calculated
+}
 
-var withoutSharedEvents = function (props) {
-  var children = props.children;
-  var modifiedChildren = React.Children.toArray(children).map(function (child) {
-    return _objectSpread(_objectSpread({}, child), {}, {
+// We need to remove sharedEvents in order to memoize the calculated data
+// With shared events, the props change on every event, and every value is re-calculated
+const withoutSharedEvents = props => {
+  const {
+    children
+  } = props;
+  const modifiedChildren = React.Children.toArray(children).map(child => {
+    return {
+      ...child,
       props: Helpers.omit(child.props, ["sharedEvents"])
-    });
+    };
   });
   props.children = modifiedChildren;
   return props;
 };
-
 export function useMemoizedProps(initialProps) {
-  var modifiedProps = withoutSharedEvents(initialProps);
+  const modifiedProps = withoutSharedEvents(initialProps);
+  const [props, setProps] = React.useState(modifiedProps);
 
-  var _React$useState = React.useState(modifiedProps),
-      _React$useState2 = _slicedToArray(_React$useState, 2),
-      props = _React$useState2[0],
-      setProps = _React$useState2[1]; // React.memo uses shallow equality to compare objects. This way props
+  // React.memo uses shallow equality to compare objects. This way props
   // will only be re-calculated when they change.
-
-
-  React.useEffect(function () {
+  React.useEffect(() => {
     if (!isEqual(modifiedProps, props)) {
       setProps(modifiedProps);
     }
   }, [props, setProps, modifiedProps]);
-  return React.useMemo(function () {
+  return React.useMemo(() => {
     return getCalculatedProps(props, props.children);
   }, [props]);
 }
-
 function pixelsToValue(props, axis, calculatedProps) {
   if (!props.offset) {
     return 0;
   }
-
-  var currentAxis = Helpers.getCurrentAxis(axis, props.horizontal);
-  var domain = calculatedProps.domain[axis];
-  var range = calculatedProps.range[currentAxis];
-  var domainExtent = Math.max.apply(Math, _toConsumableArray(domain)) - Math.min.apply(Math, _toConsumableArray(domain));
-  var rangeExtent = Math.max.apply(Math, _toConsumableArray(range)) - Math.min.apply(Math, _toConsumableArray(range));
+  const currentAxis = Helpers.getCurrentAxis(axis, props.horizontal);
+  const domain = calculatedProps.domain[axis];
+  const range = calculatedProps.range[currentAxis];
+  const domainExtent = Math.max(...domain) - Math.min(...domain);
+  const rangeExtent = Math.max(...range) - Math.min(...range);
   return domainExtent / rangeExtent * props.offset;
-} // eslint-disable-next-line max-params
-
+}
 
+// eslint-disable-next-line max-params
 function getX0(props, calculatedProps, index, role) {
-  var groupLength = role === "stack" ? calculatedProps.datasets[0].length : calculatedProps.datasets.length;
-  var center = (groupLength - 1) / 2;
-  var totalWidth = pixelsToValue(props, "x", calculatedProps);
+  const groupLength = role === "stack" ? calculatedProps.datasets[0].length : calculatedProps.datasets.length;
+  const center = (groupLength - 1) / 2;
+  const totalWidth = pixelsToValue(props, "x", calculatedProps);
   return (index - center) * totalWidth;
-} // eslint-disable-next-line max-params
-
+}
 
+// eslint-disable-next-line max-params
 function getPolarX0(props, calculatedProps, index, role) {
-  var groupLength = role === "stack" ? calculatedProps.datasets[0].length : calculatedProps.datasets.length;
-  var center = (groupLength - 1) / 2;
-  var width = getAngularWidth(props, calculatedProps);
+  const groupLength = role === "stack" ? calculatedProps.datasets[0].length : calculatedProps.datasets.length;
+  const center = (groupLength - 1) / 2;
+  const width = getAngularWidth(props, calculatedProps);
   return (index - center) * width;
 }
-
 function getAngularWidth(props, calculatedProps) {
-  var range = calculatedProps.range;
-  var angularRange = Math.abs(range.x[1] - range.x[0]);
-  var r = Math.max.apply(Math, _toConsumableArray(range.y));
+  const {
+    range
+  } = calculatedProps;
+  const angularRange = Math.abs(range.x[1] - range.x[0]);
+  const r = Math.max(...range.y);
   return props.offset / (2 * Math.PI * r) * angularRange;
 }
-
 function getLabels(props, datasets, index) {
   if (!props.labels) {
     return undefined;
   }
-
   return Math.floor(datasets.length / 2) === index ? props.labels : undefined;
 }
-
 function getChildProps(props, calculatedProps) {
-  var categories = calculatedProps.categories,
-      domain = calculatedProps.domain,
-      range = calculatedProps.range,
-      scale = calculatedProps.scale,
-      horizontal = calculatedProps.horizontal,
-      origin = calculatedProps.origin,
-      padding = calculatedProps.padding;
-  var width = props.width,
-      height = props.height,
-      theme = props.theme,
-      polar = props.polar;
+  const {
+    categories,
+    domain,
+    range,
+    scale,
+    horizontal,
+    origin,
+    padding
+  } = calculatedProps;
+  const {
+    width,
+    height,
+    theme,
+    polar
+  } = props;
   return {
-    height: height,
-    width: width,
-    theme: theme,
-    polar: polar,
-    origin: origin,
-    categories: categories,
-    domain: domain,
-    range: range,
-    scale: scale,
-    horizontal: horizontal,
-    padding: padding,
+    height,
+    width,
+    theme,
+    polar,
+    origin,
+    categories,
+    domain,
+    range,
+    scale,
+    horizontal,
+    padding,
     standalone: false
   };
 }
-
 function getColorScale(props, child) {
-  var role = child.type && child.type.role;
-  var colorScaleOptions = child.props.colorScale || props.colorScale;
-
+  const role = child.type && child.type.role;
+  const colorScaleOptions = child.props.colorScale || props.colorScale;
   if (role !== "group" && role !== "stack") {
     return undefined;
   }
-
   return props.theme && props.theme.group ? colorScaleOptions || props.theme.group.colorScale : colorScaleOptions;
 }
-
-function getDataWithOffset(props) {
-  var defaultDataset = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
-  var offset = arguments.length > 2 ? arguments[2] : undefined;
-  var dataset = props.data || props.y ? Data.getData(props) : defaultDataset;
-  var xOffset = offset || 0;
-  return dataset.map(function (datum) {
-    var _x1 = datum._x instanceof Date ? new Date(datum._x.getTime() + xOffset) : datum._x + xOffset;
-
+function getDataWithOffset(props, defaultDataset, offset) {
+  if (defaultDataset === void 0) {
+    defaultDataset = [];
+  }
+  const dataset = props.data || props.y ? Data.getData(props) : defaultDataset;
+  const xOffset = offset || 0;
+  return dataset.map(datum => {
+    const _x1 = datum._x instanceof Date ? new Date(datum._x.getTime() + xOffset) : datum._x + xOffset;
     return Object.assign({}, datum, {
-      _x1: _x1
+      _x1
     });
   });
 }
-
 export function getChildren(initialProps, childComponents, calculatedProps) {
-  var props = Helpers.modifyProps(initialProps, fallbackProps, "stack");
-  var children = childComponents || React.Children.toArray(props.children);
-  var newCalculatedProps = calculatedProps || getCalculatedProps(props, children);
-  var datasets = newCalculatedProps.datasets;
-  var labelComponent = props.labelComponent,
-      polar = props.polar;
-  var childProps = getChildProps(props, newCalculatedProps);
-  var parentName = props.name || "group";
-  return children.map(function (child, index) {
-    var role = child.type && child.type.role;
-    var xOffset = polar ? getPolarX0(props, newCalculatedProps, index, role) : getX0(props, newCalculatedProps, index, role);
-    var style = role === "voronoi" || role === "tooltip" || role === "label" ? child.props.style : Wrapper.getChildStyle(child, index, newCalculatedProps);
-    var labels = props.labels ? getLabels(props, datasets, index) : child.props.labels;
-    var name = child.props.name || "".concat(parentName, "-").concat(role, "-").concat(index);
+  const props = Helpers.modifyProps(initialProps, fallbackProps, "stack");
+  const children = childComponents || React.Children.toArray(props.children);
+  const newCalculatedProps = calculatedProps || getCalculatedProps(props, children);
+  const {
+    datasets
+  } = newCalculatedProps;
+  const {
+    labelComponent,
+    polar
+  } = props;
+  const childProps = getChildProps(props, newCalculatedProps);
+  const parentName = props.name || "group";
+  return children.map((child, index) => {
+    const role = child.type && child.type.role;
+    const xOffset = polar ? getPolarX0(props, newCalculatedProps, index, role) : getX0(props, newCalculatedProps, index, role);
+    const style = role === "voronoi" || role === "tooltip" || role === "label" ? child.props.style : Wrapper.getChildStyle(child, index, newCalculatedProps);
+    const labels = props.labels ? getLabels(props, datasets, index) : child.props.labels;
+    const name = child.props.name || `${parentName}-${role}-${index}`;
     return /*#__PURE__*/React.cloneElement(child, Object.assign({
-      labels: labels,
-      style: style,
-      key: "".concat(name, "-key-").concat(index),
-      name: name,
+      labels,
+      style,
+      key: `${name}-key-${index}`,
+      name,
       data: getDataWithOffset(props, datasets[index], xOffset),
       colorScale: getColorScale(props, child),
       labelComponent: labelComponent || child.props.labelComponent,
-      xOffset: xOffset
+      xOffset
     }, childProps));
   });
 }

package/es/victory-group.js

@@ -1,115 +1,105 @@
 import _isEmpty from "lodash/isEmpty";
 import _defaults from "lodash/defaults";
-
-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; }
-
 import React from "react";
 import { Helpers, Hooks, UserProps, VictoryContainer, VictoryTheme, Wrapper } from "victory-core";
 import { VictorySharedEvents } from "victory-shared-events";
 import { getChildren, useMemoizedProps } from "./helper-methods";
 import isEqual from "react-fast-compare";
-var fallbackProps = {
+const fallbackProps = {
   width: 450,
   height: 300,
   padding: 50,
   offset: 0
 };
-var defaultProps = {
+const defaultProps = {
   containerComponent: /*#__PURE__*/React.createElement(VictoryContainer, null),
   groupComponent: /*#__PURE__*/React.createElement("g", null),
   samples: 50,
   standalone: true,
   theme: VictoryTheme.grayscale
 };
-
-var VictoryGroupBase = function (initialProps) {
+const VictoryGroupBase = initialProps => {
   // eslint-disable-next-line no-use-before-define
-  var role = VictoryGroup === null || VictoryGroup === void 0 ? void 0 : VictoryGroup.role;
-
-  var _Hooks$useAnimationSt = Hooks.useAnimationState(),
-      getAnimationProps = _Hooks$useAnimationSt.getAnimationProps,
-      setAnimationState = _Hooks$useAnimationSt.setAnimationState,
-      getProps = _Hooks$useAnimationSt.getProps;
-
-  var propsWithDefaults = React.useMemo(function () {
-    return _objectSpread(_objectSpread({}, defaultProps), initialProps);
-  }, [initialProps]);
-  var props = getProps(propsWithDefaults);
-  var modifiedProps = Helpers.modifyProps(props, fallbackProps, role);
-  var eventKey = modifiedProps.eventKey,
-      containerComponent = modifiedProps.containerComponent,
-      standalone = modifiedProps.standalone,
-      groupComponent = modifiedProps.groupComponent,
-      externalEventMutations = modifiedProps.externalEventMutations,
-      width = modifiedProps.width,
-      height = modifiedProps.height,
-      theme = modifiedProps.theme,
-      polar = modifiedProps.polar,
-      horizontal = modifiedProps.horizontal,
-      name = modifiedProps.name;
-  var childComponents = React.Children.toArray(modifiedProps.children);
-  var calculatedProps = useMemoizedProps(modifiedProps);
-  var domain = calculatedProps.domain,
-      scale = calculatedProps.scale,
-      style = calculatedProps.style,
-      origin = calculatedProps.origin;
-  var newChildren = React.useMemo(function () {
-    var children = getChildren(props, childComponents, calculatedProps);
-    return children.map(function (child, index) {
-      var childProps = Object.assign({
+  const role = VictoryGroup?.role;
+  const {
+    getAnimationProps,
+    setAnimationState,
+    getProps
+  } = Hooks.useAnimationState();
+  const propsWithDefaults = React.useMemo(() => ({
+    ...defaultProps,
+    ...initialProps
+  }), [initialProps]);
+  const props = getProps(propsWithDefaults);
+  const modifiedProps = Helpers.modifyProps(props, fallbackProps, role);
+  const {
+    eventKey,
+    containerComponent,
+    standalone,
+    groupComponent,
+    externalEventMutations,
+    width,
+    height,
+    theme,
+    polar,
+    horizontal,
+    name
+  } = modifiedProps;
+  const childComponents = React.Children.toArray(modifiedProps.children);
+  const calculatedProps = useMemoizedProps(modifiedProps);
+  const {
+    domain,
+    scale,
+    style,
+    origin
+  } = calculatedProps;
+  const newChildren = React.useMemo(() => {
+    const children = getChildren(props, childComponents, calculatedProps);
+    return children.map((child, index) => {
+      const childProps = Object.assign({
         animate: getAnimationProps(props, child, index)
       }, child.props);
       return /*#__PURE__*/React.cloneElement(child, childProps);
     });
   }, [props, childComponents, calculatedProps, getAnimationProps]);
-  var containerProps = React.useMemo(function () {
+  const containerProps = React.useMemo(() => {
     if (standalone) {
       return {
-        domain: domain,
-        scale: scale,
-        width: width,
-        height: height,
-        standalone: standalone,
-        theme: theme,
+        domain,
+        scale,
+        width,
+        height,
+        standalone,
+        theme,
         style: style.parent,
-        horizontal: horizontal,
-        polar: polar,
-        origin: origin,
-        name: name
+        horizontal,
+        polar,
+        origin,
+        name
       };
     }
-
     return {};
   }, [standalone, domain, scale, width, height, theme, style, horizontal, polar, origin, name]);
-  var userProps = React.useMemo(function () {
-    return UserProps.getSafeUserProps(propsWithDefaults);
-  }, [propsWithDefaults]);
-  var container = React.useMemo(function () {
+  const userProps = React.useMemo(() => UserProps.getSafeUserProps(propsWithDefaults), [propsWithDefaults]);
+  const container = React.useMemo(() => {
     if (standalone) {
-      var defaultContainerProps = _defaults({}, containerComponent.props, containerProps, userProps);
-
+      const defaultContainerProps = _defaults({}, containerComponent.props, containerProps, userProps);
       return /*#__PURE__*/React.cloneElement(containerComponent, defaultContainerProps);
     }
-
     return /*#__PURE__*/React.cloneElement(groupComponent, userProps);
   }, [groupComponent, standalone, containerComponent, containerProps, userProps]);
-  var events = React.useMemo(function () {
+  const events = React.useMemo(() => {
     return Wrapper.getAllEvents(props);
   }, [props]);
-  var previousProps = Hooks.usePreviousProps(propsWithDefaults);
-  React.useEffect(function () {
+  const previousProps = Hooks.usePreviousProps(propsWithDefaults);
+  React.useEffect(() => {
     // This is called before dismount to keep state in sync
-    return function () {
+    return () => {
       if (propsWithDefaults.animate) {
         setAnimationState(previousProps, props);
       }
     };
   }, [setAnimationState, previousProps, propsWithDefaults, props]);
-
   if (!_isEmpty(events)) {
     return /*#__PURE__*/React.createElement(VictorySharedEvents, {
       container: container,
@@ -118,14 +108,12 @@ var VictoryGroupBase = function (initialProps) {
       externalEventMutations: externalEventMutations
     }, newChildren);
   }
-
   return /*#__PURE__*/React.cloneElement(container, container.props, newChildren);
 };
-
-var componentConfig = {
+const componentConfig = {
   role: "group",
   expectedComponents: ["groupComponent", "containerComponent", "labelComponent"],
-  getChildren: getChildren
+  getChildren
 };
-export var VictoryGroup = Object.assign( /*#__PURE__*/React.memo(VictoryGroupBase, isEqual), componentConfig);
+export const VictoryGroup = Object.assign( /*#__PURE__*/React.memo(VictoryGroupBase, isEqual), componentConfig);
 VictoryGroup.displayName = "VictoryGroup";