Merge pull request #181 from FormidableLabs/bug/container-rendering

Bug/container rendering

demo/demo.js

@@ -548,7 +548,7 @@ export default class Demo extends Component {
             { x: 5, y: 5 }
           ]}
           interpolation="cardinal"
-          labels="LINE"
+          labels={() => "LINE"}
           style={{
             data: {
               stroke: "#822722",

lib/components/victory-container.js

@@ -1,6 +1,6 @@
 import React from "react";
 import Svg from "react-native-svg";
-import { assign, get } from "lodash";
+import { assign, get, omit } from "lodash";
 import { View, PanResponder } from "react-native";
 import { VictoryContainer } from "victory-core/src";
 
@@ -76,20 +76,16 @@ export default class extends VictoryContainer {
     const children = this.getChildren(props);
     // const parentProps = Object.assign({ className }, nativeStyle, svgProps);
     const dimensions = responsive ? { width: "100%", height: "100%" } : { width, height };
-    const divStyle = NativeHelpers.getStyle(style);
-    const portalDivStyle = NativeHelpers.getStyle(assign(
-      { zIndex: portalZIndex, position: "absolute", top: 0, left: 0 }, dimensions
-    ));
-    const svgStyle = NativeHelpers.getStyle(assign({ pointerEvents: "all" }, dimensions));
-    const portalSvgStyle = NativeHelpers.getStyle(assign({ overflow: "visible" }, dimensions));
-    const portalProps = {
-      width, height, viewBox: svgProps.viewBox, style: portalSvgStyle
-    };
+    const baseStyle = NativeHelpers.getStyle(omit(style, ["width", "height"]));
+    const divStyle = assign({}, baseStyle, { position: "relative" });
+    const portalDivStyle = { zIndex: portalZIndex, position: "absolute", top: 0, left: 0 };
+    const portalSvgStyle = assign({ overflow: "visible" }, dimensions);
+    const portalProps = { width, height, viewBox: svgProps.viewBox, style: portalSvgStyle };
     return (
       <View {...this.panResponder.panHandlers} style={divStyle}
         className={className} ref={props.containerRef}
       >
-        <Svg {...svgProps} style={svgStyle}>
+        <Svg {...svgProps} style={dimensions}>
           {title ? <title id="title">{title}</title> : null}
           {desc ? <desc id="desc">{desc}</desc> : null}
           {children}