victory-chart 36.9.2 → 37.0.0

package/lib/helper-methods.js

@@ -7,87 +7,81 @@ exports.getBackgroundWithProps = getBackgroundWithProps;
 exports.getCalculatedProps = getCalculatedProps;
 exports.getChildComponents = void 0;
 exports.getChildren = getChildren;
-
 var _defaults2 = _interopRequireDefault(require("lodash/defaults"));
-
 var _react = _interopRequireDefault(require("react"));
-
 var _victoryCore = require("victory-core");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 /* eslint-disable no-use-before-define */
-var fallbackProps = {
+
+const fallbackProps = {
   width: 450,
   height: 300,
   padding: 50
 };
-
 function getAxisProps(child, props, calculatedProps) {
-  var domain = calculatedProps.domain,
-      scale = calculatedProps.scale,
-      stringMap = calculatedProps.stringMap,
-      categories = calculatedProps.categories,
-      horizontal = calculatedProps.horizontal;
+  const {
+    domain,
+    scale,
+    stringMap,
+    categories,
+    horizontal
+  } = calculatedProps;
   return {
-    stringMap: stringMap,
-    horizontal: horizontal,
-    categories: categories,
+    stringMap,
+    horizontal,
+    categories,
     startAngle: props.startAngle,
     endAngle: props.endAngle,
     innerRadius: props.innerRadius,
-    domain: domain,
-    scale: scale
+    domain,
+    scale
   };
 }
-
 function getBackgroundWithProps(props, calculatedProps) {
-  var backgroundElement = props.backgroundComponent;
-  var height = props.polar ? calculatedProps.range.y[1] : calculatedProps.range.y[0] - calculatedProps.range.y[1];
-  var width = calculatedProps.range.x[1] - calculatedProps.range.x[0];
-  var xScale = props.horizontal ? calculatedProps.scale.y.range()[0] : calculatedProps.scale.x.range()[0];
-  var yScale = props.horizontal ? calculatedProps.scale.x.range()[1] : calculatedProps.scale.y.range()[1];
-  var xCoordinate = props.polar ? calculatedProps.origin.x : xScale;
-  var yCoordinate = props.polar ? calculatedProps.origin.y : yScale;
-  var parentName = props.name || "chart";
-  var backgroundProps = {
-    height: height,
+  const backgroundElement = props.backgroundComponent;
+  const height = props.polar ? calculatedProps.range.y[1] : calculatedProps.range.y[0] - calculatedProps.range.y[1];
+  const width = calculatedProps.range.x[1] - calculatedProps.range.x[0];
+  const xScale = props.horizontal ? calculatedProps.scale.y.range()[0] : calculatedProps.scale.x.range()[0];
+  const yScale = props.horizontal ? calculatedProps.scale.x.range()[1] : calculatedProps.scale.y.range()[1];
+  const xCoordinate = props.polar ? calculatedProps.origin.x : xScale;
+  const yCoordinate = props.polar ? calculatedProps.origin.y : yScale;
+  const parentName = props.name || "chart";
+  const backgroundProps = {
+    height,
     polar: props.polar,
     scale: calculatedProps.scale,
     style: props.style.background,
     x: xCoordinate,
     y: yCoordinate,
-    key: "".concat(parentName, "-background"),
-    width: width
+    key: `${parentName}-background`,
+    width
   };
   return /*#__PURE__*/_react.default.cloneElement(backgroundElement, (0, _defaults2.default)({}, backgroundElement.props, backgroundProps));
 }
-
 function getChildProps(child, props, calculatedProps) {
-  var axisChild = _victoryCore.Axis.findAxisComponents([child]);
-
+  const axisChild = _victoryCore.Axis.findAxisComponents([child]);
   if (axisChild.length > 0) {
     return getAxisProps(axisChild[0], props, calculatedProps);
   }
-
-  var categories = calculatedProps.categories,
-      domain = calculatedProps.domain,
-      range = calculatedProps.range,
-      scale = calculatedProps.scale,
-      stringMap = calculatedProps.stringMap,
-      horizontal = calculatedProps.horizontal;
+  const {
+    categories,
+    domain,
+    range,
+    scale,
+    stringMap,
+    horizontal
+  } = calculatedProps;
   return {
-    categories: categories,
-    domain: domain,
-    range: range,
-    scale: scale,
-    stringMap: stringMap,
-    horizontal: horizontal
+    categories,
+    domain,
+    range,
+    scale,
+    stringMap,
+    horizontal
   };
 }
-
 function getStyles(props) {
-  var styleProps = props.style && props.style.parent;
+  const styleProps = props.style && props.style.parent;
   return {
     parent: (0, _defaults2.default)({}, styleProps, {
       height: "100%",
@@ -96,135 +90,122 @@ function getStyles(props) {
     })
   };
 }
-
 function getCalculatedProps(initialProps, childComponents) {
-  var style = getStyles(initialProps);
-
-  var props = _victoryCore.Helpers.modifyProps(initialProps, fallbackProps, "chart");
-
-  var horizontal = props.horizontal,
-      polar = props.polar;
-
-  var allStrings = _victoryCore.Wrapper.getStringsFromChildren(props, childComponents);
-
-  var categories = _victoryCore.Wrapper.getCategories(props, childComponents, allStrings);
-
-  var stringMap = createStringMap(props, childComponents, allStrings);
-  var domain = {
+  const style = getStyles(initialProps);
+  const props = _victoryCore.Helpers.modifyProps(initialProps, fallbackProps, "chart");
+  const {
+    horizontal,
+    polar
+  } = props;
+  const allStrings = _victoryCore.Wrapper.getStringsFromChildren(props, childComponents);
+  const categories = _victoryCore.Wrapper.getCategories(props, childComponents, allStrings);
+  const stringMap = createStringMap(props, childComponents, allStrings);
+  const domain = {
     x: getDomain(Object.assign({}, props, {
-      categories: categories
+      categories
     }), "x", childComponents),
     y: getDomain(Object.assign({}, props, {
-      categories: categories
+      categories
     }), "y", childComponents)
   };
-  var range = {
+  const range = {
     x: _victoryCore.Helpers.getRange(props, "x"),
     y: _victoryCore.Helpers.getRange(props, "y")
   };
-  var baseScale = {
+  const baseScale = {
     x: _victoryCore.Scale.getScaleFromProps(props, "x") || _victoryCore.Wrapper.getScale(props, "x"),
     y: _victoryCore.Scale.getScaleFromProps(props, "y") || _victoryCore.Wrapper.getScale(props, "y")
   };
-  var scale = {
+  const scale = {
     x: baseScale.x.domain(domain.x).range(horizontal ? range.y : range.x),
     y: baseScale.y.domain(domain.y).range(horizontal ? range.x : range.y)
   };
-  var origin = polar ? _victoryCore.Helpers.getPolarOrigin(props) : _victoryCore.Axis.getOrigin(domain);
-
-  var padding = _victoryCore.Helpers.getPadding(props);
-
+  const origin = polar ? _victoryCore.Helpers.getPolarOrigin(props) : _victoryCore.Axis.getOrigin(domain);
+  const padding = _victoryCore.Helpers.getPadding(props);
   return {
-    categories: categories,
-    domain: domain,
-    range: range,
-    horizontal: horizontal,
-    scale: scale,
-    stringMap: stringMap,
-    style: style,
-    origin: origin,
-    padding: padding
+    categories,
+    domain,
+    range,
+    horizontal,
+    scale,
+    stringMap,
+    style,
+    origin,
+    padding
   };
 }
-
 function getChildren(props, childComponents, calculatedProps) {
-  var children = childComponents || getChildComponents(props);
-  var newCalculatedProps = calculatedProps || getCalculatedProps(props, children);
-  var baseStyle = newCalculatedProps.style.parent;
-  var height = props.height,
-      polar = props.polar,
-      theme = props.theme,
-      width = props.width;
-  var origin = newCalculatedProps.origin,
-      horizontal = newCalculatedProps.horizontal;
-  var parentName = props.name || "chart";
-  return children.filter(_react.default.isValidElement).map(function (child, index) {
-    var role = child.type && child.type.role;
-    var style = Array.isArray(child.props.style) ? child.props.style : (0, _defaults2.default)({}, child.props.style, {
+  const children = childComponents || getChildComponents(props);
+  const newCalculatedProps = calculatedProps || getCalculatedProps(props, children);
+  const baseStyle = newCalculatedProps.style.parent;
+  const {
+    height,
+    polar,
+    theme,
+    width
+  } = props;
+  const {
+    origin,
+    horizontal
+  } = newCalculatedProps;
+  const parentName = props.name || "chart";
+  return children.filter(_react.default.isValidElement).map((child, index) => {
+    const role = child.type && child.type.role;
+    const style = Array.isArray(child.props.style) ? child.props.style : (0, _defaults2.default)({}, child.props.style, {
       parent: baseStyle
     });
-    var childProps = getChildProps(child, props, newCalculatedProps);
-    var name = child.props.name || "".concat(parentName, "-").concat(role, "-").concat(index);
-    var newProps = (0, _defaults2.default)({
-      horizontal: horizontal,
-      height: height,
-      polar: polar,
-      theme: theme,
-      width: width,
-      style: style,
-      name: name,
+    const childProps = getChildProps(child, props, newCalculatedProps);
+    const name = child.props.name || `${parentName}-${role}-${index}`;
+    const newProps = (0, _defaults2.default)({
+      horizontal,
+      height,
+      polar,
+      theme,
+      width,
+      style,
+      name,
       origin: polar ? origin : undefined,
       padding: newCalculatedProps.padding,
-      key: "".concat(name, "-key-").concat(index),
+      key: `${name}-key-${index}`,
       standalone: false
     }, childProps);
     return /*#__PURE__*/_react.default.cloneElement(child, newProps);
   });
 }
-
-var getChildComponents = function (props, defaultAxes) {
-  var childComponents = _react.default.Children.toArray(props.children);
-
+const getChildComponents = (props, defaultAxes) => {
+  let childComponents = _react.default.Children.toArray(props.children);
   if (childComponents.length === 0) {
     childComponents.push(defaultAxes.independent, defaultAxes.dependent);
   } else {
-    var axisComponents = {
+    const axisComponents = {
       dependent: _victoryCore.Axis.getAxisComponentsWithParent(childComponents, "dependent"),
       independent: _victoryCore.Axis.getAxisComponentsWithParent(childComponents, "independent")
     };
-
     if (axisComponents.dependent.length === 0 && axisComponents.independent.length === 0) {
       childComponents = props.prependDefaultAxes ? [defaultAxes.independent, defaultAxes.dependent].concat(childComponents) : childComponents.concat([defaultAxes.independent, defaultAxes.dependent]);
     }
   }
-
   return childComponents;
 };
-
 exports.getChildComponents = getChildComponents;
-
-var getDomain = function (props, axis, childComponents) {
-  var children = childComponents || _react.default.Children.toArray(props.children);
-
-  var domain = _victoryCore.Wrapper.getDomain(props, axis, children);
-
-  var axisComponent = _victoryCore.Axis.getAxisComponent(children, axis);
-
-  var invertDomain = axisComponent && axisComponent.props && axisComponent.props.invertAxis;
+const getDomain = (props, axis, childComponents) => {
+  const children = childComponents || _react.default.Children.toArray(props.children);
+  const domain = _victoryCore.Wrapper.getDomain(props, axis, children);
+  const axisComponent = _victoryCore.Axis.getAxisComponent(children, axis);
+  const invertDomain = axisComponent && axisComponent.props && axisComponent.props.invertAxis;
   return invertDomain ? domain.concat().reverse() : domain;
 };
-
-var createStringMap = function (props, childComponents, allStrings) {
-  var x = !allStrings.x || allStrings.x.length === 0 ? null : allStrings.x.reduce(function (memo, string, index) {
+const createStringMap = (props, childComponents, allStrings) => {
+  const x = !allStrings.x || allStrings.x.length === 0 ? null : allStrings.x.reduce((memo, string, index) => {
     memo[string] = index + 1;
     return memo;
   }, {});
-  var y = !allStrings.y || allStrings.y.length === 0 ? null : allStrings.y.reduce(function (memo, string, index) {
+  const y = !allStrings.y || allStrings.y.length === 0 ? null : allStrings.y.reduce((memo, string, index) => {
     memo[string] = index + 1;
     return memo;
   }, {});
   return {
-    x: x,
-    y: y
+    x,
+    y
   };
 };

package/lib/index.js

@@ -3,9 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-
 var _victoryChart = require("./victory-chart");
-
 Object.keys(_victoryChart).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _victoryChart[key]) return;

package/lib/victory-chart.js

@@ -4,39 +4,22 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.VictoryChart = void 0;
-
 var _isEmpty2 = _interopRequireDefault(require("lodash/isEmpty"));
-
 var _defaults2 = _interopRequireDefault(require("lodash/defaults"));
-
 var _react = _interopRequireDefault(require("react"));
-
 var _victoryCore = require("victory-core");
-
 var _victorySharedEvents = require("victory-shared-events");
-
 var _victoryAxis = require("victory-axis");
-
 var _victoryPolarAxis = require("victory-polar-axis");
-
 var _helperMethods = require("./helper-methods");
-
 var _reactFastCompare = _interopRequireDefault(require("react-fast-compare"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-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; }
-
-var fallbackProps = {
+const fallbackProps = {
   width: 450,
   height: 300,
   padding: 50
 };
-var defaultProps = {
+const defaultProps = {
   backgroundComponent: /*#__PURE__*/_react.default.createElement(_victoryCore.Background, null),
   containerComponent: /*#__PURE__*/_react.default.createElement(_victoryCore.VictoryContainer, null),
   defaultAxes: {
@@ -55,114 +38,96 @@ var defaultProps = {
   standalone: true,
   theme: _victoryCore.VictoryTheme.grayscale
 };
-
-var VictoryChartImpl = function (initialProps) {
-  var propsWithDefaults = _react.default.useMemo(function () {
-    return _objectSpread(_objectSpread({}, defaultProps), initialProps);
-  }, [initialProps]);
-
-  var role = "chart";
-
-  var _Hooks$useAnimationSt = _victoryCore.Hooks.useAnimationState(),
-      getAnimationProps = _Hooks$useAnimationSt.getAnimationProps,
-      setAnimationState = _Hooks$useAnimationSt.setAnimationState,
-      getProps = _Hooks$useAnimationSt.getProps;
-
-  var props = getProps(propsWithDefaults);
-
-  var modifiedProps = _victoryCore.Helpers.modifyProps(props, fallbackProps, role);
-
-  var desc = modifiedProps.desc,
-      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,
-      name = modifiedProps.name,
-      title = modifiedProps.title;
-  var axes = props.polar ? modifiedProps.defaultPolarAxes : modifiedProps.defaultAxes;
-
-  var childComponents = _react.default.useMemo(function () {
-    return (0, _helperMethods.getChildComponents)(modifiedProps, axes);
-  }, [modifiedProps, axes]);
-
-  var calculatedProps = _react.default.useMemo(function () {
-    return (0, _helperMethods.getCalculatedProps)(modifiedProps, childComponents);
-  }, [modifiedProps, childComponents]);
-
-  var domain = calculatedProps.domain,
-      scale = calculatedProps.scale,
-      style = calculatedProps.style,
-      origin = calculatedProps.origin,
-      horizontal = calculatedProps.horizontal;
-
-  var newChildren = _react.default.useMemo(function () {
-    var children = (0, _helperMethods.getChildren)(props, childComponents, calculatedProps);
-    var mappedChildren = children.map(function (child, index) {
-      var childProps = Object.assign({
+const VictoryChartImpl = initialProps => {
+  const propsWithDefaults = _react.default.useMemo(() => ({
+    ...defaultProps,
+    ...initialProps
+  }), [initialProps]);
+  const role = "chart";
+  const {
+    getAnimationProps,
+    setAnimationState,
+    getProps
+  } = _victoryCore.Hooks.useAnimationState();
+  const props = getProps(propsWithDefaults);
+  const modifiedProps = _victoryCore.Helpers.modifyProps(props, fallbackProps, role);
+  const {
+    desc,
+    eventKey,
+    containerComponent,
+    standalone,
+    groupComponent,
+    externalEventMutations,
+    width,
+    height,
+    theme,
+    polar,
+    name,
+    title
+  } = modifiedProps;
+  const axes = props.polar ? modifiedProps.defaultPolarAxes : modifiedProps.defaultAxes;
+  const childComponents = _react.default.useMemo(() => (0, _helperMethods.getChildComponents)(modifiedProps, axes), [modifiedProps, axes]);
+  const calculatedProps = _react.default.useMemo(() => (0, _helperMethods.getCalculatedProps)(modifiedProps, childComponents), [modifiedProps, childComponents]);
+  const {
+    domain,
+    scale,
+    style,
+    origin,
+    horizontal
+  } = calculatedProps;
+  const newChildren = _react.default.useMemo(() => {
+    const children = (0, _helperMethods.getChildren)(props, childComponents, calculatedProps);
+    const mappedChildren = children.map((child, index) => {
+      const childProps = Object.assign({
         animate: getAnimationProps(props, child, index)
       }, child.props);
       return /*#__PURE__*/_react.default.cloneElement(child, childProps);
     });
-
     if (props.style && props.style.background) {
-      var backgroundComponent = (0, _helperMethods.getBackgroundWithProps)(props, calculatedProps);
+      const backgroundComponent = (0, _helperMethods.getBackgroundWithProps)(props, calculatedProps);
       mappedChildren.unshift(backgroundComponent);
     }
-
     return mappedChildren;
   }, [getAnimationProps, childComponents, props, calculatedProps]);
-
-  var containerProps = _react.default.useMemo(function () {
+  const containerProps = _react.default.useMemo(() => {
     if (standalone) {
       return {
-        desc: desc,
-        domain: domain,
-        width: width,
-        height: height,
-        horizontal: horizontal,
-        name: name,
+        desc,
+        domain,
+        width,
+        height,
+        horizontal,
+        name,
         origin: polar ? origin : undefined,
-        polar: polar,
-        theme: theme,
-        title: title,
-        scale: scale,
-        standalone: standalone,
+        polar,
+        theme,
+        title,
+        scale,
+        standalone,
         style: style.parent
       };
     }
-
     return {};
   }, [desc, domain, height, horizontal, name, origin, polar, scale, standalone, style, title, theme, width]);
-
-  var container = _react.default.useMemo(function () {
+  const container = _react.default.useMemo(() => {
     if (standalone) {
-      var defaultContainerProps = (0, _defaults2.default)({}, containerComponent.props, containerProps, _victoryCore.UserProps.getSafeUserProps(propsWithDefaults));
+      const defaultContainerProps = (0, _defaults2.default)({}, containerComponent.props, containerProps, _victoryCore.UserProps.getSafeUserProps(propsWithDefaults));
       return /*#__PURE__*/_react.default.cloneElement(containerComponent, defaultContainerProps);
     }
-
     return groupComponent;
   }, [groupComponent, standalone, containerComponent, containerProps, propsWithDefaults]);
-
-  var events = _react.default.useMemo(function () {
+  const events = _react.default.useMemo(() => {
     return _victoryCore.Wrapper.getAllEvents(props);
   }, [props]);
-
-  var previousProps = _victoryCore.Hooks.usePreviousProps(propsWithDefaults);
-
-  _react.default.useEffect(function () {
+  const previousProps = _victoryCore.Hooks.usePreviousProps(propsWithDefaults);
+  _react.default.useEffect(() => {
     // This is called before dismount to keep state in sync
-    return function () {
+    return () => {
       if (propsWithDefaults.animate) {
         setAnimationState(previousProps, propsWithDefaults);
       }
     };
   }, [setAnimationState, previousProps, propsWithDefaults]);
-
   if (!(0, _isEmpty2.default)(events)) {
     return /*#__PURE__*/_react.default.createElement(_victorySharedEvents.VictorySharedEvents, {
       container: container,
@@ -171,13 +136,9 @@ var VictoryChartImpl = function (initialProps) {
       externalEventMutations: externalEventMutations
     }, newChildren);
   }
-
   return /*#__PURE__*/_react.default.cloneElement(container, container.props, newChildren);
 };
-
-var VictoryChart = /*#__PURE__*/_react.default.memo(VictoryChartImpl, _reactFastCompare.default);
-
-exports.VictoryChart = VictoryChart;
-VictoryChart.displayName = "VictoryChart"; // @ts-expect-error FIXME: Does this "expectedComponents" do anything?
-
+const VictoryChart = exports.VictoryChart = /*#__PURE__*/_react.default.memo(VictoryChartImpl, _reactFastCompare.default);
+VictoryChart.displayName = "VictoryChart";
+// @ts-expect-error FIXME: Does this "expectedComponents" do anything?
 VictoryChart.expectedComponents = ["groupComponent", "containerComponent"];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "victory-chart",
-  "version": "36.9.2",
+  "version": "37.0.0",
   "description": "Chart Component for Victory",
   "keywords": [
     "data visualization",
@@ -22,10 +22,10 @@
   "dependencies": {
     "lodash": "^4.17.19",
     "react-fast-compare": "^3.2.0",
-    "victory-axis": "^36.9.2",
-    "victory-core": "^36.9.2",
-    "victory-polar-axis": "^36.9.2",
-    "victory-shared-events": "^36.9.2"
+    "victory-axis": "^37.0.0",
+    "victory-core": "^37.0.0",
+    "victory-polar-axis": "^37.0.0",
+    "victory-shared-events": "^37.0.0"
   },
   "peerDependencies": {
     "react": ">=16.6.0"