react-native-gifted-charts 1.4.57 → 1.4.59

package/README.md

@@ -7,7 +7,7 @@
   <a href="https://www.npmjs.com/package/react-native-gifted-charts">
     <img src="/demos/npmIcon.png" height="auto" width="28" height="28" />
   </a> &nbsp; &nbsp;
-  <a href="https://discord.gg/ptdwsw48">
+  <a href="https://discord.gg/FBbu9duJxs">
     <img src="/demos/discord.png" height="auto" width="30" height="30" />
   </a>
 </p>

package/dist/BarChart/RenderStackBars.js

@@ -25,7 +25,29 @@ var RenderStackBars = function (props) {
     var barBackgroundPattern = props.barBackgroundPattern, patternId = props.patternId, stackData = props.stackData, item = props.item, index = props.index, containerHeight = props.containerHeight, spacing = props.spacing, rotateLabel = props.rotateLabel, label = props.label, labelTextStyle = props.labelTextStyle, xAxisTextNumberOfLines = props.xAxisTextNumberOfLines, xAxisLabelsVerticalShift = props.xAxisLabelsVerticalShift, renderTooltip = props.renderTooltip, selectedIndex = props.selectedIndex, setSelectedIndex = props.setSelectedIndex, activeOpacity = props.activeOpacity, _b = props.animationDuration, animationDuration = _b === void 0 ? BarDefaults.animationDuration : _b, barBorderWidth = props.barBorderWidth, barBorderColor = props.barBorderColor, stackBorderRadius = props.stackBorderRadius, stackBorderTopLeftRadius = props.stackBorderTopLeftRadius, stackBorderTopRightRadius = props.stackBorderTopRightRadius, stackBorderBottomLeftRadius = props.stackBorderBottomLeftRadius, stackBorderBottomRightRadius = props.stackBorderBottomRightRadius, showValuesAsTopLabel = props.showValuesAsTopLabel, _c = props.autoShiftLabelsForNegativeStacks, autoShiftLabelsForNegativeStacks = _c === void 0 ? true : _c, _d = props.labelsDistanceFromXaxis, labelsDistanceFromXaxis = _d === void 0 ? 0 : _d, horizontal = props.horizontal, secondaryStepHeight = props.secondaryStepHeight, secondaryStepValue = props.secondaryStepValue, secondaryNegativeStepHeight = props.secondaryNegativeStepHeight, secondaryNegativeStepValue = props.secondaryNegativeStepValue, barMarginBottom = props.barMarginBottom, highlightEnabled = props.highlightEnabled, highlightedBarIndex = props.highlightedBarIndex, lowlightOpacity = props.lowlightOpacity, stackHighlightEnabled = props.stackHighlightEnabled, selectedStackIndex = props.selectedStackIndex, setSelectedStackIndex = props.setSelectedStackIndex;
     var _e = useRenderStackBars(__assign(__assign({}, props), { secondaryStepHeight: secondaryStepHeight, secondaryStepValue: secondaryStepValue, secondaryNegativeStepHeight: secondaryNegativeStepHeight, secondaryNegativeStepValue: secondaryNegativeStepValue })), containsNegativeValue = _e.containsNegativeValue, noAnimation = _e.noAnimation, localBarInnerComponent = _e.localBarInnerComponent, borderRadius = _e.borderRadius, borderTopLeftRadius = _e.borderTopLeftRadius, borderTopRightRadius = _e.borderTopRightRadius, borderBottomLeftRadius = _e.borderBottomLeftRadius, borderBottomRightRadius = _e.borderBottomRightRadius, disablePress = _e.disablePress, totalHeight = _e.totalHeight, height = _e.height, setHeight = _e.setHeight, getBarHeight = _e.getBarHeight, getPosition = _e.getPosition, lowestBarPosition = _e.lowestBarPosition, getStackBorderRadii = _e.getStackBorderRadii, tooltipProps = _e.tooltipProps;
     var renderLabel = function (label, labelTextStyle) {
-        return (_jsx(View, { style: [
+        return (_jsx(TouchableOpacity, { disabled: disablePress || (stackHighlightEnabled && !highlightEnabled), activeOpacity: activeOpacity, onPress: function () {
+                setSelectedIndex(index);
+                if (item.onPress) {
+                    item.onPress();
+                }
+                else if (props.onPress) {
+                    props.onPress(item, index);
+                }
+            }, onLongPress: function () {
+                if (item.onLongPress) {
+                    item.onLongPress();
+                }
+                else if (props.onLongPress) {
+                    props.onLongPress(item, index);
+                }
+            }, onPressOut: function () {
+                if (item.onPressOut) {
+                    item.onPressOut();
+                }
+                else if (props.onPressOut) {
+                    props.onPressOut(item, index);
+                }
+            }, style: [
                 {
                     width: (item.labelWidth ||
                         props.labelWidth ||
@@ -34,7 +56,7 @@ var RenderStackBars = function (props) {
                         30) +
                         spacing / 2,
                     position: 'absolute',
-                    bottom: autoShiftLabelsForNegativeStacks
+                    bottom: !labelsDistanceFromXaxis && autoShiftLabelsForNegativeStacks
                         ? containsNegativeValue
                             ? -0
                             : -6 - xAxisTextNumberOfLines * 18

package/dist/BarChart/index.js

@@ -201,12 +201,14 @@ export var BarChart = function (props) {
         }
         else {
             return (_jsx(Pressable, { style: contentContainerStyle, onPress: function () {
+                    var _a;
                     if (props.highlightEnabled && selectedIndex !== -1)
                         setSelectedIndex(-1);
                     if (props.stackHighlightEnabled && selectedStackIndex !== -1) {
                         setSelectedStackIndex(-1);
                         // props.setHighlightedStackIndex?.(-1)
                     }
+                    (_a = props.onBackgroundPress) === null || _a === void 0 ? void 0 : _a.call(props);
                 }, children: renderChart() }));
         }
     };

package/dist/Components/common/Pointer.js

@@ -1,14 +1,14 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { View } from 'react-native';
 export var Pointer = function (props) {
-    var pointerX = props.pointerX, pointerYLocal = props.pointerYLocal, pointerComponent = props.pointerComponent, pointerHeight = props.pointerHeight, pointerRadius = props.pointerRadius, pointerWidth = props.pointerWidth, pointerItemLocal = props.pointerItemLocal, pointerColorLocal = props.pointerColorLocal;
+    var pointerX = props.pointerX, pointerYLocal = props.pointerYLocal, pointerComponent = props.pointerComponent, pointerHeight = props.pointerHeight, pointerRadius = props.pointerRadius, pointerWidth = props.pointerWidth, pointerItemLocal = props.pointerItemLocal, pointerColorLocal = props.pointerColorLocal, pointerIndex = props.pointerIndex;
     if (isNaN(pointerYLocal) || typeof pointerYLocal !== 'number')
         return null;
     return (_jsx(View, { style: {
             position: 'absolute',
             left: pointerX + 1 + (pointerX.pointerShiftX || 0),
             top: pointerYLocal - 4,
-        }, children: pointerComponent ? (pointerComponent()) : (_jsx(View, { style: {
+        }, children: pointerComponent ? (pointerComponent(pointerItemLocal, pointerIndex)) : (_jsx(View, { style: {
                 height: pointerHeight || pointerRadius * 2,
                 width: pointerWidth || pointerRadius * 2,
                 marginTop: (pointerItemLocal === null || pointerItemLocal === void 0 ? void 0 : pointerItemLocal.pointerShiftY) || 0,

package/dist/LineChart/index.js

@@ -301,7 +301,10 @@ export var LineChart = function (props) {
                         item.customDataPoint ||
                         props.customDataPoint;
                 dataPointLabelComponent =
-                    item.focusedDataPointLabelComponent || item.dataPointLabelComponent;
+                    item.focusedDataPointLabelComponent ||
+                        item.dataPointLabelComponent ||
+                        props.focusedDataPointLabelComponent ||
+                        props.dataPointLabelComponent;
             }
             else {
                 dataPointsShape = item.dataPointShape || dataPtsShape;
@@ -313,7 +316,8 @@ export var LineChart = function (props) {
                     text = '';
                 }
                 customDataPoint = item.customDataPoint || props.customDataPoint;
-                dataPointLabelComponent = item.dataPointLabelComponent;
+                dataPointLabelComponent =
+                    item.dataPointLabelComponent || props.dataPointLabelComponent;
             }
             if (showValuesAsDataPointsText) {
                 text = originalDataFromProps[index].value;
@@ -380,7 +384,7 @@ export var LineChart = function (props) {
                                     dataPointsHeight / 2 +
                                     (item.textShiftY || props.textShiftY || 0), children: !showTextOnFocus && !showValuesAsDataPointsText
                                     ? item.dataPointText
-                                    : text })) : null) : null] }))] }, index));
+                                    : text })) : null) : null, index === selectedIndex ? _jsx(Text, { children: '' }) : null] }))] }, index));
         });
     };
     var renderSpecificVerticalLines = function (dataForRender, spacingArray) {
@@ -426,6 +430,7 @@ export var LineChart = function (props) {
                         pointerWidth: pointerWidth,
                         pointerItemLocal: pointerItemLocal_1,
                         pointerColorLocal: pointerColorLocal_1,
+                        pointerIndex: pIndex,
                     }) }, 'dSetPts' + index));
             });
         }
@@ -490,6 +495,7 @@ export var LineChart = function (props) {
             pointerWidth: pointerWidth,
             pointerItemLocal: pointerItemLocal,
             pointerColorLocal: pointerColorLocal,
+            pointerIndex: pointerIndex,
         });
     };
     var renderStripAndLabel = function () {
@@ -658,7 +664,8 @@ export var LineChart = function (props) {
     //   return i-1;
     // }
     var activatePointers = function (x) {
-        var factor = (x - initialSpacing) / spacing; // getClosestValueFromSpacingArray(cumulativeSpacing1,x-initialSpacing)
+        var _a;
+        var factor = (x - initialSpacing) / ((_a = props.spacing1) !== null && _a !== void 0 ? _a : spacing); // getClosestValueFromSpacingArray(cumulativeSpacing1,x-initialSpacing)
         factor = Math.round(factor);
         factor = Math.min(factor, (data0 !== null && data0 !== void 0 ? data0 : data).length - 1);
         factor = Math.max(factor, 0);
@@ -790,6 +797,9 @@ export var LineChart = function (props) {
                     setResponderActive(true);
                 }
                 var x = evt.nativeEvent.locationX;
+                var px = evt.nativeEvent.pageX;
+                if (yAxisLabelWidth != -1 && x == px)
+                    return; // if locationX and pageX are equal, it means pointer has gone out of the chart, but this is not the case when yAxisLabelWidth is -1
                 if (!activatePointersOnLongPress &&
                     x > (props.width || Dimensions.get('window').width))
                     return;

package/dist/PieChart/index.js

@@ -79,7 +79,7 @@ export var PieChart = function (props) {
                         borderRightWidth: 0.5,
                         borderRightColor: innerCircleColor,
                     },
-                ], children: _jsx(View, { style: { marginTop: semiCircle ? -0.5 * innerRadius : 0 }, children: props.centerLabelComponent ? props.centerLabelComponent() : null }) }));
+                ], children: _jsx(View, { style: { marginTop: semiCircle ? -0.5 * innerRadius : 0 }, children: props.centerLabelComponent ? props.centerLabelComponent(selectedIndex) : null }) }));
         }
         return null;
     };

package/dist/PieChart/main.js

@@ -105,8 +105,10 @@ export var PieChartMain = function (props) {
                                         : item.color || pieColors[index % 9] }, index + 'a'));
                         })), (showText || showInnerComponent || showExternalLabels) &&
                             data.map(function (item, index) {
-                                var _a, _b, _c, _d, _e, _f, _g;
+                                var _a, _b, _c, _d, _e, _f, _g, _h, _j;
                                 var localPieInnerComponent = (_a = item.pieInnerComponent) !== null && _a !== void 0 ? _a : props.pieInnerComponent;
+                                var pieInnerComponentHeight = (_b = props.pieInnerComponentHeight) !== null && _b !== void 0 ? _b : 0;
+                                var pieInnerComponentWidth = (_c = props.pieInnerComponentWidth) !== null && _c !== void 0 ? _c : 0;
                                 if (isBiggerPie && index)
                                     return null;
                                 if (!props.data[index].value)
@@ -146,14 +148,14 @@ export var PieChartMain = function (props) {
                                         y = cy;
                                     }
                                 }
-                                var _h = getExternaLabelProperties(item, mx, my, cx, cy, prevSide, prevLabelComponentX, index === data.length - 1, // isLast
-                                wasFirstItemOnPole), labelLineColor = _h.labelLineColor, labelLineThickness = _h.labelLineThickness, labelComponentHeight = _h.labelComponentHeight, inX = _h.inX, inY = _h.inY, outX = _h.outX, outY = _h.outY, finalX = _h.finalX, labelComponentX = _h.labelComponentX, labelComponentY = _h.labelComponentY, localExternalLabelComponent = _h.localExternalLabelComponent, isRightHalf = _h.isRightHalf;
+                                var _k = getExternaLabelProperties(item, mx, my, cx, cy, prevSide, prevLabelComponentX, index === data.length - 1, // isLast
+                                wasFirstItemOnPole), labelLineColor = _k.labelLineColor, labelLineThickness = _k.labelLineThickness, labelComponentHeight = _k.labelComponentHeight, inX = _k.inX, inY = _k.inY, outX = _k.outX, outY = _k.outY, finalX = _k.finalX, labelComponentX = _k.labelComponentX, labelComponentY = _k.labelComponentY, localExternalLabelComponent = _k.localExternalLabelComponent, isRightHalf = _k.isRightHalf;
                                 prevSide = isRightHalf ? 'right' : 'left';
                                 prevLabelComponentX = labelComponentX;
                                 if (index === 0)
                                     wasFirstItemOnPole = labelComponentY !== outY;
-                                return (_jsxs(React.Fragment, { children: [showExternalLabels ? (_jsxs(G, { children: [_jsx(Line, { x1: inX, x2: outX, y1: inY, y2: outY, stroke: labelLineColor, strokeWidth: labelLineThickness }), _jsx(Line, { x1: outX, x2: finalX, y1: outY, y2: outY, stroke: labelLineColor, strokeWidth: labelLineThickness }), localExternalLabelComponent ? (_jsx(G, { x: labelComponentX, y: labelComponentY + labelComponentHeight / 2, children: (_b = localExternalLabelComponent === null || localExternalLabelComponent === void 0 ? void 0 : localExternalLabelComponent(item, index)) !== null && _b !== void 0 ? _b : null })) : null] })) : null, showTextBackground ? (_jsx(Circle, { cx: x + ((_d = (_c = item.shiftTextBackgroundX) !== null && _c !== void 0 ? _c : item.shiftTextX) !== null && _d !== void 0 ? _d : 0), cy: y +
-                                                ((_f = (_e = item.shiftTextBackgroundY) !== null && _e !== void 0 ? _e : item.shiftTextY) !== null && _f !== void 0 ? _f : 0) -
+                                return (_jsxs(React.Fragment, { children: [showExternalLabels ? (_jsxs(G, { children: [_jsx(Line, { x1: inX, x2: outX, y1: inY, y2: outY, stroke: labelLineColor, strokeWidth: labelLineThickness }), _jsx(Line, { x1: outX, x2: finalX, y1: outY, y2: outY, stroke: labelLineColor, strokeWidth: labelLineThickness }), localExternalLabelComponent ? (_jsx(G, { x: labelComponentX, y: labelComponentY + labelComponentHeight / 2, children: (_d = localExternalLabelComponent === null || localExternalLabelComponent === void 0 ? void 0 : localExternalLabelComponent(item, index)) !== null && _d !== void 0 ? _d : null })) : null] })) : null, showTextBackground ? (_jsx(Circle, { cx: x + ((_f = (_e = item.shiftTextBackgroundX) !== null && _e !== void 0 ? _e : item.shiftTextX) !== null && _f !== void 0 ? _f : 0), cy: y +
+                                                ((_h = (_g = item.shiftTextBackgroundY) !== null && _g !== void 0 ? _g : item.shiftTextY) !== null && _h !== void 0 ? _h : 0) -
                                                 (item.textSize || textSize) / 4, r: item.textBackgroundRadius ||
                                                 props.textBackgroundRadius ||
                                                 item.textSize ||
@@ -161,7 +163,7 @@ export var PieChartMain = function (props) {
                                                 textColor ||
                                                 pieColors[(index + 2) % 9], fontSize: item.textSize || textSize, fontFamily: item.font || font, fontWeight: item.fontWeight || fontWeight, fontStyle: item.fontStyle || fontStyle || 'normal', x: x +
                                                 (item.shiftTextX || 0) -
-                                                (item.textSize || textSize) / 1.8, y: y + (item.shiftTextY || 0), children: item.text || (showValuesAsLabels ? item.value + '' : '') })), localPieInnerComponent ? (_jsx(G, { x: x, y: y, children: (_g = localPieInnerComponent === null || localPieInnerComponent === void 0 ? void 0 : localPieInnerComponent(item, index)) !== null && _g !== void 0 ? _g : null })) : null] }, index));
+                                                (item.textSize || textSize) / 1.8, y: y + (item.shiftTextY || 0), children: item.text || (showValuesAsLabels ? item.value + '' : '') })), localPieInnerComponent ? (_jsx(G, { x: x - pieInnerComponentHeight / 2, y: y - pieInnerComponentWidth / 2, children: (_j = localPieInnerComponent === null || localPieInnerComponent === void 0 ? void 0 : localPieInnerComponent(item, index)) !== null && _j !== void 0 ? _j : null })) : null] }, index));
                             })] }), isThreeD && shadow && !semiCircle ? (_jsx(View, { style: {
                         width: radius * 2,
                         height: radius * 2,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-gifted-charts",
-  "version": "1.4.57",
+  "version": "1.4.59",
   "description": "The most complete library for Bar, Line, Area, Pie, Donut, Stacked Bar, Population Pyramid and Radar charts in React Native. Allows 2D, 3D, gradient, animations and live data updates.",
   "main": "dist/index.js",
   "files": [
@@ -26,7 +26,7 @@
     "registry": "https://registry.npmjs.org/"
   },
   "dependencies": {
-    "gifted-charts-core": "0.1.59"
+    "gifted-charts-core": "0.1.61"
   },
   "devDependencies": {
     "@babel/cli": "^7.24.8",