Allow pages without content (#1015)

dotnet · May 12, 2021 · d4df78a · d4df78a
1 parent 5969945
commit d4df78a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/src/Core/src/Handlers/Page/PageHandler.Android.cs b/src/Core/src/Handlers/Page/PageHandler.Android.cs
@@ -32,8 +32,9 @@ public override void SetVirtualView(IView view)
 			NativeView.CrossPlatformMeasure = VirtualView.Measure;
 			NativeView.CrossPlatformArrange = VirtualView.Arrange;
 			NativeView.RemoveAllViews();
-			//var wrap = ViewGroup.LayoutParams.WrapContent;
-			NativeView.AddView(VirtualView.Content.ToNative(MauiContext)); // , new ViewGroup.LayoutParams(wrap, wrap));
+
+			if (VirtualView.Content != null)
+				NativeView.AddView(VirtualView.Content.ToNative(MauiContext));
 		}
 
 		public static void MapTitle(PageHandler handler, IPage page)

diff --git a/src/Core/src/Handlers/Page/PageHandler.Windows.cs b/src/Core/src/Handlers/Page/PageHandler.Windows.cs
@@ -18,7 +18,9 @@ public override void SetVirtualView(IView view)
 			NativeView.CrossPlatformArrange = VirtualView.Arrange;
 
 			NativeView.Children.Clear();
-			NativeView.Children.Add(VirtualView.Content.ToNative(MauiContext));
+
+			if (VirtualView.Content != null)
+				NativeView.Children.Add(VirtualView.Content.ToNative(MauiContext));
 		}
 
 		protected override PagePanel CreateNativeView()

diff --git a/src/Core/src/Handlers/Page/PageHandler.cs b/src/Core/src/Handlers/Page/PageHandler.cs
@@ -1,8 +1,4 @@
 #nullable enable
-using System;
-using System.Collections.Generic;
-using System.Text;
-
 namespace Microsoft.Maui.Handlers
 {
 	public partial class PageHandler : IViewHandler

diff --git a/src/Core/src/Handlers/Page/PageHandler.iOS.cs b/src/Core/src/Handlers/Page/PageHandler.iOS.cs
@@ -36,7 +36,9 @@ public override void SetVirtualView(IView view)
 			oldChildren.ForEach(x => x.RemoveFromSuperview());
 
 			NativeView.CrossPlatformArrange = VirtualView.Arrange;
-			NativeView.AddSubview(VirtualView.Content.ToNative(MauiContext));
+
+			if (VirtualView.Content != null)
+				NativeView.AddSubview(VirtualView.Content.ToNative(MauiContext));
 		}
 
 		public static void MapTitle(PageHandler handler, IPage page)