Skip to content

WRQ-9536: Fix scrolling by wheel to scroll smoothly #1611

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

Draft
Parent: Update .travis.yml
wants to merge 4 commits into
base: develop
Choose a base branch
from
Draft

WRQ-9536: Fix scrolling by wheel to scroll smoothly #1611

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
09f7efa
WRQ-9536: Fix scrolling by wheel to scroll smoothly
vJIYEv May 16, 2024
9e00ccf
Merge branch 'develop' into feature/WRQ-9536
vJIYEv Jul 31, 2024
03706ca
set delta 0 for not scrollable case
vJIYEv Aug 1, 2024
0936d35
revert change of horizontal scroll
vJIYEv Aug 2, 2024
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
3 changes: 2 additions & 1 deletion useScroll/useEvent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -615,14 +615,14 @@ const useEventWheel = (props, instances) => {
// FIXME This routine is a temporary support for horizontal wheel scroll.
// FIXME If web engine supports horizontal wheel, this routine should be refined or removed.
if (canScrollVertically) { // This routine handles wheel events on scrollbars for vertical scroll.
delta = scrollContainerHandle.current.calculateDistanceByWheel(eventDeltaMode, eventDelta, bounds.clientHeight * scrollWheelPageMultiplierForMaxPixel);
if (negativeDelta && scrollTop > 0 + offset || positiveDelta && scrollTop < bounds.maxTop - offset) {
if (!spottable.current.isWheeling) {
initializeWheeling();
}

// If ev.target is a descendant of scrollContent, the event will be handled on scroll event handler.
if (!utilDOM.containsDangerously(scrollContentRef.current, ev.target) || snapToCenter) {
delta = scrollContainerHandle.current.calculateDistanceByWheel(eventDeltaMode, eventDelta, bounds.clientHeight * scrollWheelPageMultiplierForMaxPixel);
needToHideScrollbarTrack = !delta;

ev.preventDefault();
Expand All @@ -632,6 +632,7 @@ const useEventWheel = (props, instances) => {

ev.stopPropagation();
} else {
delta = 0;
if (overscrollEffectRequired && (negativeDelta && scrollTop <= 0 || positiveDelta && scrollTop >= bounds.maxTop)) {
scrollContainerHandle.current.applyOverscrollEffect('vertical', positiveDelta ? 'after' : 'before', overscrollTypeOnce);
}
Expand Down