Fix Popup size on Android and iOS

src/CommunityToolkit.Maui.Core/Views/Popup/PopupExtensions.android.cs

@@ -4,7 +4,6 @@
 using Android.Views;
 using Microsoft.Maui.Platform;
 using AColorRes = Android.Resource.Color;
-using AInsets = Android.Graphics.Insets;
 using APoint = Android.Graphics.Point;
 using ARect = Android.Graphics.Rect;
 using AView = Android.Views.View;
@@ -17,6 +16,10 @@ namespace CommunityToolkit.Maui.Core.Views;
 /// </summary>
 public static class PopupExtensions
 {
+	static APoint realSize = new();
+	static APoint displaySize = new();
+	static ARect contentRect = new();
+
 	/// <summary>
 	/// Method to update the <see cref="IPopup.Anchor"/> view.
 	/// </summary>
@@ -114,79 +117,18 @@ public static void SetSize(this Dialog dialog, in IPopup popup, in AView contain
 			realContentWidth = 0,
 			realContentHeight = 0;
 
-		CalculateSizes(popup, context, ref realWidth, ref realHeight, ref realContentWidth, ref realContentHeight);
-
-		if (windowManager is not null)
-		{
-			int windowWidth;
-			int windowHeight;
-			int statusBarHeight;
-			int navigationBarHeight;
+		var windowSize = GetWindowSize(windowManager, decorView);
 
-			if (OperatingSystem.IsAndroidVersionAtLeast((int)BuildVersionCodes.R))
-			{
-				var windowMetrics = windowManager.CurrentWindowMetrics;
-				var windowInsets = windowMetrics.WindowInsets.GetInsetsIgnoringVisibility(WindowInsets.Type.SystemBars());
-				windowWidth = windowMetrics.Bounds.Width();
-				windowHeight = windowMetrics.Bounds.Height();
-				statusBarHeight = windowInsets.Top;
-				navigationBarHeight = windowHeight < windowWidth ? windowInsets.Left + windowInsets.Right : windowInsets.Bottom;
-			}
-			else if (windowManager.DefaultDisplay is null)
-			{
-				throw new InvalidOperationException($"{nameof(IWindowManager)}.{nameof(IWindowManager.DefaultDisplay)} cannot be null");
-			}
-			else
-			{
-				APoint realSize = new();
-				APoint displaySize = new();
-				ARect contentRect = new();
-
-				windowManager.DefaultDisplay.GetRealSize(realSize);
-				windowManager.DefaultDisplay.GetSize(displaySize);
-				decorView.GetWindowVisibleDisplayFrame(contentRect);
-
-				windowWidth = realSize.X;
-				windowHeight = realSize.Y;
-				statusBarHeight = contentRect.Top;
-
-				navigationBarHeight = realSize.Y < realSize.X
-										? (realSize.X - displaySize.X)
-										: (realSize.Y - displaySize.Y);
-			}
-
-			realWidth = realWidth <= (windowWidth - (windowHeight < windowWidth ? navigationBarHeight : 0)) ? realWidth : (int)(windowWidth - (windowHeight < windowWidth ? navigationBarHeight : 0));
-			realHeight = realHeight <= (windowHeight - ((windowHeight < windowWidth ? 0 : navigationBarHeight) + statusBarHeight)) ? realHeight : (int)(windowHeight - ((windowHeight < windowWidth ? 0 : navigationBarHeight) + statusBarHeight));
-			window.SetLayout(realWidth, realHeight);
-		}
+		CalculateSizes(popup, context, windowSize, ref realWidth, ref realHeight, ref realContentWidth, ref realContentHeight);
+		window.SetLayout(realWidth, realHeight);
 
 		var childLayoutParams = (FrameLayout.LayoutParams)(child.LayoutParameters ?? throw new InvalidOperationException($"{nameof(child.LayoutParameters)} cannot be null"));
 		childLayoutParams.Width = realWidth;
 		childLayoutParams.Height = realHeight;
 		child.LayoutParameters = childLayoutParams;
 
-		if (realContentWidth > -1)
-		{
-			var inputMeasuredWidth = realContentWidth > realWidth ? realWidth : realContentWidth;
-			container.Measure(inputMeasuredWidth, (int)MeasureSpecMode.Unspecified);
-			horizontalParams = container.MeasuredWidth;
-		}
-		else
-		{
-			container.Measure(realWidth, (int)MeasureSpecMode.Unspecified);
-			horizontalParams = container.MeasuredWidth > realWidth ? realWidth : container.MeasuredWidth;
-		}
-
-		if (realContentHeight > -1)
-		{
-			verticalParams = realContentHeight;
-		}
-		else
-		{
-			var inputMeasuredWidth = realContentWidth > -1 ? horizontalParams : realWidth;
-			container.Measure(inputMeasuredWidth, (int)MeasureSpecMode.Unspecified);
-			verticalParams = container.MeasuredHeight > realHeight ? realHeight : container.MeasuredHeight;
-		}
+		horizontalParams = realWidth;
+		verticalParams = realHeight;
 
 		var containerLayoutParams = new FrameLayout.LayoutParams(horizontalParams, verticalParams);
 
@@ -227,35 +169,94 @@ public static void SetSize(this Dialog dialog, in IPopup popup, in AView contain
 		container.LayoutParameters = containerLayoutParams;
 
 
-		static void CalculateSizes(IPopup popup, Context context, ref int realWidth, ref int realHeight, ref int realContentWidth, ref int realContentHeight)
+		static void CalculateSizes(IPopup popup, Context context, Size windowSize, ref int realWidth, ref int realHeight, ref int realContentWidth, ref int realContentHeight)
 		{
 			ArgumentNullException.ThrowIfNull(popup.Content);
 
-			if (!popup.Size.IsZero)
-			{
-				realWidth = (int)context.ToPixels(popup.Size.Width);
-				realHeight = (int)context.ToPixels(popup.Size.Height);
-			}
-			if (double.IsNaN(popup.Content.Width) || double.IsNaN(popup.Content.Height))
+			var density = context.Resources?.DisplayMetrics?.Density ?? throw new InvalidOperationException($"Unable to determine density. {nameof(context.Resources.DisplayMetrics)} cannot be null");
+
+			if (popup.Size.IsZero)
 			{
-				var size = popup.Content.Measure(double.PositiveInfinity, double.PositiveInfinity);
-				realContentWidth = (int)context.ToPixels(size.Width);
-				realContentHeight = (int)context.ToPixels(size.Height);
+				if (double.IsNaN(popup.Content.Width) || double.IsNaN(popup.Content.Height))
+				{
+					var size = popup.Content.Measure(windowSize.Width / density, windowSize.Height / density);
+					realContentWidth = (int)context.ToPixels(size.Width);
+					realContentHeight = (int)context.ToPixels(size.Height);
+
+					if (double.IsNaN(popup.Content.Width))
+					{
+						realContentWidth = popup.HorizontalOptions == LayoutAlignment.Fill ? (int)windowSize.Width : realContentWidth;
+					}
+					if (double.IsNaN(popup.Content.Height))
+					{
+						realContentHeight = popup.VerticalOptions == LayoutAlignment.Fill ? (int)windowSize.Height : realContentHeight;
+					}
+				}
+				else
+				{
+					realContentWidth = (int)context.ToPixels(popup.Content.Width);
+					realContentHeight = (int)context.ToPixels(popup.Content.Height);
+				}
 			}
 			else
 			{
-				realContentWidth = (int)context.ToPixels(popup.Content.Width);
-				realContentHeight = (int)context.ToPixels(popup.Content.Height);
+				realWidth = (int)context.ToPixels(popup.Size.Width);
+				realHeight = (int)context.ToPixels(popup.Size.Height);
 			}
 
-			realWidth = realWidth is 0 ? realContentWidth : realWidth;
-			realHeight = realHeight is 0 ? realContentHeight : realHeight;
+			realWidth = Math.Min(realWidth is 0 ? realContentWidth : realWidth, (int)windowSize.Width);
+			realHeight = Math.Min(realHeight is 0 ? realContentHeight : realHeight, (int)windowSize.Height);
 
 			if (realHeight is 0 || realWidth is 0)
 			{
 				realWidth = (int)(context.Resources?.DisplayMetrics?.WidthPixels * 0.8 ?? throw new InvalidOperationException($"Unable to determine width. {nameof(context.Resources.DisplayMetrics)} cannot be null"));
 				realHeight = (int)(context.Resources?.DisplayMetrics?.HeightPixels * 0.6 ?? throw new InvalidOperationException($"Unable to determine height. {nameof(context.Resources.DisplayMetrics)} cannot be null"));
 			}
+
+			popup.Content.Measure(realWidth / density, realHeight / density);
+		}
+
+		static Size GetWindowSize(IWindowManager? windowManager, ViewGroup decorView)
+		{
+			ArgumentNullException.ThrowIfNull(windowManager);
+
+			int windowWidth;
+			int windowHeight;
+			int statusBarHeight;
+			int navigationBarHeight;
+
+			if (OperatingSystem.IsAndroidVersionAtLeast((int)BuildVersionCodes.R))
+			{
+				var windowMetrics = windowManager.CurrentWindowMetrics;
+				var windowInsets = windowMetrics.WindowInsets.GetInsetsIgnoringVisibility(WindowInsets.Type.SystemBars());
+				windowWidth = windowMetrics.Bounds.Width();
+				windowHeight = windowMetrics.Bounds.Height();
+				statusBarHeight = windowInsets.Top;
+				navigationBarHeight = windowHeight < windowWidth ? windowInsets.Left + windowInsets.Right : windowInsets.Bottom;
+			}
+			else if (windowManager.DefaultDisplay is null)
+			{
+				throw new InvalidOperationException($"{nameof(IWindowManager)}.{nameof(IWindowManager.DefaultDisplay)} cannot be null");
+			}
+			else
+			{
+				windowManager.DefaultDisplay.GetRealSize(realSize);
+				windowManager.DefaultDisplay.GetSize(displaySize);
+				decorView.GetWindowVisibleDisplayFrame(contentRect);
+
+				windowWidth = realSize.X;
+				windowHeight = realSize.Y;
+				statusBarHeight = contentRect.Top;
+
+				navigationBarHeight = realSize.Y < realSize.X
+										? (realSize.X - displaySize.X)
+										: (realSize.Y - displaySize.Y);
+			}
+
+			windowWidth = (windowWidth - (windowHeight < windowWidth ? navigationBarHeight : 0));
+			windowHeight = (windowHeight - ((windowHeight < windowWidth ? 0 : navigationBarHeight) + statusBarHeight));
+
+			return new Size(windowWidth, windowHeight);
 		}
 	}
 

src/CommunityToolkit.Maui.Core/Views/Popup/PopupExtensions.macios.cs

@@ -1,7 +1,6 @@
 using System.Runtime.InteropServices;
-using CommunityToolkit.Maui.Core.Extensions;
-using Microsoft.Maui;
 using Microsoft.Maui.Platform;
+using ObjCRuntime;
 
 namespace CommunityToolkit.Maui.Core.Views;
 /// <summary>
@@ -16,18 +15,54 @@ public static class PopupExtensions
 	/// <param name="popup">An instance of <see cref="IPopup"/>.</param>
 	public static void SetSize(this MauiPopup mauiPopup, in IPopup popup)
 	{
-		if (!popup.Size.IsZero)
+		ArgumentNullException.ThrowIfNull(popup.Content);
+
+		CGRect frame;
+
+		if (mauiPopup.ViewController?.View?.Window is UIWindow window)
+		{
+			frame = window.Frame;
+		}
+		else
+		{
+			frame = UIScreen.MainScreen.Bounds;
+		}
+
+		CGSize currentSize;
+
+		if (popup.Size.IsZero)
 		{
-			mauiPopup.PreferredContentSize = new CGSize(popup.Size.Width, popup.Size.Height);
+			if (double.IsNaN(popup.Content.Width) || double.IsNaN(popup.Content.Height))
+			{
+				var content = popup.Content.ToPlatform(popup.Handler?.MauiContext ?? throw new InvalidOperationException($"{nameof(popup.Handler.MauiContext)} Cannot Be Null"));
+				var contentSize = content.SizeThatFits(new CGSize(frame.Width, frame.Height));
+				var width = contentSize.Width;
+				var height = contentSize.Height;
+
+				if (double.IsNaN(popup.Content.Width))
+				{
+					width = popup.HorizontalOptions == Microsoft.Maui.Primitives.LayoutAlignment.Fill ? frame.Size.Width : width;
+				}
+				if (double.IsNaN(popup.Content.Height))
+				{
+					height = popup.VerticalOptions == Microsoft.Maui.Primitives.LayoutAlignment.Fill ? frame.Size.Height : height;
+				}
+
+				currentSize = new CGSize(width, height);
+			}
+			else
+			{
+				currentSize = new CGSize(popup.Content.Width, popup.Content.Height);
+			}
 		}
-		else if (popup.Content is not null)
+		else
 		{
-			var content = popup.Content;
-			var measure = popup.Content.Measure(double.PositiveInfinity, double.PositiveInfinity);
-			var width = content.Width.IsZeroOrNaN() ? measure.Width : content.Width;
-			var height = content.Height.IsZeroOrNaN() ? measure.Height : content.Height;
-			mauiPopup.PreferredContentSize = new CGSize(width, height);
+			currentSize = new CGSize(popup.Size.Width, popup.Size.Height);
 		}
+
+		currentSize.Width = NMath.Min(currentSize.Width, frame.Size.Width);
+		currentSize.Height = NMath.Min(currentSize.Height, frame.Size.Height);
+		mauiPopup.PreferredContentSize = currentSize;
 	}
 
 	/// <summary>