From 9438944a0f4158c43b2d2fcd5c24d0914a9cc117 Mon Sep 17 00:00:00 2001
From: Vignesh-SF3580 <vignesh.nagarajan@syncfusion.com>
Date: Fri, 17 Jan 2025 11:51:23 +0530
Subject: [PATCH 1/2] [Windows]Fixed Shell Navigating event issue when
 switching tabs

---
 .../Shell/ShellItemHandler.Windows.cs         | 16 ++++++++-
 .../TestCases.HostApp/Issues/Issue25599.xaml  | 36 +++++++++++++++++++
 .../Issues/Issue25599.xaml.cs                 | 35 ++++++++++++++++++
 .../Tests/Issues/Issue25599.cs                | 27 ++++++++++++++
 4 files changed, 113 insertions(+), 1 deletion(-)
 create mode 100644 src/Controls/tests/TestCases.HostApp/Issues/Issue25599.xaml
 create mode 100644 src/Controls/tests/TestCases.HostApp/Issues/Issue25599.xaml.cs
 create mode 100644 src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue25599.cs

diff --git a/src/Controls/src/Core/Handlers/Shell/ShellItemHandler.Windows.cs b/src/Controls/src/Core/Handlers/Shell/ShellItemHandler.Windows.cs
index 8d27b8904862..31af2550227a 100644
--- a/src/Controls/src/Core/Handlers/Shell/ShellItemHandler.Windows.cs
+++ b/src/Controls/src/Core/Handlers/Shell/ShellItemHandler.Windows.cs
@@ -141,8 +141,22 @@ private void OnNavigationTabChanged(NavigationView sender, NavigationViewSelecti
 
 			var selectedItem = (NavigationViewItemViewModel)args.SelectedItem;
 
-			if (selectedItem.Data is ShellSection shellSection)
+			if (selectedItem.Data is ShellSection shellSection && VirtualView.Parent is Shell shell)
 			{
+				NavigationViewItemViewModel? currentItem = null;
+				foreach (var item in _mainLevelTabs)
+				{
+					if (shell.CurrentItem?.CurrentItem is not null && item.Data == shell.CurrentItem.CurrentItem)
+					{
+						currentItem = item;
+						break;
+					}
+				}
+				if (PlatformView is NavigationView navView && navView?.SelectedItem is not null && navView.SelectedItem != currentItem)
+				{
+					((IShellItemController)shell.CurrentItem!).ProposeSection(shellSection);
+				}
+
 				((Shell)VirtualView.Parent).CurrentItem = shellSection;
 			}
 			else if (selectedItem.Data is ShellContent shellContent)
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue25599.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue25599.xaml
new file mode 100644
index 000000000000..97250e40d3ed
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue25599.xaml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Shell xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+       xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+       x:Class="Maui.Controls.Sample.Issues.Issue25599"
+       xmlns:local="clr-namespace:Maui.Controls.Sample.Issues">
+    <TabBar>
+        <Tab Title="Home" x:Name="FirstTab" AutomationId="Tab1">
+            <ShellContent
+            Title="Home" >
+            <ShellContent.ContentTemplate>
+                <DataTemplate>
+                    <ContentPage x:Name="firstPage">
+                        <StackLayout>
+                            <Button Text="Click" Clicked="Button_Clicked" AutomationId="HomePageButton"/>
+                            <Label Text="Home Page" AutomationId="HomePageLabel"/>
+                        </StackLayout>
+                    </ContentPage>
+                </DataTemplate>
+            </ShellContent.ContentTemplate>
+            </ShellContent>
+        </Tab>
+        <Tab Title="Settings" x:Name="SecondTab">
+            <ShellContent>
+            <ShellContent.ContentTemplate>
+                <DataTemplate>
+                    <ContentPage x:Name="secondPage">
+                        <StackLayout>
+                            <Label x:Name="settingsPageLabel" Text="SettingsPage" />
+                        </StackLayout>
+                    </ContentPage>
+                </DataTemplate>
+            </ShellContent.ContentTemplate>
+            </ShellContent>
+        </Tab>
+    </TabBar>
+</Shell>
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue25599.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue25599.xaml.cs
new file mode 100644
index 000000000000..c50b17fbb940
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue25599.xaml.cs
@@ -0,0 +1,35 @@
+namespace Maui.Controls.Sample.Issues;
+
+[Issue(IssueTracker.Github, 25599, "OnNavigating wrong target when tapping the same tab", PlatformAffected.iOS)]
+public partial class Issue25599 : Shell
+{
+	public Issue25599()
+	{
+		InitializeComponent();
+	}
+
+	private async void Button_Clicked(object sender, EventArgs e)
+	{
+		await Navigation.PushAsync(new DetailsPage());
+	}
+
+	public class DetailsPage : ContentPage
+	{
+		public DetailsPage()
+		{
+			Title = "DetailsPage";
+
+			Content = new StackLayout
+			{
+				Children =
+				{
+					new Label
+					{
+						Text = "Details Page",
+						AutomationId = "DetailsPageLabel"
+					}
+				}
+			};
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue25599.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue25599.cs
new file mode 100644
index 000000000000..7cd9b8b7b2ad
--- /dev/null
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue25599.cs
@@ -0,0 +1,27 @@
+#if TEST_FAILS_ON_CATALYST || TEST_FAILS_ON_IOS // To fix the issue in ios https://github.com/dotnet/maui/pull/25749#pullrequestreview-2554186362
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace Microsoft.Maui.TestCases.Tests.Issues
+{
+	public class Issue25599 : _IssuesUITest
+	{
+		public Issue25599(TestDevice testDevice) : base(testDevice){ }
+
+		public override string Issue => "OnNavigating wrong target when tapping the same tab";
+
+		[Test]
+		[Category(UITestCategories.Navigation)]
+		public void NavigatingEventFired()
+		{
+			App.WaitForElement("HomePageButton");
+			App.Tap("HomePageButton");
+			App.WaitForElement("DetailsPageLabel");
+			App.Tap("Home"); // Tapping already selected tab using Title
+			App.WaitForElement("DetailsPageLabel");
+			App.WaitForNoElement("HomePageLabel"); // Navigation does not occur when clicking on an already selected tab
+		}
+	}
+}
+#endif
\ No newline at end of file

From ea2e895f2b51305ed7f3f7f125c240536ee9c297 Mon Sep 17 00:00:00 2001
From: Vignesh-SF3580 <vignesh.nagarajan@syncfusion.com>
Date: Thu, 23 Jan 2025 16:34:17 +0530
Subject: [PATCH 2/2] updated Issue25599.cs

---
 .../tests/TestCases.Shared.Tests/Tests/Issues/Issue25599.cs     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue25599.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue25599.cs
index 7cd9b8b7b2ad..45b5672951d2 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue25599.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue25599.cs
@@ -1,4 +1,4 @@
-#if TEST_FAILS_ON_CATALYST || TEST_FAILS_ON_IOS // To fix the issue in ios https://github.com/dotnet/maui/pull/25749#pullrequestreview-2554186362
+#if TEST_FAILS_ON_CATALYST && TEST_FAILS_ON_IOS // To fix the issue in ios https://github.com/dotnet/maui/pull/25749#pullrequestreview-2554186362
 using NUnit.Framework;
 using UITest.Appium;
 using UITest.Core;