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

Jump to bottom

Fix nested scroll when Pager involved in scrolling process #1154

Merged
merged 2 commits into from
Mar 4, 2024
+4 −1
Merged

Fix nested scroll when Pager involved in scrolling process #1154

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7043ecc
Fix scroll interruption by Pager component when the scroll happens in…
ASalavei Mar 1, 2024
f110ec1
Refactor using proposed change
ASalavei Mar 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion ...se/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/pager/Pager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -895,7 +895,7 @@ private class DefaultPagerNestedScrollConnection(
available: Offset,
source: NestedScrollSource
): Offset {
if (source == NestedScrollSource.Fling && available != Offset.Zero) {
if (source == NestedScrollSource.Fling && available.toFloat() != 0f) {
throw CancellationException("End of scrollable area reached")
}
return Offset.Zero
Expand All @@ -904,6 +904,9 @@ private class DefaultPagerNestedScrollConnection(
override suspend fun onPostFling(consumed: Velocity, available: Velocity): Velocity {
return available.consumeOnOrientation(orientation)
}

private fun Offset.toFloat(): Float =
if (orientation == Orientation.Horizontal) this.x else this.y
}

@OptIn(ExperimentalFoundationApi::class)
Expand Down