victory-stack 36.8.1 → 36.8.3

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;
@@ -49,5 +49,5 @@ export declare function getChildProps(props: any, calculatedProps: any): {
     scale: any;
     horizontal: 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

@@ -48,13 +48,13 @@ function fillData(props, datasets) {
     var indexOffset = 0;
     var isDate = dataset[0] && dataset[0]._x instanceof Date;
     var filledInData = xArr.map(function (x, index) {
-      x = Number(x);
+      var parsedX = Number(x);
       var datum = dataset[index - indexOffset];
 
       if (datum) {
         var x1 = isDate ? datum._x.getTime() : datum._x;
 
-        if (x1 === x) {
+        if (x1 === parsedX) {
           return datum;
         }
 
@@ -62,21 +62,21 @@ function fillData(props, datasets) {
 
         var _y = fillInMissingData ? 0 : null;
 
-        x = isDate ? new Date(x) : x;
+        parsedX = isDate ? new Date(parsedX) : parsedX;
         return {
-          x: x,
+          x: parsedX,
           y: _y,
-          _x: x,
+          _x: parsedX,
           _y: _y
         };
       }
 
       var y = fillInMissingData ? 0 : null;
-      x = isDate ? new Date(x) : x;
+      parsedX = isDate ? new Date(parsedX) : parsedX;
       return {
-        x: x,
+        x: parsedX,
         y: y,
-        _x: x,
+        _x: parsedX,
         _y: y
       };
     });
@@ -140,14 +140,14 @@ function stackData(props, childComponents) {
   });
 }
 
-export function getCalculatedProps(props, childComponents) {
-  childComponents = childComponents || React.Children.toArray(props.children);
+export function getCalculatedProps(initialProps, childComponents) {
+  var children = childComponents || React.Children.toArray(initialProps.children);
   var role = "stack";
-  props = Helpers.modifyProps(props, fallbackProps, role);
+  var props = Helpers.modifyProps(initialProps, fallbackProps, role);
   var style = Wrapper.getStyle(props.theme, props.style, role);
-  var categories = props.categories || Wrapper.getCategories(props, childComponents);
-  var datasets = props.datasets || stackData(props, childComponents);
-  var children = childComponents.map(function (c, i) {
+  var categories = props.categories || Wrapper.getCategories(props, children);
+  var datasets = props.datasets || stackData(props, children);
+  var clonedChildren = children.map(function (c, i) {
     return /*#__PURE__*/React.cloneElement(c, {
       data: datasets[i]
     });
@@ -155,10 +155,10 @@ export function getCalculatedProps(props, childComponents) {
   var domain = {
     x: Wrapper.getDomain(_assign({}, props, {
       categories: categories
-    }), "x", children),
+    }), "x", clonedChildren),
     y: Wrapper.getDomain(_assign({}, props, {
       categories: categories
-    }), "y", children)
+    }), "y", clonedChildren)
   };
   var range = props.range || {
     x: Helpers.getRange(props, "x"),
@@ -172,9 +172,8 @@ export function getCalculatedProps(props, childComponents) {
     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 _props = props,
-      colorScale = _props.colorScale,
-      horizontal = _props.horizontal;
+  var colorScale = props.colorScale,
+      horizontal = props.horizontal;
   return {
     datasets: datasets,
     categories: categories,
@@ -260,18 +259,17 @@ function getColorScale(props, child) {
   return props.theme ? colorScaleOptions || props.theme.props.colorScale : colorScaleOptions;
 }
 
-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 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 childProps = getChildProps(props, newCalculatedProps);
   var parentName = props.name || "stack";
-  return childComponents.map(function (child, index) {
+  return children.map(function (child, index) {
     var role = child.type && child.type.role;
     var data = datasets[index];
-    var style = Wrapper.getChildStyle(child, index, calculatedProps);
+    var 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/es/victory-stack.d.ts

@@ -38,6 +38,7 @@ export declare const VictoryStack: React.NamedExoticComponent<VictoryStackProps>
             theme?: React.Validator<import("victory-core").VictoryThemeDefinition | null | undefined> | undefined;
             animate?: React.Validator<boolean | import("victory-core").AnimatePropTypeInterface | null | undefined> | undefined;
             containerComponent?: React.Validator<React.ReactElement<any, string | React.JSXElementConstructor<any>> | null | undefined> | undefined;
+            disableInlineStyles?: React.Validator<boolean | null | undefined> | undefined;
             domainPadding?: React.Validator<import("victory-core").ForAxes<import("victory-core").PaddingType> | null | undefined> | undefined;
             externalEventMutations?: React.Validator<import("victory-core").EventCallbackInterface<string | string[], import("victory-core").StringOrNumberOrList>[] | null | undefined> | undefined;
             groupComponent?: React.Validator<React.ReactElement<any, string | React.JSXElementConstructor<any>> | null | undefined> | undefined;

package/es/victory-stack.js

@@ -28,16 +28,17 @@ var defaultProps = {
 };
 
 var VictoryStackBase = function (initialProps) {
-  // eslint-disable-next-line no-use-before-define
   var role = VictoryStack.role;
-  initialProps = _objectSpread(_objectSpread({}, defaultProps), initialProps);
+  var propsWithDefaults = React.useMemo(function () {
+    return _objectSpread(_objectSpread({}, defaultProps), initialProps);
+  }, [initialProps]);
 
   var _Hooks$useAnimationSt = Hooks.useAnimationState(),
       setAnimationState = _Hooks$useAnimationSt.setAnimationState,
       getAnimationProps = _Hooks$useAnimationSt.getAnimationProps,
       getProps = _Hooks$useAnimationSt.getProps;
 
-  var props = getProps(initialProps);
+  var props = getProps(propsWithDefaults);
   var modifiedProps = Helpers.modifyProps(props, fallbackProps, role);
   var eventKey = modifiedProps.eventKey,
       containerComponent = modifiedProps.containerComponent,
@@ -91,8 +92,8 @@ var VictoryStackBase = function (initialProps) {
     return {};
   }, [standalone, domain, scale, width, height, theme, style, horizontal, polar, name]);
   var userProps = React.useMemo(function () {
-    return UserProps.getSafeUserProps(initialProps);
-  }, [initialProps]);
+    return UserProps.getSafeUserProps(propsWithDefaults);
+  }, [propsWithDefaults]);
   var container = React.useMemo(function () {
     if (standalone) {
       var defaultContainerProps = _defaults({}, containerComponent.props, containerProps, userProps);
@@ -105,15 +106,15 @@ var VictoryStackBase = function (initialProps) {
   var events = React.useMemo(function () {
     return Wrapper.getAllEvents(props);
   }, [props]);
-  var previousProps = Hooks.usePreviousProps(initialProps);
+  var previousProps = Hooks.usePreviousProps(propsWithDefaults);
   React.useEffect(function () {
     // This is called before dismount to keep state in sync
     return function () {
-      if (initialProps.animate) {
-        setAnimationState(previousProps, initialProps);
+      if (propsWithDefaults.animate) {
+        setAnimationState(previousProps, propsWithDefaults);
       }
     };
-  }, [setAnimationState, previousProps, initialProps]);
+  }, [setAnimationState, previousProps, propsWithDefaults]);
 
   if (!_isEmpty(events)) {
     return /*#__PURE__*/React.createElement(VictorySharedEvents, {

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;
@@ -49,5 +49,5 @@ export declare function getChildProps(props: any, calculatedProps: any): {
     scale: any;
     horizontal: 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

@@ -62,13 +62,13 @@ function fillData(props, datasets) {
     var indexOffset = 0;
     var isDate = dataset[0] && dataset[0]._x instanceof Date;
     var filledInData = xArr.map(function (x, index) {
-      x = Number(x);
+      var parsedX = Number(x);
       var datum = dataset[index - indexOffset];
 
       if (datum) {
         var x1 = isDate ? datum._x.getTime() : datum._x;
 
-        if (x1 === x) {
+        if (x1 === parsedX) {
           return datum;
         }
 
@@ -76,21 +76,21 @@ function fillData(props, datasets) {
 
         var _y = fillInMissingData ? 0 : null;
 
-        x = isDate ? new Date(x) : x;
+        parsedX = isDate ? new Date(parsedX) : parsedX;
         return {
-          x: x,
+          x: parsedX,
           y: _y,
-          _x: x,
+          _x: parsedX,
           _y: _y
         };
       }
 
       var y = fillInMissingData ? 0 : null;
-      x = isDate ? new Date(x) : x;
+      parsedX = isDate ? new Date(parsedX) : parsedX;
       return {
-        x: x,
+        x: parsedX,
         y: y,
-        _x: x,
+        _x: parsedX,
         _y: y
       };
     });
@@ -155,17 +155,19 @@ function stackData(props, childComponents) {
   });
 }
 
-function getCalculatedProps(props, childComponents) {
-  childComponents = childComponents || _react.default.Children.toArray(props.children);
+function getCalculatedProps(initialProps, childComponents) {
+  var children = childComponents || _react.default.Children.toArray(initialProps.children);
+
   var role = "stack";
-  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 categories = props.categories || _victoryCore.Wrapper.getCategories(props, childComponents);
+  var categories = props.categories || _victoryCore.Wrapper.getCategories(props, children);
 
-  var datasets = props.datasets || stackData(props, childComponents);
-  var children = childComponents.map(function (c, i) {
+  var datasets = props.datasets || stackData(props, children);
+  var clonedChildren = children.map(function (c, i) {
     return /*#__PURE__*/_react.default.cloneElement(c, {
       data: datasets[i]
     });
@@ -173,10 +175,10 @@ function getCalculatedProps(props, childComponents) {
   var domain = {
     x: _victoryCore.Wrapper.getDomain((0, _assign2.default)({}, props, {
       categories: categories
-    }), "x", children),
+    }), "x", clonedChildren),
     y: _victoryCore.Wrapper.getDomain((0, _assign2.default)({}, props, {
       categories: categories
-    }), "y", children)
+    }), "y", clonedChildren)
   };
   var range = props.range || {
     x: _victoryCore.Helpers.getRange(props, "x"),
@@ -190,9 +192,8 @@ function getCalculatedProps(props, childComponents) {
     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 _props = props,
-      colorScale = _props.colorScale,
-      horizontal = _props.horizontal;
+  var colorScale = props.colorScale,
+      horizontal = props.horizontal;
   return {
     datasets: datasets,
     categories: categories,
@@ -282,19 +283,20 @@ function getColorScale(props, child) {
   return props.theme ? colorScaleOptions || props.theme.props.colorScale : colorScaleOptions;
 }
 
-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 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 childProps = getChildProps(props, newCalculatedProps);
   var parentName = props.name || "stack";
-  return childComponents.map(function (child, index) {
+  return children.map(function (child, index) {
     var role = child.type && child.type.role;
     var data = datasets[index];
 
-    var style = _victoryCore.Wrapper.getChildStyle(child, index, calculatedProps);
+    var 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);

package/lib/victory-stack.d.ts

@@ -38,6 +38,7 @@ export declare const VictoryStack: React.NamedExoticComponent<VictoryStackProps>
             theme?: React.Validator<import("victory-core").VictoryThemeDefinition | null | undefined> | undefined;
             animate?: React.Validator<boolean | import("victory-core").AnimatePropTypeInterface | null | undefined> | undefined;
             containerComponent?: React.Validator<React.ReactElement<any, string | React.JSXElementConstructor<any>> | null | undefined> | undefined;
+            disableInlineStyles?: React.Validator<boolean | null | undefined> | undefined;
             domainPadding?: React.Validator<import("victory-core").ForAxes<import("victory-core").PaddingType> | null | undefined> | undefined;
             externalEventMutations?: React.Validator<import("victory-core").EventCallbackInterface<string | string[], import("victory-core").StringOrNumberOrList>[] | null | undefined> | undefined;
             groupComponent?: React.Validator<React.ReactElement<any, string | React.JSXElementConstructor<any>> | null | undefined> | undefined;

package/lib/victory-stack.js

@@ -45,16 +45,18 @@ var defaultProps = {
 };
 
 var VictoryStackBase = function (initialProps) {
-  // eslint-disable-next-line no-use-before-define
   var role = VictoryStack.role;
-  initialProps = _objectSpread(_objectSpread({}, defaultProps), initialProps);
+
+  var propsWithDefaults = _react.default.useMemo(function () {
+    return _objectSpread(_objectSpread({}, defaultProps), initialProps);
+  }, [initialProps]);
 
   var _Hooks$useAnimationSt = _victoryCore.Hooks.useAnimationState(),
       setAnimationState = _Hooks$useAnimationSt.setAnimationState,
       getAnimationProps = _Hooks$useAnimationSt.getAnimationProps,
       getProps = _Hooks$useAnimationSt.getProps;
 
-  var props = getProps(initialProps);
+  var props = getProps(propsWithDefaults);
 
   var modifiedProps = _victoryCore.Helpers.modifyProps(props, fallbackProps, role);
 
@@ -114,8 +116,8 @@ var VictoryStackBase = function (initialProps) {
   }, [standalone, domain, scale, width, height, theme, style, horizontal, polar, name]);
 
   var userProps = _react.default.useMemo(function () {
-    return _victoryCore.UserProps.getSafeUserProps(initialProps);
-  }, [initialProps]);
+    return _victoryCore.UserProps.getSafeUserProps(propsWithDefaults);
+  }, [propsWithDefaults]);
 
   var container = _react.default.useMemo(function () {
     if (standalone) {
@@ -130,16 +132,16 @@ var VictoryStackBase = function (initialProps) {
     return _victoryCore.Wrapper.getAllEvents(props);
   }, [props]);
 
-  var previousProps = _victoryCore.Hooks.usePreviousProps(initialProps);
+  var previousProps = _victoryCore.Hooks.usePreviousProps(propsWithDefaults);
 
   _react.default.useEffect(function () {
     // This is called before dismount to keep state in sync
     return function () {
-      if (initialProps.animate) {
-        setAnimationState(previousProps, initialProps);
+      if (propsWithDefaults.animate) {
+        setAnimationState(previousProps, propsWithDefaults);
       }
     };
-  }, [setAnimationState, previousProps, initialProps]);
+  }, [setAnimationState, previousProps, propsWithDefaults]);
 
   if (!(0, _isEmpty2.default)(events)) {
     return /*#__PURE__*/_react.default.createElement(_victorySharedEvents.VictorySharedEvents, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "victory-stack",
-  "version": "36.8.1",
+  "version": "36.8.3",
   "description": "Stack 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.1",
-    "victory-shared-events": "^36.8.1"
+    "victory-core": "^36.8.3",
+    "victory-shared-events": "^36.8.3"
   },
   "peerDependencies": {
     "react": ">=16.6.0"

package/src/helper-methods.tsx

@@ -26,22 +26,22 @@ function fillData(props, datasets) {
     let indexOffset = 0;
     const isDate = dataset[0] && dataset[0]._x instanceof Date;
     const filledInData = xArr.map((x: number | Date, index) => {
-      x = Number(x);
+      let parsedX: number | Date = Number(x);
       const datum = dataset[index - indexOffset];
 
       if (datum) {
         const x1 = isDate ? datum._x.getTime() : datum._x;
-        if (x1 === x) {
+        if (x1 === parsedX) {
           return datum;
         }
         indexOffset++;
         const y = fillInMissingData ? 0 : null;
-        x = isDate ? new Date(x) : x;
-        return { x, y, _x: x, _y: y };
+        parsedX = isDate ? new Date(parsedX) : parsedX;
+        return { x: parsedX, y, _x: parsedX, _y: y };
       }
       const y = fillInMissingData ? 0 : null;
-      x = isDate ? new Date(x) : x;
-      return { x, y, _x: x, _y: y };
+      parsedX = isDate ? new Date(parsedX) : parsedX;
+      return { x: parsedX, y, _x: parsedX, _y: y };
     });
 
     return filledInData;
@@ -117,20 +117,28 @@ function stackData(props, childComponents) {
   return datasets.map((d, i) => addLayoutData(props, datasets, i));
 }
 
-export function getCalculatedProps(props, childComponents) {
-  childComponents = childComponents || React.Children.toArray(props.children);
+export function getCalculatedProps(initialProps, childComponents) {
+  const children =
+    childComponents || React.Children.toArray(initialProps.children);
   const role = "stack";
-  props = Helpers.modifyProps(props, fallbackProps, role);
+  const props = Helpers.modifyProps(initialProps, fallbackProps, role);
   const style = Wrapper.getStyle(props.theme, props.style, role);
-  const categories =
-    props.categories || Wrapper.getCategories(props, childComponents);
-  const datasets = props.datasets || stackData(props, childComponents);
-  const children = childComponents.map((c, i) => {
+  const categories = props.categories || Wrapper.getCategories(props, children);
+  const datasets = props.datasets || stackData(props, children);
+  const clonedChildren = children.map((c, i) => {
     return React.cloneElement(c, { data: datasets[i] });
   });
   const domain = {
-    x: Wrapper.getDomain(assign({}, props, { categories }), "x", children),
-    y: Wrapper.getDomain(assign({}, props, { categories }), "y", children),
+    x: Wrapper.getDomain(
+      assign({}, props, { categories }),
+      "x",
+      clonedChildren,
+    ),
+    y: Wrapper.getDomain(
+      assign({}, props, { categories }),
+      "y",
+      clonedChildren,
+    ),
   };
   const range = props.range || {
     x: Helpers.getRange(props, "x"),
@@ -224,18 +232,18 @@ function getColorScale(props, child) {
     : colorScaleOptions;
 }
 
-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;
-  const childProps = getChildProps(props, 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 childProps = getChildProps(props, newCalculatedProps);
   const parentName = props.name || "stack";
-  return childComponents.map((child, index) => {
+  return children.map((child, index) => {
     const role = child.type && child.type.role;
     const data = datasets[index];
-    const style = Wrapper.getChildStyle(child, index, calculatedProps);
+    const style = Wrapper.getChildStyle(child, index, newCalculatedProps);
     const labels = props.labels
       ? getLabels(props, datasets, index)
       : child.props.labels;

package/src/victory-stack.tsx

@@ -61,13 +61,15 @@ const defaultProps = {
 };
 
 const VictoryStackBase = (initialProps: VictoryStackProps) => {
-  // eslint-disable-next-line no-use-before-define
   const { role } = VictoryStack;
-  initialProps = { ...defaultProps, ...initialProps };
+  const propsWithDefaults = React.useMemo(
+    () => ({ ...defaultProps, ...initialProps }),
+    [initialProps],
+  );
   const { setAnimationState, getAnimationProps, getProps } =
     Hooks.useAnimationState();
 
-  const props = getProps(initialProps);
+  const props = getProps(propsWithDefaults);
 
   const modifiedProps = Helpers.modifyProps(props, fallbackProps, role);
   const {
@@ -134,8 +136,8 @@ const VictoryStackBase = (initialProps: VictoryStackProps) => {
     name,
   ]);
   const userProps = React.useMemo(
-    () => UserProps.getSafeUserProps(initialProps),
-    [initialProps],
+    () => UserProps.getSafeUserProps(propsWithDefaults),
+    [propsWithDefaults],
   );
 
   const container = React.useMemo(() => {
@@ -161,16 +163,16 @@ const VictoryStackBase = (initialProps: VictoryStackProps) => {
     return Wrapper.getAllEvents(props);
   }, [props]);
 
-  const previousProps = Hooks.usePreviousProps(initialProps);
+  const previousProps = Hooks.usePreviousProps(propsWithDefaults);
 
   React.useEffect(() => {
     // This is called before dismount to keep state in sync
     return () => {
-      if (initialProps.animate) {
-        setAnimationState(previousProps, initialProps);
+      if (propsWithDefaults.animate) {
+        setAnimationState(previousProps, propsWithDefaults);
       }
     };
-  }, [setAnimationState, previousProps, initialProps]);
+  }, [setAnimationState, previousProps, propsWithDefaults]);
 
   if (!isEmpty(events)) {
     return (