gifted-charts-core 0.1.34 → 0.1.35

package/dist/LineChart/types.d.ts

@@ -298,6 +298,7 @@ export interface LineChartPropsType {
     onMomentumScrollEnd?: Function;
     showDataPointsForMissingValues?: boolean;
     interpolateMissingValues?: boolean;
+    extrapolateMissingValues?: boolean;
     onlyPositive?: boolean;
     parentWidth?: number;
     onChartAreaPress?: (event: GestureResponderEvent) => void;

package/dist/components/BarAndLineChartsWrapper/getHorizSectionsVals.js

@@ -1,7 +1,7 @@
 import { AxesAndRulesDefaults } from '../../utils/constants';
 import { getLabelTextUtil } from '../../utils';
 export var getHorizSectionVals = 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, _11, _12, _13, _14;
+    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, _13, _14, _15;
     var width = props.width, noOfSectionsBelowXAxis = props.noOfSectionsBelowXAxis, totalWidth = props.totalWidth, endSpacing = props.endSpacing, yAxisSide = props.yAxisSide, noOfSections = props.noOfSections, yAxisLabelWidth = props.yAxisLabelWidth, yAxisLabelContainerStyle = props.yAxisLabelContainerStyle, yAxisThickness = props.yAxisThickness, yAxisColor = props.yAxisColor, yAxisExtraHeight = props.yAxisExtraHeight, trimYAxisAtTop = props.trimYAxisAtTop, dashWidth = props.dashWidth, dashGap = props.dashGap, rulesType = props.rulesType, rulesThickness = props.rulesThickness, spacing = props.spacing, showYAxisIndices = props.showYAxisIndices, yAxisIndicesHeight = props.yAxisIndicesHeight, yAxisIndicesWidth = props.yAxisIndicesWidth, yAxisIndicesColor = props.yAxisIndicesColor, hideOrigin = props.hideOrigin, hideYAxisText = props.hideYAxisText, showFractionalValues = props.showFractionalValues, yAxisTextNumberOfLines = props.yAxisTextNumberOfLines, yAxisLabelPrefix = props.yAxisLabelPrefix, yAxisLabelSuffix = props.yAxisLabelSuffix, yAxisTextStyle = props.yAxisTextStyle, containerHeight = props.containerHeight, maxValue = props.maxValue, referenceLinesConfig = props.referenceLinesConfig, yAxisLabelTexts = props.yAxisLabelTexts, stepValue = props.stepValue, negativeStepValue = props.negativeStepValue, roundToDigits = props.roundToDigits, yAxisOffset = props.yAxisOffset, formatYLabel = props.formatYLabel, secondaryMaxItem = props.secondaryMaxItem, secondaryMinItem = props.secondaryMinItem, secondaryYAxis = props.secondaryYAxis, secondaryStepValue = props.secondaryStepValue, secondaryNegativeStepValue = props.secondaryNegativeStepValue, secondaryNoOfSectionsBelowXAxis = props.secondaryNoOfSectionsBelowXAxis;
     var yAxisExtraHeightAtTop = trimYAxisAtTop ? 0 : yAxisExtraHeight;
     /***********************************************************************************************************************************
@@ -82,9 +82,9 @@ export var getHorizSectionVals = function (props) {
             }
             secondaryHorizSections.push({
                 value: ((_1 = secondaryYAxisConfig.yAxisLabelTexts) === null || _1 === void 0 ? void 0 : _1.length)
-                    ? (_2 = secondaryYAxisConfig.yAxisLabelTexts[i + noOfSectionsBelowXAxis
+                    ? (_3 = secondaryYAxisConfig.yAxisLabelTexts[i + ((_2 = secondaryYAxisConfig.noOfSectionsBelowXAxis) !== null && _2 !== void 0 ? _2 : 0)
                     // - noOfSectionsBelowXAxis - 1
-                    ]) !== null && _2 !== void 0 ? _2 : value.toString()
+                    ]) !== null && _3 !== void 0 ? _3 : value.toString()
                     : value.toString()
             });
         }
@@ -96,11 +96,11 @@ export var getHorizSectionVals = function (props) {
                 (i - secondaryYAxisConfig.noOfSectionsBelowXAxis - 1);
             if (secondaryYAxisConfig.showFractionalValues ||
                 secondaryYAxisConfig.roundToDigits) {
-                value = parseFloat(value.toFixed((_3 = secondaryYAxisConfig.roundToDigits) !== null && _3 !== void 0 ? _3 : AxesAndRulesDefaults.roundToDigits));
+                value = parseFloat(value.toFixed((_4 = secondaryYAxisConfig.roundToDigits) !== null && _4 !== void 0 ? _4 : AxesAndRulesDefaults.roundToDigits));
             }
             secondaryHorizSectionsBelow.push({
-                value: ((_4 = secondaryYAxisConfig.yAxisLabelTexts) === null || _4 === void 0 ? void 0 : _4.length)
-                    ? (_5 = secondaryYAxisConfig.yAxisLabelTexts[i - 1]) !== null && _5 !== void 0 ? _5 : value.toString()
+                value: ((_5 = secondaryYAxisConfig.yAxisLabelTexts) === null || _5 === void 0 ? void 0 : _5.length)
+                    ? (_6 = secondaryYAxisConfig.yAxisLabelTexts[i - 1]) !== null && _6 !== void 0 ? _6 : value.toString()
                     : value.toString()
             });
         }
@@ -121,12 +121,12 @@ export var getHorizSectionVals = function (props) {
     };
     showReferenceLine1 = referenceLinesConfig.showReferenceLine1 || false;
     referenceLine1Position =
-        (_6 = referenceLinesConfig.referenceLine1Position) !== null && _6 !== void 0 ? _6 : (referenceLinesConfig.referenceLine1Position || containerHeight / 2);
+        (_7 = referenceLinesConfig.referenceLine1Position) !== null && _7 !== void 0 ? _7 : (referenceLinesConfig.referenceLine1Position || containerHeight / 2);
     referenceLine1Config = referenceLinesConfig.referenceLine1Config
         ? {
             thickness: referenceLinesConfig.referenceLine1Config.thickness ||
                 defaultReferenceConfig.thickness,
-            width: (_7 = referenceLinesConfig.referenceLine1Config.width) !== null && _7 !== void 0 ? _7 : defaultReferenceConfig.width,
+            width: (_8 = referenceLinesConfig.referenceLine1Config.width) !== null && _8 !== void 0 ? _8 : defaultReferenceConfig.width,
             color: referenceLinesConfig.referenceLine1Config.color ||
                 defaultReferenceConfig.color,
             type: referenceLinesConfig.referenceLine1Config.type ||
@@ -139,17 +139,17 @@ export var getHorizSectionVals = function (props) {
                 defaultReferenceConfig.labelText,
             labelTextStyle: referenceLinesConfig.referenceLine1Config.labelTextStyle ||
                 defaultReferenceConfig.labelTextStyle,
-            zIndex: (_8 = referenceLinesConfig.referenceLine1Config.zIndex) !== null && _8 !== void 0 ? _8 : defaultReferenceConfig.zIndex
+            zIndex: (_9 = referenceLinesConfig.referenceLine1Config.zIndex) !== null && _9 !== void 0 ? _9 : defaultReferenceConfig.zIndex
         }
         : defaultReferenceConfig;
     showReferenceLine2 = referenceLinesConfig.showReferenceLine2 || false;
     referenceLine2Position =
-        (_9 = referenceLinesConfig.referenceLine2Position) !== null && _9 !== void 0 ? _9 : (referenceLinesConfig.referenceLine2Position || (3 * containerHeight) / 2);
+        (_10 = referenceLinesConfig.referenceLine2Position) !== null && _10 !== void 0 ? _10 : (referenceLinesConfig.referenceLine2Position || (3 * containerHeight) / 2);
     referenceLine2Config = referenceLinesConfig.referenceLine2Config
         ? {
             thickness: referenceLinesConfig.referenceLine2Config.thickness ||
                 defaultReferenceConfig.thickness,
-            width: (_10 = referenceLinesConfig.referenceLine2Config.width) !== null && _10 !== void 0 ? _10 : defaultReferenceConfig.width,
+            width: (_11 = referenceLinesConfig.referenceLine2Config.width) !== null && _11 !== void 0 ? _11 : defaultReferenceConfig.width,
             color: referenceLinesConfig.referenceLine2Config.color ||
                 defaultReferenceConfig.color,
             type: referenceLinesConfig.referenceLine2Config.type ||
@@ -162,17 +162,17 @@ export var getHorizSectionVals = function (props) {
                 defaultReferenceConfig.labelText,
             labelTextStyle: referenceLinesConfig.referenceLine2Config.labelTextStyle ||
                 defaultReferenceConfig.labelTextStyle,
-            zIndex: (_11 = referenceLinesConfig.referenceLine2Config.zIndex) !== null && _11 !== void 0 ? _11 : defaultReferenceConfig.zIndex
+            zIndex: (_12 = referenceLinesConfig.referenceLine2Config.zIndex) !== null && _12 !== void 0 ? _12 : defaultReferenceConfig.zIndex
         }
         : defaultReferenceConfig;
     showReferenceLine3 = referenceLinesConfig.showReferenceLine3 || false;
     referenceLine3Position =
-        (_12 = referenceLinesConfig.referenceLine3Position) !== null && _12 !== void 0 ? _12 : (referenceLinesConfig.referenceLine3Position || containerHeight / 3);
+        (_13 = referenceLinesConfig.referenceLine3Position) !== null && _13 !== void 0 ? _13 : (referenceLinesConfig.referenceLine3Position || containerHeight / 3);
     referenceLine3Config = referenceLinesConfig.referenceLine3Config
         ? {
             thickness: referenceLinesConfig.referenceLine3Config.thickness ||
                 defaultReferenceConfig.thickness,
-            width: (_13 = referenceLinesConfig.referenceLine3Config.width) !== null && _13 !== void 0 ? _13 : defaultReferenceConfig.width,
+            width: (_14 = referenceLinesConfig.referenceLine3Config.width) !== null && _14 !== void 0 ? _14 : defaultReferenceConfig.width,
             color: referenceLinesConfig.referenceLine3Config.color ||
                 defaultReferenceConfig.color,
             type: referenceLinesConfig.referenceLine3Config.type ||
@@ -185,7 +185,7 @@ export var getHorizSectionVals = function (props) {
                 defaultReferenceConfig.labelText,
             labelTextStyle: referenceLinesConfig.referenceLine3Config.labelTextStyle ||
                 defaultReferenceConfig.labelTextStyle,
-            zIndex: (_14 = referenceLinesConfig.referenceLine3Config.zIndex) !== null && _14 !== void 0 ? _14 : defaultReferenceConfig.zIndex
+            zIndex: (_15 = referenceLinesConfig.referenceLine3Config.zIndex) !== null && _15 !== void 0 ? _15 : defaultReferenceConfig.zIndex
         }
         : defaultReferenceConfig;
     var getLabelTexts = function (val, index) {

package/dist/utils/index.d.ts

@@ -32,7 +32,7 @@ interface IgetAxesAndRulesProps extends BarChartPropsType {
     verticalLinesUptoDataPoint?: boolean;
     referenceLinesConfig: ReferenceLinesConfig;
 }
-export declare const getAxesAndRulesProps: (props: extendedBarChartPropsType, stepValue: number, negativeStepValue?: number, maxValue?: number) => IgetAxesAndRulesProps;
+export declare const getAxesAndRulesProps: (props: extendedBarChartPropsType, stepValue: number, roundToDigits: number, negativeStepValue?: number, maxValue?: number) => IgetAxesAndRulesProps;
 export declare const getExtendedContainerHeightWithPadding: (containerHeight: number, overflowTop?: number) => number;
 export declare const getSecondaryDataWithOffsetIncluded: (secondaryData?: barDataItem[] | lineDataItem[], secondaryYAxis?: any | undefined, showDataPointsForMissingValues?: boolean, interpolateMissingValues?: boolean, onlyPositive?: boolean) => barDataItem[] | lineDataItem[] | undefined;
 export declare const getArrowProperty: (property: string, count: number, props: extendedLineChartPropsType, defaultArrowConfig: arrowConfigType) => any;
@@ -79,6 +79,7 @@ interface MaxAndMin {
     maxItem: number;
     minItem: number;
 }
+export declare const indexOfFirstNonZeroDigit: (num: number) => number;
 export declare const maxAndMinUtil: (maxItem: number, minItem: number, roundToDigits?: number, showFractionalValues?: boolean) => MaxAndMin;
 export declare const computeMaxAndMinItems: (data: any[] | undefined, roundToDigits?: number, showFractionalValues?: boolean) => MaxAndMin;
 export declare const getLabelTextUtil: (val: string, index: number, showFractionalValues?: boolean, yAxisLabelTexts?: string[], yAxisOffset?: number, yAxisLabelPrefix?: string, yAxisLabelSuffix?: string, roundToDigits?: number, formatYLabel?: (label: string) => string) => string;
@@ -94,6 +95,7 @@ export declare const getBarSideColor: (isFocused?: boolean, focusedBarConfig?: F
 export declare const getBarTopColor: (isFocused?: boolean, focusedBarConfig?: FocusedBarConfig, itemTopColor?: ColorValue, topColor?: ColorValue) => ColorValue | undefined;
 export declare const getBarWidth: (isFocused?: boolean, focusedBarConfig?: FocusedBarConfig, itemBarWidth?: number, barWidth?: number) => number;
 export declare const getInterpolatedData: (dataParam: lineDataItem[], showDataPointsForMissingValues?: boolean, interpolateMissingValues?: boolean, onlyPositive?: boolean) => lineDataItem[];
+export declare const getLineSegmentsDueToNoExtrapolation: (data?: lineDataItem[]) => LineSegment[] | undefined;
 export declare const getLineSegmentsForMissingValues: (data?: lineDataItem[]) => LineSegment[] | undefined;
 export declare const getTextSizeForPieLabels: (textSize: number, radius: number) => number;
 export declare const adjustToOffset: (data: lineDataItem[], yAxisOffset?: number) => lineDataItem[];

package/dist/utils/index.js

@@ -486,7 +486,7 @@ export var getArrowPoints = function (arrowTipX, arrowTipY, x1, y1, arrowLength,
     arrowPoints += " L".concat(arrowTipX, " ").concat(arrowTipY);
     return arrowPoints;
 };
-export var getAxesAndRulesProps = function (props, stepValue, negativeStepValue, maxValue) {
+export var getAxesAndRulesProps = function (props, stepValue, roundToDigits, negativeStepValue, maxValue) {
     var _a, _b, _c, _d, _e;
     var secondaryYAxis = !props.secondaryYAxis || props.secondaryYAxis === true
         ? {}
@@ -551,7 +551,7 @@ export var getAxesAndRulesProps = function (props, stepValue, negativeStepValue,
         verticalLinesStrokeLinecap: props.verticalLinesStrokeLinecap,
         // specific to Line charts-
         verticalLinesUptoDataPoint: props.verticalLinesUptoDataPoint,
-        roundToDigits: props.roundToDigits,
+        roundToDigits: roundToDigits,
         stepValue: stepValue,
         negativeStepValue: negativeStepValue !== null && negativeStepValue !== void 0 ? negativeStepValue : stepValue,
         secondaryYAxis: props.secondaryYAxis,
@@ -662,15 +662,28 @@ export var getAllArrowProperties = function (props, defaultArrowConfig) {
         showArrowBasesFromSet: showArrowBasesFromSet
     };
 };
+export var indexOfFirstNonZeroDigit = function (num) {
+    var numString = num.toString();
+    var i = 0;
+    var d = numString[i];
+    while (i < numString.length - 2 && (isNaN(Number(d)) || d === '0')) {
+        d = numString[++i];
+    }
+    return i;
+};
 export var maxAndMinUtil = function (maxItem, minItem, roundToDigits, showFractionalValues) {
     if (showFractionalValues !== null && showFractionalValues !== void 0 ? showFractionalValues : roundToDigits) {
-        maxItem *= 10 * (roundToDigits !== null && roundToDigits !== void 0 ? roundToDigits : 1);
-        maxItem = maxItem + (10 - (maxItem % 10));
-        maxItem /= 10 * (roundToDigits !== null && roundToDigits !== void 0 ? roundToDigits : 1);
-        maxItem = parseFloat(maxItem.toFixed(roundToDigits !== null && roundToDigits !== void 0 ? roundToDigits : 1));
-        if (minItem !== 0) {
-            minItem += minItem / 10;
-        }
+        var range = maxItem - minItem;
+        var stepValue = range / 10;
+        maxItem += stepValue;
+        minItem = minItem !== 0 ? minItem + stepValue : minItem;
+        // maxItem *= 10 * (roundToDigits ?? 1)
+        // maxItem = maxItem + (10 - (maxItem % 10))
+        // maxItem /= 10 * (roundToDigits ?? 1)
+        // maxItem = parseFloat(maxItem.toFixed(roundToDigits ?? 1))
+        // if (minItem !== 0) {
+        //   minItem += minItem / 10
+        // }
     }
     else {
         maxItem = maxItem + (10 - (maxItem % 10));
@@ -835,6 +848,11 @@ export var getBarTopColor = function (isFocused, focusedBarConfig, itemTopColor,
     }
     return itemTopColor !== null && itemTopColor !== void 0 ? itemTopColor : topColor;
 };
+var myFindLastIndex = function (arr, func) {
+    var tempLastIndex = arr.slice().reverse().findIndex(func);
+    var lastIndex = tempLastIndex >= 0 ? arr.length - 1 - tempLastIndex : tempLastIndex;
+    return lastIndex;
+};
 export var getBarWidth = function (isFocused, focusedBarConfig, itemBarWidth, barWidth) {
     var _a, _b;
     var localBarWidth = (_a = itemBarWidth !== null && itemBarWidth !== void 0 ? itemBarWidth : barWidth) !== null && _a !== void 0 ? _a : BarDefaults.barWidth;
@@ -891,12 +909,7 @@ export var getInterpolatedData = function (dataParam, showDataPointsForMissingVa
         //    4. None has valid value -> this is already handled in preprocessing
         var pre = data.slice(0, index);
         var post = data.slice(index + 1, n);
-        var preCount = pre.length - 1;
-        var tempPreValidIndex = pre
-            .slice()
-            .reverse()
-            .findIndex(function (item) { return typeof item.value === 'number'; });
-        var preValidIndex = tempPreValidIndex >= 0 ? preCount - tempPreValidIndex : tempPreValidIndex;
+        var preValidIndex = myFindLastIndex(pre, function (item) { return typeof item.value === 'number'; });
         var postValidInd = post.findIndex(function (item) { return typeof item.value === 'number'; });
         var postValidIndex = postValidInd + index + 1;
         var count, step;
@@ -911,18 +924,12 @@ export var getInterpolatedData = function (dataParam, showDataPointsForMissingVa
             //    2. Only pre has valid value
             //  Now there are 2 possibilities-
             //    1. There's only 1 valid value in the pre -> this is already handled in preprocessing
-            //    2. There are more than valid values in pre
+            //    2. There are more than 1 valid values in pre
             var secondPre = data.slice(0, preValidIndex);
-            var secondPreCount = pre.length - 1;
-            var tempSecondPreIndex = secondPre
-                .slice()
-                .reverse()
-                .findIndex(function (item) { return typeof item.value === 'number'; });
-            var secondPreIndex = tempSecondPreIndex >= 0
-                ? secondPreCount - tempSecondPreIndex
-                : tempSecondPreIndex;
+            var secondPreIndex = myFindLastIndex(secondPre, function (item) { return typeof item.value === 'number'; });
             count = preValidIndex - secondPreIndex;
             step = (data[secondPreIndex].value - data[preValidIndex].value) / count;
+            var val = data[preValidIndex].value - step * (index - preValidIndex);
             data[index].value =
                 data[preValidIndex].value - step * (index - preValidIndex);
         }
@@ -948,6 +955,28 @@ export var getInterpolatedData = function (dataParam, showDataPointsForMissingVa
         ? data.map(function (item) { return (__assign(__assign({}, item), { value: Math.max(item.value, 0) })); })
         : data;
 };
+export var getLineSegmentsDueToNoExtrapolation = function (data) {
+    if (!(data === null || data === void 0 ? void 0 : data.length))
+        return undefined;
+    var segments = [];
+    var firstNumericIndex = data.findIndex(function (item) { return typeof item.value === 'number'; });
+    if (firstNumericIndex !== 0) {
+        segments.push({
+            startIndex: 0,
+            endIndex: firstNumericIndex,
+            color: 'transparent'
+        });
+    }
+    var lastNumericIndex = myFindLastIndex(data, function (item) { return typeof item.value === 'number'; });
+    if (lastNumericIndex !== data.length) {
+        segments.push({
+            startIndex: lastNumericIndex,
+            endIndex: data.length,
+            color: 'transparent'
+        });
+    }
+    return segments;
+};
 export var getLineSegmentsForMissingValues = function (data) {
     if (!(data === null || data === void 0 ? void 0 : data.length))
         return undefined;

package/package.json

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