Revert "Add some defensive code around layout propagation (#24217)" (#…

…24441)

This reverts commit d85c05f.

eng/Versions.props

@@ -1,10 +1,10 @@
 <Project>
   <PropertyGroup>
     <!-- The .NET product branding version -->
-    <ProductVersion>8.0.81</ProductVersion>
+    <ProductVersion>8.0.82</ProductVersion>
     <MajorVersion>8</MajorVersion>
     <MinorVersion>0</MinorVersion>
-    <PatchVersion>81</PatchVersion>
+    <PatchVersion>82</PatchVersion>
     <SdkBandVersion>8.0.100</SdkBandVersion>
     <PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
     <!-- Servicing builds have different characteristics for the way dependencies, baselines, and versions are handled. -->

src/Controls/src/Core/Compatibility/Handlers/NavigationPage/iOS/NavigationRenderer.cs

@@ -328,10 +328,7 @@ protected virtual async Task<bool> OnPopViewAsync(Page page, bool animated)
 			var actuallyRemoved = poppedViewController == null ? true : !await task;
 			_ignorePopCall = false;
 
-			if (poppedViewController is ParentingViewController pvc)
-				pvc.Disconnect(false);
-			else
-				poppedViewController?.Dispose();
+			poppedViewController?.Dispose();
 
 			UpdateToolBarVisible();
 			return actuallyRemoved;
@@ -1145,9 +1142,7 @@ public Page Child
 						return;
 
 					if (child is not null)
-					{
 						child.PropertyChanged -= HandleChildPropertyChanged;
-					}
 
 					if (value is not null)
 					{
@@ -1277,69 +1272,45 @@ public override void WillMoveToParentViewController(UIViewController parent)
 				}
 			}
 
-			internal void Disconnect(bool dispose)
+			protected override void Dispose(bool disposing)
 			{
-				if (Child is Page child)
+				if (_disposed)
 				{
-					child.SendDisappearing();
-					child.PropertyChanged -= HandleChildPropertyChanged;
-					Child = null;
+					return;
 				}
 
-				if (_tracker is not null)
+				_disposed = true;
+
+				if (disposing)
 				{
+					if (Child is Page child)
+					{
+						child.SendDisappearing();
+						child.PropertyChanged -= HandleChildPropertyChanged;
+						Child = null;
+					}
+
 					_tracker.Target = null;
 					_tracker.CollectionChanged -= TrackerOnCollectionChanged;
 					_tracker = null;
-				}
 
-				if (NavigationItem.TitleView is not null)
-				{
-					if (dispose)
+					if (NavigationItem.TitleView != null)
+					{
 						NavigationItem.TitleView.Dispose();
-
-					NavigationItem.TitleView = null;
-				}
-
-				if (NavigationItem.RightBarButtonItems is not null && dispose)
-				{
-					for (var i = 0; i < NavigationItem.RightBarButtonItems.Length; i++)
-						NavigationItem.RightBarButtonItems[i].Dispose();
-				}
-
-				if (ToolbarItems is not null && dispose)
-				{
-					for (var i = 0; i < ToolbarItems.Length; i++)
-						ToolbarItems[i].Dispose();
-				}
-
-				for (int i = View.Subviews.Length - 1; i >= 0; i--)
-				{
-					View.Subviews[i].RemoveFromSuperview();
-				}
-
-
-				for (int i = ChildViewControllers.Length - 1; i >= 0; i--)
-				{
-					var childViewController = ChildViewControllers[i];
-					childViewController.View.RemoveFromSuperview();
-					childViewController.RemoveFromParentViewController();
-				}
-
-			}
-
-			protected override void Dispose(bool disposing)
-			{
-				if (_disposed)
-				{
-					return;
-				}
+						NavigationItem.TitleView = null;
+					}
 
-				_disposed = true;
+					if (NavigationItem.RightBarButtonItems != null)
+					{
+						for (var i = 0; i < NavigationItem.RightBarButtonItems.Length; i++)
+							NavigationItem.RightBarButtonItems[i].Dispose();
+					}
 
-				if (disposing)
-				{
-					Disconnect(true);
+					if (ToolbarItems != null)
+					{
+						for (var i = 0; i < ToolbarItems.Length; i++)
+							ToolbarItems[i].Dispose();
+					}
 				}
 
 				base.Dispose(disposing);
@@ -2000,7 +1971,7 @@ protected override void Dispose(bool disposing)
 
 					if (_child != null)
 					{
-						(_child.ContainerView ?? _child.PlatformView).RemoveFromSuperview();
+						_child.PlatformView.RemoveFromSuperview();
 						_child.DisconnectHandler();
 						_child = null;
 					}

src/Controls/src/Core/Compatibility/Handlers/iOS/FrameRenderer.cs

@@ -207,7 +207,7 @@ protected override void Dispose(bool disposing)
 		public override void SetNeedsLayout()
 		{
 			base.SetNeedsLayout();
-			this.GetSuperViewIfWindowSet()?.SetNeedsLayout();
+			Superview?.SetNeedsLayout();
 		}
 
 		[Microsoft.Maui.Controls.Internals.Preserve(Conditional = true)]

src/Controls/src/Core/NavigationPage/NavigationPage.cs

@@ -402,8 +402,6 @@ void FireAppearing(Page page)
 		void RemoveFromInnerChildren(Element page)
 		{
 			InternalChildren.Remove(page);
-
-			// TODO For NET9 we should remove this because the DisconnectHandlers will take care of it
 			page.Handler = null;
 		}
 

src/Controls/src/Core/Platform/iOS/Extensions/ButtonExtensions.cs

@@ -188,7 +188,7 @@ public static void UpdateContentLayout(this UIButton platformButton, Button butt
 			{
 				platformButton.ImageEdgeInsets = imageInsets;
 				platformButton.TitleEdgeInsets = titleInsets;
-				platformButton.GetSuperViewIfWindowSet()?.SetNeedsLayout();
+				platformButton.Superview?.SetNeedsLayout();
 			}
 #pragma warning restore CA1416, CA1422
 		}

src/Core/src/Handlers/View/ViewHandlerOfT.iOS.cs

@@ -63,7 +63,7 @@ void CleanupContainerView(UIView? containerView)
 				if (containerView is WrapperView wrapperView)
 				{
 					wrapperView.RemoveFromSuperview();
-					wrapperView.Disconnect();
+					wrapperView.Dispose();
 				}
 			}
 		}

src/Core/src/Platform/iOS/LayoutView.cs

@@ -11,14 +11,14 @@ public override void SubviewAdded(UIView uiview)
 		{
 			InvalidateConstraintsCache();
 			base.SubviewAdded(uiview);
-			this.GetSuperViewIfWindowSet()?.SetNeedsLayout();
+			Superview?.SetNeedsLayout();
 		}
 
 		public override void WillRemoveSubview(UIView uiview)
 		{
 			InvalidateConstraintsCache();
 			base.WillRemoveSubview(uiview);
-			this.GetSuperViewIfWindowSet()?.SetNeedsLayout();
+			Superview?.SetNeedsLayout();
 		}
 
 		public override UIView? HitTest(CGPoint point, UIEvent? uievent)

src/Core/src/Platform/iOS/MauiView.cs

@@ -140,7 +140,7 @@ public override void SetNeedsLayout()
 		{
 			InvalidateConstraintsCache();
 			base.SetNeedsLayout();
-			this.GetSuperViewIfWindowSet()?.SetNeedsLayout();
+			Superview?.SetNeedsLayout();
 		}
 
 		IVisualTreeElement? IVisualTreeElementProvidable.GetElement()

src/Core/src/Platform/iOS/ViewExtensions.cs

@@ -264,18 +264,10 @@ public static void UpdateBackgroundLayerFrame(this UIView view)
 			}
 		}
 
-		internal static UIView? GetSuperViewIfWindowSet(this UIView? view)
-		{
-			if (view?.Window is null)
-				return null;
-
-			return view.Superview;
-		}
-
 		public static void InvalidateMeasure(this UIView platformView, IView view)
 		{
 			platformView.SetNeedsLayout();
-			platformView.GetSuperViewIfWindowSet()?.SetNeedsLayout();
+			platformView.Superview?.SetNeedsLayout();
 		}
 
 		public static void UpdateWidth(this UIView platformView, IView view)

src/Core/src/Platform/iOS/WrapperView.cs

@@ -105,19 +105,12 @@ public override void LayoutSubviews()
 			SetBorder();
 		}
 
-		internal void Disconnect()
-		{
-			MaskLayer = null;
-			BackgroundMaskLayer = null;
-			ShadowLayer = null;
-			_borderView?.RemoveFromSuperview();
-		}
-
-
-		// TODO obsolete or delete this for NET9
 		public new void Dispose()
 		{
-			Disconnect();
+			DisposeClip();
+			DisposeShadow();
+			DisposeBorder();
+
 			base.Dispose();
 		}
 
@@ -165,7 +158,7 @@ public override void SetNeedsLayout()
 		{
 			base.SetNeedsLayout();
 
-			this.GetSuperViewIfWindowSet()?.SetNeedsLayout();
+			Superview?.SetNeedsLayout();
 		}
 
 		partial void ClipChanged()
@@ -207,6 +200,12 @@ void SetClip()
 			backgroundMask.Path = nativePath;
 		}
 
+		void DisposeClip()
+		{
+			MaskLayer = null;
+			BackgroundMaskLayer = null;
+		}
+
 		void SetShadow()
 		{
 			var shadowLayer = ShadowLayer;
@@ -231,6 +230,11 @@ void SetShadow()
 				shadowLayer.SetShadow(Shadow);
 		}
 
+		void DisposeShadow()
+		{
+			ShadowLayer = null;
+		}
+
 		void SetBorder()
 		{
 			if (Border == null)
@@ -247,6 +251,11 @@ void SetBorder()
 			_borderView.UpdateMauiCALayer(Border);
 		}
 
+		void DisposeBorder()
+		{
+			_borderView?.RemoveFromSuperview();
+		}
+
 		CALayer? GetLayer()
 		{
 			var sublayers = Layer?.Sublayers;