gifted-charts-core 0.1.12 → 0.1.13

package/package.json

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

package/src/BarChart/index.js

@@ -111,12 +111,12 @@ export var useBarChart = function (props) {
     var scrollAnimation = (_t = props.scrollAnimation) !== null && _t !== void 0 ? _t : BarDefaults.scrollAnimation;
     var scrollEventThrottle = (_u = props.scrollEventThrottle) !== null && _u !== void 0 ? _u : BarDefaults.scrollEventThrottle;
     var labelsExtraHeight = (_v = props.labelsExtraHeight) !== null && _v !== void 0 ? _v : AxesAndRulesDefaults.labelsExtraHeight;
-    var totalWidth = initialSpacing;
+    var totalWidth = initialSpacing + endSpacing;
     var maxItem = 0;
     var minItem = 0;
     if (props.stackData) {
-        props.stackData.forEach(function (stackItem) {
-            var _a, _b;
+        props.stackData.forEach(function (stackItem, index) {
+            var _a, _b, _c;
             var stackSumMax = stackItem.stacks.reduce(function (acc, stack) { return acc + (stack.value >= 0 ? stack.value : 0); }, 0);
             var stackSumMin = stackItem.stacks.reduce(function (acc, stack) { return acc + (stack.value < 0 ? stack.value : 0); }, 0);
             if (stackSumMax > maxItem) {
@@ -127,11 +127,11 @@ export var useBarChart = function (props) {
             }
             totalWidth +=
                 ((_b = (_a = stackItem.stacks[0].barWidth) !== null && _a !== void 0 ? _a : props.barWidth) !== null && _b !== void 0 ? _b : defaultBarWidth) +
-                    spacing;
+                    (index === data.length - 1 ? 0 : (_c = stackItem.spacing) !== null && _c !== void 0 ? _c : spacing);
         });
     }
     else {
-        data.forEach(function (item) {
+        data.forEach(function (item, index) {
             var _a, _b, _c;
             if (item.value > maxItem) {
                 maxItem = item.value;
@@ -141,7 +141,7 @@ export var useBarChart = function (props) {
             }
             totalWidth +=
                 ((_b = (_a = item.barWidth) !== null && _a !== void 0 ? _a : props.barWidth) !== null && _b !== void 0 ? _b : defaultBarWidth) +
-                    ((_c = item.spacing) !== null && _c !== void 0 ? _c : spacing);
+                    (index === data.length - 1 ? spacing : (_c = item.spacing) !== null && _c !== void 0 ? _c : spacing);
         });
     }
     var secondaryMaxItem = 0;
@@ -391,7 +391,7 @@ export var useBarChart = function (props) {
     });
     var animatedWidth = widthValue === null || widthValue === void 0 ? void 0 : widthValue.interpolate({
         inputRange: [0, 1],
-        outputRange: [0, initialSpacing + totalWidth + endSpacing]
+        outputRange: [0, initialSpacing + totalWidth]
     });
     var getPropsCommonForBarAndStack = function (item, index) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;

package/src/BarChart/index.ts

@@ -167,11 +167,11 @@ export const useBarChart = (props: extendedBarChartPropsType) => {
   const labelsExtraHeight =
     props.labelsExtraHeight ?? AxesAndRulesDefaults.labelsExtraHeight
 
-  let totalWidth = initialSpacing
+  let totalWidth = initialSpacing + endSpacing
   let maxItem = 0
   let minItem = 0
   if (props.stackData) {
-    props.stackData.forEach((stackItem) => {
+    props.stackData.forEach((stackItem, index) => {
       const stackSumMax = stackItem.stacks.reduce(
         (acc, stack) => acc + (stack.value >= 0 ? stack.value : 0),
         0
@@ -190,10 +190,10 @@ export const useBarChart = (props: extendedBarChartPropsType) => {
       }
       totalWidth +=
         (stackItem.stacks[0].barWidth ?? props.barWidth ?? defaultBarWidth) +
-        spacing
+        (index === data.length - 1 ? 0 : stackItem.spacing ?? spacing)
     })
   } else {
-    data.forEach((item: barDataItem) => {
+    data.forEach((item: barDataItem, index) => {
       if (item.value > maxItem) {
         maxItem = item.value
       }
@@ -202,7 +202,7 @@ export const useBarChart = (props: extendedBarChartPropsType) => {
       }
       totalWidth +=
         (item.barWidth ?? props.barWidth ?? defaultBarWidth) +
-        (item.spacing ?? spacing)
+        (index === data.length - 1 ? spacing : item.spacing ?? spacing)
     })
   }
 
@@ -632,7 +632,7 @@ export const useBarChart = (props: extendedBarChartPropsType) => {
 
   const animatedWidth = widthValue?.interpolate({
     inputRange: [0, 1],
-    outputRange: [0, initialSpacing + totalWidth + endSpacing]
+    outputRange: [0, initialSpacing + totalWidth]
   })
 
   const getPropsCommonForBarAndStack = (item: any, index: number) => {

package/src/LineChart/LineChartBiColor.js

@@ -81,17 +81,17 @@ export var useLineChartBiColor = function (props) {
     var areaChart = (_w = props.areaChart) !== null && _w !== void 0 ? _w : false;
     var textFontSize1 = (_x = props.textFontSize) !== null && _x !== void 0 ? _x : LineDefaults.textFontSize;
     var textColor1 = (_y = props.textColor) !== null && _y !== void 0 ? _y : LineDefaults.textColor;
-    var totalWidth = initialSpacing;
+    var totalWidth = initialSpacing + endSpacing;
     var maxItem = 0;
     var minItem = 0;
-    data.forEach(function (item) {
+    data.forEach(function (item, index) {
         if (item.value > maxItem) {
             maxItem = item.value;
         }
         if (item.value < minItem) {
             minItem = item.value;
         }
-        totalWidth += spacing;
+        totalWidth += index === data.length - 1 ? 0 : spacing;
     });
     if ((_z = props.showFractionalValues) !== null && _z !== void 0 ? _z : props.roundToDigits) {
         maxItem *= 10 * ((_0 = props.roundToDigits) !== null && _0 !== void 0 ? _0 : 1);

package/src/LineChart/LineChartBiColor.ts

@@ -99,17 +99,17 @@ export const useLineChartBiColor = (
   const textFontSize1 = props.textFontSize ?? LineDefaults.textFontSize
   const textColor1 = props.textColor ?? LineDefaults.textColor
 
-  let totalWidth = initialSpacing
+  let totalWidth = initialSpacing + endSpacing
   let maxItem = 0
   let minItem = 0
-  data.forEach((item: bicolorLineDataItem) => {
+  data.forEach((item: bicolorLineDataItem, index) => {
     if (item.value > maxItem) {
       maxItem = item.value
     }
     if (item.value < minItem) {
       minItem = item.value
     }
-    totalWidth += spacing
+    totalWidth += index === data.length - 1 ? 0 : spacing
   })
 
   if (props.showFractionalValues ?? props.roundToDigits) {

package/src/LineChart/index.js

@@ -233,7 +233,7 @@ export var useLineChart = function (props) {
     var textColor3 = (_93 = (_92 = props.textColor3) !== null && _92 !== void 0 ? _92 : props.textColor) !== null && _93 !== void 0 ? _93 : LineDefaults.textColor;
     var textColor4 = (_95 = (_94 = props.textColor4) !== null && _94 !== void 0 ? _94 : props.textColor) !== null && _95 !== void 0 ? _95 : LineDefaults.textColor;
     var textColor5 = (_97 = (_96 = props.textColor5) !== null && _96 !== void 0 ? _96 : props.textColor) !== null && _97 !== void 0 ? _97 : LineDefaults.textColor;
-    var totalWidth = initialSpacing + spacing * (data0 !== null && data0 !== void 0 ? data0 : data).length;
+    var totalWidth = initialSpacing + spacing * (data0 !== null && data0 !== void 0 ? data0 : data).length - 1 + endSpacing;
     var _339 = computeMaxAndMinItems(data0 !== null && data0 !== void 0 ? data0 : data, props.roundToDigits, props.showFractionalValues), maxItem = _339.maxItem, minItem = _339.minItem;
     var maxValue = getMaxValue(props.maxValue, props.stepValue, noOfSections, maxItem);
     var mostNegativeValue = (_98 = props.mostNegativeValue) !== null && _98 !== void 0 ? _98 : minItem;
@@ -253,6 +253,9 @@ export var useLineChart = function (props) {
         animations.forEach(function (item, index) {
             item.addListener(function (val) {
                 var _a, _b, _c, _d, _e, _f, _g, _h;
+                if (typeof data[index] === 'undefined') {
+                    return;
+                }
                 var temp = (_b = (_a = data[index]) === null || _a === void 0 ? void 0 : _a.value) !== null && _b !== void 0 ? _b : 0;
                 data[index].value = (_c = val === null || val === void 0 ? void 0 : val.value) !== null && _c !== void 0 ? _c : 0;
                 var pp = '';

package/src/LineChart/index.ts

@@ -428,7 +428,8 @@ export const useLineChart = (props: extendedLineChartPropsType) => {
   const textColor5 =
     props.textColor5 ?? props.textColor ?? LineDefaults.textColor
 
-  const totalWidth = initialSpacing + spacing * (data0 ?? data).length
+  const totalWidth =
+    initialSpacing + spacing * (data0 ?? data).length - 1 + endSpacing
 
   const { maxItem, minItem } = computeMaxAndMinItems(
     data0 ?? data,
@@ -469,7 +470,9 @@ export const useLineChart = (props: extendedLineChartPropsType) => {
   if (animateOnDataChange && animations) {
     animations.forEach((item, index) => {
       item.addListener((val) => {
-        if (typeof data[index] === 'undefined') { return; }
+        if (typeof data[index] === 'undefined') {
+          return
+        }
 
         const temp = data[index]?.value ?? 0
         data[index].value = val?.value ?? 0

package/src/components/BarAndLineChartsWrapper/getHorizSectionsVals.js

@@ -112,7 +112,7 @@ export var getHorizSectionVals = function (props) {
     var showReferenceLine1 = referenceLinesConfig.showReferenceLine1, referenceLine1Position = referenceLinesConfig.referenceLine1Position, referenceLine1Config = referenceLinesConfig.referenceLine1Config, showReferenceLine2 = referenceLinesConfig.showReferenceLine2, referenceLine2Position = referenceLinesConfig.referenceLine2Position, referenceLine2Config = referenceLinesConfig.referenceLine2Config, showReferenceLine3 = referenceLinesConfig.showReferenceLine3, referenceLine3Position = referenceLinesConfig.referenceLine3Position, referenceLine3Config = referenceLinesConfig.referenceLine3Config;
     var defaultReferenceConfig = {
         thickness: rulesThickness,
-        width: (width || totalWidth - spacing) + endSpacing,
+        width: (width || totalWidth - endSpacing) + endSpacing,
         color: 'black',
         type: rulesType,
         dashWidth: dashWidth,

package/src/components/BarAndLineChartsWrapper/getHorizSectionsVals.ts

@@ -228,7 +228,7 @@ export const getHorizSectionVals = (props: horizSectionPropTypes) => {
 
   const defaultReferenceConfig = {
     thickness: rulesThickness,
-    width: (width || totalWidth - spacing) + endSpacing,
+    width: (width || totalWidth - endSpacing) + endSpacing,
     color: 'black',
     type: rulesType,
     dashWidth,

package/src/components/BarAndLineChartsWrapper/index.js

@@ -91,6 +91,7 @@ export var useBarAndLineChartsWrapper = function (props) {
     var verticalLinesAr = noOfVerticalLines
         ? __spreadArray([], __read(Array(noOfVerticalLines).keys()), false) : __spreadArray([], __read(Array(stackData ? stackData.length : data.length).keys()), false);
     var horizSectionProps = {
+        chartType: chartType,
         width: width,
         horizSections: horizSections,
         noOfSectionsBelowXAxis: noOfSectionsBelowXAxis,

package/src/components/BarAndLineChartsWrapper/index.ts

@@ -168,6 +168,7 @@ export const useBarAndLineChartsWrapper = (
     : [...Array(stackData ? stackData.length : data.length).keys()]
 
   const horizSectionProps: horizSectionPropTypes = {
+    chartType,
     width,
     horizSections,
     noOfSectionsBelowXAxis,

package/src/utils/types.d.ts

@@ -110,6 +110,7 @@ export interface arrowConfigType {
     showArrowBase: boolean;
 }
 export interface horizSectionPropTypes {
+    chartType: chartTypes;
     width: number | undefined;
     horizSections: any[];
     noOfSectionsBelowXAxis: number;

package/src/utils/types.ts

@@ -125,6 +125,7 @@ export interface arrowConfigType {
 }
 
 export interface horizSectionPropTypes {
+  chartType: chartTypes
   width: number | undefined
   horizSections: any[]
   noOfSectionsBelowXAxis: number