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

Improve padding in NVD3Vis #6626

Merged
merged 2 commits into from
Jan 9, 2019
Merged

Improve padding in NVD3Vis #6626

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc263ac
WIP, fixing padding
betodealmeida Jan 8, 2019
a5c3151
Remove testing code
betodealmeida Jan 9, 2019
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
20 changes: 16 additions & 4 deletions superset/assets/src/visualizations/nvd3/NVD3Vis.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,6 +549,14 @@ function nvd3Vis(element, props) {
.attr('width', width)
.call(chart);

if (xLabelRotation > 0) {
// shift labels to the left so they look better
const xTicks = svg.select('.nv-x.nv-axis > g').selectAll('g');
xTicks
.selectAll('text')
.attr('dx', -6.5);
}

// align yAxis1 and yAxis2 ticks
if (isVizTypes(['dual_line', 'line_multi'])) {
const count = chart.yAxis1.ticks();
Expand Down Expand Up @@ -615,11 +623,15 @@ function nvd3Vis(element, props) {
// If x bounds are shown, we need a right margin
margins.right = Math.max(20, maxXAxisLabelHeight / 2) + marginPad;
}
if (xLabelRotation === 45) {
margins.bottom = maxXAxisLabelHeight + marginPad;
margins.right = maxXAxisLabelHeight + marginPad;
} else if (staggerLabels) {
if (staggerLabels) {
margins.bottom = 40;
} else {
margins.bottom = (
maxXAxisLabelHeight * Math.sin(Math.PI * xLabelRotation / 180)
) + marginPad;
margins.right = (
maxXAxisLabelHeight * Math.cos(Math.PI * xLabelRotation / 180)
) + marginPad;
}

if (isVizTypes(['dual_line', 'line_multi'])) {
Expand Down