Skip to content

LineChart: Rework X axis labeling to allow dissimilar dataset lengths#515

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

Merged
Hermanya merged 2 commits into from
Feb 8, 2022
Merged

LineChart: Rework X axis labeling to allow dissimilar dataset lengths #515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2bd0f2c
Rework X axis labeling to allow dissimilar dataset lengths
coltonmccormack Mar 3, 2021
3b33198
Add prepare script for GitHub sourced library usage (builds on install)
coltonmccormack Jun 3, 2021
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
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@
"name": "react-native-chart-kit",
"version": "6.11.0",
"devDependencies": {
"@types/react": "^16.9.38",
"@types/react-native": "^0.62.13",
"babel-eslint": "10.x",
"babel-plugin-module-resolver": "^3.1.1",
Expand DownExpand Up@@ -41,7 +40,8 @@
"test": "jest",
"build": "tsc",
"dev": "tsc --watch",
"prepublish": "yarn build"
"prepublish": "yarn build",
"prepare": "yarn build"
},
"jest": {
"preset": "jest-expo"
Expand Down
23 changes: 14 additions & 9 deletions src/line-chart/LineChart.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -278,7 +278,7 @@ class LineChart extends AbstractChart<LineChartProps, LineChartState> {
return null;
}
} = this.props;

const xMax = this.getXMaxValues(data);
data.forEach(dataset => {
if (dataset.withDots == false) return;

Expand All@@ -287,8 +287,7 @@ class LineChart extends AbstractChart<LineChartProps, LineChartState> {
return;
}

const cx =
paddingRight + (i * (width - paddingRight)) / dataset.data.length;
const cx = paddingRight + (i * (width - paddingRight)) / xMax;

const cy =
((baseHeight - this.calcHeight(x, datas, height)) / 4) * 3 +
Expand DownExpand Up@@ -617,14 +616,14 @@ class LineChart extends AbstractChart<LineChartProps, LineChartState> {
const output = [];
const datas = this.getDatas(data);
const baseHeight = this.calcBaseHeight(datas, height);
const xMax = this.getXMaxValues(data);

let lastPoint: string;

data.forEach((dataset, index) => {
const points = dataset.data.map((d, i) => {
if (d === null) return lastPoint;
const x =
(i * (width - paddingRight)) / dataset.data.length + paddingRight;
const x = (i * (width - paddingRight)) / xMax + paddingRight;
const y =
((baseHeight - this.calcHeight(d, datas, height)) / 4) * 3 +
paddingTop;
Expand All@@ -649,6 +648,12 @@ class LineChart extends AbstractChart<LineChartProps, LineChartState> {
return output;
};

getXMaxValues = (data: Dataset[]) => {
return data.reduce((acc, cur) => {
return cur.data.length > acc ? cur.data.length : acc;
}, 0);
};

getBezierLinePoints = (
dataset: Dataset,
{
Expand All@@ -667,11 +672,10 @@ class LineChart extends AbstractChart<LineChartProps, LineChartState> {
}

const datas = this.getDatas(data);
const xMax = this.getXMaxValues(data);

const x = (i: number) =>
Math.floor(
paddingRight + (i * (width - paddingRight)) / dataset.data.length
);
Math.floor(paddingRight + (i * (width - paddingRight)) / xMax);

const baseHeight = this.calcBaseHeight(datas, height);

Expand DownExpand Up@@ -744,6 +748,7 @@ class LineChart extends AbstractChart<LineChartProps, LineChartState> {
useColorFromDataset: AbstractChartConfig["useShadowColorFromDataset"];
}) =>
data.map((dataset, index) => {
const xMax = this.getXMaxValues(data);
const d =
this.getBezierLinePoints(dataset, {
width,
Expand All@@ -753,7 +758,7 @@ class LineChart extends AbstractChart<LineChartProps, LineChartState> {
data
}) +
` L${paddingRight +
((width - paddingRight) / dataset.data.length) *
((width - paddingRight) / xMax) *
(dataset.data.length - 1)},${(height / 4) * 3 +
paddingTop} L${paddingRight},${(height / 4) * 3 + paddingTop} Z`;

Expand Down