From 011501fd09c01a7d5708d959d1fdf655ffe62fe1 Mon Sep 17 00:00:00 2001
From: Aaron Caldwell <Aaron.Caldwell@elastic.co>
Date: Tue, 24 Jul 2018 11:13:43 -0600
Subject: [PATCH 1/2] Default scroll wheel zoom to false on vega maps. Update
 docs

---
 docs/visualize/vega.asciidoc                           | 3 ++-
 src/core_plugins/vega/public/data_model/vega_parser.js | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/visualize/vega.asciidoc b/docs/visualize/vega.asciidoc
index 9f88eeefbbb21..7351cd65ef090 100644
--- 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/vega_parser.js b/src/core_plugins/vega/public/data_model/vega_parser.js
index cb2023365709e..e324cfffb7170 100644
--- 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) {

From 8fabec072e4daec29eab781c1a6e4c19f2271eaf Mon Sep 17 00:00:00 2001
From: Aaron Caldwell <aaronjcaldwell@gmail.com>
Date: Mon, 29 Oct 2018 13:15:57 -0600
Subject: [PATCH 2/2] Update scroll wheel to false in tests

---
 .../vega/public/data_model/__tests__/vega_parser.js       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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
index 1be4c160d075f..4753101298a82 100644
--- 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,7 +180,7 @@ describe('VegaParser._parseMapConfig', () => {
     longitude: 0,
     mapStyle: 'default',
     zoomControl: true,
-    scrollWheelZoom: true,
+    scrollWheelZoom: false,
     maxBounds: [1, 2, 3, 4],
   }, {
     delayRepaint: true,
@@ -188,7 +188,7 @@ describe('VegaParser._parseMapConfig', () => {
     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));
 });