-
Notifications
You must be signed in to change notification settings - Fork 1.7k
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.
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
Resize internal content container when ScrollView content is resized #16385
Conversation
/backport to net7.0 |
Started backporting to net7.0: https://github.com/dotnet/maui/actions/runs/5811129750 |
@PureWeen backporting to net7.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Resize internal content container when ScrollView content is resized Fixes #14257
.git/rebase-apply/patch:44: trailing whitespace.
resizeButton.Clicked += (sender, args) => {
.git/rebase-apply/patch:47: trailing whitespace.
layoutContent.HeightRequest = 1000;
.git/rebase-apply/patch:130: trailing whitespace.
.git/rebase-apply/patch:372: trailing whitespace.
// This method will keep scrolling in the specified direction until it finds an element
.git/rebase-apply/patch:377: trailing whitespace.
warning: 5 lines add whitespace errors.
Using index info to reconstruct a base tree...
M src/Core/src/Handlers/ScrollView/ScrollViewHandler.iOS.cs
A src/TestUtils/src/TestUtils.Appium.UITests/AppiumUITestApp.cs
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): src/TestUtils/src/TestUtils.Appium.UITests/AppiumUITestApp.cs deleted in HEAD and modified in Resize internal content container when ScrollView content is resized Fixes #14257. Version Resize internal content container when ScrollView content is resized Fixes #14257 of src/TestUtils/src/TestUtils.Appium.UITests/AppiumUITestApp.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
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Resize internal content container when ScrollView content is resized Fixes #14257
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 128 Please backport manually! |
@PureWeen 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. |
This claims to have fixed #15762, so we removed our workaround in our MAUI 8 app. Immediately all dynamically added controls in scrollviews on iOS did not react to taps. Do we need to do anything special to make this work? |
Ah never mind, it's broken too when we keep our workaround. It seems the move to MAUI 8 works just fine on Android, but the iOS app is borked in many places. So it's probably not directly related to this issue. |
@Ghostbird can you test out nightly https://github.com/dotnet/maui/wiki/Nightly-Builds ? If you're still seeing an issue please log a new bug with a repro. |
Description of Change
The iOS ScrollView's internal content container was correctly sized for off-screen content at first layout, but was failing to update correctly when the content was resized (possibly because of a data binding change).
These changes correct that problem, and add automated UI tests to verify this scenario.
Issues Fixed
Fixes #14257
Fixes #15762
Fixes #14624
Fixes #12727