Skip to content

Commit

Permalink
add pointNumber to sankey event data
Browse files Browse the repository at this point in the history
  • Loading branch information
etpinard committed Jul 19, 2017
1 parent 69de548 commit 15dc324
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 9 deletions.
5 changes: 2 additions & 3 deletions src/traces/sankey/render.js
Expand Up @@ -86,13 +86,15 @@ function sankeyModel(layout, d, i) {

var nodes = nodeSpec.label.map(function(l, i) {
return {
pointNumber: i,
label: l,
color: Lib.isArray(nodeSpec.color) ? nodeSpec.color[i] : nodeSpec.color
};
});

var links = linkSpec.value.map(function(d, i) {
return {
pointNumber: i,
label: linkSpec.label[i],
color: Lib.isArray(linkSpec.color) ? linkSpec.color[i] : linkSpec.color,
source: linkSpec.source[i],
Expand Down Expand Up @@ -159,7 +161,6 @@ function linkModel(uniqueKeys, d, l) {
// for event data
l.trace = d.trace;
l.curveNumber = d.trace.index;
l.pointNumber = 'TODO';

return {
key: key,
Expand Down Expand Up @@ -191,7 +192,6 @@ function nodeModel(uniqueKeys, d, n) {
// for event data
n.trace = d.trace;
n.curveNumber = d.trace.index;
n.pointNumber = 'TODO';

return {
key: key,
Expand Down Expand Up @@ -424,7 +424,6 @@ function snappingForce(sankeyNode, forceKey, nodes, d) {
// scene graph

module.exports = function(svg, styledData, layout, callbacks) {

var sankey = svg.selectAll('.sankey')
.data(styledData
.filter(function(d) {return unwrap(d).trace.visible;})
Expand Down
24 changes: 18 additions & 6 deletions test/jasmine/tests/sankey_test.js
Expand Up @@ -470,37 +470,49 @@ describe('sankey tests', function() {
.then(function() { return _hover('node'); })
.then(function(d) {
_assert(d, {
curveNumber: 0
curveNumber: 0,
pointNumber: 4,
label: 'Solid'
});
})
.then(function() { return _hover('link'); })
.then(function(d) {
_assert(d, {
curveNumber: 0
curveNumber: 0,
pointNumber: 61,
value: 46.477
});
})
.then(function() { return _click('node'); })
.then(function(d) {
_assert(d, {
curveNumber: 0
curveNumber: 0,
pointNumber: 4,
label: 'Solid'
});
})
.then(function() { return _click('link'); })
.then(function(d) {
_assert(d, {
curveNumber: 0
curveNumber: 0,
pointNumber: 61,
value: 46.477
});
})
.then(function() { return _unhover('node'); })
.then(function(d) {
_assert(d, {
curveNumber: 0
curveNumber: 0,
pointNumber: 4,
label: 'Solid'
});
})
.then(function() { return _unhover('link'); })
.then(function(d) {
_assert(d, {
curveNumber: 0
curveNumber: 0,
pointNumber: 61,
value: 46.477
});
})
.catch(fail)
Expand Down

0 comments on commit 15dc324

Please sign in to comment.