Skip to content

Fix #1913 by pushing overflowed legend items to a new line #3628

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 14 commits into from
Mar 20, 2019
Merged

Fix #1913 by pushing overflowed legend items to a new line #3628

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
b89f1ee
Fix #1913 by adding pushing overflowed legend items to a new line whi…
nathanjenx Mar 12, 2019
d152792
Add test image for legendgroup horizontal wrapping
nathanjenx Mar 12, 2019
b9542c4
Remove traceGroupGap from widths
nathanjenx Mar 12, 2019
f279235
Generate test images for legend group wrapping
nathanjenx Mar 12, 2019
51178ec
Enforce minimum of 5px gap between traces when legend horizontal
nathanjenx Mar 12, 2019
76df791
Fix traceGroup vriable and baseline images
nathanjenx Mar 12, 2019
737150b
Ensure width of legend is checked before adding a new width
nathanjenx Mar 13, 2019
3edc9eb
Remove extra height from horizontal grouped legends
nathanjenx Mar 13, 2019
68848e4
Only add traceGap on new rows
nathanjenx Mar 13, 2019
f6d430b
Include intial 10px padding on legend
nathanjenx Mar 13, 2019
9dfdedd
Add opts.tracegroupgap to height not traceGap
nathanjenx Mar 13, 2019
0806a9a
Ensure opt.tracegroupgap is added to legend rather than traceGap, ref…
nathanjenx Mar 18, 2019
131145d
test that changing `legend.tracegroupgap` updates the margin size
antoinerg Mar 20, 2019
a5fa247
legend: minor style improvements to the code
antoinerg Mar 20, 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
8 changes: 5 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 @@ -609,13 +609,15 @@ function computeLegendDimensions(gd, groups, traces) {
maxItems = Math.max(maxItems, group.length);
});

maxHeight += opts.tracegroupgap || 5;
maxHeight += opts.tracegroupgap;
var traceGroupGap = 5;
maxWidth += traceGroupGap;

var groupXOffsets = [opts._width];
var rowHeights = [];
var rowNum = 1;
for(var i = 0, n = groupData.length; i < n; i++) {
opts._width += maxWidth;
opts._width += maxWidth ;

if(fullLayout._size.w < (borderwidth + opts._width + maxWidth)) {
groupXOffsets[groupXOffsets.length - 1] = groupXOffsets[0];
Expand Down Expand Up @@ -669,7 +671,7 @@ function computeLegendDimensions(gd, groups, traces) {
var maxTraceWidth = 0;
var offsetX = 0;
var fullTracesWidth = 0;
var traceGap = opts.tracegroupgap || 5;
var traceGap = 5;

// calculate largest width for traces and use for width of all legend items
traces.each(function(d) {
Expand Down