Fix iOS/Win InputTransparent layouts and add several UI tests #17286
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
mattleibow
force-pushed
the
dev/input-transparency-tests
branch
from
ced05ff
to
2561a12
Compare
|
/azp run MAUI-UITests |
mattleibow
force-pushed
the
dev/input-transparency-tests
branch
from
2561a12
to
d72384a
Compare
mattleibow
force-pushed
the
dev/input-transparency-tests
branch
from
d72384a
to
ac69639
Compare
mattleibow
commented
Sep 13, 2023
Comment on lines
+196
to
+201
| #if ANDROID | ||
| // TODO: Android is broken with everything passing through | ||
| // https://github.com/dotnet/maui/issues/10252 | ||
| bottom.Clicked += (s, e) => t.ViewContainer.ReportSuccessEvent(); | ||
| top.Clicked += (s, e) => t.ViewContainer.ReportFailEvent(); | ||
| #else |
Comment on lines
+50
to
+62
| else if (Device == TestDevice.Android) | ||
| { | ||
| // TODO: Android is broken with everything passing through so we just use that | ||
| // to test the bottom button was clickable | ||
| // https://github.com/dotnet/maui/issues/10252 | ||
| Assert.AreEqual($"Event: {test} (SUCCESS 1)", textAfterClick); | ||
| } |
Comment on lines
+325
to
+330
| #if IOS || MACCATALYST | ||
| // Containers on iOS/Mac Catalyst may be hit testable, so we need to | ||
| // propagate the the view's values to its container view. | ||
| if (handler.ContainerView is WrapperView wrapper) | ||
| wrapper.UpdateInputTransparent(handler, view); | ||
| #endif |
There was a problem hiding this comment.
There is a change for iOS to ensure taps pass through the containers if they should.
Comment on lines
+40
to
+54
| if (!result.UserInteractionEnabled) | ||
| { | ||
| // If the child also has user interaction disabled (IOW the child is InputTransparent), | ||
| // then we also want to exclude it from the hit testing. | ||
|
|
||
| return null!; | ||
| } | ||
|
|
||
| if (result is LayoutView layoutView && !layoutView.UserInteractionEnabledOverride) | ||
| { | ||
| // If the child is a layout then we need to check the UserInteractionEnabledOverride | ||
| // since layouts always have user interaction enabled. | ||
|
|
||
| return null!; | ||
| } |
There was a problem hiding this comment.
And we need to ensure that transparent views/layouts also allow taps to pass through.
mattleibow
changed the title
mattleibow
changed the title
|
/azp run MAUI-UITests |
|
No pipelines are associated with this pull request. |
mattleibow
commented
Sep 15, 2023
Comment on lines
-126
to
134
| static void MapInputTransparent(ILayoutHandler handler, ILayout layout) | ||
| public static partial void MapBackground(ILayoutHandler handler, ILayout layout) | ||
| { | ||
| if (handler.PlatformView is LayoutPanel layoutPanel && layout != null) | ||
| { | ||
| layoutPanel.UpdatePlatformViewBackground(layout); | ||
| } | ||
| handler.PlatformView?.UpdatePlatformViewBackground(layout); | ||
| } | ||
|
|
||
| public static partial void MapInputTransparent(ILayoutHandler handler, ILayout layout) | ||
| { | ||
| handler.PlatformView?.UpdatePlatformViewBackground(layout); | ||
| } |
There was a problem hiding this comment.
Seems Windows does IT right, but then the background just wipes it all out. Fixed this by making Background call the correct method.
|
/azp run MAUI-UITests |
|
No pipelines are associated with this pull request. |
mattleibow
force-pushed
the
dev/input-transparency-tests
branch
from
74e3b3c
to
072f4d4
Compare
|
/azp run MAUI-UITests |
|
No pipelines are associated with this pull request. |
|
The failing UI tests are unrelated and are failing on main before my PR: 
|
mattleibow
force-pushed
the
dev/input-transparency-tests
branch
2 times, most recently
from
e9fef23
to
f5d64af
Compare
|
/rebase |
github-actions
bot
force-pushed
the
dev/input-transparency-tests
branch
from
f5d64af
to
86befcf
Compare
Windows and iOs correctly handled transparency with regards to children, but did not allow taps to pass through
mattleibow
force-pushed
the
dev/input-transparency-tests
branch
from
86befcf
to
e3fd0e4
Compare
PureWeen
approved these changes
Sep 26, 2023
|
/backport to release/8.0.1xx-rc2 |
|
Started backporting to release/8.0.1xx-rc2: https://github.com/dotnet/maui/actions/runs/6628524257 |
|
@PureWeen backporting to release/8.0.1xx-rc2 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Add tests and fix Windows + iOS
Using index info to reconstruct a base tree...
M src/Controls/samples/Controls.Sample.UITests/CoreViews/CorePageView.cs
M src/Core/src/Platform/iOS/LayoutView.cs
M src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
Falling back to patching base and 3-way merge...
Auto-merging src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
Auto-merging src/Core/src/Platform/iOS/LayoutView.cs
CONFLICT (content): Merge conflict in src/Core/src/Platform/iOS/LayoutView.cs
Auto-merging src/Controls/samples/Controls.Sample.UITests/CoreViews/CorePageView.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 Add tests and fix Windows + iOS
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! |
|
@PureWeen an error occurred while backporting to release/8.0.1xx-rc2, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
PureWeen
pushed a commit
that referenced
this pull request
Oct 24, 2023
Windows and iOs correctly handled transparency with regards to children, but did not allow taps to pass through # Conflicts: # src/Core/src/Platform/iOS/LayoutView.cs
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
This PR is just adding a bunch of input transparency tests so we can be suer all the combinations are working - without the need for manual tests.
This should have been part of #14846, but we did not have any UI tests at the time. This finally makes the world of InputTransparent and CascadeInputTransparent complete.
There was also a bug in the way some input transparent controls did not allow taps to pass through because the container was not transparent. And, the layout always blocked taps - even when the controls were transparent - because it was not first checking if the controls inside should block.