Update ScrollViewHandler.iOS.cs

dotnet · Jan 5, 2025 · 01d5d65 · 01d5d65
1 parent 1d2a7a6
commit 01d5d65
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/src/Core/src/Handlers/ScrollView/ScrollViewHandler.iOS.cs b/src/Core/src/Handlers/ScrollView/ScrollViewHandler.iOS.cs
@@ -2,6 +2,7 @@
 using CoreGraphics;
 using Microsoft.Maui.Graphics;
 using Microsoft.Maui.Layouts;
+using Microsoft.Maui.Primitives;
 using UIKit;
 
 namespace Microsoft.Maui.Handlers
@@ -185,6 +186,16 @@ static Size MeasureContent(IContentView contentView, Thickness inset, double wid
 
 			var contentSize = Size.Zero;
 
+			if (widthConstraint != double.PositiveInfinity && Dimension.IsExplicitSet(contentView.Width))
+			{
+				widthConstraint = contentView.Width;
+			}
+
+			if (heightConstraint != double.PositiveInfinity && Dimension.IsExplicitSet(contentView.Height))
+			{
+				heightConstraint = contentView.Height;
+			}
+
 			if (content != null)
 			{
 				contentSize = content.Measure(widthConstraint - inset.HorizontalThickness,