diff --git a/src/Core/src/Handlers/ScrollView/ScrollViewHandler.iOS.cs b/src/Core/src/Handlers/ScrollView/ScrollViewHandler.iOS.cs index 6d4ea0d3af0d..28ebd82f1e85 100644 --- 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,