Fix nested scrolling on mouse wheel#1055
Merged
MatkovIvan merged 13 commits intojb-mainfrom Feb 14, 2024
Merged
Conversation
MatkovIvan
force-pushed
the
ivan.matkov/fix-nested-scroll
branch
from
1fdf908 to
6df372b
Compare
igordmn
reviewed
Feb 7, 2024
...oundation/src/commonMain/kotlin/androidx/compose/foundation/gestures/MouseWheelScrollable.kt
Outdated
Show resolved
Hide resolved
igordmn
reviewed
Feb 7, 2024
...oundation/src/commonMain/kotlin/androidx/compose/foundation/gestures/MouseWheelScrollable.kt
Outdated
Show resolved
Hide resolved
MatkovIvan
added a commit
that referenced
this pull request
Feb 12, 2024
## Proposed Changes - A part from #1055 with cancellation fix ## Testing Test: run a new unit test
MatkovIvan
force-pushed
the
ivan.matkov/fix-nested-scroll
branch
from
617891b to
3db084b
Compare
igordmn
approved these changes
Feb 14, 2024
MatkovIvan
added a commit
that referenced
this pull request
Feb 14, 2024
## Proposed Changes - Based on #1055 - Trigger `onScrollStopped` callback after mouse wheel scroll - Ignore `ScrollableDefaultFlingBehavior`s during mouse scroll to avoid breaking changes - Remove scrolling via `dispatchRawDelta`, `isSmoothScrollingEnabled = false` will just disable animation instead - Add pager test page in mpp demo ## Testing Test: run pager page in mpp demo ## Issues Fixed Fixes JetBrains/compose-multiplatform#3447 Fixes JetBrains/compose-multiplatform#3454
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Proposed Changes
dispatchScrollwith a newNestedScrollSource.Wheelinstead of direct call ofscrollBy/dispatchRawDeltaMutatePriority.UserInputduring mouse wheel scroll animationshouldApplyImmediatelyflag based onisPreciseWheelScrollhandles it instead.ProgressTimeoutafter each mouse wheel event before resettingisScrollInProgressflagTesting
Test: Check "NestedScroll" page in mpp demo + unit tests
Issues Fixed
Fixes JetBrains/compose-multiplatform#653
Fixes JetBrains/compose-multiplatform#1423