Skip to content

Do not track Android ScrollView scroll velocity if scroll change... #47046

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

Closed
DrRefactor wants to merge 1 commit into from
Closed

Do not track Android ScrollView scroll velocity if scroll change... #47046

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 12 additions & 4 deletions ...tive/ReactAndroid/src/main/java/com/facebook/react/views/scroll/OnScrollDispatchHelper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,21 @@ public class OnScrollDispatchHelper {
* Call from a ScrollView in onScrollChanged, returns true if this onScrollChanged is legit (not a
* duplicate) and should be dispatched.
*/
public fun onScrollChanged(x: Int, y: Int): Boolean {
public fun onScrollChanged(x: Int, y: Int, duringGesture: Boolean): Boolean {
val eventTime = SystemClock.uptimeMillis()
val shouldDispatch =
eventTime - lastScrollEventTimeMs > MIN_EVENT_SEPARATION_MS || prevX != x || prevY != y
if (eventTime - lastScrollEventTimeMs != 0L) {
xFlingVelocity = (x - prevX).toFloat() / (eventTime - lastScrollEventTimeMs)
yFlingVelocity = (y - prevY).toFloat() / (eventTime - lastScrollEventTimeMs)
if (duringGesture) {
if (eventTime - lastScrollEventTimeMs != 0L) {
xFlingVelocity = (x - prevX).toFloat() / (eventTime - lastScrollEventTimeMs)
yFlingVelocity = (y - prevY).toFloat() / (eventTime - lastScrollEventTimeMs)
}
} else {
// Reset velocity if scroll change was not caused by a gesture, but e.g.:
// - manual scrollTo() call
// - internal scrollTo() call (e.g. in rtl, when list resizes)
xFlingVelocity = 0f
yFlingVelocity = 0f
}
lastScrollEventTimeMs = eventTime
prevX = x
Expand Down
2 changes: 1 addition & 1 deletion ...ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,7 @@ protected void onScrollChanged(int x, int y, int oldX, int oldY) {

mActivelyScrolling = true;

if (mOnScrollDispatchHelper.onScrollChanged(x, y)) {
if (mOnScrollDispatchHelper.onScrollChanged(x, y, mDragging)) {
if (mRemoveClippedSubviews) {
updateClippingRect();
}
Expand Down
2 changes: 1 addition & 1 deletion ...ct-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,7 @@ protected void onScrollChanged(int x, int y, int oldX, int oldY) {

mActivelyScrolling = true;

if (mOnScrollDispatchHelper.onScrollChanged(x, y)) {
if (mOnScrollDispatchHelper.onScrollChanged(x, y, mDragging)) {
if (mRemoveClippedSubviews) {
updateClippingRect();
}
Expand Down