From 78e7f86791bd927e84c3257696cd4c0e133369ce Mon Sep 17 00:00:00 2001
From: lcawl <lcawley@elastic.co>
Date: Wed, 26 Jan 2022 18:23:18 -0800
Subject: [PATCH 1/5] Add tooltip for Surrounding documents

---
 .../discover_grid/discover_grid_flyout.tsx    | 52 ++++++++++++++-----
 1 file changed, 39 insertions(+), 13 deletions(-)

diff --git a/src/plugins/discover/public/components/discover_grid/discover_grid_flyout.tsx b/src/plugins/discover/public/components/discover_grid/discover_grid_flyout.tsx
index 726c211fe418b1..88fba6891150bb 100644
--- a/src/plugins/discover/public/components/discover_grid/discover_grid_flyout.tsx
+++ b/src/plugins/discover/public/components/discover_grid/discover_grid_flyout.tsx
@@ -15,9 +15,11 @@ import {
   EuiFlyout,
   EuiFlyoutBody,
   EuiFlyoutHeader,
+  EuiIcon,
   EuiTitle,
   EuiButtonEmpty,
   EuiText,
+  EuiToolTip,
   EuiSpacer,
   EuiPortal,
   EuiPagination,
@@ -160,19 +162,43 @@ export function DiscoverGridFlyout({
               </EuiButtonEmpty>
             </EuiFlexItem>
             {indexPattern.isTimeBased() && indexPattern.id && (
-              <EuiFlexItem grow={false}>
-                <EuiButtonEmpty
-                  size="xs"
-                  iconType="documents"
-                  flush="left"
-                  {...surrDocsProps}
-                  data-test-subj="docTableRowAction"
-                >
-                  {i18n.translate('discover.grid.tableRow.viewSurroundingDocumentsLinkTextSimple', {
-                    defaultMessage: 'Surrounding documents',
-                  })}
-                </EuiButtonEmpty>
-              </EuiFlexItem>
+              <EuiFlexGroup alignItems="center" responsive={false} gutterSize="s">
+                <EuiFlexItem grow={false}>
+                  <EuiButtonEmpty
+                    size="xs"
+                    iconType="documents"
+                    flush="left"
+                    {...surrDocsProps}
+                    data-test-subj="docTableRowAction"
+                  >
+                    {i18n.translate(
+                      'discover.grid.tableRow.viewSurroundingDocumentsLinkTextSimple',
+                      {
+                        defaultMessage: 'Surrounding documents',
+                      }
+                    )}
+                  </EuiButtonEmpty>
+                </EuiFlexItem>
+                <EuiFlexItem grow={false}>
+                  <EuiToolTip
+                    position="right"
+                    content={i18n.translate(
+                      'discover.grid.tableRow.viewSurroundingDocumentsHover',
+                      {
+                        defaultMessage:
+                          'Inspect documents that occurred before and after this document. Only pinned filters remain active in the Surrounding documents view.',
+                      }
+                    )}
+                  >
+                    <EuiIcon
+                      size="s"
+                      color="subdued"
+                      type="questionInCircle"
+                      className="eui-alignTop"
+                    />
+                  </EuiToolTip>
+                </EuiFlexItem>
+              </EuiFlexGroup>
             )}
             {activePage !== -1 && (
               <EuiFlexItem data-test-subj={`dscDocNavigationPage-${activePage}`}>

From 317870f7510396e6c11d802851413b02a012a6d3 Mon Sep 17 00:00:00 2001
From: lcawl <lcawley@elastic.co>
Date: Thu, 27 Jan 2022 10:58:08 -0800
Subject: [PATCH 2/5] Switch to icontip

---
 .../discover_grid/discover_grid_flyout.tsx    | 24 +++++++++----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/plugins/discover/public/components/discover_grid/discover_grid_flyout.tsx b/src/plugins/discover/public/components/discover_grid/discover_grid_flyout.tsx
index 88fba6891150bb..d7eee4dfbec08c 100644
--- a/src/plugins/discover/public/components/discover_grid/discover_grid_flyout.tsx
+++ b/src/plugins/discover/public/components/discover_grid/discover_grid_flyout.tsx
@@ -15,11 +15,10 @@ import {
   EuiFlyout,
   EuiFlyoutBody,
   EuiFlyoutHeader,
-  EuiIcon,
+  EuiIconTip,
   EuiTitle,
   EuiButtonEmpty,
   EuiText,
-  EuiToolTip,
   EuiSpacer,
   EuiPortal,
   EuiPagination,
@@ -162,7 +161,7 @@ export function DiscoverGridFlyout({
               </EuiButtonEmpty>
             </EuiFlexItem>
             {indexPattern.isTimeBased() && indexPattern.id && (
-              <EuiFlexGroup alignItems="center" responsive={false} gutterSize="s">
+              <EuiFlexGroup alignItems="center" responsive={false} gutterSize="none">
                 <EuiFlexItem grow={false}>
                   <EuiButtonEmpty
                     size="xs"
@@ -180,8 +179,7 @@ export function DiscoverGridFlyout({
                   </EuiButtonEmpty>
                 </EuiFlexItem>
                 <EuiFlexItem grow={false}>
-                  <EuiToolTip
-                    position="right"
+                  <EuiIconTip
                     content={i18n.translate(
                       'discover.grid.tableRow.viewSurroundingDocumentsHover',
                       {
@@ -189,14 +187,14 @@ export function DiscoverGridFlyout({
                           'Inspect documents that occurred before and after this document. Only pinned filters remain active in the Surrounding documents view.',
                       }
                     )}
-                  >
-                    <EuiIcon
-                      size="s"
-                      color="subdued"
-                      type="questionInCircle"
-                      className="eui-alignTop"
-                    />
-                  </EuiToolTip>
+                    type="questionInCircle"
+                    color="subdued"
+                    size="s"
+                    position="right"
+                    iconProps={{
+                      className: 'eui-alignTop',
+                    }}
+                  />
                 </EuiFlexItem>
               </EuiFlexGroup>
             )}

From 9b48ca06316b8149066cdabf2ffd890c87b7d929 Mon Sep 17 00:00:00 2001
From: Lisa Cawley <lcawley@elastic.co>
Date: Mon, 14 Feb 2022 14:26:43 -0800
Subject: [PATCH 3/5] Update
 src/plugins/discover/public/components/discover_grid/discover_grid_flyout.tsx

Co-authored-by: Andrea Del Rio <delrio.andre@gmail.com>
---
 .../public/components/discover_grid/discover_grid_flyout.tsx   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/plugins/discover/public/components/discover_grid/discover_grid_flyout.tsx b/src/plugins/discover/public/components/discover_grid/discover_grid_flyout.tsx
index a1e59371501557..e88edbfbeb300b 100644
--- a/src/plugins/discover/public/components/discover_grid/discover_grid_flyout.tsx
+++ b/src/plugins/discover/public/components/discover_grid/discover_grid_flyout.tsx
@@ -163,7 +163,8 @@ export function DiscoverGridFlyout({
               <EuiFlexGroup alignItems="center" responsive={false} gutterSize="none">
                 <EuiFlexItem grow={false}>
                   <EuiButtonEmpty
-                    size="xs"
+                    size="s"
+                    iconSize="s"
                     iconType="documents"
                     flush="left"
                     {...surrDocsProps}

From 324a2a89b022573a8d13722cca255b04dfc51704 Mon Sep 17 00:00:00 2001
From: lcawl <lcawley@elastic.co>
Date: Mon, 14 Feb 2022 14:30:53 -0800
Subject: [PATCH 4/5] Removes unnecessary size property

---
 .../public/components/discover_grid/discover_grid_flyout.tsx     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/plugins/discover/public/components/discover_grid/discover_grid_flyout.tsx b/src/plugins/discover/public/components/discover_grid/discover_grid_flyout.tsx
index e88edbfbeb300b..79ade8ed18f05b 100644
--- a/src/plugins/discover/public/components/discover_grid/discover_grid_flyout.tsx
+++ b/src/plugins/discover/public/components/discover_grid/discover_grid_flyout.tsx
@@ -189,7 +189,6 @@ export function DiscoverGridFlyout({
                     )}
                     type="questionInCircle"
                     color="subdued"
-                    size="s"
                     position="right"
                     iconProps={{
                       className: 'eui-alignTop',

From 72165b88e1cb32914f57926c839fe70c49735f8a Mon Sep 17 00:00:00 2001
From: lcawl <lcawley@elastic.co>
Date: Mon, 14 Feb 2022 15:01:22 -0800
Subject: [PATCH 5/5] Change size properties for single document

---
 .../public/components/discover_grid/discover_grid_flyout.tsx   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/plugins/discover/public/components/discover_grid/discover_grid_flyout.tsx b/src/plugins/discover/public/components/discover_grid/discover_grid_flyout.tsx
index 79ade8ed18f05b..bdf9268c73060e 100644
--- a/src/plugins/discover/public/components/discover_grid/discover_grid_flyout.tsx
+++ b/src/plugins/discover/public/components/discover_grid/discover_grid_flyout.tsx
@@ -148,7 +148,8 @@ export function DiscoverGridFlyout({
             </EuiHideFor>
             <EuiFlexItem grow={false}>
               <EuiButtonEmpty
-                size="xs"
+                size="s"
+                iconSize="s"
                 iconType="document"
                 flush="left"
                 data-test-subj="docTableRowAction"