From 096dd6ba05329e36699741cf47d0cc13bedf7c9d Mon Sep 17 00:00:00 2001
From: Jakub Florkowski <kubaflo123@gmail.com>
Date: Sun, 11 Feb 2024 01:21:06 +0100
Subject: [PATCH 1/3] [iOS] Fixed updating frame's content (#19127)

---
 .../Compatibility/Handlers/iOS/FrameRenderer.cs   | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/Controls/src/Core/Compatibility/Handlers/iOS/FrameRenderer.cs b/src/Controls/src/Core/Compatibility/Handlers/iOS/FrameRenderer.cs
index 08311ec4e968..9909b7a4be6f 100644
--- a/src/Controls/src/Core/Compatibility/Handlers/iOS/FrameRenderer.cs
+++ b/src/Controls/src/Core/Compatibility/Handlers/iOS/FrameRenderer.cs
@@ -69,6 +69,21 @@ protected override void OnElementPropertyChanged(object sender, PropertyChangedE
 				SetupLayer();
 			else if (e.PropertyName == Controls.Frame.HasShadowProperty.PropertyName)
 				UpdateShadow();
+			else if (e.PropertyName == Microsoft.Maui.Controls.Frame.ContentProperty.PropertyName)
+				UpdateContent();
+		}
+
+		void UpdateContent()
+		{
+			_actualView.ClearSubviews();
+
+			var content = Element?.Content;
+
+			if (content == null || MauiContext == null)
+				return;
+
+			var platformView = content.ToPlatform(MauiContext);
+			_actualView.AddSubview(platformView);
 		}
 
 		public override void TraitCollectionDidChange(UITraitCollection previousTraitCollection)

From 43d120657959744247edba565292f9ec42bee0c5 Mon Sep 17 00:00:00 2001
From: Jakub Florkowski <kubaflo123@gmail.com>
Date: Sun, 11 Feb 2024 01:24:04 +0100
Subject: [PATCH 2/3] Added a UiTest (#19127)

---
 .../Issues/Issue19127.xaml                    | 32 +++++++++++++
 .../Issues/Issue19127.xaml.cs                 | 47 +++++++++++++++++++
 .../tests/UITests/Tests/Issues/Issue19127.cs  | 29 ++++++++++++
 3 files changed, 108 insertions(+)
 create mode 100644 src/Controls/samples/Controls.Sample.UITests/Issues/Issue19127.xaml
 create mode 100644 src/Controls/samples/Controls.Sample.UITests/Issues/Issue19127.xaml.cs
 create mode 100644 src/Controls/tests/UITests/Tests/Issues/Issue19127.cs

diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue19127.xaml b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue19127.xaml
new file mode 100644
index 000000000000..47ede0be8804
--- /dev/null
+++ b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue19127.xaml
@@ -0,0 +1,32 @@
+<?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.Issue19127"
+             xmlns:ns="clr-namespace:Maui.Controls.Sample.Issues">
+         <VerticalStackLayout
+            VerticalOptions="Center">
+            <Button Text="{Binding IsCameraEnabled, StringFormat='Toggle Camera View ({0})'}"
+                    Command="{Binding EnableCamera}"
+                    AutomationId="button" />
+
+            <Frame x:Name="frame"
+                   HeightRequest="191">
+                <Frame.Triggers>
+                    <DataTrigger TargetType="Frame" Binding="{Binding IsCameraEnabled}" Value="False">
+                        <Setter Property="Content">
+                            <Grid BackgroundColor="Gray">
+                                <Label Text="Camera is Disabled" TextColor="White" />
+                            </Grid>
+                        </Setter>
+                    </DataTrigger>
+                    <DataTrigger TargetType="Frame" Binding="{Binding IsCameraEnabled}" Value="True">
+                        <Setter Property="Content">
+                            <Grid BackgroundColor="HotPink">
+                                <Label AutomationId="label" Text="Camera is Enabled" TextColor="White" />
+                            </Grid>
+                        </Setter>
+                    </DataTrigger>
+                </Frame.Triggers>
+            </Frame>
+        </VerticalStackLayout>
+</ContentPage>
\ No newline at end of file
diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue19127.xaml.cs b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue19127.xaml.cs
new file mode 100644
index 000000000000..f13acb460029
--- /dev/null
+++ b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue19127.xaml.cs
@@ -0,0 +1,47 @@
+using System;
+using System.ComponentModel;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui.Controls.Xaml;
+
+namespace Maui.Controls.Sample.Issues
+{
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	[Issue(IssueTracker.Github, 19127, "[iOS] Triggers are not working on Frame control", PlatformAffected.iOS)]
+	public partial class Issue19127 : ContentPage
+	{
+		public Issue19127()
+		{
+			InitializeComponent();
+			BindingContext = new Issue19127Settings();
+		}
+	}
+
+	public class Issue19127Settings : INotifyPropertyChanged
+	{
+		public event PropertyChangedEventHandler PropertyChanged;
+
+		public Command EnableCamera { get; set; }
+
+		private bool _isCameraEnabled;
+		public bool IsCameraEnabled
+		{
+			get { return _isCameraEnabled; }
+			set
+			{
+				_isCameraEnabled = value;
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsCameraEnabled)));
+			}
+		}
+
+		public Issue19127Settings()
+		{
+			IsCameraEnabled = false;
+			EnableCamera = new Command(() => ToggleEnableCamera());
+		}
+
+		private void ToggleEnableCamera()
+		{
+			IsCameraEnabled = !_isCameraEnabled;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue19127.cs b/src/Controls/tests/UITests/Tests/Issues/Issue19127.cs
new file mode 100644
index 000000000000..e6f4bde5866f
--- /dev/null
+++ b/src/Controls/tests/UITests/Tests/Issues/Issue19127.cs
@@ -0,0 +1,29 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace Microsoft.Maui.AppiumTests.Issues
+{
+	public class Issue19127 : _IssuesUITest
+	{
+		public override string Issue => "[iOS] Triggers are not working on Frame control";
+
+		public Issue19127(TestDevice device) : base(device)
+		{
+		}
+
+		[Test]
+		public void ContentOfFrameShouldChange()
+		{
+			this.IgnoreIfPlatforms(new TestDevice[] { TestDevice.Android, TestDevice.Mac, TestDevice.Windows });
+
+			_ = App.WaitForElement("button");
+
+			App.Click("button");
+
+			var text = App.FindElement("label").GetText();
+
+			Assert.AreEqual(text, "Camera is Enabled");
+		}
+	}
+}

From 41f3e73b483190a2c16ea24a5e6886d1b292fc4b Mon Sep 17 00:00:00 2001
From: Jakub Florkowski <kubaflo123@gmail.com>
Date: Wed, 14 Feb 2024 20:31:55 +0100
Subject: [PATCH 3/3] Code refactor

---
 .../Issues/Issue19127.xaml                    |  4 ++--
 .../Issues/Issue19127.xaml.cs                 |  2 +-
 .../Handlers/iOS/FrameRenderer.cs             | 24 +++++++++----------
 .../tests/UITests/Tests/Issues/Issue19127.cs  | 11 +++++----
 4 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue19127.xaml b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue19127.xaml
index 47ede0be8804..6d39f217b515 100644
--- a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue19127.xaml
+++ b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue19127.xaml
@@ -15,14 +15,14 @@
                     <DataTrigger TargetType="Frame" Binding="{Binding IsCameraEnabled}" Value="False">
                         <Setter Property="Content">
                             <Grid BackgroundColor="Gray">
-                                <Label Text="Camera is Disabled" TextColor="White" />
+                                <Label AutomationId="label1" Text="Camera is Disabled" TextColor="White" />
                             </Grid>
                         </Setter>
                     </DataTrigger>
                     <DataTrigger TargetType="Frame" Binding="{Binding IsCameraEnabled}" Value="True">
                         <Setter Property="Content">
                             <Grid BackgroundColor="HotPink">
-                                <Label AutomationId="label" Text="Camera is Enabled" TextColor="White" />
+                                <Label AutomationId="label2" Text="Camera is Enabled" TextColor="White" />
                             </Grid>
                         </Setter>
                     </DataTrigger>
diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue19127.xaml.cs b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue19127.xaml.cs
index f13acb460029..99fb0a9e9c30 100644
--- a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue19127.xaml.cs
+++ b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue19127.xaml.cs
@@ -6,7 +6,7 @@
 namespace Maui.Controls.Sample.Issues
 {
 	[XamlCompilation(XamlCompilationOptions.Compile)]
-	[Issue(IssueTracker.Github, 19127, "[iOS] Triggers are not working on Frame control", PlatformAffected.iOS)]
+	[Issue(IssueTracker.Github, 19127, "Triggers are not working on Frame control", PlatformAffected.iOS)]
 	public partial class Issue19127 : ContentPage
 	{
 		public Issue19127()
diff --git a/src/Controls/src/Core/Compatibility/Handlers/iOS/FrameRenderer.cs b/src/Controls/src/Core/Compatibility/Handlers/iOS/FrameRenderer.cs
index 9909b7a4be6f..abef7e762d20 100644
--- a/src/Controls/src/Core/Compatibility/Handlers/iOS/FrameRenderer.cs
+++ b/src/Controls/src/Core/Compatibility/Handlers/iOS/FrameRenderer.cs
@@ -10,7 +10,17 @@ namespace Microsoft.Maui.Controls.Handlers.Compatibility
 	public class FrameRenderer : VisualElementRenderer<Frame>
 	{
 		public static IPropertyMapper<Frame, FrameRenderer> Mapper
-			= new PropertyMapper<Frame, FrameRenderer>(VisualElementRendererMapper);
+			= new PropertyMapper<Frame, FrameRenderer>(VisualElementRendererMapper)
+			{
+				[VisualElement.BackgroundColorProperty.PropertyName] = (h, _) => h.SetupLayer(),
+				[VisualElement.BackgroundProperty.PropertyName] = (h, _) => h.SetupLayer(),
+				[Microsoft.Maui.Controls.Frame.BorderColorProperty.PropertyName] = (h, _) => h.SetupLayer(),
+				[Microsoft.Maui.Controls.Frame.CornerRadiusProperty.PropertyName] = (h, _) => h.SetupLayer(),
+				[Microsoft.Maui.Controls.Frame.IsClippedToBoundsProperty.PropertyName] = (h, _) => h.SetupLayer(),
+				[VisualElement.IsVisibleProperty.PropertyName] = (h, _) => h.SetupLayer(),
+				[Controls.Frame.HasShadowProperty.PropertyName] = (h, _) => h.UpdateShadow(),
+				[Microsoft.Maui.Controls.Frame.ContentProperty.PropertyName] = (h, _) => h.UpdateContent(),
+			};
 
 		public static CommandMapper<Frame, FrameRenderer> CommandMapper
 			= new CommandMapper<Frame, FrameRenderer>(VisualElementRendererCommandMapper);
@@ -59,18 +69,6 @@ protected override void OnElementChanged(ElementChangedEventArgs<Frame> e)
 		protected override void OnElementPropertyChanged(object sender, PropertyChangedEventArgs e)
 		{
 			base.OnElementPropertyChanged(sender, e);
-
-			if (e.PropertyName == VisualElement.BackgroundColorProperty.PropertyName ||
-				e.PropertyName == VisualElement.BackgroundProperty.PropertyName ||
-				e.PropertyName == Microsoft.Maui.Controls.Frame.BorderColorProperty.PropertyName ||
-				e.PropertyName == Microsoft.Maui.Controls.Frame.CornerRadiusProperty.PropertyName ||
-				e.PropertyName == Microsoft.Maui.Controls.Frame.IsClippedToBoundsProperty.PropertyName ||
-				e.PropertyName == VisualElement.IsVisibleProperty.PropertyName)
-				SetupLayer();
-			else if (e.PropertyName == Controls.Frame.HasShadowProperty.PropertyName)
-				UpdateShadow();
-			else if (e.PropertyName == Microsoft.Maui.Controls.Frame.ContentProperty.PropertyName)
-				UpdateContent();
 		}
 
 		void UpdateContent()
diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue19127.cs b/src/Controls/tests/UITests/Tests/Issues/Issue19127.cs
index e6f4bde5866f..a5647b48386b 100644
--- a/src/Controls/tests/UITests/Tests/Issues/Issue19127.cs
+++ b/src/Controls/tests/UITests/Tests/Issues/Issue19127.cs
@@ -6,7 +6,7 @@ namespace Microsoft.Maui.AppiumTests.Issues
 {
 	public class Issue19127 : _IssuesUITest
 	{
-		public override string Issue => "[iOS] Triggers are not working on Frame control";
+		public override string Issue => "Triggers are not working on Frame control";
 
 		public Issue19127(TestDevice device) : base(device)
 		{
@@ -15,15 +15,16 @@ public Issue19127(TestDevice device) : base(device)
 		[Test]
 		public void ContentOfFrameShouldChange()
 		{
-			this.IgnoreIfPlatforms(new TestDevice[] { TestDevice.Android, TestDevice.Mac, TestDevice.Windows });
-
 			_ = App.WaitForElement("button");
 
+			var textBeforeClick = App.FindElement("label1").GetText();
+
 			App.Click("button");
 
-			var text = App.FindElement("label").GetText();
+			var textAfterClick = App.FindElement("label2").GetText();
 
-			Assert.AreEqual(text, "Camera is Enabled");
+			Assert.AreEqual(textBeforeClick, "Camera is Disabled");
+			Assert.AreEqual(textAfterClick, "Camera is Enabled");
 		}
 	}
 }