fixup cross-subplot select logic brought up in 71a0395

plotly · Apr 12, 2018 · 9d0bcfd · 9d0bcfd
1 parent 24dad16
commit 9d0bcfd
Showing 1 changed file with 26 additions and 13 deletions.
diff --git a/src/plots/cartesian/select.js b/src/plots/cartesian/select.js
@@ -53,20 +53,33 @@ function prepSelect(e, startX, startY, dragOptions, mode) {
     var filterPoly, testPoly, mergedPolygons, currentPolygon;
     var i, cd, trace, searchInfo, eventData;
 
-    if(fullLayout._lastSelectedSubplot && fullLayout._lastSelectedSubplot === plotinfo.id) {
+    var selectingOnSameSubplot = (
+        fullLayout._lastSelectedSubplot &&
+        fullLayout._lastSelectedSubplot === plotinfo.id
+    );
+
+    if(
+        selectingOnSameSubplot &&
+        (e.shiftKey || e.altKey) &&
+        (plotinfo.selection && plotinfo.selection.polygons) &&
+        !dragOptions.polygons
+    ) {
         // take over selection polygons from prev mode, if any
-        if((e.shiftKey || e.altKey) && (plotinfo.selection && plotinfo.selection.polygons) && !dragOptions.polygons) {
-            dragOptions.polygons = plotinfo.selection.polygons;
-            dragOptions.mergedPolygons = plotinfo.selection.mergedPolygons;
-        }
-        // create new polygons, if shift mode
-        else if((!e.shiftKey && !e.altKey) || ((e.shiftKey || e.altKey) && !plotinfo.selection)) {
-            plotinfo.selection = {};
-            plotinfo.selection.polygons = dragOptions.polygons = [];
-            plotinfo.selection.mergedPolygons = dragOptions.mergedPolygons = [];
-        }
-    } else {
-        // do not allow multi-selection across different subplots
+        dragOptions.polygons = plotinfo.selection.polygons;
+        dragOptions.mergedPolygons = plotinfo.selection.mergedPolygons;
+    } else if(
+        (!e.shiftKey && !e.altKey) ||
+        ((e.shiftKey || e.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 = [];
+    }
+
+    // clear selection outline when selecting a different subplot
+    if(!selectingOnSameSubplot) {
         clearSelect(zoomLayer);
         fullLayout._lastSelectedSubplot = plotinfo.id;
     }