From 0e737ed86d0c75bfc1087421d65dfd8e972a2336 Mon Sep 17 00:00:00 2001
From: Jakub Florkowski <kubaflo123@gmail.com>
Date: Mon, 16 Jun 2025 00:43:00 +0200
Subject: [PATCH 1/3] [iOS]CarouselView Position Not Respected When Changing
 From Hidden to Visible in CV2 - fix

---
 .../Handlers/Items2/iOS/CarouselViewController2.cs   |  7 +++++++
 .../Issues/CarouselViewUpdatePosition.xaml           | 12 ++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/Controls/src/Core/Handlers/Items2/iOS/CarouselViewController2.cs b/src/Controls/src/Core/Handlers/Items2/iOS/CarouselViewController2.cs
index 16c1365cd987..a5f53848918b 100644
--- a/src/Controls/src/Core/Handlers/Items2/iOS/CarouselViewController2.cs
+++ b/src/Controls/src/Core/Handlers/Items2/iOS/CarouselViewController2.cs
@@ -499,6 +499,13 @@ async Task UpdateInitialPosition()
 				return;
 			}
 
+			if(!ItemsView.IsVisible)
+			{
+				// If the CarouselView is not visible we don't want to set the initial position
+				// since it will be set when the CarouselView becomes visible
+				return;
+			}
+
 			if (ItemsSource is null)
 			{
 				return;
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/CarouselViewUpdatePosition.xaml b/src/Controls/tests/TestCases.HostApp/Issues/CarouselViewUpdatePosition.xaml
index a093143a1675..f87ee577b471 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/CarouselViewUpdatePosition.xaml
+++ b/src/Controls/tests/TestCases.HostApp/Issues/CarouselViewUpdatePosition.xaml
@@ -14,20 +14,20 @@
                 Text="Tap the Button. If the item selected in the CarouselView is Item 4, the test has passed."/>
             <!-- This functionality failed in CarouselView2. Reference: https://github.com/dotnet/maui/issues/29309 -->     
             <!-- TODO: Replace CarouselView1 with CarouselView once the issues mentioned in the GitHub issue are resolved. -->  
-            <local:CarouselView1
+            <local:CarouselView2
                 x:Name="carousel"
                 IsSwipeEnabled="True"
                 Position="3"
                 IsVisible="False">
-                <local:CarouselView1.ItemTemplate>
+                <local:CarouselView2.ItemTemplate>
                     <DataTemplate>
                         <Label
                             Text="{Binding}"
                             FontSize="Large"
                             HorizontalOptions="CenterAndExpand"/>
                     </DataTemplate>
-                </local:CarouselView1.ItemTemplate>
-                <local:CarouselView1.ItemsSource>
+                </local:CarouselView2.ItemTemplate>
+                <local:CarouselView2.ItemsSource>
                     <x:Array Type="{x:Type x:String}">
                         <x:String>Item 1</x:String>
                         <x:String>Item 2</x:String>
@@ -35,8 +35,8 @@
                         <x:String>Item 4</x:String>
                         <x:String>Item 5</x:String>
                     </x:Array>
-                </local:CarouselView1.ItemsSource>
-            </local:CarouselView1>
+                </local:CarouselView2.ItemsSource>
+            </local:CarouselView2>
             <Button
                 AutomationId="AppearButton"
                 Text="Appear"

From efcdee6bcefd6b9ab5feb839a6fcae9b2d90bf9d Mon Sep 17 00:00:00 2001
From: Jakub Florkowski <kubaflo123@gmail.com>
Date: Mon, 16 Jun 2025 00:47:08 +0200
Subject: [PATCH 2/3] Update CarouselViewUpdatePosition.xaml

---
 .../TestCases.HostApp/Issues/CarouselViewUpdatePosition.xaml    | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Controls/tests/TestCases.HostApp/Issues/CarouselViewUpdatePosition.xaml b/src/Controls/tests/TestCases.HostApp/Issues/CarouselViewUpdatePosition.xaml
index f87ee577b471..b70f7e6238c6 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/CarouselViewUpdatePosition.xaml
+++ b/src/Controls/tests/TestCases.HostApp/Issues/CarouselViewUpdatePosition.xaml
@@ -12,8 +12,6 @@
                 BackgroundColor="Black"
                 TextColor="White"
                 Text="Tap the Button. If the item selected in the CarouselView is Item 4, the test has passed."/>
-            <!-- This functionality failed in CarouselView2. Reference: https://github.com/dotnet/maui/issues/29309 -->     
-            <!-- TODO: Replace CarouselView1 with CarouselView once the issues mentioned in the GitHub issue are resolved. -->  
             <local:CarouselView2
                 x:Name="carousel"
                 IsSwipeEnabled="True"

From 37fac1c6a6e0490c8a525200bf2767071133a1ae Mon Sep 17 00:00:00 2001
From: Jakub Florkowski <kubaflo123@gmail.com>
Date: Tue, 17 Jun 2025 02:06:57 +0200
Subject: [PATCH 3/3] Update CarouselViewUpdatePosition.xaml

---
 .../Issues/CarouselViewUpdatePosition.xaml           | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Controls/tests/TestCases.HostApp/Issues/CarouselViewUpdatePosition.xaml b/src/Controls/tests/TestCases.HostApp/Issues/CarouselViewUpdatePosition.xaml
index b70f7e6238c6..6171c56da54f 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/CarouselViewUpdatePosition.xaml
+++ b/src/Controls/tests/TestCases.HostApp/Issues/CarouselViewUpdatePosition.xaml
@@ -12,20 +12,20 @@
                 BackgroundColor="Black"
                 TextColor="White"
                 Text="Tap the Button. If the item selected in the CarouselView is Item 4, the test has passed."/>
-            <local:CarouselView2
+            <CarouselView
                 x:Name="carousel"
                 IsSwipeEnabled="True"
                 Position="3"
                 IsVisible="False">
-                <local:CarouselView2.ItemTemplate>
+                <CarouselView.ItemTemplate>
                     <DataTemplate>
                         <Label
                             Text="{Binding}"
                             FontSize="Large"
                             HorizontalOptions="CenterAndExpand"/>
                     </DataTemplate>
-                </local:CarouselView2.ItemTemplate>
-                <local:CarouselView2.ItemsSource>
+                </CarouselView.ItemTemplate>
+                <CarouselView.ItemsSource>
                     <x:Array Type="{x:Type x:String}">
                         <x:String>Item 1</x:String>
                         <x:String>Item 2</x:String>
@@ -33,8 +33,8 @@
                         <x:String>Item 4</x:String>
                         <x:String>Item 5</x:String>
                     </x:Array>
-                </local:CarouselView2.ItemsSource>
-            </local:CarouselView2>
+                </CarouselView.ItemsSource>
+            </CarouselView>
             <Button
                 AutomationId="AppearButton"
                 Text="Appear"