gifted-charts-core 0.0.50 → 0.1.0

package/package.json

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

package/src/PieChart/pro.js

@@ -26,17 +26,18 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 import { defaultAnimationDuration } from '../utils/constants';
 export var usePiePro = function (props) {
     var _a, _b;
-    var data = props.data, isAnimated = props.isAnimated, donut = props.donut, semiCircle = props.semiCircle, _c = props.radius, radius = _c === void 0 ? 120 : _c, _d = props.innerRadius, innerRadius = _d === void 0 ? radius / 2.5 : _d, _e = props.strokeWidth, strokeWidth = _e === void 0 ? 0 : _e, _f = props.edgesRadius, edgesRadius = _f === void 0 ? 0 : _f, _g = props.startAngle, startAngle = _g === void 0 ? 0 : _g;
+    var data = props.data, isAnimated = props.isAnimated, donut = props.donut, semiCircle = props.semiCircle, _c = props.radius, radius = _c === void 0 ? 120 : _c, _d = props.innerRadius, innerRadius = _d === void 0 ? donut ? radius / 2.5 : 0 : _d, _e = props.strokeWidth, strokeWidth = _e === void 0 ? 0 : _e, _f = props.edgesRadius, edgesRadius = _f === void 0 ? 0 : _f, _g = props.startAngle, startAngle = _g === void 0 ? 0 : _g;
     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 total = data.reduce(function (acc, item) { return acc + (item === null || item === void 0 ? void 0 : item.value); }, 0);
     var animationDuration = (_b = props.animationDuration) !== null && _b !== void 0 ? _b : defaultAnimationDuration;
     //   let endAngleLocal = 0
     var addValues = function (index) {
+        var _a;
         if (index < 0)
             return 0;
         var sum = 0;
         for (var i = 0; i <= index; i++)
-            sum += data[i].value;
+            sum += (_a = data[i]) === null || _a === void 0 ? void 0 : _a.value;
         return sum;
     };
     var labelsPosition = props.labelsPosition
@@ -44,17 +45,18 @@ 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 _a;
         var addedValue = addValues(index - 1) + (addInOnlyEnd ? 0 : additionalValue !== null && additionalValue !== void 0 ? additionalValue : 0);
-        var angle = (addedValue / total) * endAngle + 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;
         var startOuterY = radius - Math.sin(angle) * radius;
         var value = addValues(index - 1) +
-            data[index].value +
+            ((_a = data[index]) === null || _a === void 0 ? void 0 : _a.value) +
             (addInOnlyStart ? 0 : additionalValue !== null && additionalValue !== void 0 ? additionalValue : 0);
-        angle = (value / total) * endAngle + 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;
@@ -71,7 +73,8 @@ export var usePiePro = function (props) {
         };
     };
     var getTextCoordinates = function (index, labelPos) {
-        var value = addValues(index - 1) + data[index].value / 2;
+        var _a;
+        var value = addValues(index - 1) + ((_a = data[index]) === null || _a === void 0 ? void 0 : _a.value) / 2;
         var angle = (value / total) * endAngle + startAngle;
         var labelPosition = labelPos || labelsPosition;
         var x = radius +
@@ -104,17 +107,21 @@ export var usePiePro = function (props) {
         }
         return "M".concat(radius + innerRadius, ",").concat(radius, " h").concat(radius - innerRadius, " ");
     };
-    var getPath = function (index) {
-        var _a;
-        var _b = getCoordinates(index), endOuterX = _b.endOuterX, endOuterY = _b.endOuterY;
-        var isLargeArc = data[index].value / 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 getPath = function (index, totalParam) {
+        var _a, _b;
+        var _c = getCoordinates(index, 0, false, false, totalParam), endOuterX = _c.endOuterX, endOuterY = _c.endOuterY;
+        var isLargeArc = semiCircle
+            ? 0
+            : ((_a = data[index]) === null || _a === void 0 ? void 0 : _a.value) / (totalParam !== null && totalParam !== void 0 ? totalParam : total) > 0.5
+                ? 1
+                : 0;
+        var arc = "A".concat(radius + ((_b = props.strokeWidth) !== null && _b !== void 0 ? _b : 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 _a;
+    var getDonutPath = function (index, item, totalParam) {
+        var _a, _b;
         var additionalForStart = item.isStartEdgeCurved || item.startEdgeRadius
             ? (radius - innerRadius) / (radius / 20)
             : 0;
@@ -123,10 +130,10 @@ 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 _c = getCoordinates(index, cropAtEnd ? additionalForEnd : additionalForStart, !cropAtEnd, cropAtEnd, totalParam), startInnerX = _c.startInnerX, startInnerY = _c.startInnerY, endOuterX = _c.endOuterX, endOuterY = _c.endOuterY, endInnerX = _c.endInnerX, endInnerY = _c.endInnerY;
+        var isLargeArc = ((_a = data[index]) === null || _a === void 0 ? void 0 : _a.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 outerArc = "A".concat(radius + ((_b = props.strokeWidth) !== null && _b !== void 0 ? _b : 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);
         initial = "M".concat(endInnerX, ",").concat(endInnerY, " L").concat(endOuterX, ",").concat(endOuterY, " ");
         return path;
@@ -158,7 +165,9 @@ export var usePiePro = function (props) {
         : __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));
+        return "".concat(initial || getInitial(item), " ").concat(donut
+            ? getDonutPath(index, item, total * 101)
+            : getPath(index, total * 101));
     });
     initial = '';
     var dFinal = dataForFinalPath.map(function (item, index) {

package/src/PieChart/pro.ts

@@ -28,13 +28,13 @@ export const usePiePro = (props: PieChartPropsType): IusePiePro => {
     donut,
     semiCircle,
     radius = 120,
-    innerRadius = radius / 2.5,
+    innerRadius = donut ? radius / 2.5 : 0,
     strokeWidth = 0,
     edgesRadius = 0,
     startAngle = 0
   } = props
   let endAngle = props.endAngle ?? startAngle + Math.PI * (semiCircle ? 1 : 2)
-  const total = data.reduce((acc, item) => acc + item.value, 0)
+  const total = data.reduce((acc, item) => acc + item?.value, 0)
   const animationDuration = props.animationDuration ?? defaultAnimationDuration
 
   //   let endAngleLocal = 0
@@ -42,7 +42,7 @@ export const usePiePro = (props: PieChartPropsType): IusePiePro => {
   const addValues = (index: number) => {
     if (index < 0) return 0
     let sum = 0
-    for (let i = 0; i <= index; i++) sum += data[i].value
+    for (let i = 0; i <= index; i++) sum += data[i]?.value
     return sum
   }
   const labelsPosition = props.labelsPosition
@@ -55,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) * endAngle + 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
@@ -67,9 +68,9 @@ export const usePiePro = (props: PieChartPropsType): IusePiePro => {
 
     const value =
       addValues(index - 1) +
-      data[index].value +
+      data[index]?.value +
       (addInOnlyStart ? 0 : additionalValue ?? 0)
-    angle = (value / total) * endAngle + startAngle
+    angle = (value / (totalParam ?? total)) * endAngle + startAngle
 
     const endOuterX = radius + Math.cos(angle) * radius
     const endOuterY = radius - Math.sin(angle) * radius
@@ -90,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 value = addValues(index - 1) + data[index]?.value / 2
     const angle = (value / total) * endAngle + startAngle
 
     const labelPosition: LabelsPosition = labelPos || labelsPosition
@@ -131,10 +132,20 @@ 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 = semiCircle
+      ? 0
+      : data[index]?.value / (totalParam ?? total) > 0.5
+      ? 1
+      : 0
 
     const arc = `A${
       radius + (props.strokeWidth ?? 0) / 2
@@ -146,7 +157,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)
@@ -172,10 +187,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${
@@ -225,7 +241,9 @@ export const usePiePro = (props: PieChartPropsType): IusePiePro => {
   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)
       }`
   )
 

package/src/index.d.ts

@@ -34,5 +34,5 @@ export { getTopAndLeftForStripAndLabel } from './components/common/StripAndLabel
 /*********************************          common utils, constants and types           ********************************
 /***********************************************************************************************************************/
 export { getCumulativeWidth, getLighterColor, svgQuadraticCurvePath, svgPath, bezierCommand, getSegmentString, getCurvePathWithSegments, getPreviousSegmentsLastPoint, getPathWithHighlight, getRegionPathObjects, getSegmentedPathObjects, getArrowPoints, getAxesAndRulesProps, getExtendedContainerHeightWithPadding, getSecondaryDataWithOffsetIncluded, getArrowProperty, getAllArrowProperties, maxAndMinUtil, computeMaxAndMinItems, getLabelTextUtil, getXForLineInBar, getYForLineInBar, clone, getLineConfigForBarChart, adjustToOffset } from './utils';
-export { chartTypes, yAxisSides, loc, SEGMENT_START, SEGMENT_END, RANGE_ENTER, RANGE_EXIT, STOP, ruleTypes, AxesAndRulesDefaults, defaultArrowConfig, BarDefaults, defaultLineConfig, LineDefaults, defaultPointerConfig, pieColors, populationDefaults } from './utils/constants';
+export { chartTypes, yAxisSides, loc, SEGMENT_START, SEGMENT_END, RANGE_ENTER, RANGE_EXIT, STOP, ruleTypes, AxesAndRulesDefaults, defaultArrowConfig, BarDefaults, defaultLineConfig, LineDefaults, defaultPointerConfig, pieColors, populationDefaults, defaultAnimationDuration } from './utils/constants';
 export { type RuleType, type RuleTypes, type RulesConfig, type CurveType, type EdgePosition, type LabelsPosition, type PointerEvents, type secondaryYAxisType, type secondaryLineConfigType, type referenceConfigType, type arrowConfigType, type horizSectionPropTypes, type HorizSectionsType, type BarAndLineChartsWrapperTypes, type Pointer, type HighlightedRange, type LineSegment, type LineSvgProps, type LineProperties, type DataSet, type Framework } from './utils/types';

package/src/index.js

@@ -30,4 +30,4 @@ export { getTopAndLeftForStripAndLabel } from './components/common/StripAndLabel
 /*********************************          common utils, constants and types           ********************************
 /***********************************************************************************************************************/
 export { getCumulativeWidth, getLighterColor, svgQuadraticCurvePath, svgPath, bezierCommand, getSegmentString, getCurvePathWithSegments, getPreviousSegmentsLastPoint, getPathWithHighlight, getRegionPathObjects, getSegmentedPathObjects, getArrowPoints, getAxesAndRulesProps, getExtendedContainerHeightWithPadding, getSecondaryDataWithOffsetIncluded, getArrowProperty, getAllArrowProperties, maxAndMinUtil, computeMaxAndMinItems, getLabelTextUtil, getXForLineInBar, getYForLineInBar, clone, getLineConfigForBarChart, adjustToOffset } from './utils';
-export { chartTypes, yAxisSides, loc, SEGMENT_START, SEGMENT_END, RANGE_ENTER, RANGE_EXIT, STOP, ruleTypes, AxesAndRulesDefaults, defaultArrowConfig, BarDefaults, defaultLineConfig, LineDefaults, defaultPointerConfig, pieColors, populationDefaults } from './utils/constants';
+export { chartTypes, yAxisSides, loc, SEGMENT_START, SEGMENT_END, RANGE_ENTER, RANGE_EXIT, STOP, ruleTypes, AxesAndRulesDefaults, defaultArrowConfig, BarDefaults, defaultLineConfig, LineDefaults, defaultPointerConfig, pieColors, populationDefaults, defaultAnimationDuration } from './utils/constants';

package/src/index.ts

@@ -120,7 +120,8 @@ export {
   LineDefaults,
   defaultPointerConfig,
   pieColors,
-  populationDefaults
+  populationDefaults,
+  defaultAnimationDuration
 } from './utils/constants'
 
 export {