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 c3ff1761bb49..e553b2e8ae87 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; } @@ -191,6 +192,7 @@ internal bool SendPop(UIViewController topViewController = null) // Allow the page to intercept back navigation via OnBackButtonPressed if (tracker.Value.Page?.SendBackButtonPressed() == true) { + _sendPopPending = false; // reset before returning return false; } 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"); diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/BackButtonBehavior_IsVisible_False_ProgrammaticNavStillWorks.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/BackButtonBehavior_IsVisible_False_ProgrammaticNavStillWorks.png index 93b7bcfa80be..96d3a90fb136 100644 Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/BackButtonBehavior_IsVisible_False_ProgrammaticNavStillWorks.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/BackButtonBehavior_IsVisible_False_ProgrammaticNavStillWorks.png differ