From 5b3718d6bcec70fef96c0b63e331a5280ef7ef1b Mon Sep 17 00:00:00 2001
From: Nathan Reese <reese.nathan@gmail.com>
Date: Fri, 22 Nov 2019 17:02:08 -0700
Subject: [PATCH] [Maps] focus inputs when editor opens popovers (#51487)
 (#51512)

---
 .../__snapshots__/add_tooltip_field_popover.test.js.snap      | 4 ++--
 .../maps/public/components/add_tooltip_field_popover.js       | 1 +
 .../layer_panel/filter_editor/filter_editor.js                | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/x-pack/legacy/plugins/maps/public/components/__snapshots__/add_tooltip_field_popover.test.js.snap b/x-pack/legacy/plugins/maps/public/components/__snapshots__/add_tooltip_field_popover.test.js.snap
index 968915905cd31..f37dfdd879c5b 100644
--- a/x-pack/legacy/plugins/maps/public/components/__snapshots__/add_tooltip_field_popover.test.js.snap
+++ b/x-pack/legacy/plugins/maps/public/components/__snapshots__/add_tooltip_field_popover.test.js.snap
@@ -22,7 +22,7 @@ exports[`Should remove selected fields from selectable 1`] = `
   hasArrow={true}
   id="addTooltipFieldPopover"
   isOpen={false}
-  ownFocus={false}
+  ownFocus={true}
   panelPaddingSize="m"
 >
   <EuiSelectable
@@ -87,7 +87,7 @@ exports[`Should render 1`] = `
   hasArrow={true}
   id="addTooltipFieldPopover"
   isOpen={false}
-  ownFocus={false}
+  ownFocus={true}
   panelPaddingSize="m"
 >
   <EuiSelectable
diff --git a/x-pack/legacy/plugins/maps/public/components/add_tooltip_field_popover.js b/x-pack/legacy/plugins/maps/public/components/add_tooltip_field_popover.js
index 53a9fd33c2612..82e26087a2c68 100644
--- a/x-pack/legacy/plugins/maps/public/components/add_tooltip_field_popover.js
+++ b/x-pack/legacy/plugins/maps/public/components/add_tooltip_field_popover.js
@@ -166,6 +166,7 @@ export class AddTooltipFieldPopover extends Component {
         button={this._renderAddButton()}
         isOpen={this.state.isPopoverOpen}
         closePopover={this._closePopover}
+        ownFocus
       >
         {this._renderContent()}
       </EuiPopover>
diff --git a/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/filter_editor/filter_editor.js b/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/filter_editor/filter_editor.js
index 20520ad3ff8f1..0086c5067ba12 100644
--- a/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/filter_editor/filter_editor.js
+++ b/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/filter_editor/filter_editor.js
@@ -90,6 +90,7 @@ export class FilterEditor extends Component {
         isOpen={this.state.isPopoverOpen}
         closePopover={this._close}
         anchorPosition="leftCenter"
+        ownFocus
       >
         <div className="mapFilterEditor" data-test-subj="mapFilterEditor">
           <SearchBar