gifted-charts-core 0.0.49 → 0.0.51

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gifted-charts-core",
-  "version": "0.0.49",
+  "version": "0.0.51",
   "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,7 +10,6 @@ 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) => {

package/src/PieChart/pro.js

@@ -1,3 +1,28 @@
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
+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;
@@ -5,7 +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 endAngleLocal = 0;
+    //   let endAngleLocal = 0
     var addValues = function (index) {
         if (index < 0)
             return 0;
@@ -19,9 +44,9 @@ export var usePiePro = function (props) {
         : donut || props.centerLabelComponent
             ? 'outward'
             : 'mid';
-    var getCoordinates = function (index, additionalValue, addInOnlyStart, addInOnlyEnd) {
+    var getCoordinates = function (index, additionalValue, addInOnlyStart, addInOnlyEnd, totalParam) {
         var addedValue = addValues(index - 1) + (addInOnlyEnd ? 0 : additionalValue !== null && additionalValue !== void 0 ? additionalValue : 0);
-        var angle = (addedValue / total) * endAngleLocal + startAngle;
+        var angle = (addedValue / (totalParam !== null && totalParam !== void 0 ? totalParam : total)) * endAngle + startAngle;
         var startInnerX = radius + Math.cos(angle) * innerRadius;
         var startInnerY = radius - Math.sin(angle) * innerRadius;
         var startOuterX = radius + Math.cos(angle) * radius;
@@ -29,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 / (totalParam !== null && totalParam !== void 0 ? totalParam : total)) * endAngle + startAngle;
         var endOuterX = radius + Math.cos(angle) * radius;
         var endOuterY = radius - Math.sin(angle) * radius;
         var endInnerX = radius + Math.cos(angle) * innerRadius;
@@ -47,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) *
@@ -79,16 +104,16 @@ export var usePiePro = function (props) {
         }
         return "M".concat(radius + innerRadius, ",").concat(radius, " h").concat(radius - innerRadius, " ");
     };
-    var getPath = function (index) {
+    var getPath = function (index, totalParam) {
         var _a;
-        var _b = getCoordinates(index), endOuterX = _b.endOuterX, endOuterY = _b.endOuterY;
-        var isLargeArc = data[index].value / total > 0.5 ? 1 : 0;
+        var _b = getCoordinates(index, 0, false, false, totalParam), endOuterX = _b.endOuterX, endOuterY = _b.endOuterY;
+        var isLargeArc = data[index].value / (totalParam !== null && totalParam !== void 0 ? totalParam : total) > 0.5 ? 1 : 0;
         var arc = "A".concat(radius + ((_a = props.strokeWidth) !== null && _a !== void 0 ? _a : 0) / 2, ",").concat(radius, " 0 ").concat(isLargeArc, " 0 ");
         var path = "".concat(arc, " ").concat(endOuterX, ", ").concat(endOuterY, "\n      L").concat(radius, ",").concat(radius, " ");
         initial = "M".concat(radius, ",").concat(radius, " L").concat(endOuterX, ",").concat(endOuterY);
         return path;
     };
-    var getDonutPath = function (index, item) {
+    var getDonutPath = function (index, item, totalParam) {
         var _a;
         var additionalForStart = item.isStartEdgeCurved || item.startEdgeRadius
             ? (radius - innerRadius) / (radius / 20)
@@ -98,8 +123,8 @@ export var usePiePro = function (props) {
             : 0;
         var cropAtEnd = !!(index === data.length - 1 &&
             (item.isEndEdgeCurved || item.endEdgeRadius));
-        var _b = getCoordinates(index, cropAtEnd ? additionalForEnd : additionalForStart, !cropAtEnd, cropAtEnd), startInnerX = _b.startInnerX, startInnerY = _b.startInnerY, endOuterX = _b.endOuterX, endOuterY = _b.endOuterY, endInnerX = _b.endInnerX, endInnerY = _b.endInnerY;
-        var isLargeArc = data[index].value / total > 0.5 ? 1 : 0;
+        var _b = getCoordinates(index, cropAtEnd ? additionalForEnd : additionalForStart, !cropAtEnd, cropAtEnd, totalParam), startInnerX = _b.startInnerX, startInnerY = _b.startInnerY, endOuterX = _b.endOuterX, endOuterY = _b.endOuterY, endInnerX = _b.endInnerX, endInnerY = _b.endInnerY;
+        var isLargeArc = data[index].value / (totalParam !== null && totalParam !== void 0 ? totalParam : total) > 0.5 ? 1 : 0;
         var innerArc = "A".concat(innerRadius, ",").concat(innerRadius, " 0 ").concat(isLargeArc, " 1 ");
         var outerArc = "A".concat(radius + ((_a = props.strokeWidth) !== null && _a !== void 0 ? _a : 0) / 2, ",").concat(radius, " 0 ").concat(isLargeArc, " 0 ");
         var path = "".concat(outerArc, " ").concat(endOuterX, ", ").concat(endOuterY, "\n      L").concat(endInnerX, ",").concat(endInnerY, " M").concat(endInnerX, ",").concat(endInnerY, " ").concat(innerArc, " ").concat(startInnerX, ",").concat(startInnerY);
@@ -128,12 +153,17 @@ 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) {
-        return "".concat(initial || getInitial(item), " ").concat(donut ? getDonutPath(index, item) : getPath(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, total * 101)
+            : getPath(index, total * 101));
     });
-    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 {

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,7 +12,6 @@ interface IusePiePro {
   initial: string
   dInitial: string[]
   dFinal: string[]
-  isAnimating?: boolean
   getStartCaps: (index: number, item: pieDataItem) => string
   getEndCaps: (index: number, item: pieDataItem) => string
   getTextCoordinates: (
@@ -39,7 +37,7 @@ export const usePiePro = (props: PieChartPropsType): IusePiePro => {
   const total = data.reduce((acc, item) => acc + item.value, 0)
   const animationDuration = props.animationDuration ?? defaultAnimationDuration
 
-  let endAngleLocal = 0
+  //   let endAngleLocal = 0
 
   const addValues = (index: number) => {
     if (index < 0) return 0
@@ -57,11 +55,12 @@ export const usePiePro = (props: PieChartPropsType): IusePiePro => {
     index: number,
     additionalValue?: number,
     addInOnlyStart?: boolean,
-    addInOnlyEnd?: boolean
+    addInOnlyEnd?: boolean,
+    totalParam?: number
   ) => {
     const addedValue =
       addValues(index - 1) + (addInOnlyEnd ? 0 : additionalValue ?? 0)
-    let angle = (addedValue / total) * endAngleLocal + startAngle
+    let angle = (addedValue / (totalParam ?? total)) * endAngle + startAngle
     const startInnerX = radius + Math.cos(angle) * innerRadius
     const startInnerY = radius - Math.sin(angle) * innerRadius
     const startOuterX = radius + Math.cos(angle) * radius
@@ -71,7 +70,7 @@ export const usePiePro = (props: PieChartPropsType): IusePiePro => {
       addValues(index - 1) +
       data[index].value +
       (addInOnlyStart ? 0 : additionalValue ?? 0)
-    angle = (value / total) * endAngleLocal + startAngle
+    angle = (value / (totalParam ?? total)) * endAngle + startAngle
 
     const endOuterX = radius + Math.cos(angle) * radius
     const endOuterY = radius - Math.sin(angle) * radius
@@ -93,7 +92,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
 
@@ -133,10 +132,16 @@ export const usePiePro = (props: PieChartPropsType): IusePiePro => {
     }
     return `M${radius + innerRadius},${radius} h${radius - innerRadius} `
   }
-  const getPath = (index: number) => {
-    const { endOuterX, endOuterY } = getCoordinates(index)
+  const getPath = (index: number, totalParam?: number) => {
+    const { endOuterX, endOuterY } = getCoordinates(
+      index,
+      0,
+      false,
+      false,
+      totalParam
+    )
 
-    const isLargeArc = data[index].value / total > 0.5 ? 1 : 0
+    const isLargeArc = data[index].value / (totalParam ?? total) > 0.5 ? 1 : 0
 
     const arc = `A${
       radius + (props.strokeWidth ?? 0) / 2
@@ -148,7 +153,11 @@ export const usePiePro = (props: PieChartPropsType): IusePiePro => {
 
     return path
   }
-  const getDonutPath = (index: number, item: pieDataItem) => {
+  const getDonutPath = (
+    index: number,
+    item: pieDataItem,
+    totalParam?: number
+  ) => {
     const additionalForStart =
       item.isStartEdgeCurved || item.startEdgeRadius
         ? (radius - innerRadius) / (radius / 20)
@@ -174,10 +183,11 @@ export const usePiePro = (props: PieChartPropsType): IusePiePro => {
       index,
       cropAtEnd ? additionalForEnd : additionalForStart,
       !cropAtEnd,
-      cropAtEnd
+      cropAtEnd,
+      totalParam
     )
 
-    const isLargeArc = data[index].value / total > 0.5 ? 1 : 0
+    const isLargeArc = data[index].value / (totalParam ?? total) > 0.5 ? 1 : 0
 
     const innerArc = `A${innerRadius},${innerRadius} 0 ${isLargeArc} 1 `
     const outerArc = `A${
@@ -219,16 +229,22 @@ 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)
+        donut
+          ? getDonutPath(index, item, total * 101)
+          : getPath(index, total * 101)
       }`
   )
 
-  endAngleLocal = endAngle
   initial = ''
-  const dFinal = data.map(
+  const dFinal = dataForFinalPath.map(
     (item, index) =>
       `${initial || getInitial(item)} ${
         donut ? getDonutPath(index, item) : getPath(index)