Skip to content

Additional prop to customize vertical labels height #480

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, 2021
Merged

Additional prop to customize vertical labels height #480

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
889f113
Additional prop to customize vertical labels height
noktigula Feb 1, 2021
420042b
Merge branch 'master' into feature/parametrized_stacked_bar_chart_hei…
Hermanya Feb 8, 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
67 changes: 51 additions & 16 deletions src/AbstractChart.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,13 @@ export interface AbstractChartConfig extends ChartConfig {
stackedBar?: boolean;
verticalLabelRotation?: number;
formatXLabel?: (xLabel: string) => string;
verticalLabelsHeightPercentage?: number;
}

export type AbstractChartState = {};

export const DEFAULT_X_LABELS_HEIGHT_PERCENTAGE = 0.75;

class AbstractChart<
IProps extends AbstractChartProps,
IState extends AbstractChartState
Expand Down Expand Up @@ -128,8 +131,15 @@ class AbstractChart<
}

renderHorizontalLines = config => {
const { count, width, height, paddingTop, paddingRight } = config;
const basePosition = height - height / 4;
const {
count,
width,
height,
paddingTop,
paddingRight,
verticalLabelsHeightPercentage = DEFAULT_X_LABELS_HEIGHT_PERCENTAGE
} = config;
const basePosition = height * verticalLabelsHeightPercentage;

return [...new Array(count + 1)].map((_, i) => {
const y = (basePosition / count) * i + paddingTop;
Expand All @@ -147,14 +157,20 @@ class AbstractChart<
};

renderHorizontalLine = config => {
const { width, height, paddingTop, paddingRight } = config;
const {
width,
height,
paddingTop,
paddingRight,
verticalLabelsHeightPercentage = DEFAULT_X_LABELS_HEIGHT_PERCENTAGE
} = config;
return (
<Line
key={Math.random()}
x1={paddingRight}
y1={height - height / 4 + paddingTop}
y1={height * verticalLabelsHeightPercentage + paddingTop}
x2={width}
y2={height - height / 4 + paddingTop}
y2={height * verticalLabelsHeightPercentage + paddingTop}
{...this.getPropsForBackgroundLines()}
/>
);
Expand All @@ -171,7 +187,8 @@ class AbstractChart<
paddingRight,
horizontalLabelRotation = 0,
decimalPlaces = 2,
formatYLabel = (yLabel: string) => yLabel
formatYLabel = (yLabel: string) => yLabel,
verticalLabelsHeightPercentage = DEFAULT_X_LABELS_HEIGHT_PERCENTAGE
} = config;

const {
Expand All @@ -195,12 +212,14 @@ class AbstractChart<
)}${yAxisSuffix}`;
}

const basePosition = height - height / 4;
const basePosition = height * verticalLabelsHeightPercentage;
const x = paddingRight - yLabelsOffset;
const y =
count === 1 && this.props.fromZero
? paddingTop + 4
: (height * 3) / 4 - (basePosition / count) * i + paddingTop;
: height * verticalLabelsHeightPercentage -
(basePosition / count) * i +
paddingTop;
return (
<Text
rotation={horizontalLabelRotation}
Expand All @@ -227,7 +246,8 @@ class AbstractChart<
horizontalOffset = 0,
stackedBar = false,
verticalLabelRotation = 0,
formatXLabel = xLabel => xLabel
formatXLabel = xLabel => xLabel,
verticalLabelsHeightPercentage = DEFAULT_X_LABELS_HEIGHT_PERCENTAGE
}: Pick<
AbstractChartConfig,
| "labels"
Expand All @@ -239,6 +259,7 @@ class AbstractChart<
| "stackedBar"
| "verticalLabelRotation"
| "formatXLabel"
| "verticalLabelsHeightPercentage"
>) => {
const {
xAxisLabel = "",
Expand All @@ -264,7 +285,11 @@ class AbstractChart<
horizontalOffset) *
fac;

const y = (height * 3) / 4 + paddingTop + fontSize * 2 + xLabelsOffset;
const y =
height * verticalLabelsHeightPercentage +
paddingTop +
fontSize * 2 +
xLabelsOffset;

return (
<Text
Expand All @@ -288,11 +313,17 @@ class AbstractChart<
width,
height,
paddingTop,
paddingRight
paddingRight,
verticalLabelsHeightPercentage = DEFAULT_X_LABELS_HEIGHT_PERCENTAGE
}: Omit<
Pick<
AbstractChartConfig,
"data" | "width" | "height" | "paddingRight" | "paddingTop"
| "data"
| "width"
| "height"
| "paddingRight"
| "paddingTop"
| "verticalLabelsHeightPercentage"
>,
"data"
> & { data: number[] }) => {
Expand All @@ -312,7 +343,7 @@ class AbstractChart<
((width - paddingRight) / (data.length / yAxisInterval)) * i +
paddingRight
)}
y2={height - height / 4 + paddingTop}
y2={height * verticalLabelsHeightPercentage + paddingTop}
{...this.getPropsForBackgroundLines()}
/>
);
Expand All @@ -323,14 +354,18 @@ class AbstractChart<
renderVerticalLine = ({
height,
paddingTop,
paddingRight
}: Pick<AbstractChartConfig, "height" | "paddingRight" | "paddingTop">) => (
paddingRight,
verticalLabelsHeightPercentage = DEFAULT_X_LABELS_HEIGHT_PERCENTAGE
}: Pick<
AbstractChartConfig,
"height" | "paddingRight" | "paddingTop" | "verticalLabelsHeightPercentage"
>) => (
<Line
key={Math.random()}
x1={Math.floor(paddingRight)}
y1={0}
x2={Math.floor(paddingRight)}
y2={height - height / 4 + paddingTop}
y2={height * verticalLabelsHeightPercentage + paddingTop}
{...this.getPropsForBackgroundLines()}
/>
);
Expand Down
32 changes: 25 additions & 7 deletions src/StackedBarChart.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ import { G, Rect, Svg, Text } from "react-native-svg";

import AbstractChart, {
AbstractChartConfig,
AbstractChartProps
AbstractChartProps,
DEFAULT_X_LABELS_HEIGHT_PERCENTAGE
} from "./AbstractChart";

export interface StackedBarChartData {
Expand Down Expand Up @@ -49,6 +50,12 @@ export interface StackedBarChartProps extends AbstractChartProps {

percentile?: boolean;

/**
* Percentage of the chart height, dedicated to vertical labels
* (space below chart)
*/
verticalLabelsHeightPercentage?: number;

formatYLabel?: (yLabel: string) => string;
}

Expand Down Expand Up @@ -77,10 +84,16 @@ class StackedBarChart extends AbstractChart<
paddingRight,
border,
colors,
stackedBar = false
stackedBar = false,
verticalLabelsHeightPercentage
}: Pick<
Omit<AbstractChartConfig, "data">,
"width" | "height" | "paddingRight" | "paddingTop" | "stackedBar"
| "width"
| "height"
| "paddingRight"
| "paddingTop"
| "stackedBar"
| "verticalLabelsHeightPercentage"
> & {
border: number;
colors: string[];
Expand All @@ -97,7 +110,7 @@ class StackedBarChart extends AbstractChart<
fac = 0.7;
}
const sum = this.props.percentile ? x.reduce((a, b) => a + b, 0) : border;
const barsAreaHeight = (height / 4) * 3;
const barsAreaHeight = height * verticalLabelsHeightPercentage;
for (let z = 0; z < x.length; z++) {
h = barsAreaHeight * (x[z] / sum);
const y = barsAreaHeight - h + st;
Expand Down Expand Up @@ -187,6 +200,7 @@ class StackedBarChart extends AbstractChart<
segments = 4,
decimalPlaces,
percentile = false,
verticalLabelsHeightPercentage = DEFAULT_X_LABELS_HEIGHT_PERCENTAGE,
formatYLabel = (yLabel: string) => {
return yLabel;
},
Expand Down Expand Up @@ -236,7 +250,8 @@ class StackedBarChart extends AbstractChart<
{this.renderHorizontalLines({
...config,
count: segments,
paddingTop
paddingTop,
verticalLabelsHeightPercentage
})}
</G>
<G>
Expand All @@ -248,6 +263,7 @@ class StackedBarChart extends AbstractChart<
paddingTop,
paddingRight,
decimalPlaces,
verticalLabelsHeightPercentage,
formatYLabel
})
: null}
Expand All @@ -260,7 +276,8 @@ class StackedBarChart extends AbstractChart<
paddingRight: paddingRight + 28,
stackedBar,
paddingTop,
horizontalOffset: barWidth
horizontalOffset: barWidth,
verticalLabelsHeightPercentage
})
: null}
</G>
Expand All @@ -272,7 +289,8 @@ class StackedBarChart extends AbstractChart<
colors: this.props.data.barColors,
paddingTop,
paddingRight: paddingRight + 20,
stackedBar
stackedBar,
verticalLabelsHeightPercentage
})}
</G>
{showLegend &&
Expand Down