From 87df6358c47cdd6062aa2a0b4372b664e3df0bc9 Mon Sep 17 00:00:00 2001
From: Jakub Florkowski <kubaflo123@gmail.com>
Date: Sat, 11 May 2024 16:36:26 +0200
Subject: [PATCH 1/6] Fix #22289

---
 src/Core/src/Handlers/View/ViewHandler.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Core/src/Handlers/View/ViewHandler.cs b/src/Core/src/Handlers/View/ViewHandler.cs
index eb3ac9b6eaaf..cdcdeeb2c7a3 100644
--- a/src/Core/src/Handlers/View/ViewHandler.cs
+++ b/src/Core/src/Handlers/View/ViewHandler.cs
@@ -417,6 +417,8 @@ public static void MapContainerView(IViewHandler handler, IView view)
 				handler.HasContainer = viewHandler.NeedsContainer;
 			else
 				handler.HasContainer = view.NeedsContainer();
+
+			handler.UpdateValue(nameof(IView.Visibility));
 		}
 
 		/// <summary>

From 485c641f1658f900e8ac1cb8d559148b5df1fb8a Mon Sep 17 00:00:00 2001
From: Jakub Florkowski <kubaflo123@gmail.com>
Date: Sat, 11 May 2024 16:37:01 +0200
Subject: [PATCH 2/6] Added a UI Test (#22289)

---
 .../TestCases.HostApp/Issues/Issue22289.xaml  | 17 +++++++++++++
 .../Issues/Issue22289.xaml.cs                 | 21 ++++++++++++++++
 .../Tests/Issues/Issue22289.cs                | 24 +++++++++++++++++++
 3 files changed, 62 insertions(+)
 create mode 100644 src/Controls/tests/TestCases.HostApp/Issues/Issue22289.xaml
 create mode 100644 src/Controls/tests/TestCases.HostApp/Issues/Issue22289.xaml.cs
 create mode 100644 src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue22289.cs

diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue22289.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue22289.xaml
new file mode 100644
index 000000000000..6867df224e6c
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue22289.xaml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="Maui.Controls.Sample.Issues.Issue22289"
+             Title="Issue22289">
+    <Grid RowDefinitions="*,*,*">
+        <Grid InputTransparent="True" BackgroundColor="Red">
+            <Label Text="Grid with InputTransparent"/>
+            <Button AutomationId="button1" x:Name="Button1" VerticalOptions="Center" Text="Click me" IsVisible="False"/>
+        </Grid>
+        <Grid Grid.Row="1" BackgroundColor="Green">
+            <Label Text="Grid without InputTransparent"/>
+            <Button AutomationId="button2" x:Name="Button2" VerticalOptions="Center" Text="Click me" IsVisible="False"/>
+        </Grid>
+        <Button AutomationId="changeVisibilityButton" Grid.Row="2" Clicked="Button_Clicked" Text="Click" />
+    </Grid>
+</ContentPage>
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue22289.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue22289.xaml.cs
new file mode 100644
index 000000000000..a5049c322eee
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue22289.xaml.cs
@@ -0,0 +1,21 @@
+using Microsoft.Maui.Controls;
+using Microsoft.Maui.Controls.Xaml;
+
+namespace Maui.Controls.Sample.Issues;
+
+[XamlCompilation(XamlCompilationOptions.Compile)]
+[Issue(IssueTracker.Github, 22289, "InputTransparent=\"true\" on a Layout breaks child controls on Android", PlatformAffected.Android)]
+
+public partial class Issue22289 : ContentPage
+{
+	public Issue22289()
+	{
+		InitializeComponent();
+	}
+
+	void Button_Clicked(object sender, System.EventArgs e)
+	{
+		Button1.IsVisible = !Button1.IsVisible;
+		Button2.IsVisible = !Button2.IsVisible;
+	}
+}
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue22289.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue22289.cs
new file mode 100644
index 000000000000..721e960da4ec
--- /dev/null
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue22289.cs
@@ -0,0 +1,24 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace Microsoft.Maui.AppiumTests.Issues
+{
+	public class Issue22289 : _IssuesUITest
+	{
+		public override string Issue => "InputTransparent=\"true\" on a Layout breaks child controls on Android";
+		public Issue22289(TestDevice device) : base(device)
+		{
+		}
+
+		[Test]
+		public void ButtonsShouldBeVisible()
+		{
+			App.WaitForElement("changeVisibilityButton");
+			App.Click("changeVisibilityButton");
+
+			App.WaitForElement("button1");
+			App.WaitForElement("button2");
+		}
+	}
+}
\ No newline at end of file

From c509ac57c7a84dfff9633cc2d69182366ea7d4af Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Thu, 16 May 2024 04:26:53 -0500
Subject: [PATCH 3/6] Update LabelHandler.Windows.cs

---
 src/Core/src/Handlers/Label/LabelHandler.Windows.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Core/src/Handlers/Label/LabelHandler.Windows.cs b/src/Core/src/Handlers/Label/LabelHandler.Windows.cs
index 2cf6e715a2f4..f563ce7d29ca 100644
--- a/src/Core/src/Handlers/Label/LabelHandler.Windows.cs
+++ b/src/Core/src/Handlers/Label/LabelHandler.Windows.cs
@@ -43,7 +43,6 @@ public static void MapBackground(ILabelHandler handler, ILabel label)
 
 		public static void MapOpacity(ILabelHandler handler, ILabel label)
 		{
-			handler.UpdateValue(nameof(IViewHandler.ContainerView));
 			handler.PlatformView.UpdateOpacity(label);
 			handler.ToPlatform().UpdateOpacity(label);
 		}

From f24fc87b363629ec97d7d5275faa2eab0c2240a3 Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Thu, 16 May 2024 04:29:31 -0500
Subject: [PATCH 4/6] Update ViewHandler.cs

---
 src/Core/src/Handlers/View/ViewHandler.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Core/src/Handlers/View/ViewHandler.cs b/src/Core/src/Handlers/View/ViewHandler.cs
index cdcdeeb2c7a3..fc4049db7107 100644
--- a/src/Core/src/Handlers/View/ViewHandler.cs
+++ b/src/Core/src/Handlers/View/ViewHandler.cs
@@ -419,6 +419,10 @@ public static void MapContainerView(IViewHandler handler, IView view)
 				handler.HasContainer = view.NeedsContainer();
 
 			handler.UpdateValue(nameof(IView.Visibility));
+   
+   			#if WINDOWS
+			handler.UpdateValue(nameof(IView.Opacity));
+   			#endif
 		}
 
 		/// <summary>

From 72198abd00091846d5ce8089b25914286e2ecfe2 Mon Sep 17 00:00:00 2001
From: Jakub Florkowski <kubaflo123@gmail.com>
Date: Wed, 3 Jul 2024 19:33:50 +0200
Subject: [PATCH 5/6] Update Issue22289.cs

---
 .../tests/TestCases.Shared.Tests/Tests/Issues/Issue22289.cs     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue22289.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue22289.cs
index 721e960da4ec..0020b567d185 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue22289.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue22289.cs
@@ -2,7 +2,7 @@
 using UITest.Appium;
 using UITest.Core;
 
-namespace Microsoft.Maui.AppiumTests.Issues
+namespace Microsoft.Maui.TestCases.Tests.Issues
 {
 	public class Issue22289 : _IssuesUITest
 	{

From df2e5f72a62c694af478f013d0deb45ad4968c36 Mon Sep 17 00:00:00 2001
From: Jakub Florkowski <kubaflo123@gmail.com>
Date: Wed, 3 Jul 2024 19:27:55 +0200
Subject: [PATCH 6/6] Update ViewHandler.cs

---
 src/Core/src/Handlers/View/ViewHandler.cs | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/Core/src/Handlers/View/ViewHandler.cs b/src/Core/src/Handlers/View/ViewHandler.cs
index fc4049db7107..0878fb9b6a1c 100644
--- a/src/Core/src/Handlers/View/ViewHandler.cs
+++ b/src/Core/src/Handlers/View/ViewHandler.cs
@@ -413,16 +413,21 @@ public static void MapInvalidateMeasure(IViewHandler handler, IView view, object
 		/// <param name="view">The associated <see cref="IView"/> instance.</param>
 		public static void MapContainerView(IViewHandler handler, IView view)
 		{
+			bool hasContainerOldValue = handler.HasContainer;
+
 			if (handler is ViewHandler viewHandler)
 				handler.HasContainer = viewHandler.NeedsContainer;
 			else
 				handler.HasContainer = view.NeedsContainer();
 
-			handler.UpdateValue(nameof(IView.Visibility));
-   
-   			#if WINDOWS
-			handler.UpdateValue(nameof(IView.Opacity));
-   			#endif
+			if(hasContainerOldValue != handler.HasContainer)
+			{
+				handler.UpdateValue(nameof(IView.Visibility));
+	
+				#if WINDOWS
+				handler.UpdateValue(nameof(IView.Opacity));
+				#endif
+			}
 		}
 
 		/// <summary>