sankey: reset node.(x|y) when grouping, test drag for every arrangements

Author: antoinerg

src/traces/sankey/attributes.js

@@ -91,6 +91,7 @@ var attrs = module.exports = overrideAll({
         },
         groups: {
             valType: 'info_array',
+            impliedEdits: {'x': [], 'y': []},
             dimensions: 2,
             freeLength: true,
             dflt: [],

src/traces/sankey/render.js

@@ -641,7 +641,7 @@ function startForce(sankeyNode, sankeyLink, d, forceKey, gd) {
             window.requestAnimationFrame(faster);
         } else {
             // Make sure the final x position is equal to its original value
-            // necessary because the force simulation will have numerical error
+            // because the force simulation will have numerical error
             var x = d.node.originalX;
             d.node.x0 = x - d.visibleWidth / 2;
             d.node.x1 = x + d.visibleWidth / 2;
@@ -744,6 +744,9 @@ module.exports = function(gd, svg, calcData, layout, callbacks) {
         firstRender = true;
     });
 
+    // To prevent animation on dragging
+    var dragcover = gd.querySelector('.dragcover');
+
     var styledData = calcData
             .filter(function(d) {return unwrap(d).trace.visible;})
             .map(sankeyModel.bind(null, layout));
@@ -808,7 +811,7 @@ module.exports = function(gd, svg, calcData, layout, callbacks) {
         .attr('d', linkPath());
 
     sankeyLink
-        .style('opacity', function() { return (gd._context.staticPlot || firstRender) ? 1 : 0;})
+        .style('opacity', function() { return (gd._context.staticPlot || firstRender || dragcover) ? 1 : 0;})
         .transition()
         .ease(c.ease).duration(c.duration)
         .style('opacity', 1);

test/jasmine/assets/drag.js

@@ -1,6 +1,7 @@
 var isNumeric = require('fast-isnumeric');
 var mouseEvent = require('./mouse_event');
 var getNodeCoords = require('./get_node_coords');
+var delay = require('./delay');
 
 function makeFns(node, dx, dy, opts) {
     opts = opts || {};
@@ -49,7 +50,8 @@ function makeFns(node, dx, dy, opts) {
  * optionally specify an edge ('n', 'se', 'w' etc)
  * to grab it by an edge or corner (otherwise the middle is used)
  */
-function drag(node, dx, dy, edge, x0, y0, nsteps, noCover) {
+function drag(node, dx, dy, edge, x0, y0, nsteps, noCover, timeDelay) {
+    if(!timeDelay) timeDelay = 0;
     var fns = makeFns(node, dx, dy, {
         edge: edge,
         x0: x0,
@@ -58,7 +60,7 @@ function drag(node, dx, dy, edge, x0, y0, nsteps, noCover) {
         noCover: noCover
     });
 
-    return fns.start().then(fns.end);
+    return fns.start().then(delay(timeDelay)).then(fns.end);
 }
 
 function waitForDragCover() {

test/jasmine/tests/sankey_test.js

@@ -1012,7 +1012,7 @@ describe('sankey tests', function() {
     });
 
     describe('Test drag interactions', function() {
-        ['freeform', 'perpendicular'].forEach(function(arrangement) {
+        ['freeform', 'perpendicular', 'snap'].forEach(function(arrangement) {
             describe('for arrangement ' + arrangement + ':', function() {
                 var gd;
                 var mockCopy;
@@ -1037,9 +1037,10 @@ describe('sankey tests', function() {
                         return Promise.resolve()
                         .then(function() {
                             nodes = document.getElementsByClassName('sankey-node');
-                            node = nodes.item(nodeId); // Selecting node with label 'Solid'
+                            node = nodes.item(nodeId);
                             position = getNodeCoords(node);
-                            return drag(node, move[0], move[1]);
+                            var timeDelay = (arrangement === 'snap') ? 1000 : 0; // Wait for force simulation to finish
+                            return drag(node, move[0], move[1], false, false, false, 10, false, timeDelay);
                         })
                         .then(function() {
                             nodes = document.getElementsByClassName('sankey-node');
@@ -1072,7 +1073,7 @@ describe('sankey tests', function() {
                       .then(done);
                 });
 
-                it('should persist the position of evry nodes after drag in attributes nodes.(x|y)', function(done) {
+                it('should persist the position of every nodes after drag in attributes nodes.(x|y)', function(done) {
                     mockCopy.data[0].arrangement = arrangement;
                     var move = [50, 50];
                     var nodes;