From 80a2dce99444977622a70e0991b50121eed6823f Mon Sep 17 00:00:00 2001
From: Dominik Prokop <dominik.prokop@grafana.com>
Date: Wed, 29 Jan 2020 14:52:43 +0100
Subject: [PATCH] Select: Fix direct usages of react-select to make the scroll
 great again (#21822)

---
 packages/grafana-ui/src/components/Forms/Select/SelectBase.tsx | 2 +-
 packages/grafana-ui/src/components/Select/Select.tsx           | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/grafana-ui/src/components/Forms/Select/SelectBase.tsx b/packages/grafana-ui/src/components/Forms/Select/SelectBase.tsx
index bd820370c5a..fbb2f820719 100644
--- a/packages/grafana-ui/src/components/Forms/Select/SelectBase.tsx
+++ b/packages/grafana-ui/src/components/Forms/Select/SelectBase.tsx
@@ -229,6 +229,7 @@ export function SelectBase<T>({
     onKeyDown,
     menuShouldScrollIntoView: false,
     renderControl,
+    captureMenuScroll: false,
   };
 
   // width property is deprecated in favor of size or className
@@ -254,7 +255,6 @@ export function SelectBase<T>({
 
   return (
     <ReactSelectComponent
-      captureMenuScroll={false}
       components={{
         MenuList: SelectMenu,
         Group: SelectOptionGroup,
diff --git a/packages/grafana-ui/src/components/Select/Select.tsx b/packages/grafana-ui/src/components/Select/Select.tsx
index 3b4a1d8c861..8edd3dd2b5d 100644
--- a/packages/grafana-ui/src/components/Select/Select.tsx
+++ b/packages/grafana-ui/src/components/Select/Select.tsx
@@ -133,6 +133,7 @@ export class Select<T> extends PureComponent<LegacySelectProps<T>> {
         {(onOpenMenuInternal, onCloseMenuInternal) => {
           return (
             <SelectComponent
+              captureMenuScroll={false}
               classNamePrefix="gf-form-select-box"
               className={selectClassNames}
               components={selectComponents}
@@ -226,6 +227,7 @@ export class AsyncSelect<T> extends PureComponent<AsyncProps<T>> {
         {(onOpenMenuInternal, onCloseMenuInternal) => {
           return (
             <ReactAsyncSelect
+              captureMenuScroll={false}
               classNamePrefix="gf-form-select-box"
               className={selectClassNames}
               components={{