react-native-gifted-charts 1.3.13 → 1.3.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-gifted-charts",
-  "version": "1.3.13",
+  "version": "1.3.15",
   "description": "The most complete library for Bar, Line, Area, Pie, Donut and Stacked Bar charts in React Native. Allows 2D, 3D, gradient, animations and live data updates.",
   "main": "src/index.tsx",
   "files": [

package/src/BarChart/RenderBars.tsx

@@ -341,57 +341,47 @@ const RenderBars = (props: Props) => {
       (data[i].barWidth || props.barWidth || 30);
   }
 
-  return (
-    <>
-      <TouchableOpacity
-        disabled={
-          item.disablePress ||
-          props.disablePress ||
-          (pointerConfig && pointerConfig.barTouchable !== false)
+  const barWrapperStyle = [
+    {
+      // overflow: 'visible',
+      marginBottom: 60 + barMarginBottom,
+      width: item.barWidth || props.barWidth || 30,
+      height: barHeight,
+      marginRight: spacing,
+    },
+    item.value < 0
+      ? {
+          transform: [
+            {
+              translateY:
+                (Math.abs(item.value) * (containerHeight || 200)) /
+                (maxValue || 200),
+            },
+            {rotateZ: '180deg'},
+          ],
         }
-        activeOpacity={props.activeOpacity || 0.2}
-        onPress={() => {
-          if (renderTooltip) {
-            setSelectedIndex(index);
-          }
-          item.onPress
-            ? item.onPress()
-            : props.onPress
-            ? props.onPress(item, index)
-            : null;
-        }}
-        style={[
-          {
-            // overflow: 'visible',
-            marginBottom: 60 + barMarginBottom,
-            width: item.barWidth || props.barWidth || 30,
-            height: barHeight,
-            marginRight: spacing,
-          },
-          item.value < 0
-            ? {
-                transform: [
-                  {
-                    translateY:
-                      (Math.abs(item.value) * (containerHeight || 200)) /
-                      (maxValue || 200),
-                  },
-                  {rotateZ: '180deg'},
-                ],
-              }
-            : pointerConfig
-            ? {
-                transform: [
-                  {
-                    translateY: (containerHeight || 200) - (barHeight - 10),
-                  },
-                ],
-              }
-            : null,
-          // !isThreeD && !item.showGradient && !props.showGradient &&
-          // { backgroundColor: item.frontColor || props.frontColor || 'black' },
-          side !== 'right' && {zIndex: data.length - index},
-        ]}>
+      : pointerConfig
+      ? {
+          transform: [
+            {
+              translateY: (containerHeight || 200) - (barHeight - 10),
+            },
+          ],
+        }
+      : null,
+    // !isThreeD && !item.showGradient && !props.showGradient &&
+    // { backgroundColor: item.frontColor || props.frontColor || 'black' },
+    side !== 'right' && {zIndex: data.length - index},
+  ];
+
+  const pressDisabled =
+    item.disablePress ||
+    props.disablePress ||
+    (pointerConfig && pointerConfig.barTouchable !== true);
+
+  const barContent = () => {
+    return (
+      <>
         {(props.showXAxisIndices || item.showXAxisIndex) && (
           <View
             style={{
@@ -569,7 +559,33 @@ const RenderBars = (props: Props) => {
         {isAnimated
           ? renderAnimatedLabel(label, labelTextStyle, item.value)
           : renderLabel(label, labelTextStyle, item.value)}
-      </TouchableOpacity>
+      </>
+    );
+  };
+
+  return (
+    <>
+      {pressDisabled ? (
+        <View pointerEvents="none" style={barWrapperStyle}>
+          {barContent()}
+        </View>
+      ) : (
+        <TouchableOpacity
+          activeOpacity={props.activeOpacity || 0.2}
+          onPress={() => {
+            if (renderTooltip) {
+              setSelectedIndex(index);
+            }
+            item.onPress
+              ? item.onPress()
+              : props.onPress
+              ? props.onPress(item, index)
+              : null;
+          }}
+          style={barWrapperStyle}>
+          {barContent()}
+        </TouchableOpacity>
+      )}
       {renderTooltip && selectedIndex === index && (
         <View
           style={{

package/src/BarChart/index.tsx

@@ -565,6 +565,7 @@ export const BarChart = (props: BarChartPropsType) => {
       pointerStripColor,
       pointerConfig,
       pointerLabelComponent,
+      scrollX: 0,
     });
   };
 

package/src/Components/common/StripAndLabel.tsx

@@ -26,6 +26,7 @@ export const StripAndLabel = props => {
     pointerConfig,
     pointerLabelComponent,
     secondaryPointerItem,
+    scrollX,
   } = props;
   let left = 0,
     top = 0;

package/src/LineChart/index.tsx

@@ -1450,6 +1450,13 @@ export const LineChart = (props: LineChartPropsType) => {
   const containerHeightIncludingBelowXAxis =
     extendedContainerHeight + noOfSectionsBelowXAxis * stepHeight;
 
+  const lineGradient = props.lineGradient ?? LineDefaults.lineGradient;
+  const lineGradientDirection = props.lineGradientDirection ?? 'vertical';
+  const lineGradientStartColor =
+    props.lineGradientStartColor ?? LineDefaults.lineGradientStartColor;
+  const lineGradientEndColor =
+    props.lineGradientEndColor ?? LineDefaults.lineGradientEndColor;
+
   const renderLabel = (
     index: number,
     label: String,
@@ -1637,7 +1644,7 @@ export const LineChart = (props: LineChartPropsType) => {
       const currentStripWidth = item.stripWidth ?? stripWidth;
       const currentStripOpacity = item.stripOpacity ?? stripOpacity;
       const currentStripColor = item.stripColor || stripColor;
-      const position= I18nManager.isRTL ?  "right" :"left";
+      const position = I18nManager.isRTL ? 'right' : 'left';
 
       return (
         <Fragment key={index}>
@@ -1698,8 +1705,9 @@ export const LineChart = (props: LineChartPropsType) => {
                       height: dataPointsHeight,
                       width: dataPointsWidth,
                       top: getYOrSecondaryY(item.value),
-                      [position]: initialSpacing - dataPointsWidth + spacing * index,
-                      transform: [{ scaleX: I18nManager.isRTL ? -1 : 1 }],
+                      [position]:
+                        initialSpacing - dataPointsWidth + spacing * index,
+                      transform: [{scaleX: I18nManager.isRTL ? -1 : 1}],
                     },
                   ]}>
                   {customDataPoint()}
@@ -1977,9 +1985,55 @@ export const LineChart = (props: LineChartPropsType) => {
       pointerConfig,
       pointerLabelComponent,
       secondaryPointerItem,
+      scrollX,
     });
   };
 
+  const getLineGradientComponent = () => {
+    return props.lineGradientComponent ? (
+      props.lineGradientComponent()
+    ) : (
+      <LinearGradient
+        id="lineGradient"
+        x1="0"
+        y1="0"
+        x2={lineGradientDirection === 'horizontal' ? '1' : '0'}
+        y2={lineGradientDirection === 'vertical' ? '1' : '0'}>
+        <Stop offset="0" stopColor={lineGradientStartColor} />
+        <Stop offset="1" stopColor={lineGradientEndColor} />
+      </LinearGradient>
+    );
+  };
+
+  const getAreaGradientComponent = (
+    startFillColor: string,
+    endFillColor: string,
+    startOpacity: number,
+    endOpacity: number,
+  ) => {
+    return props.areaGradientComponent ? (
+      props.areaGradientComponent()
+    ) : (
+      <LinearGradient
+        id="Gradient"
+        x1="0"
+        y1="0"
+        x2={gradientDirection === 'horizontal' ? '1' : '0'}
+        y2={gradientDirection === 'vertical' ? '1' : '0'}>
+        <Stop
+          offset="0"
+          stopColor={startFillColor}
+          stopOpacity={startOpacity.toString()}
+        />
+        <Stop
+          offset="1"
+          stopColor={endFillColor}
+          stopOpacity={endOpacity.toString()}
+        />
+      </LinearGradient>
+    );
+  };
+
   const lineSvgComponent = (
     points: any,
     currentLineThickness: number | undefined,
@@ -1998,6 +2052,7 @@ export const LineChart = (props: LineChartPropsType) => {
   ) => {
     return (
       <Svg>
+        {lineGradient && getLineGradientComponent()}
         {strokeDashArray &&
         strokeDashArray.length === 2 &&
         typeof strokeDashArray[0] === 'number' &&
@@ -2005,7 +2060,13 @@ export const LineChart = (props: LineChartPropsType) => {
           <Path
             d={points}
             fill="none"
-            stroke={color}
+            stroke={
+              lineGradient
+                ? props.lineGradientId
+                  ? `url(#${props.lineGradientId})`
+                  : `url(#lineGradient)`
+                : color
+            }
             strokeWidth={currentLineThickness || thickness}
             strokeDasharray={strokeDashArray}
           />
@@ -2013,36 +2074,34 @@ export const LineChart = (props: LineChartPropsType) => {
           <Path
             d={points}
             fill="none"
-            stroke={color}
+            stroke={
+              lineGradient
+                ? props.lineGradientId
+                  ? `url(#${props.lineGradientId})`
+                  : `url(#lineGradient)`
+                : color
+            }
             strokeWidth={currentLineThickness || thickness}
           />
         )}
 
         {/***********************      For Area Chart        ************/}
 
-        {atLeastOneAreaChart && (
-          <LinearGradient
-            id="Gradient"
-            x1="0"
-            y1="0"
-            x2={gradientDirection === 'horizontal' ? '1' : '0'}
-            y2={gradientDirection === 'vertical' ? '1' : '0'}>
-            <Stop
-              offset="0"
-              stopColor={startFillColor}
-              stopOpacity={startOpacity.toString()}
-            />
-            <Stop
-              offset="1"
-              stopColor={endFillColor}
-              stopOpacity={endOpacity.toString()}
-            />
-          </LinearGradient>
-        )}
+        {atLeastOneAreaChart &&
+          getAreaGradientComponent(
+            startFillColor,
+            endFillColor,
+            startOpacity,
+            endOpacity,
+          )}
         {atLeastOneAreaChart && (
           <Path
             d={fillPoints}
-            fill="url(#Gradient)"
+            fill={
+              props.areaGradientId
+                ? `url(#${props.areaGradientId})`
+                : `url(#Gradient)`
+            }
             stroke={'transparent'}
             strokeWidth={currentLineThickness || thickness}
           />
@@ -2408,7 +2467,7 @@ export const LineChart = (props: LineChartPropsType) => {
             (props.overflowBottom ?? dataPointsRadius1),
           width: totalWidth,
           zIndex: zIndex,
-          transform: [{ scaleX: I18nManager.isRTL ? -1 : 1 }],
+          transform: [{scaleX: I18nManager.isRTL ? -1 : 1}],
         }}>
         {lineSvgComponent(
           points,
@@ -2673,7 +2732,7 @@ export const LineChart = (props: LineChartPropsType) => {
             (props.overflowBottom ?? dataPointsRadius1),
           width: animatedWidth,
           zIndex: zIndex,
-          transform: [{ scaleX: I18nManager.isRTL ? -1 : 1 }],
+          transform: [{scaleX: I18nManager.isRTL ? -1 : 1}],
           // backgroundColor: 'wheat',
         }}>
         {lineSvgComponent(

package/src/LineChart/types.ts

@@ -234,6 +234,9 @@ export type LineChartPropsType = {
   endOpacity5?: number;
   gradientDirection?: string;
 
+  areaGradientComponent?: () => any;
+  areaGradientId?: string;
+
   textFontSize?: number;
   textColor?: string;
   textFontSize1?: number;
@@ -281,6 +284,12 @@ export type LineChartPropsType = {
   secondaryYAxis?: secondaryYAxisType;
   secondaryLineConfig?: secondaryLineConfigType;
   formatYLabel?: (label: string) => string;
+  lineGradient?: boolean;
+  lineGradientComponent?: () => any;
+  lineGradientId?: string;
+  lineGradientDirection?: string;
+  lineGradientStartColor?: string;
+  lineGradientEndColor?: string;
 };
 
 type referenceConfigType = {

package/src/utils/constants.ts

@@ -190,6 +190,9 @@ export const LineDefaults = {
 
   startFillColor: 'gray',
   endFillColor: 'white',
+  lineGradient: false,
+  lineGradientStartColor: 'lightgreen',
+  lineGradientEndColor: 'orange',
   startOpacity: 1,
   endOpacity: 1,