victory-pie 11.2.0 → 11.4.2

package/lib/components/victory-pie.js

@@ -1,165 +1,154 @@
-Object.defineProperty(exports,"__esModule",{value:true});var _partialRight2=require("lodash/partialRight");var _partialRight3=_interopRequireDefault(_partialRight2);var _jsxFileName="src/components/victory-pie.js";var _createClass=function(){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);}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor;};}();
-var _react=require("react");var _react2=_interopRequireDefault(_react);
-var _propTypes=require("prop-types");var _propTypes2=_interopRequireDefault(_propTypes);
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 
-var _victoryCore=require("victory-core");
+var _partialRight2 = require("lodash/partialRight");
 
+var _partialRight3 = _interopRequireDefault(_partialRight2);
 
+var _createClass = function () { 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); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
 
-var _helperMethods=require("./helper-methods");var _helperMethods2=_interopRequireDefault(_helperMethods);function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor)){throw new TypeError("Cannot call a class as a function");}}function _possibleConstructorReturn(self,call){if(!self){throw new ReferenceError("this hasn't been initialised - super() hasn't been called");}return call&&(typeof call==="object"||typeof call==="function")?call:self;}function _inherits(subClass,superClass){if(typeof superClass!=="function"&&superClass!==null){throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);}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;}
-
-var fallbackProps={
-endAngle:360,
-height:400,
-innerRadius:0,
-cornerRadius:0,
-padAngle:0,
-padding:30,
-width:400,
-startAngle:0,
-colorScale:[
-"#ffffff",
-"#f0f0f0",
-"#d9d9d9",
-"#bdbdbd",
-"#969696",
-"#737373",
-"#525252",
-"#252525",
-"#000000"]};
-
-
-
-var animationWhitelist=[
-"data","endAngle","height","innerRadius","cornerRadius","padAngle","padding",
-"colorScale","startAngle","style","width"];var
-
-
-VictoryPie=function(_React$Component){_inherits(VictoryPie,_React$Component);function VictoryPie(){_classCallCheck(this,VictoryPie);return _possibleConstructorReturn(this,(VictoryPie.__proto__||Object.getPrototypeOf(VictoryPie)).apply(this,arguments));}_createClass(VictoryPie,[{key:"shouldAnimate",value:function shouldAnimate()
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-return Boolean(this.props.animate);
-}},{key:"render",value:function render()
-
-{var
-role=this.constructor.role;
-var props=_victoryCore.Helpers.modifyProps(this.props,fallbackProps,role);
-if(this.shouldAnimate()){
-return this.animateComponent(props,animationWhitelist);
-}
-
-var children=this.renderData(props);
-return props.standalone?this.renderContainer(props.containerComponent,children):children;
-}}]);return VictoryPie;}(_react2.default.Component);VictoryPie.displayName="VictoryPie";VictoryPie.defaultTransitions={onExit:{duration:500,before:function before(){return{_y:0,label:" "};}},onEnter:{duration:500,before:function before(){return{_y:0,label:" "};},after:function after(datum){return{y_:datum._y,label:datum.label};}}};VictoryPie.propTypes={animate:_propTypes2.default.object,colorScale:_propTypes2.default.oneOfType([_propTypes2.default.arrayOf(_propTypes2.default.string),_propTypes2.default.oneOf(["grayscale","qualitative","heatmap","warm","cool","red","green","blue"])]),containerComponent:_propTypes2.default.element,cornerRadius:_victoryCore.PropTypes.nonNegative,data:_propTypes2.default.array,dataComponent:_propTypes2.default.element,endAngle:_propTypes2.default.number,eventKey:_propTypes2.default.oneOfType([_propTypes2.default.func,_victoryCore.PropTypes.allOfType([_victoryCore.PropTypes.integer,_victoryCore.PropTypes.nonNegative]),_propTypes2.default.string]),events:_propTypes2.default.arrayOf(_propTypes2.default.shape({target:_propTypes2.default.oneOf(["data","labels","parent"]),eventKey:_propTypes2.default.oneOfType([_propTypes2.default.func,_victoryCore.PropTypes.allOfType([_victoryCore.PropTypes.integer,_victoryCore.PropTypes.nonNegative]),_propTypes2.default.string]),eventHandlers:_propTypes2.default.object})),groupComponent:_propTypes2.default.element,height:_victoryCore.PropTypes.nonNegative,innerRadius:_victoryCore.PropTypes.nonNegative,labelComponent:_propTypes2.default.element,labelRadius:_propTypes2.default.oneOfType([_victoryCore.PropTypes.nonNegative,_propTypes2.default.func]),labels:_propTypes2.default.oneOfType([_propTypes2.default.func,_propTypes2.default.array]),name:_propTypes2.default.string,padAngle:_victoryCore.PropTypes.nonNegative,padding:_propTypes2.default.oneOfType([_propTypes2.default.number,_propTypes2.default.shape({top:_propTypes2.default.number,bottom:_propTypes2.default.number,left:_propTypes2.default.number,right:_propTypes2.default.number})]),sharedEvents:_propTypes2.default.shape({events:_propTypes2.default.array,getEventState:_propTypes2.default.func}),sortKey:_propTypes2.default.oneOfType([_propTypes2.default.func,_victoryCore.PropTypes.allOfType([_victoryCore.PropTypes.integer,_victoryCore.PropTypes.nonNegative]),_propTypes2.default.string,_propTypes2.default.arrayOf(_propTypes2.default.string)]),standalone:_propTypes2.default.bool,startAngle:_propTypes2.default.number,style:_propTypes2.default.shape({parent:_propTypes2.default.object,data:_propTypes2.default.object,labels:_propTypes2.default.object}),theme:_propTypes2.default.object,width:_victoryCore.PropTypes.nonNegative,x:_propTypes2.default.oneOfType([_propTypes2.default.func,_victoryCore.PropTypes.allOfType([_victoryCore.PropTypes.integer,_victoryCore.PropTypes.nonNegative]),_propTypes2.default.string,_propTypes2.default.arrayOf(_propTypes2.default.string)]),y:_propTypes2.default.oneOfType([_propTypes2.default.func,_victoryCore.PropTypes.allOfType([_victoryCore.PropTypes.integer,_victoryCore.PropTypes.nonNegative]),_propTypes2.default.string,_propTypes2.default.arrayOf(_propTypes2.default.string)])};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:_react2.default.createElement(_victoryCore.Slice,{__source:{fileName:_jsxFileName,lineNumber:135}}),labelComponent:_react2.default.createElement(_victoryCore.VictoryLabel,{__source:{fileName:_jsxFileName,lineNumber:136}}),containerComponent:_react2.default.createElement(_victoryCore.VictoryContainer,{__source:{fileName:_jsxFileName,lineNumber:137}}),groupComponent:_react2.default.createElement("g",{__source:{fileName:_jsxFileName,lineNumber:138}}),theme:_victoryCore.VictoryTheme.grayscale};VictoryPie.getBaseProps=(0,_partialRight3.default)(_helperMethods2.default.getBaseProps.bind(_helperMethods2.default),fallbackProps);VictoryPie.getData=_victoryCore.Data.getData.bind(_victoryCore.Data);VictoryPie.expectedComponents=["dataComponent","labelComponent","groupComponent","containerComponent"];exports.default=
-
-
-(0,_victoryCore.addEvents)(VictoryPie);
+var _react = require("react");
+
+var _react2 = _interopRequireDefault(_react);
+
+var _propTypes = require("prop-types");
+
+var _propTypes2 = _interopRequireDefault(_propTypes);
+
+var _victoryCore = require("victory-core");
+
+var _helperMethods = require("./helper-methods");
+
+var _helperMethods2 = _interopRequireDefault(_helperMethods);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } 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; } /*eslint no-magic-numbers: ["error", { "ignore": [-1, 0, 1, 2] }]*/
+
+
+var fallbackProps = {
+  endAngle: 360,
+  height: 400,
+  innerRadius: 0,
+  cornerRadius: 0,
+  padAngle: 0,
+  padding: 30,
+  width: 400,
+  startAngle: 0,
+  colorScale: ["#ffffff", "#f0f0f0", "#d9d9d9", "#bdbdbd", "#969696", "#737373", "#525252", "#252525", "#000000"]
+};
+
+var animationWhitelist = ["data", "endAngle", "height", "innerRadius", "cornerRadius", "padAngle", "padding", "colorScale", "startAngle", "style", "width"];
+
+var VictoryPie = function (_React$Component) {
+  _inherits(VictoryPie, _React$Component);
+
+  function VictoryPie() {
+    _classCallCheck(this, VictoryPie);
+
+    return _possibleConstructorReturn(this, (VictoryPie.__proto__ || Object.getPrototypeOf(VictoryPie)).apply(this, arguments));
+  }
+
+  _createClass(VictoryPie, [{
+    key: "shouldAnimate",
+
+
+    // Overridden in victory-native
+    value: function shouldAnimate() {
+      return Boolean(this.props.animate);
+    }
+  }, {
+    key: "render",
+    value: function render() {
+      var role = this.constructor.role;
+
+      var props = _victoryCore.Helpers.modifyProps(this.props, fallbackProps, role);
+      if (this.shouldAnimate()) {
+        return this.animateComponent(props, animationWhitelist);
+      }
+
+      var children = this.renderData(props);
+      return props.standalone ? this.renderContainer(props.containerComponent, children) : children;
+    }
+  }]);
+
+  return VictoryPie;
+}(_react2.default.Component);
+
+VictoryPie.displayName = "VictoryPie";
+VictoryPie.defaultTransitions = {
+  onExit: {
+    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 };
+    }
+  }
+};
+VictoryPie.propTypes = {
+  animate: _propTypes2.default.oneOfType([_propTypes2.default.bool, _propTypes2.default.object]),
+  colorScale: _propTypes2.default.oneOfType([_propTypes2.default.arrayOf(_propTypes2.default.string), _propTypes2.default.oneOf(["grayscale", "qualitative", "heatmap", "warm", "cool", "red", "green", "blue"])]),
+  containerComponent: _propTypes2.default.element,
+  cornerRadius: _victoryCore.PropTypes.nonNegative,
+  data: _propTypes2.default.array,
+  dataComponent: _propTypes2.default.element,
+  endAngle: _propTypes2.default.number,
+  eventKey: _propTypes2.default.oneOfType([_propTypes2.default.func, _victoryCore.PropTypes.allOfType([_victoryCore.PropTypes.integer, _victoryCore.PropTypes.nonNegative]), _propTypes2.default.string]),
+  events: _propTypes2.default.arrayOf(_propTypes2.default.shape({
+    target: _propTypes2.default.oneOf(["data", "labels", "parent"]),
+    eventKey: _propTypes2.default.oneOfType([_propTypes2.default.func, _victoryCore.PropTypes.allOfType([_victoryCore.PropTypes.integer, _victoryCore.PropTypes.nonNegative]), _propTypes2.default.string]),
+    eventHandlers: _propTypes2.default.object
+  })),
+  groupComponent: _propTypes2.default.element,
+  height: _victoryCore.PropTypes.nonNegative,
+  innerRadius: _victoryCore.PropTypes.nonNegative,
+  labelComponent: _propTypes2.default.element,
+  labelRadius: _propTypes2.default.oneOfType([_victoryCore.PropTypes.nonNegative, _propTypes2.default.func]),
+  labels: _propTypes2.default.oneOfType([_propTypes2.default.func, _propTypes2.default.array]),
+  name: _propTypes2.default.string,
+  padAngle: _victoryCore.PropTypes.nonNegative,
+  padding: _propTypes2.default.oneOfType([_propTypes2.default.number, _propTypes2.default.shape({
+    top: _propTypes2.default.number, bottom: _propTypes2.default.number,
+    left: _propTypes2.default.number, right: _propTypes2.default.number
+  })]),
+  sharedEvents: _propTypes2.default.shape({
+    events: _propTypes2.default.array,
+    getEventState: _propTypes2.default.func
+  }),
+  sortKey: _propTypes2.default.oneOfType([_propTypes2.default.func, _victoryCore.PropTypes.allOfType([_victoryCore.PropTypes.integer, _victoryCore.PropTypes.nonNegative]), _propTypes2.default.string, _propTypes2.default.arrayOf(_propTypes2.default.string)]),
+  standalone: _propTypes2.default.bool,
+  startAngle: _propTypes2.default.number,
+  style: _propTypes2.default.shape({
+    parent: _propTypes2.default.object, data: _propTypes2.default.object, labels: _propTypes2.default.object
+  }),
+  theme: _propTypes2.default.object,
+  width: _victoryCore.PropTypes.nonNegative,
+  x: _propTypes2.default.oneOfType([_propTypes2.default.func, _victoryCore.PropTypes.allOfType([_victoryCore.PropTypes.integer, _victoryCore.PropTypes.nonNegative]), _propTypes2.default.string, _propTypes2.default.arrayOf(_propTypes2.default.string)]),
+  y: _propTypes2.default.oneOfType([_propTypes2.default.func, _victoryCore.PropTypes.allOfType([_victoryCore.PropTypes.integer, _victoryCore.PropTypes.nonNegative]), _propTypes2.default.string, _propTypes2.default.arrayOf(_propTypes2.default.string)])
+};
+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: _react2.default.createElement(_victoryCore.Slice, null),
+  labelComponent: _react2.default.createElement(_victoryCore.VictoryLabel, null),
+  containerComponent: _react2.default.createElement(_victoryCore.VictoryContainer, null),
+  groupComponent: _react2.default.createElement("g", null),
+  theme: _victoryCore.VictoryTheme.grayscale
+};
+VictoryPie.getBaseProps = (0, _partialRight3.default)(_helperMethods2.default.getBaseProps.bind(_helperMethods2.default), fallbackProps);
+VictoryPie.getData = _victoryCore.Data.getData.bind(_victoryCore.Data);
+VictoryPie.expectedComponents = ["dataComponent", "labelComponent", "groupComponent", "containerComponent"];
+exports.default = (0, _victoryCore.addEvents)(VictoryPie);

package/lib/index.js

@@ -1,2 +1,12 @@
-Object.defineProperty(exports,"__esModule",{value:true});exports.VictoryPie=undefined;var _victoryPie=require("./components/victory-pie");var _victoryPie2=_interopRequireDefault(_victoryPie);function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}exports.
-VictoryPie=_victoryPie2.default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.VictoryPie = undefined;
+
+var _victoryPie = require("./components/victory-pie");
+
+var _victoryPie2 = _interopRequireDefault(_victoryPie);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+exports.VictoryPie = _victoryPie2.default;

package/package.json

@@ -1,8 +1,10 @@
 {
   "name": "victory-pie",
-  "version": "11.2.0",
+  "version": "11.4.2",
   "description": "D3 pie & donut chart component for React",
   "main": "lib/index.js",
+  "module": "es/index.js",
+  "jsnext:main": "es/index.js",
   "repository": {
     "type": "git",
     "url": "https://github.com/FormidableLabs/victory-pie.git"
@@ -28,11 +30,11 @@
   "dependencies": {
     "d3-shape": "^1.0.0",
     "lodash": "^4.17.4",
-    "victory-core": "^16.2.0"
+    "victory-core": "^17.0.0"
   },
   "devDependencies": {
     "@kadira/storybook": "^1.25.0",
-    "builder-victory-component-dev": "^4.0.2",
+    "builder-victory-component-dev": "^5.0.1",
     "chai": "^3.5.0",
     "chai-enzyme": "0.4.1",
     "enzyme": "^2.4.1",
@@ -44,7 +46,7 @@
     "sinon": "^1.17.5",
     "sinon-chai": "^2.8.0",
     "builder": "^3.2.1",
-    "builder-victory-component": "^4.0.2"
+    "builder-victory-component": "^5.0.1"
   },
   "publishr": {
     "dependencies": [

package/src/components/helper-methods.js

@@ -55,7 +55,9 @@ export default {
   getLabelProps(props, dataProps, calculatedValues) {
     const { index, datum, data, slice } = dataProps;
     const { style, radius, origin } = calculatedValues;
-    const labelStyle = assign({ padding: 0 }, style.labels);
+    const labelStyle = Helpers.evaluateStyle(
+      assign({ padding: 0 }, style.labels), datum, props.active
+    );
     const labelRadius = Helpers.evaluateProp(props.labelRadius, datum);
     const labelPosition = this.getLabelPosition(radius, labelRadius, labelStyle);
     const position = labelPosition.centroid(slice);
@@ -79,12 +81,9 @@ export default {
     const colors = Array.isArray(colorScale) ? colorScale : Style.getColorScale(colorScale);
     const padding = Helpers.getPadding(props);
     const radius = this.getRadius(props, padding);
-    const offsetWidth = width / 2 + padding.left - padding.right;
-    const offsetHeight = height / 2 + padding.top - padding.bottom;
-    const origin = {
-      x: offsetWidth + radius > width ? radius + padding.left - padding.right : offsetWidth,
-      y: offsetHeight + radius > height ? radius + padding.top - padding.bottom : offsetHeight
-    };
+    const offsetWidth = ((radius + padding.left) + (width - radius - padding.right)) / 2;
+    const offsetHeight = ((radius + padding.top) + (height - radius - padding.bottom)) / 2;
+    const origin = { x: offsetWidth, y: offsetHeight };
     const data = Data.getData(props);
     const slices = this.getSlices(props, data);
     const pathFunction = d3Shape.arc()

package/src/components/victory-pie.js

@@ -51,7 +51,7 @@ class VictoryPie extends React.Component {
   };
 
   static propTypes = {
-    animate: PropTypes.object,
+    animate: PropTypes.oneOfType([PropTypes.bool, PropTypes.object]),
     colorScale: PropTypes.oneOfType([
       PropTypes.arrayOf(PropTypes.string),
       PropTypes.oneOf([