Processed feedback

Author: jfversluis

Xamarin.Forms.Controls/GalleryPages/PageWithTransparentBkgnd.xaml

@@ -7,8 +7,7 @@
              x:Class="Xamarin.Forms.Controls.GalleryPages.PageWithTransparentBkgnd"
              xmlns:ios="clr-namespace:Xamarin.Forms.PlatformConfiguration.iOSSpecific;assembly=Xamarin.Forms.Core"
              ios:Page.UseSafeArea="true"
-             BackgroundColor="Transparent"
-             ModalBackgroundColor="#700000FF"
+             BackgroundColor="#700000FF"
              ios:Page.ModalPresentationStyle="OverFullScreen">
     <Frame VerticalOptions="Center"
            HorizontalOptions="Center"

Xamarin.Forms.Core/Page.cs

@@ -42,8 +42,6 @@ public class Page : VisualElement, ILayout, IPageController, IElementConfigurati
 		[EditorBrowsable(EditorBrowsableState.Never)]
 		public static readonly BindableProperty IconProperty = IconImageSourceProperty;
 
-		public static readonly BindableProperty ModalBackgroundColorProperty = BindableProperty.Create(nameof(ModalBackgroundColor), typeof(Color), typeof(Page), Color.Default);
-
 		readonly Lazy<PlatformConfigurationRegistry<Page>> _platformConfigurationRegistry;
 
 		bool _allocatedFlag;
@@ -155,12 +153,6 @@ public bool IgnoresContainerArea
         [EditorBrowsable(EditorBrowsableState.Never)]
         public ObservableCollection<Element> InternalChildren { get; } = new ObservableCollection<Element>();
 
-		public Color ModalBackgroundColor
-		{
-			get { return (Color)GetValue(ModalBackgroundColorProperty); }
-			set { SetValue(ModalBackgroundColorProperty, value); }
-		}
-
 		internal override IEnumerable<Element> ChildrenNotDrawnByThisElement
 		{
 			get

Xamarin.Forms.Core/PlatformConfiguration/iOSSpecific/UIModalPresentationStyle.cs

@@ -4,6 +4,8 @@ public enum UIModalPresentationStyle
 	{
 		FullScreen,
 		FormSheet,
-		OverFullScreen
+		OverFullScreen,
+		PageSheet,
+		Automatic
 	}
 }

Xamarin.Forms.Platform.iOS/Extensions/Extensions.cs

@@ -86,6 +86,10 @@ public static UIModalPresentationStyle ToNativeModalPresentationStyle(this Platf
 					return UIModalPresentationStyle.FullScreen;
 				case PlatformConfiguration.iOSSpecific.UIModalPresentationStyle.OverFullScreen:
 					return UIModalPresentationStyle.OverFullScreen;
+				case PlatformConfiguration.iOSSpecific.UIModalPresentationStyle.PageSheet:
+					return UIModalPresentationStyle.PageSheet;
+				case PlatformConfiguration.iOSSpecific.UIModalPresentationStyle.Automatic:
+					return UIModalPresentationStyle.Automatic;
 				default:
 					throw new ArgumentOutOfRangeException(nameof(style));
 			}

Xamarin.Forms.Platform.iOS/ModalWrapper.cs

@@ -123,14 +123,21 @@ public override UIViewController ChildViewControllerForStatusBarStyle()
 
 		void OnModalPagePropertyChanged(object sender, PropertyChangedEventArgs e)
 		{
-			if (e.PropertyName == Page.ModalBackgroundColorProperty.PropertyName)
+			if (e.PropertyName == Page.BackgroundColorProperty.PropertyName)
 				UpdateBackgroundColor();
 		}
 
 		void UpdateBackgroundColor()
 		{
-			Color modalBkgndColor = ((Page)_modal.Element).ModalBackgroundColor;
-			View.BackgroundColor = modalBkgndColor.IsDefault ? UIColor.White : modalBkgndColor.ToUIColor();
+			if (ModalPresentationStyle == UIKit.UIModalPresentationStyle.FullScreen)
+			{
+				Color modalBkgndColor = ((Page)_modal.Element).BackgroundColor;
+				View.BackgroundColor = modalBkgndColor.IsDefault ? UIColor.White : modalBkgndColor.ToUIColor();
+			}
+			else
+			{
+				View.BackgroundColor = UIColor.Clear;
+			}
 		}
 	}
 }

Xamarin.Forms.Platform.iOS/PageExtensions.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using UIKit;
 
 namespace Xamarin.Forms
@@ -39,5 +40,17 @@ public static UIViewController CreateViewController(this ContentPage page)
 		{
 			return Xamarin.Forms.PageExtensions.CreateViewController(page);
 		}
+
+		internal static Page GetCurrentPage(this Page currentPage)
+		{
+			if (currentPage.NavigationProxy.ModalStack.LastOrDefault() is Page modal)
+				return modal;
+			else if (currentPage is MasterDetailPage mdp)
+				return GetCurrentPage(mdp.Detail);
+			else if (currentPage is IPageContainer<Page> pc)
+				return GetCurrentPage(pc.CurrentPage);
+			else
+				return currentPage;
+		}
 	}
 }

Xamarin.Forms.Platform.iOS/Platform.cs

@@ -120,7 +120,7 @@ async Task<Page> INavigation.PopModalAsync(bool animated)
 			modal.DisposeModalAndChildRenderers();
 
 			if (IsModalPresentedOverContext(modal))
-				GetCurentPage(Page)?.SendAppearing();
+				Page.GetCurrentPage()?.SendAppearing();
 
 			return modal;
 		}
@@ -154,8 +154,27 @@ Task INavigation.PushModalAsync(Page modal, bool animated)
 		{
 			EndEditing();
 
-			if (_appeared && IsModalPresentedOverContext(modal))
-				GetCurentPage(Page)?.SendDisappearing();
+			var elementConfiguration = modal as IElementConfiguration<Page>;
+
+			var presentationStyle = elementConfiguration?.On<PlatformConfiguration.iOS>()?.ModalPresentationStyle().ToNativeModalPresentationStyle();
+
+			bool shouldFire = true;
+
+			if (Forms.IsiOS13OrNewer)
+			{
+				if (presentationStyle == UIKit.UIModalPresentationStyle.FullScreen)
+					shouldFire = false; //this is mainly for backwards compatibility
+			}
+			else
+			{
+				if (presentationStyle == UIKit.UIModalPresentationStyle.Automatic)
+					shouldFire = false;
+				else if (presentationStyle == UIKit.UIModalPresentationStyle.FullScreen)
+					shouldFire = false; //this is mainly for backwards compatibility
+			}
+
+			if (_appeared && shouldFire)
+				Page.GetCurrentPage()?.SendDisappearing();
 
 			_modals.Add(modal);
 
@@ -605,17 +624,6 @@ internal void CleanUpPages()
 			(Page.Parent as IDisposable)?.Dispose();
 		}
 
-		Page GetCurentPage(Page currentPage)
-		{
-			if (_modals.LastOrDefault() is Page modal)
-				return modal;
-			else if (currentPage is MasterDetailPage mdp)
-				return GetCurentPage(mdp.Detail);
-			else if (currentPage is IPageContainer<Page> pc)
-				return GetCurentPage(pc.CurrentPage);
-			else
-				return currentPage;
-		}
 
 		static bool IsModalPresentedOverContext(Page modal)
 		{