Default scroll wheel zoom to false on vega maps. Update docs (#21169)

* Default scroll wheel zoom to false on vega maps. Update docs * Update scroll wheel to false in tests
elastic · Oct 29, 2018 · ad10c75 · ad10c75
1 parent dc89a9d
commit ad10c75
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/docs/visualize/vega.asciidoc b/docs/visualize/vega.asciidoc
@@ -215,7 +215,8 @@ the graph must specify `type=map` in the host configuration:
       // defaults to true, shows +/- buttons to zoom in/out
       "zoomControl": false,
 
-      // defaults to true, disables mouse wheel zoom
+      // Defaults to 'false', disables mouse wheel zoom. If set to 
+      // 'true', map may zoom unexpectedly while scrolling dashboard
       "scrollWheelZoom": false,
 
       // When false, repaints on each move frame.

diff --git a/src/core_plugins/vega/public/data_model/__tests__/vega_parser.js b/src/core_plugins/vega/public/data_model/__tests__/vega_parser.js
@@ -171,7 +171,7 @@ describe('VegaParser._parseMapConfig', () => {
     longitude: 0,
     mapStyle: 'default',
     zoomControl: true,
-    scrollWheelZoom: true,
+    scrollWheelZoom: false,
   }, 0));
 
   it('filled', test({
@@ -180,15 +180,15 @@ describe('VegaParser._parseMapConfig', () => {
     longitude: 0,
     mapStyle: 'default',
     zoomControl: true,
-    scrollWheelZoom: true,
+    scrollWheelZoom: false,
     maxBounds: [1, 2, 3, 4],
   }, {
     delayRepaint: true,
     latitude: 0,
     longitude: 0,
     mapStyle: 'default',
     zoomControl: true,
-    scrollWheelZoom: true,
+    scrollWheelZoom: false,
     maxBounds: [1, 2, 3, 4],
   }, 0));
 
@@ -207,7 +207,7 @@ describe('VegaParser._parseMapConfig', () => {
     longitude: 0,
     mapStyle: 'default',
     zoomControl: true,
-    scrollWheelZoom: true,
+    scrollWheelZoom: false,
   }, 5));
 });
 

diff --git a/src/core_plugins/vega/public/data_model/vega_parser.js b/src/core_plugins/vega/public/data_model/vega_parser.js
@@ -299,7 +299,7 @@ export class VegaParser {
     }
 
     this._parseBool('zoomControl', res, true);
-    this._parseBool('scrollWheelZoom', res, true);
+    this._parseBool('scrollWheelZoom', res, false);
 
     const maxBounds = this._config.maxBounds;
     if (maxBounds !== undefined) {