Skip to content
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

Jump to bottom

fix(axis): rotated label positioning #709

Merged
merged 3 commits into from
Jun 15, 2020
Merged

fix(axis): rotated label positioning #709

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
637cf07
fix(axis): rotated label positioning
nickofthyme Jun 15, 2020
9ed5ebc
Merge branch 'master' into fix/rotated-axis-label-positioning
nickofthyme Jun 15, 2020
4656528
Merge branch 'master' into fix/rotated-axis-label-positioning
nickofthyme Jun 15, 2020
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
Binary file modified ...ests-for-all-stories-axes-tick-label-rotation-visually-looks-correct-1-snap.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...napshots__/axis-stories-test-ts-axis-stories-should-hide-bottom-axis-1-snap.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ..._snapshots__/axis-stories-test-ts-axis-stories-should-hide-left-axis-1-snap.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...e_snapshots__/axis-stories-test-ts-axis-stories-should-hide-top-axis-1-snap.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...ories-test-ts-axis-stories-should-render-ticks-with-varied-rotations-1-snap.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions src/chart_types/xy_chart/renderer/canvas/axes/title.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ function renderVerticalTitle(ctx: CanvasRenderingContext2D, props: AxisProps) {
const {
axisPosition: { height },
axisSpec: { title, position, tickSize, tickPadding },
axisTicksDimensions: { maxLabelTextWidth },
axisTicksDimensions: { maxLabelBboxWidth },
axisConfig: { axisTitleStyle },
debug,
} = props;
Expand All @@ -51,7 +51,7 @@ function renderVerticalTitle(ctx: CanvasRenderingContext2D, props: AxisProps) {
}
const { padding, ...titleStyle } = axisTitleStyle;
const top = height;
const left = position === Position.Left ? 0 : tickSize + tickPadding + maxLabelTextWidth + padding;
const left = position === Position.Left ? 0 : tickSize + tickPadding + maxLabelBboxWidth + padding;

if (debug) {
renderDebugRect(ctx, { x: left, y: top, width: height, height: titleStyle.fontSize }, undefined, undefined, -90);
Expand Down
2 changes: 1 addition & 1 deletion stories/axes/2_tick_label_rotation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ export const Example = () => {
id="right"
title="Bar axis"
position={Position.Right}
tickLabelRotation={number('right axis tick label rotation', 0, {
tickLabelRotation={number('right axis tick label rotation', -90, {
range: true,
min: -90,
max: 90,
Expand Down