Merge pull request #4188 from plotly/fix-tiny-zoomboxes

Fix tiny zoombox behavior
plotly · Sep 13, 2019 · 832590b · 832590b
2 parents 6c2babd + 61b88e9
commit 832590b
Show file tree

Hide file tree

Showing 3 changed files with 72 additions and 14 deletions.
diff --git a/src/plots/cartesian/dragbox.js b/src/plots/cartesian/dragbox.js
@@ -429,14 +429,7 @@ function makeDragBox(gd, plotinfo, x, y, w, h, ns, ew) {
     }
 
     function zoomDone() {
-        // more strict than dragged, which allows you to come back to where you started
-        // and still count as dragged
-        if(Math.min(box.h, box.w) < MINDRAG * 2) {
-            return removeZoombox(gd);
-        }
-
         computeZoomUpdates();
-
         removeZoombox(gd);
         dragTail();
         showDoubleClickNotifier(gd);

diff --git a/test/jasmine/tests/cartesian_interact_test.js b/test/jasmine/tests/cartesian_interact_test.js
@@ -65,7 +65,6 @@ describe('zoom box element', function() {
     });
 });
 
-
 describe('main plot pan', function() {
     var gd, modeBar, relayoutCallback;
 
@@ -893,7 +892,7 @@ describe('axis zoom/pan and main plot zoom', function() {
                         cnt++;
                         // called twice as many times on drag:
                         // - once per axis during mousemouve
-                        // - once per raxis on mouseup
+                        // - once per axis on mouseup
                         if(opts.dragged) cnt++;
                     }
                 });
@@ -1726,7 +1725,7 @@ describe('axis zoom/pan and main plot zoom', function() {
 
             Plotly.plot(gd, [{ type: 'heatmap', z: z() }], {dragmode: 'pan'})
             .then(function() {
-                // inspired by https://github.com/plotly/plotly.js/issues/2687<Paste>
+                // inspired by https://github.com/plotly/plotly.js/issues/2687
                 gd.on('plotly_relayout', function(d) {
                     relayoutTracker.unshift(d);
                     setTimeout(function() {
@@ -1915,6 +1914,66 @@ describe('axis zoom/pan and main plot zoom', function() {
             .then(done);
         });
     });
+
+    it('zoomboxes during small drag motions', function(done) {
+        var MINDRAG = constants.MINDRAG;
+        var eventData = {};
+
+        function _run(msg, dpos, exp) {
+            return function() {
+                var node = getDragger('xy', 'nsew');
+                var fns = drag.makeFns({node: node, pos0: [200, 200], dpos: dpos});
+
+                return fns.start().then(function() {
+                    var zl = d3.select(gd).select('g.zoomlayer');
+                    var d = zl.select('.zoombox-corners').attr('d');
+                    if(exp === 'nozoom') {
+                        expect(d).toBe('M0,0Z', 'blank path | ' + msg);
+                    } else {
+                        var actual = (d.match(/Z/g) || []).length;
+                        if(exp === 'x-zoom' || exp === 'y-zoom') {
+                            expect(actual).toBe(2, 'two corners | ' + msg);
+                        } else if(exp === 'xy-zoom') {
+                            expect(actual).toBe(4, 'four corners | ' + msg);
+                        } else {
+                            fail('wrong expectation str.');
+                        }
+                    }
+                })
+                .then(fns.end)
+                .then(function() {
+                    var keys = Object.keys(eventData);
+                    if(exp === 'nozoom') {
+                        expect(keys.length).toBe(0, 'no event data | ' + msg);
+                    } else if(exp === 'x-zoom') {
+                        expect(keys).withContext('relayout xaxis rng | ' + msg)
+                            .toEqual(['xaxis.range[0]', 'xaxis.range[1]']);
+                    } else if(exp === 'y-zoom') {
+                        expect(keys).withContext('relayout yaxis rng | ' + msg)
+                            .toEqual(['yaxis.range[0]', 'yaxis.range[1]']);
+                    } else if(exp === 'xy-zoom') {
+                        expect(keys.length).toBe(4, 'x and y relayout | ' + msg);
+                    } else {
+                        fail('wrong expectation str.');
+                    }
+                    eventData = {};
+                });
+            };
+        }
+
+        Plotly.plot(gd, [{y: [1, 2, 1]}], {width: 400, height: 400})
+        .then(function() {
+            gd.on('plotly_relayout', function(d) { eventData = d; });
+        })
+        .then(_run('dx < MINDRAG', [MINDRAG - 2, 0], 'nozoom'))
+        .then(_run('dx > MINDRAG', [MINDRAG + 2, 0], 'x-zoom'))
+        .then(_run('dy < MINDRAG', [0, MINDRAG - 2], 'nozoom'))
+        .then(_run('dy > MINDRAG', [0, MINDRAG + 2], 'y-zoom'))
+        .then(_run('(dx,dy) < MINDRAG', [MINDRAG - 2, MINDRAG - 2], 'nozoom'))
+        .then(_run('(dx,dy) > MINDRAG', [MINDRAG + 2, MINDRAG + 2], 'xy-zoom'))
+        .catch(failTest)
+        .then(done);
+    });
 });
 
 describe('Event data:', function() {

diff --git a/test/jasmine/tests/select_test.js b/test/jasmine/tests/select_test.js
@@ -437,17 +437,23 @@ describe('Click-to-select', function() {
               assertSelectedPoints([7, 35]);
               return _clickPt(mock14Pts[7], { shiftKey: true });
           })
-          .then(function() {
-              assertSelectedPoints(35);
-              drag(LASSO_PATH);
-          })
           .then(function() {
               assertSelectedPoints(35);
               _clickPt(mock14Pts[35], { shiftKey: true });
               return deselectPromise;
           })
           .then(function() {
               assertSelectionCleared();
+              return _clickPt(mock14Pts[7], { shiftKey: true });
+          })
+          .then(function() {
+              assertSelectedPoints(7);
+              drag([[110, 100], [300, 300]]);
+          })
+          .then(delay(100))
+          .then(function() {
+              // persist after zoombox
+              assertSelectedPoints(7);
           })
           .catch(failTest)
           .then(done);