Theme bugs

src/components/victory-axis/helper-methods.js

@@ -191,7 +191,7 @@ export default {
 
       const styles = this.getEvaluatedStyles(style, tick, index);
       const tickLayout = {
-        position: this.getTickPosition(styles.tickStyle, orientation, isVertical),
+        position: this.getTickPosition(styles, orientation, isVertical),
         transform: this.getTickTransform(scale(ticks[index]), globalTransform, isVertical)
       };
 
@@ -204,7 +204,6 @@ export default {
             scale(ticks[index]) + globalTransform.y : gridOffset.y + globalTransform.y
         }
       };
-
       childProps[index] = {
         axis: axisProps,
         axisLabel: axisLabelProps,
@@ -271,7 +270,8 @@ export default {
       const scaleTicks = scale.ticks(props.tickCount);
       const ticks = Array.isArray(scaleTicks) && scaleTicks.length ? scaleTicks : scale.domain();
       if (props.crossAxis) {
-        return includes(ticks, 0) ? without(ticks, 0) : ticks;
+        const filteredTicks = includes(ticks, 0) ? without(ticks, 0) : ticks;
+        return filteredTicks.length ? filteredTicks : ticks;
       }
       return ticks;
     }
@@ -349,9 +349,11 @@ export default {
   },
 
   getTickPosition(style, orientation, isVertical) {
-    const size = style.size || 0;
-    const padding = style.padding || 0;
-    const tickSpacing = size + padding;
+    const {tickStyle, labelStyle} = style;
+    const size = tickStyle.size || 0;
+    const tickPadding = tickStyle.padding || 0;
+    const labelPadding = labelStyle.padding || 0;
+    const tickSpacing = size + tickPadding + labelPadding;
     const sign = orientationSign[orientation];
     return {
       x: isVertical ? sign * tickSpacing : 0,

src/components/victory-chart/victory-chart.js

@@ -259,25 +259,22 @@ export default class VictoryChart extends React.Component {
 
   render() {
     const props = this.state && this.state.nodesWillExit ?
-      this.state.oldProps : this.props;
+      this.state.oldProps || this.props : this.props;
     const modifiedProps = Helpers.modifyProps(props, fallbackProps, "chart");
+    const { standalone, events, eventKey } = modifiedProps;
     const childComponents = ChartHelpers.getChildComponents(modifiedProps,
       modifiedProps.defaultAxes);
     const calculatedProps = this.getCalculatedProps(modifiedProps, childComponents);
-    const container = modifiedProps.standalone && this.getContainer(modifiedProps, calculatedProps);
     const newChildren = this.getNewChildren(modifiedProps, childComponents, calculatedProps);
-    if (modifiedProps.events) {
+    const group = this.renderGroup(newChildren, calculatedProps.style.parent);
+    const container = standalone ? this.getContainer(modifiedProps, calculatedProps) : group;
+    if (events) {
       return (
-        <VictorySharedEvents events={modifiedProps.events}
-          eventKey={modifiedProps.eventKey}
-          container={container}
-        >
+        <VictorySharedEvents events={events} eventKey={eventKey} container={container}>
           {newChildren}
         </VictorySharedEvents>
       );
     }
-
-    const group = this.renderGroup(newChildren, calculatedProps.style.parent);
-    return modifiedProps.standalone ? React.cloneElement(container, container.props, group) : group;
+    return standalone ? React.cloneElement(container, container.props, group) : group;
   }
 }

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

@@ -15,7 +15,7 @@ const fallbackProps = {
 export default class VictoryGroup extends React.Component {
   static displayName = "VictoryGroup";
 
-  static role = "group-wrapper";
+  static role = "group";
 
   static propTypes = {
     animate: PropTypes.object,
@@ -220,7 +220,7 @@ export default class VictoryGroup extends React.Component {
   getColorScale(props, child) {
     const role = child.type && child.type.role;
     const colorScaleOptions = child.props.colorScale || props.colorScale;
-    if (role !== "group-wrapper" && role !== "stack-wrapper") {
+    if (role !== "group" && role !== "stack") {
       return undefined;
     }
     return props.theme && props.theme.group ? colorScaleOptions || props.theme.group.colorScale
@@ -262,7 +262,7 @@ export default class VictoryGroup extends React.Component {
         colorScale: this.getColorScale(props, child),
         key: index,
         labelComponent: labelComponent || child.props.labelComponent,
-        xOffset: role === "stack-wrapper" ? xOffset : undefined
+        xOffset: role === "stack" ? xOffset : undefined
       }, childProps));
     }
     return newChildren;
@@ -289,30 +289,25 @@ export default class VictoryGroup extends React.Component {
 
   render() {
     const props = this.state && this.state.nodesWillExit ?
-      this.state.oldProps : this.props;
+      this.state.oldProps || this.props : this.props;
     const modifiedProps = Helpers.modifyProps(props, fallbackProps, "group");
     const { theme, standalone, events, eventKey } = modifiedProps;
     const defaultStyle = theme && theme.group && theme.group.style ? theme.group.style : {};
     const style = Helpers.getStyles(modifiedProps.style, defaultStyle, "auto", "100%");
     const childComponents = React.Children.toArray(modifiedProps.children);
     const calculatedProps = this.getCalculatedProps(modifiedProps, childComponents, style,
       fallbackProps.props);
-
-    const container = standalone && this.getContainer(modifiedProps, calculatedProps);
     const newChildren = this.getNewChildren(modifiedProps, childComponents, calculatedProps);
-    if (modifiedProps.events) {
+    const group = this.renderGroup(newChildren, style.parent);
+    const container = standalone ?
+      this.getContainer(modifiedProps, calculatedProps) : group;
+    if (events) {
       return (
-        <VictorySharedEvents
-          events={events}
-          eventKey={eventKey}
-          container={container}
-        >
+        <VictorySharedEvents events={events} eventKey={eventKey} container={container}>
           {newChildren}
         </VictorySharedEvents>
       );
     }
-    const group = this.renderGroup(newChildren, style.parent);
-
     return standalone ? React.cloneElement(container, container.props, group) : group;
   }
 }

src/components/victory-stack/victory-stack.js

@@ -15,7 +15,7 @@ const fallbackProps = {
 export default class VictoryStack extends React.Component {
   static displayName = "VictoryStack";
 
-  static role = "stack-wrapper";
+  static role = "stack";
 
   static propTypes = {
     animate: PropTypes.object,
@@ -194,7 +194,7 @@ export default class VictoryStack extends React.Component {
   getColorScale(props, child) {
     const role = child.type && child.type.role;
     const colorScaleOptions = child.props.colorScale || props.colorScale;
-    if (role !== "group-wrapper" && role !== "stack-wrapper") {
+    if (role !== "group" && role !== "stack") {
       return undefined;
     }
     return props.theme ? colorScaleOptions || props.theme.props.colorScale
@@ -248,31 +248,25 @@ export default class VictoryStack extends React.Component {
 
   render() {
     const props = this.state && this.state.nodesWillExit ?
-      this.state.oldProps : this.props;
+      this.state.oldProps || this.props : this.props;
     const modifiedProps = Helpers.modifyProps(props, fallbackProps, "stack");
     const { theme, standalone, events, eventKey} = modifiedProps;
     const fallbackStyle = theme && theme.stack && theme.stack.style ?
       theme.stack.style : {};
     const style = Helpers.getStyles(modifiedProps.style, fallbackStyle, "auto", "100%");
     const childComponents = React.Children.toArray(modifiedProps.children);
-
     const calculatedProps = this.getCalculatedProps(modifiedProps, childComponents, style);
-
-    const container = standalone && this.getContainer(modifiedProps, calculatedProps);
     const newChildren = this.getNewChildren(modifiedProps, childComponents, calculatedProps);
+    const group = this.renderGroup(newChildren, style.parent);
+    const container = standalone ? this.getContainer(modifiedProps, calculatedProps) : group;
     if (events) {
       return (
-        <VictorySharedEvents
-          events={events}
-          eventKey={eventKey}
-          container={container}
-        >
+        <VictorySharedEvents events={events} eventKey={eventKey} container={container}>
           {newChildren}
         </VictorySharedEvents>
       );
     }
-    const group = this.renderGroup(newChildren, style.parent);
 
-    return modifiedProps.standalone ? React.cloneElement(container, container.props, group) : group;
+    return standalone ? React.cloneElement(container, container.props, group) : group;
   }
 }

src/helpers/wrapper.js

@@ -205,7 +205,7 @@ export default {
   getChildStyle(child, index, calculatedProps) {
     const { style } = calculatedProps;
     const role = child.type && child.type.role;
-    const defaultFill = role === "stack-wrapper" ?
+    const defaultFill = role === "stack" ?
       undefined : this.getColor(calculatedProps, child, index);
     const defaultColor = role === "line" ?
       {fill: "none", stroke: defaultFill} : {fill: defaultFill};