Fix crash with a hidden CarouselView on iOS (#13397)

Co-authored-by: Javier Suárez <javiersuarezruiz@hotmail.com>
dotnet · Feb 16, 2023 · 9c34659 · 9c34659
1 parent 6ee362f
commit 9c34659
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 3 deletions.
diff --git a/src/Controls/src/Core/Handlers/Items/iOS/CarouselViewLayout.cs b/src/Controls/src/Core/Handlers/Items/iOS/CarouselViewLayout.cs
@@ -19,9 +19,9 @@ public CarouselViewLayout(ItemsLayout itemsLayout, CarouselView carouselView) :
 
 		public override void ConstrainTo(CGSize size)
 		{
-			//TODO: Should we scale the items 
-			var width = size.Width - _carouselView.PeekAreaInsets.Left - _carouselView.PeekAreaInsets.Right;
-			var height = size.Height - _carouselView.PeekAreaInsets.Top - _carouselView.PeekAreaInsets.Bottom;
+			// TODO: Should we scale the items 
+			var width = size.Width != 0 ? size.Width - _carouselView.PeekAreaInsets.Left - _carouselView.PeekAreaInsets.Right : 0;
+			var height = size.Height != 0 ? size.Height - _carouselView.PeekAreaInsets.Top - _carouselView.PeekAreaInsets.Bottom : 0;
 
 			if (ScrollDirection == UICollectionViewScrollDirection.Horizontal)
 			{

diff --git a/src/Controls/tests/DeviceTests/Elements/CarouselView/CarouselViewTests.cs b/src/Controls/tests/DeviceTests/Elements/CarouselView/CarouselViewTests.cs
@@ -73,6 +73,45 @@ await CreateHandlerAndAddToWindow<LayoutHandler>(layout, async (handler) =>
 				Assert.NotNull(handler.PlatformView);
 			});
 		}
+
+		[Fact]
+		public async Task HiddenCarouselViewNoCrash()
+		{
+			SetupBuilder();
+
+			ObservableCollection<int> data = new ObservableCollection<int>()
+			{
+				1,
+				2,
+			};
+
+			var template = new DataTemplate(() =>
+			{
+				return new Grid()
+				{
+					new Label()
+				};
+			});
+
+			var carouselView = new CarouselView()
+			{
+				ItemTemplate = template,
+				ItemsSource = data
+			};
+
+			var layout = new Grid()
+			{
+				carouselView,
+			};
+
+			layout.IsVisible = false;
+
+			await CreateHandlerAndAddToWindow<LayoutHandler>(layout, async (handler) =>
+			{
+				await Task.Delay(100);
+				Assert.NotNull(handler.PlatformView);
+			});
+		}
 	}
 
 	internal class CustomDataTemplateSelectorSelector : DataTemplateSelector