Merge pull request #1447 from FormidableLabs/feature/pie-label-positi…

…on-func-prop allow labelPosition as a function in VictoryPie
FormidableLabs · Nov 26, 2019 · 9f0f3ca · 9f0f3ca
2 parents 26afd06 + 1dfe6fd
commit 9f0f3ca
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/packages/victory-pie/src/helper-methods.js b/packages/victory-pie/src/helper-methods.js
@@ -137,11 +137,15 @@ const getVerticalAnchor = (orientation) => {
 
 const getLabelProps = (text, dataProps, calculatedValues) => {
   const { index, datum, data, slice } = dataProps;
-  const { style, defaultRadius, origin, width, height, labelPosition } = calculatedValues;
+  const { style, defaultRadius, origin, width, height } = calculatedValues;
   const labelRadius = Helpers.evaluateProp(
     calculatedValues.labelRadius,
     assign({ text }, dataProps)
   );
+  const labelPosition = Helpers.evaluateProp(
+    calculatedValues.labelPosition,
+    assign({ text }, dataProps)
+  );
   const labelStyle = assign({ padding: 0 }, style.labels);
   const evaluatedStyle = Helpers.evaluateStyle(
     labelStyle,

diff --git a/packages/victory-pie/src/victory-pie.js b/packages/victory-pie/src/victory-pie.js
@@ -123,7 +123,10 @@ class VictoryPie extends React.Component {
     height: CustomPropTypes.nonNegative,
     innerRadius: PropTypes.oneOfType([CustomPropTypes.nonNegative, PropTypes.func]),
     labelComponent: PropTypes.element,
-    labelPosition: PropTypes.oneOf(["startAngle", "centroid", "endAngle"]),
+    labelPosition: PropTypes.oneOfType([
+      PropTypes.func,
+      PropTypes.oneOf(["startAngle", "centroid", "endAngle"])
+    ]),
     labelRadius: PropTypes.oneOfType([CustomPropTypes.nonNegative, PropTypes.func]),
     labels: PropTypes.oneOfType([PropTypes.func, PropTypes.array]),
     name: PropTypes.string,

diff --git a/stories/victory-pie.js b/stories/victory-pie.js
@@ -45,9 +45,18 @@ storiesOf("VictoryPie", module)
   ))
   .add("with a radius prop", () => <VictoryPie radius={100} />)
   .add("with an origin prop", () => <VictoryPie radius={100} origin={{ x: 150, y: 150 }} />)
-  .add("with a label position different than centroid", () => (
+  .add("with a labelPosition different than centroid", () => (
     <VictoryPie labelPosition={"startAngle"} />
   ))
+  .add("with a labelPosition as a function", () => (
+    <VictoryPie
+      startAngle={-90}
+      endAngle={90}
+      innerRadius={90}
+      data={[{ x: "Cat", y: 62 }, { x: "Bird", y: 25 }]}
+      labelPosition={({ index }) => (index === 0 ? "endAngle" : "startAngle")}
+    />
+  ))
   .add("with custom data and colors", () => (
     <VictoryPie
       style={{