From 89672f870526c451951a323bccab112fa582339b Mon Sep 17 00:00:00 2001
From: miukimiu <elizabet.oliveira@elastic.co>
Date: Wed, 15 Jul 2020 14:58:22 +0100
Subject: [PATCH 1/2] Fixed EuiComboBox always showing a scrollbar

---
 CHANGELOG.md                                  |  4 ++-
 .../__snapshots__/combo_box.test.tsx.snap     | 26 +++++++++----------
 .../combo_box_options_list.tsx                |  2 +-
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 28e9b4178af..7717a9d9372 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,8 @@
 ## [`master`](https://github.com/elastic/eui/tree/master)
 
-No public interface changes since `27.1.0`.
+**Bug fixes**
+
+- Fixed `EuiComboBox` always showing a scrollbar ([#3699](https://github.com/elastic/eui/pull/3699))
 
 ## [`27.1.0`](https://github.com/elastic/eui/tree/v27.1.0)
 
diff --git a/src/components/combo_box/__snapshots__/combo_box.test.tsx.snap b/src/components/combo_box/__snapshots__/combo_box.test.tsx.snap
index 9eff4a11e59..8e4e3329142 100644
--- a/src/components/combo_box/__snapshots__/combo_box.test.tsx.snap
+++ b/src/components/combo_box/__snapshots__/combo_box.test.tsx.snap
@@ -317,12 +317,12 @@ exports[`props options list is rendered 1`] = `
       class="euiComboBoxOptionsList__rowWrap"
     >
       <div
-        style="position: relative; height: 189px; width: 0px; overflow: auto; direction: ltr;"
+        style="position: relative; height: 203px; width: 0px; overflow: auto; direction: ltr;"
       >
         <div
           id="htmlid_listbox"
           role="listBox"
-          style="height: 270px; width: 100%;"
+          style="height: 290px; width: 100%;"
           tabindex="0"
         >
           <button
@@ -331,7 +331,7 @@ exports[`props options list is rendered 1`] = `
             data-test-subj="titanOption"
             id="htmlid__option-0"
             role="option"
-            style="position: absolute; left: 0px; top: 0px; height: 27px; width: 100%;"
+            style="position: absolute; left: 0px; top: 0px; height: 29px; width: 100%;"
             title="Titan"
             type="button"
           >
@@ -354,7 +354,7 @@ exports[`props options list is rendered 1`] = `
             class="euiFilterSelectItem"
             id="htmlid__option-1"
             role="option"
-            style="position: absolute; left: 0px; top: 27px; height: 27px; width: 100%;"
+            style="position: absolute; left: 0px; top: 29px; height: 29px; width: 100%;"
             title="Enceladus"
             type="button"
           >
@@ -377,7 +377,7 @@ exports[`props options list is rendered 1`] = `
             class="euiFilterSelectItem"
             id="htmlid__option-2"
             role="option"
-            style="position: absolute; left: 0px; top: 54px; height: 27px; width: 100%;"
+            style="position: absolute; left: 0px; top: 58px; height: 29px; width: 100%;"
             title="Mimas"
             type="button"
           >
@@ -400,7 +400,7 @@ exports[`props options list is rendered 1`] = `
             class="euiFilterSelectItem"
             id="htmlid__option-3"
             role="option"
-            style="position: absolute; left: 0px; top: 81px; height: 27px; width: 100%;"
+            style="position: absolute; left: 0px; top: 87px; height: 29px; width: 100%;"
             title="Dione"
             type="button"
           >
@@ -423,7 +423,7 @@ exports[`props options list is rendered 1`] = `
             class="euiFilterSelectItem"
             id="htmlid__option-4"
             role="option"
-            style="position: absolute; left: 0px; top: 108px; height: 27px; width: 100%;"
+            style="position: absolute; left: 0px; top: 116px; height: 29px; width: 100%;"
             title="Iapetus"
             type="button"
           >
@@ -446,7 +446,7 @@ exports[`props options list is rendered 1`] = `
             class="euiFilterSelectItem"
             id="htmlid__option-5"
             role="option"
-            style="position: absolute; left: 0px; top: 135px; height: 27px; width: 100%;"
+            style="position: absolute; left: 0px; top: 145px; height: 29px; width: 100%;"
             title="Phoebe"
             type="button"
           >
@@ -469,7 +469,7 @@ exports[`props options list is rendered 1`] = `
             class="euiFilterSelectItem"
             id="htmlid__option-6"
             role="option"
-            style="position: absolute; left: 0px; top: 162px; height: 27px; width: 100%;"
+            style="position: absolute; left: 0px; top: 174px; height: 29px; width: 100%;"
             title="Rhea"
             type="button"
           >
@@ -492,7 +492,7 @@ exports[`props options list is rendered 1`] = `
             class="euiFilterSelectItem"
             id="htmlid__option-7"
             role="option"
-            style="position: absolute; left: 0px; top: 189px; height: 27px; width: 100%;"
+            style="position: absolute; left: 0px; top: 203px; height: 29px; width: 100%;"
             title="Pandora is one of Saturn's moons, named for a Titaness of Greek mythology"
             type="button"
           >
@@ -515,7 +515,7 @@ exports[`props options list is rendered 1`] = `
             class="euiFilterSelectItem"
             id="htmlid__option-8"
             role="option"
-            style="position: absolute; left: 0px; top: 216px; height: 27px; width: 100%;"
+            style="position: absolute; left: 0px; top: 232px; height: 29px; width: 100%;"
             title="Tethys"
             type="button"
           >
@@ -741,7 +741,7 @@ exports[`props singleSelection prepend and append is rendered 1`] = `
       }
       position="bottom"
       rootId={[Function]}
-      rowHeight={27}
+      rowHeight={29}
       scrollToIndex={-1}
       searchValue=""
       selectedOptions={Array []}
@@ -875,7 +875,7 @@ exports[`props singleSelection selects existing option when opened 1`] = `
       }
       position="bottom"
       rootId={[Function]}
-      rowHeight={27}
+      rowHeight={29}
       scrollToIndex={-1}
       searchValue=""
       selectedOptions={
diff --git a/src/components/combo_box/combo_box_options_list/combo_box_options_list.tsx b/src/components/combo_box/combo_box_options_list/combo_box_options_list.tsx
index 6ca32b98af1..c12be6f3946 100644
--- a/src/components/combo_box/combo_box_options_list/combo_box_options_list.tsx
+++ b/src/components/combo_box/combo_box_options_list/combo_box_options_list.tsx
@@ -112,7 +112,7 @@ export class EuiComboBoxOptionsList<T> extends Component<
 
   static defaultProps = {
     'data-test-subj': '',
-    rowHeight: 27, // row height of default option renderer
+    rowHeight: 29, // row height of default option renderer
   };
 
   updatePosition = () => {

From c2152cd2296bf5510c411a9acc7a226de0fa0862 Mon Sep 17 00:00:00 2001
From: miukimiu <elizabet.oliveira@elastic.co>
Date: Wed, 15 Jul 2020 15:11:46 +0100
Subject: [PATCH 2/2] Adding the right PR number to CL

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7717a9d9372..eeb2a634918 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 **Bug fixes**
 
-- Fixed `EuiComboBox` always showing a scrollbar ([#3699](https://github.com/elastic/eui/pull/3699))
+- Fixed `EuiComboBox` always showing a scrollbar ([#3744](https://github.com/elastic/eui/pull/3744))
 
 ## [`27.1.0`](https://github.com/elastic/eui/tree/v27.1.0)