WIP: Legend Scrolling #243
Add scrollbox (not yet set to be active though)
- Loading branch information
commit 7cfec792f445be9187d30307c94c3ee6c7db920f
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -444,22 +444,28 @@ legend.draw = function(td) { | |
|
|
||
| var legendsvg = fullLayout._infolayer.selectAll('svg.legend') | ||
| .data([0]); | ||
| legendsvg.enter().append('svg') | ||
| .attr('class','legend') | ||
| .attr('pointer-events', 'all'); | ||
|
|
||
| var bg = legendsvg.selectAll('rect.bg') | ||
| .data([0]); | ||
| bg.enter().append('rect') | ||
| .attr('class','bg') | ||
| .call(Color.stroke, opts.bordercolor) | ||
| .call(Color.fill, opts.bgcolor) | ||
| .style('stroke-width', opts.borderwidth + 'px'); | ||
|
|
||
| var scrollBox = legendsvg.selectAll('svg.scrollbox') | ||
| .data([0]); | ||
| scrollBox.enter().append('svg') | ||
| .attr('class', 'scrollbox'); | ||
| scrollBox.exit().remove(); | ||
|
|
||
| var groups = scrollBox.selectAll('g.groups') | ||
| .data(legendData); | ||
| groups.enter().append('g') | ||
| .attr('class', 'groups'); | ||
| groups.exit().remove(); | ||
|
|
||
| if(isGrouped(opts)) { | ||
|
|
@@ -530,6 +536,7 @@ legend.draw = function(td) { | |
| }); | ||
| }); | ||
|
|
||
| // Position and size the legend | ||
| legend.repositionLegend(td, traces); | ||
|
|
||
| if(td._context.editable) { | ||
|
|
@@ -672,11 +679,37 @@ legend.repositionLegend = function(td, traces){ | |
| lx = Math.round(lx); | ||
| ly = Math.round(ly); | ||
|
|
||
| // Add scroll functionality | ||
| var legendsvg = fullLayout._infolayer.selectAll('svg.legend'), | ||
| scrollBox = fullLayout._infolayer.selectAll('svg.legend .scrollbox'), | ||
| scrollheight = Math.min(80, legendheight); | ||
|
|
||
| scrollBox.attr('viewBox', '0 0 ' + legendwidth + ' ' + scrollheight); | ||
| legendsvg.node().addEventListener('wheel', scrollHandler); | ||
|
|
||
| function scrollHandler(e){ | ||
| e.preventDefault(); | ||
|
|
||
| var scroll = scrollBox.attr('viewBox').split(' '); | ||
| scroll[1] = constrain(0, Math.max(legendheight - scrollheight, 0), +scroll[1] + e.deltaY); | ||
|
|
||
| scrollBox.attr('viewBox', scroll.join(' ')); | ||
| } | ||
|
|
||
| function constrain(min, max, c){ | ||
|
There was a problem hiding this comment.
|
||
| if(c <= max && c >= min){ | ||
| return c; | ||
| }else if(c > max){ | ||
| return max; | ||
| }else{ | ||
| return min; | ||
| } | ||
| } | ||
|
|
||
| fullLayout._infolayer.selectAll('svg.legend') | ||
| .call(Drawing.setRect, lx, ly, legendwidth, scrollheight); | ||
| fullLayout._infolayer.selectAll('svg.legend .bg') | ||
| .style({ width: legendwidth, height: scrollheight }); | ||
|
|
||
| // lastly check if the margin auto-expand has changed | ||
| Plots.autoMargin(td,'legend',{ | ||
|
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This section should likely be moved to the
drawstep, but everything is highly coupled right now and the order of drawing/sizing/positioning is very scattered.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@mdtusz Any reason for putting this section in
repostionLegendin the first place?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Mainly for ease of development. The scroll handler requires the final height of the legend to calculate the viewbox offset and at the time, I was still trying to wrap my head around the control flow in here.
It will be moved out into
drawbefore we merge thoughThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
thanks for the info. 👍