Skip to content

[net7.0] Make sure that we have valid values for setting the ContentSize of the ScrollView on iOS #15424

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rmarinho merged 2 commits into from
Jun 5, 2023
Merged

[net7.0] Make sure that we have valid values for setting the ContentSize of the ScrollView on iOS #15424

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c8c7774
Make sure that we have valid values for setting the ContentSize of th…
hartez Jun 2, 2023
50051b5
Fix up merge issues
hartez Jun 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 35 additions & 10 deletions src/Core/src/Handlers/ScrollView/ScrollViewHandler.iOS.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,13 @@ public static void MapVerticalScrollBarVisibility(IScrollViewHandler handler, IS

public static void MapOrientation(IScrollViewHandler handler, IScrollView scrollView)
{
// Nothing to do here for now, but we might need to make adjustments for FlowDirection when the orientation is set to Horizontal
if (handler?.PlatformView is UIScrollView uiScrollView)
{
var fullContentSize = scrollView.PresentedContent?.DesiredSize ?? Size.Zero;
var viewportWidth = uiScrollView.Bounds.Width;
var viewportHeight = uiScrollView.Bounds.Height;
SetContentSizeForOrientation(uiScrollView, viewportWidth, viewportHeight, scrollView.Orientation, fullContentSize);
}
}

public static void MapRequestScrollTo(IScrollViewHandler handler, IScrollView scrollView, object? args)
Expand Down Expand Up @@ -150,14 +156,14 @@ static void InsertContentView(UIScrollView platformScrollView, IScrollView scrol
Tag = ContentPanelTag
};

contentContainer.CrossPlatformArrange = ArrangeScrollViewContent(scrollView.CrossPlatformArrange, contentContainer, platformScrollView);
contentContainer.CrossPlatformArrange = ArrangeScrollViewContent(scrollView.CrossPlatformArrange, contentContainer, platformScrollView, scrollView.Orientation);

platformScrollView.ClearSubviews();
contentContainer.AddSubview(platformContent);
platformScrollView.AddSubview(contentContainer);
}

static Func<Rect, Size> ArrangeScrollViewContent(Func<Rect, Size> internalArrange, ContentView container, UIScrollView platformScrollView)
static Func<Rect, Size> ArrangeScrollViewContent(Func<Rect, Size> internalArrange, ContentView container, UIScrollView platformScrollView, ScrollOrientation scrollOrientation)
{
return (rect) =>
{
Expand All @@ -177,7 +183,9 @@ static Func<Rect, Size> ArrangeScrollViewContent(Func<Rect, Size> internalArrang
}

var contentSize = internalArrange(rect);
platformScrollView.ContentSize = contentSize;

SetContentSizeForOrientation(platformScrollView, platformScrollView.Bounds.Width, platformScrollView.Bounds.Height, scrollOrientation, contentSize);

return contentSize;
};
}
Expand Down Expand Up @@ -236,16 +244,19 @@ public override Size GetDesiredSize(double widthConstraint, double heightConstra
widthConstraint = AccountForPadding(widthConstraint, padding.HorizontalThickness);
heightConstraint = AccountForPadding(heightConstraint, padding.VerticalThickness);

var size = virtualView.CrossPlatformMeasure(widthConstraint, heightConstraint);
var crossPlatformContentSize = virtualView.CrossPlatformMeasure(widthConstraint, heightConstraint);

// Add the padding back in for the final size
size.Width += padding.HorizontalThickness;
size.Height += padding.VerticalThickness;
crossPlatformContentSize.Width += padding.HorizontalThickness;
crossPlatformContentSize.Height += padding.VerticalThickness;

platformView.ContentSize = size;
var viewportWidth = Math.Min(crossPlatformContentSize.Width, widthConstraint);
var viewportHeight = Math.Min(crossPlatformContentSize.Height, heightConstraint);

var finalWidth = ViewHandlerExtensions.ResolveConstraints(size.Width, virtualView.Width, virtualView.MinimumWidth, virtualView.MaximumWidth);
var finalHeight = ViewHandlerExtensions.ResolveConstraints(size.Height, virtualView.Height, virtualView.MinimumHeight, virtualView.MaximumHeight);
SetContentSizeForOrientation(platformView, widthConstraint, heightConstraint, virtualView.Orientation, crossPlatformContentSize);

var finalWidth = ViewHandlerExtensions.ResolveConstraints(viewportWidth, virtualView.Width, virtualView.MinimumWidth, virtualView.MaximumWidth);
var finalHeight = ViewHandlerExtensions.ResolveConstraints(viewportHeight, virtualView.Height, virtualView.MinimumHeight, virtualView.MaximumHeight);

return new Size(finalWidth, finalHeight);
}
Expand Down Expand Up @@ -281,5 +292,19 @@ static double AccountForPadding(double constraint, double padding)
// Remove the padding from the constraint, but don't allow it to go negative
return Math.Max(0, constraint - padding);
}
static void SetContentSizeForOrientation(UIScrollView uiScrollView, double viewportWidth, double viewportHeight, ScrollOrientation orientation, Size contentSize)
{
if (orientation is ScrollOrientation.Vertical or ScrollOrientation.Neither)
{
contentSize.Width = Math.Min(contentSize.Width, viewportWidth);
}

if (orientation is ScrollOrientation.Horizontal or ScrollOrientation.Neither)
{
contentSize.Height = Math.Min(contentSize.Height, viewportHeight);
}

uiScrollView.ContentSize = contentSize;
}
}
}