Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 11 additions & 2 deletions src/Controls/src/Core/Handlers/Items2/CarouselViewHandler2.iOS.cs
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ protected override UICollectionViewLayout SelectLayout()
NSCollectionLayoutDimension groupWidth = NSCollectionLayoutDimension.CreateFractionalWidth(1);
NSCollectionLayoutDimension groupHeight = NSCollectionLayoutDimension.CreateFractionalHeight(1);
nfloat itemSpacing = 0;
NSCollectionLayoutGroup group = null;

var layout = new UICollectionViewCompositionalLayout((sectionIndex, environment) =>
{
Expand Down Expand Up @@ -78,8 +79,16 @@ protected override UICollectionViewLayout SelectLayout()

var groupSize = NSCollectionLayoutSize.Create(groupWidth, groupHeight);

var group = IsHorizontal ? NSCollectionLayoutGroup.GetHorizontalGroup(groupSize, item, 1) :
NSCollectionLayoutGroup.GetVerticalGroup(groupSize, item, 1);
if (OperatingSystem.IsIOSVersionAtLeast(16))
{
group = IsHorizontal ? NSCollectionLayoutGroup.GetHorizontalGroup(groupSize, item, 1) :
NSCollectionLayoutGroup.GetVerticalGroup(groupSize, item, 1);
}
else
{
group = IsHorizontal ? NSCollectionLayoutGroup.CreateHorizontal(groupSize, item, 1) :
NSCollectionLayoutGroup.CreateVertical(groupSize, item, 1);
}

// Create our section layout
var section = NSCollectionLayoutSection.Create(group: group);
Expand Down
32 changes: 32 additions & 0 deletions src/Controls/tests/TestCases.HostApp/Issues/Issue27818.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
namespace Maui.Controls.Sample.Issues;
[Issue(IssueTracker.Github, 27818, "CarouselView crashes on iOS 15.8.3 when using CarouselViewHandler2", PlatformAffected.iOS)]
public class Issue27818 : ContentPage
{
public Issue27818()
{
Content = new CarouselView2
{
AutomationId = "CarouselView",
ItemsSource = new List<string>
{
"Baboon",
"Capuchin Monkey",
"Blue Monkey",
"Squirrel Monkey",
"Golden Lion Tamarin",
"Howler Monkey",
"Japanese Macaque",
"Mandrill",
"Proboscis Monkey",
"Red-shanked Douc",
"Gray-shanked Douc",
"Golden Snub-nosed Monkey",
"Black Snub-nosed Monkey",
"Tonkin Snub-nosed Monkey",
"Thomas's Langur",
"Purple-faced Langur",
"Gelada"
}
};
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
using NUnit.Framework;
using UITest.Appium;
using UITest.Core;

namespace Microsoft.Maui.TestCases.Tests.Issues
{
public class Issue27818 : _IssuesUITest
{
public Issue27818(TestDevice device) : base(device) { }

public override string Issue => "CarouselView crashes on iOS 15.8.3 when using CarouselViewHandler2";

[Test]
[Category(UITestCategories.CarouselView)]
public void CarouselViewShouldNotCrash()
{
App.WaitForElement("CarouselView");
}
}
}
Loading