[iOS] Fix ScrollTo method issues #15984
Merged
Conversation
This file contains 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
jsuarezruiz
added
t/bug
jsuarezruiz
commented
Jul 4, 2023
| { | ||
| // If the ContentSize of the UIScrollView has not yet been defined, | ||
| // we create a pending scroll request that we will launch after performing the Layout and sizing process. | ||
| scrollViewHandler.PendingScrollToRequest = request; |
There was a problem hiding this comment.
This is the main change. Do the scroll to request once we have values in the UIScrollView ContentSize.
rmarinho
reviewed
Jul 17, 2023
rmarinho
reviewed
Jul 25, 2023
rmarinho
requested changes
Jul 26, 2023
|
Added UI Tests. |
rmarinho
requested changes
Jul 31, 2023
samhouts
added
the
backport/suggested
hartez
previously requested changes
Aug 17, 2023
rmarinho
approved these changes
Aug 21, 2023
samhouts
added
the
partner/cat 😻
hartez
added
the
backport/approved
|
/backport to net7.0 |
|
Started backporting to net7.0: https://github.com/dotnet/maui/actions/runs/6017947256 |
|
@hartez backporting to net7.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Fix iOS ScrollTo issues
Using index info to reconstruct a base tree...
A src/Controls/src/Core/ScrollView/ScrollView.cs
M src/Core/src/Handlers/ScrollView/ScrollViewHandler.iOS.cs
A src/Core/src/Platform/iOS/MauiScrollView.cs
M src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
M src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
Falling back to patching base and 3-way merge...
Auto-merging src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
CONFLICT (content): Merge conflict in src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
Auto-merging src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
CONFLICT (content): Merge conflict in src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
CONFLICT (modify/delete): src/Core/src/Platform/iOS/MauiScrollView.cs deleted in HEAD and modified in Fix iOS ScrollTo issues. Version Fix iOS ScrollTo issues of src/Core/src/Platform/iOS/MauiScrollView.cs left in tree.
Auto-merging src/Core/src/Handlers/ScrollView/ScrollViewHandler.iOS.cs
CONFLICT (content): Merge conflict in src/Core/src/Handlers/ScrollView/ScrollViewHandler.iOS.cs
Auto-merging src/Controls/src/Core/ScrollView.cs
CONFLICT (content): Merge conflict in src/Controls/src/Core/ScrollView.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix iOS ScrollTo issues
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
|
@hartez an error occurred while backporting to net7.0, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
hartez
added a commit
that referenced
this pull request
Aug 30, 2023
* Fix iOS ScrollTo issues --------- Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com>
PureWeen
pushed a commit
that referenced
this pull request
Sep 18, 2023
* Fix iOS ScrollTo issues --------- Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com>
rmarinho
pushed a commit
that referenced
this pull request
Sep 20, 2023
* [iOS] Fix ScrollTo method issues (#15984) * Fix iOS ScrollTo issues --------- Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com> * Fix build errors * More changes * - fix compile errors --------- Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com> Co-authored-by: Javier Suárez <javiersuarezruiz@hotmail.com> Co-authored-by: Shane Neuville <shneuvil@microsoft.com>
Eilon
added
area-layout
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Description of Change
Fix iOS ScrollTo method issues.
To validate the changes can use the added sample in the .NET MAUI Gallery in Control > ScrollView.
Issues Fixed
Fixes #7295