victory-pie 36.2.2 → 36.4.0

package/lib/victory-pie.js

@@ -21,13 +21,23 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
 
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 
-function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+
+function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
 
 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 var fallbackProps = {
   endAngle: 360,
@@ -42,21 +52,21 @@ var fallbackProps = {
   labelPosition: "centroid"
 };
 
-var VictoryPie =
-/*#__PURE__*/
-function (_React$Component) {
+var VictoryPie = /*#__PURE__*/function (_React$Component) {
   _inherits(VictoryPie, _React$Component);
 
+  var _super = _createSuper(VictoryPie);
+
   function VictoryPie() {
     _classCallCheck(this, VictoryPie);
 
-    return _possibleConstructorReturn(this, (VictoryPie.__proto__ || Object.getPrototypeOf(VictoryPie)).apply(this, arguments));
+    return _super.apply(this, arguments);
   }
 
   _createClass(VictoryPie, [{
     key: "shouldAnimate",
-    // Overridden in victory-native
-    value: function shouldAnimate() {
+    value: // Overridden in victory-native
+    function shouldAnimate() {
       return Boolean(this.props.animate);
     }
   }, {
@@ -72,179 +82,145 @@ function (_React$Component) {
       }
 
       var children = this.renderData(props);
-      return props.standalone ? this.renderContainer(props.containerComponent, children) : children;
+
+      var container = /*#__PURE__*/_react.default.cloneElement(props.containerComponent, _victoryCore.UserProps.getSafeUserProps(props));
+
+      return props.standalone ? this.renderContainer(container, children) : children;
     }
   }]);
 
   return VictoryPie;
 }(_react.default.Component);
 
-Object.defineProperty(VictoryPie, "animationWhitelist", {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  value: ["data", "endAngle", "height", "innerRadius", "cornerRadius", "padAngle", "padding", "colorScale", "startAngle", "style", "width"]
-});
-Object.defineProperty(VictoryPie, "displayName", {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  value: "VictoryPie"
-});
-Object.defineProperty(VictoryPie, "role", {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  value: "pie"
-});
-Object.defineProperty(VictoryPie, "defaultTransitions", {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  value: {
-    onExit: {
-      duration: 500,
-      before: function () {
-        return {
-          _y: 0,
-          label: " "
-        };
-      }
+_defineProperty(VictoryPie, "animationWhitelist", ["data", "endAngle", "height", "innerRadius", "cornerRadius", "padAngle", "padding", "colorScale", "startAngle", "style", "width"]);
+
+_defineProperty(VictoryPie, "displayName", "VictoryPie");
+
+_defineProperty(VictoryPie, "role", "pie");
+
+_defineProperty(VictoryPie, "defaultTransitions", {
+  onExit: {
+    duration: 500,
+    before: function () {
+      return {
+        _y: 0,
+        label: " "
+      };
+    }
+  },
+  onEnter: {
+    duration: 500,
+    before: function () {
+      return {
+        _y: 0,
+        label: " "
+      };
     },
-    onEnter: {
-      duration: 500,
-      before: function () {
-        return {
-          _y: 0,
-          label: " "
-        };
-      },
-      after: function (datum) {
-        return {
-          y_: datum._y,
-          label: datum.label
-        };
-      }
+    after: function (datum) {
+      return {
+        y_: datum._y,
+        label: datum.label
+      };
     }
   }
 });
-Object.defineProperty(VictoryPie, "propTypes", {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  value: {
-    animate: _propTypes.default.oneOfType([_propTypes.default.bool, _propTypes.default.object]),
-    colorScale: _propTypes.default.oneOfType([_propTypes.default.arrayOf(_propTypes.default.string), _propTypes.default.oneOf(["grayscale", "qualitative", "heatmap", "warm", "cool", "red", "green", "blue"])]),
-    containerComponent: _propTypes.default.element,
-    cornerRadius: _propTypes.default.oneOfType([_victoryCore.PropTypes.nonNegative, _propTypes.default.func]),
-    data: _propTypes.default.array,
-    dataComponent: _propTypes.default.element,
-    disableInlineStyes: _propTypes.default.bool,
-    endAngle: _propTypes.default.number,
-    eventKey: _propTypes.default.oneOfType([_propTypes.default.func, _victoryCore.PropTypes.allOfType([_victoryCore.PropTypes.integer, _victoryCore.PropTypes.nonNegative]), _propTypes.default.string]),
-    events: _propTypes.default.arrayOf(_propTypes.default.shape({
-      target: _propTypes.default.oneOf(["data", "labels", "parent"]),
-      eventKey: _propTypes.default.oneOfType([_propTypes.default.array, _propTypes.default.func, _victoryCore.PropTypes.allOfType([_victoryCore.PropTypes.integer, _victoryCore.PropTypes.nonNegative]), _propTypes.default.string]),
-      eventHandlers: _propTypes.default.object
-    })),
-    externalEventMutations: _propTypes.default.arrayOf(_propTypes.default.shape({
-      callback: _propTypes.default.function,
-      childName: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.array]),
-      eventKey: _propTypes.default.oneOfType([_propTypes.default.array, _victoryCore.PropTypes.allOfType([_victoryCore.PropTypes.integer, _victoryCore.PropTypes.nonNegative]), _propTypes.default.string]),
-      mutation: _propTypes.default.function,
-      target: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.array])
-    })),
-    groupComponent: _propTypes.default.element,
-    height: _victoryCore.PropTypes.nonNegative,
-    innerRadius: _propTypes.default.oneOfType([_victoryCore.PropTypes.nonNegative, _propTypes.default.func]),
-    labelComponent: _propTypes.default.element,
-    labelPlacement: _propTypes.default.oneOfType([_propTypes.default.func, _propTypes.default.oneOf(["parallel", "perpendicular", "vertical"])]),
-    labelPosition: _propTypes.default.oneOfType([_propTypes.default.func, _propTypes.default.oneOf(["startAngle", "centroid", "endAngle"])]),
-    labelRadius: _propTypes.default.oneOfType([_victoryCore.PropTypes.nonNegative, _propTypes.default.func]),
-    labels: _propTypes.default.oneOfType([_propTypes.default.func, _propTypes.default.array]),
-    name: _propTypes.default.string,
-    origin: _propTypes.default.shape({
-      x: _victoryCore.PropTypes.nonNegative,
-      y: _victoryCore.PropTypes.nonNegative
-    }),
-    padAngle: _propTypes.default.oneOfType([_victoryCore.PropTypes.nonNegative, _propTypes.default.func]),
-    padding: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.shape({
-      top: _propTypes.default.number,
-      bottom: _propTypes.default.number,
-      left: _propTypes.default.number,
-      right: _propTypes.default.number
-    })]),
-    radius: _propTypes.default.oneOfType([_victoryCore.PropTypes.nonNegative, _propTypes.default.func]),
-    sharedEvents: _propTypes.default.shape({
-      events: _propTypes.default.array,
-      getEventState: _propTypes.default.func
-    }),
-    sortKey: _propTypes.default.oneOfType([_propTypes.default.func, _victoryCore.PropTypes.allOfType([_victoryCore.PropTypes.integer, _victoryCore.PropTypes.nonNegative]), _propTypes.default.string, _propTypes.default.arrayOf(_propTypes.default.string)]),
-    sortOrder: _propTypes.default.oneOf(["ascending", "descending"]),
-    standalone: _propTypes.default.bool,
-    startAngle: _propTypes.default.number,
-    style: _propTypes.default.shape({
-      parent: _propTypes.default.object,
-      data: _propTypes.default.object,
-      labels: _propTypes.default.object
-    }),
-    theme: _propTypes.default.object,
-    width: _victoryCore.PropTypes.nonNegative,
-    x: _propTypes.default.oneOfType([_propTypes.default.func, _victoryCore.PropTypes.allOfType([_victoryCore.PropTypes.integer, _victoryCore.PropTypes.nonNegative]), _propTypes.default.string, _propTypes.default.arrayOf(_propTypes.default.string)]),
-    y: _propTypes.default.oneOfType([_propTypes.default.func, _victoryCore.PropTypes.allOfType([_victoryCore.PropTypes.integer, _victoryCore.PropTypes.nonNegative]), _propTypes.default.string, _propTypes.default.arrayOf(_propTypes.default.string)])
-  }
-});
-Object.defineProperty(VictoryPie, "defaultProps", {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  value: {
-    data: [{
-      x: "A",
-      y: 1
-    }, {
-      x: "B",
-      y: 2
-    }, {
-      x: "C",
-      y: 3
-    }, {
-      x: "D",
-      y: 1
-    }, {
-      x: "E",
-      y: 2
-    }],
-    standalone: true,
-    dataComponent: _react.default.createElement(_slice.default, null),
-    labelComponent: _react.default.createElement(_victoryCore.VictoryLabel, null),
-    containerComponent: _react.default.createElement(_victoryCore.VictoryContainer, null),
-    groupComponent: _react.default.createElement("g", null),
-    sortOrder: "ascending",
-    theme: _victoryCore.VictoryTheme.grayscale
-  }
-});
-Object.defineProperty(VictoryPie, "getBaseProps", {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  value: function (props) {
-    return (0, _helperMethods.getBaseProps)(props, fallbackProps);
-  }
+
+_defineProperty(VictoryPie, "propTypes", {
+  animate: _propTypes.default.oneOfType([_propTypes.default.bool, _propTypes.default.object]),
+  colorScale: _propTypes.default.oneOfType([_propTypes.default.arrayOf(_propTypes.default.string), _propTypes.default.oneOf(["grayscale", "qualitative", "heatmap", "warm", "cool", "red", "green", "blue"])]),
+  containerComponent: _propTypes.default.element,
+  cornerRadius: _propTypes.default.oneOfType([_victoryCore.PropTypes.nonNegative, _propTypes.default.func]),
+  data: _propTypes.default.array,
+  dataComponent: _propTypes.default.element,
+  disableInlineStyes: _propTypes.default.bool,
+  endAngle: _propTypes.default.number,
+  eventKey: _propTypes.default.oneOfType([_propTypes.default.func, _victoryCore.PropTypes.allOfType([_victoryCore.PropTypes.integer, _victoryCore.PropTypes.nonNegative]), _propTypes.default.string]),
+  events: _propTypes.default.arrayOf(_propTypes.default.shape({
+    target: _propTypes.default.oneOf(["data", "labels", "parent"]),
+    eventKey: _propTypes.default.oneOfType([_propTypes.default.array, _propTypes.default.func, _victoryCore.PropTypes.allOfType([_victoryCore.PropTypes.integer, _victoryCore.PropTypes.nonNegative]), _propTypes.default.string]),
+    eventHandlers: _propTypes.default.object
+  })),
+  externalEventMutations: _propTypes.default.arrayOf(_propTypes.default.shape({
+    callback: _propTypes.default.function,
+    childName: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.array]),
+    eventKey: _propTypes.default.oneOfType([_propTypes.default.array, _victoryCore.PropTypes.allOfType([_victoryCore.PropTypes.integer, _victoryCore.PropTypes.nonNegative]), _propTypes.default.string]),
+    mutation: _propTypes.default.function,
+    target: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.array])
+  })),
+  groupComponent: _propTypes.default.element,
+  height: _victoryCore.PropTypes.nonNegative,
+  innerRadius: _propTypes.default.oneOfType([_victoryCore.PropTypes.nonNegative, _propTypes.default.func]),
+  labelComponent: _propTypes.default.element,
+  labelPlacement: _propTypes.default.oneOfType([_propTypes.default.func, _propTypes.default.oneOf(["parallel", "perpendicular", "vertical"])]),
+  labelPosition: _propTypes.default.oneOfType([_propTypes.default.func, _propTypes.default.oneOf(["startAngle", "centroid", "endAngle"])]),
+  labelRadius: _propTypes.default.oneOfType([_victoryCore.PropTypes.nonNegative, _propTypes.default.func]),
+  labels: _propTypes.default.oneOfType([_propTypes.default.func, _propTypes.default.array]),
+  name: _propTypes.default.string,
+  origin: _propTypes.default.shape({
+    x: _victoryCore.PropTypes.nonNegative,
+    y: _victoryCore.PropTypes.nonNegative
+  }),
+  padAngle: _propTypes.default.oneOfType([_victoryCore.PropTypes.nonNegative, _propTypes.default.func]),
+  padding: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.shape({
+    top: _propTypes.default.number,
+    bottom: _propTypes.default.number,
+    left: _propTypes.default.number,
+    right: _propTypes.default.number
+  })]),
+  radius: _propTypes.default.oneOfType([_victoryCore.PropTypes.nonNegative, _propTypes.default.func]),
+  sharedEvents: _propTypes.default.shape({
+    events: _propTypes.default.array,
+    getEventState: _propTypes.default.func
+  }),
+  sortKey: _propTypes.default.oneOfType([_propTypes.default.func, _victoryCore.PropTypes.allOfType([_victoryCore.PropTypes.integer, _victoryCore.PropTypes.nonNegative]), _propTypes.default.string, _propTypes.default.arrayOf(_propTypes.default.string)]),
+  sortOrder: _propTypes.default.oneOf(["ascending", "descending"]),
+  standalone: _propTypes.default.bool,
+  startAngle: _propTypes.default.number,
+  style: _propTypes.default.shape({
+    parent: _propTypes.default.object,
+    data: _propTypes.default.object,
+    labels: _propTypes.default.object
+  }),
+  theme: _propTypes.default.object,
+  width: _victoryCore.PropTypes.nonNegative,
+  x: _propTypes.default.oneOfType([_propTypes.default.func, _victoryCore.PropTypes.allOfType([_victoryCore.PropTypes.integer, _victoryCore.PropTypes.nonNegative]), _propTypes.default.string, _propTypes.default.arrayOf(_propTypes.default.string)]),
+  y: _propTypes.default.oneOfType([_propTypes.default.func, _victoryCore.PropTypes.allOfType([_victoryCore.PropTypes.integer, _victoryCore.PropTypes.nonNegative]), _propTypes.default.string, _propTypes.default.arrayOf(_propTypes.default.string)])
 });
-Object.defineProperty(VictoryPie, "getData", {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  value: _victoryCore.Data.getData
+
+_defineProperty(VictoryPie, "defaultProps", {
+  data: [{
+    x: "A",
+    y: 1
+  }, {
+    x: "B",
+    y: 2
+  }, {
+    x: "C",
+    y: 3
+  }, {
+    x: "D",
+    y: 1
+  }, {
+    x: "E",
+    y: 2
+  }],
+  standalone: true,
+  dataComponent: /*#__PURE__*/_react.default.createElement(_slice.default, null),
+  labelComponent: /*#__PURE__*/_react.default.createElement(_victoryCore.VictoryLabel, null),
+  containerComponent: /*#__PURE__*/_react.default.createElement(_victoryCore.VictoryContainer, null),
+  groupComponent: /*#__PURE__*/_react.default.createElement("g", null),
+  sortOrder: "ascending",
+  theme: _victoryCore.VictoryTheme.grayscale
 });
-Object.defineProperty(VictoryPie, "expectedComponents", {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  value: ["dataComponent", "labelComponent", "groupComponent", "containerComponent"]
+
+_defineProperty(VictoryPie, "getBaseProps", function (props) {
+  return (0, _helperMethods.getBaseProps)(props, fallbackProps);
 });
 
+_defineProperty(VictoryPie, "getData", _victoryCore.Data.getData);
+
+_defineProperty(VictoryPie, "expectedComponents", ["dataComponent", "labelComponent", "groupComponent", "containerComponent"]);
+
 var _default = (0, _victoryCore.addEvents)(VictoryPie);
 
 exports.default = _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "victory-pie",
-  "version": "36.2.2",
+  "version": "36.4.0",
   "description": "Pie Component for Victory",
   "keywords": [
     "data visualization",
@@ -19,10 +19,10 @@
   "author": "Formidable",
   "license": "MIT",
   "dependencies": {
-    "d3-shape": "^1.0.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/helper-methods.js

@@ -1,6 +1,6 @@
 /*eslint no-magic-numbers: ["error", { "ignore": [-1, 0, 1, 2, 45, 90, 135, 180, 225, 270, 315, 360] }]*/
 import { assign, defaults, isFunction, isPlainObject, isNil } from "lodash";
-import * as d3Shape from "d3-shape";
+import * as d3Shape from "victory-vendor/d3-shape";
 
 import { Helpers, Data, Style } from "victory-core";
 

package/src/index.d.ts

@@ -42,6 +42,7 @@ export interface SliceProps extends VictoryCommonProps {
   };
   sliceEndAngle?: SliceNumberOrCallback<SliceProps, "sliceEndAngle">;
   sliceStartAngle?: SliceNumberOrCallback<SliceProps, "sliceStartAngle">;
+  style?: VictoryStyleInterface;
   tabIndex?: NumberOrCallback;
 }
 

package/src/slice.js

@@ -2,7 +2,7 @@ import React from "react";
 import PropTypes from "prop-types";
 import { Helpers, CommonProps, Path } from "victory-core";
 import { defaults, isFunction, assign } from "lodash";
-import * as d3Shape from "d3-shape";
+import * as d3Shape from "victory-vendor/d3-shape";
 
 const getPath = (props) => {
   const { slice, radius, innerRadius, cornerRadius } = props;

package/src/victory-pie.js

@@ -8,7 +8,8 @@ import {
   PropTypes as CustomPropTypes,
   VictoryContainer,
   VictoryLabel,
-  VictoryTheme
+  VictoryTheme,
+  UserProps
 } from "victory-core";
 import Slice from "./slice";
 import { getBaseProps } from "./helper-methods";
@@ -255,8 +256,12 @@ class VictoryPie extends React.Component {
     }
 
     const children = this.renderData(props);
+    const container = React.cloneElement(
+      props.containerComponent,
+      UserProps.getSafeUserProps(props)
+    );
     return props.standalone
-      ? this.renderContainer(props.containerComponent, children)
+      ? this.renderContainer(container, children)
       : children;
   }
 }