Disconnect Shell flyout container handlers

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Copilot-Session: 926cb3a5-a29d-45bd-8c25-35da659b8dfd

Author: Copilot

src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellFlyoutContentRenderer.cs

@@ -151,17 +151,13 @@ void UpdateFlyoutFooter(View view)
 			int previousIndex = GetPreviousIndex(_footerView);
 			if (_footer is not null)
 			{
-				var oldRenderer = (IPlatformViewHandler)_footer.Handler;
 				var oldFooterView = _footerView;
 				_footer.MeasureInvalidated -= OnFooterMeasureInvalidated;
 				_tableViewController.FooterView = null;
-				_footerView?.Disconnect();
 				_footerView = null;
 				_uIViews[FooterIndex] = null;
 				oldFooterView?.RemoveFromSuperview();
-
-				_footer.Handler = null;
-				oldRenderer?.DisconnectHandler();
+				oldFooterView?.Dispose();
 			}
 
 			_footer = view;

src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/UIContainerView.cs

@@ -11,14 +11,14 @@ namespace Microsoft.Maui.Controls.Platform.Compatibility
 	public class UIContainerView : UIView
 	{
 		readonly View _view;
-		[UnconditionalSuppressMessage("Memory", "MEM0002", Justification = "Renderer is owned by the container view and cleared in Dispose(bool).")]
+		[UnconditionalSuppressMessage("Memory", "MEM0002", Justification = "Renderer is owned by the container view and disconnected and cleared in Disconnect.")]
 		IPlatformViewHandler _renderer;
-		[UnconditionalSuppressMessage("Memory", "MEM0002", Justification = "Platform view is owned as a UIKit subview and cleared in Dispose(bool).")]
+		[UnconditionalSuppressMessage("Memory", "MEM0002", Justification = "Platform view is owned as a UIKit subview and detached and cleared in Disconnect.")]
 		UIView _platformView;
 		bool _disposed;
 		double _measuredHeight;
 
-		[UnconditionalSuppressMessage("Memory", "MEM0001", Justification = "Event is unsubscribed by ShellFlyoutLayoutManager.TearDown when the header view is released.")]
+		[UnconditionalSuppressMessage("Memory", "MEM0001", Justification = "Event subscribers are cleared in Dispose(bool).")]
 		internal event EventHandler HeaderSizeChanged;
 
 		public UIContainerView(View view)
@@ -105,7 +105,6 @@ public override CGSize SizeThatFits(CGSize size)
 
 		public override void WillRemoveSubview(UIView uiview)
 		{
-			Disconnect();
 			base.WillRemoveSubview(uiview);
 		}
 
@@ -141,6 +140,16 @@ public override void LayoutSubviews()
 
 		internal void Disconnect()
 		{
+			var renderer = _renderer;
+			var platformView = _platformView;
+
+			_renderer = null;
+			_platformView = null;
+
+			if (platformView?.Superview == this)
+				platformView.RemoveFromSuperview();
+
+			renderer?.DisconnectHandler();
 		}
 
 		protected override void Dispose(bool disposing)
@@ -151,12 +160,7 @@ protected override void Dispose(bool disposing)
 			if (disposing)
 			{
 				Disconnect();
-
-				if (_platformView.Superview == this)
-					_platformView.RemoveFromSuperview();
-
-				_renderer = null;
-				_platformView = null;
+				HeaderSizeChanged = null;
 				_disposed = true;
 			}
 

src/Controls/tests/DeviceTests/Elements/Shell/ShellTests.iOS.cs

@@ -649,6 +649,44 @@ await CreateHandlerAndAddToWindow<ShellHandler>(shell, handler =>
 			});
 		}
 
+		[Fact(DisplayName = "Disposed Shell Flyout Content Disconnects Header And Footer Handlers")]
+		public async Task DisposedShellFlyoutContentDisconnectsHeaderAndFooterHandlers()
+		{
+			SetupBuilder();
+			var header = new Label { Text = "Header" };
+			var footer = new Label { Text = "Footer" };
+			var shell = await CreateShellAsync(shell =>
+			{
+				shell.Items.Add(new ContentPage());
+				shell.FlyoutHeader = header;
+				shell.FlyoutFooter = footer;
+			});
+
+			await CreateHandlerAndAddToWindow<ShellHandler>(shell, handler =>
+			{
+				var flyoutContent = handler.ViewController
+					.ChildViewControllers
+					.OfType<ShellFlyoutContentRenderer>()
+					.First();
+				var headerPlatformView = header.ToPlatform();
+				var footerPlatformView = footer.ToPlatform();
+
+				Assert.NotNull(header.Handler);
+				Assert.NotNull(footer.Handler);
+				Assert.NotNull(headerPlatformView.Superview);
+				Assert.NotNull(footerPlatformView.Superview);
+
+				flyoutContent.Dispose();
+
+				Assert.Null(header.Handler);
+				Assert.Null(footer.Handler);
+				Assert.Null(headerPlatformView.Superview);
+				Assert.Null(footerPlatformView.Superview);
+
+				return Task.CompletedTask;
+			});
+		}
+
 		[Fact(DisplayName = "Shell Flyout Renderer Disposal Is Idempotent After Native Teardown")]
 		public Task ShellFlyoutRendererDisposalIsIdempotentAfterNativeTeardown() =>
 			InvokeOnMainThreadAsync(() =>