From 6243dd7743aef324f437bf952c41f289bb961d75 Mon Sep 17 00:00:00 2001
From: Alberto Aldegheri <albyrock87@gmail.com>
Date: Wed, 21 Aug 2024 17:45:13 +0200
Subject: [PATCH 1/4] Fix border lagging and unwanted animations on iOS

---
 .../TestCases.HostApp/Issues/Issue18204.xaml  | 35 ++++++++++++++++++-
 .../Issues/Issue18204.xaml.cs                 |  4 +++
 src/Core/src/Platform/iOS/ContentView.cs      | 22 ++++--------
 src/Core/src/Platform/iOS/MauiCAClipLayer.cs  | 11 ++++++
 src/Core/src/Platform/iOS/MauiCALayer.cs      |  6 +++-
 src/Core/src/Platform/iOS/StrokeExtensions.cs | 35 +++++--------------
 6 files changed, 69 insertions(+), 44 deletions(-)
 create mode 100644 src/Core/src/Platform/iOS/MauiCAClipLayer.cs

diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue18204.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue18204.xaml
index f3bb0113e435..2664c929a3fe 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue18204.xaml
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue18204.xaml
@@ -3,7 +3,12 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="Maui.Controls.Sample.Issues.Issue18204"
              Title="Issue18204">
-
+    <ContentPage.Resources>
+      <Color x:Key="TealFadeStart">#1B836D</Color>
+      <Color x:Key="TealFadeEnd">#015b66</Color>
+      <Color x:Key="TealFadeStartHover">#2aab88</Color>
+      <Color x:Key="TealFadeEndHover">#026875</Color>
+    </ContentPage.Resources>
     <VerticalStackLayout Padding="24">
       <Border
         HorizontalOptions="Center"
@@ -13,5 +18,33 @@
         StrokeShape="{RoundRectangle CornerRadius=20}">
         <Button x:Name="TheButton" Clicked="ButtonClicked" BackgroundColor="LightGreen" WidthRequest="200" HeightRequest="500" />
       </Border>
+      <Border x:Name="TheOtherButton"
+              BackgroundColor="Transparent"
+              StrokeShape="{RoundRectangle CornerRadius=20}"
+              StrokeThickness="0"
+              IsVisible="False"
+              Stroke="Transparent">
+        <Border.Background>
+          <LinearGradientBrush StartPoint="0,0" EndPoint="1,0">
+            <GradientStop Offset="0.1" Color="{DynamicResource TealFadeEnd}" />
+            <GradientStop Offset="1.0" Color="{DynamicResource TealFadeStart}" />
+          </LinearGradientBrush>
+        </Border.Background>
+        <Border.Content>
+          <Grid ColumnDefinitions="auto,*,auto"
+                Padding="16,8">
+              <Label Grid.Column="0"
+                     FontSize="24"
+                     Text="Hello" />
+              <Label Grid.Column="1"
+                     FontSize="24"
+                     Text="awesome"
+                     HorizontalTextAlignment="Center"/>
+              <Label Grid.Column="2"
+                     FontSize="24"
+                     Text="World!" />
+          </Grid>
+        </Border.Content>
+      </Border>
     </VerticalStackLayout>
 </ContentPage>
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue18204.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue18204.xaml.cs
index 74e390b4a32e..40326940ab0b 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue18204.xaml.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue18204.xaml.cs
@@ -13,6 +13,10 @@ public partial class Issue18204 : ContentPage
 	public Issue18204()
 	{
 		InitializeComponent();
+		Dispatcher.DispatchDelayed(TimeSpan.FromSeconds(3), () =>
+		{
+			TheOtherButton.IsVisible = true;
+		});
 	}
 
 	private void ButtonClicked(object sender, EventArgs e)
diff --git a/src/Core/src/Platform/iOS/ContentView.cs b/src/Core/src/Platform/iOS/ContentView.cs
index 06f933192eb6..eea495f36c1c 100644
--- a/src/Core/src/Platform/iOS/ContentView.cs
+++ b/src/Core/src/Platform/iOS/ContentView.cs
@@ -78,7 +78,7 @@ void UpdateClip()
 				return;
 			}
 
-			_contentMask ??= new CAShapeLayer();
+			_contentMask ??= new MauiCAClipLayer();
 
 			var bounds = Bounds;
 
@@ -93,12 +93,6 @@ void UpdateClip()
 			var clipBounds = new RectF(0, 0, clipWidth, clipHeight);
 			_contentMask.Path = GetClipPath(clipBounds, strokeThickness);
 
-			// Set the mask on the content, if it isn't already
-			if (content.Layer.Mask != _contentMask)
-			{
-				content.Layer.Mask = _contentMask;
-			}
-
 			// Since the mask is on the content's CALayer, it's anchored to the content. But we need it to be
 			// relative to _this_ container. So we need to compute an adjusted position for it.
 
@@ -112,16 +106,14 @@ void UpdateClip()
 
 			CGPoint adjustedMaskPosition = new(clipCenterX - contentOffsetX, clipCenterY - contentOffsetY);
 
-			// Relocating/resizing a layer is animated by default; the mask will slide around as we do things like
-			// resize the content that's being masked. To prevent his, we need to set the animation duration 
-			// to zero during the operation. We'll do that in its own transaction so as not to change the default
-			// animation durations for everything else.
-
-			CATransaction.Begin();
-			CATransaction.AnimationDuration = 0;
 			_contentMask.Bounds = clipBounds;
 			_contentMask.Position = adjustedMaskPosition;
-			CATransaction.Commit();
+
+			// Set the mask on the content, if it isn't already
+			if (content.Layer.Mask != _contentMask)
+			{
+				content.Layer.Mask = _contentMask;
+			}
 		}
 
 		CGPath? GetClipPath(RectF bounds, float strokeThickness)
diff --git a/src/Core/src/Platform/iOS/MauiCAClipLayer.cs b/src/Core/src/Platform/iOS/MauiCAClipLayer.cs
new file mode 100644
index 000000000000..8b7402d0ec16
--- /dev/null
+++ b/src/Core/src/Platform/iOS/MauiCAClipLayer.cs
@@ -0,0 +1,11 @@
+using CoreAnimation;
+
+namespace Microsoft.Maui.Platform;
+
+class MauiCAClipLayer : CAShapeLayer
+{
+	public override void AddAnimation(CAAnimation animation, string? key)
+	{
+		// Do nothing, we don't want animations here
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/Platform/iOS/MauiCALayer.cs b/src/Core/src/Platform/iOS/MauiCALayer.cs
index 862948754b99..e17ebddf7821 100644
--- a/src/Core/src/Platform/iOS/MauiCALayer.cs
+++ b/src/Core/src/Platform/iOS/MauiCALayer.cs
@@ -5,7 +5,6 @@
 using CoreGraphics;
 using Microsoft.Maui.Graphics;
 using Microsoft.Maui.Graphics.Platform;
-using ObjCRuntime;
 using UIKit;
 
 namespace Microsoft.Maui.Platform
@@ -38,6 +37,11 @@ public MauiCALayer()
 			ContentsScale = UIScreen.MainScreen.Scale;
 		}
 
+		public override void AddAnimation(CAAnimation animation, string? key)
+		{
+			// Do nothing, we don't want animations here
+		}
+
 		public override void LayoutSublayers()
 		{
 			base.LayoutSublayers();
diff --git a/src/Core/src/Platform/iOS/StrokeExtensions.cs b/src/Core/src/Platform/iOS/StrokeExtensions.cs
index 22394438fc3d..53d0660c83dc 100644
--- a/src/Core/src/Platform/iOS/StrokeExtensions.cs
+++ b/src/Core/src/Platform/iOS/StrokeExtensions.cs
@@ -101,7 +101,7 @@ public static void UpdateStrokeLineJoin(this UIView platformView, IBorderStroke
 
 			platformView.UpdateMauiCALayer(border);
 		}
-
+		
 		internal static void UpdateMauiCALayer(this UIView platformView, IBorderStroke? border)
 		{
 			CALayer? backgroundLayer = platformView.Layer as MauiCALayer;
@@ -134,8 +134,6 @@ internal static void UpdateMauiCALayer(this UIView platformView, IBorderStroke?
 
 			if (backgroundLayer is MauiCALayer mauiCALayer)
 			{
-				backgroundLayer.Frame = platformView.Bounds;
-
 				if (border is IView view)
 					mauiCALayer.SetBackground(view.Background);
 				else
@@ -156,7 +154,9 @@ internal static void UpdateMauiCALayer(this UIView platformView, IBorderStroke?
 			}
 
 			if (platformView is ContentView contentView)
+			{
 				contentView.Clip = border;
+			}
 		}
 
 		internal static void UpdateMauiCALayer(this UIView view)
@@ -171,7 +171,11 @@ internal static void UpdateMauiCALayer(this UIView view)
 			{
 				var bounds = view.Bounds;
 				var backgroundLayers = GetBackgroundLayersNeedingUpdate(sublayers, bounds);
-				backgroundLayers.UpdateBackgroundLayers(bounds);
+
+				foreach (CALayer backgroundLayer in backgroundLayers)
+				{
+					backgroundLayer.Frame = bounds;
+				}
 			}
 		}
 
@@ -193,28 +197,5 @@ static IEnumerable<CALayer> GetBackgroundLayersNeedingUpdate(this CALayer[] laye
 				}
 			}
 		}
-		
-		static void UpdateBackgroundLayers(this IEnumerable<CALayer> backgroundLayers, CGRect bounds)
-		{
-			using var backgroundLayerEnumerator = backgroundLayers.GetEnumerator();
-
-			if (backgroundLayerEnumerator.MoveNext())
-			{
-				// iOS by default adds animations to certain actions such as layer resizing (setting the Frame property).
-				// This can result in the background layer not keeping up with animations controlled by MAUI.
-				// To prevent this undesired effect, native animations will be turned off for the duration of the operation.
-				CATransaction.Begin();
-				CATransaction.AnimationDuration = 0;
-				
-				do
-				{
-					var backgroundLayer = backgroundLayerEnumerator.Current;
-					backgroundLayer.Frame = bounds;
-				}
-				while (backgroundLayerEnumerator.MoveNext());
-				
-				CATransaction.Commit();
-			}
-		}
 	}
 }
\ No newline at end of file

From 92d0838bcf6e2dc2e8ed54f279f87cf5401e8fb5 Mon Sep 17 00:00:00 2001
From: Alberto Aldegheri <albyrock87@gmail.com>
Date: Thu, 22 Aug 2024 23:27:18 +0200
Subject: [PATCH 2/4] Update src/Core/src/Platform/iOS/StrokeExtensions.cs

Co-authored-by: MartyIX <203266+MartyIX@users.noreply.github.com>
---
 src/Core/src/Platform/iOS/StrokeExtensions.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Core/src/Platform/iOS/StrokeExtensions.cs b/src/Core/src/Platform/iOS/StrokeExtensions.cs
index 53d0660c83dc..668a87f38d39 100644
--- a/src/Core/src/Platform/iOS/StrokeExtensions.cs
+++ b/src/Core/src/Platform/iOS/StrokeExtensions.cs
@@ -101,7 +101,6 @@ public static void UpdateStrokeLineJoin(this UIView platformView, IBorderStroke
 
 			platformView.UpdateMauiCALayer(border);
 		}
-		
 		internal static void UpdateMauiCALayer(this UIView platformView, IBorderStroke? border)
 		{
 			CALayer? backgroundLayer = platformView.Layer as MauiCALayer;

From 6510f9316ca4638a35a214776d5e98709d9a7fc1 Mon Sep 17 00:00:00 2001
From: Alberto Aldegheri <albyrock87@gmail.com>
Date: Fri, 23 Aug 2024 13:17:05 +0200
Subject: [PATCH 3/4] Add some control on the test case

---
 .../TestCases.HostApp/Issues/Issue18204.xaml   | 18 ++++++++++++++----
 .../Issues/Issue18204.xaml.cs                  | 16 +++++++++-------
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue18204.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue18204.xaml
index 2664c929a3fe..9e500afbfa0b 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue18204.xaml
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue18204.xaml
@@ -9,19 +9,29 @@
       <Color x:Key="TealFadeStartHover">#2aab88</Color>
       <Color x:Key="TealFadeEndHover">#026875</Color>
     </ContentPage.Resources>
-    <VerticalStackLayout Padding="24">
+    <VerticalStackLayout Padding="24" Spacing="30">
+      <Button AutomationId="ChangeSize"
+              Clicked="ChangeSizeClicked"
+              Text="Change Size"
+              BackgroundColor="WhiteSmoke"
+              WidthRequest="200" />
+      <Button AutomationId="ShowHide"
+              Clicked="ShowHideClicked"
+              Text="Show/Hide"
+              BackgroundColor="WhiteSmoke"
+              WidthRequest="200" />
       <Border
         HorizontalOptions="Center"
-        x:Name="TheBorder"
         BackgroundColor="LightBlue"
-        Shadow="{Shadow Brush=Black, Offset='0,2', Radius=2, Opacity=0.20}"
+        Shadow="{Shadow Brush=Black, Offset='0,2', Radius=24, Opacity=0.2}"
         StrokeShape="{RoundRectangle CornerRadius=20}">
-        <Button x:Name="TheButton" Clicked="ButtonClicked" BackgroundColor="LightGreen" WidthRequest="200" HeightRequest="500" />
+        <Button x:Name="TheButton" BackgroundColor="LightGreen" WidthRequest="200" HeightRequest="400" />
       </Border>
       <Border x:Name="TheOtherButton"
               BackgroundColor="Transparent"
               StrokeShape="{RoundRectangle CornerRadius=20}"
               StrokeThickness="0"
+              Shadow="{Shadow Brush=Black, Offset='0,2', Radius=24, Opacity=0.5}"
               IsVisible="False"
               Stroke="Transparent">
         <Border.Background>
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue18204.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue18204.xaml.cs
index 40326940ab0b..f978263baeff 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue18204.xaml.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue18204.xaml.cs
@@ -13,17 +13,19 @@ public partial class Issue18204 : ContentPage
 	public Issue18204()
 	{
 		InitializeComponent();
-		Dispatcher.DispatchDelayed(TimeSpan.FromSeconds(3), () =>
-		{
-			TheOtherButton.IsVisible = true;
-		});
 	}
 
-	private void ButtonClicked(object sender, EventArgs e)
+	private void ChangeSizeClicked(object sender, EventArgs e)
 	{
-		var button = (Button)sender;
+		var button = TheButton;
 		button.CancelAnimations();
-		var targetHeight = button.HeightRequest == 200.0 ? 500.0 : 200.0;
+		var targetHeight = button.HeightRequest == 200.0 ? 400.0 : 200.0;
 		button.Animate("Height", new Animation(v => button.HeightRequest = v, button.Height, targetHeight, Easing.Linear));
 	}
+	
+	private void ShowHideClicked(object sender, EventArgs e)
+	{
+		var button = TheOtherButton;
+		button.IsVisible = !button.IsVisible;
+	}
 }

From 72a01411bcae2a0c259685bb20ba9ec4d5e6be2f Mon Sep 17 00:00:00 2001
From: Alberto Aldegheri <albyrock87@gmail.com>
Date: Mon, 26 Aug 2024 18:08:48 +0200
Subject: [PATCH 4/4] Ensure every CALayer used by MAUI does not use
 animations.

---
 .../src/MacOS/Extensions/BrushExtensions.cs   |  4 +-
 .../Core/src/iOS/VisualElementTracker.cs      |  2 +-
 .../Shell/iOS/ShellFlyoutLayoutManager.cs     |  2 +-
 .../iOS/Extensions/BrushExtensions.cs         | 32 +++------------
 src/Core/src/Graphics/PaintExtensions.iOS.cs  |  6 +--
 .../src/Handlers/Border/BorderHandler.iOS.cs  |  5 ---
 src/Core/src/Platform/iOS/ContentView.cs      |  4 +-
 .../src/Platform/iOS/StaticCAGradientLayer.cs | 11 ++++++
 .../{MauiCAClipLayer.cs => StaticCALayer.cs}  |  2 +-
 .../src/Platform/iOS/StaticCAShapeLayer.cs    | 11 ++++++
 src/Core/src/Platform/iOS/StrokeExtensions.cs | 39 -------------------
 src/Core/src/Platform/iOS/ViewExtensions.cs   | 34 +++++++++++-----
 src/Core/src/Platform/iOS/WrapperView.cs      |  6 +--
 .../PublicAPI/net-ios/PublicAPI.Unshipped.txt |  2 +
 .../net-maccatalyst/PublicAPI.Unshipped.txt   |  2 +
 15 files changed, 69 insertions(+), 93 deletions(-)
 create mode 100644 src/Core/src/Platform/iOS/StaticCAGradientLayer.cs
 rename src/Core/src/Platform/iOS/{MauiCAClipLayer.cs => StaticCALayer.cs} (83%)
 create mode 100644 src/Core/src/Platform/iOS/StaticCAShapeLayer.cs

diff --git a/src/Compatibility/Core/src/MacOS/Extensions/BrushExtensions.cs b/src/Compatibility/Core/src/MacOS/Extensions/BrushExtensions.cs
index a7a291f07824..9676a3d6581d 100644
--- a/src/Compatibility/Core/src/MacOS/Extensions/BrushExtensions.cs
+++ b/src/Compatibility/Core/src/MacOS/Extensions/BrushExtensions.cs
@@ -60,7 +60,7 @@ public static CAGradientLayer GetBackgroundLayer(this NSView control, Brush brus
 				var p1 = linearGradientBrush.StartPoint;
 				var p2 = linearGradientBrush.EndPoint;
 
-				var linearGradientLayer = new CAGradientLayer
+				var linearGradientLayer = new StaticCAGradientLayer
 				{
 					Name = BackgroundLayer,
 					AutoresizingMask = CAAutoresizingMask.HeightSizable | CAAutoresizingMask.WidthSizable,
@@ -86,7 +86,7 @@ public static CAGradientLayer GetBackgroundLayer(this NSView control, Brush brus
 				var center = radialGradientBrush.Center;
 				var radius = radialGradientBrush.Radius;
 
-				var radialGradientLayer = new CAGradientLayer
+				var radialGradientLayer = new StaticCAGradientLayer
 				{
 					Name = BackgroundLayer,
 					Frame = control.Bounds,
diff --git a/src/Compatibility/Core/src/iOS/VisualElementTracker.cs b/src/Compatibility/Core/src/iOS/VisualElementTracker.cs
index f956435b5ce8..441dc17ffcde 100644
--- a/src/Compatibility/Core/src/iOS/VisualElementTracker.cs
+++ b/src/Compatibility/Core/src/iOS/VisualElementTracker.cs
@@ -416,7 +416,7 @@ void UpdateClip()
 			var formsGeometry = element.Clip;
 			var nativeGeometry = formsGeometry.ToCGPath();
 
-			var maskLayer = new CAShapeLayer
+			var maskLayer = new StaticCAShapeLayer
 			{
 				Name = ClipShapeLayer,
 				Path = nativeGeometry.Data,
diff --git a/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellFlyoutLayoutManager.cs b/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellFlyoutLayoutManager.cs
index 0321ac733747..191cd98b3104 100644
--- a/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellFlyoutLayoutManager.cs
+++ b/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellFlyoutLayoutManager.cs
@@ -293,7 +293,7 @@ void LayoutHeader(CGRect parentFrame)
 				if (_context.Shell.FlyoutHeaderBehavior == FlyoutHeaderBehavior.Scroll && HeaderViewTopVerticalOffset > 0 && _headerOffset < 0)
 				{
 					var headerHeight = Math.Max(HeaderMinimumHeight, ArrangedHeaderViewHeightWithMargin + _headerOffset);
-					CAShapeLayer shapeLayer = new CAShapeLayer();
+					CAShapeLayer shapeLayer = new StaticCAShapeLayer();
 					CGRect rect = new CGRect(0, _headerOffset * -1, parentFrame.Width, headerHeight);
 					var path = CGPath.FromRect(rect);
 					shapeLayer.Path = path;
diff --git a/src/Controls/src/Core/Platform/iOS/Extensions/BrushExtensions.cs b/src/Controls/src/Core/Platform/iOS/Extensions/BrushExtensions.cs
index 77c2e71f410f..5179f0d8d120 100644
--- a/src/Controls/src/Core/Platform/iOS/Extensions/BrushExtensions.cs
+++ b/src/Controls/src/Core/Platform/iOS/Extensions/BrushExtensions.cs
@@ -44,7 +44,7 @@ public static CALayer GetBackgroundLayer(this UIView control, Brush brush)
 
 			if (brush is SolidColorBrush solidColorBrush)
 			{
-				var linearGradientLayer = new CALayer
+				var linearGradientLayer = new StaticCALayer
 				{
 					Name = BackgroundLayer,
 					ContentsGravity = CALayer.GravityResizeAspectFill,
@@ -60,7 +60,7 @@ public static CALayer GetBackgroundLayer(this UIView control, Brush brush)
 				var p1 = linearGradientBrush.StartPoint;
 				var p2 = linearGradientBrush.EndPoint;
 
-				var linearGradientLayer = new CAGradientLayer
+				var linearGradientLayer = new StaticCAGradientLayer
 				{
 					Name = BackgroundLayer,
 					ContentsGravity = CALayer.GravityResizeAspectFill,
@@ -85,7 +85,7 @@ public static CALayer GetBackgroundLayer(this UIView control, Brush brush)
 				var center = radialGradientBrush.Center;
 				var radius = radialGradientBrush.Radius;
 
-				var radialGradientLayer = new CAGradientLayer
+				var radialGradientLayer = new StaticCAGradientLayer
 				{
 					Name = BackgroundLayer,
 					ContentsGravity = CALayer.GravityResizeAspectFill,
@@ -176,30 +176,8 @@ public static void RemoveBackgroundLayer(this CALayer layer)
 			}
 		}
 
-		public static void UpdateBackgroundLayer(this UIView view)
-		{
-			if (view == null || view.Frame.IsEmpty)
-				return;
-
-			var layer = view.Layer;
-
-			UpdateBackgroundLayer(layer, view.Bounds);
-		}
-
-		static void UpdateBackgroundLayer(this CALayer layer, CGRect bounds)
-		{
-			var sublayers = layer?.Sublayers;
-			if (sublayers is not null)
-			{
-				foreach (var sublayer in sublayers)
-				{
-					UpdateBackgroundLayer(sublayer, bounds);
-
-					if (sublayer.Name == BackgroundLayer && sublayer.Frame != bounds)
-						sublayer.Frame = bounds;
-				}
-			}
-		}
+		public static void UpdateBackgroundLayer(this UIView view) =>
+			view.UpdateBackgroundLayerFrame(BackgroundLayer);
 
 		static CGPoint GetRadialGradientBrushEndPoint(Point startPoint, double radius)
 		{
diff --git a/src/Core/src/Graphics/PaintExtensions.iOS.cs b/src/Core/src/Graphics/PaintExtensions.iOS.cs
index f0b4758d9e0a..f5b1e6928ae5 100644
--- a/src/Core/src/Graphics/PaintExtensions.iOS.cs
+++ b/src/Core/src/Graphics/PaintExtensions.iOS.cs
@@ -31,7 +31,7 @@ public static partial class PaintExtensions
 
 		public static CALayer? CreateCALayer(this SolidPaint solidPaint, CGRect frame = default)
 		{
-			var solidColorLayer = new CALayer
+			var solidColorLayer = new StaticCALayer
 			{
 				ContentsGravity = CALayer.GravityResizeAspectFill,
 				Frame = frame,
@@ -57,7 +57,7 @@ public static partial class PaintExtensions
 			var p1 = linearGradientPaint.StartPoint;
 			var p2 = linearGradientPaint.EndPoint;
 
-			var linearGradientLayer = new CAGradientLayer
+			var linearGradientLayer = new StaticCAGradientLayer
 			{
 				ContentsGravity = CALayer.GravityResizeAspectFill,
 				Frame = frame,
@@ -81,7 +81,7 @@ public static partial class PaintExtensions
 			var center = radialGradientPaint.Center;
 			var radius = radialGradientPaint.Radius;
 
-			var radialGradientLayer = new CAGradientLayer
+			var radialGradientLayer = new StaticCAGradientLayer
 			{
 				ContentsGravity = CALayer.GravityResizeAspectFill,
 				Frame = frame,
diff --git a/src/Core/src/Handlers/Border/BorderHandler.iOS.cs b/src/Core/src/Handlers/Border/BorderHandler.iOS.cs
index f68457d098d9..3238e1a4cbb7 100644
--- a/src/Core/src/Handlers/Border/BorderHandler.iOS.cs
+++ b/src/Core/src/Handlers/Border/BorderHandler.iOS.cs
@@ -20,11 +20,6 @@ protected override ContentView CreatePlatformView()
 			};
 		}
 
-		protected override void ConnectHandler(ContentView platformView)
-		{
-			base.ConnectHandler(platformView);
-		}
-
 		protected override void DisconnectHandler(ContentView platformView)
 		{
 			base.DisconnectHandler(platformView);
diff --git a/src/Core/src/Platform/iOS/ContentView.cs b/src/Core/src/Platform/iOS/ContentView.cs
index eea495f36c1c..08d701b77428 100644
--- a/src/Core/src/Platform/iOS/ContentView.cs
+++ b/src/Core/src/Platform/iOS/ContentView.cs
@@ -27,7 +27,7 @@ public override void LayoutSubviews()
 			base.LayoutSubviews();
 
 			UpdateClip();
-			this.UpdateMauiCALayer();
+			this.UpdateBackgroundLayerFrame();
 		}
 
 		internal IBorderStroke? Clip
@@ -78,7 +78,7 @@ void UpdateClip()
 				return;
 			}
 
-			_contentMask ??= new MauiCAClipLayer();
+			_contentMask ??= new StaticCAShapeLayer();
 
 			var bounds = Bounds;
 
diff --git a/src/Core/src/Platform/iOS/StaticCAGradientLayer.cs b/src/Core/src/Platform/iOS/StaticCAGradientLayer.cs
new file mode 100644
index 000000000000..f9b246cc1912
--- /dev/null
+++ b/src/Core/src/Platform/iOS/StaticCAGradientLayer.cs
@@ -0,0 +1,11 @@
+using CoreAnimation;
+
+namespace Microsoft.Maui.Platform;
+
+class StaticCAGradientLayer : CAGradientLayer
+{
+	public override void AddAnimation(CAAnimation animation, string? key)
+	{
+		// Do nothing, we don't want animations here
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/Platform/iOS/MauiCAClipLayer.cs b/src/Core/src/Platform/iOS/StaticCALayer.cs
similarity index 83%
rename from src/Core/src/Platform/iOS/MauiCAClipLayer.cs
rename to src/Core/src/Platform/iOS/StaticCALayer.cs
index 8b7402d0ec16..7d62a909b387 100644
--- a/src/Core/src/Platform/iOS/MauiCAClipLayer.cs
+++ b/src/Core/src/Platform/iOS/StaticCALayer.cs
@@ -2,7 +2,7 @@
 
 namespace Microsoft.Maui.Platform;
 
-class MauiCAClipLayer : CAShapeLayer
+class StaticCALayer : CALayer
 {
 	public override void AddAnimation(CAAnimation animation, string? key)
 	{
diff --git a/src/Core/src/Platform/iOS/StaticCAShapeLayer.cs b/src/Core/src/Platform/iOS/StaticCAShapeLayer.cs
new file mode 100644
index 000000000000..6c4ae6217c9e
--- /dev/null
+++ b/src/Core/src/Platform/iOS/StaticCAShapeLayer.cs
@@ -0,0 +1,11 @@
+using CoreAnimation;
+
+namespace Microsoft.Maui.Platform;
+
+class StaticCAShapeLayer : CAShapeLayer
+{
+	public override void AddAnimation(CAAnimation animation, string? key)
+	{
+		// Do nothing, we don't want animations here
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/Platform/iOS/StrokeExtensions.cs b/src/Core/src/Platform/iOS/StrokeExtensions.cs
index 668a87f38d39..098f9f473e09 100644
--- a/src/Core/src/Platform/iOS/StrokeExtensions.cs
+++ b/src/Core/src/Platform/iOS/StrokeExtensions.cs
@@ -157,44 +157,5 @@ internal static void UpdateMauiCALayer(this UIView platformView, IBorderStroke?
 				contentView.Clip = border;
 			}
 		}
-
-		internal static void UpdateMauiCALayer(this UIView view)
-		{
-			if (view.Frame.IsEmpty)
-			{
-				return;
-			}
-
-			var layer = view.Layer;
-			if (layer?.Sublayers is { Length: > 0 } sublayers)
-			{
-				var bounds = view.Bounds;
-				var backgroundLayers = GetBackgroundLayersNeedingUpdate(sublayers, bounds);
-
-				foreach (CALayer backgroundLayer in backgroundLayers)
-				{
-					backgroundLayer.Frame = bounds;
-				}
-			}
-		}
-
-		static IEnumerable<CALayer> GetBackgroundLayersNeedingUpdate(this CALayer[] layers, CGRect bounds)
-		{
-			foreach (var layer in layers)
-			{
-				if (layer.Sublayers is { Length: > 0 } sublayers)
-				{
-					foreach (var sublayer in GetBackgroundLayersNeedingUpdate(sublayers, bounds))
-					{
-						yield return sublayer;
-					}
-				}
-
-				if (layer.Name == ViewExtensions.BackgroundLayerName && layer.Frame != bounds)
-				{
-					yield return layer;
-				}
-			}
-		}
 	}
 }
\ No newline at end of file
diff --git a/src/Core/src/Platform/iOS/ViewExtensions.cs b/src/Core/src/Platform/iOS/ViewExtensions.cs
index 79d6c5f64ad7..901658091dcf 100644
--- a/src/Core/src/Platform/iOS/ViewExtensions.cs
+++ b/src/Core/src/Platform/iOS/ViewExtensions.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Numerics;
 using System.Threading.Tasks;
+using CoreAnimation;
 using CoreGraphics;
 using Foundation;
 using Microsoft.Maui.Graphics;
@@ -245,21 +246,36 @@ public static void UpdateBorder(this UIView platformView, IView view)
 		public static T? FindDescendantView<T>(this UIView view) where T : UIView =>
 			FindDescendantView<T>(view, (_) => true);
 
-		public static void UpdateBackgroundLayerFrame(this UIView view)
+		public static void UpdateBackgroundLayerFrame(this UIView view) =>
+			view.UpdateBackgroundLayerFrame(BackgroundLayerName);
+
+		internal static void UpdateBackgroundLayerFrame(this UIView view, string layerName)
 		{
-			if (view == null || view.Frame.IsEmpty)
+			if (view.Frame.IsEmpty)
+			{
 				return;
+			}
 
-			var sublayers = view.Layer?.Sublayers;
-			if (sublayers is null || sublayers.Length == 0)
-				return;
+			var layer = view.Layer;
+			if (layer?.Sublayers is { Length: > 0 } sublayers)
+			{
+				var bounds = view.Bounds;
+				UpdateBackgroundLayers(sublayers, layerName, bounds);
+			}
+		}
 
-			foreach (var sublayer in sublayers)
+		static void UpdateBackgroundLayers(this CALayer[] layers, string layerName, CGRect bounds)
+		{
+			foreach (var layer in layers)
 			{
-				if (sublayer.Name == BackgroundLayerName && sublayer.Frame != view.Bounds)
+				if (layer.Sublayers is { Length: > 0 } sublayers)
 				{
-					sublayer.Frame = view.Bounds;
-					break;
+					UpdateBackgroundLayers(sublayers, layerName, bounds);
+				}
+
+				if (layer.Name == layerName && layer.Frame != bounds)
+				{
+					layer.Frame = bounds;
 				}
 			}
 		}
diff --git a/src/Core/src/Platform/iOS/WrapperView.cs b/src/Core/src/Platform/iOS/WrapperView.cs
index 95728ffa4264..dc3357c39239 100644
--- a/src/Core/src/Platform/iOS/WrapperView.cs
+++ b/src/Core/src/Platform/iOS/WrapperView.cs
@@ -268,7 +268,7 @@ void SetClip()
 			var path = _clip?.PathForBounds(bounds);
 			var nativePath = path?.AsCGPath();
 
-			mask ??= MaskLayer = new CAShapeLayer();
+			mask ??= MaskLayer = new StaticCAShapeLayer();
 			mask.Path = nativePath;
 
 			var backgroundLayer = GetBackgroundLayer();
@@ -278,7 +278,7 @@ void SetClip()
 			if (backgroundLayer is null)
 				return;
 
-			backgroundMask ??= BackgroundMaskLayer = new CAShapeLayer();
+			backgroundMask ??= BackgroundMaskLayer = new StaticCAShapeLayer();
 			backgroundMask.Path = nativePath;
 		}
 
@@ -289,7 +289,7 @@ void SetShadow()
 			if (shadowLayer == null && Shadow == null)
 				return;
 
-			shadowLayer ??= ShadowLayer = new CAShapeLayer();
+			shadowLayer ??= ShadowLayer = new StaticCAShapeLayer();
 
 			var frame = Frame;
 			var bounds = new RectF(0, 0, (float)frame.Width, (float)frame.Height);
diff --git a/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
index 7dc5c58110bf..b0ccc5266a37 100644
--- a/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
@@ -1 +1,3 @@
 #nullable enable
+override Microsoft.Maui.Platform.MauiCALayer.AddAnimation(CoreAnimation.CAAnimation! animation, string? key) -> void
+*REMOVED*override Microsoft.Maui.Handlers.BorderHandler.ConnectHandler(Microsoft.Maui.Platform.ContentView! platformView) -> void
\ No newline at end of file
diff --git a/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
index 7dc5c58110bf..68239b19929e 100644
--- a/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
@@ -1 +1,3 @@
 #nullable enable
+override Microsoft.Maui.Platform.MauiCALayer.AddAnimation(CoreAnimation.CAAnimation! animation, string? key) -> void
+*REMOVED*override Microsoft.Maui.Handlers.BorderHandler.ConnectHandler(Microsoft.Maui.Platform.ContentView! platformView) -> void