From d2b9caa1a7e97e996a127755cef10d33f755f267 Mon Sep 17 00:00:00 2001
From: Larry Gregory <larry.gregory@elastic.co>
Date: Tue, 9 Mar 2021 17:42:38 -0500
Subject: [PATCH] Fix positioning of space name and avatar in selector dropdown
 (#94169)

---
 .../spaces/public/nav_control/components/spaces_menu.scss   | 4 ++++
 .../spaces/public/nav_control/components/spaces_menu.tsx    | 6 ++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/x-pack/plugins/spaces/public/nav_control/components/spaces_menu.scss b/x-pack/plugins/spaces/public/nav_control/components/spaces_menu.scss
index 367fbf9e9792..1f272260fc9c 100644
--- a/x-pack/plugins/spaces/public/nav_control/components/spaces_menu.scss
+++ b/x-pack/plugins/spaces/public/nav_control/components/spaces_menu.scss
@@ -15,3 +15,7 @@
   margin: $euiSizeM;
   width: calc(100% - #{$euiSizeM*2});
 }
+
+.spcMenu__item {
+  margin-left: $euiSizeM;
+}
\ No newline at end of file
diff --git a/x-pack/plugins/spaces/public/nav_control/components/spaces_menu.tsx b/x-pack/plugins/spaces/public/nav_control/components/spaces_menu.tsx
index fda79bd93e39..392a95c44592 100644
--- a/x-pack/plugins/spaces/public/nav_control/components/spaces_menu.tsx
+++ b/x-pack/plugins/spaces/public/nav_control/components/spaces_menu.tsx
@@ -133,14 +133,12 @@ class SpacesMenuUI extends Component<Props, State> {
     return (
       <div key="manageSpacesSearchField" className="spcMenu__searchFieldWrapper">
         {
-          // @ts-ignore
           <EuiFieldSearch
             placeholder={intl.formatMessage({
               id: 'xpack.spaces.navControl.spacesMenu.findSpacePlaceholder',
               defaultMessage: 'Find a space',
             })}
             incremental={true}
-            // FIXME needs updated typedef
             onSearch={this.onSearch}
             onKeyDown={this.onSearchKeyDown}
             onFocus={this.onSearchFocus}
@@ -159,7 +157,7 @@ class SpacesMenuUI extends Component<Props, State> {
 
     const keyCode = e.keyCode;
     if (focusableKeyCodes.includes(keyCode)) {
-      // Allows the spaces list panel to recieve focus. This enables keyboard and screen reader navigation
+      // Allows the spaces list panel to receive focus. This enables keyboard and screen reader navigation
       this.setState({
         allowSpacesListFocus: true,
       });
@@ -206,7 +204,7 @@ class SpacesMenuUI extends Component<Props, State> {
         toolTipTitle={space.description && space.name}
         toolTipContent={space.description}
       >
-        {space.name}
+        <EuiText className="spcMenu__item">{space.name}</EuiText>
       </EuiContextMenuItem>
     );
   };