gifted-charts-core 0.1.30 → 0.1.32

package/dist/LineChart/index.d.ts

@@ -374,6 +374,7 @@ export declare const useLineChart: (props: extendedLineChartPropsType) => {
     stripStrokeDashArray: number[] | undefined;
     unFocusOnPressOut: boolean;
     delayBeforeUnFocus: number;
+    containerHeightIncludingBelowXAxis: number;
     lineGradient: boolean;
     lineGradientDirection: string;
     lineGradientStartColor: string;

package/dist/LineChart/index.js

@@ -425,7 +425,7 @@ export var useLineChart = function (props) {
                         }
                     }
                     var xx = svgPath(pArray, (_d = set.curveType) !== null && _d !== void 0 ? _d : curveType, (_e = set.curvature) !== null && _e !== void 0 ? _e : curvature);
-                    pointsArray_1.push(getCurvePathWithSegments(xx, set.lineSegments, SEGMENT_START, SEGMENT_END));
+                    pointsArray_1.push(getCurvePathWithSegments(xx, set.lineSegments, SEGMENT_START, SEGMENT_END, curveType));
                     // For Arrow-
                     if (set.data.length > 1 && ((_f = set.showArrow) !== null && _f !== void 0 ? _f : props.showArrows)) {
                         var arrowTipY = pArray[pArray.length - 1][1];
@@ -474,7 +474,7 @@ export var useLineChart = function (props) {
                                 (initialSpacing + spacing * (set.data.length - 1)) +
                                 ' ' +
                                 heightUptoXaxis;
-                        ppp += 'L' + initialSpacing + ' ' + heightUptoXaxis + ' ';
+                        ppp += ' L' + initialSpacing + ' ' + heightUptoXaxis + ' ';
                         fillPointsArray_1.push(ppp.replace('L', 'M'));
                     }
                 }
@@ -598,7 +598,7 @@ export var useLineChart = function (props) {
                                 (initialSpacing + spacing * (data.length - 1)) +
                                 ' ' +
                                 heightUptoXaxis;
-                        ppp += 'L' + initialSpacing + ' ' + heightUptoXaxis + ' ';
+                        ppp += ' L' + initialSpacing + ' ' + heightUptoXaxis + ' ';
                         setFillPoints(ppp.replace('L', 'M'));
                     }
                     if ((areaChart !== null && areaChart !== void 0 ? areaChart : areaChart2) && data2.length > 0) {
@@ -609,7 +609,7 @@ export var useLineChart = function (props) {
                                 (initialSpacing + spacing * (data.length - 1)) +
                                 ' ' +
                                 heightUptoXaxis;
-                        ppp2 += 'L' + initialSpacing + ' ' + heightUptoXaxis + ' ';
+                        ppp2 += ' L' + initialSpacing + ' ' + heightUptoXaxis + ' ';
                         setFillPoints2(ppp2.replace('L', 'M'));
                     }
                     if ((areaChart !== null && areaChart !== void 0 ? areaChart : areaChart3) && data3.length > 0) {
@@ -620,7 +620,7 @@ export var useLineChart = function (props) {
                                 (initialSpacing + spacing * (data.length - 1)) +
                                 ' ' +
                                 heightUptoXaxis;
-                        ppp3 += 'L' + initialSpacing + ' ' + heightUptoXaxis + ' ';
+                        ppp3 += ' L' + initialSpacing + ' ' + heightUptoXaxis + ' ';
                         setFillPoints3(ppp3.replace('L', 'M'));
                     }
                     if ((areaChart !== null && areaChart !== void 0 ? areaChart : areaChart4) && data4.length > 0) {
@@ -631,7 +631,7 @@ export var useLineChart = function (props) {
                                 (initialSpacing + spacing * (data.length - 1)) +
                                 ' ' +
                                 heightUptoXaxis;
-                        ppp4 += 'L' + initialSpacing + ' ' + heightUptoXaxis + ' ';
+                        ppp4 += ' L' + initialSpacing + ' ' + heightUptoXaxis + ' ';
                         setFillPoints4(ppp4.replace('L', 'M'));
                     }
                     if ((areaChart !== null && areaChart !== void 0 ? areaChart : areaChart5) && data5.length > 0) {
@@ -642,7 +642,7 @@ export var useLineChart = function (props) {
                                 (initialSpacing + spacing * (data.length - 1)) +
                                 ' ' +
                                 heightUptoXaxis;
-                        ppp5 += 'L' + initialSpacing + ' ' + heightUptoXaxis + ' ';
+                        ppp5 += ' L' + initialSpacing + ' ' + heightUptoXaxis + ' ';
                         setFillPoints5(ppp5.replace('L', 'M'));
                     }
                 }
@@ -676,11 +676,11 @@ export var useLineChart = function (props) {
                 var xx3 = svgPath(p3Array, curveType, curvature);
                 var xx4 = svgPath(p4Array, curveType, curvature);
                 var xx5 = svgPath(p5Array, curveType, curvature);
-                setPoints(getCurvePathWithSegments(xx, lineSegments, SEGMENT_START, SEGMENT_END));
-                setPoints2(getCurvePathWithSegments(xx2, lineSegments2, SEGMENT_START, SEGMENT_END));
-                setPoints3(getCurvePathWithSegments(xx3, lineSegments3, SEGMENT_START, SEGMENT_END));
-                setPoints4(getCurvePathWithSegments(xx4, lineSegments4, SEGMENT_START, SEGMENT_END));
-                setPoints5(getCurvePathWithSegments(xx5, lineSegments5, SEGMENT_START, SEGMENT_END));
+                setPoints(getCurvePathWithSegments(xx, lineSegments, SEGMENT_START, SEGMENT_END, curveType));
+                setPoints2(getCurvePathWithSegments(xx2, lineSegments2, SEGMENT_START, SEGMENT_END, curveType));
+                setPoints3(getCurvePathWithSegments(xx3, lineSegments3, SEGMENT_START, SEGMENT_END, curveType));
+                setPoints4(getCurvePathWithSegments(xx4, lineSegments4, SEGMENT_START, SEGMENT_END, curveType));
+                setPoints5(getCurvePathWithSegments(xx5, lineSegments5, SEGMENT_START, SEGMENT_END, curveType));
                 if (data.length > 1 && ((_f = props.showArrow1) !== null && _f !== void 0 ? _f : props.showArrows)) {
                     var arrowTipY = p1Array[p1Array.length - 1][1];
                     var arrowTipX = p1Array[p1Array.length - 1][0];
@@ -833,7 +833,7 @@ export var useLineChart = function (props) {
                             (initialSpacing + spacing * (secondaryData.length - 1)) +
                             ' ' +
                             heightUptoXaxis;
-                    ppp += 'L' + initialSpacing + ' ' + heightUptoXaxis + ' ';
+                    ppp += ' L' + initialSpacing + ' ' + heightUptoXaxis + ' ';
                     setSecondaryFillPoints(ppp.replace('L', 'M'));
                 }
             }
@@ -871,6 +871,7 @@ export var useLineChart = function (props) {
     var stepHeight = (_237 = props.stepHeight) !== null && _237 !== void 0 ? _237 : containerHeight / noOfSections;
     var stepValue = (_238 = props.stepValue) !== null && _238 !== void 0 ? _238 : maxValue / noOfSections;
     var noOfSectionsBelowXAxis = (_239 = props.noOfSectionsBelowXAxis) !== null && _239 !== void 0 ? _239 : Math.round(Math.ceil(-mostNegativeValue / stepValue));
+    var containerHeightIncludingBelowXAxis = extendedContainerHeight + noOfSectionsBelowXAxis * stepHeight;
     var showXAxisIndices = (_240 = props.showXAxisIndices) !== null && _240 !== void 0 ? _240 : AxesAndRulesDefaults.showXAxisIndices;
     var xAxisIndicesHeight = (_241 = props.xAxisIndicesHeight) !== null && _241 !== void 0 ? _241 : AxesAndRulesDefaults.xAxisIndicesHeight;
     var xAxisIndicesWidth = (_242 = props.xAxisIndicesWidth) !== null && _242 !== void 0 ? _242 : AxesAndRulesDefaults.xAxisIndicesWidth;
@@ -881,7 +882,8 @@ export var useLineChart = function (props) {
     var showFractionalValues = (_246 = props.showFractionalValues) !== null && _246 !== void 0 ? _246 : AxesAndRulesDefaults.showFractionalValues;
     var horizontal = false;
     var yAxisAtTop = false;
-    defaultPointerConfig.pointerStripHeight = containerHeight;
+    defaultPointerConfig.pointerStripHeight =
+        containerHeight + noOfSectionsBelowXAxis * stepHeight;
     var pointerConfig = props.pointerConfig;
     var getPointerProps = (_247 = props.getPointerProps) !== null && _247 !== void 0 ? _247 : null;
     var pointerHeight = (_248 = pointerConfig === null || pointerConfig === void 0 ? void 0 : pointerConfig.height) !== null && _248 !== void 0 ? _248 : defaultPointerConfig.height;
@@ -1427,6 +1429,7 @@ export var useLineChart = function (props) {
         stripStrokeDashArray: stripStrokeDashArray,
         unFocusOnPressOut: unFocusOnPressOut,
         delayBeforeUnFocus: delayBeforeUnFocus,
+        containerHeightIncludingBelowXAxis: containerHeightIncludingBelowXAxis,
         lineGradient: lineGradient,
         lineGradientDirection: lineGradientDirection,
         lineGradientStartColor: lineGradientStartColor,

package/dist/PieChart/main.d.ts

@@ -55,9 +55,10 @@ export declare const getPieChartMainProps: (props: PieChartMainProps) => {
         labelComponentWidth: number;
         labelComponentHeight: number;
         labelComponentMargin: number;
+        avoidOverlappingOfLabels: boolean;
     };
     externalLabelComponent: ((item?: pieDataItem, index?: number) => any) | undefined;
-    getExternaLabelProperties: (item: pieDataItem, mx: number, my: number, cx: number, cy: number) => {
+    getExternaLabelProperties: (item: pieDataItem, mx: number, my: number, cx: number, cy: number, prevSide: string, prevLabelComponentX: number) => {
         labelLineColor: string;
         labelLineThickness: number;
         labelComponentHeight: number;
@@ -67,7 +68,9 @@ export declare const getPieChartMainProps: (props: PieChartMainProps) => {
         outY: number;
         finalX: number;
         labelComponentX: number;
+        labelComponentY: number;
         localExternalLabelComponent: null;
+        isRightHalf: boolean;
     } | {
         labelLineColor: import("react-native").ColorValue;
         labelLineThickness: number;
@@ -78,6 +81,8 @@ export declare const getPieChartMainProps: (props: PieChartMainProps) => {
         outY: number;
         finalX: number;
         labelComponentX: number;
+        labelComponentY: number;
         localExternalLabelComponent: ((item?: pieDataItem, index?: number) => any) | undefined;
+        isRightHalf: boolean;
     };
 };

package/dist/PieChart/main.js

@@ -36,7 +36,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 };
 import { defaultLabelLineConfig, emptyExternaLabelProperties, getTextSizeForPieLabels } from '../utils';
 export var getPieChartMainProps = function (props) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12;
     var isThreeD = props.isThreeD, isBiggerPie = props.isBiggerPie, paddingHorizontal = props.paddingHorizontal, paddingVertical = props.paddingVertical, extraRadius = props.extraRadius, showExternalLabels = props.showExternalLabels, externalLabelComponent = props.externalLabelComponent;
     var propData = props.data;
     var data = [];
@@ -79,9 +79,10 @@ export var getPieChartMainProps = function (props) {
         thickness: (_x = (_w = props.labelLineConfig) === null || _w === void 0 ? void 0 : _w.thickness) !== null && _x !== void 0 ? _x : defaultLabelLineConfig.thickness,
         labelComponentWidth: (_z = (_y = props.labelLineConfig) === null || _y === void 0 ? void 0 : _y.labelComponentWidth) !== null && _z !== void 0 ? _z : defaultLabelLineConfig.labelComponentWidth,
         labelComponentHeight: (_1 = (_0 = props.labelLineConfig) === null || _0 === void 0 ? void 0 : _0.labelComponentHeight) !== null && _1 !== void 0 ? _1 : defaultLabelLineConfig.labelComponentHeight,
-        labelComponentMargin: (_3 = (_2 = props.labelLineConfig) === null || _2 === void 0 ? void 0 : _2.labelComponentMargin) !== null && _3 !== void 0 ? _3 : defaultLabelLineConfig.labelComponentMargin
+        labelComponentMargin: (_3 = (_2 = props.labelLineConfig) === null || _2 === void 0 ? void 0 : _2.labelComponentMargin) !== null && _3 !== void 0 ? _3 : defaultLabelLineConfig.labelComponentMargin,
+        avoidOverlappingOfLabels: (_5 = (_4 = props.labelLineConfig) === null || _4 === void 0 ? void 0 : _4.avoidOverlappingOfLabels) !== null && _5 !== void 0 ? _5 : defaultLabelLineConfig.avoidOverlappingOfLabels
     };
-    var tiltAngle = (_4 = props.tiltAngle) !== null && _4 !== void 0 ? _4 : '55deg';
+    var tiltAngle = (_6 = props.tiltAngle) !== null && _6 !== void 0 ? _6 : '55deg';
     if (tiltAngle &&
         !isNaN(Number(tiltAngle)) &&
         !(tiltAngle + '').endsWith('deg')) {
@@ -93,12 +94,12 @@ export var getPieChartMainProps = function (props) {
         : donut || props.centerLabelComponent
             ? 'outward'
             : 'mid';
-    var showTextBackground = (_5 = props.showTextBackground) !== null && _5 !== void 0 ? _5 : false;
-    var textBackgroundColor = (_6 = props.textBackgroundColor) !== null && _6 !== void 0 ? _6 : 'white';
-    var showValuesAsLabels = (_7 = props.showValuesAsLabels) !== null && _7 !== void 0 ? _7 : false;
-    var showGradient = (_8 = props.showGradient) !== null && _8 !== void 0 ? _8 : false;
-    var gradientCenterColor = (_9 = props.gradientCenterColor) !== null && _9 !== void 0 ? _9 : 'white';
-    var toggleFocusOnPress = (_10 = props.toggleFocusOnPress) !== null && _10 !== void 0 ? _10 : true;
+    var showTextBackground = (_7 = props.showTextBackground) !== null && _7 !== void 0 ? _7 : false;
+    var textBackgroundColor = (_8 = props.textBackgroundColor) !== null && _8 !== void 0 ? _8 : 'white';
+    var showValuesAsLabels = (_9 = props.showValuesAsLabels) !== null && _9 !== void 0 ? _9 : false;
+    var showGradient = (_10 = props.showGradient) !== null && _10 !== void 0 ? _10 : false;
+    var gradientCenterColor = (_11 = props.gradientCenterColor) !== null && _11 !== void 0 ? _11 : 'white';
+    var toggleFocusOnPress = (_12 = props.toggleFocusOnPress) !== null && _12 !== void 0 ? _12 : true;
     var minShiftX = 0;
     var maxShiftX = 0;
     var minShiftY = 0;
@@ -143,7 +144,7 @@ export var getPieChartMainProps = function (props) {
         return pAcc + (acc - pAcc) / 2;
     });
     pData = __spreadArray([0], __read(pData), false);
-    var getExternaLabelProperties = function (item, mx, my, cx, cy) {
+    var getExternaLabelProperties = function (item, mx, my, cx, cy, prevSide, prevLabelComponentX) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
         if (!showExternalLabels)
             return emptyExternaLabelProperties;
@@ -162,17 +163,35 @@ export var getPieChartMainProps = function (props) {
         var outY = my + (isRightHalf ? yFactor : -yFactor);
         var inX = mx + (isRightHalf ? -xFactor : xFactor);
         var inY = my + (isRightHalf ? -yFactor : yFactor);
+        var labelComponentY = outY;
+        var side = isRightHalf ? 'right' : 'left';
+        var isOnPole = labelLineConfig.avoidOverlappingOfLabels &&
+            Math.abs(inX - outX) < 4 &&
+            side === prevSide;
         var finalX = isRightHalf ? cx * 2 + labelLineLength : -labelLineLength;
-        finalX = isRightHalf
-            ? finalX > outX
-                ? finalX
-                : outX
-            : finalX < outX
-                ? finalX
-                : outX;
+        if (isOnPole) {
+            finalX = outX;
+            labelComponentY += outY > cy ? 10 : -10;
+        }
+        else {
+            finalX = isRightHalf
+                ? finalX > outX
+                    ? finalX
+                    : outX
+                : finalX < outX
+                    ? finalX
+                    : outX;
+        }
         var labelComponentX = isRightHalf
-            ? finalX + labelComponentMargin
-            : finalX - labelComponentWidth - labelComponentMargin;
+            ? finalX + (isOnPole ? -10 : labelComponentMargin)
+            : finalX - labelComponentWidth - (isOnPole ? -20 : labelComponentMargin);
+        // In case both previous & current labels are at pole, then their labels might again overlap, to counter this, we vertically shift the current label
+        if (labelLineConfig.avoidOverlappingOfLabels &&
+            isOnPole &&
+            Math.abs(prevLabelComponentX - labelComponentX) < 30) {
+            labelComponentY += outY > cy ? 20 : -20;
+            outY += outY > cy ? 20 : -20;
+        }
         var localExternalLabelComponent = (_q = item.externalLabelComponent) !== null && _q !== void 0 ? _q : props.externalLabelComponent;
         return {
             labelLineColor: labelLineColor,
@@ -184,7 +203,9 @@ export var getPieChartMainProps = function (props) {
             outY: outY,
             finalX: finalX,
             labelComponentX: labelComponentX,
-            localExternalLabelComponent: localExternalLabelComponent
+            labelComponentY: labelComponentY,
+            localExternalLabelComponent: localExternalLabelComponent,
+            isRightHalf: isRightHalf
         };
     };
     return {

package/dist/components/common/types.d.ts

@@ -32,4 +32,5 @@ export interface StripAndLabelProps {
     screenWidth: number;
     isBarChart: boolean;
     pointerIndex: number;
+    containsNegative: boolean;
 }

package/dist/index.d.ts

@@ -34,6 +34,6 @@ export { type StripAndLabelProps } from './components/common/types';
 /***********************************************************************************************************************
 /*********************************          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 { 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, pointsWithPaddedRepititions } from './utils';
 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, CurveType, 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, Framework, type XAxisConfig, type LineInBarChartPropsType, type DataPointProps, type Linecap, type IntersectionAreaConfig, type LabelLineConfig } from './utils/types';

package/dist/index.js

@@ -29,6 +29,6 @@ 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 { 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, pointsWithPaddedRepititions } from './utils';
 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 { CurveType, EdgePosition, Framework } from './utils/types';

package/dist/utils/index.d.ts

@@ -10,11 +10,11 @@ export declare const svgQuadraticCurvePath: (points: number[][]) => string;
 export declare const svgPath: (points: number[][], curveType?: CurveType, curvature?: number) => string;
 export declare const bezierCommand: (point: number[], i: number, a: number[][], curvature: number) => string;
 export declare const getSegmentString: (lineSegment: LineSegment[] | undefined, index: number, startDelimeter: string, endDelimeter: string) => string;
-export declare const getCurvePathWithSegments: (path: string, lineSegment: LineSegment[] | undefined, startDelimeter: string, endDelimeter: string) => string;
+export declare const getCurvePathWithSegments: (path: string, lineSegment: LineSegment[] | undefined, startDelimeter: string, endDelimeter: string, curveType: CurveType) => string;
 export declare const getPreviousSegmentsLastPoint: (isCurved: boolean, previousSegment: string) => string;
 export declare const getPathWithHighlight: (data: lineDataItem[], i: number, highlightedRange: HighlightedRange, startIndex: number, endIndex: number, getX: (i: number) => number, getY: (value: number) => number) => string;
-export declare const getRegionPathObjects: (points: string, color: ColorValue, currentLineThickness: number, thickness: number, strokeDashArray: number[], isCurved: boolean, startDelimeter: string, stop: string, endDelimeter: string) => LineProperties[];
-export declare const getSegmentedPathObjects: (points: string, color: ColorValue, currentLineThickness: number, thickness: number, strokeDashArray: number[], isCurved: boolean, startDelimeter: string, endDelimeter: string) => LineProperties[];
+export declare const getRegionPathObjects: (points: string, color: ColorValue, currentLineThickness: number, thickness: number, strokeDashArray: number[], isCurved: boolean, startDelimeter: string, stop: string, endDelimeter: string, curveType: CurveType) => LineProperties[];
+export declare const getSegmentedPathObjects: (points: string, color: ColorValue, currentLineThickness: number, thickness: number, strokeDashArray: number[], isCurved: boolean, startDelimeter: string, endDelimeter: string, curveType: CurveType) => LineProperties[];
 export declare const getArrowPoints: (arrowTipX: number, arrowTipY: number, x1: number, y1: number, arrowLength?: number, arrowWidth?: number, showArrowBase?: boolean) => string;
 interface ReferenceLinesConfig {
     showReferenceLine1?: boolean;
@@ -109,7 +109,9 @@ export declare const emptyExternaLabelProperties: {
     outY: number;
     finalX: number;
     labelComponentX: number;
+    labelComponentY: number;
     localExternalLabelComponent: null;
+    isRightHalf: boolean;
 };
 export declare const defaultLabelLineConfig: {
     length: number;
@@ -119,5 +121,7 @@ export declare const defaultLabelLineConfig: {
     labelComponentWidth: number;
     labelComponentHeight: number;
     labelComponentMargin: number;
+    avoidOverlappingOfLabels: boolean;
 };
+export declare const pointsWithPaddedRepititions: (oldPoints: string, newPoints: string) => string[];
 export {};

package/dist/utils/index.js

@@ -87,21 +87,21 @@ export var svgQuadraticCurvePath = function (points) {
         var cpX1 = (xMid + points[i][0]) / 2;
         var cpX2 = (xMid + points[i + 1][0]) / 2;
         path +=
-            'Q ' +
+            ' Q ' +
                 cpX1 +
-                ', ' +
+                ',' +
                 points[i][1] +
                 ', ' +
                 xMid +
-                ', ' +
+                ',' +
                 yMid +
-                (' Q ' +
+                (' Q' +
                     cpX2 +
-                    ', ' +
+                    ',' +
                     points[i + 1][1] +
                     ', ' +
                     points[i + 1][0] +
-                    ', ' +
+                    ',' +
                     points[i + 1][1]);
     }
     return path;
@@ -157,15 +157,16 @@ export var getSegmentString = function (lineSegment, index, startDelimeter, endD
     var segment = lineSegment === null || lineSegment === void 0 ? void 0 : lineSegment.find(function (segment) { return segment.startIndex === index; });
     return segment ? startDelimeter + JSON.stringify(segment) + endDelimeter : '';
 };
-export var getCurvePathWithSegments = function (path, lineSegment, startDelimeter, endDelimeter) {
+export var getCurvePathWithSegments = function (path, lineSegment, startDelimeter, endDelimeter, curveType) {
     if (!(lineSegment === null || lineSegment === void 0 ? void 0 : lineSegment.length))
         return path;
+    var char = curveType === CurveType.QUADRATIC ? 'Q ' : 'C'; // space after Q is intentional, it signifies the first Q as their are 2 Qs equivalent to 1 C, and to counter this, we placed space after the 1st Q
     var newPath = '';
-    var pathArray = path.split('C');
+    var pathArray = path.split(char);
     var _loop_1 = function (i) {
         var segment = lineSegment === null || lineSegment === void 0 ? void 0 : lineSegment.find(function (segment) { return segment.startIndex === i; });
         newPath +=
-            (pathArray[i].startsWith('M') ? '' : 'C') +
+            (pathArray[i].startsWith('M') ? '' : char) +
                 pathArray[i] +
                 (segment ? startDelimeter + JSON.stringify(segment) + endDelimeter : '');
     };
@@ -286,10 +287,11 @@ export var getPathWithHighlight = function (data, i, highlightedRange, startInde
     }
     return path;
 };
-export var getRegionPathObjects = function (points, color, currentLineThickness, thickness, strokeDashArray, isCurved, startDelimeter, stop, endDelimeter) {
+export var getRegionPathObjects = function (points, color, currentLineThickness, thickness, strokeDashArray, isCurved, startDelimeter, stop, endDelimeter, curveType) {
     var _a, _b;
     var ar = [{ d: '', color: '', strokeWidth: 0 }];
     var tempStr = points;
+    var char = curveType === CurveType.QUADRATIC ? 'Q' : 'C';
     if (!points.startsWith(startDelimeter)) {
         /** ********************            line upto first segment                 *****************/
         var lineSvgProps = {
@@ -326,7 +328,7 @@ export var getRegionPathObjects = function (points, color, currentLineThickness,
         var stringUptoNextSegment = tempStr.substring(0, nextDelimiterIndex);
         /** ********************            line upto the next segment            *****************/
         if (nextDelimiterIndex !== -1 &&
-            stringUptoNextSegment.includes(isCurved ? 'C' : 'L')) {
+            stringUptoNextSegment.includes(isCurved ? char : 'L')) {
             var previousSegment_1 = ar[ar.length - 1].d;
             var moveToLastPointOfPreviousSegment_1 = getPreviousSegmentsLastPoint(isCurved, previousSegment_1);
             var lineSvgProps_1 = {
@@ -357,10 +359,11 @@ export var getRegionPathObjects = function (points, color, currentLineThickness,
     ar.shift();
     return ar;
 };
-export var getSegmentedPathObjects = function (points, color, currentLineThickness, thickness, strokeDashArray, isCurved, startDelimeter, endDelimeter) {
+export var getSegmentedPathObjects = function (points, color, currentLineThickness, thickness, strokeDashArray, isCurved, startDelimeter, endDelimeter, curveType) {
     var _a, _b;
     var ar = [{ d: '', color: '', strokeWidth: 0 }];
     var tempStr = points;
+    var char = curveType === CurveType.QUADRATIC ? 'Q' : 'C';
     if (!points.startsWith(startDelimeter)) {
         /** ********************            line upto first segment                 *****************/
         var lineSvgProps = {
@@ -385,13 +388,21 @@ export var getSegmentedPathObjects = function (points, color, currentLineThickne
         var s = 0;
         var i = void 0;
         for (i = 0; i < segment.length; i++) {
-            if (segment[i] === (isCurved ? 'C' : 'L'))
-                c++;
-            if (c === segmentLength) {
+            if (segment[i] === (isCurved ? char : 'L')) {
+                if (curveType === CurveType.QUADRATIC) {
+                    if (segment[i + 1] == ' ')
+                        c++;
+                }
+                else {
+                    c++;
+                }
+            }
+            if (c >= segmentLength) {
                 if (segment[i] === ' ')
                     s++;
-                if (s === (isCurved ? 3 : 2))
+                if (s === (isCurved ? (char === 'Q' ? 5 : 3) : 2)) {
                     break;
+                }
             }
         }
         segment = segment.substring(0, i);
@@ -412,7 +423,7 @@ export var getSegmentedPathObjects = function (points, color, currentLineThickne
         var stringUptoNextSegment = tempStr.substring(0, nextDelimiterIndex);
         /** ********************            line upto the next segment            *****************/
         if (nextDelimiterIndex !== -1 &&
-            stringUptoNextSegment.includes(isCurved ? 'C' : 'L')) {
+            stringUptoNextSegment.includes(isCurved ? char : 'L')) {
             var previousSegment_2 = ar[ar.length - 1].d;
             var moveToLastPointOfPreviousSegment_2 = getPreviousSegmentsLastPoint(isCurved, previousSegment_2);
             var lineSvgProps_2 = {
@@ -1033,7 +1044,9 @@ export var emptyExternaLabelProperties = {
     outY: 0,
     finalX: 0,
     labelComponentX: 0,
-    localExternalLabelComponent: null
+    labelComponentY: 0,
+    localExternalLabelComponent: null,
+    isRightHalf: false
 };
 export var defaultLabelLineConfig = {
     length: 10,
@@ -1042,5 +1055,114 @@ export var defaultLabelLineConfig = {
     thickness: 1,
     labelComponentWidth: 20,
     labelComponentHeight: 10,
-    labelComponentMargin: 4
+    labelComponentMargin: 4,
+    avoidOverlappingOfLabels: true
+};
+var secondLastIndexOf = function (text, seq) {
+    // assuming seq is a single char
+    var strCopy = text;
+    var lastIndex = strCopy.lastIndexOf(seq);
+    strCopy =
+        strCopy.substring(0, lastIndex) + 'x' + strCopy.substring(lastIndex + 1);
+    return strCopy.lastIndexOf(seq);
+};
+var thirdLastIndexOf = function (text, seq) {
+    // assuming seq is a single char
+    var strCopy = text;
+    var lastIndex = strCopy.lastIndexOf(seq);
+    strCopy =
+        strCopy.substring(0, lastIndex) + 'x' + strCopy.substring(lastIndex + 1);
+    lastIndex = strCopy.lastIndexOf(seq);
+    strCopy =
+        strCopy.substring(0, lastIndex) + 'x' + strCopy.substring(lastIndex + 1);
+    return strCopy.lastIndexOf(seq);
+};
+export var pointsWithPaddedRepititions = function (oldPoints, newPoints) {
+    /*
+     **          Handles these cases-
+     **
+     **          1. Straight line chart
+     **          2. Curved Line chart
+     **          3. Straight Area chart -> we need to repeatedly add the 3rd last substring from the points array which represents the last point
+     **          4. Curved Area chart -> we need to repeatedly add the 3nd last substring (the 2 last substrings start with L while the 3rd last will start with C) from the points array which represents the last point
+     */
+    var oldPointsCopy = oldPoints.trim();
+    var newPointsCopy = newPoints.trim();
+    var char = oldPointsCopy.indexOf('C') === -1 ? 'L' : 'C';
+    var oldPointsCopyAr = oldPointsCopy.split(char);
+    var newPointsCopyAr = newPointsCopy.split(char);
+    var oldPointsCopyLen = oldPointsCopyAr.length - 1;
+    var newPointsCopyLen = newPointsCopyAr.length - 1;
+    var diff = Math.abs(oldPointsCopyLen - newPointsCopyLen);
+    var lastSequence = oldPointsCopyLen < newPointsCopyLen
+        ? oldPointsCopyAr[oldPointsCopyLen].trim()
+        : newPointsCopyAr[newPointsCopyLen].trim();
+    var indexOfL = lastSequence.indexOf('L');
+    var isCurvedAreaChart = char === 'C' && indexOfL !== -1;
+    var isStraightAreaChart = !isCurvedAreaChart &&
+        oldPointsCopyAr[0].substring(1).trim() ===
+            oldPointsCopyAr[oldPointsCopyLen].trim();
+    var repeats = isCurvedAreaChart
+        ? lastSequence.substring(0, indexOfL)
+        : isStraightAreaChart
+            ? oldPointsCopyLen < newPointsCopyLen
+                ? oldPointsCopyAr[oldPointsCopyLen - 2]
+                : newPointsCopyAr[newPointsCopyLen - 2]
+            : lastSequence;
+    repeats = char + (repeats === null || repeats === void 0 ? void 0 : repeats.trim());
+    if (isCurvedAreaChart) {
+        if (oldPointsCopyLen < newPointsCopyLen) {
+            oldPointsCopy = oldPointsCopy
+                .substring(0, secondLastIndexOf(oldPointsCopy, 'L'))
+                .trim();
+        }
+        else {
+            newPointsCopy = newPointsCopy
+                .substring(0, secondLastIndexOf(newPointsCopy, 'L'))
+                .trim();
+        }
+    }
+    if (isStraightAreaChart) {
+        if (oldPointsCopyLen < newPointsCopyLen) {
+            oldPointsCopy = oldPointsCopy
+                .substring(0, thirdLastIndexOf(oldPointsCopy, 'L'))
+                .trim();
+        }
+        else {
+            newPointsCopy = newPointsCopy
+                .substring(0, thirdLastIndexOf(newPointsCopy, 'L'))
+                .trim();
+        }
+    }
+    for (var i = 0; i < diff; i++) {
+        if (oldPointsCopyLen < newPointsCopyLen) {
+            oldPointsCopy += " ".concat(repeats);
+        }
+        else {
+            newPointsCopy += " ".concat(repeats);
+        }
+    }
+    oldPointsCopy = oldPointsCopy.trim();
+    newPointsCopy = newPointsCopy.trim();
+    if (isCurvedAreaChart) {
+        if (oldPointsCopyLen < newPointsCopyLen) {
+            oldPointsCopy +=
+                ' ' + oldPoints.substring(secondLastIndexOf(oldPoints, 'L'));
+        }
+        else {
+            newPointsCopy +=
+                ' ' + newPoints.substring(secondLastIndexOf(newPoints, 'L'));
+        }
+    }
+    if (isStraightAreaChart) {
+        if (oldPointsCopyLen < newPointsCopyLen) {
+            oldPointsCopy +=
+                ' ' + oldPoints.substring(thirdLastIndexOf(oldPoints, 'L'));
+        }
+        else {
+            newPointsCopy +=
+                ' ' + newPoints.substring(thirdLastIndexOf(newPoints, 'L'));
+        }
+    }
+    return [oldPointsCopy.trim(), newPointsCopy.trim()];
 };

package/dist/utils/types.d.ts

@@ -413,5 +413,6 @@ export interface LabelLineConfig {
     labelComponentWidth?: number;
     labelComponentHeight?: number;
     labelComponentMargin?: number;
+    avoidOverlappingOfLabels?: boolean;
 }
 export {};

package/package.json

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