[net11.0] Expose safe area contract for custom views

src/Controls/src/Build.Tasks/nuget/buildTransitive/netstandard2.0/maui-sc.aotprofile.txt

@@ -3284,9 +3284,9 @@ Methods:
 	Microsoft.Maui.Primitives.LayoutAlignment Microsoft.Maui.Controls.View:Microsoft.Maui.IView.get_VerticalLayoutAlignment ()
 	Microsoft.Maui.PropertyMapper Microsoft.Maui.Controls.View:Microsoft.Maui.IPropertyMapperView.GetPropertyMapperOverrides ()
 	Microsoft.Maui.SafeAreaEdges Microsoft.Maui.Controls.Layout:get_SafeAreaEdges ()
-	Microsoft.Maui.SafeAreaEdges Microsoft.Maui.Controls.Layout:Microsoft.Maui.ISafeAreaElement.SafeAreaEdgesDefaultValueCreator ()
+	Microsoft.Maui.SafeAreaEdges Microsoft.Maui.Controls.Layout:Microsoft.Maui.ISafeAreaElement.GetDefaultSafeAreaEdges ()
 	Microsoft.Maui.SafeAreaEdges Microsoft.Maui.Controls.ScrollView:get_SafeAreaEdges ()
-	Microsoft.Maui.SafeAreaEdges Microsoft.Maui.Controls.ScrollView:Microsoft.Maui.ISafeAreaElement.SafeAreaEdgesDefaultValueCreator ()
+	Microsoft.Maui.SafeAreaEdges Microsoft.Maui.Controls.ScrollView:Microsoft.Maui.ISafeAreaElement.GetDefaultSafeAreaEdges ()
 	Microsoft.Maui.SafeAreaEdges Microsoft.Maui.SafeAreaEdges:get_Default ()
 	Microsoft.Maui.SafeAreaRegions Microsoft.Maui.Controls.ContentPage:Microsoft.Maui.ISafeAreaView2.GetSafeAreaRegionsForEdge (int)
 	Microsoft.Maui.SafeAreaRegions Microsoft.Maui.Controls.Layout:Microsoft.Maui.ISafeAreaView2.GetSafeAreaRegionsForEdge (int)

src/Controls/src/Build.Tasks/nuget/buildTransitive/netstandard2.0/maui.aotprofile.txt

@@ -2591,9 +2591,9 @@ Methods:
 	Microsoft.Maui.Primitives.LayoutAlignment Microsoft.Maui.Controls.VisualElement:Microsoft.Maui.IView.get_VerticalLayoutAlignment ()
 	Microsoft.Maui.PropertyMapper Microsoft.Maui.Controls.View:Microsoft.Maui.IPropertyMapperView.GetPropertyMapperOverrides ()
 	Microsoft.Maui.SafeAreaEdges Microsoft.Maui.Controls.Layout:get_SafeAreaEdges ()
-	Microsoft.Maui.SafeAreaEdges Microsoft.Maui.Controls.Layout:Microsoft.Maui.ISafeAreaElement.SafeAreaEdgesDefaultValueCreator ()
+	Microsoft.Maui.SafeAreaEdges Microsoft.Maui.Controls.Layout:Microsoft.Maui.ISafeAreaElement.GetDefaultSafeAreaEdges ()
 	Microsoft.Maui.SafeAreaEdges Microsoft.Maui.Controls.ScrollView:get_SafeAreaEdges ()
-	Microsoft.Maui.SafeAreaEdges Microsoft.Maui.Controls.ScrollView:Microsoft.Maui.ISafeAreaElement.SafeAreaEdgesDefaultValueCreator ()
+	Microsoft.Maui.SafeAreaEdges Microsoft.Maui.Controls.ScrollView:Microsoft.Maui.ISafeAreaElement.GetDefaultSafeAreaEdges ()
 	Microsoft.Maui.SafeAreaEdges Microsoft.Maui.SafeAreaEdges:get_Default ()
 	Microsoft.Maui.SafeAreaRegions Microsoft.Maui.Controls.ContentPage:Microsoft.Maui.ISafeAreaView2.GetSafeAreaRegionsForEdge (int)
 	Microsoft.Maui.SafeAreaRegions Microsoft.Maui.Controls.Layout:Microsoft.Maui.ISafeAreaView2.GetSafeAreaRegionsForEdge (int)

src/Controls/src/Core/Border/Border.cs

@@ -482,17 +482,14 @@ SafeAreaRegions ISafeAreaView2.GetSafeAreaRegionsForEdge(int edge)
 			return regionForEdge;
 		}
 
-		/// <inheritdoc cref="ISafeAreaView2.SafeAreaInsets"/>
-		Thickness ISafeAreaView2.SafeAreaInsets { set { } } // Default no-op implementation for borders
-
 		/// <inheritdoc cref="ISafeAreaView2.HasExplicitSafeAreaEdges"/>
-		bool ISafeAreaView2.HasExplicitSafeAreaEdges => IsSetExplicitly(SafeAreaEdgesProperty);
+		bool ISafeAreaView2.HasExplicitSafeAreaEdges => SafeAreaElement.IsSafeAreaEdgesSet(this);
 
 		/// <summary>
 		/// Provides the default value for the <see cref="SafeAreaEdges"/> property.
 		/// </summary>
 		/// <returns>The default safe area edges of <see cref="SafeAreaEdges.None"/>.</returns>
-		SafeAreaEdges ISafeAreaElement.SafeAreaEdgesDefaultValueCreator()
+		SafeAreaEdges ISafeAreaElement.GetDefaultSafeAreaEdges()
 		{
 			return SafeAreaEdges.None;
 		}

src/Controls/src/Core/ContentPage/ContentPage.cs

@@ -2,12 +2,11 @@
 
 using System;
 using System.Diagnostics;
-
 using Microsoft.Maui.Controls.Internals;
+using Microsoft.Maui.Devices;
 using Microsoft.Maui.Graphics;
 using Microsoft.Maui.HotReload;
 using Microsoft.Maui.Layouts;
-using Microsoft.Maui.Devices;
 
 namespace Microsoft.Maui.Controls
 {
@@ -172,13 +171,13 @@ Size IContentView.CrossPlatformMeasure(double widthConstraint, double heightCons
 		}
 
 		/// <inheritdoc cref="ISafeAreaView2.HasExplicitSafeAreaEdges"/>
-		bool ISafeAreaView2.HasExplicitSafeAreaEdges => IsSetExplicitly(SafeAreaEdgesProperty);
+		bool ISafeAreaView2.HasExplicitSafeAreaEdges => SafeAreaElement.IsSafeAreaEdgesSet(this);
 
 		/// <inheritdoc cref="ISafeAreaView2.GetSafeAreaRegionsForEdge"/>
 		SafeAreaRegions ISafeAreaView2.GetSafeAreaRegionsForEdge(int edge)
 		{
 			// Check if the developer has explicitly set SafeAreaEdges
-			if (IsSet(SafeAreaEdgesProperty))
+			if (SafeAreaElement.IsSafeAreaEdgesSet(this))
 			{
 				// Developer has explicitly set SafeAreaEdges, use it directly
 				return SafeAreaEdges.GetEdge(edge);
@@ -206,7 +205,7 @@ SafeAreaRegions ISafeAreaView2.GetSafeAreaRegionsForEdge(int edge)
 #endif
 		}
 
-		SafeAreaEdges ISafeAreaElement.SafeAreaEdgesDefaultValueCreator()
+		SafeAreaEdges ISafeAreaElement.GetDefaultSafeAreaEdges()
 		{
 			return SafeAreaEdges.None;
 		}

src/Controls/src/Core/ContentView/ContentView.cs

@@ -77,7 +77,7 @@ internal override void SetChildInheritedBindingContext(Element child, object con
 
 		IView IContentView.PresentedContent => ((this as IControlTemplated).TemplateRoot as IView) ?? Content;
 
-		SafeAreaEdges ISafeAreaElement.SafeAreaEdgesDefaultValueCreator()
+		SafeAreaEdges ISafeAreaElement.GetDefaultSafeAreaEdges()
 		{
 			return SafeAreaEdges.None;
 		}
@@ -88,11 +88,8 @@ private protected override string GetDebuggerDisplay()
 			return $"{base.GetDebuggerDisplay()}, {contentText}";
 		}
 
-		/// <inheritdoc cref="ISafeAreaView2.SafeAreaInsets"/>
-		Thickness ISafeAreaView2.SafeAreaInsets { set { } } // Default no-op implementation for content views
-
 		/// <inheritdoc cref="ISafeAreaView2.HasExplicitSafeAreaEdges"/>
-		bool ISafeAreaView2.HasExplicitSafeAreaEdges => IsSetExplicitly(SafeAreaEdgesProperty);
+		bool ISafeAreaView2.HasExplicitSafeAreaEdges => SafeAreaElement.IsSafeAreaEdgesSet(this);
 
 		/// <inheritdoc cref="ISafeAreaView2.GetSafeAreaRegionsForEdge"/>
 		SafeAreaRegions ISafeAreaView2.GetSafeAreaRegionsForEdge(int edge)

src/Controls/src/Core/Layout/Layout.cs

@@ -370,7 +370,7 @@ Thickness IPaddingElement.PaddingDefaultValueCreator()
 			return new Thickness(0);
 		}
 
-		SafeAreaEdges ISafeAreaElement.SafeAreaEdgesDefaultValueCreator()
+		SafeAreaEdges ISafeAreaElement.GetDefaultSafeAreaEdges()
 		{
 			return SafeAreaEdges.Container;
 		}
@@ -409,11 +409,8 @@ private protected override string GetDebuggerDisplay()
 		}
 
 
-		/// <inheritdoc cref="ISafeAreaView2.SafeAreaInsets"/>
-		Thickness ISafeAreaView2.SafeAreaInsets { set { } } // Default no-op implementation for layouts
-
 		/// <inheritdoc cref="ISafeAreaView2.HasExplicitSafeAreaEdges"/>
-		bool ISafeAreaView2.HasExplicitSafeAreaEdges => IsSetExplicitly(SafeAreaEdgesProperty);
+		bool ISafeAreaView2.HasExplicitSafeAreaEdges => SafeAreaElement.IsSafeAreaEdgesSet(this);
 
 		/// <inheritdoc cref="ISafeAreaView2.GetSafeAreaRegionsForEdge"/>
 		SafeAreaRegions ISafeAreaView2.GetSafeAreaRegionsForEdge(int edge)

src/Controls/src/Core/Page/Page.cs

@@ -21,7 +21,7 @@ namespace Microsoft.Maui.Controls
 	/// <remarks><see cref = "Page" /> is primarily a base class for more useful derived types. Objects that are derived from the <see cref="Page"/> class are most prominently used as the top level UI element in .NET MAUI applications. In addition to their role as the main pages of applications, <see cref="Page"/> objects and their descendants can be used with navigation classes, such as <see cref="NavigationPage"/> or <see cref="FlyoutPage"/>, among others, to provide rich user experiences that conform to the expected behaviors on each platform.
 	/// </remarks>
 	[DebuggerDisplay("{GetDebuggerDisplay(), nq}")]
-	public partial class Page : VisualElement, ILayout, IPageController, IElementConfiguration<Page>, IPaddingElement, ISafeAreaView2, IView, ITitledElement, IToolbarElement, ISafeAreaView, IConstrainedView
+	public partial class Page : VisualElement, ILayout, IPageController, IElementConfiguration<Page>, IPaddingElement, ISafeAreaView2, ISafeAreaInsets, IView, ITitledElement, IToolbarElement, ISafeAreaView, IConstrainedView
 #if IOS
 	,IiOSPageSpecifics
 #endif
@@ -254,7 +254,7 @@ int IiOSPageSpecifics.PreferredStatusBarUpdateAnimationMode
 #endif
 
 		/// <inheritdoc/>
-		Thickness ISafeAreaView2.SafeAreaInsets
+		Thickness ISafeAreaInsets.SafeAreaInsets
 		{
 			set
 			{
@@ -918,7 +918,7 @@ internal void SendNavigatedFrom(NavigatedFromEventArgs args, bool disconnectHand
 					}
 				}
 #endif
-				
+
 				if (!this.IsLoaded)
 				{
 					this.DisconnectHandlers();

src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt

@@ -1,4 +1,7 @@
 #nullable enable
+Microsoft.Maui.Controls.SafeAreaElement
+static Microsoft.Maui.Controls.SafeAreaElement.IsSafeAreaEdgesSet(Microsoft.Maui.Controls.BindableObject! bindable) -> bool
+static readonly Microsoft.Maui.Controls.SafeAreaElement.SafeAreaEdgesProperty -> Microsoft.Maui.Controls.BindableProperty!
 Microsoft.Maui.Controls.DragGestureRecognizer.SendDragStarting(Microsoft.Maui.Controls.View! element, System.Func<Microsoft.Maui.IElement?, Microsoft.Maui.Graphics.Point?>? getPosition = null, Microsoft.Maui.Controls.PlatformDragStartingEventArgs? platformArgs = null) -> Microsoft.Maui.Controls.DragStartingEventArgs!
 Microsoft.Maui.Controls.DragGestureRecognizer.SendDropCompleted(Microsoft.Maui.Controls.DropCompletedEventArgs! args) -> void
 Microsoft.Maui.Controls.DropGestureRecognizer.SendDragLeave(Microsoft.Maui.Controls.DragEventArgs! args) -> void

src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt

@@ -1,4 +1,7 @@
 #nullable enable
+Microsoft.Maui.Controls.SafeAreaElement
+static Microsoft.Maui.Controls.SafeAreaElement.IsSafeAreaEdgesSet(Microsoft.Maui.Controls.BindableObject! bindable) -> bool
+static readonly Microsoft.Maui.Controls.SafeAreaElement.SafeAreaEdgesProperty -> Microsoft.Maui.Controls.BindableProperty!
 Microsoft.Maui.Controls.DragGestureRecognizer.SendDragStarting(Microsoft.Maui.Controls.View! element, System.Func<Microsoft.Maui.IElement?, Microsoft.Maui.Graphics.Point?>? getPosition = null, Microsoft.Maui.Controls.PlatformDragStartingEventArgs? platformArgs = null) -> Microsoft.Maui.Controls.DragStartingEventArgs!
 Microsoft.Maui.Controls.DragGestureRecognizer.SendDropCompleted(Microsoft.Maui.Controls.DropCompletedEventArgs! args) -> void
 Microsoft.Maui.Controls.DropGestureRecognizer.SendDragLeave(Microsoft.Maui.Controls.DragEventArgs! args) -> void

src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt

@@ -1,4 +1,7 @@
 #nullable enable
+Microsoft.Maui.Controls.SafeAreaElement
+static Microsoft.Maui.Controls.SafeAreaElement.IsSafeAreaEdgesSet(Microsoft.Maui.Controls.BindableObject! bindable) -> bool
+static readonly Microsoft.Maui.Controls.SafeAreaElement.SafeAreaEdgesProperty -> Microsoft.Maui.Controls.BindableProperty!
 Microsoft.Maui.Controls.DragGestureRecognizer.SendDragStarting(Microsoft.Maui.Controls.View! element, System.Func<Microsoft.Maui.IElement?, Microsoft.Maui.Graphics.Point?>? getPosition = null, Microsoft.Maui.Controls.PlatformDragStartingEventArgs? platformArgs = null) -> Microsoft.Maui.Controls.DragStartingEventArgs!
 Microsoft.Maui.Controls.DragGestureRecognizer.SendDropCompleted(Microsoft.Maui.Controls.DropCompletedEventArgs! args) -> void
 Microsoft.Maui.Controls.DropGestureRecognizer.SendDragLeave(Microsoft.Maui.Controls.DragEventArgs! args) -> void

src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt

@@ -1,4 +1,7 @@
 #nullable enable
+Microsoft.Maui.Controls.SafeAreaElement
+static Microsoft.Maui.Controls.SafeAreaElement.IsSafeAreaEdgesSet(Microsoft.Maui.Controls.BindableObject! bindable) -> bool
+static readonly Microsoft.Maui.Controls.SafeAreaElement.SafeAreaEdgesProperty -> Microsoft.Maui.Controls.BindableProperty!
 Microsoft.Maui.Controls.DragGestureRecognizer.SendDragStarting(Microsoft.Maui.Controls.View! element, System.Func<Microsoft.Maui.IElement?, Microsoft.Maui.Graphics.Point?>? getPosition = null, Microsoft.Maui.Controls.PlatformDragStartingEventArgs? platformArgs = null) -> Microsoft.Maui.Controls.DragStartingEventArgs!
 Microsoft.Maui.Controls.DragGestureRecognizer.SendDropCompleted(Microsoft.Maui.Controls.DropCompletedEventArgs! args) -> void
 Microsoft.Maui.Controls.DropGestureRecognizer.SendDragLeave(Microsoft.Maui.Controls.DragEventArgs! args) -> void

src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt

@@ -1,4 +1,7 @@
 #nullable enable
+Microsoft.Maui.Controls.SafeAreaElement
+static Microsoft.Maui.Controls.SafeAreaElement.IsSafeAreaEdgesSet(Microsoft.Maui.Controls.BindableObject! bindable) -> bool
+static readonly Microsoft.Maui.Controls.SafeAreaElement.SafeAreaEdgesProperty -> Microsoft.Maui.Controls.BindableProperty!
 Microsoft.Maui.Controls.DragGestureRecognizer.SendDragStarting(Microsoft.Maui.Controls.View! element, System.Func<Microsoft.Maui.IElement?, Microsoft.Maui.Graphics.Point?>? getPosition = null, Microsoft.Maui.Controls.PlatformDragStartingEventArgs? platformArgs = null) -> Microsoft.Maui.Controls.DragStartingEventArgs!
 Microsoft.Maui.Controls.DragGestureRecognizer.SendDropCompleted(Microsoft.Maui.Controls.DropCompletedEventArgs! args) -> void
 Microsoft.Maui.Controls.DropGestureRecognizer.SendDragLeave(Microsoft.Maui.Controls.DragEventArgs! args) -> void

src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt

@@ -1,4 +1,7 @@
 #nullable enable
+Microsoft.Maui.Controls.SafeAreaElement
+static Microsoft.Maui.Controls.SafeAreaElement.IsSafeAreaEdgesSet(Microsoft.Maui.Controls.BindableObject! bindable) -> bool
+static readonly Microsoft.Maui.Controls.SafeAreaElement.SafeAreaEdgesProperty -> Microsoft.Maui.Controls.BindableProperty!
 Microsoft.Maui.Controls.DragGestureRecognizer.SendDragStarting(Microsoft.Maui.Controls.View! element, System.Func<Microsoft.Maui.IElement?, Microsoft.Maui.Graphics.Point?>? getPosition = null, Microsoft.Maui.Controls.PlatformDragStartingEventArgs? platformArgs = null) -> Microsoft.Maui.Controls.DragStartingEventArgs!
 Microsoft.Maui.Controls.DragGestureRecognizer.SendDropCompleted(Microsoft.Maui.Controls.DropCompletedEventArgs! args) -> void
 Microsoft.Maui.Controls.DropGestureRecognizer.SendDragLeave(Microsoft.Maui.Controls.DragEventArgs! args) -> void

src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt

@@ -1,4 +1,7 @@
 #nullable enable
+Microsoft.Maui.Controls.SafeAreaElement
+static Microsoft.Maui.Controls.SafeAreaElement.IsSafeAreaEdgesSet(Microsoft.Maui.Controls.BindableObject! bindable) -> bool
+static readonly Microsoft.Maui.Controls.SafeAreaElement.SafeAreaEdgesProperty -> Microsoft.Maui.Controls.BindableProperty!
 Microsoft.Maui.Controls.DragGestureRecognizer.SendDragStarting(Microsoft.Maui.Controls.View! element, System.Func<Microsoft.Maui.IElement?, Microsoft.Maui.Graphics.Point?>? getPosition = null, Microsoft.Maui.Controls.PlatformDragStartingEventArgs? platformArgs = null) -> Microsoft.Maui.Controls.DragStartingEventArgs!
 Microsoft.Maui.Controls.DragGestureRecognizer.SendDropCompleted(Microsoft.Maui.Controls.DropCompletedEventArgs! args) -> void
 Microsoft.Maui.Controls.DropGestureRecognizer.SendDragLeave(Microsoft.Maui.Controls.DragEventArgs! args) -> void

src/Controls/src/Core/SafeAreaElement.cs

@@ -7,17 +7,45 @@
 
 namespace Microsoft.Maui.Controls
 {
-	internal static class SafeAreaElement
+	/// <summary>
+	/// Provides the shared bindable property used by controls that implement <see cref="ISafeAreaElement"/>.
+	/// </summary>
+	public static class SafeAreaElement
 	{
 		/// <summary>
 		/// The backing store for the <see cref="ISafeAreaElement.SafeAreaEdges" /> bindable property.
 		/// </summary>
+		/// <remarks>
+		/// Types using this property must implement <see cref="ISafeAreaElement"/> and should expose this instance through
+		/// their own public <c>SafeAreaEdgesProperty</c> field.
+		/// </remarks>
 		public static readonly BindableProperty SafeAreaEdgesProperty =
 			BindableProperty.Create(nameof(ISafeAreaElement.SafeAreaEdges), typeof(SafeAreaEdges), typeof(ISafeAreaElement), SafeAreaEdges.Default,
 									defaultValueCreator: SafeAreaEdgesDefaultValueCreator);
 
 		static object SafeAreaEdgesDefaultValueCreator(BindableObject bindable)
-			=> ((ISafeAreaElement)bindable).SafeAreaEdgesDefaultValueCreator();
+		{
+			if (bindable is not ISafeAreaElement safeAreaElement)
+				throw new InvalidOperationException($"{bindable.GetType()} must implement {nameof(ISafeAreaElement)} to use {nameof(SafeAreaEdgesProperty)}.");
+
+			return safeAreaElement.GetDefaultSafeAreaEdges();
+		}
+
+		/// <summary>
+		/// Determines whether <see cref="SafeAreaEdgesProperty"/> has been explicitly configured on a bindable object.
+		/// </summary>
+		/// <param name="bindable">The bindable object to inspect.</param>
+		/// <returns><see langword="true"/> when a local value, style, binding, or other non-default value is applied; otherwise, <see langword="false"/>.</returns>
+		/// <remarks>
+		/// The type must use <see cref="SafeAreaEdgesProperty"/> as the backing store for its safe area property.
+		/// </remarks>
+		public static bool IsSafeAreaEdgesSet(BindableObject bindable)
+		{
+			if (bindable is null)
+				throw new ArgumentNullException(nameof(bindable));
+
+			return bindable.IsSetExplicitly(SafeAreaEdgesProperty);
+		}
 
 		/// <summary>
 		/// Gets the effective safe area behavior for a specific edge.

src/Controls/src/Core/ScrollView/ScrollView.cs

@@ -550,23 +550,13 @@ Size IContentView.CrossPlatformMeasure(double widthConstraint, double heightCons
 		Size IContentView.CrossPlatformArrange(Rect bounds) =>
 			((ICrossPlatformLayout)this).CrossPlatformArrange(bounds);
 
-		SafeAreaEdges ISafeAreaElement.SafeAreaEdgesDefaultValueCreator()
+		SafeAreaEdges ISafeAreaElement.GetDefaultSafeAreaEdges()
 		{
 			return SafeAreaEdges.Default;
 		}
 
-		/// <inheritdoc cref="ISafeAreaView2.SafeAreaInsets"/>
-		Thickness ISafeAreaView2.SafeAreaInsets
-		{
-			set
-			{
-				// For ScrollView, we don't need to store the SafeAreaInsets
-				// The platform-specific MauiScrollView handles this
-			}
-		}
-
 		/// <inheritdoc cref="ISafeAreaView2.HasExplicitSafeAreaEdges"/>
-		bool ISafeAreaView2.HasExplicitSafeAreaEdges => IsSetExplicitly(SafeAreaEdgesProperty);
+		bool ISafeAreaView2.HasExplicitSafeAreaEdges => SafeAreaElement.IsSafeAreaEdgesSet(this);
 
 		/// <inheritdoc cref="ISafeAreaView2.GetSafeAreaRegionsForEdge"/>
 		SafeAreaRegions ISafeAreaView2.GetSafeAreaRegionsForEdge(int edge)