Merge branch 'master' into config-opts-in-plot-schema

plotly · etpinard · Jan 16, 2019 · Dec 26, 2018 · Dec 26, 2018 · Jan 8, 2019
commit e7f1478ee000432696c9cfb27621167e80d1833f
diff --git a/test/jasmine/tests/config_test.js b/test/jasmine/tests/config_test.js
@@ -822,4 +822,88 @@ describe('config argument', function() {
             .then(done);
         });
     });
+
+    describe('scrollZoom interactions:', function() {
+        var gd;
+
+        afterEach(destroyGraphDiv);
+
+        function _scroll() {
+            var mainDrag = d3.select('.nsewdrag[data-subplot="xy"]').node();
+            mouseEvent('scroll', 200, 200, {deltaY: -200, element: mainDrag});
+        }
+
+        it('should not disable scrollZoom when *responsive:true*', function(done) {
+            gd = document.createElement('div');
+            gd.id = 'graph';
+            gd.style.height = '85vh';
+            gd.style.minHeight = '300px';
+            document.body.appendChild(gd);
+
+            // locking down fix for:
+            // https://github.com/plotly/plotly.js/issues/3337
+
+            var xrng0;
+            var yrng0;
+
+            Plotly.newPlot(gd, [{
+                y: [1, 2, 1]
+            }], {}, {
+                scrollZoom: true,
+                responsive: true
+            })
+            .then(function() {
+                xrng0 = gd._fullLayout.xaxis.range.slice();
+                yrng0 = gd._fullLayout.yaxis.range.slice();
+            })
+            .then(_scroll)
+            .then(function() {
+                var xrng = gd._fullLayout.xaxis.range;
+                expect(xrng[0]).toBeGreaterThan(xrng0[0], 'scrolled x-range[0]');
+                expect(xrng[1]).toBeLessThan(xrng0[1], 'scrolled x-range[1]');
+
+                var yrng = gd._fullLayout.yaxis.range;
+                expect(yrng[0]).toBeGreaterThan(yrng0[0], 'scrolled y-range[0]');
+                expect(yrng[1]).toBeLessThan(yrng0[1], 'scrolled y-range[1]');
+            })
+            .catch(failTest)
+            .then(done);
+        });
+
+        it('should not disable scrollZoom when page is made scrollable by large graph', function(done) {
+            gd = document.createElement('div');
+            gd.id = 'graph';
+            document.body.appendChild(gd);
+
+            // locking down fix for:
+            // https://github.com/plotly/plotly.js/issues/2371
+
+            var xrng0;
+            var yrng0;
+
+            Plotly.newPlot(gd, [{
+                y: [1, 2, 1]
+            }], {
+                width: 2 * window.innerWidth
+            }, {
+                scrollZoom: true
+            })
+            .then(function() {
+                xrng0 = gd._fullLayout.xaxis.range.slice();
+                yrng0 = gd._fullLayout.yaxis.range.slice();
+            })
+            .then(_scroll)
+            .then(function() {
+                var xrng = gd._fullLayout.xaxis.range;
+                expect(xrng[0]).toBeGreaterThan(xrng0[0], 'scrolled x-range[0]');
+                expect(xrng[1]).toBeLessThan(xrng0[1], 'scrolled x-range[1]');
+
+                var yrng = gd._fullLayout.yaxis.range;
+                expect(yrng[0]).toBeGreaterThan(yrng0[0], 'scrolled y-range[0]');
+                expect(yrng[1]).toBeLessThan(yrng0[1], 'scrolled y-range[1]');
+            })
+            .catch(failTest)
+            .then(done);
+        });
+    });
 });