gifted-charts-core 0.1.35 → 0.1.36

package/dist/BarChart/RenderStackBars.js

@@ -17,7 +17,7 @@ var __read = (this && this.__read) || function (o, n) {
 import { useState } from 'react';
 export var useRenderStackBars = function (props) {
     var _a, _b, _c, _d, _e, _f, _g, _h;
-    var item = props.item, index = props.index, containerHeight = props.containerHeight, maxValue = props.maxValue, propSpacing = props.propSpacing, initialSpacing = props.initialSpacing, stackData = props.stackData, isAnimated = props.isAnimated, xAxisThickness = props.xAxisThickness, renderTooltip = props.renderTooltip, leftShiftForTooltip = props.leftShiftForTooltip, leftShiftForLastIndexTooltip = props.leftShiftForLastIndexTooltip, autoCenterTooltip = props.autoCenterTooltip, horizontal = props.horizontal;
+    var item = props.item, index = props.index, containerHeight = props.containerHeight, maxValue = props.maxValue, propSpacing = props.propSpacing, initialSpacing = props.initialSpacing, stackData = props.stackData, isAnimated = props.isAnimated, xAxisThickness = props.xAxisThickness, renderTooltip = props.renderTooltip, leftShiftForTooltip = props.leftShiftForTooltip, leftShiftForLastIndexTooltip = props.leftShiftForLastIndexTooltip, autoCenterTooltip = props.autoCenterTooltip, horizontal = props.horizontal, stepHeight = props.stepHeight, stepValue = props.stepValue, negativeStepHeight = props.negativeStepHeight, negativeStepValue = props.negativeStepValue, secondaryStepHeight = props.secondaryStepHeight, secondaryStepValue = props.secondaryStepValue, secondaryNegativeStepHeight = props.secondaryNegativeStepHeight, secondaryNegativeStepValue = props.secondaryNegativeStepValue;
     var containsNegativeValue = item.stacks.some(function (item) { return item.value < 0; });
     var noAnimation = containsNegativeValue || !isAnimated;
     var localBarInnerComponent = (_a = item.barInnerComponent) !== null && _a !== void 0 ? _a : props.barInnerComponent;
@@ -29,13 +29,20 @@ export var useRenderStackBars = function (props) {
                 ((_e = (_d = stackData[i].stacks[0].barWidth) !== null && _d !== void 0 ? _d : props.barWidth) !== null && _e !== void 0 ? _e : 30);
     }
     var disablePress = (_f = props.disablePress) !== null && _f !== void 0 ? _f : false;
+    var heightFactor = item.isSecondary
+        ? secondaryStepHeight / secondaryStepValue
+        : stepHeight / stepValue;
+    var negativeHeightFactor = item.isSecondary
+        ? secondaryNegativeStepHeight / secondaryNegativeStepValue
+        : negativeStepHeight / negativeStepValue;
     var totalHeight = props.item.stacks.reduce(function (acc, stack) {
         return acc +
-            (Math.abs(stack.value) * (containerHeight !== null && containerHeight !== void 0 ? containerHeight : 200)) / (maxValue || 200);
+            Math.abs(stack.value) *
+                (stack.value < 0 ? negativeHeightFactor : heightFactor);
     }, 0);
     var _j = __read(useState(noAnimation ? totalHeight : 1), 2), height = _j[0], setHeight = _j[1];
     var getBarHeight = function (value, marginBottom) {
-        return ((Math.abs(value) * (containerHeight !== null && containerHeight !== void 0 ? containerHeight : 200)) / (maxValue || 200) -
+        return (Math.abs(value) * (value < 0 ? negativeHeightFactor : heightFactor) -
             (marginBottom !== null && marginBottom !== void 0 ? marginBottom : 0));
     };
     var getPosition = function (index) {

package/dist/BarChart/index.d.ts

@@ -87,7 +87,6 @@ export declare const useBarChart: (props: extendedBarChartPropsType) => {
     appearingOpacity: Animated.AnimatedInterpolation<string | number> | undefined;
     autoShiftLabels: boolean;
     yAxisAtTop: boolean;
-    secondaryData: import("..").lineDataItem[] | barDataItem[] | undefined;
     disableScroll: boolean;
     showScrollIndicator: boolean;
     scrollToEnd: boolean;
@@ -186,6 +185,12 @@ export declare const useBarChart: (props: extendedBarChartPropsType) => {
         negativeStepHeight: number;
         negativeStepValue: number;
         secondaryXAxis: import("../utils/types").XAxisConfig | undefined;
+        secondaryYAxis: boolean | secondaryYAxisType | undefined;
+        secondaryStepHeight: number;
+        secondaryStepValue: number;
+        secondaryNegativeStepHeight: number;
+        secondaryNegativeStepValue: number;
+        secondaryNoOfSectionsBelowXAxis: number;
     };
     barAndLineChartsWrapperProps: BarAndLineChartsWrapperTypes;
     yAxisExtraHeightAtTop: number;

package/dist/BarChart/index.js

@@ -26,15 +26,15 @@ var __read = (this && this.__read) || function (o, n) {
     return ar;
 };
 import { useEffect, useMemo, useState } from 'react';
-import { getArrowPoints, getAxesAndRulesProps, getExtendedContainerHeightWithPadding, getLineConfigForBarChart, getMaxValue, getMostNegativeValue, getNoOfSections, getSecondaryDataWithOffsetIncluded, getXForLineInBar, getYForLineInBar, indexOfFirstNonZeroDigit, maxAndMinUtil, svgPath } from '../utils';
+import { getArrowPoints, getAxesAndRulesProps, getExtendedContainerHeightWithPadding, getLineConfigForBarChart, getMaxValue, getMostNegativeValue, getNoOfSections, getXForLineInBar, getYForLineInBar, indexOfFirstNonZeroDigit, maxAndMinUtil, svgPath } from '../utils';
 import { AxesAndRulesDefaults, BarDefaults, chartTypes, defaultLineConfig, defaultPointerConfig } from '../utils/constants';
 export var useBarChart = 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, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48;
+    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, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54;
     var heightValue = props.heightValue, widthValue = props.widthValue, opacityValue = props.opacityValue, yAxisOffset = props.yAxisOffset, adjustToWidth = props.adjustToWidth, parentWidth = props.parentWidth, labelsDistanceFromXaxis = props.labelsDistanceFromXaxis, autoShiftLabelsForNegativeStacks = props.autoShiftLabelsForNegativeStacks, focusedBarIndex = props.focusedBarIndex, negativeStepValue = props.negativeStepValue, autoCenterTooltip = props.autoCenterTooltip;
-    var _49 = __read(useState(''), 2), points = _49[0], setPoints = _49[1];
-    var _50 = __read(useState(''), 2), points2 = _50[0], setPoints2 = _50[1];
-    var _51 = __read(useState(''), 2), arrowPoints = _51[0], setArrowPoints = _51[1];
-    var _52 = __read(useState(focusedBarIndex !== null && focusedBarIndex !== void 0 ? focusedBarIndex : -1), 2), selectedIndex = _52[0], setSelectedIndex = _52[1];
+    var _55 = __read(useState(''), 2), points = _55[0], setPoints = _55[1];
+    var _56 = __read(useState(''), 2), points2 = _56[0], setPoints2 = _56[1];
+    var _57 = __read(useState(''), 2), arrowPoints = _57[0], setArrowPoints = _57[1];
+    var _58 = __read(useState(focusedBarIndex !== null && focusedBarIndex !== void 0 ? focusedBarIndex : -1), 2), selectedIndex = _58[0], setSelectedIndex = _58[1];
     var showLine = (_a = props.showLine) !== null && _a !== void 0 ? _a : BarDefaults.showLine;
     useEffect(function () {
         setSelectedIndex(focusedBarIndex !== null && focusedBarIndex !== void 0 ? focusedBarIndex : -1);
@@ -74,7 +74,10 @@ export var useBarChart = function (props) {
     var widthFromProps = horizontal ? props.height : props.width;
     var isAnimated = (_l = props.isAnimated) !== null && _l !== void 0 ? _l : BarDefaults.isAnimated;
     var animationDuration = (_m = props.animationDuration) !== null && _m !== void 0 ? _m : BarDefaults.animationDuration;
-    var secondaryData = getSecondaryDataWithOffsetIncluded(props.secondaryData, props.secondaryYAxis);
+    // const secondaryData = getSecondaryDataWithOffsetIncluded(
+    //   props.secondaryData,
+    //   props.secondaryYAxis
+    // )
     var lineData = useMemo(function () {
         var _a;
         if (!props.lineData) {
@@ -110,19 +113,47 @@ export var useBarChart = function (props) {
     var scrollAnimation = (_s = props.scrollAnimation) !== null && _s !== void 0 ? _s : BarDefaults.scrollAnimation;
     var scrollEventThrottle = (_t = props.scrollEventThrottle) !== null && _t !== void 0 ? _t : BarDefaults.scrollEventThrottle;
     var labelsExtraHeight = (_u = props.labelsExtraHeight) !== null && _u !== void 0 ? _u : AxesAndRulesDefaults.labelsExtraHeight;
+    var secondaryMaxItem = 0;
+    var secondaryMinItem = 0;
+    if (lineConfig.isSecondary) {
+        lineData.forEach(function (item) {
+            var _a, _b, _c, _d;
+            if (((_a = item.value) !== null && _a !== void 0 ? _a : 0) > secondaryMaxItem) {
+                secondaryMaxItem = (_b = item.value) !== null && _b !== void 0 ? _b : 0;
+            }
+            if (((_c = item.value) !== null && _c !== void 0 ? _c : 0) < secondaryMinItem) {
+                secondaryMinItem = (_d = item.value) !== null && _d !== void 0 ? _d : 0;
+            }
+        });
+    }
     var totalWidth = initialSpacing + endSpacing;
     var maxItem = 0;
     var minItem = 0;
+    var minPositiveItem = 0;
+    var secondaryMinPositiveItem = 0;
     if (props.stackData) {
         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) {
-                maxItem = stackSumMax;
+            if (stackItem.isSecondary) {
+                if (stackSumMax > secondaryMaxItem) {
+                    secondaryMaxItem = stackSumMax;
+                }
+                if (stackSumMin < secondaryMinItem) {
+                    secondaryMinItem = stackSumMin;
+                    secondaryMinPositiveItem =
+                        secondaryMinItem > 0 ? secondaryMinItem : secondaryMinPositiveItem;
+                }
             }
-            if (stackSumMin < minItem) {
-                minItem = stackSumMin;
+            else {
+                if (stackSumMax > maxItem) {
+                    maxItem = stackSumMax;
+                }
+                if (stackSumMin < minItem) {
+                    minItem = stackSumMin;
+                    minPositiveItem = minItem > 0 ? minItem : minPositiveItem;
+                }
             }
             totalWidth +=
                 ((_b = (_a = stackItem.stacks[0].barWidth) !== null && _a !== void 0 ? _a : props.barWidth) !== null && _b !== void 0 ? _b : defaultBarWidth) +
@@ -132,107 +163,119 @@ export var useBarChart = function (props) {
     else {
         data.forEach(function (item, index) {
             var _a, _b, _c;
-            if (item.value > maxItem) {
-                maxItem = item.value;
+            if (item.isSecondary) {
+                if (item.value > secondaryMaxItem) {
+                    secondaryMaxItem = item.value;
+                }
+                if (item.value < secondaryMinItem) {
+                    secondaryMinItem = item.value;
+                    secondaryMinPositiveItem =
+                        secondaryMinItem > 0 ? secondaryMinItem : secondaryMinPositiveItem;
+                }
             }
-            if (item.value < minItem) {
-                minItem = item.value;
+            else {
+                if (item.value > maxItem) {
+                    maxItem = item.value;
+                }
+                if (item.value < minItem) {
+                    minItem = item.value;
+                    minPositiveItem = minItem > 0 ? minItem : minPositiveItem;
+                }
             }
             totalWidth +=
                 ((_b = (_a = item.barWidth) !== null && _a !== void 0 ? _a : props.barWidth) !== null && _b !== void 0 ? _b : defaultBarWidth) +
                     (index === data.length - 1 ? spacing : (_c = item.spacing) !== null && _c !== void 0 ? _c : spacing);
         });
     }
-    var secondaryMaxItem = 0;
-    var secondaryMinItem = 0;
-    if (lineConfig.isSecondary) {
-        lineData.forEach(function (item) {
-            var _a, _b, _c, _d;
-            if (((_a = item.value) !== null && _a !== void 0 ? _a : 0) > secondaryMaxItem) {
-                secondaryMaxItem = (_b = item.value) !== null && _b !== void 0 ? _b : 0;
-            }
-            if (((_c = item.value) !== null && _c !== void 0 ? _c : 0) < secondaryMinItem) {
-                secondaryMinItem = (_d = item.value) !== null && _d !== void 0 ? _d : 0;
-            }
-        });
-    }
-    var valuesRange = maxItem - minItem;
+    var valuesRange = maxItem - minPositiveItem; // Diff bw largest & smallest +ve values
     var showFractionalValues = (_v = props.showFractionalValues) !== null && _v !== void 0 ? _v : valuesRange <= 1;
     var roundToDigits = (_w = props.roundToDigits) !== null && _w !== void 0 ? _w : (showFractionalValues ? indexOfFirstNonZeroDigit(valuesRange) + 1 : 0);
     var maxAndMin = maxAndMinUtil(maxItem, minItem, roundToDigits, showFractionalValues);
-    var secondaryMaxAndMin = maxAndMinUtil(secondaryMaxItem, secondaryMinItem, roundToDigits, showFractionalValues);
     var maxValue = getMaxValue(props.maxValue, props.stepValue, noOfSections, maxAndMin.maxItem);
-    var secondaryMaxValue = lineConfig.isSecondary
-        ? typeof props.secondaryYAxis !== 'boolean'
-            ? (_x = props.secondaryYAxis.maxValue) !== null && _x !== void 0 ? _x : secondaryMaxAndMin.maxItem
-            : secondaryMaxAndMin.maxItem
-        : maxValue;
+    var secondaryRange = secondaryMaxItem - secondaryMinPositiveItem; // Diff bw largest & smallest +ve values
+    var showSecondaryFractionalValues = (_y = (_x = props.secondaryYAxis) === null || _x === void 0 ? void 0 : _x.showFractionalValues) !== null && _y !== void 0 ? _y : secondaryRange <= 1;
+    var secondaryRoundToDigits = (_0 = (_z = props.secondaryYAxis) === null || _z === void 0 ? void 0 : _z.roundToDigits) !== null && _0 !== void 0 ? _0 : (showSecondaryFractionalValues
+        ? indexOfFirstNonZeroDigit(secondaryRange) + 1
+        : 0);
+    var secondaryMaxAndMin = maxAndMinUtil(secondaryMaxItem, secondaryMinItem, secondaryRoundToDigits, showSecondaryFractionalValues);
+    // const secondaryMaxValue = lineConfig.isSecondary
+    //   ? typeof props.secondaryYAxis !== 'boolean'
+    //     ? (props.secondaryYAxis as secondaryYAxisType).maxValue ??
+    //       secondaryMaxAndMin.maxItem
+    //     : secondaryMaxAndMin.maxItem
+    //   : maxValue
+    var secondaryMaxValue = (_2 = (_1 = props.secondaryYAxis) === null || _1 === void 0 ? void 0 : _1.maxValue) !== null && _2 !== void 0 ? _2 : secondaryMaxAndMin.maxItem;
     var mostNegativeValue = getMostNegativeValue(props.mostNegativeValue, props.negativeStepValue, props.noOfSectionsBelowXAxis, maxAndMin.minItem);
-    var stepValue = (_y = props.stepValue) !== null && _y !== void 0 ? _y : maxValue / noOfSections;
-    var noOfSectionsBelowXAxis = (_z = props.noOfSectionsBelowXAxis) !== null && _z !== void 0 ? _z : Math.round(Math.ceil(-mostNegativeValue / (negativeStepValue !== null && negativeStepValue !== void 0 ? negativeStepValue : stepValue)));
-    var showScrollIndicator = (_0 = props.showScrollIndicator) !== null && _0 !== void 0 ? _0 : BarDefaults.showScrollIndicator;
-    var side = (_1 = props.side) !== null && _1 !== void 0 ? _1 : BarDefaults.side;
-    var rotateLabel = (_2 = props.rotateLabel) !== null && _2 !== void 0 ? _2 : AxesAndRulesDefaults.rotateLabel;
-    var opacity = (_3 = props.opacity) !== null && _3 !== void 0 ? _3 : BarDefaults.opacity;
-    var isThreeD = (_4 = props.isThreeD) !== null && _4 !== void 0 ? _4 : BarDefaults.isThreeD;
-    var showXAxisIndices = (_5 = props.showXAxisIndices) !== null && _5 !== void 0 ? _5 : AxesAndRulesDefaults.showXAxisIndices;
-    var xAxisIndicesHeight = (_6 = props.xAxisIndicesHeight) !== null && _6 !== void 0 ? _6 : AxesAndRulesDefaults.xAxisIndicesHeight;
-    var xAxisIndicesWidth = (_7 = props.xAxisIndicesWidth) !== null && _7 !== void 0 ? _7 : AxesAndRulesDefaults.xAxisIndicesWidth;
-    var xAxisIndicesColor = (_8 = props.xAxisIndicesColor) !== null && _8 !== void 0 ? _8 : AxesAndRulesDefaults.xAxisIndicesColor;
-    var xAxisThickness = (_9 = props.xAxisThickness) !== null && _9 !== void 0 ? _9 : AxesAndRulesDefaults.xAxisThickness;
-    var xAxisTextNumberOfLines = (_10 = props.xAxisTextNumberOfLines) !== null && _10 !== void 0 ? _10 : AxesAndRulesDefaults.xAxisTextNumberOfLines;
-    var xAxisLabelsVerticalShift = (_11 = props.xAxisLabelsVerticalShift) !== null && _11 !== void 0 ? _11 : AxesAndRulesDefaults.xAxisLabelsVerticalShift;
+    var stepValue = (_3 = props.stepValue) !== null && _3 !== void 0 ? _3 : maxValue / noOfSections;
+    var noOfSectionsBelowXAxis = (_4 = props.noOfSectionsBelowXAxis) !== null && _4 !== void 0 ? _4 : Math.round(Math.ceil(-mostNegativeValue / (negativeStepValue !== null && negativeStepValue !== void 0 ? negativeStepValue : stepValue)));
+    var showScrollIndicator = (_5 = props.showScrollIndicator) !== null && _5 !== void 0 ? _5 : BarDefaults.showScrollIndicator;
+    var side = (_6 = props.side) !== null && _6 !== void 0 ? _6 : BarDefaults.side;
+    var rotateLabel = (_7 = props.rotateLabel) !== null && _7 !== void 0 ? _7 : AxesAndRulesDefaults.rotateLabel;
+    var opacity = (_8 = props.opacity) !== null && _8 !== void 0 ? _8 : BarDefaults.opacity;
+    var isThreeD = (_9 = props.isThreeD) !== null && _9 !== void 0 ? _9 : BarDefaults.isThreeD;
+    var showXAxisIndices = (_10 = props.showXAxisIndices) !== null && _10 !== void 0 ? _10 : AxesAndRulesDefaults.showXAxisIndices;
+    var xAxisIndicesHeight = (_11 = props.xAxisIndicesHeight) !== null && _11 !== void 0 ? _11 : AxesAndRulesDefaults.xAxisIndicesHeight;
+    var xAxisIndicesWidth = (_12 = props.xAxisIndicesWidth) !== null && _12 !== void 0 ? _12 : AxesAndRulesDefaults.xAxisIndicesWidth;
+    var xAxisIndicesColor = (_13 = props.xAxisIndicesColor) !== null && _13 !== void 0 ? _13 : AxesAndRulesDefaults.xAxisIndicesColor;
+    var xAxisThickness = (_14 = props.xAxisThickness) !== null && _14 !== void 0 ? _14 : AxesAndRulesDefaults.xAxisThickness;
+    var xAxisTextNumberOfLines = (_15 = props.xAxisTextNumberOfLines) !== null && _15 !== void 0 ? _15 : AxesAndRulesDefaults.xAxisTextNumberOfLines;
+    var xAxisLabelsVerticalShift = (_16 = props.xAxisLabelsVerticalShift) !== null && _16 !== void 0 ? _16 : AxesAndRulesDefaults.xAxisLabelsVerticalShift;
     var horizontalRulesStyle = props.horizontalRulesStyle;
-    var autoShiftLabels = (_12 = props.autoShiftLabels) !== null && _12 !== void 0 ? _12 : false;
-    var barBorderColor = (_13 = props.barBorderColor) !== null && _13 !== void 0 ? _13 : BarDefaults.barBorderColor;
+    var autoShiftLabels = (_17 = props.autoShiftLabels) !== null && _17 !== void 0 ? _17 : false;
+    var barBorderColor = (_18 = props.barBorderColor) !== null && _18 !== void 0 ? _18 : BarDefaults.barBorderColor;
     var extendedContainerHeight = getExtendedContainerHeightWithPadding(containerHeight, 0);
-    var containerHeightIncludingBelowXAxis = extendedContainerHeight + noOfSectionsBelowXAxis * stepHeight;
-    var _53 = __read(useState(-1), 2), pointerIndex = _53[0], setPointerIndex = _53[1];
-    var _54 = __read(useState(0), 2), pointerX = _54[0], setPointerX = _54[1];
-    var _55 = __read(useState(0), 2), pointerY = _55[0], setPointerY = _55[1];
-    var _56 = __read(useState(), 2), pointerItem = _56[0], setPointerItem = _56[1];
-    var _57 = __read(useState(0), 2), responderStartTime = _57[0], setResponderStartTime = _57[1];
-    var _58 = __read(useState(false), 2), responderActive = _58[0], setResponderActive = _58[1];
+    var axesAndRulesProps = getAxesAndRulesProps(props, containerHeight, stepHeight, stepValue, noOfSections, roundToDigits, negativeStepValue !== null && negativeStepValue !== void 0 ? negativeStepValue : stepValue, secondaryMaxValue, secondaryMinItem, showSecondaryFractionalValues, secondaryRoundToDigits);
+    var _59 = axesAndRulesProps.secondaryYAxisConfig, secondaryStepHeight = _59.stepHeight, secondaryStepValue = _59.stepValue, secondaryNegativeStepHeight = _59.negativeStepHeight, secondaryNegativeStepValue = _59.negativeStepValue, secondaryNoOfSectionsBelowXAxis = _59.noOfSectionsBelowXAxis;
+    var primary4thQuadrantHeight = noOfSectionsBelowXAxis * ((_19 = props.negativeStepHeight) !== null && _19 !== void 0 ? _19 : stepHeight);
+    var secondary4thQuadrantHeight = secondaryNoOfSectionsBelowXAxis * secondaryNegativeStepHeight;
+    var containerHeightIncludingBelowXAxis = extendedContainerHeight +
+        Math.max(primary4thQuadrantHeight, secondary4thQuadrantHeight);
+    var _60 = __read(useState(-1), 2), pointerIndex = _60[0], setPointerIndex = _60[1];
+    var _61 = __read(useState(0), 2), pointerX = _61[0], setPointerX = _61[1];
+    var _62 = __read(useState(0), 2), pointerY = _62[0], setPointerY = _62[1];
+    var _63 = __read(useState(), 2), pointerItem = _63[0], setPointerItem = _63[1];
+    var _64 = __read(useState(0), 2), responderStartTime = _64[0], setResponderStartTime = _64[1];
+    var _65 = __read(useState(false), 2), responderActive = _65[0], setResponderActive = _65[1];
     var pointerConfig = props.pointerConfig;
-    var getPointerProps = (_14 = props.getPointerProps) !== null && _14 !== void 0 ? _14 : null;
-    var pointerHeight = (_15 = pointerConfig === null || pointerConfig === void 0 ? void 0 : pointerConfig.height) !== null && _15 !== void 0 ? _15 : defaultPointerConfig.height;
-    var pointerWidth = (_16 = pointerConfig === null || pointerConfig === void 0 ? void 0 : pointerConfig.width) !== null && _16 !== void 0 ? _16 : defaultPointerConfig.width;
-    var pointerRadius = (_17 = pointerConfig === null || pointerConfig === void 0 ? void 0 : pointerConfig.radius) !== null && _17 !== void 0 ? _17 : defaultPointerConfig.radius;
-    var pointerColor = (_18 = pointerConfig === null || pointerConfig === void 0 ? void 0 : pointerConfig.pointerColor) !== null && _18 !== void 0 ? _18 : defaultPointerConfig.pointerColor;
-    var pointerComponent = (_19 = pointerConfig === null || pointerConfig === void 0 ? void 0 : pointerConfig.pointerComponent) !== null && _19 !== void 0 ? _19 : defaultPointerConfig.pointerComponent;
+    var getPointerProps = (_20 = props.getPointerProps) !== null && _20 !== void 0 ? _20 : null;
+    var pointerHeight = (_21 = pointerConfig === null || pointerConfig === void 0 ? void 0 : pointerConfig.height) !== null && _21 !== void 0 ? _21 : defaultPointerConfig.height;
+    var pointerWidth = (_22 = pointerConfig === null || pointerConfig === void 0 ? void 0 : pointerConfig.width) !== null && _22 !== void 0 ? _22 : defaultPointerConfig.width;
+    var pointerRadius = (_23 = pointerConfig === null || pointerConfig === void 0 ? void 0 : pointerConfig.radius) !== null && _23 !== void 0 ? _23 : defaultPointerConfig.radius;
+    var pointerColor = (_24 = pointerConfig === null || pointerConfig === void 0 ? void 0 : pointerConfig.pointerColor) !== null && _24 !== void 0 ? _24 : defaultPointerConfig.pointerColor;
+    var pointerComponent = (_25 = pointerConfig === null || pointerConfig === void 0 ? void 0 : pointerConfig.pointerComponent) !== null && _25 !== void 0 ? _25 : defaultPointerConfig.pointerComponent;
     var showPointerStrip = (pointerConfig === null || pointerConfig === void 0 ? void 0 : pointerConfig.showPointerStrip) === false
         ? false
         : defaultPointerConfig.showPointerStrip;
-    var pointerStripHeight = (_20 = pointerConfig === null || pointerConfig === void 0 ? void 0 : pointerConfig.pointerStripHeight) !== null && _20 !== void 0 ? _20 : defaultPointerConfig.pointerStripHeight;
-    var pointerStripWidth = (_21 = pointerConfig === null || pointerConfig === void 0 ? void 0 : pointerConfig.pointerStripWidth) !== null && _21 !== void 0 ? _21 : defaultPointerConfig.pointerStripWidth;
-    var pointerStripColor = (_22 = pointerConfig === null || pointerConfig === void 0 ? void 0 : pointerConfig.pointerStripColor) !== null && _22 !== void 0 ? _22 : defaultPointerConfig.pointerStripColor;
-    var pointerStripUptoDataPoint = (_23 = pointerConfig === null || pointerConfig === void 0 ? void 0 : pointerConfig.pointerStripUptoDataPoint) !== null && _23 !== void 0 ? _23 : defaultPointerConfig.pointerStripUptoDataPoint;
-    var pointerLabelComponent = (_24 = pointerConfig === null || pointerConfig === void 0 ? void 0 : pointerConfig.pointerLabelComponent) !== null && _24 !== void 0 ? _24 : defaultPointerConfig.pointerLabelComponent;
-    var stripOverPointer = (_25 = pointerConfig === null || pointerConfig === void 0 ? void 0 : pointerConfig.stripOverPointer) !== null && _25 !== void 0 ? _25 : defaultPointerConfig.stripOverPointer;
-    var shiftPointerLabelX = (_26 = pointerConfig === null || pointerConfig === void 0 ? void 0 : pointerConfig.shiftPointerLabelX) !== null && _26 !== void 0 ? _26 : defaultPointerConfig.shiftPointerLabelX;
-    var shiftPointerLabelY = (_27 = pointerConfig === null || pointerConfig === void 0 ? void 0 : pointerConfig.shiftPointerLabelY) !== null && _27 !== void 0 ? _27 : defaultPointerConfig.shiftPointerLabelY;
-    var pointerLabelWidth = (_28 = pointerConfig === null || pointerConfig === void 0 ? void 0 : pointerConfig.pointerLabelWidth) !== null && _28 !== void 0 ? _28 : defaultPointerConfig.pointerLabelWidth;
-    var pointerLabelHeight = (_29 = pointerConfig === null || pointerConfig === void 0 ? void 0 : pointerConfig.pointerLabelHeight) !== null && _29 !== void 0 ? _29 : defaultPointerConfig.pointerLabelHeight;
-    var autoAdjustPointerLabelPosition = (_30 = pointerConfig === null || pointerConfig === void 0 ? void 0 : pointerConfig.autoAdjustPointerLabelPosition) !== null && _30 !== void 0 ? _30 : defaultPointerConfig.autoAdjustPointerLabelPosition;
-    var pointerVanishDelay = (_31 = pointerConfig === null || pointerConfig === void 0 ? void 0 : pointerConfig.pointerVanishDelay) !== null && _31 !== void 0 ? _31 : defaultPointerConfig.pointerVanishDelay;
-    var activatePointersOnLongPress = (_32 = pointerConfig === null || pointerConfig === void 0 ? void 0 : pointerConfig.activatePointersOnLongPress) !== null && _32 !== void 0 ? _32 : defaultPointerConfig.activatePointersOnLongPress;
-    var activatePointersDelay = (_33 = pointerConfig === null || pointerConfig === void 0 ? void 0 : pointerConfig.activatePointersDelay) !== null && _33 !== void 0 ? _33 : defaultPointerConfig.activatePointersDelay;
-    var initialPointerIndex = (_34 = pointerConfig === null || pointerConfig === void 0 ? void 0 : pointerConfig.initialPointerIndex) !== null && _34 !== void 0 ? _34 : defaultPointerConfig.initialPointerIndex;
-    var initialPointerAppearDelay = (_35 = pointerConfig === null || pointerConfig === void 0 ? void 0 : pointerConfig.initialPointerAppearDelay) !== null && _35 !== void 0 ? _35 : (isAnimated
+    var pointerStripHeight = (_26 = pointerConfig === null || pointerConfig === void 0 ? void 0 : pointerConfig.pointerStripHeight) !== null && _26 !== void 0 ? _26 : defaultPointerConfig.pointerStripHeight;
+    var pointerStripWidth = (_27 = pointerConfig === null || pointerConfig === void 0 ? void 0 : pointerConfig.pointerStripWidth) !== null && _27 !== void 0 ? _27 : defaultPointerConfig.pointerStripWidth;
+    var pointerStripColor = (_28 = pointerConfig === null || pointerConfig === void 0 ? void 0 : pointerConfig.pointerStripColor) !== null && _28 !== void 0 ? _28 : defaultPointerConfig.pointerStripColor;
+    var pointerStripUptoDataPoint = (_29 = pointerConfig === null || pointerConfig === void 0 ? void 0 : pointerConfig.pointerStripUptoDataPoint) !== null && _29 !== void 0 ? _29 : defaultPointerConfig.pointerStripUptoDataPoint;
+    var pointerLabelComponent = (_30 = pointerConfig === null || pointerConfig === void 0 ? void 0 : pointerConfig.pointerLabelComponent) !== null && _30 !== void 0 ? _30 : defaultPointerConfig.pointerLabelComponent;
+    var stripOverPointer = (_31 = pointerConfig === null || pointerConfig === void 0 ? void 0 : pointerConfig.stripOverPointer) !== null && _31 !== void 0 ? _31 : defaultPointerConfig.stripOverPointer;
+    var shiftPointerLabelX = (_32 = pointerConfig === null || pointerConfig === void 0 ? void 0 : pointerConfig.shiftPointerLabelX) !== null && _32 !== void 0 ? _32 : defaultPointerConfig.shiftPointerLabelX;
+    var shiftPointerLabelY = (_33 = pointerConfig === null || pointerConfig === void 0 ? void 0 : pointerConfig.shiftPointerLabelY) !== null && _33 !== void 0 ? _33 : defaultPointerConfig.shiftPointerLabelY;
+    var pointerLabelWidth = (_34 = pointerConfig === null || pointerConfig === void 0 ? void 0 : pointerConfig.pointerLabelWidth) !== null && _34 !== void 0 ? _34 : defaultPointerConfig.pointerLabelWidth;
+    var pointerLabelHeight = (_35 = pointerConfig === null || pointerConfig === void 0 ? void 0 : pointerConfig.pointerLabelHeight) !== null && _35 !== void 0 ? _35 : defaultPointerConfig.pointerLabelHeight;
+    var autoAdjustPointerLabelPosition = (_36 = pointerConfig === null || pointerConfig === void 0 ? void 0 : pointerConfig.autoAdjustPointerLabelPosition) !== null && _36 !== void 0 ? _36 : defaultPointerConfig.autoAdjustPointerLabelPosition;
+    var pointerVanishDelay = (_37 = pointerConfig === null || pointerConfig === void 0 ? void 0 : pointerConfig.pointerVanishDelay) !== null && _37 !== void 0 ? _37 : defaultPointerConfig.pointerVanishDelay;
+    var activatePointersOnLongPress = (_38 = pointerConfig === null || pointerConfig === void 0 ? void 0 : pointerConfig.activatePointersOnLongPress) !== null && _38 !== void 0 ? _38 : defaultPointerConfig.activatePointersOnLongPress;
+    var activatePointersDelay = (_39 = pointerConfig === null || pointerConfig === void 0 ? void 0 : pointerConfig.activatePointersDelay) !== null && _39 !== void 0 ? _39 : defaultPointerConfig.activatePointersDelay;
+    var initialPointerIndex = (_40 = pointerConfig === null || pointerConfig === void 0 ? void 0 : pointerConfig.initialPointerIndex) !== null && _40 !== void 0 ? _40 : defaultPointerConfig.initialPointerIndex;
+    var initialPointerAppearDelay = (_41 = pointerConfig === null || pointerConfig === void 0 ? void 0 : pointerConfig.initialPointerAppearDelay) !== null && _41 !== void 0 ? _41 : (isAnimated
         ? animationDuration
         : defaultPointerConfig.initialPointerAppearDelay);
-    var persistPointer = (_36 = pointerConfig === null || pointerConfig === void 0 ? void 0 : pointerConfig.persistPointer) !== null && _36 !== void 0 ? _36 : defaultPointerConfig.persistPointer;
-    var hidePointer1 = (_37 = pointerConfig === null || pointerConfig === void 0 ? void 0 : pointerConfig.hidePointer1) !== null && _37 !== void 0 ? _37 : defaultPointerConfig.hidePointer1;
+    var persistPointer = (_42 = pointerConfig === null || pointerConfig === void 0 ? void 0 : pointerConfig.persistPointer) !== null && _42 !== void 0 ? _42 : defaultPointerConfig.persistPointer;
+    var hidePointer1 = (_43 = pointerConfig === null || pointerConfig === void 0 ? void 0 : pointerConfig.hidePointer1) !== null && _43 !== void 0 ? _43 : defaultPointerConfig.hidePointer1;
     var pointerEvents = pointerConfig === null || pointerConfig === void 0 ? void 0 : pointerConfig.pointerEvents;
-    var stripBehindBars = (_38 = pointerConfig === null || pointerConfig === void 0 ? void 0 : pointerConfig.stripBehindBars) !== null && _38 !== void 0 ? _38 : defaultPointerConfig.stripBehindBars;
-    var disableScroll = (_39 = props.disableScroll) !== null && _39 !== void 0 ? _39 : (pointerConfig
+    var stripBehindBars = (_44 = pointerConfig === null || pointerConfig === void 0 ? void 0 : pointerConfig.stripBehindBars) !== null && _44 !== void 0 ? _44 : defaultPointerConfig.stripBehindBars;
+    var disableScroll = (_45 = props.disableScroll) !== null && _45 !== void 0 ? _45 : (pointerConfig
         ? activatePointersOnLongPress
             ? !!responderActive
             : true
         : false);
     var yAxisExtraHeightAtTop = props.trimYAxisAtTop
         ? 0
-        : (_40 = props.yAxisExtraHeight) !== null && _40 !== void 0 ? _40 : containerHeight / 20;
+        : (_46 = props.yAxisExtraHeight) !== null && _46 !== void 0 ? _46 : containerHeight / 20;
     var barInnerComponent = props.barInnerComponent;
     useEffect(function () {
         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;
@@ -348,9 +391,9 @@ export var useBarChart = function (props) {
         spacing,
         yAxisLabelWidth,
         lineConfig.showArrow,
-        (_41 = lineConfig.arrowConfig) === null || _41 === void 0 ? void 0 : _41.length,
-        (_42 = lineConfig.arrowConfig) === null || _42 === void 0 ? void 0 : _42.width,
-        (_43 = lineConfig.arrowConfig) === null || _43 === void 0 ? void 0 : _43.showArrowBase
+        (_47 = lineConfig.arrowConfig) === null || _47 === void 0 ? void 0 : _47.length,
+        (_48 = lineConfig.arrowConfig) === null || _48 === void 0 ? void 0 : _48.width,
+        (_49 = lineConfig.arrowConfig) === null || _49 === void 0 ? void 0 : _49.showArrowBase
     ]);
     useEffect(function () {
         var _a, _b, _c, _d;
@@ -465,7 +508,13 @@ export var useBarChart = function (props) {
             stepValue: stepValue,
             negativeStepHeight: (_u = props.negativeStepHeight) !== null && _u !== void 0 ? _u : stepHeight,
             negativeStepValue: (_v = props.negativeStepValue) !== null && _v !== void 0 ? _v : stepValue,
-            secondaryXAxis: props.secondaryXAxis
+            secondaryXAxis: props.secondaryXAxis,
+            secondaryYAxis: props.secondaryYAxis,
+            secondaryStepHeight: secondaryStepHeight,
+            secondaryStepValue: secondaryStepValue,
+            secondaryNegativeStepHeight: secondaryNegativeStepHeight,
+            secondaryNegativeStepValue: secondaryNegativeStepValue,
+            secondaryNoOfSectionsBelowXAxis: secondaryNoOfSectionsBelowXAxis
         };
     };
     var barAndLineChartsWrapperProps = {
@@ -473,19 +522,19 @@ export var useBarChart = function (props) {
         containerHeight: containerHeight,
         noOfSectionsBelowXAxis: noOfSectionsBelowXAxis,
         stepHeight: stepHeight,
-        negativeStepHeight: (_44 = props.negativeStepHeight) !== null && _44 !== void 0 ? _44 : stepHeight,
+        negativeStepHeight: (_50 = props.negativeStepHeight) !== null && _50 !== void 0 ? _50 : stepHeight,
         labelsExtraHeight: labelsExtraHeight,
         yAxisLabelWidth: yAxisLabelWidth,
         horizontal: horizontal,
         rtl: rtl,
-        shiftX: (_45 = props.shiftX) !== null && _45 !== void 0 ? _45 : 0,
-        shiftY: (_46 = props.shiftY) !== null && _46 !== void 0 ? _46 : 0,
+        shiftX: (_51 = props.shiftX) !== null && _51 !== void 0 ? _51 : 0,
+        shiftY: (_52 = props.shiftY) !== null && _52 !== void 0 ? _52 : 0,
         yAxisAtTop: yAxisAtTop,
         initialSpacing: initialSpacing,
         data: data,
         stackData: props.stackData,
-        secondaryData: secondaryData,
-        barWidth: (_47 = props.barWidth) !== null && _47 !== void 0 ? _47 : defaultBarWidth,
+        // secondaryData,
+        barWidth: (_53 = props.barWidth) !== null && _53 !== void 0 ? _53 : defaultBarWidth,
         xAxisThickness: xAxisThickness,
         totalWidth: totalWidth,
         disableScroll: disableScroll,
@@ -517,7 +566,7 @@ export var useBarChart = function (props) {
         noOfSections: noOfSections,
         sectionColors: props.sectionColors,
         showFractionalValues: showFractionalValues,
-        axesAndRulesProps: getAxesAndRulesProps(props, stepValue, roundToDigits, negativeStepValue, secondaryMaxValue),
+        axesAndRulesProps: axesAndRulesProps,
         yAxisLabelTexts: props.yAxisLabelTexts,
         yAxisOffset: yAxisOffset,
         rotateYAxisTexts: props.rotateYAxisTexts,
@@ -534,7 +583,7 @@ export var useBarChart = function (props) {
         pointerY: pointerY,
         onEndReached: props.onEndReached,
         onStartReached: props.onStartReached,
-        endReachedOffset: (_48 = props.endReachedOffset) !== null && _48 !== void 0 ? _48 : BarDefaults.endReachedOffset,
+        endReachedOffset: (_54 = props.endReachedOffset) !== null && _54 !== void 0 ? _54 : BarDefaults.endReachedOffset,
         onMomentumScrollEnd: props.onMomentumScrollEnd
     };
     return {
@@ -615,7 +664,7 @@ export var useBarChart = function (props) {
         appearingOpacity: appearingOpacity,
         autoShiftLabels: autoShiftLabels,
         yAxisAtTop: yAxisAtTop,
-        secondaryData: secondaryData,
+        // secondaryData,
         disableScroll: disableScroll,
         showScrollIndicator: showScrollIndicator,
         scrollToEnd: scrollToEnd,

package/dist/BarChart/types.d.ts

@@ -56,6 +56,7 @@ export interface stackDataItem {
     onContextMenu?: Function;
     onMouseEnter?: Function;
     onMouseLeave?: Function;
+    isSecondary?: boolean;
 }
 export interface StackedBarChartPropsType {
     style?: any;
@@ -125,6 +126,15 @@ export interface StackedBarChartPropsType {
     pointerConfig?: Pointer;
     showValuesAsTopLabel?: boolean;
     yAxisOffset: number;
+    stepHeight: number;
+    stepValue: number;
+    negativeStepHeight: number;
+    negativeStepValue: number;
+    secondaryStepHeight: number;
+    secondaryStepValue: number;
+    secondaryNegativeStepHeight: number;
+    secondaryNegativeStepValue: number;
+    secondaryNoOfSectionsBelowXAxis: number;
 }
 export interface BarChartPropsType {
     width?: number;
@@ -287,7 +297,6 @@ export interface BarChartPropsType {
     leftShiftForLastIndexTooltip?: number;
     barStyle?: object;
     barInnerComponent?: (item?: stackDataItem | barDataItem, index?: number) => ReactNode;
-    secondaryData?: barDataItem[];
     secondaryYAxis?: secondaryYAxisType | boolean;
     pointerConfig?: Pointer;
     getPointerProps?: Function;
@@ -565,6 +574,7 @@ export interface RenderBarsPropsType {
     setSelectedIndex: Function;
     barStyle?: object;
     xAxisThickness?: number;
+    secondaryXAxis?: XAxisConfig;
     pointerConfig?: Pointer;
     focusBarOnPress?: boolean;
     focusedBarIndex?: number;
@@ -574,7 +584,11 @@ export interface RenderBarsPropsType {
     stepValue: number;
     negativeStepHeight: number;
     negativeStepValue: number;
-    secondaryXAxis?: XAxisConfig;
+    secondaryStepHeight: number;
+    secondaryStepValue: number;
+    secondaryNegativeStepHeight: number;
+    secondaryNegativeStepValue: number;
+    secondaryNoOfSectionsBelowXAxis: number;
 }
 export interface trianglePropTypes {
     style: any;

package/dist/LineChart/LineChartBiColor.js

@@ -419,7 +419,7 @@ export var useLineChartBiColor = function (props) {
         horizontalRulesStyle: horizontalRulesStyle,
         noOfSections: noOfSections,
         showFractionalValues: showFractionalValues,
-        axesAndRulesProps: getAxesAndRulesProps(props, stepValue, (_50 = props.roundToDigits) !== null && _50 !== void 0 ? _50 : 0, undefined),
+        axesAndRulesProps: getAxesAndRulesProps(props, containerHeight, stepHeight, stepValue, noOfSections, (_50 = props.roundToDigits) !== null && _50 !== void 0 ? _50 : 0, 0, 0, 0, false, 0),
         yAxisLabelTexts: props.yAxisLabelTexts,
         yAxisOffset: props.yAxisOffset,
         rotateYAxisTexts: 0,