Skip to content

[iOS] Fix UI loop when setting ContentInset #21140

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
PureWeen merged 5 commits into from
Mar 15, 2024
Merged

[iOS] Fix UI loop when setting ContentInset #21140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4a622fd
[controls] Add repo for issue #20294
rmarinho Mar 8, 2024
392d2b2
[iOS] Fix ShouldInvalidateLayoutForBoundsChange
rmarinho Mar 11, 2024
2165041
[controls] Add uitest for issue #20294
rmarinho Mar 12, 2024
7516780
[testing] Fix UITest by actually scrolling the colelctionview
rmarinho Mar 14, 2024
fe24a31
[tests] Just run test on iOS
rmarinho Mar 15, 2024
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
56 changes: 56 additions & 0 deletions src/Controls/samples/Controls.Sample.UITests/Issues/Issue20294.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
<?xml version="1.0" encoding="utf-8" ?>
<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
Title="Issue 20294"
x:Class="Maui.Controls.Sample.Issues.Issue20294">
<CollectionView SelectionMode="Single" Margin="10.0" AutomationId="theCollectionView">
<CollectionView.ItemsSource>
<x:Array Type="{x:Type x:String}">
<x:String>ONE</x:String>
<x:String>asdf</x:String>
<x:String>asdf</x:String>
<x:String>asdf</x:String>
<x:String>asdf</x:String>
<x:String>asdf</x:String>
<x:String>asdf</x:String>
<x:String>asdf</x:String>
<x:String>asdf</x:String>
<x:String>asdf</x:String>
<x:String>asdf</x:String>
<x:String>asdf</x:String>
<x:String>asdf</x:String>
<x:String>asdf</x:String>
<x:String>asdf</x:String>
<x:String>asdf</x:String>
<x:String>asdf</x:String>
<x:String>asdf</x:String>
<x:String>asdf</x:String>
<x:String>asdf</x:String>
<x:String>asdf</x:String>
<x:String>asdf</x:String>
<x:String>asdf</x:String>
<x:String>asdf</x:String>
<x:String>asdf</x:String>
<x:String>asdf</x:String>
<x:String>asdf</x:String>
<x:String>asdf</x:String>
<x:String>LAST</x:String>
</x:Array>
</CollectionView.ItemsSource>
<CollectionView.ItemsLayout>
<LinearItemsLayout
Orientation="Vertical"
ItemSpacing="15"/>
</CollectionView.ItemsLayout>
<CollectionView.Footer>
<Label HeightRequest="45" Text="FOOTER" AutomationId="FOOTER"/>
</CollectionView.Footer>
<CollectionView.ItemTemplate>
<DataTemplate x:DataType="x:String">
<Border AutomationId="{Binding}" StrokeThickness="0.2">
<Label Text="{Binding}" FontSize="20"/>
</Border>
</DataTemplate>
</CollectionView.ItemTemplate>
</CollectionView>
</ContentPage>
15 changes: 15 additions & 0 deletions src/Controls/samples/Controls.Sample.UITests/Issues/Issue20294.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
using Microsoft.Maui.Controls;
using Microsoft.Maui.Controls.Xaml;

namespace Maui.Controls.Sample.Issues
{
[XamlCompilation(XamlCompilationOptions.Compile)]
[Issue(IssueTracker.Github, 20294, "CollectionView containing a Footer and a Border with StrokeThickness set to decimal value crashes on scroll", PlatformAffected.iOS)]
public partial class Issue20294 : ContentPage
{
public Issue20294()
{
InitializeComponent();
}
}
}
11 changes: 5 additions & 6 deletions src/Controls/src/Core/Handlers/Items/iOS/ItemsViewLayout.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,11 @@ protected virtual void HandlePropertyChanged(PropertyChangedEventArgs propertyCh
}
}

internal virtual void UpdateConstraints(CGSize size)
internal virtual bool UpdateConstraints(CGSize size)
{
if (size.IsCloseTo(_currentSize))
{
return;
return false;
}

ClearCellSizeCache();
Expand All @@ -119,6 +119,7 @@ internal virtual void UpdateConstraints(CGSize size)
ConstrainTo(newSize);

UpdateCellConstraints();
return true;
}

internal void SetInitialConstraints(CGSize size)
Expand Down Expand Up @@ -573,14 +574,12 @@ static void ForceScrollToLastItem(UICollectionView collectionView, ItemsLayout i

public override bool ShouldInvalidateLayoutForBoundsChange(CGRect newBounds)
{
if (newBounds.Size == _currentSize)
if (newBounds.Size.IsCloseTo(_currentSize))
{
return base.ShouldInvalidateLayoutForBoundsChange(newBounds);
}

UpdateConstraints(CollectionView.AdjustedContentInset.InsetRect(newBounds).Size);

return true;
return UpdateConstraints(CollectionView.AdjustedContentInset.InsetRect(newBounds).Size);
}

internal bool TryGetCachedCellSize(object item, out CGSize size)
Expand Down
8 changes: 6 additions & 2 deletions src/Controls/src/Core/Handlers/Items/iOS/StructuredItemsViewController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,16 +133,18 @@ internal void UpdateSubview(object view, DataTemplate viewTemplate, nint viewTag
}

if (formsElement != null)
{
Copy link
Copy Markdown
Member Author

@rmarinho rmarinho Mar 14, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These changes on this file is just small cleanup and seems we need braces now :)

ItemsView.AddLogicalChild(formsElement);
}

if (formsElement != null)
{
RemeasureLayout(formsElement);
formsElement.MeasureInvalidated += OnFormsElementMeasureInvalidated;
}
else if (uiView != null)
else
{
uiView.SizeToFit();
uiView?.SizeToFit();
}
}

Expand All @@ -159,7 +161,9 @@ void UpdateHeaderFooterPosition()
nfloat emptyWidth = emptyView?.Frame.Width ?? 0f;

if (_headerUIView != null && _headerUIView.Frame.X != headerWidth)
{
_headerUIView.Frame = new CoreGraphics.CGRect(-headerWidth, 0, headerWidth, CollectionView.Frame.Height);
}

if (_footerUIView != null && (_footerUIView.Frame.X != ItemsViewLayout.CollectionViewContentSize.Width || emptyWidth > 0))
_footerUIView.Frame = new CoreGraphics.CGRect(ItemsViewLayout.CollectionViewContentSize.Width + emptyWidth, 0, footerWidth, CollectionView.Frame.Height);
Expand Down
26 changes: 26 additions & 0 deletions src/Controls/tests/UITests/Tests/Issues/Issue20294.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
using System.Drawing;
using NUnit.Framework;
using UITest.Appium;
using UITest.Core;

namespace Microsoft.Maui.AppiumTests.Issues;

public class Issue20294 : _IssuesUITest
{
public Issue20294(TestDevice device) : base(device) { }

public override string Issue => "CollectionView containing a Footer and a Border with StrokeThickness set to decimal value crashes on scroll";

[Test]
public void ScrollToEndDoesntCrash()
{
this.IgnoreIfPlatforms(new TestDevice[] { TestDevice.Android, TestDevice.Mac, TestDevice.Windows });

App.ScrollTo("FOOTER");
App.ScrollUp("theCollectionView", ScrollStrategy.Gesture, 0.5);
App.ScrollDown("theCollectionView", ScrollStrategy.Gesture, 0.5);
App.ScrollDown("theCollectionView", ScrollStrategy.Gesture, 0.5);
App.ScrollUp("theCollectionView", ScrollStrategy.Gesture, 0.5);
App.ScrollDown("theCollectionView", ScrollStrategy.Gesture, 0.5);
}
}