victory-group 36.8.2 → 36.8.4

package/es/helper-methods.d.ts

@@ -1,4 +1,4 @@
-export declare function getCalculatedProps(props: any, childComponents: any): {
+export declare function getCalculatedProps(initialProps: any, childComponents: any): {
     datasets: any;
     categories: any;
     range: any;
@@ -48,5 +48,5 @@ export declare function useMemoizedProps(initialProps: any): {
         right: any;
     };
 };
-export declare function getChildren(props: any, childComponents?: any, calculatedProps?: any): any;
+export declare function getChildren(initialProps: any, childComponents?: any, calculatedProps?: any): any;
 //# sourceMappingURL=helper-methods.d.ts.map

package/es/helper-methods.js

@@ -36,16 +36,15 @@ var fallbackProps = {
   offset: 0
 }; // eslint-disable-next-line max-statements
 
-export function getCalculatedProps(props, childComponents) {
+export function getCalculatedProps(initialProps, childComponents) {
   var role = "group";
-  props = Helpers.modifyProps(props, fallbackProps, role);
+  var props = Helpers.modifyProps(initialProps, fallbackProps, role);
   var style = Wrapper.getStyle(props.theme, props.style, role);
-  var _props = props,
-      offset = _props.offset,
-      colorScale = _props.colorScale,
-      color = _props.color,
-      polar = _props.polar,
-      horizontal = _props.horizontal;
+  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 = {
@@ -215,21 +214,19 @@ function getDataWithOffset(props) {
   });
 }
 
-export function getChildren(props, childComponents, calculatedProps) {
-  props = Helpers.modifyProps(props, fallbackProps, "stack");
-  childComponents = childComponents || React.Children.toArray(props.children);
-  calculatedProps = calculatedProps || getCalculatedProps(props, childComponents);
-  var _calculatedProps = calculatedProps,
-      datasets = _calculatedProps.datasets;
-  var _props2 = props,
-      labelComponent = _props2.labelComponent,
-      polar = _props2.polar;
-  var childProps = getChildProps(props, calculatedProps);
+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 childComponents.map(function (child, index) {
+  return children.map(function (child, index) {
     var role = child.type && child.type.role;
-    var xOffset = polar ? getPolarX0(props, calculatedProps, index, role) : getX0(props, calculatedProps, index, role);
-    var style = role === "voronoi" || role === "tooltip" || role === "label" ? child.props.style : Wrapper.getChildStyle(child, index, calculatedProps);
+    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);
     return /*#__PURE__*/React.cloneElement(child, _assign({

package/lib/helper-methods.d.ts

@@ -1,4 +1,4 @@
-export declare function getCalculatedProps(props: any, childComponents: any): {
+export declare function getCalculatedProps(initialProps: any, childComponents: any): {
     datasets: any;
     categories: any;
     range: any;
@@ -48,5 +48,5 @@ export declare function useMemoizedProps(initialProps: any): {
         right: any;
     };
 };
-export declare function getChildren(props: any, childComponents?: any, calculatedProps?: any): any;
+export declare function getChildren(initialProps: any, childComponents?: any, calculatedProps?: any): any;
 //# sourceMappingURL=helper-methods.d.ts.map

package/lib/helper-methods.js

@@ -50,18 +50,18 @@ var fallbackProps = {
   offset: 0
 }; // eslint-disable-next-line max-statements
 
-function getCalculatedProps(props, childComponents) {
+function getCalculatedProps(initialProps, childComponents) {
   var role = "group";
-  props = _victoryCore.Helpers.modifyProps(props, fallbackProps, role);
+
+  var props = _victoryCore.Helpers.modifyProps(initialProps, fallbackProps, role);
 
   var style = _victoryCore.Wrapper.getStyle(props.theme, props.style, role);
 
-  var _props = props,
-      offset = _props.offset,
-      colorScale = _props.colorScale,
-      color = _props.color,
-      polar = _props.polar,
-      horizontal = _props.horizontal;
+  var offset = props.offset,
+      colorScale = props.colorScale,
+      color = props.color,
+      polar = props.polar,
+      horizontal = props.horizontal;
 
   var categories = props.categories || _victoryCore.Wrapper.getCategories(props, childComponents, null);
 
@@ -241,21 +241,21 @@ function getDataWithOffset(props) {
   });
 }
 
-function getChildren(props, childComponents, calculatedProps) {
-  props = _victoryCore.Helpers.modifyProps(props, fallbackProps, "stack");
-  childComponents = childComponents || _react.default.Children.toArray(props.children);
-  calculatedProps = calculatedProps || getCalculatedProps(props, childComponents);
-  var _calculatedProps = calculatedProps,
-      datasets = _calculatedProps.datasets;
-  var _props2 = props,
-      labelComponent = _props2.labelComponent,
-      polar = _props2.polar;
-  var childProps = getChildProps(props, calculatedProps);
+function getChildren(initialProps, childComponents, calculatedProps) {
+  var props = _victoryCore.Helpers.modifyProps(initialProps, fallbackProps, "stack");
+
+  var children = childComponents || _react.default.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 childComponents.map(function (child, index) {
+  return children.map(function (child, index) {
     var role = child.type && child.type.role;
-    var xOffset = polar ? getPolarX0(props, calculatedProps, index, role) : getX0(props, calculatedProps, index, role);
-    var style = role === "voronoi" || role === "tooltip" || role === "label" ? child.props.style : _victoryCore.Wrapper.getChildStyle(child, index, calculatedProps);
+    var xOffset = polar ? getPolarX0(props, newCalculatedProps, index, role) : getX0(props, newCalculatedProps, index, role);
+    var style = role === "voronoi" || role === "tooltip" || role === "label" ? child.props.style : _victoryCore.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);
     return /*#__PURE__*/_react.default.cloneElement(child, (0, _assign2.default)({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "victory-group",
-  "version": "36.8.2",
+  "version": "36.8.4",
   "description": "Group Layout Component for Victory",
   "keywords": [
     "data visualization",
@@ -23,8 +23,8 @@
     "lodash": "^4.17.19",
     "prop-types": "^15.8.1",
     "react-fast-compare": "^3.2.0",
-    "victory-core": "^36.8.2",
-    "victory-shared-events": "^36.8.2"
+    "victory-core": "^36.8.4",
+    "victory-shared-events": "^36.8.4"
   },
   "devDependencies": {
     "victory-bar": "*",

package/src/helper-methods.tsx

@@ -12,9 +12,9 @@ const fallbackProps = {
 };
 
 // eslint-disable-next-line max-statements
-export function getCalculatedProps(props, childComponents) {
+export function getCalculatedProps(initialProps, childComponents) {
   const role = "group";
-  props = Helpers.modifyProps(props, fallbackProps, role);
+  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 =
@@ -188,24 +188,24 @@ function getDataWithOffset(props, defaultDataset = [], offset) {
   });
 }
 
-export function getChildren(props, childComponents?, calculatedProps?) {
-  props = Helpers.modifyProps(props, fallbackProps, "stack");
-  childComponents = childComponents || React.Children.toArray(props.children);
-  calculatedProps =
-    calculatedProps || getCalculatedProps(props, childComponents);
-  const { datasets } = calculatedProps;
+export function getChildren(initialProps, childComponents?, calculatedProps?) {
+  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, calculatedProps);
+  const childProps = getChildProps(props, newCalculatedProps);
   const parentName = props.name || "group";
-  return childComponents.map((child, index) => {
+  return children.map((child, index) => {
     const role = child.type && child.type.role;
     const xOffset = polar
-      ? getPolarX0(props, calculatedProps, index, role)
-      : getX0(props, calculatedProps, index, role);
+      ? 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, calculatedProps);
+        : Wrapper.getChildStyle(child, index, newCalculatedProps);
     const labels = props.labels
       ? getLabels(props, datasets, index)
       : child.props.labels;