Merge pull request #196 from Abhinandan-Kushwaha/abhi

Abhi
This commit is contained in:
Abhinandan Kushwaha 2022-05-21 03:23:34 +05:30 committed by GitHub
commit 651a2d3f59
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 2 deletions

View File

@ -297,6 +297,7 @@ type Pointer = {
pointerStripColor?: ColorValue; // default: 'black' pointerStripColor?: ColorValue; // default: 'black'
pointerStripUptoDataPoint?: boolean; // default: false pointerStripUptoDataPoint?: boolean; // default: false
pointerLabelComponent?: Function; // default: null pointerLabelComponent?: Function; // default: null
stripOverPointer?: boolean; // default: false
shiftPointerLabelX?: number; // default: 0 shiftPointerLabelX?: number; // default: 0
shiftPointerLabelY?: number; // default: 0 shiftPointerLabelY?: number; // default: 0
pointerLabelWidth?: number; // default: 20 pointerLabelWidth?: number; // default: 20

View File

@ -1,6 +1,6 @@
{ {
"name": "react-native-gifted-charts", "name": "react-native-gifted-charts",
"version": "1.2.20", "version": "1.2.21",
"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.", "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", "main": "src/index.tsx",
"files": [ "files": [

View File

@ -347,6 +347,7 @@ type Pointer = {
pointerStripColor?: ColorValue; pointerStripColor?: ColorValue;
pointerStripUptoDataPoint?: boolean; pointerStripUptoDataPoint?: boolean;
pointerLabelComponent?: Function; pointerLabelComponent?: Function;
stripOverPointer?: boolean;
autoAdjustPointerLabelPosition?: boolean; autoAdjustPointerLabelPosition?: boolean;
shiftPointerLabelX?: number; shiftPointerLabelX?: number;
shiftPointerLabelY?: number; shiftPointerLabelY?: number;
@ -1412,6 +1413,7 @@ export const LineChart = (props: propTypes) => {
pointerStripColor: 'black', pointerStripColor: 'black',
pointerStripUptoDataPoint: false, pointerStripUptoDataPoint: false,
pointerLabelComponent: null, pointerLabelComponent: null,
stripOverPointer: false,
shiftPointerLabelX: 0, shiftPointerLabelX: 0,
shiftPointerLabelY: 0, shiftPointerLabelY: 0,
pointerLabelWidth: 20, pointerLabelWidth: 20,
@ -1473,6 +1475,10 @@ export const LineChart = (props: propTypes) => {
pointerConfig && pointerConfig.pointerLabelComponent pointerConfig && pointerConfig.pointerLabelComponent
? pointerConfig.pointerLabelComponent ? pointerConfig.pointerLabelComponent
: defaultPointerConfig.pointerLabelComponent; : defaultPointerConfig.pointerLabelComponent;
const stripOverPointer =
pointerConfig && pointerConfig.stripOverPointer
? pointerConfig.stripOverPointer
: defaultPointerConfig.stripOverPointer;
const shiftPointerLabelX = const shiftPointerLabelX =
pointerConfig && pointerConfig.shiftPointerLabelX pointerConfig && pointerConfig.shiftPointerLabelX
? pointerConfig.shiftPointerLabelX ? pointerConfig.shiftPointerLabelX
@ -3469,12 +3475,13 @@ export const LineChart = (props: propTypes) => {
width: totalWidth, width: totalWidth,
zIndex: 20, zIndex: 20,
}}> }}>
{!stripOverPointer && renderStripAndLabel()}
{renderPointer(1)} {renderPointer(1)}
{points2 ? renderPointer(2) : null} {points2 ? renderPointer(2) : null}
{points3 ? renderPointer(3) : null} {points3 ? renderPointer(3) : null}
{points4 ? renderPointer(4) : null} {points4 ? renderPointer(4) : null}
{points5 ? renderPointer(5) : null} {points5 ? renderPointer(5) : null}
{renderStripAndLabel()} {stripOverPointer && renderStripAndLabel()}
</View> </View>
) : null} ) : null}
{data.map((item: itemType, index: number) => { {data.map((item: itemType, index: number) => {