From 942e3210b5311a4467752c5c82d8a0404632f342 Mon Sep 17 00:00:00 2001
From: Agata Stawarz <47450693+agatapst@users.noreply.github.com>
Date: Tue, 22 Dec 2020 11:09:13 +0100
Subject: [PATCH] Fix Filter Bar scrolling (#12156)

---
 .../components/StickyVerticalBar.tsx          | 24 +++++++++++++++++--
 .../components/nativeFilters/FilterBar.tsx    |  3 +--
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/superset-frontend/src/dashboard/components/StickyVerticalBar.tsx b/superset-frontend/src/dashboard/components/StickyVerticalBar.tsx
index 713e5e7ed7..ce334469ef 100644
--- a/superset-frontend/src/dashboard/components/StickyVerticalBar.tsx
+++ b/superset-frontend/src/dashboard/components/StickyVerticalBar.tsx
@@ -73,8 +73,28 @@ export const StickyVerticalBar: React.FC<SVBProps> = ({
     <Wrapper className={cx({ open: filtersOpen })}>
       <StickyContainer>
         <Sticky topOffset={-topOffset} bottomOffset={Infinity}>
-          {({ style, isSticky }: { style: any; isSticky: boolean }) => (
-            <Contents style={isSticky ? { ...style, top: topOffset } : null}>
+          {({
+            style,
+            isSticky,
+            distanceFromTop,
+          }: {
+            style: any;
+            isSticky: boolean;
+            distanceFromTop: number;
+          }) => (
+            <Contents
+              style={
+                isSticky
+                  ? {
+                      ...style,
+                      top: topOffset,
+                      height: `calc(100vh - ${topOffset}px)`,
+                    }
+                  : {
+                      height: `calc(100vh - ${distanceFromTop}px)`,
+                    }
+              }
+            >
               {children}
             </Contents>
           )}
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar.tsx
index d78aab5b4f..6dae669177 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar.tsx
@@ -61,8 +61,7 @@ const Bar = styled.div`
   width: ${barWidth}; // arbitrary...
   background: ${({ theme }) => theme.colors.grayscale.light5};
   border-right: 1px solid ${({ theme }) => theme.colors.grayscale.light2};
-  height: 100%;
-  max-height: 100%;
+  min-height: 100%;
   display: none;
   /* &.animated {
     display: flex;