victory-chart 18.2.0 → 19.1.1

package/src/components/victory-errorbar/victory-errorbar.js

@@ -1,10 +1,12 @@
-import React, { PropTypes } from "react";
+import PropTypes from "prop-types";
+import React from "react";
 import {
-  PropTypes as CustomPropTypes, Helpers, VictoryTransition, VictoryLabel, addEvents,
+  PropTypes as CustomPropTypes, Helpers, VictoryLabel, addEvents,
   VictoryContainer, VictoryTheme, DefaultTransitions, ErrorBar, Data
 } from "victory-core";
 import { partialRight } from "lodash";
 import ErrorBarHelpers from "./helper-methods";
+import { BaseProps, DataProps } from "../../helpers/common-props";
 
 const fallbackProps = {
   width: 450,
@@ -13,10 +15,10 @@ const fallbackProps = {
 };
 
 const defaultData = [
-  {x: 1, y: 1, errorX: 0.1, errorY: 0.1},
-  {x: 2, y: 2, errorX: 0.2, errorY: 0.2},
-  {x: 3, y: 3, errorX: 0.3, errorY: 0.3},
-  {x: 4, y: 4, errorX: 0.4, errorY: 0.4}
+  { x: 1, y: 1, errorX: 0.1, errorY: 0.1 },
+  { x: 2, y: 2, errorX: 0.2, errorY: 0.2 },
+  { x: 3, y: 3, errorX: 0.3, errorY: 0.3 },
+  { x: 4, y: 4, errorX: 0.4, errorY: 0.4 }
 ];
 
 const animationWhitelist = [
@@ -30,28 +32,9 @@ class VictoryErrorBar extends React.Component {
   static defaultTransitions = DefaultTransitions.discreteTransitions();
 
   static propTypes = {
-    animate: PropTypes.object,
+    ...BaseProps,
+    ...DataProps,
     borderWidth: PropTypes.number,
-    categories: PropTypes.oneOfType([
-      PropTypes.arrayOf(PropTypes.string),
-      PropTypes.shape({
-        x: PropTypes.arrayOf(PropTypes.string), y: PropTypes.arrayOf(PropTypes.string)
-      })
-    ]),
-    containerComponent: PropTypes.element,
-    data: PropTypes.array,
-    domainPadding: PropTypes.oneOfType([
-      PropTypes.shape({
-        x: PropTypes.oneOfType([ PropTypes.number, CustomPropTypes.domain ]),
-        y: PropTypes.oneOfType([ PropTypes.number, CustomPropTypes.domain ])
-      }),
-      PropTypes.number
-    ]),
-    dataComponent: PropTypes.element,
-    domain: PropTypes.oneOfType([
-      CustomPropTypes.domain,
-      PropTypes.shape({ x: CustomPropTypes.domain, y: CustomPropTypes.domain })
-    ]),
     errorX: PropTypes.oneOfType([
       PropTypes.func,
       CustomPropTypes.allOfType([CustomPropTypes.integer, CustomPropTypes.nonNegative]),
@@ -64,67 +47,7 @@ class VictoryErrorBar extends React.Component {
       PropTypes.string,
       PropTypes.arrayOf(PropTypes.string)
     ]),
-    events: PropTypes.arrayOf(PropTypes.shape({
-      target: PropTypes.oneOf(["data", "labels", "parent"]),
-      eventKey: PropTypes.oneOfType([
-        PropTypes.array,
-        CustomPropTypes.allOfType([CustomPropTypes.integer, CustomPropTypes.nonNegative]),
-        PropTypes.string
-      ]),
-      eventHandlers: PropTypes.object
-    })),
-    eventKey: PropTypes.oneOfType([
-      PropTypes.func,
-      CustomPropTypes.allOfType([CustomPropTypes.integer, CustomPropTypes.nonNegative]),
-      PropTypes.string
-    ]),
-    groupComponent: PropTypes.element,
-    height: CustomPropTypes.nonNegative,
-    horizontal: PropTypes.bool,
-    labels: PropTypes.oneOfType([ PropTypes.func, PropTypes.array ]),
-    labelComponent: PropTypes.element,
-    name: PropTypes.string,
-    padding: PropTypes.oneOfType([
-      PropTypes.number,
-      PropTypes.shape({
-        top: PropTypes.number, bottom: PropTypes.number,
-        left: PropTypes.number, right: PropTypes.number
-      })
-    ]),
-    samples: CustomPropTypes.nonNegative,
-    scale: PropTypes.oneOfType([
-      CustomPropTypes.scale,
-      PropTypes.shape({ x: CustomPropTypes.scale, y: CustomPropTypes.scale })
-    ]),
-    sharedEvents: PropTypes.shape({
-      events: PropTypes.array,
-      getEventState: PropTypes.func
-    }),
-    sortKey: PropTypes.oneOfType([
-      PropTypes.func,
-      CustomPropTypes.allOfType([CustomPropTypes.integer, CustomPropTypes.nonNegative]),
-      PropTypes.string,
-      PropTypes.arrayOf(PropTypes.string)
-    ]),
-    standalone: PropTypes.bool,
-    style: PropTypes.shape({
-      parent: PropTypes.object, data: PropTypes.object, labels: PropTypes.object
-    }),
-    theme: PropTypes.object,
-    width: CustomPropTypes.nonNegative,
-    x: PropTypes.oneOfType([
-      PropTypes.func,
-      CustomPropTypes.allOfType([CustomPropTypes.integer, CustomPropTypes.nonNegative]),
-      PropTypes.string,
-      PropTypes.arrayOf(PropTypes.string)
-    ]),
-    y: PropTypes.oneOfType([
-      PropTypes.func,
-      CustomPropTypes.allOfType([CustomPropTypes.integer, CustomPropTypes.nonNegative]),
-      PropTypes.string,
-      PropTypes.arrayOf(PropTypes.string),
-      PropTypes.arrayOf(PropTypes.func)
-    ])
+    horizontal: PropTypes.bool
   };
 
   static defaultProps = {
@@ -146,47 +69,19 @@ class VictoryErrorBar extends React.Component {
     "dataComponent", "labelComponent", "groupComponent", "containerComponent"
   ];
 
-  renderData(props) {
-    const { dataComponent, labelComponent, groupComponent } = props;
-
-    const dataComponents = this.dataKeys.map((_dataKey, index) => {
-      const dataProps = this.getComponentProps(dataComponent, "data", index);
-      return React.cloneElement(dataComponent, dataProps);
-    });
-
-    const labelComponents = this.dataKeys.map((_dataKey, index) => {
-      const labelProps = this.getComponentProps(labelComponent, "labels", index);
-      if (labelProps.text !== undefined && labelProps.text !== null) {
-        return React.cloneElement(labelComponent, labelProps);
-      }
-    }).filter(Boolean);
-
-    const children = [...dataComponents, ...labelComponents];
-    return this.renderContainer(groupComponent, children);
-  }
-
+  // Overridden in native versions
   shouldAnimate() {
     return !!this.props.animate;
   }
 
-  renderContainer(component, children) {
-    const isContainer = component.type && component.type.role === "container";
-    const parentProps = isContainer ? this.getComponentProps(component, "parent", "parent") : {};
-    return React.cloneElement(component, parentProps, children);
-  }
-
   render() {
-    const {role} = this.constructor;
+    const { role } = this.constructor;
     const props = Helpers.modifyProps(this.props, fallbackProps, role);
     if (this.shouldAnimate()) {
-      return (
-        <VictoryTransition animate={props.animate} animationWhitelist={animationWhitelist}>
-          {React.createElement(this.constructor, props)}
-        </VictoryTransition>
-      );
+      return this.animateComponent(props, animationWhitelist);
     }
     const children = this.renderData(props);
-    return this.renderContainer(props.containerComponent, children);
+    return props.standalone ? this.renderContainer(props.containerComponent, children) : children;
   }
 }
 

package/src/components/victory-group/victory-group.js

@@ -1,9 +1,12 @@
+/*eslint no-magic-numbers: ["error", { "ignore": [0, 1, 2] }]*/
 import { assign, defaults } from "lodash";
-import React, { PropTypes } from "react";
-import { PropTypes as CustomPropTypes, Helpers, VictorySharedEvents,
-  VictoryContainer, VictoryTheme, Scale, Data
+import PropTypes from "prop-types";
+import React from "react";
+import {
+  Helpers, VictorySharedEvents, VictoryContainer, VictoryTheme, Scale, Data
 } from "victory-core";
 import Wrapper from "../../helpers/wrapper";
+import { BaseProps, DataProps } from "../../helpers/common-props";
 
 const fallbackProps = {
   width: 450,
@@ -18,16 +21,9 @@ export default class VictoryGroup extends React.Component {
   static role = "group";
 
   static propTypes = {
-    animate: PropTypes.object,
-    categories: PropTypes.oneOfType([
-      PropTypes.arrayOf(PropTypes.string),
-      PropTypes.shape({
-        x: PropTypes.arrayOf(PropTypes.string), y: PropTypes.arrayOf(PropTypes.string)
-      })
-    ]),
-    children: React.PropTypes.oneOfType([
-      React.PropTypes.arrayOf(React.PropTypes.node), React.PropTypes.node
-    ]),
+    ...BaseProps,
+    ...DataProps,
+    children: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.node), PropTypes.node]),
     color: PropTypes.string,
     colorScale: PropTypes.oneOfType([
       PropTypes.arrayOf(PropTypes.string),
@@ -35,92 +31,23 @@ export default class VictoryGroup extends React.Component {
         "grayscale", "qualitative", "heatmap", "warm", "cool", "red", "green", "blue"
       ])
     ]),
-    containerComponent: PropTypes.element,
-    data: PropTypes.array,
-    domainPadding: PropTypes.oneOfType([
-      PropTypes.shape({
-        x: PropTypes.oneOfType([ PropTypes.number, CustomPropTypes.domain ]),
-        y: PropTypes.oneOfType([ PropTypes.number, CustomPropTypes.domain ])
-      }),
-      PropTypes.number
-    ]),
-    dataComponent: PropTypes.element,
-    domain: PropTypes.oneOfType([
-      CustomPropTypes.domain,
-      PropTypes.shape({ x: CustomPropTypes.domain, y: CustomPropTypes.domain })
-    ]),
-    events: PropTypes.arrayOf(PropTypes.shape({
-      childName: PropTypes.oneOfType([
-        PropTypes.string,
-        PropTypes.array
-      ]),
-      target: PropTypes.oneOf(["data", "labels", "parent"]),
-      eventKey: PropTypes.oneOfType([
-        PropTypes.array,
-        PropTypes.func,
-        CustomPropTypes.allOfType([CustomPropTypes.integer, CustomPropTypes.nonNegative]),
-        PropTypes.string
-      ]),
-      eventHandlers: PropTypes.object
-    })),
-    eventKey: PropTypes.oneOfType([
-      PropTypes.func,
-      CustomPropTypes.allOfType([CustomPropTypes.integer, CustomPropTypes.nonNegative]),
-      PropTypes.string
-    ]),
-    groupComponent: PropTypes.element,
-    height: CustomPropTypes.nonNegative,
     horizontal: PropTypes.bool,
-    labels: PropTypes.oneOfType([ PropTypes.func, PropTypes.array ]),
-    labelComponent: PropTypes.element,
-    name: PropTypes.string,
-    offset: PropTypes.number,
-    padding: PropTypes.oneOfType([
-      PropTypes.number,
-      PropTypes.shape({
-        top: PropTypes.number, bottom: PropTypes.number,
-        left: PropTypes.number, right: PropTypes.number
-      })
-    ]),
-    samples: CustomPropTypes.nonNegative,
-    scale: PropTypes.oneOfType([
-      CustomPropTypes.scale,
-      PropTypes.shape({ x: CustomPropTypes.scale, y: CustomPropTypes.scale })
-    ]),
-    sharedEvents: PropTypes.shape({
-      events: PropTypes.array,
-      getEventState: PropTypes.func
-    }),
-    standalone: PropTypes.bool,
-    style: PropTypes.shape({
-      parent: PropTypes.object, data: PropTypes.object, labels: PropTypes.object
-    }),
-    theme: PropTypes.object,
-    width: CustomPropTypes.nonNegative,
-    x: PropTypes.oneOfType([
-      PropTypes.func,
-      CustomPropTypes.allOfType([CustomPropTypes.integer, CustomPropTypes.nonNegative]),
-      PropTypes.string,
-      PropTypes.arrayOf(PropTypes.string)
-    ]),
-    y: PropTypes.oneOfType([
-      PropTypes.func,
-      CustomPropTypes.allOfType([CustomPropTypes.integer, CustomPropTypes.nonNegative]),
-      PropTypes.string,
-      PropTypes.arrayOf(PropTypes.string)
-    ]),
-    modifyChildren: PropTypes.func
+    offset: PropTypes.number
   };
 
   static defaultProps = {
+    containerComponent: <VictoryContainer/>,
+    groupComponent: <g/>,
     samples: 50,
     scale: "linear",
     standalone: true,
-    containerComponent: <VictoryContainer/>,
-    groupComponent: <g/>,
     theme: VictoryTheme.grayscale
   };
 
+  static expectedComponents = [
+    "groupComponent", "containerComponent", "labelComponent"
+  ];
+
   static getDomain = Wrapper.getDomain.bind(Wrapper);
   static getData = Wrapper.getData.bind(Wrapper);
 
@@ -180,7 +107,7 @@ export default class VictoryGroup extends React.Component {
     };
     const colorScale = modifiedProps.colorScale;
     const color = modifiedProps.color;
-    return {datasets, categories, range, domain, horizontal, scale, style, colorScale, color};
+    return { datasets, categories, range, domain, horizontal, scale, style, colorScale, color };
   }
 
   pixelsToValue(props, axis, calculatedProps) {
@@ -241,7 +168,7 @@ export default class VictoryGroup extends React.Component {
     const xOffset = offset || 0;
     return dataset.map((datum) => {
       const _x1 = datum._x instanceof Date ? new Date(datum._x + xOffset) : datum._x + xOffset;
-      return assign({}, datum, {_x1});
+      return assign({}, datum, { _x1 });
     });
   }
 
@@ -276,7 +203,7 @@ export default class VictoryGroup extends React.Component {
   }
 
   getContainerProps(props, calculatedProps) {
-    const { width, height, standalone, theme} = props;
+    const { width, height, standalone, theme } = props;
     const { domain, scale, style } = calculatedProps;
     return {
       domain, scale, width, height, standalone, theme, style: style.parent
@@ -285,21 +212,18 @@ export default class VictoryGroup extends React.Component {
 
   getStyle(theme, style, role) {
     const defaultStyle = theme && theme[role] && theme[role].style ? theme[role].style : {};
-    return Helpers.getStyles(style, defaultStyle, "auto", "100%");
+    return Helpers.getStyles(style, defaultStyle);
   }
 
   render() {
-    const {role} = this.constructor;
+    const { role } = this.constructor;
     const props = this.state && this.state.nodesWillExit ?
       this.state.oldProps || this.props : this.props;
     const modifiedProps = Helpers.modifyProps(props, fallbackProps, role);
-    const { eventKey, containerComponent } = modifiedProps;
+    const { eventKey, containerComponent, standalone, groupComponent } = modifiedProps;
     const childComponents = React.Children.toArray(modifiedProps.children);
     const calculatedProps = this.getCalculatedProps(modifiedProps, childComponents);
-    let newChildren = this.getNewChildren(modifiedProps, childComponents, calculatedProps);
-    if (this.props.modifyChildren) {
-      newChildren = this.props.modifyChildren(newChildren, modifiedProps);
-    }
+    const newChildren = this.getNewChildren(modifiedProps, childComponents, calculatedProps);
     const containerProps = this.getContainerProps(modifiedProps, calculatedProps);
     const container = this.renderContainer(containerComponent, containerProps);
     if (this.events) {
@@ -309,6 +233,8 @@ export default class VictoryGroup extends React.Component {
         </VictorySharedEvents>
       );
     }
-    return React.cloneElement(container, container.props, newChildren);
+    return standalone ?
+      React.cloneElement(container, container.props, newChildren) :
+      React.cloneElement(groupComponent, {}, newChildren);
   }
 }

package/src/components/victory-line/helper-methods.js

@@ -1,3 +1,4 @@
+/*eslint no-magic-numbers: ["error", { "ignore": [-1, 0, 1, 2] }]*/
 import { defaults } from "lodash";
 import { Helpers, Log, Data, Domain, Scale } from "victory-core";
 
@@ -17,7 +18,7 @@ export default {
       const text = this.getLabelText(props, datum, index);
       if (text !== undefined && text !== null || events || sharedEvents) {
         const eventKey = datum.eventKey || index;
-        childProps[eventKey] = {labels: this.getLabelProps(text, index, calculatedValues)};
+        childProps[eventKey] = { labels: this.getLabelProps(text, index, calculatedValues) };
       }
       return childProps;
     }, initialChildProps);
@@ -46,7 +47,7 @@ export default {
 
     const defaultStyles = props.theme && props.theme.line && props.theme.line.style ?
       props.theme.line.style : {};
-    const style = Helpers.getStyles(props.style, defaultStyles, "auto", "100%");
+    const style = Helpers.getStyles(props.style, defaultStyles);
 
     return { domain, data, scale, style };
   },
@@ -59,7 +60,7 @@ export default {
   getLabelProps(text, index, calculatedProps) {
     const { scale, data, style } = calculatedProps;
     const datum = data[index];
-    const {x, y} = this.getLabelPosition(datum, scale);
+    const { x, y } = this.getLabelPosition(datum, scale);
     const labelStyle = this.getLabelStyle(style) || {};
     const sign = (datum._y1 || datum._y) < 0 ? -1 : 1;
     return {
@@ -93,6 +94,6 @@ export default {
     // use fill instead of stroke for text
     const fill = dataStyle.stroke;
     const padding = labelStyle.padding || 0;
-    return defaults({}, labelStyle, {opacity, fill, padding});
+    return defaults({}, labelStyle, { opacity, fill, padding });
   }
 };

package/src/components/victory-line/victory-line.js

@@ -1,11 +1,12 @@
-import { partialRight, without } from "lodash";
-import React, { PropTypes } from "react";
+import { partialRight } from "lodash";
+import PropTypes from "prop-types";
+import React from "react";
 import LineHelpers from "./helper-methods";
 import {
-  PropTypes as CustomPropTypes, Helpers, VictoryTransition, VictoryLabel, addEvents,
-  VictoryContainer, VictoryTheme, DefaultTransitions, Curve, VictoryClipContainer,
-  Data, Domain
+  PropTypes as CustomPropTypes, Helpers, VictoryLabel, addEvents, VictoryContainer, VictoryTheme,
+  DefaultTransitions, Curve, VictoryClipContainer, Data, Domain
 } from "victory-core";
+import { BaseProps, DataProps } from "../../helpers/common-props";
 
 const fallbackProps = {
   width: 450,
@@ -23,89 +24,16 @@ class VictoryLine extends React.Component {
   static continuous = true;
 
   static propTypes = {
-    animate: PropTypes.object,
-    categories: PropTypes.oneOfType([
-      PropTypes.arrayOf(PropTypes.string),
-      PropTypes.shape({
-        x: PropTypes.arrayOf(PropTypes.string), y: PropTypes.arrayOf(PropTypes.string)
-      })
-    ]),
-    containerComponent: PropTypes.element,
-    data: PropTypes.array,
-    domainPadding: PropTypes.oneOfType([
-      PropTypes.shape({
-        x: PropTypes.oneOfType([ PropTypes.number, CustomPropTypes.domain ]),
-        y: PropTypes.oneOfType([ PropTypes.number, CustomPropTypes.domain ])
-      }),
-      PropTypes.number
-    ]),
-    dataComponent: PropTypes.element,
-    domain: PropTypes.oneOfType([
-      CustomPropTypes.domain,
-      PropTypes.shape({ x: CustomPropTypes.domain, y: CustomPropTypes.domain })
-    ]),
-    events: PropTypes.arrayOf(PropTypes.shape({
-      target: PropTypes.oneOf(["data", "labels", "parent"]),
-      eventKey: PropTypes.oneOfType([
-        PropTypes.array,
-        CustomPropTypes.allOfType([CustomPropTypes.integer, CustomPropTypes.nonNegative]),
-        PropTypes.string
-      ]),
-      eventHandlers: PropTypes.object
-    })),
-    groupComponent: PropTypes.element,
-    height: CustomPropTypes.nonNegative,
+    ...BaseProps,
+    ...DataProps,
     interpolation: PropTypes.oneOf([
       "basis", "bundle", "cardinal", "catmullRom", "linear", "monotoneX",
       "monotoneY", "natural", "radial", "step", "stepAfter", "stepBefore"
     ]),
-    Label: CustomPropTypes.deprecated(
+    label: CustomPropTypes.deprecated(
       PropTypes.string,
       "Use `labels` instead for individual data labels"
-    ),
-    labels: PropTypes.oneOfType([ PropTypes.func, PropTypes.array ]),
-    labelComponent: PropTypes.element,
-    name: PropTypes.string,
-    padding: PropTypes.oneOfType([
-      PropTypes.number,
-      PropTypes.shape({
-        top: PropTypes.number, bottom: PropTypes.number,
-        left: PropTypes.number, right: PropTypes.number
-      })
-    ]),
-    samples: CustomPropTypes.nonNegative,
-    scale: PropTypes.oneOfType([
-      CustomPropTypes.scale,
-      PropTypes.shape({ x: CustomPropTypes.scale, y: CustomPropTypes.scale })
-    ]),
-    sharedEvents: PropTypes.shape({
-      events: PropTypes.array,
-      getEventState: PropTypes.func
-    }),
-    sortKey: PropTypes.oneOfType([
-      PropTypes.func,
-      CustomPropTypes.allOfType([CustomPropTypes.integer, CustomPropTypes.nonNegative]),
-      PropTypes.string,
-      PropTypes.arrayOf(PropTypes.string)
-    ]),
-    standalone: PropTypes.bool,
-    style: PropTypes.shape({
-      parent: PropTypes.object, data: PropTypes.object, labels: PropTypes.object
-    }),
-    theme: PropTypes.object,
-    width: CustomPropTypes.nonNegative,
-    x: PropTypes.oneOfType([
-      PropTypes.func,
-      CustomPropTypes.allOfType([CustomPropTypes.integer, CustomPropTypes.nonNegative]),
-      PropTypes.string,
-      PropTypes.arrayOf(PropTypes.string)
-    ]),
-    y: PropTypes.oneOfType([
-      PropTypes.func,
-      CustomPropTypes.allOfType([CustomPropTypes.integer, CustomPropTypes.nonNegative]),
-      PropTypes.string,
-      PropTypes.arrayOf(PropTypes.string)
-    ])
+    )
   };
 
   static defaultProps = {
@@ -114,7 +42,7 @@ class VictoryLine extends React.Component {
     standalone: true,
     sortKey: "x",
     dataComponent: <Curve/>,
-    labelComponent: <VictoryLabel/>,
+    labelComponent: <VictoryLabel renderInPortal/>,
     containerComponent: <VictoryContainer/>,
     groupComponent: <VictoryClipContainer/>,
     theme: VictoryTheme.grayscale
@@ -128,43 +56,19 @@ class VictoryLine extends React.Component {
     "dataComponent", "labelComponent", "groupComponent", "containerComponent"
   ];
 
-  renderData(props) {
-    const { dataComponent, labelComponent, groupComponent } = props;
-    const dataKeys = without(this.dataKeys, "all");
-    const labelComponents = dataKeys.reduce((memo, key) => {
-      const labelProps = this.getComponentProps(labelComponent, "labels", key);
-      if (labelProps && labelProps.text !== undefined && labelProps.text !== null) {
-        memo = memo.concat(React.cloneElement(labelComponent, labelProps));
-      }
-      return memo;
-    }, []);
-    const dataProps = this.getComponentProps(dataComponent, "data", "all");
-    const children = [React.cloneElement(dataComponent, dataProps), ...labelComponents];
-    return this.renderContainer(groupComponent, children);
-  }
-
+  // Overridden in native versions
   shouldAnimate() {
     return !!this.props.animate;
   }
 
-  renderContainer(component, children) {
-    const isContainer = component.type && component.type.role === "container";
-    const parentProps = isContainer ? this.getComponentProps(component, "parent", "parent") : {};
-    return React.cloneElement(component, parentProps, children);
-  }
-
   render() {
-    const {role} = this.constructor;
+    const { role } = this.constructor;
     const props = Helpers.modifyProps(this.props, fallbackProps, role);
     if (this.shouldAnimate()) {
-      return (
-        <VictoryTransition animate={props.animate} animationWhitelist={animationWhitelist}>
-          {React.createElement(this.constructor, props)}
-        </VictoryTransition>
-      );
+      return this.animateComponent(props, animationWhitelist);
     }
-    const children = this.renderData(props);
-    return this.renderContainer(props.containerComponent, children);
+    const children = this.renderContinuousData(props);
+    return props.standalone ? this.renderContainer(props.containerComponent, children) : children;
   }
 }
 export default addEvents(VictoryLine);

package/src/components/victory-scatter/helper-methods.js

@@ -9,7 +9,7 @@ export default {
     const { data, style, scale, domain } = calculatedValues;
     const initialChildProps = { parent: {
       style: style.parent, scale, domain, data, height, width, standalone, theme
-    }};
+    } };
 
     return data.reduce((childProps, datum, index) => {
       const eventKey = datum.eventKey;
@@ -54,7 +54,7 @@ export default {
   getCalculatedValues(props) {
     const defaultStyles = props.theme && props.theme.scatter && props.theme.scatter.style ?
       props.theme.scatter.style : {};
-    const style = Helpers.getStyles(props.style, defaultStyles, "auto", "100%");
+    const style = Helpers.getStyles(props.style, defaultStyles);
     const data = Data.getData(props);
     const range = {
       x: Helpers.getRange(props, "x"),
@@ -69,7 +69,7 @@ export default {
       y: Scale.getBaseScale(props, "y").domain(domain.y).range(range.y)
     };
     const z = props.bubbleProperty || "z";
-    return {domain, data, scale, style, z};
+    return { domain, data, scale, style, z };
   },
 
   getDataStyles(datum, style) {
@@ -87,8 +87,8 @@ export default {
   getLabelStyle(labelStyle, dataProps) {
     const { size, style } = dataProps;
     const matchedStyle = pick(style, ["opacity", "fill"]);
-    const padding = labelStyle.padding || size * 0.25;
-    return defaults({}, labelStyle, matchedStyle, {padding});
+    const padding = labelStyle.padding || size * 0.25; // eslint-disable-line no-magic-numbers
+    return defaults({}, labelStyle, matchedStyle, { padding });
   },
 
   getSymbol(data, props) {
@@ -99,16 +99,16 @@ export default {
   },
 
   getBubbleSize(datum, props, calculatedValues) {
-    const {data, z} = calculatedValues;
+    const { data, z } = calculatedValues;
     const getMaxRadius = () => {
       const minPadding = Math.min(...values(Helpers.getPadding(props)));
-      return Math.max(minPadding, 5);
+      return Math.max(minPadding, 5); // eslint-disable-line no-magic-numbers
     };
     const zData = data.map((point) => point[z]);
     const zMin = Math.min(...zData);
     const zMax = Math.max(...zData);
     const maxRadius = props.maxBubbleSize || getMaxRadius();
-    const maxArea = Math.PI * Math.pow(maxRadius, 2);
+    const maxArea = Math.PI * Math.pow(maxRadius, 2); // eslint-disable-line no-magic-numbers
     const area = ((datum[z] - zMin) / (zMax - zMin)) * maxArea;
     const radius = Math.sqrt(area / Math.PI);
     return Math.max(radius, 1);