victory-area 36.2.2 → 36.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "victory-area",
-  "version": "36.2.2",
+  "version": "36.4.0",
   "description": "Area Component for Victory",
   "keywords": [
     "data visualization",
@@ -19,10 +19,10 @@
   "author": "Formidable",
   "license": "MIT",
   "dependencies": {
-    "d3-shape": "^1.2.0",
     "lodash": "^4.17.19",
     "prop-types": "^15.5.8",
-    "victory-core": "^36.2.2"
+    "victory-core": "^36.4.0",
+    "victory-vendor": "^36.4.0"
   },
   "peerDependencies": {
     "react": "^16.6.0 || ^17.0.0"
@@ -31,5 +31,5 @@
     "version": "yarn run nps build-libs && nps build-dists"
   },
   "sideEffects": false,
-  "gitHead": "e09146d4bede80e27ed095fcd7e1167c00fba864"
+  "gitHead": "2e05481eeb34f9801a90023a131a21aa7deff082"
 }

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

@@ -13,7 +13,8 @@ import {
   addEvents,
   VictoryTheme,
   Data,
-  Domain
+  Domain,
+  UserProps
 } from "victory-core";
 
 const fallbackProps = {
@@ -107,8 +108,12 @@ class VictoryArea extends React.Component {
     }
 
     const children = this.renderContinuousData(props);
+    const container = React.cloneElement(
+      props.containerComponent,
+      UserProps.getSafeUserProps(props)
+    );
     return props.standalone
-      ? this.renderContainer(props.containerComponent, children)
+      ? this.renderContainer(container, children)
       : children;
   }
 }