Fix iOS/Win InputTransparent layouts and add several UI tests by mattleibow · Pull Request #17286 · dotnet/maui

mattleibow · 2023-09-08T22:41:59Z

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.

mattleibow · 2023-09-08T23:17:23Z

/azp run MAUI-UITests

azure-pipelines · 2023-09-08T23:17:29Z

https://dev.azure.com/devdiv/DevDiv/_build/results?buildId=8374597

mattleibow · 2023-09-13T21:15:15Z

+#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


Android currently is semi-broken: #10252 but fixed in #13725

mattleibow · 2023-09-13T21:15:53Z

+			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);
+			}


Android currently is semi-broken: #10252 but fixed in #13725

mattleibow · 2023-09-13T21:16:48Z

+#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 is a change for iOS to ensure taps pass through the containers if they should.

mattleibow · 2023-09-13T21:17:31Z

+			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!;
+			}


And we need to ensure that transparent views/layouts also allow taps to pass through.

mattleibow · 2023-09-15T00:16:15Z

/azp run MAUI-UITests

azure-pipelines · 2023-09-15T00:16:21Z

No pipelines are associated with this pull request.

mattleibow · 2023-09-15T00:17:15Z


-		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);
 		}


Seems Windows does IT right, but then the background just wipes it all out. Fixed this by making Background call the correct method.

mattleibow · 2023-09-15T02:07:49Z

/azp run MAUI-UITests

azure-pipelines · 2023-09-15T02:07:54Z

No pipelines are associated with this pull request.

mattleibow · 2023-09-15T22:11:13Z

/azp run MAUI-UITests

azure-pipelines · 2023-09-15T22:11:18Z

No pipelines are associated with this pull request.

mattleibow · 2023-09-16T06:47:45Z

The failing UI tests are unrelated and are failing on main before my PR:

mattleibow · 2023-09-21T09:13:52Z

/rebase

Windows and iOs correctly handled transparency with regards to children, but did not allow taps to pass through

PureWeen · 2023-10-24T14:44:45Z

/backport to release/8.0.1xx-rc2

github-actions · 2023-10-24T14:44:58Z

Started backporting to release/8.0.1xx-rc2: https://github.com/dotnet/maui/actions/runs/6628524257

github-actions · 2023-10-24T14:45:18Z

@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 128

Please backport manually!

github-actions · 2023-10-24T14:45:20Z

@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.

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

mattleibow requested a review from a team as a code owner September 8, 2023 22:41

mattleibow requested review from PureWeen and rmarinho September 8, 2023 22:42

mattleibow force-pushed the dev/input-transparency-tests branch from ced05ff to 2561a12 Compare September 8, 2023 22:42

PureWeen requested a review from sbanni September 9, 2023 22:19

mattleibow force-pushed the dev/input-transparency-tests branch from 2561a12 to d72384a Compare September 11, 2023 14:18

mattleibow marked this pull request as draft September 11, 2023 17:04

samhouts added this to the .NET 8 GA milestone Sep 11, 2023

mattleibow force-pushed the dev/input-transparency-tests branch from d72384a to ac69639 Compare September 13, 2023 21:14

mattleibow commented Sep 13, 2023

View reviewed changes

mattleibow changed the title ~~Add several InputTransparent UI tests~~ Fix iOS InputTransparent layouts and add several InputTransparent UI tests Sep 13, 2023

mattleibow changed the title ~~Fix iOS InputTransparent layouts and add several InputTransparent UI tests~~ Fix iOS/Win InputTransparent layouts and add several UI tests Sep 15, 2023

mattleibow commented Sep 15, 2023

View reviewed changes

mattleibow force-pushed the dev/input-transparency-tests branch from 74e3b3c to 072f4d4 Compare September 15, 2023 22:11

mattleibow force-pushed the dev/input-transparency-tests branch 2 times, most recently from e9fef23 to f5d64af Compare September 18, 2023 20:54

samhouts modified the milestones: .NET 8 GA, Under Consideration Sep 19, 2023

github-actions Bot force-pushed the dev/input-transparency-tests branch from f5d64af to 86befcf Compare September 21, 2023 09:14

mattleibow marked this pull request as ready for review September 21, 2023 09:15

Add tests and fix Windows + iOS

e3fd0e4

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 September 22, 2023 16:51

PureWeen approved these changes Sep 26, 2023

View reviewed changes

PureWeen merged commit c29e7b3 into main Sep 26, 2023

PureWeen deleted the dev/input-transparency-tests branch September 26, 2023 19:17

PureWeen pushed a commit that referenced this pull request Oct 24, 2023

Add tests and fix Windows + iOS (#17286)

684c110

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

PureWeen mentioned this pull request Oct 24, 2023

[release/8.0.1xx-rc2.1] Fix iOS/Win InputTransparent layouts and add several UI tests #18300

Closed

github-actions Bot locked and limited conversation to collaborators Dec 6, 2023

samhouts added platform/windows platform/ios labels Feb 1, 2024

samhouts removed this from the Under Consideration milestone Jul 1, 2024

samhouts added the fixed-in-8.0.0-rc.2.9511 Look for this fix in 8.0.0-rc.2.9511 label Aug 2, 2024

Conversation

mattleibow commented Sep 8, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description of Change

Uh oh!

mattleibow commented Sep 8, 2023

Uh oh!

azure-pipelines Bot commented Sep 8, 2023 • edited by mattleibow Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mattleibow Sep 13, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mattleibow Sep 13, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mattleibow Sep 13, 2023

Choose a reason for hiding this comment

Uh oh!

mattleibow Sep 13, 2023

Choose a reason for hiding this comment

Uh oh!

mattleibow commented Sep 15, 2023

Uh oh!

azure-pipelines Bot commented Sep 15, 2023

Uh oh!

mattleibow Sep 15, 2023

Choose a reason for hiding this comment

Uh oh!

mattleibow commented Sep 15, 2023

Uh oh!

azure-pipelines Bot commented Sep 15, 2023

Uh oh!

mattleibow commented Sep 15, 2023

Uh oh!

azure-pipelines Bot commented Sep 15, 2023

Uh oh!

mattleibow commented Sep 16, 2023

Uh oh!

mattleibow commented Sep 21, 2023

Uh oh!

PureWeen commented Oct 24, 2023

Uh oh!

github-actions Bot commented Oct 24, 2023

Uh oh!

github-actions Bot commented Oct 24, 2023

Uh oh!

github-actions Bot commented Oct 24, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

mattleibow commented Sep 8, 2023 •

edited

Loading

azure-pipelines Bot commented Sep 8, 2023 •

edited by mattleibow

Loading

mattleibow Sep 13, 2023 •

edited

Loading

mattleibow Sep 13, 2023 •

edited

Loading