1852 persistent click via select points

src/plots/cartesian/select.js

@@ -246,6 +246,9 @@ function prepSelect(e, startX, startY, dragOptions, mode) {
                 }
 
                 updateSelectedState(gd, searchTraces);
+
+                clearSelectionsCache(dragOptions);
+
                 gd.emit('plotly_deselect', null);
             } else {
                 if(clickmode.indexOf('select') > -1) {
@@ -322,9 +325,7 @@ function selectOnClick(evt, gd, xAxes, yAxes, subplot, dragOptions, polygonOutli
 
             updateSelectedState(gd, searchTraces);
 
-            // Clear selection cache to ensure a possible next selection
-            // starts from a clean slate.
-            dragOptions.polygons = [];
+            clearSelectionsCache(dragOptions);
 
             if(sendEvents) {
                 gd.emit('plotly_deselect', null);
@@ -387,10 +388,7 @@ function coerceSelectionsCache(evt, gd, dragOptions) {
       (!evt.shiftKey && !evt.altKey) ||
       ((evt.shiftKey || evt.altKey) && !plotinfo.selection)
     ) {
-        // create new polygons, if shift mode or selecting across different subplots
-        plotinfo.selection = {};
-        plotinfo.selection.polygons = dragOptions.polygons = [];
-        plotinfo.selection.mergedPolygons = dragOptions.mergedPolygons = [];
+        clearSelectionsCache(dragOptions);
     }
 
     // clear selection outline when selecting a different subplot
@@ -400,6 +398,14 @@ function coerceSelectionsCache(evt, gd, dragOptions) {
     }
 }
 
+function clearSelectionsCache(dragOptions) {
+    var plotinfo = dragOptions.plotinfo;
+
+    plotinfo.selection = {};
+    plotinfo.selection.polygons = dragOptions.polygons = [];
+    plotinfo.selection.mergedPolygons = dragOptions.mergedPolygons = [];
+}
+
 function determineSearchTraces(gd, xAxes, yAxes, subplot) {
     var searchTraces = [];
     var xAxisIds = xAxes.map(getAxId);

test/jasmine/assets/double_click.js

@@ -3,22 +3,25 @@ var getNodeCoords = require('./get_node_coords');
 var DBLCLICKDELAY = require('../../../src/constants/interactions').DBLCLICKDELAY;
 
 /*
- * double click on a point.
- * you can either specify x,y as pixels, or
+ * Double click on a point.
+ * You can either specify x,y as pixels, or
  * you can specify node and optionally an edge ('n', 'se', 'w' etc)
- * to grab it by an edge or corner (otherwise the middle is used)
+ * to grab it by an edge or corner (otherwise the middle is used).
+ * You can also pass options for the underlying click, e.g.
+ * to specify modifier keys. See `click` function
+ * for more info.
  */
-module.exports = function doubleClick(x, y) {
+module.exports = function doubleClick(x, y, clickOpts) {
     if(typeof x === 'object') {
         var coords = getNodeCoords(x, y);
         x = coords.x;
         y = coords.y;
     }
     return new Promise(function(resolve) {
-        click(x, y);
+        click(x, y, clickOpts);
 
         setTimeout(function() {
-            click(x, y);
+            click(x, y, clickOpts);
             setTimeout(function() { resolve(); }, DBLCLICKDELAY / 2);
         }, DBLCLICKDELAY / 2);
     });

test/jasmine/tests/select_test.js

@@ -262,6 +262,27 @@ describe('Click-to-select', function() {
         });
     });
 
+    it('cleanly clears and starts selections although add/subtract mode on', function(done) {
+        plotMock14()
+          .then(function() {
+              return _immediateClickPt(mock14Pts[7]);
+          })
+          .then(function() {
+              assertSelectedPoints(7);
+              _clickPt(mock14Pts[7], { shiftKey: true });
+              return deselectPromise;
+          })
+          .then(function() {
+              assertSelectionCleared();
+              return _clickPt(mock14Pts[35], { shiftKey: true });
+          })
+          .then(function() {
+              assertSelectedPoints(35);
+          })
+          .catch(failTest)
+          .then(done);
+    });
+
     it('supports adding to an existing selection', function(done) {
         plotMock14()
           .then(function() { return _immediateClickPt(mock14Pts[7]); })
@@ -1134,6 +1155,38 @@ describe('@flaky Test select box and lasso in general:', function() {
         .then(done);
     });
 
+    it('should cleanly clear and restart selections on double click when add/subtract mode on', function(done) {
+        var gd = createGraphDiv();
+        var fig = Lib.extendDeep({}, require('@mocks/0.json'));
+
+        fig.layout.dragmode = 'select';
+        Plotly.plot(gd, fig)
+          .then(function() {
+              return drag([[350, 100], [400, 400]]);
+          })
+          .then(function() {
+              _assertSelectedPoints([49, 50, 51, 52, 53, 54, 55, 56, 57]);
+              return doubleClick(500, 200, { shiftKey: true });
+          })
+          .then(function() {
+              _assertSelectedPoints(null);
+              return drag([[450, 100], [500, 400]], { shiftKey: true });
+          })
+          .then(function() {
+              _assertSelectedPoints([67, 68, 69, 70, 71, 72, 73, 74]);
+          })
+          .catch(failTest)
+          .then(done);
+
+        function _assertSelectedPoints(selPts) {
+            if(selPts) {
+                expect(gd.data[0].selectedpoints).toEqual(selPts);
+            } else {
+                expect('selectedpoints' in gd.data[0]).toBe(false);
+            }
+        }
+    });
+
     it('should clear selected points on double click only on pan/lasso modes', function(done) {
         var gd = createGraphDiv();
         var fig = Lib.extendDeep({}, require('@mocks/0.json'));