From f4126e713396fc514d96be91672e3cf575a16293 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Su=C3=A1rez?= <javiersuarezruiz@hotmail.com>
Date: Wed, 20 Nov 2024 15:59:42 +0100
Subject: [PATCH 01/10] Added repro sample

---
 .../TestCases.HostApp/Issues/Issue25893.xaml    | 16 ++++++++++++++++
 .../TestCases.HostApp/Issues/Issue25893.xaml.cs | 17 +++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 src/Controls/tests/TestCases.HostApp/Issues/Issue25893.xaml
 create mode 100644 src/Controls/tests/TestCases.HostApp/Issues/Issue25893.xaml.cs

diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue25893.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue25893.xaml
new file mode 100644
index 000000000000..e51d847fb67f
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue25893.xaml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<controls:TestContentPage xmlns:controls="clr-namespace:Maui.Controls.Sample.Issues"
+                          xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+                          xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+                          x:Class="Maui.Controls.Sample.Issues.Issue25893">
+  <Grid RowDefinitions="Auto,*,Auto">
+    <ContentView Grid.Row="0" Grid.RowSpan="3">
+      <FlyoutBase.ContextFlyout>
+        <MenuFlyout x:Name="ContextMenu">
+          <MenuFlyoutItem IconImageSource="dotnet_bot.png" Text="Copy" />
+          <MenuFlyoutSubItem IconImageSource="dotnet_bot.png" Text="Zoom"  />
+        </MenuFlyout>
+      </FlyoutBase.ContextFlyout>
+    </ContentView>
+  </Grid>
+</controls:TestContentPage>
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue25893.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue25893.xaml.cs
new file mode 100644
index 000000000000..9ff3cb8d59c0
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue25893.xaml.cs
@@ -0,0 +1,17 @@
+namespace Maui.Controls.Sample.Issues
+{
+
+	[Issue(IssueTracker.Github, 25893, "Setting MenuFlyoutSubItem IconImageSource throws a NullReferenceException", PlatformAffected.UWP)]
+	public partial class Issue25893 : TestContentPage
+	{
+		public Issue25893()
+		{
+			InitializeComponent();	
+		}
+
+		protected override void Init()
+		{
+		
+		}
+	}
+}
\ No newline at end of file

From f04642853824096733f9165ca205e69eeea8083c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Su=C3=A1rez?= <javiersuarezruiz@hotmail.com>
Date: Thu, 21 Nov 2024 12:43:19 +0100
Subject: [PATCH 02/10] Updated sample

---
 src/Controls/tests/TestCases.HostApp/Issues/Issue25893.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue25893.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue25893.xaml
index e51d847fb67f..0f84558caecb 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue25893.xaml
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue25893.xaml
@@ -8,7 +8,7 @@
       <FlyoutBase.ContextFlyout>
         <MenuFlyout x:Name="ContextMenu">
           <MenuFlyoutItem IconImageSource="dotnet_bot.png" Text="Copy" />
-          <MenuFlyoutSubItem IconImageSource="dotnet_bot.png" Text="Zoom"  />
+          <MenuFlyoutSubItem IconImageSource="dotnet_bot.png" Text="Zoom" />
         </MenuFlyout>
       </FlyoutBase.ContextFlyout>
     </ContentView>

From 0da244f08c41dfb2dd59a79a3bf64dd48cdb8c55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Su=C3=A1rez?= <javiersuarezruiz@hotmail.com>
Date: Thu, 21 Nov 2024 12:43:26 +0100
Subject: [PATCH 03/10] Fix the issue

---
 src/Controls/src/Core/Menu/MenuFlyoutSubItem.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Controls/src/Core/Menu/MenuFlyoutSubItem.cs b/src/Controls/src/Core/Menu/MenuFlyoutSubItem.cs
index 3f606a85523c..d92d506a3010 100644
--- a/src/Controls/src/Core/Menu/MenuFlyoutSubItem.cs
+++ b/src/Controls/src/Core/Menu/MenuFlyoutSubItem.cs
@@ -16,7 +16,12 @@ public partial class MenuFlyoutSubItem : MenuFlyoutItem, IMenuFlyoutSubItem
 
 		public MenuFlyoutSubItem()
 		{
-			LogicalChildrenInternalBackingStore = new CastingList<Element, IMenuElement>(_menus);
+			LogicalChildrenInternalBackingStore = new List<Element>();
+
+			foreach(var item in _menus)
+			{
+				LogicalChildrenInternalBackingStore.Add((Element)item);
+			}
 		}
 
 		private protected override IList<Element> LogicalChildrenInternalBackingStore { get; }

From c9661232e10bb438ff033f4824f00be830ac1e6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Su=C3=A1rez?= <javiersuarezruiz@hotmail.com>
Date: Thu, 21 Nov 2024 12:56:47 +0100
Subject: [PATCH 04/10] Added UITest

---
 .../TestCases.HostApp/Issues/Issue25893.xaml  |  3 ++-
 .../Tests/Issues/Issue25893.cs                | 23 +++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue25893.cs

diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue25893.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue25893.xaml
index 0f84558caecb..fb3860f05def 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue25893.xaml
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue25893.xaml
@@ -4,7 +4,8 @@
                           xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
                           x:Class="Maui.Controls.Sample.Issues.Issue25893">
   <Grid RowDefinitions="Auto,*,Auto">
-    <ContentView Grid.Row="0" Grid.RowSpan="3">
+    <Label AutomationId="WaitForStubControl" Text="Issue25893"/>
+    <ContentView Grid.Row="1" Grid.RowSpan="2" BackgroundColor="LightGray">
       <FlyoutBase.ContextFlyout>
         <MenuFlyout x:Name="ContextMenu">
           <MenuFlyoutItem IconImageSource="dotnet_bot.png" Text="Copy" />
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue25893.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue25893.cs
new file mode 100644
index 000000000000..9d1cb56d2b03
--- /dev/null
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue25893.cs
@@ -0,0 +1,23 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace Microsoft.Maui.TestCases.Tests.Issues;
+
+public class Issue25893 : _IssuesUITest
+{
+	public override string Issue => "Setting MenuFlyoutSubItem IconImageSource throws a NullReferenceException";
+
+	public Issue25893(TestDevice testDevice) : base(testDevice)
+	{
+	}
+
+	[Test]
+	[Category(UITestCategories.ContextActions)]
+	public void MenuFlyoutSubItemWithIconNoCrash()
+	{
+		App.WaitForElement("WaitForStubControl");
+
+		// Without crashing, the test has passed.
+	}
+}
\ No newline at end of file

From ee4c5117e1ccf0b915a3a94038590bfe79966ccc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Su=C3=A1rez?= <javiersuarezruiz@hotmail.com>
Date: Thu, 21 Nov 2024 20:38:21 +0100
Subject: [PATCH 05/10] Added XAML test

---
 .../Xaml.UnitTests/Issues/Issue25893.xaml     | 16 ++++++++
 .../Xaml.UnitTests/Issues/Issue25893.xaml.cs  | 37 +++++++++++++++++++
 2 files changed, 53 insertions(+)
 create mode 100644 src/Controls/tests/Xaml.UnitTests/Issues/Issue25893.xaml
 create mode 100644 src/Controls/tests/Xaml.UnitTests/Issues/Issue25893.xaml.cs

diff --git a/src/Controls/tests/Xaml.UnitTests/Issues/Issue25893.xaml b/src/Controls/tests/Xaml.UnitTests/Issues/Issue25893.xaml
new file mode 100644
index 000000000000..8d662d506676
--- /dev/null
+++ b/src/Controls/tests/Xaml.UnitTests/Issues/Issue25893.xaml
@@ -0,0 +1,16 @@
+<?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"
+			 x:Class="Microsoft.Maui.Controls.Xaml.UnitTests.Issue25893">
+  <Grid RowDefinitions="Auto,*,Auto">
+    <Label AutomationId="WaitForStubControl" Text="Issue25893"/>
+    <ContentView x:Name="ViewWithMenu" Grid.Row="1" Grid.RowSpan="2" BackgroundColor="LightGray">
+      <FlyoutBase.ContextFlyout>
+        <MenuFlyout x:Name="ContextMenu">
+          <MenuFlyoutItem IconImageSource="dotnet_bot.png" Text="Item1" />
+          <MenuFlyoutSubItem IconImageSource="dotnet_bot.png" Text="SubItem1" />
+        </MenuFlyout>
+      </FlyoutBase.ContextFlyout>
+    </ContentView>
+  </Grid>
+</ContentPage>
\ No newline at end of file
diff --git a/src/Controls/tests/Xaml.UnitTests/Issues/Issue25893.xaml.cs b/src/Controls/tests/Xaml.UnitTests/Issues/Issue25893.xaml.cs
new file mode 100644
index 000000000000..503988f1d19c
--- /dev/null
+++ b/src/Controls/tests/Xaml.UnitTests/Issues/Issue25893.xaml.cs
@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui.Controls.Core.UnitTests;
+using NUnit.Framework;
+
+namespace Microsoft.Maui.Controls.Xaml.UnitTests
+{
+	public partial class Issue25893 : ContentPage
+	{
+		public Issue25893()
+		{
+			InitializeComponent();
+		}
+
+		public Issue25893(bool useCompiledXaml)
+		{
+			//this stub will be replaced at compile time
+		}
+
+		[TestFixture]
+		public class Tests
+		{
+			[TestCase(false)]
+			[TestCase(true)]
+			public void MenuFlyoutSubItemWithIcon(bool useCompiledXaml)
+			{
+				var page = new Issue25893(useCompiledXaml);
+				var view = page.FindByName<ContentView>("ViewWithMenu");
+				var contextFlyout = FlyoutBase.GetContextFlyout(view);
+	
+				Assert.AreEqual(contextFlyout.LogicalChildrenInternal.Count, 2);
+			}
+		}
+	}
+}
\ No newline at end of file

From 4ed16a16fe314dd67328000a10ba550cdd77cdf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Su=C3=A1rez?= <javiersuarezruiz@hotmail.com>
Date: Thu, 21 Nov 2024 21:35:25 +0100
Subject: [PATCH 06/10] Updated UItest

---
 .../TestCases.HostApp/Issues/Issue25893.xaml  | 14 +++++--
 .../Issues/Issue25893.xaml.cs                 | 42 +++++++++++++++++--
 .../Tests/Issues/Issue25893.cs                | 19 +++++++++
 3 files changed, 68 insertions(+), 7 deletions(-)

diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue25893.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue25893.xaml
index fb3860f05def..497ea19c4cf5 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue25893.xaml
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue25893.xaml
@@ -4,14 +4,20 @@
                           xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
                           x:Class="Maui.Controls.Sample.Issues.Issue25893">
   <Grid RowDefinitions="Auto,*,Auto">
-    <Label AutomationId="WaitForStubControl" Text="Issue25893"/>
-    <ContentView Grid.Row="1" Grid.RowSpan="2" BackgroundColor="LightGray">
+    <Label AutomationId="WaitForStubControl" x:Name="InfoLabel" />
+    <ContentView x:Name="ViewWithMenu" Grid.Row="1" BackgroundColor="LightGray">
       <FlyoutBase.ContextFlyout>
         <MenuFlyout x:Name="ContextMenu">
-          <MenuFlyoutItem IconImageSource="dotnet_bot.png" Text="Copy" />
-          <MenuFlyoutSubItem IconImageSource="dotnet_bot.png" Text="Zoom" />
+          <MenuFlyoutItem IconImageSource="dotnet_bot.png" Text="Item1" />
+          <MenuFlyoutSubItem IconImageSource="dotnet_bot.png" Text="SubItem1" />
+          <MenuFlyoutSubItem IconImageSource="dotnet_bot.png" Text="SubItem2" />
+          <MenuFlyoutSubItem IconImageSource="dotnet_bot.png" Text="SubItem3" />
         </MenuFlyout>
       </FlyoutBase.ContextFlyout>
     </ContentView>
+    <HorizontalStackLayout Grid.Row="2">
+      <Button AutomationId="AddMenuItem" Text="Add MenuItem" Clicked="AddButtonClicked" />
+      <Button AutomationId="RemoveMenuItem" Text="Remove MenuItem" Clicked="RemoveButtonClicked" />
+    </HorizontalStackLayout>
   </Grid>
 </controls:TestContentPage>
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue25893.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue25893.xaml.cs
index 9ff3cb8d59c0..18ea623b9318 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue25893.xaml.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue25893.xaml.cs
@@ -4,14 +4,50 @@
 	[Issue(IssueTracker.Github, 25893, "Setting MenuFlyoutSubItem IconImageSource throws a NullReferenceException", PlatformAffected.UWP)]
 	public partial class Issue25893 : TestContentPage
 	{
+		MenuFlyout _contextMenu;
+
 		public Issue25893()
 		{
-			InitializeComponent();	
+			InitializeComponent();
+
+			_contextMenu = FlyoutBase.GetContextFlyout(ViewWithMenu) as MenuFlyout;
+
+			if (_contextMenu is null)
+				return;
+
+			var itemsCount = _contextMenu.Count;
+			InfoLabel.Text = $"{itemsCount}";
 		}
 
 		protected override void Init()
 		{
-		
+
+		}
+
+		void AddButtonClicked(object sender, EventArgs e)
+		{
+			if (_contextMenu is null)
+				return;
+
+			var itemsCount = _contextMenu.Count;
+			InfoLabel.Text = $"{itemsCount}";
+
+			var itemNumber = itemsCount > 0 ? itemsCount : 1;
+			_contextMenu.Add(new MenuFlyoutSubItem { IconImageSource = "dotnet_bot.png", Text = $"Added Item {itemNumber}" });
+		}
+
+		void RemoveButtonClicked(object sender, EventArgs e)
+		{
+			if (_contextMenu is null)
+				return;
+
+			var itemsCount = _contextMenu.Count;
+			InfoLabel.Text = $"{itemsCount}";
+
+			if (itemsCount > 0)
+			{
+				_contextMenu.RemoveAt(itemsCount - 1);
+			}	
 		}
-	}
+    }
 }
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue25893.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue25893.cs
index 9d1cb56d2b03..74b8208e5110 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue25893.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue25893.cs
@@ -1,4 +1,5 @@
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using UITest.Appium;
 using UITest.Core;
 
@@ -18,6 +19,24 @@ public void MenuFlyoutSubItemWithIconNoCrash()
 	{
 		App.WaitForElement("WaitForStubControl");
 
+		var result1 = App.FindElement("WaitForStubControl").GetText();
+		ClassicAssert.AreEqual("3", result1);
+
+		App.Tap("AddMenuItem");
+		
+		var result2 = App.FindElement("WaitForStubControl").GetText();
+		ClassicAssert.AreEqual("4", result2);
+
+		App.Tap("RemoveMenuItem");
+		App.Tap("RemoveMenuItem");
+		
+		var result3 = App.FindElement("WaitForStubControl").GetText();
+		ClassicAssert.AreEqual("2", result3);
+
+		App.RightClick("WaitForStubControl");
+
+		VerifyScreenshot();
+
 		// Without crashing, the test has passed.
 	}
 }
\ No newline at end of file

From 69ce1a5e6213e60ce296bdc3af6664826ebf4f0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Su=C3=A1rez?= <javiersuarezruiz@hotmail.com>
Date: Thu, 21 Nov 2024 23:52:08 +0100
Subject: [PATCH 07/10] Updated test

---
 .../TestCases.HostApp/Issues/Issue25893.xaml  |  2 +-
 .../Issues/Issue25893.xaml.cs                 | 28 +++++++++----------
 .../Tests/Issues/Issue25893.cs                | 16 +++++------
 3 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue25893.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue25893.xaml
index 497ea19c4cf5..911a6385548e 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue25893.xaml
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue25893.xaml
@@ -5,7 +5,7 @@
                           x:Class="Maui.Controls.Sample.Issues.Issue25893">
   <Grid RowDefinitions="Auto,*,Auto">
     <Label AutomationId="WaitForStubControl" x:Name="InfoLabel" />
-    <ContentView x:Name="ViewWithMenu" Grid.Row="1" BackgroundColor="LightGray">
+    <ContentView x:Name="ViewWithMenu" AutomationId="ViewWithMenu" Grid.Row="1" BackgroundColor="LightGray">
       <FlyoutBase.ContextFlyout>
         <MenuFlyout x:Name="ContextMenu">
           <MenuFlyoutItem IconImageSource="dotnet_bot.png" Text="Item1" />
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue25893.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue25893.xaml.cs
index 18ea623b9318..c4617cb866a6 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue25893.xaml.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue25893.xaml.cs
@@ -4,19 +4,18 @@
 	[Issue(IssueTracker.Github, 25893, "Setting MenuFlyoutSubItem IconImageSource throws a NullReferenceException", PlatformAffected.UWP)]
 	public partial class Issue25893 : TestContentPage
 	{
-		MenuFlyout _contextMenu;
+		readonly MenuFlyout _contextMenu;
 
 		public Issue25893()
 		{
 			InitializeComponent();
 
-			_contextMenu = FlyoutBase.GetContextFlyout(ViewWithMenu) as MenuFlyout;
+			_contextMenu = (MenuFlyout)FlyoutBase.GetContextFlyout(ViewWithMenu);
 
 			if (_contextMenu is null)
 				return;
 
-			var itemsCount = _contextMenu.Count;
-			InfoLabel.Text = $"{itemsCount}";
+			InfoLabel.Text = $"{_contextMenu.Count}";
 		}
 
 		protected override void Init()
@@ -26,28 +25,27 @@ protected override void Init()
 
 		void AddButtonClicked(object sender, EventArgs e)
 		{
-			if (_contextMenu is null)
-				return;
-
 			var itemsCount = _contextMenu.Count;
-			InfoLabel.Text = $"{itemsCount}";
-
 			var itemNumber = itemsCount > 0 ? itemsCount : 1;
 			_contextMenu.Add(new MenuFlyoutSubItem { IconImageSource = "dotnet_bot.png", Text = $"Added Item {itemNumber}" });
+
+			UpdateInfoLabel();
 		}
 
 		void RemoveButtonClicked(object sender, EventArgs e)
 		{
-			if (_contextMenu is null)
-				return;
-
 			var itemsCount = _contextMenu.Count;
-			InfoLabel.Text = $"{itemsCount}";
 
 			if (itemsCount > 0)
-			{
 				_contextMenu.RemoveAt(itemsCount - 1);
-			}	
+			
+			UpdateInfoLabel();
+		}
+
+		void UpdateInfoLabel()
+		{
+			var itemsCount = _contextMenu.Count;
+			InfoLabel.Text = $"{itemsCount}";
 		}
     }
 }
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue25893.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue25893.cs
index 74b8208e5110..ffde8c58b7b8 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue25893.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue25893.cs
@@ -1,4 +1,5 @@
-using NUnit.Framework;
+#if WINDOWS
+using NUnit.Framework;
 using NUnit.Framework.Legacy;
 using UITest.Appium;
 using UITest.Core;
@@ -20,23 +21,20 @@ public void MenuFlyoutSubItemWithIconNoCrash()
 		App.WaitForElement("WaitForStubControl");
 
 		var result1 = App.FindElement("WaitForStubControl").GetText();
-		ClassicAssert.AreEqual("3", result1);
+		ClassicAssert.AreEqual("4", result1);
 
 		App.Tap("AddMenuItem");
 		
 		var result2 = App.FindElement("WaitForStubControl").GetText();
-		ClassicAssert.AreEqual("4", result2);
+		ClassicAssert.AreEqual("5", result2);
 
 		App.Tap("RemoveMenuItem");
 		App.Tap("RemoveMenuItem");
 		
 		var result3 = App.FindElement("WaitForStubControl").GetText();
-		ClassicAssert.AreEqual("2", result3);
-
-		App.RightClick("WaitForStubControl");
-
-		VerifyScreenshot();
+		ClassicAssert.AreEqual("3", result3);
 
 		// Without crashing, the test has passed.
 	}
-}
\ No newline at end of file
+}
+#endif
\ No newline at end of file

From 53e76a509f63c8606c76cf498b69e0a178791bdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Su=C3=A1rez?= <javiersuarezruiz@hotmail.com>
Date: Sun, 24 Nov 2024 20:31:00 +0100
Subject: [PATCH 08/10] Fixed broken tests

---
 .../src/Core/Menu/MenuFlyoutSubItem.cs        | 34 +++++++------------
 .../MenuFlyoutSubItemHandler.Windows.cs       | 24 +++++++------
 2 files changed, 26 insertions(+), 32 deletions(-)

diff --git a/src/Controls/src/Core/Menu/MenuFlyoutSubItem.cs b/src/Controls/src/Core/Menu/MenuFlyoutSubItem.cs
index d92d506a3010..56f3b6887f97 100644
--- a/src/Controls/src/Core/Menu/MenuFlyoutSubItem.cs
+++ b/src/Controls/src/Core/Menu/MenuFlyoutSubItem.cs
@@ -1,34 +1,24 @@
 #nullable disable
-using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.ComponentModel;
-using System.Windows.Input;
-using Microsoft.Maui.Controls.StyleSheets;
-using Microsoft.Maui.Graphics;
+using System.Linq;
 
 namespace Microsoft.Maui.Controls
 {
 	public partial class MenuFlyoutSubItem : MenuFlyoutItem, IMenuFlyoutSubItem
 	{
-		readonly List<IMenuElement> _menus = new List<IMenuElement>();
+		readonly List<IElement> _menus = new List<IElement>();
 
-		public MenuFlyoutSubItem()
-		{
-			LogicalChildrenInternalBackingStore = new List<Element>();
-
-			foreach(var item in _menus)
-			{
-				LogicalChildrenInternalBackingStore.Add((Element)item);
-			}
-		}
+        public MenuFlyoutSubItem()
+        {
+            LogicalChildrenInternalBackingStore = new CastingList<Element, IElement>(_menus);
+        }
 
 		private protected override IList<Element> LogicalChildrenInternalBackingStore { get; }
 
 		public IMenuElement this[int index]
 		{
-			get { return _menus[index]; }
+			get { return _menus[index] as IMenuElement; }
 			set
 			{
 				RemoveAt(index);
@@ -63,10 +53,10 @@ public void CopyTo(IMenuElement[] array, int arrayIndex)
 			_menus.CopyTo(array, arrayIndex);
 		}
 
-		public IEnumerator<IMenuElement> GetEnumerator()
-		{
-			return _menus.GetEnumerator();
-		}
+        public IEnumerator<IMenuElement> GetEnumerator()
+        {
+            return _menus.Cast<IMenuElement>().GetEnumerator();
+        }
 
 		public int IndexOf(IMenuElement item)
 		{
@@ -92,7 +82,7 @@ public void RemoveAt(int index)
 		{
 			var item = _menus[index];
 			RemoveLogicalChild((Element)item, index);
-			NotifyHandler(nameof(IMenuFlyoutHandler.Remove), index, item);
+			NotifyHandler(nameof(IMenuFlyoutHandler.Remove), index, item as IMenuElement);
 		}
 
 		IEnumerator IEnumerable.GetEnumerator()
diff --git a/src/Core/src/Handlers/MenuFlyoutSubItem/MenuFlyoutSubItemHandler.Windows.cs b/src/Core/src/Handlers/MenuFlyoutSubItem/MenuFlyoutSubItemHandler.Windows.cs
index 1b234a850395..dd9dea4d4403 100644
--- a/src/Core/src/Handlers/MenuFlyoutSubItem/MenuFlyoutSubItemHandler.Windows.cs
+++ b/src/Core/src/Handlers/MenuFlyoutSubItem/MenuFlyoutSubItemHandler.Windows.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Text;
 using Microsoft.Maui.Platform;
 using Microsoft.UI.Xaml.Controls;
@@ -62,16 +63,19 @@ public static void MapSource(IMenuFlyoutSubItemHandler handler, IMenuFlyoutSubIt
 				view.Source?.ToIconSource(handler.MauiContext!)?.CreateIconElement();
 		}
 
-		public override void SetVirtualView(IElement view)
-		{
-			base.SetVirtualView(view);
-			PlatformView.Items.Clear();
-
-			foreach (var item in ((IMenuFlyoutSubItem)view))
-			{
-				PlatformView.Items.Add((MenuFlyoutItemBase)item.ToPlatform(MauiContext!));
-			}
-		}
+        public override void SetVirtualView(IElement view)
+        {
+            base.SetVirtualView(view);
+            PlatformView.Items.Clear();
+
+            if (view is IMenuFlyoutSubItem menuFlyoutSubItem)
+            {
+                foreach (var item in menuFlyoutSubItem.OfType<IMenuElement>())
+                {
+                    PlatformView.Items.Add((MenuFlyoutItemBase)item.ToPlatform(MauiContext!));
+                }
+            }
+        }
 
 		// workaround WinUI bug https://github.com/microsoft/microsoft-ui-xaml/issues/7797
 		void Reset()

From 5d01f2a44d3dcbc07f1bbcbee5b37d1d8b782e41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Su=C3=A1rez?= <javiersuarezruiz@hotmail.com>
Date: Sun, 24 Nov 2024 20:31:26 +0100
Subject: [PATCH 09/10] Fix formatting

---
 src/Controls/src/Core/Menu/MenuFlyoutSubItem.cs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Controls/src/Core/Menu/MenuFlyoutSubItem.cs b/src/Controls/src/Core/Menu/MenuFlyoutSubItem.cs
index 56f3b6887f97..8c0686fb2a4d 100644
--- a/src/Controls/src/Core/Menu/MenuFlyoutSubItem.cs
+++ b/src/Controls/src/Core/Menu/MenuFlyoutSubItem.cs
@@ -9,10 +9,10 @@ public partial class MenuFlyoutSubItem : MenuFlyoutItem, IMenuFlyoutSubItem
 	{
 		readonly List<IElement> _menus = new List<IElement>();
 
-        public MenuFlyoutSubItem()
-        {
-            LogicalChildrenInternalBackingStore = new CastingList<Element, IElement>(_menus);
-        }
+		public MenuFlyoutSubItem()
+		{
+			LogicalChildrenInternalBackingStore = new CastingList<Element, IElement>(_menus);
+		}
 
 		private protected override IList<Element> LogicalChildrenInternalBackingStore { get; }
 
@@ -53,10 +53,10 @@ public void CopyTo(IMenuElement[] array, int arrayIndex)
 			_menus.CopyTo(array, arrayIndex);
 		}
 
-        public IEnumerator<IMenuElement> GetEnumerator()
-        {
-            return _menus.Cast<IMenuElement>().GetEnumerator();
-        }
+		public IEnumerator<IMenuElement> GetEnumerator()
+		{
+			return _menus.Cast<IMenuElement>().GetEnumerator();
+		}
 
 		public int IndexOf(IMenuElement item)
 		{

From 9a252bf7010fcd7134f8a5beaa23485951ab5635 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Sua=CC=81rez?= <javiersuarezruiz@hotmail.com>
Date: Mon, 25 Nov 2024 15:29:16 +0100
Subject: [PATCH 10/10] Enable added UITest on Catalyst

---
 .../TestCases.Shared.Tests/Tests/Issues/Issue25893.cs     | 2 +-
 .../MenuFlyoutSubItem/MenuFlyoutSubItemHandler.iOS.cs     | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue25893.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue25893.cs
index ffde8c58b7b8..a35a00a3b6a2 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue25893.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue25893.cs
@@ -1,4 +1,4 @@
-#if WINDOWS
+#if MACCATALYST || WINDOWS
 using NUnit.Framework;
 using NUnit.Framework.Legacy;
 using UITest.Appium;
diff --git a/src/Core/src/Handlers/MenuFlyoutSubItem/MenuFlyoutSubItemHandler.iOS.cs b/src/Core/src/Handlers/MenuFlyoutSubItem/MenuFlyoutSubItemHandler.iOS.cs
index 7b1d1bb135d9..a23cd75ba094 100644
--- a/src/Core/src/Handlers/MenuFlyoutSubItem/MenuFlyoutSubItemHandler.iOS.cs
+++ b/src/Core/src/Handlers/MenuFlyoutSubItem/MenuFlyoutSubItemHandler.iOS.cs
@@ -1,4 +1,6 @@
-using UIKit;
+using System.Collections.Generic;
+using System.Linq;
+using UIKit;
 
 namespace Microsoft.Maui.Handlers
 {
@@ -15,8 +17,10 @@ protected override UIMenu CreatePlatformElement()
 				uIMenuBuilder = builder;
 			}
 
+			var menuItems = ((IMenuFlyoutSubItem)VirtualView).OfType<IMenuElement>().ToList();
+			
 			var menu =
-				VirtualView.ToPlatformMenu(
+				menuItems.ToPlatformMenu(
 					VirtualView.Text,
 					VirtualView.Source,
 					MauiContext!,