Skip to content

Fix handling of horizontal legendgroup #3609

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

Closed
wants to merge 1 commit into from
Closed

Fix handling of horizontal legendgroup #3609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 0 additions & 42 deletions src/components/legend/draw.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,48 +585,6 @@ function computeLegendDimensions(gd, groups, traces) {

extraWidth = 40;
}
else if(isGrouped) {
var groupXOffsets = [opts._width];
var groupData = groups.data();

for(var i = 0, n = groupData.length; i < n; i++) {
var textWidths = groupData[i].map(function(legendItemArray) {
return legendItemArray[0].width;
});

var groupWidth = 40 + Math.max.apply(null, textWidths);

opts._width += opts.tracegroupgap + groupWidth;

groupXOffsets.push(opts._width);
}

groups.each(function(d, i) {
Drawing.setTranslate(this, groupXOffsets[i], 0);
});

groups.each(function() {
var group = d3.select(this);
var groupTraces = group.selectAll('g.traces');
var groupHeight = 0;

groupTraces.each(function(d) {
var legendItem = d[0];
var textHeight = legendItem.height;

Drawing.setTranslate(this,
0,
(5 + borderwidth + groupHeight + textHeight / 2));

groupHeight += textHeight;
});

opts._height = Math.max(opts._height, groupHeight);
});

opts._height += 10 + borderwidth * 2;
opts._width += borderwidth * 2;
}
else {
var rowHeight = 0;
var maxTraceHeight = 0;
Expand Down
Binary file modified test/image/baselines/legend_horizontal_groups.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 added test/image/baselines/legendgroup_horizontal_wrapping.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.
51 changes: 51 additions & 0 deletions test/image/mocks/legendgroup_horizontal_wrapping.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
{
"data": [{
"x": [1, 2, 3, 4],
"y": [63.69, 62.55, 61.64, 61.39],
"legendgroup": 1
}, {
"x": [1, 2, 3, 4],
"y": [58.24, 54.93, 42.11, 50.75],
"legendgroup": 1
}, {
"x": [1, 2, 3, 4],
"y": [51.49, 49.59, 37.12, 31.45]
}, {
"x": [1, 2, 3, 4],
"y": [49.09, 58.54, 53.91, 43.12]
}, {
"x": [1, 2, 3, 4],
"y": [70.53, 72.51, 72.28, 78.65]
}, {
"x": [1, 2, 3, 4],
"y": [62.69, 59.09, 63.82, 62]
}, {
"x": [1, 2, 3, 4],
"y": [76.27, 71.43, 59.83, 64.34]
}, {
"x": [1, 2, 3, 4],
"y": [71.15, 81.82, 88.46, 74.29]
}, {
"x": [1, 2, 3, 4],
"y": [57.89, 57.38, 52.08, 63.83]
}, {
"x": [1, 2, 3, 4],
"y": [65.4, 63.27, 65.78, 64.03]
}],
"layout": {
"width": 600,
"legend": {
"orientation": "h"
},
"xaxis": {
"type": "linear",
"range": [0.7840236686390533, 4.215976331360947],
"autorange": true
},
"yaxis": {
"type": "linear",
"range": [27.274108280254776, 92.63589171974522],
"autorange": true
}
}
}