gifted-charts-core 0.0.48 → 0.0.50

package/package.json

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

package/src/PieChart/pro.d.ts

@@ -10,13 +10,13 @@ interface IusePiePro {
     initial: string;
     dInitial: string[];
     dFinal: string[];
-    isAnimating?: boolean;
     getStartCaps: (index: number, item: pieDataItem) => string;
     getEndCaps: (index: number, item: pieDataItem) => string;
     getTextCoordinates: (index: number, labelPos?: LabelsPosition) => {
         x: number;
         y: number;
     };
+    labelsPosition: LabelsPosition;
 }
 export declare const usePiePro: (props: PieChartPropsType) => IusePiePro;
 export {};

package/src/PieChart/pro.js

@@ -14,7 +14,15 @@ var __read = (this && this.__read) || function (o, n) {
     }
     return ar;
 };
-import { useEffect, useState } from 'react';
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 import { defaultAnimationDuration } from '../utils/constants';
 export var usePiePro = function (props) {
     var _a, _b;
@@ -22,14 +30,7 @@ export var usePiePro = function (props) {
     var endAngle = (_a = props.endAngle) !== null && _a !== void 0 ? _a : startAngle + Math.PI * (semiCircle ? 1 : 2);
     var total = data.reduce(function (acc, item) { return acc + item.value; }, 0);
     var animationDuration = (_b = props.animationDuration) !== null && _b !== void 0 ? _b : defaultAnimationDuration;
-    var _h = __read(useState(isAnimated), 2), isAnimating = _h[0], setIsAnimating = _h[1];
-    useEffect(function () {
-        if (isAnimated) {
-            setIsAnimating(true);
-            setTimeout(function () { return setIsAnimating(false); }, animationDuration);
-        }
-    }, []);
-    var endAngleLocal = 0;
+    //   let endAngleLocal = 0
     var addValues = function (index) {
         if (index < 0)
             return 0;
@@ -45,7 +46,7 @@ export var usePiePro = 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) * endAngle + startAngle;
         var startInnerX = radius + Math.cos(angle) * innerRadius;
         var startInnerY = radius - Math.sin(angle) * innerRadius;
         var startOuterX = radius + Math.cos(angle) * radius;
@@ -53,7 +54,7 @@ export var usePiePro = 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) * endAngle + startAngle;
         var endOuterX = radius + Math.cos(angle) * radius;
         var endOuterY = radius - Math.sin(angle) * radius;
         var endInnerX = radius + Math.cos(angle) * innerRadius;
@@ -71,7 +72,7 @@ export var usePiePro = 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) * endAngle + startAngle;
         var labelPosition = labelPos || labelsPosition;
         var x = radius +
             Math.cos(angle) *
@@ -152,12 +153,15 @@ export var usePiePro = function (props) {
         var path = "M".concat(endInnerX, ",").concat(endInnerY, " A").concat(edgeRadius, ",").concat(edgeRadius, " 0 0 1 ").concat(endOuterX, ",").concat(endOuterY);
         return path;
     };
-    var dInitial = data.map(function (item, index) {
+    var dataForInitialPath = isAnimated
+        ? data
+        : __spreadArray(__spreadArray([], __read(data), false), [{ value: total * 100 }], false);
+    var dataForFinalPath = isAnimated ? data : __spreadArray(__spreadArray([], __read(data), false), [{ value: 0 }], false);
+    var dInitial = dataForInitialPath.map(function (item, index) {
         return "".concat(initial || getInitial(item), " ").concat(donut ? getDonutPath(index, item) : getPath(index));
     });
-    endAngleLocal = endAngle;
     initial = '';
-    var dFinal = data.map(function (item, index) {
+    var dFinal = dataForFinalPath.map(function (item, index) {
         return "".concat(initial || getInitial(item), " ").concat(donut ? getDonutPath(index, item) : getPath(index));
     });
     return {
@@ -170,9 +174,9 @@ export var usePiePro = function (props) {
         initial: initial,
         dInitial: dInitial,
         dFinal: dFinal,
-        isAnimating: isAnimating,
         getStartCaps: getStartCaps,
         getEndCaps: getEndCaps,
-        getTextCoordinates: getTextCoordinates
+        getTextCoordinates: getTextCoordinates,
+        labelsPosition: labelsPosition
     };
 };

package/src/PieChart/pro.ts

@@ -1,4 +1,3 @@
-import { useEffect, useState } from 'react'
 import { defaultAnimationDuration } from '../utils/constants'
 import { PieChartPropsType, pieDataItem } from './types'
 import { LabelsPosition } from '../utils/types'
@@ -13,13 +12,13 @@ interface IusePiePro {
   initial: string
   dInitial: string[]
   dFinal: string[]
-  isAnimating?: boolean
   getStartCaps: (index: number, item: pieDataItem) => string
   getEndCaps: (index: number, item: pieDataItem) => string
   getTextCoordinates: (
     index: number,
     labelPos?: LabelsPosition
   ) => { x: number; y: number }
+  labelsPosition: LabelsPosition
 }
 
 export const usePiePro = (props: PieChartPropsType): IusePiePro => {
@@ -38,16 +37,7 @@ export const usePiePro = (props: PieChartPropsType): IusePiePro => {
   const total = data.reduce((acc, item) => acc + item.value, 0)
   const animationDuration = props.animationDuration ?? defaultAnimationDuration
 
-  const [isAnimating, setIsAnimating] = useState(isAnimated)
-
-  useEffect(() => {
-    if (isAnimated) {
-      setIsAnimating(true)
-      setTimeout(() => setIsAnimating(false), animationDuration)
-    }
-  }, [])
-
-  let endAngleLocal = 0
+  //   let endAngleLocal = 0
 
   const addValues = (index: number) => {
     if (index < 0) return 0
@@ -69,7 +59,7 @@ export const usePiePro = (props: PieChartPropsType): IusePiePro => {
   ) => {
     const addedValue =
       addValues(index - 1) + (addInOnlyEnd ? 0 : additionalValue ?? 0)
-    let angle = (addedValue / total) * endAngleLocal + startAngle
+    let angle = (addedValue / total) * endAngle + startAngle
     const startInnerX = radius + Math.cos(angle) * innerRadius
     const startInnerY = radius - Math.sin(angle) * innerRadius
     const startOuterX = radius + Math.cos(angle) * radius
@@ -79,7 +69,7 @@ export const usePiePro = (props: PieChartPropsType): IusePiePro => {
       addValues(index - 1) +
       data[index].value +
       (addInOnlyStart ? 0 : additionalValue ?? 0)
-    angle = (value / total) * endAngleLocal + startAngle
+    angle = (value / total) * endAngle + startAngle
 
     const endOuterX = radius + Math.cos(angle) * radius
     const endOuterY = radius - Math.sin(angle) * radius
@@ -101,7 +91,7 @@ export const usePiePro = (props: PieChartPropsType): IusePiePro => {
 
   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) * endAngle + startAngle
 
     const labelPosition: LabelsPosition = labelPos || labelsPosition
 
@@ -227,16 +217,20 @@ export const usePiePro = (props: PieChartPropsType): IusePiePro => {
     return path
   }
 
-  const dInitial = data.map(
+  const dataForInitialPath = isAnimated
+    ? data
+    : [...data, { value: total * 100 }]
+  const dataForFinalPath = isAnimated ? data : [...data, { value: 0 }]
+
+  const dInitial = dataForInitialPath.map(
     (item, index) =>
       `${initial || getInitial(item)} ${
         donut ? getDonutPath(index, item) : getPath(index)
       }`
   )
 
-  endAngleLocal = endAngle
   initial = ''
-  const dFinal = data.map(
+  const dFinal = dataForFinalPath.map(
     (item, index) =>
       `${initial || getInitial(item)} ${
         donut ? getDonutPath(index, item) : getPath(index)
@@ -253,9 +247,9 @@ export const usePiePro = (props: PieChartPropsType): IusePiePro => {
     initial,
     dInitial,
     dFinal,
-    isAnimating,
     getStartCaps,
     getEndCaps,
-    getTextCoordinates
+    getTextCoordinates,
+    labelsPosition
   }
 }