fix(scrollableParent): check hasScrollbar

Shyam-Chen · Jun 28, 2024 · cff18a9 · cff18a9
1 parent 31f4db2
commit cff18a9
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/ui/src/composables/scroll-parent/scrollableParent.ts b/ui/src/composables/scroll-parent/scrollableParent.ts
@@ -5,7 +5,16 @@ export default (node?: HTMLElement | null): HTMLElement | undefined => {
 
   while (parent) {
     const { overflow } = window.getComputedStyle(parent);
-    if (overflow.split(' ').every((o) => o === 'auto' || o === 'scroll')) return parent;
+    const hasScrollbarY = parent.scrollHeight > parent.clientHeight;
+    const hasScrollbarX = parent.scrollWidth > parent.clientWidth;
+
+    if (
+      overflow.split(' ').every((o) => o === 'auto' || o === 'scroll') &&
+      (hasScrollbarY || hasScrollbarX)
+    ) {
+      return parent;
+    }
+
     parent = parent.parentElement;
   }