Addressed copilot concerns.

Vignesh-SF3580 · Vignesh-SF3580 · commit 71639d138dba · 2026-03-31T18:12:33.000+05:30
diff --git a/src/Controls/src/Core/Handlers/Items2/iOS/LayoutFactory2.cs b/src/Controls/src/Core/Handlers/Items2/iOS/LayoutFactory2.cs
@@ -276,8 +276,8 @@ public static UICollectionViewLayout CreateCarouselLayout(
 	{
 		// Keep the typed layout around so the final layout selection can opt vertical carousels
 		// into the custom snap-aware compositional layout.
-		var linearItemsLayout = weakItemsView.TryGetTarget(out var itemsView)
-			? itemsView.ItemsLayout as LinearItemsLayout
+		var linearItemsLayout = weakItemsView.TryGetTarget(out var carouselView)
+			? carouselView.ItemsLayout as LinearItemsLayout
 			: null;
 
 		NSCollectionLayoutDimension itemWidth = NSCollectionLayoutDimension.CreateFractionalWidth(1);
@@ -426,9 +426,12 @@ public static UICollectionViewLayout CreateCarouselLayout(
 			return section;
 		});
 
-		// Route vertical CarouselView layouts through the custom compositional layout so
-		// MandatorySingle snapping uses the existing TargetContentOffset pipeline.
+		// Route vertical CarouselView layouts with snap points through the custom compositional
+		// layout so MandatorySingle snapping uses the existing TargetContentOffset pipeline.
+		// Vertical carousels without snap points continue to use the standard layout to avoid
+		// unintended behavior changes.
 		var layout = linearItemsLayout?.Orientation == ItemsLayoutOrientation.Vertical
+				&& linearItemsLayout.SnapPointsType != SnapPointsType.None
 			? new CustomUICollectionViewCompositionalLayout(
 				new LayoutSnapInfo
 				{
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue33308.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue33308.cs
@@ -15,6 +15,7 @@ public Issue33308()
 		var cardsCarousel = new CarouselView
 		{
 			Loop = false,
+			AutomationId = "CardsCarousel",
 			ItemsSource = cards,
 			VerticalScrollBarVisibility = ScrollBarVisibility.Never,
 			ItemsLayout = new LinearItemsLayout(ItemsLayoutOrientation.Vertical)
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue33308.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue33308.cs
@@ -1,3 +1,4 @@
+#if TEST_FAILS_ON_WINDOWS // Windows does not consistently capture the same item on scroll down, so this test may be flaky and is skipped on Windows.
 using NUnit.Framework;
 using UITest.Appium;
 using UITest.Core;
@@ -16,10 +17,13 @@ public Issue33308(TestDevice device) : base(device)
 	[Category(UITestCategories.CarouselView)]
 	public void VerticalCarouselMandatorySingleSnapAdvancesOneCard()
 	{
-		App.WaitForElement("Card 1");
+		App.WaitForElement("CardsCarousel");
 
-		App.ScrollDown("Card 1", ScrollStrategy.Gesture, 0.99, swipeSpeed: 50, withInertia: true);
+		App.ScrollDown("CardsCarousel", ScrollStrategy.Gesture, 0.99, swipeSpeed: 500, withInertia: true);
+
+		App.WaitForElement("Card 2");
 
 		VerifyScreenshot(retryTimeout: TimeSpan.FromSeconds(2));
 	}
 }
+#endif

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ public Issue33308()`
`15`	`15`	`var cardsCarousel = new CarouselView`
`16`	`16`	`{`
`17`	`17`	`Loop = false,`
	`18`	`+ AutomationId = "CardsCarousel",`
`18`	`19`	`ItemsSource = cards,`
`19`	`20`	`VerticalScrollBarVisibility = ScrollBarVisibility.Never,`
`20`	`21`	`ItemsLayout = new LinearItemsLayout(ItemsLayoutOrientation.Vertical)`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+#if TEST_FAILS_ON_WINDOWS // Windows does not consistently capture the same item on scroll down, so this test may be flaky and is skipped on Windows.`
`1`	`2`	`using NUnit.Framework;`
`2`	`3`	`using UITest.Appium;`
`3`	`4`	`using UITest.Core;`
`@@ -16,10 +17,13 @@ public Issue33308(TestDevice device) : base(device)`
`16`	`17`	`[Category(UITestCategories.CarouselView)]`
`17`	`18`	`public void VerticalCarouselMandatorySingleSnapAdvancesOneCard()`
`18`	`19`	`{`
`19`		`- App.WaitForElement("Card 1");`
	`20`	`+ App.WaitForElement("CardsCarousel");`
`20`	`21`
`21`		`- App.ScrollDown("Card 1", ScrollStrategy.Gesture, 0.99, swipeSpeed: 50, withInertia: true);`
	`22`	`+ App.ScrollDown("CardsCarousel", ScrollStrategy.Gesture, 0.99, swipeSpeed: 500, withInertia: true);`
	`23`	`+`
	`24`	`+ App.WaitForElement("Card 2");`
`22`	`25`
`23`	`26`	`VerifyScreenshot(retryTimeout: TimeSpan.FromSeconds(2));`
`24`	`27`	`}`
`25`	`28`	`}`
	`29`	`+#endif`