victory-area 36.3.2 → 36.5.0

package/src/area.js

@@ -2,8 +2,8 @@
 import React from "react";
 import PropTypes from "prop-types";
 import { assign } from "lodash";
-import * as d3Shape from "d3-shape";
-import { Helpers, CommonProps, Path } from "victory-core";
+import * as d3Shape from "victory-vendor/d3-shape";
+import { Helpers, CommonProps, Path, UserProps } from "victory-core";
 
 const defined = (d) => {
   const y = d._y1 !== undefined ? d._y1 : d._y;
@@ -136,6 +136,7 @@ const Area = (props) => {
     desc,
     tabIndex
   } = props;
+  const userProps = UserProps.getSafeUserProps(props);
   const defaultTransform =
     polar && origin ? `translate(${origin.x}, ${origin.y})` : undefined;
   const transform = props.transform || defaultTransform;
@@ -156,6 +157,7 @@ const Area = (props) => {
     clipPath,
     tabIndex
   };
+
   const area = React.cloneElement(
     pathComponent,
     assign(
@@ -166,7 +168,8 @@ const Area = (props) => {
         desc,
         tabIndex
       },
-      sharedProps
+      sharedProps,
+      userProps
     )
   );
 
@@ -185,7 +188,7 @@ const Area = (props) => {
     : null;
 
   return renderLine
-    ? React.cloneElement(groupComponent, {}, [area, line])
+    ? React.cloneElement(groupComponent, userProps, [area, line])
     : area;
 };
 

package/src/victory-area.js

@@ -108,13 +108,11 @@ class VictoryArea extends React.Component {
     }
 
     const children = this.renderContinuousData(props);
-    const container = React.cloneElement(
-      props.containerComponent,
-      UserProps.getSafeUserProps(props)
-    );
-    return props.standalone
-      ? this.renderContainer(container, children)
+    const component = props.standalone
+      ? this.renderContainer(props.containerComponent, children)
       : children;
+
+    return UserProps.withSafeUserProps(component, props);
   }
 }