1852 persistent click

src/components/modebar/manage.js

@@ -185,7 +185,6 @@ function areAllAxesFixed(fullLayout) {
 }
 
 // look for traces that support selection
-// to be updated as we add more selectPoints handlers
 function isSelectable(fullData) {
     var selectable = false;
 
@@ -194,7 +193,7 @@ function isSelectable(fullData) {
 
         var trace = fullData[i];
 
-        if(!trace._module || !trace._module.selectPoints) continue;
+        if(!trace._module || !trace._module.selectable) continue;
 
         if(Registry.traceIs(trace, 'scatter-like')) {
             if(scatterSubTypes.hasMarkers(trace) || scatterSubTypes.hasText(trace)) {
@@ -205,7 +204,7 @@ function isSelectable(fullData) {
                 selectable = true;
             }
         }
-        // assume that in general if the trace module has selectPoints,
+        // assume that in general if the trace module has getPointsIn and toggleSelected,
         // then it's selectable. Scatter is an exception to this because it must
         // have markers or text, not just be a scatter type.
         else selectable = true;

src/lib/index.js

@@ -72,6 +72,9 @@ lib.variance = statsModule.variance;
 lib.stdev = statsModule.stdev;
 lib.interp = statsModule.interp;
 
+var setOpsModule = require('./set_operations');
+lib.difference = setOpsModule.difference;
+
 var matrixModule = require('./matrix');
 lib.init2dArray = matrixModule.init2dArray;
 lib.transposeRagged = matrixModule.transposeRagged;

src/lib/set_operations.js

@@ -0,0 +1,43 @@
+/**
+* Copyright 2012-2018, Plotly, Inc.
+* All rights reserved.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*/
+
+'use strict';
+
+
+/**
+ * Computes the set difference of two arrays.
+ *
+ * @param {array} a
+ * @param {array} b
+ * @returns out all elements of a that are not in b.
+ *      If a is not an array, an empty array is returned.
+ *      If b is not an array, a is returned.
+ */
+function difference(a, b) {
+    if(!Array.isArray(a)) return [];
+    if(!Array.isArray(b)) return a;
+
+    var hash = {};
+    var out = [];
+    var i;
+
+    for(i = 0; i < b.length; i++) {
+        hash[b[i]] = 1;
+    }
+
+    for(i = 0; i < a.length; i++) {
+        var ai = a[i];
+        if(!hash[ai]) out.push(ai);
+    }
+
+    return out;
+}
+
+module.exports = {
+    difference: difference
+};

src/plots/cartesian/dragbox.js

@@ -30,6 +30,8 @@ var doTicksSingle = require('./axes').doTicksSingle;
 var getFromId = require('./axis_ids').getFromId;
 var prepSelect = require('./select').prepSelect;
 var clearSelect = require('./select').clearSelect;
+var selectOnClick = require('./select').selectOnClick;
+
 var scaleZoom = require('./scale_zoom');
 
 var constants = require('./constants');
@@ -158,7 +160,7 @@ function makeDragBox(gd, plotinfo, x, y, w, h, ns, ew) {
                 // to pan (or to zoom if it already is pan) on shift
                 if(e.shiftKey) {
                     if(dragModeNow === 'pan') dragModeNow = 'zoom';
-                    else if(!isSelectOrLasso(dragModeNow)) dragModeNow = 'pan';
+                    else if(!isBoxOrLassoSelect(dragModeNow)) dragModeNow = 'pan';
                 }
                 else if(e.ctrlKey) {
                     dragModeNow = 'pan';
@@ -171,10 +173,11 @@ function makeDragBox(gd, plotinfo, x, y, w, h, ns, ew) {
         if(dragModeNow === 'lasso') dragOptions.minDrag = 1;
         else dragOptions.minDrag = undefined;
 
-        if(isSelectOrLasso(dragModeNow)) {
+        if(isBoxOrLassoSelect(dragModeNow)) {
             dragOptions.xaxes = xaxes;
             dragOptions.yaxes = yaxes;
             // this attaches moveFn, clickFn, doneFn on dragOptions
+            // TODO Maybe rename the function to prepSelectOnDrag
             prepSelect(e, startX, startY, dragOptions, dragModeNow);
         } else {
             dragOptions.clickFn = clickFn;
@@ -212,8 +215,10 @@ function makeDragBox(gd, plotinfo, x, y, w, h, ns, ew) {
         if(numClicks === 2 && !singleEnd) doubleClick();
 
         if(isMainDrag) {
-            Fx.click(gd, evt, plotinfo.id);
+            handleClickInMainDrag(gd, numClicks, evt, xaxes, yaxes, plotinfo.id);
         }
+        // Allow manual editing of range bounds through an input field
+        // TODO consider extracting that to a method for clarity
         else if(numClicks === 1 && singleEnd) {
             var ax = ns ? ya0 : xa0,
                 end = (ns === 's' || ew === 'w') ? 0 : 1,
@@ -620,6 +625,12 @@ function makeDragBox(gd, plotinfo, x, y, w, h, ns, ew) {
         redrawObjs(gd._fullLayout.images || [], Registry.getComponentMethod('images', 'draw'), true);
     }
 
+    function handleClickInMainDrag(gd, numClicks, evt, xaxes, yaxes, subplot) {
+        // TODO differentiate based on `clickmode` attr here as soon as it is available
+        selectOnClick(gd, numClicks, evt, xaxes, yaxes);
+        Fx.click(gd, evt, subplot);
+    }
+
     function doubleClick() {
         if(gd._transitioningWithDuration) return;
 
@@ -1013,7 +1024,7 @@ function showDoubleClickNotifier(gd) {
     }
 }
 
-function isSelectOrLasso(dragmode) {
+function isBoxOrLassoSelect(dragmode) {
     return dragmode === 'lasso' || dragmode === 'select';
 }