Fix freeze when scrolling is cancelled during overscroll #1928
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mazunin-v-jb
approved these changes
Mar 18, 2025
MatkovIvan
reviewed
Mar 19, 2025
Comment on lines
-129
to
+134
| private var overscrollOffset: Offset by mutableStateOf(Offset.Zero) | ||
| private var overscrollOffsetState = mutableStateOf(Offset.Zero) | ||
| private var overscrollOffset: Offset |
There was a problem hiding this comment.
It will probably be clearer to use an idiomatic approach here:
snapshotFlow { overscrollOffset }
.collect { /* your on change logic */ }There was a problem hiding this comment.
It requires some coroutineContext - but as far as I figured out, it's hard to find one on ini state
| ) { | ||
| if (pass == PointerEventPass.Final) { | ||
| if (pointerEvent.type == PointerEventType.Press) { | ||
| pointersDown++ |
There was a problem hiding this comment.
Should we increment on Initial event pass?
There was a problem hiding this comment.
Since it only triggers recomposition, any phase is sufficient.
...tion/src/uikitMain/kotlin/androidx/compose/foundation/cupertino/CupertinoOverscrollEffect.kt
Show resolved
Hide resolved
| override fun onRemeasured(size: IntSize) = onNodeRemeasured(size) | ||
|
|
||
| var pointersDown by mutableStateOf(0) |
There was a problem hiding this comment.
Why is it a state? Isn't draw called without it?
There was a problem hiding this comment.
The change we're looking for has to be triggered by the touch up gesture. If it's not a state - it won't work.
MatkovIvan
approved these changes
Mar 21, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Reset the overscroll effect when no ongoing animation or interaction is applied.
Fixes https://youtrack.jetbrains.com/issue/CMP-7099/iOS-Content-in-a-scrollable-container-becomes-non-focusable-after-calling-focusManager.clearFocus
Release Notes
Fixes - iOS