Skip to content

[BottomSheet] Fix velocity-based dismiss through nested scroll path #5077

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

Open
harveylx wants to merge 1 commit into
base: master
Choose a base branch
from
+16 −4
Open

[BottomSheet] Fix velocity-based dismiss through nested scroll path #5077

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
20 changes: 16 additions & 4 deletions lib/java/com/google/android/material/bottomsheet/BottomSheetBehavior.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,8 @@ void onLayout(@NonNull View bottomSheet) {}

private int lastNestedScrollDy;

private float lastNestedFlingVelocityY;

private boolean nestedScrolled;

private float hideFriction = HIDE_FRICTION;
Expand Down Expand Up @@ -775,6 +777,7 @@ public boolean onStartNestedScroll(
int type) {
lastNestedScrollDy = 0;
nestedScrolled = false;
lastNestedFlingVelocityY = 0;
return (axes & ViewCompat.SCROLL_AXIS_VERTICAL) != 0;
}

Expand Down Expand Up @@ -884,7 +887,10 @@ public void onStopNestedScroll(
targetState = STATE_EXPANDED;
}
}
} else if (hideable && shouldHide(child, getYVelocity())) {
} else if (hideable
&& shouldHide(
child,
lastNestedFlingVelocityY != 0 ? lastNestedFlingVelocityY : getYVelocity())) {
targetState = STATE_HIDDEN;
} else if (lastNestedScrollDy == 0) {
int currentTop = child.getTop();
Expand Down Expand Up @@ -953,9 +959,15 @@ public boolean onNestedPreFling(
float velocityY) {

if (isNestedScrollingCheckEnabled() && hasScrollingChild()) {
return isViewScrollingChild(target)
&& ((state != STATE_EXPANDED && !draggableOnNestedScrollLastDragIgnored)
|| super.onNestedPreFling(coordinatorLayout, child, target, velocityX, velocityY));
boolean consumed =
isViewScrollingChild(target)
&& ((state != STATE_EXPANDED && !draggableOnNestedScrollLastDragIgnored)
|| super.onNestedPreFling(
coordinatorLayout, child, target, velocityX, velocityY));
if (consumed) {
lastNestedFlingVelocityY = velocityY;
}
return consumed;
} else {
return false;
}
Expand Down