Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 19 additions & 2 deletions src/stickyScrollBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,8 @@ const StickyScrollBar: React.ForwardRefRenderFunction<unknown, StickyScrollBarPr
};

const checkScrollBarVisible = () => {
raf.cancel(rafRef.current);

rafRef.current = raf(() => {
if (!scrollBodyRef.current) {
return;
Expand Down Expand Up @@ -147,12 +149,27 @@ const StickyScrollBar: React.ForwardRefRenderFunction<unknown, StickyScrollBarPr
};
}, [scrollBarWidth, isActive]);

// Loop for scroll event check
React.useEffect(() => {
container.addEventListener(SCROLL_EVENT, checkScrollBarVisible, false);
if (!scrollBodyRef.current) return;

const scrollParents: HTMLElement[] = [];
let parent: HTMLElement = scrollBodyRef.current;
while (parent) {
scrollParents.push(parent);
parent = parent.parentElement;
}

scrollParents.forEach(p => p.addEventListener(SCROLL_EVENT, checkScrollBarVisible, false));
window.addEventListener(RESIZE_EVENT, checkScrollBarVisible, false);
window.addEventListener(SCROLL_EVENT, checkScrollBarVisible, false);
container.addEventListener(SCROLL_EVENT, checkScrollBarVisible, false);

return () => {
container.removeEventListener(SCROLL_EVENT, checkScrollBarVisible);
scrollParents.forEach(p => p.removeEventListener(SCROLL_EVENT, checkScrollBarVisible));
window.removeEventListener(RESIZE_EVENT, checkScrollBarVisible);
window.removeEventListener(SCROLL_EVENT, checkScrollBarVisible);
container.removeEventListener(SCROLL_EVENT, checkScrollBarVisible);
};
}, [container]);

Expand Down
Loading