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

Refactor legend draw to make input/output and optional arguments clear #5579

Merged
merged 10 commits into from
Apr 6, 2021
Merged

Refactor legend draw to make input/output and optional arguments clear #5579

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0fccc8d
rename _main legend to _isLegend for clarity
archmoj Mar 29, 2021
6abbfb2
use _inHover instead of !_isLegend for clarity
archmoj Mar 29, 2021
ee75947
better handle of main title
archmoj Mar 31, 2021
2daab81
rename confusing opts in legend/draw to container i.e. legend/hover
archmoj Apr 5, 2021
61d01e6
refactor if without not
archmoj Apr 5, 2021
f717986
let _inHover handle the case of unified hover
archmoj Apr 5, 2021
0a4fd73
more of let _inHover handle unified hover in legend draw
archmoj Apr 5, 2021
9c9ee75
ensure container passed into legend _draw function
archmoj Apr 5, 2021
7337cb3
rename legendOpts to mockLegend
archmoj Apr 5, 2021
ab23397
rename container to legendObj i.e. to avoid conflict with legend.cont…
archmoj Apr 5, 2021
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
13 changes: 7 additions & 6 deletions src/components/fx/hover.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1010,10 +1010,10 @@ function createHoverText(hoverData, opts, gd) {
};
var mockLayoutOut = {};
legendSupplyDefaults(mockLayoutIn, mockLayoutOut, gd._fullData);
var legendOpts = mockLayoutOut.legend;
var mockLegend = mockLayoutOut.legend;

// prepare items for the legend
legendOpts.entries = [];
mockLegend.entries = [];
for(var j = 0; j < hoverData.length; j++) {
var texts = getHoverLabelText(hoverData[j], true, hovermode, fullLayout, t0);
var text = texts[0];
Expand All @@ -1039,13 +1039,14 @@ function createHoverText(hoverData, opts, gd) {
}
pt._distinct = true;

legendOpts.entries.push([pt]);
mockLegend.entries.push([pt]);
}
legendOpts.entries.sort(function(a, b) { return a[0].trace.index - b[0].trace.index;});
legendOpts.layer = container;
mockLegend.entries.sort(function(a, b) { return a[0].trace.index - b[0].trace.index;});
mockLegend.layer = container;

// Draw unified hover label
legendDraw(gd, legendOpts);
mockLegend._inHover = true;
legendDraw(gd, mockLegend);

// Position the hover
var ly = Lib.mean(hoverData.map(function(c) {return (c.y0 + c.y1) / 2;}));
Expand Down
Loading