Fix thumb size when ignoring some top scroll (#340)

edgedb · Mar 22, 2024 · 1a4ef05 · 1a4ef05
1 parent 228f613
commit 1a4ef05
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/shared/common/ui/customScrollbar/index.tsx b/shared/common/ui/customScrollbar/index.tsx
@@ -107,18 +107,23 @@ export function CustomScrollbars({
     const hasV = el.scrollHeight > el.clientHeight;
     const hasH = el.scrollWidth > el.clientWidth;
 
-    if (scrollBarHeight === 0 && el.clientHeight < el.scrollHeight) {
+    if (hasV) {
       setScrollBarHeight(
-        el.clientHeight - (hasH ? 8 : verScrollBarBottomOffset) - headerPadding
+        el.clientHeight -
+          (hasH ? 8 : verScrollBarBottomOffset) -
+          headerPadding +
+          scrollBarTopOffset
       );
     }
 
     thumbSizes.current = [
       hasV
         ? Math.max(
             28,
-            ((el.clientHeight + verScrollIgnoreLength) * scrollBarHeight) /
-              el.scrollHeight
+            el.clientHeight < el.scrollHeight - verScrollIgnoreLength
+              ? ((el.clientHeight + verScrollIgnoreLength) * scrollBarHeight) /
+                  el.scrollHeight
+              : scrollBarHeight
           )
         : -1,
       hasH