[release/10.0.1xx-sr7] [iOS, Mac] Fix OnBackButtonPressed not invoked for NavigationPage and Shell by kubaflo · Pull Request #35434 · dotnet/maui

kubaflo · 2026-05-13T18:27:03Z

Note

Are you waiting for the changes in this PR to be merged?
It would be very helpful if you could test the resulting artifacts from this PR and let us know in a comment if this change resolves your issue. Thank you!

Manual backport of #35072 to release/10.0.1xx-sr7.

Why this is a manual backport

The automated /backport workflow (failed run) hit a modify/delete conflict on src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue9095.cs. The file is added by #35150 (already backported as #35430, currently OPEN) and modified by #35072. Because #35430 is not yet merged into release/10.0.1xx-sr7, the file does not exist on the target branch and the patch could not apply cleanly.

Resolution

Cherry-picked the squashed merge commit 7023635baac2524ab02f602e56fd7608142984a1 of #35072 onto release/10.0.1xx-sr7. Resolved the conflict by keeping the post-merge version of Issue9095.cs (verified byte-identical to inflight/current, which contains both #35150's added content and #35072's tweaks).

⚠️ Dependency on #35430

This PR's diff currently shows Issue9095.cs as a new file because it includes content originally introduced by #35150. Recommended merge order:

Merge [release/10.0.1xx-sr7] [Android] Fix OnBackButtonPressed not invoked for Shell #35430 (Android backport of [Android] Fix OnBackButtonPressed not invoked for Shell #35150) first.
This PR will then auto-rebase to show only [iOS, Mac] Fix OnBackButtonPressed not invoked for NavigationPage and Shell #35072's incremental delta (a 2-line change to Issue9095.cs and the ShellSectionRenderer.cs / NavigationRenderer.cs / Issue8296.cs changes).

Alternatively, this PR can be merged first, but #35430 will then need a manual conflict resolution (the file would already exist).

Fixes #8296 in release/10.0.1xx-sr7.

… Shell (#35072)  > [!NOTE] > Are you waiting for the changes in this PR to be merged? > It would be very helpful if you could [test the resulting artifacts](https://github.com/dotnet/maui/wiki/Testing-PR-Builds) from this PR and let us know in a comment if this change resolves your issue. Thank you!  when the native navigation bar back button is tapped inside a NavigationPage. button is tapped on Android and iOS Shell pages - ShouldPopItem in NavigationRenderer.cs (the navigationBar:shouldPopItem: UIKit delegate callback) fires when the user taps the native iOS back button. - Previously it unconditionally set _uiRequestedPop = true and returned true, allowing the native pop without ever notifying MAUI's page model. As a result, ContentPage.OnBackButtonPressed was never called on iOS when the native back button was tapped inside a NavigationPage. - Same issue — tracker.Value.Page?.SendBackButtonPressed() skipped the Shell chain and went directly to the ContentPage. - In ShouldPopItem, call NavPage?.CurrentPage?.SendBackButtonPressed() before allowing the native pop. If it returns true (the page handled/cancelled back navigation), reset _uiRequestedPop and return false to prevent the native pop. - Route through _context.Shell?.SendBackButtonPressed() instead of tracker.Value.Page?.SendBackButtonPressed(), so the Shell back button tap goes through the same chain as the system back button. **Note** on _sendPopPending = false in the BackButtonBehavior command path: On iOS 26+, _sendPopPending is set to true unconditionally at the start of SendPop(), before any BackButtonBehavior checks. When a BackButtonBehavior.Command executes and returns false (preventing navigation), ViewDidDisappear never fires — so without an explicit reset, the flag stays true permanently and silently blocks all subsequent back presses. The _sendPopPending = false after command execution (line 188) is therefore an intentional and necessary fix to prevent the back button becoming permanently unresponsive after a command-handled back press on iOS 26+. | Platform | Navigation | `OnBackButtonPressed` | |---|---|---| | iOS / MacCatalyst | `GoToAsync` | ✅ Triggered | | Android | `GoToAsync` | ✅ Triggered (app back button and emulator back button) | | Windows | `GoToAsync` | ✅ Triggered | >`OnBackButtonPressed` is triggered for both the `Shell` and the contained `ContentPage`. | Platform | Navigation | `OnBackButtonPressed` | Notes | |---|---|---|---| | iOS / MacCatalyst | `PushAsync` | ✅ Triggered | | | iOS / MacCatalyst | `PushModalAsync` | — | Back button not visible in modal navigation | | Android | `PushAsync` | ✅ Triggered (app back button and emulator back button) | | | Android | `PushModalAsync` | ✅ Triggered | Called on the modal ContentPage | | Windows | `PushAsync` | ✅ Triggered | | | Windows | `PushModalAsync` | — | Back button not visible in modal navigation | > On Android and Windows, `OnBackButtonPressed` is triggered for both the `NavigationPage` and the contained `ContentPage`. | Platform | Navigation | `OnBackButtonPressed` | Notes | |---|---|---|---| | iOS / MacCatalyst | `PushAsync` | ✅ Triggered | | | iOS / MacCatalyst | `PushModalAsync` | — | Back button not visible in modal navigation | | Android | `PushAsync` | ✅ Triggered | | | Android | `PushModalAsync` | ✅ Triggered | | | Windows | `PushAsync` | ✅ Triggered | | | Windows | `PushModalAsync` | — | Back button not visible in modal navigation | | Platform | Navigation | `OnBackButtonPressed` | Notes | |---|---|---|---| | iOS / MacCatalyst | `PushAsync` | ✅ Triggered | | | iOS / MacCatalyst | `PushModalAsync` | — | Back button not visible in modal navigation | | Android | `PushAsync` | ✅ Triggered | | | Android | `PushModalAsync` | ✅ Triggered | | | Windows | `PushAsync` | ✅ Triggered | | | Windows | `PushModalAsync` | — | Back button not visible in modal navigation | - [ ] Android - [ ] Windows - [x] iOS - [x] Mac Fixes #8296 | | Before | After | |--|---------|--------| |8296| <video src="https://github.com/user-attachments/assets/13887369-e9e9-42df-a2a0-db88f0e6b38f"> | <video src="https://github.com/user-attachments/assets/d0ccfb01-59e8-44bc-8878-54c5d0f6fb7e"> | |9095 | <video src="https://github.com/user-attachments/assets/664e0b7f-3964-4a1b-a4f6-46b1db758b48"> | <video src="https://github.com/user-attachments/assets/3ff159ec-93b0-4a91-854a-ca23211ff204"> | --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> (cherry picked from commit 7023635)

github-actions · 2026-05-13T18:27:21Z

🚀 Dogfood this PR with:

⚠️ WARNING: Do not do this without first carefully reviewing the code of this PR to satisfy yourself it is safe.

curl -fsSL https://raw.githubusercontent.com/dotnet/maui/main/eng/scripts/get-maui-pr.sh | bash -s -- 35434

Or

Run remotely in PowerShell:

iex "& { $(irm https://raw.githubusercontent.com/dotnet/maui/main/eng/scripts/get-maui-pr.ps1) } 35434"

PureWeen · 2026-05-13T18:47:22Z

/azp run maui-pr-uitests, maui-pr-devicetests

azure-pipelines · 2026-05-13T18:47:40Z

Azure Pipelines successfully started running 2 pipeline(s).

sheiksyedm · 2026-05-14T07:48:57Z

/azp run maui-pr-uitests, maui-pr-devicetests

azure-pipelines · 2026-05-14T07:49:12Z

Azure Pipelines successfully started running 2 pipeline(s).

sheiksyedm · 2026-05-15T11:07:32Z

/azp run maui-pr-uitests , maui-pr-devicetests

azure-pipelines · 2026-05-15T11:07:48Z

Azure Pipelines successfully started running 2 pipeline(s).

### Description of Change  > [!NOTE] > Are you waiting for the changes in this PR to be merged? > It would be very helpful if you could [test the resulting artifacts](https://github.com/dotnet/maui/wiki/Testing-PR-Builds) from this PR and let us know in a comment if this change resolves your issue. Thank you! Cherry-picks test fixes and snapshot additions from multiple backport PRs: - **PR #35434** — Fixed CI failure (removed flaky test attributes from Bugzilla40333) and removed Issue9095 test - **PR #35426** — Added mac and Windows snapshots for `VerifySearchBarHeightRequestValues`, updated iOS snapshots - **PR #35427** — Resolved device test failures in `ScrollViewHandler.Windows.cs` - **PR #35424** — Added mac and Windows snapshots for `LinearGradientBrushTransparentStopsShouldNotBeOpaque` - **PR #35425** — Removed failing test: "Missing ControlTemplate with exception handler should throw" (`StaticResourceTests.cs`) ## Changes | File | Change | |------|--------| | `Bugzilla40333.cs` | Removed 2 lines (CI fix) | | `Issue9095.cs` | Deleted | | `ScrollViewHandler.Windows.cs` | Fixed device test failures | | `StaticResourceTests.cs` | Deleted | | SearchBar snapshots (mac/windows/iOS) | Added/updated | | LinearGradientBrush snapshots (mac/windows) | Added | --------- Co-authored-by: Dhivya-SF4094 <127717131+Dhivya-SF4094@users.noreply.github.com> Co-authored-by: devanathan-vaithiyanathan <114395405+devanathan-vaithiyanathan@users.noreply.github.com> Co-authored-by: Vignesh-SF3580 <102575140+Vignesh-SF3580@users.noreply.github.com>

…xx-sr8 (#35810)  > [!NOTE] > Are you waiting for the changes in this PR to be merged? > It would be very helpful if you could [test the resulting artifacts](https://github.com/dotnet/maui/wiki/Testing-PR-Builds) from this PR and let us know in a comment if this change resolves your issue. Thank you! ## Cut-then-merge step 2 of 2 SR8 was cut from `main` at [`e02d6b6dc2`](e02d6b6) (commit "Add gh-aw rerun review scanner (#35685)"). This PR pulls the SR7 stabilization work into SR8 so SR8 contains everything that's in SR7. - **Base:** `release/10.0.1xx-sr8` @ [`e02d6b6dc2`](e02d6b6) - **Merging in:** `release/10.0.1xx-sr7` @ [`9da598b4a1`](9da598b) (PatchVersion bump to 71) - **Merge base:** [`f8cb875e`](f8cb875eee) ("[Testing] The Windows WebView category is removed from CI…" #35335) - **Strategy:** non-fast-forward merge commit (preserves both branches' history) ## Conflict resolution Two trivial conflicts, both resolved by taking the SR8 (`HEAD`) side: | File | Why it conflicted | Resolution | | --- | --- | --- | | [`eng/Versions.props`](https://github.com/dotnet/maui/blob/release/10.0.1xx-sr8/eng/Versions.props) | SR7 bumped `PatchVersion` 70→71 (#35786); SR8 starts at 80 | Keep `PatchVersion=80` (SR8 is the higher patch band) | | `src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellSectionRenderer.cs` | Whitespace-only difference (`false; //` vs `false; //`) in two comments | Keep SR8's whitespace | No semantic conflicts. ## Inherited from SR7 26 SR7-only commits land in SR8 via this merge. The source PRs are: <details> <summary>Source PRs (43, deduped by commit)</summary> #35020, #35072, #35092, #35150, #35223, #35299, #35305, #35347, #35356, #35359, #35360, #35421, #35423, #35424, #35425, #35426, #35427, #35428, #35430, #35434, #35441, #35447, #35461, #35480, #35503, #35520, #35521, #35559, #35566, #35585, #35625, #35642, #35664, #35689, #35690, #35691, #35692, #35693, #35694, #35703, #35744, #35768, #35786 Includes the SR7 revert chain: - #35689 — Revert PR #30068 (FontImageSource centering on Windows) - #35694 — Revert TalkBack RadioButton fix - #35703 — Revert Shell.NavBarIsVisible fix - #35744 — Revert HybridWebView WebView fix - #35461, #35503 — additional Android reverts </details> After this lands, the release-readiness tracker can survey `release/10.0.1xx-sr8` directly instead of using `-Candidate -InheritFromPriorSr` mode against SR7.

### Description of Change  > [!NOTE] > Are you waiting for the changes in this PR to be merged? > It would be very helpful if you could [test the resulting artifacts](https://github.com/dotnet/maui/wiki/Testing-PR-Builds) from this PR and let us know in a comment if this change resolves your issue. Thank you! Cherry-picks test fixes and snapshot additions from multiple backport PRs: - **PR #35434** — Fixed CI failure (removed flaky test attributes from Bugzilla40333) and removed Issue9095 test - **PR #35426** — Added mac and Windows snapshots for `VerifySearchBarHeightRequestValues`, updated iOS snapshots - **PR #35427** — Resolved device test failures in `ScrollViewHandler.Windows.cs` - **PR #35424** — Added mac and Windows snapshots for `LinearGradientBrushTransparentStopsShouldNotBeOpaque` - **PR #35425** — Removed failing test: "Missing ControlTemplate with exception handler should throw" (`StaticResourceTests.cs`) ## Changes | File | Change | |------|--------| | `Bugzilla40333.cs` | Removed 2 lines (CI fix) | | `Issue9095.cs` | Deleted | | `ScrollViewHandler.Windows.cs` | Fixed device test failures | | `StaticResourceTests.cs` | Deleted | | SearchBar snapshots (mac/windows/iOS) | Added/updated | | LinearGradientBrush snapshots (mac/windows) | Added | --------- Co-authored-by: Dhivya-SF4094 <127717131+Dhivya-SF4094@users.noreply.github.com> Co-authored-by: devanathan-vaithiyanathan <114395405+devanathan-vaithiyanathan@users.noreply.github.com> Co-authored-by: Vignesh-SF3580 <102575140+Vignesh-SF3580@users.noreply.github.com>

Removed Issue9095

13deee2

github-actions Bot mentioned this pull request May 14, 2026

[repo-status] .NET MAUI Daily Status - May 14, 2026 🌟 #35440

Closed

This was referenced May 14, 2026

[PR Review Queue] 2026-05-14 #35443

Closed

[PR Review Queue] 2026-05-15 #35456

Closed

Fixed CI failure

be92b2a

github-actions Bot mentioned this pull request May 15, 2026

[repo-status] Daily Repo Status — May 15, 2026 #35467

Closed

PureWeen approved these changes May 15, 2026

View reviewed changes

PureWeen merged commit c9466bd into release/10.0.1xx-sr7 May 15, 2026
147 of 167 checks passed

PureWeen deleted the backport/pr-35072-to-release/10.0.1xx-sr7 branch May 15, 2026 16:56

github-actions Bot added this to the .NET 10 SR7 milestone May 15, 2026

This was referenced May 16, 2026

[repo-status] Daily Repo Status — May 16, 2026 #35474

Closed

[repo-status] Daily Repo Status — May 17, 2026 #35482

Closed

[repo-status] Daily Repo Status — May 18, 2026 #35486

Closed

Tamilarasan-Paranthaman mentioned this pull request May 18, 2026

Backport Test Fixes and Snapshots from SR to Inflight Branch #35499

Merged

PureWeen mentioned this pull request Jun 8, 2026

[release/10.0.1xx-sr8] Merge release/10.0.1xx-sr7 into release/10.0.1xx-sr8 #35810

Merged

github-actions Bot locked and limited conversation to collaborators Jun 15, 2026

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[release/10.0.1xx-sr7] [iOS, Mac] Fix OnBackButtonPressed not invoked for NavigationPage and Shell#35434

[release/10.0.1xx-sr7] [iOS, Mac] Fix OnBackButtonPressed not invoked for NavigationPage and Shell#35434
PureWeen merged 3 commits into
release/10.0.1xx-sr7from
backport/pr-35072-to-release/10.0.1xx-sr7

kubaflo commented May 13, 2026

Uh oh!

github-actions Bot commented May 13, 2026 •

edited

Loading

Uh oh!

PureWeen commented May 13, 2026

Uh oh!

azure-pipelines Bot commented May 13, 2026

Uh oh!

sheiksyedm commented May 14, 2026

Uh oh!

azure-pipelines Bot commented May 14, 2026

Uh oh!

sheiksyedm commented May 15, 2026

Uh oh!

azure-pipelines Bot commented May 15, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

kubaflo commented May 13, 2026

Why this is a manual backport

Resolution

⚠️ Dependency on #35430

Uh oh!

github-actions Bot commented May 13, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

PureWeen commented May 13, 2026

Uh oh!

azure-pipelines Bot commented May 13, 2026

Uh oh!

sheiksyedm commented May 14, 2026

Uh oh!

azure-pipelines Bot commented May 14, 2026

Uh oh!

sheiksyedm commented May 15, 2026

Uh oh!

azure-pipelines Bot commented May 15, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

github-actions Bot commented May 13, 2026 •

edited

Loading