Pie aggregation and event cleanup #2117
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
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
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
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
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 |
|---|---|---|
|
|
@@ -95,7 +95,19 @@ module.exports = function plot(gd, cdpie) { | |
| // in case fullLayout or fullData has changed without a replot | ||
| var fullLayout2 = gd._fullLayout; | ||
| var trace2 = gd._fullData[trace.index]; | ||
|
|
||
| var hoverinfo = trace2.hoverinfo; | ||
| if(Array.isArray(hoverinfo)) { | ||
| // super hacky: we need to pull out the *first* hoverinfo from | ||
| // pt.pts, then put it back into an array in a dummy trace | ||
| // and call castHoverinfo on that. | ||
| // TODO: do we want to have Fx.castHoverinfo somehow handle this? | ||
| // it already takes an array for index, for 2D, so this seems tricky. | ||
| hoverinfo = Fx.castHoverinfo({ | ||
| hoverinfo: [helpers.castOption(hoverinfo, pt.pts)], | ||
| _module: trace._module | ||
| }, fullLayout2, 0); | ||
|
There was a problem hiding this comment. @etpinard thoughts? I didn't see a reasonable way to build this into There was a problem hiding this comment. Maybe something like: Fx.castHoverinfo = function(trace, fullLayout, pt) {
if(pt.pointNumber) {
// as currently
} else if(pt.pointNumbers) {
// new pie logic
}
}
// instead of
Fx.castHoverinfo = function(trace, fullLayout, ptNumber) {
// ...
}but your hack (with that comment) is fine 👍 There was a problem hiding this comment. I think I should leave it as is for now, but if we unify this behavior with histograms (see #1984) then it may be worth making this change. |
||
| } | ||
|
|
||
| if(hoverinfo === 'all') hoverinfo = 'label+text+value+percent+name'; | ||
|
|
||
|
|
@@ -115,31 +127,27 @@ module.exports = function plot(gd, cdpie) { | |
|
|
||
| if(hoverinfo.indexOf('label') !== -1) thisText.push(pt.label); | ||
| if(hoverinfo.indexOf('text') !== -1) { | ||
| var texti = helpers.castOption(trace2.hovertext || trace2.text, pt.pts); | ||
| if(texti) thisText.push(texti); | ||
| } | ||
| if(hoverinfo.indexOf('value') !== -1) thisText.push(helpers.formatPieValue(pt.v, separators)); | ||
| if(hoverinfo.indexOf('percent') !== -1) thisText.push(helpers.formatPiePercent(pt.v / cd0.vTotal, separators)); | ||
|
|
||
| var hoverLabel = trace.hoverlabel; | ||
| var hoverFont = hoverLabel.font; | ||
|
|
||
| Fx.loneHover({ | ||
| x0: hoverCenterX - rInscribed * cd0.r, | ||
| x1: hoverCenterX + rInscribed * cd0.r, | ||
| y: hoverCenterY, | ||
| text: thisText.join('<br>'), | ||
| name: hoverinfo.indexOf('name') !== -1 ? trace2.name : undefined, | ||
| idealAlign: pt.pxmid[0] < 0 ? 'left' : 'right', | ||
| color: helpers.castOption(hoverLabel.bgcolor, pt.pts) || pt.color, | ||
| borderColor: helpers.castOption(hoverLabel.bordercolor, pt.pts), | ||
| fontFamily: helpers.castOption(hoverFont.family, pt.pts), | ||
| fontSize: helpers.castOption(hoverFont.size, pt.pts), | ||
| fontColor: helpers.castOption(hoverFont.color, pt.pts) | ||
| }, { | ||
| container: fullLayout2._hoverlayer.node(), | ||
| outerContainer: fullLayout2._paper.node(), | ||
|
|
@@ -182,7 +190,7 @@ module.exports = function plot(gd, cdpie) { | |
| .on('click', handleClick); | ||
|
|
||
| if(trace.pull) { | ||
| var pull = +helpers.castOption(trace.pull, pt.pts) || 0; | ||
| if(pull > 0) { | ||
| cx += pull * pt.pxmid[0]; | ||
| cy += pull * pt.pxmid[1]; | ||
|
|
@@ -233,8 +241,7 @@ module.exports = function plot(gd, cdpie) { | |
| } | ||
|
|
||
| // add text | ||
| var textPosition = helpers.castOption(trace.textposition, pt.pts), | ||
| sliceTextGroup = sliceTop.selectAll('g.slicetext') | ||
| .data(pt.text && (textPosition !== 'none') ? [0] : []); | ||
|
|
||
|
|
@@ -492,7 +499,12 @@ function scootLabels(quadrants, trace) { | |
| otherPt = wholeSide[i]; | ||
|
|
||
| // overlap can only happen if the other point is pulled more than this one | ||
| if(otherPt === thisPt || ( | ||
| (helpers.castOption(trace.pull, thisPt.pts) || 0) >= | ||
| (helpers.castOption(trace.pull, otherPt.pts) || 0)) | ||
| ) { | ||
| continue; | ||
| } | ||
|
|
||
| if((thisPt.pxmid[1] - otherPt.pxmid[1]) * yDiffSign > 0) { | ||
| // closer to the equator - by construction all of these happen first | ||
|
|
||
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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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 |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| { | ||
| "data": [ | ||
| { | ||
| "labels": [ | ||
| "Alice", | ||
| "Bob", | ||
| "Charlie", | ||
| "Charlie", | ||
| "Charlie", | ||
| "Alice" | ||
| ], | ||
| "type": "pie", | ||
| "domain": {"x": [0, 0.4]} | ||
| }, | ||
| { | ||
| "labels": [ | ||
| "Alice", | ||
| "Alice", | ||
| "Allison", | ||
| "Alys", | ||
| "Elise", | ||
| "Allison", | ||
| "Alys", | ||
| "Alys" | ||
| ], | ||
| "values": [ | ||
| 10, 20, 30, 40, 50, 60, 70, 80 | ||
| ], | ||
| "marker": {"colors": ["", "", "#ccc"]}, | ||
| "type": "pie", | ||
| "domain": {"x": [0.5, 1]}, | ||
| "textinfo": "label+value+percent" | ||
| } | ||
| ], | ||
| "layout": { | ||
| "height": 300, | ||
| "width": 500 | ||
| } | ||
| } |
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
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.
Blocking: Would you mind locking this down in a jasmine test?
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.
sure -> ee1f8c4
It was done in the image test I added, but nice to have it in jasmine too.