gifted-charts-core 0.0.43 → 0.0.45

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gifted-charts-core",
-  "version": "0.0.43",
+  "version": "0.0.45",
   "description": "Mathematical and logical utilities used by react-gifted-charts and react-native-gifted-charts",
   "main": "./src/index.js",
   "files": [

package/src/PieChart/index.js

@@ -89,7 +89,8 @@ export var usePieChart = function (props) {
         ? ((_u = props.textBackgroundRadius) !== null && _u !== void 0 ? _u : textSize) * 2 + 6
         : 0;
     /**********************************       PRO                       **********************/
-    var animationDuration = ((_v = props.animationDuration) !== null && _v !== void 0 ? _v : defaultAnimationDuration) / 1000;
+    var startAngleForPro = (_v = props.startAngle) !== null && _v !== void 0 ? _v : 0;
+    var animationDuration = (_w = props.animationDuration) !== null && _w !== void 0 ? _w : defaultAnimationDuration;
     var _3 = __read(useState(isAnimated), 2), isAnimating = _3[0], setIsAnimating = _3[1];
     useEffect(function () {
         if (isAnimated) {
@@ -113,7 +114,7 @@ export var usePieChart = function (props) {
             : 'mid';
     var getCoordinates = function (index, additionalValue, addInOnlyStart, addInOnlyEnd) {
         var addedValue = addValues(index - 1) + (addInOnlyEnd ? 0 : additionalValue !== null && additionalValue !== void 0 ? additionalValue : 0);
-        var angle = (addedValue / total) * endAngleLocal + startAngle;
+        var angle = (addedValue / total) * endAngleLocal + startAngleForPro;
         var startInnerX = radius + Math.cos(angle) * innerRadius;
         var startInnerY = radius - Math.sin(angle) * innerRadius;
         var startOuterX = radius + Math.cos(angle) * radius;
@@ -121,7 +122,7 @@ export var usePieChart = function (props) {
         var value = addValues(index - 1) +
             data[index].value +
             (addInOnlyStart ? 0 : additionalValue !== null && additionalValue !== void 0 ? additionalValue : 0);
-        angle = (value / total) * endAngleLocal + startAngle;
+        angle = (value / total) * endAngleLocal + startAngleForPro;
         var endOuterX = radius + Math.cos(angle) * radius;
         var endOuterY = radius - Math.sin(angle) * radius;
         var endInnerX = radius + Math.cos(angle) * innerRadius;
@@ -139,7 +140,7 @@ export var usePieChart = function (props) {
     };
     var getTextCoordinates = function (index, labelPos) {
         var value = addValues(index - 1) + data[index].value / 2;
-        var angle = (value / total) * endAngleLocal + startAngle;
+        var angle = (value / total) * endAngleLocal + startAngleForPro;
         var labelPosition = labelPos || labelsPosition;
         var x = radius +
             Math.cos(angle) *
@@ -234,7 +235,7 @@ export var usePieChart = function (props) {
         pi: pi,
         selectedIndex: selectedIndex,
         setSelectedIndex: setSelectedIndex,
-        startAngle: pro ? (_w = props.startAngle) !== null && _w !== void 0 ? _w : 0 : startAngle,
+        startAngle: pro ? startAngleForPro : startAngle,
         endAngle: endAngle,
         setStartAngle: setStartAngle,
         total: total,
@@ -258,7 +259,7 @@ export var usePieChart = function (props) {
         paddingHorizontal: paddingHorizontal,
         paddingVertical: paddingVertical,
         isAnimated: isAnimated,
-        animationDuration: animationDuration,
+        animationDuration: animationDuration / 1000,
         // PRO
         initial: initial,
         dInitial: dInitial,

package/src/PieChart/index.ts

@@ -156,8 +156,8 @@ export const usePieChart = (props: IPieChartPropsType): IusePieChart => {
 
   /**********************************       PRO                       **********************/
 
-  const animationDuration =
-    (props.animationDuration ?? defaultAnimationDuration) / 1000
+  const startAngleForPro = props.startAngle ?? 0
+  const animationDuration = props.animationDuration ?? defaultAnimationDuration
 
   const [isAnimating, setIsAnimating] = useState(isAnimated)
 
@@ -190,7 +190,7 @@ export const usePieChart = (props: IPieChartPropsType): IusePieChart => {
   ) => {
     const addedValue =
       addValues(index - 1) + (addInOnlyEnd ? 0 : additionalValue ?? 0)
-    let angle = (addedValue / total) * endAngleLocal + startAngle
+    let angle = (addedValue / total) * endAngleLocal + startAngleForPro
     const startInnerX = radius + Math.cos(angle) * innerRadius
     const startInnerY = radius - Math.sin(angle) * innerRadius
     const startOuterX = radius + Math.cos(angle) * radius
@@ -200,7 +200,7 @@ export const usePieChart = (props: IPieChartPropsType): IusePieChart => {
       addValues(index - 1) +
       data[index].value +
       (addInOnlyStart ? 0 : additionalValue ?? 0)
-    angle = (value / total) * endAngleLocal + startAngle
+    angle = (value / total) * endAngleLocal + startAngleForPro
 
     const endOuterX = radius + Math.cos(angle) * radius
     const endOuterY = radius - Math.sin(angle) * radius
@@ -222,7 +222,7 @@ export const usePieChart = (props: IPieChartPropsType): IusePieChart => {
 
   const getTextCoordinates = (index: number, labelPos?: LabelsPosition) => {
     const value = addValues(index - 1) + data[index].value / 2
-    const angle = (value / total) * endAngleLocal + startAngle
+    const angle = (value / total) * endAngleLocal + startAngleForPro
 
     const labelPosition: LabelsPosition = labelPos || labelsPosition
 
@@ -370,7 +370,7 @@ export const usePieChart = (props: IPieChartPropsType): IusePieChart => {
     pi,
     selectedIndex,
     setSelectedIndex,
-    startAngle: pro ? props.startAngle ?? 0 : startAngle,
+    startAngle: pro ? startAngleForPro : startAngle,
     endAngle,
     setStartAngle,
     total,
@@ -394,7 +394,7 @@ export const usePieChart = (props: IPieChartPropsType): IusePieChart => {
     paddingHorizontal,
     paddingVertical,
     isAnimated,
-    animationDuration,
+    animationDuration: animationDuration / 1000,
 
     // PRO