From 4a499cd6d137c4bf2c9dde460ec61bd0617fa713 Mon Sep 17 00:00:00 2001 From: Dhivya-SF4094 <127717131+Dhivya-SF4094@users.noreply.github.com> Date: Tue, 19 May 2026 19:42:39 +0530 Subject: [PATCH 1/2] Fix for Issue33356NavigateShouldOccur failure --- .../Compatibility/Handlers/Shell/iOS/ShellSectionRenderer.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellSectionRenderer.cs b/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellSectionRenderer.cs index cdb9f460041c..7af5397098d6 100644 --- a/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellSectionRenderer.cs +++ b/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellSectionRenderer.cs @@ -175,6 +175,7 @@ internal bool SendPop(UIViewController topViewController = null) if (!enabled) { + _sendPopPending = false; // reset before returning return false; } @@ -194,6 +195,7 @@ internal bool SendPop(UIViewController topViewController = null) // hardware/system back button. if (_context.Shell?.SendBackButtonPressed() == true) { + _sendPopPending = false; // reset before returning return false; } From 028a1975baf4fb096b699ada9948b77e8b6bc63a Mon Sep 17 00:00:00 2001 From: Dhivya-SF4094 <127717131+Dhivya-SF4094@users.noreply.github.com> Date: Tue, 19 May 2026 20:06:32 +0530 Subject: [PATCH 2/2] Updated ShellNavigationFeatureTests --- .../Tests/FeatureMatrix/ShellNavigationFeatureTests.cs | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ShellNavigationFeatureTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ShellNavigationFeatureTests.cs index 01f9bb79a603..cafd579ba112 100644 --- a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ShellNavigationFeatureTests.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ShellNavigationFeatureTests.cs @@ -883,10 +883,6 @@ public void BackButtonBehavior_CommandParameter_CommandFiresWithCorrectParameter [Test, Order(50)] public void BackButtonBehavior_IsEnabled_False_BackButtonDoesNotNavigate() { - if (iOS26OrHigher) - { - Assert.Ignore("Fails on iOS 26 due to bug issue: https://github.com/dotnet/maui/issues/34771"); - } App.WaitForElement("MainPageIdentityLabel"); App.WaitForElement("IsEnabledButton"); App.Tap("IsEnabledButton"); @@ -909,10 +905,6 @@ public void BackButtonBehavior_IsEnabled_False_BackButtonDoesNotNavigate() [Test, Order(51)] public void BackButtonBehavior_IsVisible_False_ProgrammaticNavStillWorks() { - if (iOS26OrHigher) - { - Assert.Ignore("Fails on iOS 26 due to bug issue: https://github.com/dotnet/maui/issues/34771"); - } App.WaitForElement("MainPageIdentityLabel"); App.WaitForElement("IsVisibleButton"); App.Tap("IsVisibleButton");