From c71a758e4635ea7be1b2dd2e7d33f78386fc60e5 Mon Sep 17 00:00:00 2001
From: Vignesh-SF3580 <vignesh.nagarajan@syncfusion.com>
Date: Fri, 8 Nov 2024 19:23:38 +0530
Subject: [PATCH 1/3] Fixed - 25599 : OnNavigating wrong target when tapping
 the same tab

---
 .../Handlers/Shell/iOS/ShellItemRenderer.cs      |  4 ++--
 .../Handlers/Shell/ShellItemHandler.Windows.cs   | 16 +++++++++++++++-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellItemRenderer.cs b/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellItemRenderer.cs
index ff509574fd5f..e780d2c79810 100644
--- a/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellItemRenderer.cs
+++ b/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellItemRenderer.cs
@@ -113,9 +113,9 @@ public override void ViewDidLoad()
 
 			ShouldSelectViewController = (tabController, viewController) =>
 			{
-				bool accept = true;
+				bool accept = false;
 				var r = RendererForViewController(viewController);
-				if (r != null)
+				if (r is not null && r != SelectedViewController)
 					accept = ((IShellItemController)ShellItem).ProposeSection(r.ShellSection, false);
 
 				return accept;
diff --git a/src/Controls/src/Core/Handlers/Shell/ShellItemHandler.Windows.cs b/src/Controls/src/Core/Handlers/Shell/ShellItemHandler.Windows.cs
index b60e49ca4126..a1a88e22a1f3 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)

From 65d2b82ee3646822164e97eb0d047891af6b6d2b Mon Sep 17 00:00:00 2001
From: Vignesh-SF3580 <vignesh.nagarajan@syncfusion.com>
Date: Thu, 14 Nov 2024 19:09:01 +0530
Subject: [PATCH 2/3] Added testcasees.

---
 .../TestCases.HostApp/Issues/Issue25599.xaml  | 37 +++++++++++++++++++
 .../Issues/Issue25599.xaml.cs                 | 35 ++++++++++++++++++
 .../Tests/Issues/Issue25599.cs                | 27 ++++++++++++++
 3 files changed, 99 insertions(+)
 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/tests/TestCases.HostApp/Issues/Issue25599.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue25599.xaml
new file mode 100644
index 000000000000..4ceb61cdee8a
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue25599.xaml
@@ -0,0 +1,37 @@
+<?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 Shell.TabBarForegroundColor="Green"
+        Shell.TabBarUnselectedColor="Red">
+        <Tab Title="Home" x:Name="FirstTab">
+            <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..e7f6500f686c
--- /dev/null
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue25599.cs
@@ -0,0 +1,27 @@
+#if ANDROID // Facing a full exception when clicking on the already selected tab(App.Tap()) in Windows, iOS, and macOS, so excluded those platforms.
+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");
+			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 f21d409be14b1786f81bb2f291ea6a59ce102db8 Mon Sep 17 00:00:00 2001
From: Vignesh-SF3580 <vignesh.nagarajan@syncfusion.com>
Date: Fri, 15 Nov 2024 16:01:19 +0530
Subject: [PATCH 3/3] updated testcases.

---
 src/Controls/tests/TestCases.HostApp/Issues/Issue25599.xaml   | 3 +--
 .../tests/TestCases.Shared.Tests/Tests/Issues/Issue25599.cs   | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue25599.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue25599.xaml
index 4ceb61cdee8a..edcde0b5d952 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue25599.xaml
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue25599.xaml
@@ -3,8 +3,7 @@
        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 Shell.TabBarForegroundColor="Green"
-        Shell.TabBarUnselectedColor="Red">
+    <TabBar>
         <Tab Title="Home" x:Name="FirstTab">
             <ShellContent
             Title="Home" >
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 e7f6500f686c..b8baeb071785 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue25599.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue25599.cs
@@ -18,9 +18,9 @@ public void NavigatingEventFired()
 			App.WaitForElement("HomePageButton");
 			App.Tap("HomePageButton");
 			App.WaitForElement("DetailsPageLabel");
-			App.Tap("Home");
+			App.Tap("Home"); // Tapping already selected Home tab
 			App.WaitForElement("DetailsPageLabel");
-			App.WaitForNoElement("HomePageLabel"); //Navigation does not occur when clicking on an already selected tab
+			App.WaitForNoElement("HomePageLabel"); // Navigation does not occur when clicking on an already selected tab
 		}
 	}
 }