code revert and test update

praveenkumarkarunanithi · sheiksyedm · commit c4d4f3f19043 · 2026-04-04T14:27:13.000+05:30
diff --git a/src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.iOS.cs b/src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.iOS.cs
@@ -319,5 +319,77 @@ Rect GetCollectionViewCellBounds(IView cellContent)
 
 			return cellContent.ToPlatform().GetParentOfType<UIKit.UICollectionViewCell>().GetBoundingBox();
 		}
+
+		// Regression test for https://github.com/dotnet/maui/issues/34635
+		// PR #33908 changed RespondsToSafeArea() to exclude UICollectionView from the
+		// UIScrollView descendant check, allowing CV cell content views to respond to
+		// safe area. This caused Window.SafeAreaInsets (title bar ~41px on macOS) to be
+		// applied to every cell, shifting content by 41px.
+		// The fix ensures CV cell content views are treated as UIScrollView descendants
+		// (since UICollectionView inherits from UIScrollView), so they do NOT respond
+		// to safe area independently.
+		[Fact("https://github.com/dotnet/maui/issues/34635")]
+		[Category(TestCategory.CollectionView)]
+		public async Task CollectionViewCellContentShouldBeScrollViewDescendant()
+		{
+			SetupBuilder();
+
+			var collectionView = new CollectionView
+			{
+				ItemsSource = Enumerable.Range(0, 5).Select(i => $"Item {i}").ToList(),
+				ItemTemplate = new DataTemplate(() =>
+				{
+					var grid = new Grid { Padding = new Thickness(10) };
+					var label = new Label();
+					label.SetBinding(Label.TextProperty, ".");
+					grid.Add(label);
+					return grid;
+				}),
+			};
+
+			await CreateHandlerAndAddToWindow<CollectionViewHandler>(collectionView, async handler =>
+			{
+				await Task.Delay(500);
+
+				var platformCV = collectionView.ToPlatform();
+				Assert.NotNull(platformCV);
+
+				var uiCollectionView = platformCV as UICollectionView
+					?? platformCV.GetParentOfType<UICollectionView>();
+
+				if (uiCollectionView is null && platformCV is UIView pv)
+					uiCollectionView = pv.Subviews.OfType<UICollectionView>().FirstOrDefault();
+
+				Assert.NotNull(uiCollectionView);
+
+				var visibleCells = uiCollectionView.VisibleCells;
+				Assert.NotEmpty(visibleCells);
+
+				foreach (var cell in visibleCells)
+				{
+					foreach (var mv in FindAllSubviews<MauiView>(cell))
+					{
+						mv.SetNeedsLayout();
+						mv.LayoutIfNeeded();
+
+						Assert.False(mv.AppliesSafeAreaAdjustments,
+							$"CollectionView cell MauiView '{mv.View?.GetType().Name}' should not apply safe area adjustments. " +
+							"Cell views inside UICollectionView must be treated as scroll view descendants.");
+					}
+				}
+			});
+		}
+
+		static List<T> FindAllSubviews<T>(UIView root) where T : UIView
+		{
+			var result = new List<T>();
+			foreach (var subview in root.Subviews)
+			{
+				if (subview is T match)
+					result.Add(match);
+				result.AddRange(FindAllSubviews<T>(subview));
+			}
+			return result;
+		}
 	}
 }
diff --git a/src/Core/src/Platform/iOS/MauiView.cs b/src/Core/src/Platform/iOS/MauiView.cs
@@ -72,13 +72,6 @@ public abstract class MauiView : UIView, ICrossPlatformLayoutBacking, IVisualTre
 		// Null means not yet determined. Invalidated when view hierarchy changes.
 		bool? _parentHandlesSafeArea;
 
-		// Cached UICollectionView parent detection to avoid repeated hierarchy checks.
-		bool? _collectionViewDescendant;
-
-		// Cached Window safe area padding for CollectionView children to detect changes.
-		// Uses SafeAreaPadding with EqualsAtPixelLevel() to absorb sub-pixel animation noise.
-		SafeAreaPadding _lastWindowSafeAreaPadding;
-
 		// Keyboard tracking
 		CGRect _keyboardFrame = CGRect.Empty;
 		bool _isKeyboardShowing;
@@ -132,18 +125,9 @@ bool RespondsToSafeArea()
 			// To prevent this, we ignore safe area calculations on child views when they are inside a scroll view.
 			// The scrollview itself is responsible for applying the correct insets, and child views should not apply additional safe area logic.
 			//
-			// EXCEPTION: CollectionView items must handle their own safe area because UICollectionView (which inherits from UIScrollView)
-			// does not automatically apply safe area insets to individual cells. Without this exception, CollectionView content
-			// would render under the notch and home indicator.
-			//
 			// For more details and implementation specifics, see MauiScrollView.cs, which contains the logic for safe area management
 			// within scroll views and explains how this interacts with the overall layout system.
-			var scrollViewParent = this.GetParentOfType<UIScrollView>();
-			_scrollViewDescendant = scrollViewParent is not null && scrollViewParent is not UICollectionView;
-			
-			// Cache whether this view is inside a UICollectionView for use in CrossPlatformArrange()
-			_collectionViewDescendant = scrollViewParent is UICollectionView;
-			
+			_scrollViewDescendant = this.GetParentOfType<UIScrollView>() is not null;
 			return !_scrollViewDescendant.Value;
 		}
 
@@ -310,12 +294,7 @@ void OnKeyboardWillHide(NSNotification notification)
 
 		SafeAreaPadding GetAdjustedSafeAreaInsets()
 		{
-			// CollectionView cells don't receive SafeAreaInsetsDidChange notifications, so their SafeAreaInsets
-			// property may be stale during layout (especially after rotation). Use Window.SafeAreaInsets instead,
-			// which always reflects the current device orientation and safe area state.
-			var baseSafeArea = _collectionViewDescendant == true && Window is not null
-				? Window.SafeAreaInsets.ToSafeAreaInsets()
-				: SafeAreaInsets.ToSafeAreaInsets();
+			var baseSafeArea = SafeAreaInsets.ToSafeAreaInsets();
 
 			// Check if keyboard-aware safe area adjustments are needed
 			if (View is ISafeAreaView2 safeAreaPage && _isKeyboardShowing)
@@ -545,18 +524,6 @@ Size CrossPlatformMeasure(double widthConstraint, double heightConstraint)
 		/// <param name="bounds">The bounds rectangle to arrange within</param>
 		void CrossPlatformArrange(CGRect bounds)
 		{
-			// Force safe area revalidation for CollectionView cells when Window safe area changes.
-			if (View is ISafeAreaView or ISafeAreaView2 && _collectionViewDescendant == true && Window is not null)
-			{
-				var currentWindowPadding = Window.SafeAreaInsets.ToSafeAreaInsets();
-				if (!currentWindowPadding.EqualsAtPixelLevel(_lastWindowSafeAreaPadding))
-				{
-					_lastWindowSafeAreaPadding = currentWindowPadding;
-					_safeAreaInvalidated = true;
-					ValidateSafeArea();
-				}
-			}
-			
 			if (_appliesSafeAreaAdjustments)
 			{
 				bounds = AdjustForSafeArea(bounds);
@@ -801,8 +768,6 @@ public override void MovedToWindow()
 
 			_scrollViewDescendant = null;
 			_parentHandlesSafeArea = null;
-			_collectionViewDescendant = null;
-			_lastWindowSafeAreaPadding = SafeAreaPadding.Empty;
 
 			// Notify any subscribers that this view has been moved to a window
 			_movedToWindow?.Invoke(this, EventArgs.Empty);
