Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed issue where onMenuScrollToBottom was not fired when the scrollbar is mouse-dragged to the bottom #4970

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Fixed issue where onMenuScrollToBottom was not fired when the scrollbar is mouse-dragged to the bottom #4970

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
53d4153
Fixed scroll bug.
Duarte10 Dec 28, 2021
2df3d9e
Replace onWheel with onScroll
Duarte10 Dec 29, 2021
5faa082
Use WheelEvent
Duarte10 Dec 29, 2021
5613229
Fixed type
Duarte10 Dec 30, 2021
b5ccfc1
Fixed type.
Duarte10 Dec 30, 2021
2ce2631
Fixed type.
Duarte10 Dec 30, 2021
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
19 changes: 11 additions & 8 deletions packages/react-select/src/internal/useScrollCapture.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,10 @@ export default function useScrollCapture({
const isTop = useRef(false);
const touchStart = useRef(0);
const scrollTarget = useRef<HTMLElement | null>(null);
const previousScrollTop = useRef(0);

const handleEventDelta = useCallback(
(event: WheelEvent | TouchEvent, delta: number) => {
(event: WheelEvent | TouchEvent | React.UIEvent<HTMLElement, UIEvent>, delta: number) => {
if (scrollTarget.current === null) return;

const { scrollTop, scrollHeight, clientHeight } = scrollTarget.current;
Expand Down Expand Up @@ -73,9 +74,11 @@ export default function useScrollCapture({
[onBottomArrive, onBottomLeave, onTopArrive, onTopLeave]
);

const onWheel = useCallback(
(event: WheelEvent) => {
handleEventDelta(event, event.deltaY);
const onScroll = useCallback(
(event: React.UIEvent<HTMLElement>) => {
const deltaY = event.currentTarget.scrollTop - previousScrollTop.current;
previousScrollTop.current = event.currentTarget.scrollTop;
handleEventDelta(event, deltaY);
},
[handleEventDelta]
);
Expand All @@ -97,23 +100,23 @@ export default function useScrollCapture({
if (!el) return;

const notPassive = supportsPassiveEvents ? { passive: false } : false;
el.addEventListener('wheel', onWheel, notPassive);
el.addEventListener('scroll', onScroll, notPassive);
el.addEventListener('touchstart', onTouchStart, notPassive);
el.addEventListener('touchmove', onTouchMove, notPassive);
},
[onTouchMove, onTouchStart, onWheel]
[onTouchMove, onTouchStart, onScroll]
);

const stopListening = useCallback(
(el) => {
// bail early if no element is available to detach from
if (!el) return;

el.removeEventListener('wheel', onWheel, false);
el.removeEventListener('scroll', onScroll, false);
el.removeEventListener('touchstart', onTouchStart, false);
el.removeEventListener('touchmove', onTouchMove, false);
},
[onTouchMove, onTouchStart, onWheel]
[onTouchMove, onTouchStart, onScroll]
);

useEffect(() => {
Expand Down