8000 Multiple legend positioning and sizing fixes by etpinard · Pull Request #4160 · plotly/plotly.js · GitHub
[go: up one dir, main page]
Skip to content

Multiple legend positioning and sizing fixes #4160

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
merged 20 commits into from
Sep 23, 2019
Merged

Multiple legend positioning and sizing fixes #4160

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
3ab7713
rm useless legend/anchor_utils.js file
etpinard Aug 15, 2019
de369f3
improve legend x, y, xanchor, yanchor attr declarations
etpinard Aug 14, 2019
1cf347a
drop firstRender logic in Legend.draw
etpinard Aug 7, 2019
82b9769
calc max name/label length in getLegendData
etpinard Aug 7, 2019
0c497bb
add a few things to legend/constants.js
etpinard Aug 9, 2019
f12c62c
drop expandHorizontalMargin logic
etpinard Aug 9, 2019
d770138
some more linting
etpinard Aug 13, 2019
51df66d
trim toggle-rect to more-precise width
etpinard Aug 13, 2019
bf586d4
add more legend mocks (with 1.49.4 baselines)
etpinard Aug 13, 2019
488cca1
fix many legend auto-margin push and positioning edge cases
etpinard Aug 16, 2019
c33c92f
do not constrain legend (x,y) when `margin.autoexpand:false`
etpinard Aug 16, 2019
1e6862a
Lib.log when margin push are dropped
etpinard Aug 14, 2019
1f00a40
add Lib.log when legend (x,y) are constrained into graph width/height
etpinard Aug 30, 2019
2b2bd9b
add mocks showing #4132 bug
etpinard Aug 19, 2019
6b0befe
fix #4132 - fix horizontal legend dimension computations
etpinard Aug 19, 2019
6b2b63b
Merge branch 'master' into legend-horizontal-computed-dims-fix
etpinard Sep 9, 2019
e92ca98
cleanup legend relayout tests
etpinard Sep 10, 2019
35b0c92
fixup variable name in legend maxWidth logic block
etpinard Sep 10, 2019
42d5e4e
end Legend.draw early when margin-redraw in-progress
etpinard Sep 10, 2019
d043151
add margin.autoexpand attr description
etpinard Sep 23, 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
Prev Previous commit
Next Next commit
drop expandHorizontalMargin logic 
... which doesn't appear to do anything,
   and mv computeLegendDimension to separate step
  • Loading branch information
@etpinard
etpinard committed Aug 30, 2019
commit f12c62c27c65156d836cbdbadf28cb543974ca14
37 changes: 4 additions & 33 deletions src/components/legend/draw.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,24 +90,17 @@ module.exports = function draw(gd) {
.call(style, gd)
.each(function() { d3.select(this).call(setupTraceToggle, gd); });

Lib.syncOrAsync([Plots.previousPromises,
Lib.syncOrAsync([
Plots.previousPromises,
function() { return computeLegendDimensions(gd, groups, traces); },
function() { return expandMargin(gd); },
function() {
// Position and size the legend
var lxMin = 0;
var lxMax = fullLayout.width;
var lyMin = 0;
var lyMax = fullLayout.height;

computeLegendDimensions(gd, groups, traces);

if(opts._height > lyMax) {
// If the legend doesn't fit in the plot area,
// do not expand the vertical margins.
expandHorizontalMargin(gd);
} else {
expandMargin(gd);
}

// Scroll section must be executed after repositionLegend.
// It requires the legend width, height, x and y to position the scrollbox
// and these values are mutated in repositionLegend.
Expand Down Expand Up @@ -689,25 +682,3 @@ function expandMargin(gd) {
t: opts._height * (FROM_TL[yanchor])
});
}

function expandHorizontalMargin(gd) {
var fullLayout = gd._fullLayout;
var opts = fullLayout.legend;

var xanchor = 'left';
if(Lib.isRightAnchor(opts)) {
xanchor = 'right';
} else if(Lib.isCenterAnchor(opts)) {
xanchor = 'center';
}

// lastly check if the margin auto-expand has changed
Plots.autoMargin(gd, 'legend', {
x: opts.x,
y: 0.5,
l: opts._width * (FROM_TL[xanchor]),
r: opts._width * (FROM_BR[xanchor]),
b: 0,
t: 0
});
}
0