Skip to content

Sankey: group nodes #3556

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 13 commits into from
Feb 26, 2019
+424 −63
Merged

Sankey: group nodes #3556

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
d5f3cd5
sankey: grouping with animations
antoinerg Feb 19, 2019
85470a0
nodes that are part of a group should be in the back
antoinerg Feb 19, 2019
1cd206f
sankey: turn `node.groups` into a info_array, use for loops
antoinerg Feb 19, 2019
b90fda1
remove opacity transition if _context.staticPlot
antoinerg Feb 19, 2019
b4d7ff3
fix opacity logic
antoinerg Feb 19, 2019
ab1a0fb
update position of phantom children nodes when a group is dragged
antoinerg Feb 19, 2019
63d8190
replace children by childrenNodes
antoinerg Feb 19, 2019
6175fb5
sankey: add warning if node is in multiple groups, change transition …
antoinerg Feb 21, 2019
31990f0
sankey: do not animate on first render
antoinerg Feb 25, 2019
fec3739
sankey: fix attribute's role for `node.groups`
antoinerg Feb 25, 2019
ffbafa7
sankey: test that groups have appropriate DOM elements
antoinerg Feb 26, 2019
7094887
sankey: check for circularity after grouping
antoinerg Feb 26, 2019
fb9479a
fix typo
antoinerg Feb 26, 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
1 change: 0 additions & 1 deletion src/traces/sankey/calc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ function convertToD3Sankey(trace) {
}

// if link originates from a node in a group, relink source to that group
// if(group.indexOf(source) !== -1) {
if(groupLookup.hasOwnProperty(source)) {
source = groupLookup[source];
}
Expand Down
10 changes: 5 additions & 5 deletions src/traces/sankey/render.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ function sankeyModel(layout, d, traceIndex) {
}
}

graph.nodes.push({
graph.nodes.unshift({
pointNumber: parseInt(nodePointNumber),
x0: groupingNode.x0,
x1: groupingNode.x1,
Expand Down Expand Up @@ -474,19 +474,19 @@ function attachPointerEvents(selection, sankey, eventSet) {
selection
.on('.basic', null) // remove any preexisting handlers
.on('mouseover.basic', function(d) {
if(!d.interactionState.dragInProgress) {
if(!d.interactionState.dragInProgress && !d.partOfGroup) {
eventSet.hover(this, d, sankey);
d.interactionState.hovered = [this, d];
}
})
.on('mousemove.basic', function(d) {
if(!d.interactionState.dragInProgress) {
if(!d.interactionState.dragInProgress && !d.partOfGroup) {
eventSet.follow(this, d);
d.interactionState.hovered = [this, d];
}
})
.on('mouseout.basic', function(d) {
if(!d.interactionState.dragInProgress) {
if(!d.interactionState.dragInProgress && !d.partOfGroup) {
eventSet.unhover(this, d, sankey);
d.interactionState.hovered = false;
}
Expand All @@ -496,7 +496,7 @@ function attachPointerEvents(selection, sankey, eventSet) {
eventSet.unhover(this, d, sankey);
d.interactionState.hovered = false;
}
if(!d.interactionState.dragInProgress) {
if(!d.interactionState.dragInProgress && !d.partOfGroup) {
eventSet.select(this, d, sankey);
}
});
Expand Down