Skip to content

Add draggable value indicator to LineChart #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Fadikk367 wants to merge 1 commit into
base: next
Choose a base branch
from
Open

Add draggable value indicator to LineChart #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion example/src/screens/components/LineChart/LineChart.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ const LineChartScreen = () => {
const [horizontalLinesShown, setHorizontalLinesShown] = useState(false);
const [verticalLinesShown, setVerticalLinesShown] = useState(false);
const [showArrows, setShowArrows] = useState(false);
const [exactValue, setExactValue] = useState<number | undefined>(undefined);

const xLabels = utils.linspace(0, 100, 10);
const yLabels = utils.linspace(0, 100, 20);
Expand Down Expand Up @@ -59,10 +60,17 @@ const LineChartScreen = () => {
},
},
}}
font={LatoRegular}>
font={LatoRegular}
onIndicatorChange={v => setExactValue(v.y)}>
<Line color="red" strokeWidth={3} data={dataset1} />
<Line color="blue" strokeWidth={5} data={dataset2} />
</LineChart>
<View style={styles.row}>
<Text style={styles.switchLabel}>Value:</Text>
{exactValue ? (
<Text style={styles.switchLabel}>{exactValue}</Text>
) : null}
</View>
<View style={styles.row}>
<Text style={styles.switchLabel}>Show horizontal lines:</Text>
<Switch
Expand Down
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@
"@release-it/conventional-changelog": "^5.0.0",
"@trivago/prettier-plugin-sort-imports": "^4.1.1",
"@types/jest": "^28.1.2",
"@types/react": "~17.0.21",
"@types/react-native": "0.70.0",
"@types/react": "~18.2.0",
"@types/react-native": "0.71.3",
"del-cli": "^5.0.0",
"eslint": "^8.4.1",
"eslint-config-prettier": "^8.5.0",
Expand All @@ -77,7 +77,7 @@
"react-native-reanimated": "^2.14.4"
},
"resolutions": {
"@types/react": "17.0.21"
"@types/react": "~18.2.0"
},
"peerDependencies": {
"react": "*",
Expand Down
183 changes: 141 additions & 42 deletions src/LineChart/LineChart.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
import React from 'react';
import React, { useState } from 'react';
import { StyleSheet, View } from 'react-native';

import { Group, Path, SkPoint, rect } from '@shopify/react-native-skia';
import { Gesture, GestureDetector } from 'react-native-gesture-handler';
import Animated, {
runOnJS,
useAnimatedStyle,
useSharedValue,
withTiming,
} from 'react-native-reanimated';

import XAxis from '../core/Axes/XAxis';
import YAxis from '../core/Axes/YAxis';
Expand All @@ -25,6 +33,7 @@ const LineChart = ({
xAxis,
yAxis,
children,
onIndicatorChange,
}: LineChartProps) => {
const padding = ensureDefaults(customPadding, defaultPadding);
const xAxisHeight = xAxis?.height || 30;
Expand All @@ -44,6 +53,10 @@ const LineChart = ({
};
};

// const mapCanvasToDomainX = (canvasX: number): number => {
// return (canvasX / contentWidth) * (xDomain[1] - xDomain[0]);
// };

const dataSeries = extractProps(children);

const paths = dataSeries.map(({ data, color, strokeWidth }) => {
Expand All @@ -60,49 +73,135 @@ const LineChart = ({
);
});

const indicatorX = useSharedValue(0);
const indicatorScale = useSharedValue(1);

const pan = Gesture.Pan()
.onStart(() => {
indicatorScale.value = withTiming(1.2, { duration: 200 });
})
.onChange(e => {
indicatorX.value += e.changeX;
const canvasX = indicatorX.value + 15;
const domainX = (canvasX / contentWidth) * (xDomain[1] - xDomain[0]);
let domainY = 0;
dataSeries[0]?.data.every((point, i, arr) => {
if (domainX === point.x) {
domainY = point.y;
return false;
}
if (domainX > point.x && !!arr[i + 1] && domainX < arr[i + 1]!.x) {
const next = arr[i + 1]!;
const a = (point.y - next.y) / (point.x - next.x);
const b = point.y - a * point.x;
domainY = a * domainX + b;
return false;
}

return true;
});

if (onIndicatorChange) {
runOnJS(onIndicatorChange)({ x: domainY, y: domainX });
}
})
.onEnd(() => {
indicatorScale.value = withTiming(1, { duration: 200 });
});

const indicatorDotStyles = useAnimatedStyle(() => ({
transform: [
{ translateX: indicatorX.value },
{ scale: indicatorScale.value },
],
}));

const indicatorLineStyles = useAnimatedStyle(() => ({
transform: [{ translateX: indicatorX.value }],
}));

const [showIndicator, setShowIndicator] = useState(false);
const tap = Gesture.Tap().onStart(() => {
runOnJS(setShowIndicator)(!showIndicator);
});

return (
<ChartContainer
width={width}
height={height}
backgroundColor={backgroundColor}
padding={padding}>
<Group transform={[{ translateX: yAxisWidth }]}>
<Gridlines
{...gridlinesConfig}
xTicks={xTicks}
yTicks={yTicks}
xDomain={xDomain}
yDomain={yDomain}
mapDomainToCanvas={mapDomainToCanvas}
/>
<Group clip={rect(0, 0, contentWidth, contentHeight)}>{paths}</Group>
</Group>
<YAxis
ticks={yTicksWithinDomain}
width={yAxisWidth}
height={contentHeight}
font={font}
{...yAxis}
mapDomainToCanvas={mapDomainToCanvas}
/>
<Group
transform={[
{ translateX: yAxisWidth },
{
translateY: contentHeight,
},
]}>
<XAxis
ticks={xTicksWithinDomain}
width={contentWidth}
height={xAxisHeight}
font={font}
{...xAxis}
mapDomainToCanvas={mapDomainToCanvas}
/>
</Group>
</ChartContainer>
<>
<GestureDetector gesture={tap}>
<ChartContainer
width={width}
height={height}
backgroundColor={backgroundColor}
padding={padding}>
<Group transform={[{ translateX: yAxisWidth }]}>
<Gridlines
{...gridlinesConfig}
xTicks={xTicks}
yTicks={yTicks}
xDomain={xDomain}
yDomain={yDomain}
mapDomainToCanvas={mapDomainToCanvas}
/>
<Group clip={rect(0, 0, contentWidth, contentHeight)}>
{paths}
</Group>
</Group>
<YAxis
ticks={yTicksWithinDomain}
width={yAxisWidth}
height={contentHeight}
font={font}
{...yAxis}
mapDomainToCanvas={mapDomainToCanvas}
/>
<Group
transform={[
{ translateX: yAxisWidth },
{
translateY: contentHeight,
},
]}>
<XAxis
ticks={xTicksWithinDomain}
width={contentWidth}
height={xAxisHeight}
font={font}
{...xAxis}
mapDomainToCanvas={mapDomainToCanvas}
/>
</Group>
</ChartContainer>
</GestureDetector>
{showIndicator ? (
<GestureDetector gesture={pan}>
<View style={[style.container, { left: padding.left + yAxisWidth }]}>
<Animated.View style={[style.indicator, indicatorDotStyles]} />
<Animated.View style={[style.line, indicatorLineStyles]} />
</View>
</GestureDetector>
) : null}
</>
);
};

const style = StyleSheet.create({
container: {
position: 'absolute',
},
indicator: {
position: 'absolute',
width: 30,
height: 30,
borderRadius: 15,
backgroundColor: 'red',
},
line: {
position: 'absolute',
left: 14,
width: 2,
height: 300 - 30,
backgroundColor: 'red',
},
});

export default LineChart;
3 changes: 3 additions & 0 deletions src/LineChart/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import type { SkPoint } from '@shopify/react-native-skia';

import type { XAxisConfig, YAxisConfig } from '../core/Axes/types';
import type { ArrowVariant } from '../core/AxisArrow/types';
import type { GridlinesConfig } from '../core/Gridlines/types';
Expand Down Expand Up @@ -28,4 +30,5 @@ export interface LineChartProps extends ChartBaseProps {
children?: LineChartChildren;
xAxis?: XAxisConfig;
yAxis?: YAxisConfig;
onIndicatorChange?(value: SkPoint): void;
}
25 changes: 8 additions & 17 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2146,26 +2146,17 @@
resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.5.tgz#5f19d2b85a98e9558036f6a3cacc8819420f05cf"
integrity sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==

"@types/react-native@0.70.0":
version "0.70.0"
resolved "https://registry.yarnpkg.com/@types/react-native/-/react-native-0.70.0.tgz#f8cdcdd542d36467d7591585b93d27e0563676e0"
integrity sha512-yBN7qJDfs0Vwr34NyfW1SWzalHQoYtpUWf0t4UJY9C5ft58BRr46+r92I0v+l3QX4VNsSRMHVAAWqLLCbIkM+g==
"@types/react-native@0.71.3":
version "0.71.3"
resolved "https://registry.yarnpkg.com/@types/react-native/-/react-native-0.71.3.tgz#537f669ed6b38b5ae47444bd9d253c4cff23bed7"
integrity sha512-0Uqw1YZ0qbVla0MMWFTANFm6W8KYWNvGQmYfucdecbXivLMcQ2v4PovuYFKr7bE6Bc5nDCUEaga962Y8gcDF7A==
dependencies:
"@types/react" "*"

"@types/react@*", "@types/react@17.0.21":
version "17.0.21"
resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.21.tgz#069c43177cd419afaab5ce26bb4e9056549f7ea6"
integrity sha512-GzzXCpOthOjXvrAUFQwU/svyxu658cwu00Q9ugujS4qc1zXgLFaO0kS2SLOaMWLt2Jik781yuHCWB7UcYdGAeQ==
dependencies:
"@types/prop-types" "*"
"@types/scheduler" "*"
csstype "^3.0.2"

"@types/react@~17.0.21":
version "17.0.53"
resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.53.tgz#10d4d5999b8af3d6bc6a9369d7eb953da82442ab"
integrity sha512-1yIpQR2zdYu1Z/dc1OxC+MA6GR240u3gcnP4l6mvj/PJiVaqHsQPmWttsvHsfnhfPbU2FuGmo0wSITPygjBmsw==
"@types/react@*", "@types/react@~18.2.0":
version "18.2.6"
resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.6.tgz#5cd53ee0d30ffc193b159d3516c8c8ad2f19d571"
integrity sha512-wRZClXn//zxCFW+ye/D2qY65UsYP1Fpex2YXorHc8awoNamkMZSvBxwxdYVInsHOZZd2Ppq8isnSzJL5Mpf8OA==
dependencies:
"@types/prop-types" "*"
"@types/scheduler" "*"
Expand Down