Merge pull request #3745 from plotly/mapbox-scrollzoom-fix

Disable mapbox scroll zoom on init, when required
plotly · Apr 8, 2019 · e111300 · e111300
2 parents 5baa139 + 57a06e5
commit e111300
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/src/plots/mapbox/mapbox.js b/src/plots/mapbox/mapbox.js
@@ -258,12 +258,6 @@ proto.updateMap = function(calcData, fullLayout, resolve, reject) {
         self.updateLayout(fullLayout);
         self.resolveOnRender(resolve);
     }
-
-    if(this.gd._context._scrollZoom.mapbox) {
-        map.scrollZoom.enable();
-    } else {
-        map.scrollZoom.disable();
-    }
 };
 
 proto.updateData = function(calcData) {
@@ -314,6 +308,12 @@ proto.updateLayout = function(fullLayout) {
     this.updateFramework(fullLayout);
     this.updateFx(fullLayout);
     this.map.resize();
+
+    if(this.gd._context._scrollZoom.mapbox) {
+        map.scrollZoom.enable();
+    } else {
+        map.scrollZoom.disable();
+    }
 };
 
 proto.resolveOnRender = function(resolve) {

diff --git a/test/jasmine/tests/mapbox_test.js b/test/jasmine/tests/mapbox_test.js
@@ -977,6 +977,9 @@ describe('@noCI, mapbox plots', function() {
     }, LONG_TIMEOUT_INTERVAL);
 
     it('should respect scrollZoom config option', function(done) {
+        var mockCopy2 = Lib.extendDeep({}, mock);
+        mockCopy2.config = {scrollZoom: false};
+
         var relayoutCnt = 0;
         gd.on('plotly_relayout', function() { relayoutCnt++; });
 
@@ -991,6 +994,7 @@ describe('@noCI, mapbox plots', function() {
 
         var zoom = getMapInfo(gd).zoom;
         expect(zoom).toBeCloseTo(1.234);
+        var zoom0 = zoom;
 
         _scroll().then(function() {
             expect(relayoutCnt).toBe(1, 'scroll relayout cnt');
@@ -1015,7 +1019,13 @@ describe('@noCI, mapbox plots', function() {
 
             var zoomNew = getMapInfo(gd).zoom;
             expect(zoomNew).toBeGreaterThan(zoom);
-            zoom = zoomNew;
+        })
+        .then(function() { return Plotly.newPlot(gd, mockCopy2); })
+        .then(_scroll)
+        .then(function() {
+            // see https://github.com/plotly/plotly.js/issues/3738
+            var zoomNew = getMapInfo(gd).zoom;
+            expect(zoomNew).toBe(zoom0);
         })
         .catch(failTest)
         .then(done);