From 3d3e35290ffa8c5f8f19a0d05245f91625e07dea Mon Sep 17 00:00:00 2001 From: Barbara Schiavinato Date: Mon, 1 Oct 2018 11:16:03 +0100 Subject: [PATCH 1/2] Fix Aarc center on the update Prevent negative innerRadius on the update case --- modules/pie-chart/hybrid/index.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/pie-chart/hybrid/index.js b/modules/pie-chart/hybrid/index.js index accf067..01fdcde 100644 --- a/modules/pie-chart/hybrid/index.js +++ b/modules/pie-chart/hybrid/index.js @@ -49,7 +49,6 @@ export default class PieChart extends PureComponent { static get defaultProps() { return { size: 400, - innerHoleSize: 0, padding: 2, labels: false, styles: {}, @@ -90,7 +89,7 @@ export default class PieChart extends PureComponent { const outerRadius = this.getOuterRadius(); return arc() - .innerRadius(innerRadius - padding) + .innerRadius(innerRadius) .outerRadius(outerRadius - padding); } @@ -112,7 +111,8 @@ export default class PieChart extends PureComponent { } getInnerRadius() { - return this.props.innerHoleSize * 0.5; + const { innerHoleSize, padding } = this.props; + return innerHoleSize ? innerHoleSize * 0.5 - padding : 0; } getSlices() { From 701a4d54864b7f5b51defe4e130c6b8d58089d75 Mon Sep 17 00:00:00 2001 From: Barbara Schiavinato Date: Mon, 1 Oct 2018 14:51:57 +0100 Subject: [PATCH 2/2] Fix test --- modules/pie-chart/hybrid/index.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/pie-chart/hybrid/index.js b/modules/pie-chart/hybrid/index.js index 01fdcde..f09bb8e 100644 --- a/modules/pie-chart/hybrid/index.js +++ b/modules/pie-chart/hybrid/index.js @@ -52,6 +52,7 @@ export default class PieChart extends PureComponent { padding: 2, labels: false, styles: {}, + innerHoleSize: 0, mouseOverHandler: () => {}, mouseOutHandler: () => {}, mouseMoveHandler: () => {}, @@ -112,7 +113,7 @@ export default class PieChart extends PureComponent { getInnerRadius() { const { innerHoleSize, padding } = this.props; - return innerHoleSize ? innerHoleSize * 0.5 - padding : 0; + return (innerHoleSize !== 0) ? innerHoleSize * 0.5 - padding : 0; } getSlices() {