Skip to content

Legend item wrap with layout.legend.orientation = h #1

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
psalmody merged 7 commits into from
Jul 27, 2016
Merged

Legend item wrap with layout.legend.orientation = h #1

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bb60510
Might fix #769 - added check for pushing past plot margin and startin…
psalmody Jul 22, 2016
5f38595
linted
psalmody Jul 22, 2016
5b5a102
code in original order
psalmody Jul 22, 2016
d0934f3
changes based on @n-riesco comments
psalmody Jul 25, 2016
e7a286f
need both margins for proper wrapping
psalmody Jul 25, 2016
91d384b
put horizontal legend traces in columns
psalmody Jul 26, 2016
7ef2dff
Merge pull request #2 from psalmody/h-legend-cols
psalmody Jul 26, 2016
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
28 changes: 25 additions & 3 deletions src/components/legend/draw.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,18 +568,40 @@ function computeLegendDimensions(gd, groups, traces) {
else {
opts.width = 0;
opts.height = 0;
var rowHeight = 0,
maxTraceHeight = 0,
maxTraceWidth = 0,
offsetX = 0;

//calculate largest width for traces and use for width of all legend items
traces.each(function(d) {
maxTraceWidth = Math.max(40 + d[0].width, maxTraceWidth);
});

traces.each(function(d) {

var legendItem = d[0],
traceWidth = 40 + legendItem.width,
traceWidth = maxTraceWidth,
traceGap = opts.tracegroupgap || 5;

if((borderwidth + offsetX + traceGap + traceWidth) > (fullLayout.width - (fullLayout.margin.r + fullLayout.margin.l))) {
offsetX = 0;
rowHeight = rowHeight + maxTraceHeight;
opts.height = opts.height + maxTraceHeight;
Copy link

@n-riesco n-riesco Jul 25, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should set maxTraceHeight = 0 here, so that it gets recomputed for each row.

//reset for next row
maxTraceHeight = 0;
}

Lib.setTranslate(this,
(borderwidth + opts.width),
(5 + borderwidth + legendItem.height / 2));
(borderwidth + offsetX),
(5 + borderwidth + legendItem.height / 2) + rowHeight);

opts.width += traceGap + traceWidth;
opts.height = Math.max(opts.height, legendItem.height);

//keep track of tallest trace in group
offsetX += traceGap + traceWidth;
maxTraceHeight = Math.max(legendItem.height, maxTraceHeight);
});

opts.width += borderwidth * 2;
Expand Down