react-native-gifted-charts 1.4.5 → 1.4.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-gifted-charts",
-  "version": "1.4.5",
+  "version": "1.4.7",
   "description": "The most complete library for Bar, Line, Area, Pie, Donut, Stacked Bar and Population Pyramid charts in React Native. Allows 2D, 3D, gradient, animations and live data updates.",
   "main": "src/index.tsx",
   "files": [
@@ -24,7 +24,7 @@
     "registry": "https://registry.npmjs.org/"
   },
   "dependencies": {
-    "gifted-charts-core": "^0.0.15"
+    "gifted-charts-core": "^0.0.21"
   },
   "devDependencies": {
     "@babel/core": "^7.22.5",

package/src/LineChart/index.tsx

@@ -31,13 +31,14 @@ import {
   lineDataItem,
   LineSvgProps,
   useLineChart,
+  adjustToOffset,
 } from 'gifted-charts-core';
 import BarAndLineChartsWrapper from '../Components/BarAndLineChartsWrapper';
 import {StripAndLabel} from '../Components/common/StripAndLabel';
 import {Pointer} from '../Components/common/Pointer';
 
 let initialData: Array<lineDataItem> | null = null;
-let animations: Array<any> = [];
+let animations: Array<Animated.Value> = [];
 
 export const LineChart = (props: LineChartPropsType) => {
   const scrollRef = props.scrollRef ?? useRef(null);
@@ -48,6 +49,11 @@ export const LineChart = (props: LineChartPropsType) => {
   const widthValue4 = useMemo(() => new Animated.Value(0), []);
   const widthValue5 = useMemo(() => new Animated.Value(0), []);
 
+  if (!initialData) {
+    initialData = props.dataSet?.[0]?.data ?? props.data ?? [];
+    animations = initialData.map(item => new Animated.Value(item.value));
+  }
+
   const {
     scrollX,
     setScrollX,
@@ -295,11 +301,6 @@ export const LineChart = (props: LineChartPropsType) => {
     barAndLineChartsWrapperProps,
   } = useLineChart({...props, animations});
 
-  if (!initialData) {
-    initialData = data0 ?? [...data];
-    animations = initialData?.map(item => new Animated.Value(item.value));
-  }
-
   const widthValuesFromSet = useMemo(
     () => dataSet?.map(set => new Animated.Value(0)),
     [],
@@ -1120,14 +1121,10 @@ export const LineChart = (props: LineChartPropsType) => {
 
         {dataSet?.map(set => renderSpecificVerticalLines(set?.data)) ?? null}
         {dataSet?.map(set => {
-          const setData = set.data.map(item => {
-            item.value = item.value - (props.yAxisOffset ?? 0);
-            return item;
-          });
           return renderDataPoints(
             set.hideDataPoints ?? hideDataPoints1,
-            setData,
             set.data,
+            adjustToOffset(set.data, -(props.yAxisOffset ?? 0)), // need the actual values passed by user
             set.dataPointsShape ?? dataPointsShape1,
             set.dataPointsWidth ?? dataPointsWidth1,
             set.dataPointsHeight ?? dataPointsHeight1,

package/src/PieChart/index.tsx

@@ -135,6 +135,8 @@ export const PieChart = (props: PieChartPropsType) => {
                     props.data[selectedIndex].strokeWidth || undefined,
                   gradientCenterColor:
                     props.data[selectedIndex].gradientCenterColor || undefined,
+                  shiftTextX: props.data[selectedIndex].shiftTextX || undefined,
+                  shiftTextY: props.data[selectedIndex].shiftTextY || undefined,
                 },
                 {
                   value: total - props.data[selectedIndex].value,

package/src/PieChart/main.tsx

@@ -264,8 +264,12 @@ export const PieChartMain = (props: PieChartMainProps) => {
                 {/* <Line x1={mx} x2={cx} y1={my} y2={cy} stroke="black" /> */}
                 {showTextBackground ? (
                   <Circle
-                    cx={x}
-                    cy={y - (item.textSize || textSize) / 4}
+                    cx={x + (item.shiftTextBackgroundX ?? item.shiftTextX ?? 0)}
+                    cy={
+                      y +
+                      (item.shiftTextBackgroundY ?? item.shiftTextY ?? 0) -
+                      (item.textSize || textSize) / 4
+                    }
                     r={
                       item.textBackgroundRadius ||
                       props.textBackgroundRadius ||