Skip to content

[iOS] Fix App crash with NullReferenceException in ShellSectionRenderer#32109

Merged
kubaflo merged 8 commits into
dotnet:inflight/currentfrom
devanathan-vaithiyanathan:fix_31961
Mar 30, 2026
Merged

[iOS] Fix App crash with NullReferenceException in ShellSectionRenderer#32109
kubaflo merged 8 commits into
dotnet:inflight/currentfrom
devanathan-vaithiyanathan:fix_31961

Conversation

@devanathan-vaithiyanathan
Copy link
Copy Markdown
Contributor

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!

Issue Details

In the ShellSectionRenderer class, the ElementForViewController method is used to find the corresponding .NET MAUI page for a given ViewController.
While traversing the entire ShellSection stack to locate the respective page, a push and pop modal operation causes Page1’s handler to become null.

Root Cause

iOS OnUnloaded mechanism fires immediately during navigation transitions, triggering premature Handler disposal before checking if the page is still accessible for back navigation.

Description of Change

In Page.cs, added Shell navigation stack check in SendNavigatedFrom() to prevent Handler disposal when page is still in stack

Issues Fixed

Fixes #31961

Tested the behavior in the following platforms.

  • Android
  • Windows
  • iOS
  • Mac

Output Screenshot

Before After
iOS
Before.mov
iOS
After.mov

@dotnet-policy-service dotnet-policy-service Bot added community ✨ Community Contribution partner/syncfusion Issues / PR's with Syncfusion collaboration labels Oct 21, 2025
@jsuarezruiz jsuarezruiz added the area-controls-shell Shell Navigation, Routes, Tabs, Flyout label Oct 22, 2025
args.NavigationType == NavigationType.PopToRoot)
{
// Don't dispose Handlers too early on iOS!
// iOS aggressively cleans up page Handlers during navigation, but if the page
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is only required on iOS? Because this is a cross platform code that will run same on other platforms.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jsuarezruiz , I've added the fix only for iOS platform

@sheiksyedm
Copy link
Copy Markdown
Contributor

/azp run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 3 pipeline(s).

@devanathan-vaithiyanathan devanathan-vaithiyanathan marked this pull request as ready for review October 28, 2025 08:39
Copilot AI review requested due to automatic review settings October 28, 2025 08:39
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR fixes an iOS-specific NullReferenceException crash in ShellSectionRenderer that occurs during modal navigation. The root cause was premature Handler disposal when iOS's OnUnloaded mechanism triggered during navigation transitions, disposing Handlers for pages still accessible via back navigation in the Shell stack.

Key Changes:

  • Added Shell navigation stack validation before Handler disposal on iOS to prevent premature cleanup
  • Added comprehensive UI tests demonstrating the crash scenario and validating the fix

Reviewed Changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated 1 comment.

File Description
src/Controls/src/Core/Page/Page.cs Adds iOS-specific check to prevent Handler disposal when page remains in Shell navigation stack
src/Controls/tests/TestCases.HostApp/Issues/Issue31961.cs Implements UI test page demonstrating modal + Shell navigation interaction
src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue31961.cs Implements Appium test validating the fix through automated UI interaction

}
}
#endif

Copy link

Copilot AI Oct 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Trailing whitespace should be removed from the blank line.

Suggested change

Copilot uses AI. Check for mistakes.
@rmarinho
Copy link
Copy Markdown
Member

rmarinho commented Feb 16, 2026

🤖 AI Summary

📊 Expand Full Review
🔍 Pre-Flight — Context & Validation
📝 Review SessionUpdate Issue31961.cs · c89ea28

PR: #32109 - [iOS] Fix App crash with NullReferenceException in ShellSectionRenderer
Issue: #31961 - [iOS] App crash with NullReferenceException in ShellSectionRenderer
Author: @devanathan-vaithiyanathan (Syncfusion partner)
Platforms Affected: iOS (platform-specific issue, labels: platform/ios, area-controls-shell)
Files Changed: 1 implementation file, 2 test files

Issue Summary

When navigating back from a page (Page A) and then that page navigates forward inside Shell OnNavigated event, the Handler for Page A becomes null on iOS. This causes NullReferenceException in ShellSectionRenderer.ElementForViewController. Regression from .NET 8 → .NET 9.

Reproduction steps:

  1. Navigate: Main → Page1
  2. Open modal from Page1
  3. Close modal (returns to Page1, triggers Shell OnNavigated)
  4. Page1's OnShellNavigated handler navigates to Page2
  5. Navigate Page2 → Page3 → CRASH (Page1's Handler is null)

Root Cause (from PR)

iOS OnUnloaded fires immediately during navigation transitions, triggering premature Handler disposal before checking if page is still accessible via back navigation in Shell stack.

Files Changed

Implementation:

  • src/Controls/src/Core/Page/Page.cs (+18 lines) — Added iOS-specific guard in SendNavigatedFrom() to prevent Handler disposal when page is still in Shell.Current.CurrentItem?.CurrentItem?.Stack

Tests:

  • src/Controls/tests/TestCases.HostApp/Issues/Issue31961.cs (+194 lines) — Shell with modal navigation scenario
  • src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue31961.cs (+27 lines) — Appium test: MainPage → Page1 → OpenModal → CloseModal → Page2 → Page3

PR Discussion

File:Line Reviewer Says Author Says Status
Page.cs:857 jsuarezruiz: "This is only required on iOS? Cross-platform code runs same on other platforms." "I've added the fix only for iOS platform" (uses #if IOS) ✅ Addressed with platform guard
Page.cs:872 copilot: "Trailing whitespace on blank line" - ⚠️ Minor cleanup needed
General kubaflo (Feb 2026): "test doesn't catch the bug" - ❌ Outstanding issue

Prior agent review (Feb 2026): Gate ❌ FAILED — tests passed without fix. Same commit c89ea28 at time of prior review.

Edge Cases to Check

  • Multi-step modal navigation (modal → modal)
  • Multiple pages with null Handlers in stack
  • Non-Shell navigation scenarios (should be unaffected — Shell.Current null)
  • Test properly catches the bug without fix

Fix Candidates

# Source Approach Test Result Files Changed Notes
PR PR #32109 iOS-specific guard in SendNavigatedFrom(): check Shell.Current.CurrentItem?.CurrentItem?.Stack.Contains(this) before disposing Handler ⏳ PENDING (Gate) Page.cs (+18) Original PR — uses #if IOS to scope to iOS only

🚦 Gate — Test Verification
📝 Review SessionUpdate Issue31961.cs · c89ea28

Result: ❌ FAILED
Platform: ios
Mode: Full Verification
Test Filter: Issue31961

Verification Outcome

  • Tests FAIL without fix: ❌ NO (Expected: YES)

    • Tests PASSED when fix was reverted — tests don't detect the bug
  • Tests PASS with fix: ✅ YES (Expected: YES)

    • Tests passed with PR's fix applied

Critical Issue

The tests in Issue31961.cs do not catch the bug they claim to fix.

When the PR's fix in Page.cs was reverted to the merge base state, the tests still passed. This means:

  1. Tests may not reproduce the exact crash scenario from issue [iOS] App crash with NullReferenceException in ShellSectionRenderer #31961
  2. The crash requires specific timing (iOS OnUnloaded firing during navigation transition) that may not be triggered in this test
  3. The test validates navigation completes without verifying that Handler disposal was NOT triggered prematurely

Test Analysis

Current test flow:

  1. App.WaitForElement("MainPage") → tap
  2. App.WaitForElement("OpenModalButton") → tap (navigates to modal)
  3. App.WaitForElement("CloseModalButton") → tap (closes modal, triggers OnShellNavigated)
  4. App.WaitForElement("Page2") → tap (navigation from OnShellNavigated)
  5. App.WaitForElement("Page3") → (final assertion)

Problem: The test waits for Page2 button AFTER closing modal. But Issue31961FirstPage.OnShellNavigated() triggers NavigateToPage2Command.Execute(null) which calls GoToAsync without await. Since navigation is triggered synchronously in OnShellNavigated, and the Command uses fire-and-forget, the timing may not reproduce the crash on all devices.

Why test may pass without fix: The crash in issue #31961 depends on iOS specifically disposing the Handler during the modal close → navigation sequence. The test may be completing fast enough that the crash timing window is not hit, or the timing of when IsLoaded is checked differs.

Prior Gate Result

A prior agent review (Feb 2026, same commit c89ea28) also found Gate ❌ FAILED with identical result. Reviewer kubaflo confirmed: "test doesn't catch the bug."

Recommended Actions

  1. Fix the test to ensure it actually catches the NullReferenceException:

    • Add assertion that verifies Handler is NOT null after the modal close → navigation sequence
    • Consider adding a try/catch in the test page's OnShellNavigated to detect crashes
    • OR refactor to check that all pages still have non-null Handlers after the sequence
  2. Alternative approach: Write a test that directly verifies the Handler state, not just navigation completion

  3. Use write-tests-agent to help create tests that properly catch this bug

GATE BLOCKED — Tests must be fixed before this PR can be approved.


📋 Report — Final Recommendation
📝 Review SessionUpdate Issue31961.cs · c89ea28

⚠️ Final Recommendation: REQUEST CHANGES

Status: Review INCOMPLETE — Gate phase failed

Summary

PR #32109 aims to fix an iOS-specific crash (NullReferenceException in ShellSectionRenderer) that occurs during modal navigation in Shell. The fix itself looks technically sound, but the automated test verification reveals the tests do NOT catch the bug they claim to fix.

This is confirmed by:

  • This review's Gate verification (February 2026)
  • Prior agent review's Gate verification (February 2026, same commit)
  • Reviewer kubaflo's manual review (February 2026): "Looks like the test doesn't catch the bug."

Gate Phase Results

Platform Tested: iOS
Test Filter: Issue31961

Check Expected Actual Status
Tests FAIL without fix YES NO — tests pass
Tests PASS with fix YES YES

Conclusion: Tests are inadequate. They do not detect whether the fix is in place.

Root Cause Analysis

Bug: iOS OnUnloaded fires immediately during modal navigation transitions, causing premature Handler disposal for pages still in Shell's navigation stack. When SendNavigatedFrom is called with NavigationType.Pop during modal close, the Handler for Issue31961FirstPage is disposed even though the page is still accessible in the Shell stack.

PR's Fix: Adds an #if IOS guard in Page.SendNavigatedFrom() that checks Shell.Current.CurrentItem?.CurrentItem?.Stack.Contains(this) before disposing the Handler. If the page is still in the stack, disposal is skipped.

Why the test doesn't catch it: The test validates that navigation completes (reaches "Page3") but doesn't verify that the Handler is NOT disposed prematurely. The crash depends on iOS-specific timing of OnUnloaded during the modal close sequence, which the test may not reliably trigger.

Fix Quality Assessment

The implementation approach is reasonable but has potential concerns:

  1. Timing dependency: The fix checks the stack at the moment SendNavigatedFrom is called. If the stack hasn't been updated yet (race condition), this check might fail.

  2. Stack access path: Shell.Current.CurrentItem?.CurrentItem?.Stack only checks the current active ShellSection's stack. Pages in other sections or tabs would not be found here, potentially still getting their Handlers disposed incorrectly.

  3. Memory implications: If Handler disposal is prevented indefinitely for pages in the stack, it could delay garbage collection. This is acceptable for typical navigation depths.

  4. Trailing whitespace at line 824 in Page.cs (minor)

Phases Completed

Phase Status Notes
1. Pre-Flight ✅ COMPLETE Context gathered
2. Gate ❌ FAILED Tests don't catch bug — confirmed 2nd time
3. Fix ⏭️ SKIPPED Cannot proceed — Gate must pass first
4. Report ✅ COMPLETE This report

Required Actions for @devanathan-vaithiyanathan

  1. Fix the test so it actually catches the NullReferenceException without the fix:

    • Verify that Handler is NOT null after the modal close sequence (before fix reverts this)
    • Consider checking Handler != null on Issue31961FirstPage after CloseModalButton is tapped
    • The test should CRASH (app crash or assertion failure) without the fix in Page.cs
  2. Verify manually: Run without the #if IOS guard in Page.cs to confirm test fails

  3. Remove trailing whitespace at line 824 of Page.cs

  4. Consider: Use write-tests-agent for help creating tests that properly reproduce this iOS timing issue


📋 Expand PR Finalization Review
Title: ✅ Good

Current: [iOS] Fix App crash with NullReferenceException in ShellSectionRenderer

Description: ⚠️ Needs Update

Description needs updates. See details below.

✨ Suggested PR Description

[!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!

Issue Details

In ShellSectionRenderer, the ElementForViewController method is used to find the corresponding .NET MAUI page for a given UIViewController. When a page that is still in the Shell navigation stack has its Handler disposed prematurely, ElementForViewController returns null, crashing in WillShowViewController.

Root Cause

The crash occurs through this sequence on iOS:

  1. User navigates to Page1 via Shell, then opens a ModalPage (via GoToAsync)
  2. User closes the modal (GoToAsync("..")) — this triggers NavigationType.Pop in SendNavigatedFrom
  3. iOS's OnUnloaded mechanism fires during this navigation transition, which calls SendNavigatedFrom on Page1
  4. SendNavigatedFrom with NavigationType.Pop calls DisconnectHandlers() on Page1 — but Page1 is still in the Shell navigation stack and the user can still navigate forward from it
  5. Page1's Handler becomes null
  6. When the user next navigates and ShellSectionRenderer.WillShowViewController tries to map the UIViewController back to Page1, ElementForViewController finds the page but its Handler is null, causing a NullReferenceException

This is a regression introduced in .NET 9; .NET MAUI 8 was not affected.

Description of Change

In Page.cs, added an iOS-specific guard in SendNavigatedFrom(): before calling DisconnectHandlers() on a Pop/PopToRoot navigation, check whether the page is still present in Shell.Current.CurrentItem?.CurrentItem?.Stack. If the page is still reachable in the Shell navigation stack, return early without disposing the Handler.

#if IOS
    if (Shell.Current != null)
    {
        var currentStack = Shell.Current.CurrentItem?.CurrentItem?.Stack;
        if (currentStack?.Contains(this) == true)
        {
            return; // Page still in stack, don't dispose Handler
        }
    }
#endif

Issues Fixed

Fixes #31961

Platforms Tested

  • Android
  • Windows
  • iOS
  • Mac
Code Review: ⚠️ Issues Found

Code Review — PR #32109

🔴 Critical Issues

1. Platform-specific logic (#if IOS) in a shared Core file

File: src/Controls/src/Core/Page/Page.cs (lines 855–868)

Problem: Adding #if IOS inside a shared Controls/Core file is a MAUI anti-pattern. The platform layer (iOS-specific code in Handlers/ or Platform/iOS/) is the correct location for platform-specific behavior. Putting it in Page.cs (a cross-platform type) creates several problems:

  • It conflates platform concerns with cross-platform logic
  • The #if IOS guard is invisible at the call site — the SendNavigatedFrom method signature gives no indication it behaves differently per platform
  • Existing reviewer @jsuarezruiz flagged this concern (see PR review thread)

Recommendation: Consider moving the guard to iOS-specific Shell platform code. Alternatively, introduce a virtual/partial method that iOS can override. If the #if IOS approach is kept as a pragmatic fix, it must be clearly documented with a comment explaining why this is iOS-only.


🟡 Warnings

2. Fragile Shell.Current.CurrentItem?.CurrentItem?.Stack traversal

File: src/Controls/src/Core/Page/Page.cs (lines 858–863)

Problem: The chain Shell.Current.CurrentItem?.CurrentItem?.Stack makes several assumptions:

  • Shell.Current is the shell that owns this page (not always true with multiple Shells)
  • The page is always inside a ShellSection that is the CurrentItem of a ShellItem that is the CurrentItem of the Shell
  • It only checks the current section's stack — if the page lives in a tab/section that is not currently selected, the check returns false, potentially disposing a reachable page

If any level of the hierarchy is null (e.g., a FlyoutItem without a Tab), the null-conditional ?. will return null and the check falls through to DisconnectHandlers(), which is the safe default — but it means the fix only works for the narrow TabBar > Tab > ShellSection topology, not all Shell configurations.

Recommendation: Use Shell.Current?.Navigation?.NavigationStack?.Contains(this) as a broader and more robust check, since Shell.Current.Navigation.NavigationStack reflects the entire Shell back stack regardless of hierarchy topology.

3. Early return may permanently suppress Handler disposal

File: src/Controls/src/Core/Page/Page.cs (lines 860–864)

Problem: The early return skips DisconnectHandlers() entirely. For pages that remain in the stack indefinitely (e.g., deeply nested routes that are never popped), this could delay or prevent Handler disposal if SendNavigatedFrom is the only path that triggers disconnection. This may cause a subtle memory leak in long navigation sessions.

Recommendation: Document why the early return is safe — specifically, note that the page will be disconnected via the normal DisconnectHandlers() path when it is genuinely popped from the stack later.

4. Incorrect "Platforms Tested" in PR description

Not a code issue, but the PR description marks Android and Windows as tested. The fix is entirely inside #if IOS and has no effect on Android or Windows. These checkmarks are misleading and should be unchecked.


🟢 Looks Good / Info

5. Trailing whitespace on line 872

File: src/Controls/src/Core/Page/Page.cs (line 872 — blank line between #endif and if (!this.IsLoaded))

Already flagged in the Copilot PR reviewer comment. A trivial nit, but dotnet format should clean this.

6. partial class without XAML in HostApp test

File: src/Controls/tests/TestCases.HostApp/Issues/Issue31961.cs (line 42)

Issue31961MainPage is declared partial class but there is no corresponding XAML file. Unnecessary partial should be removed.

7. Test coverage is good and matches crash scenario

The UI test in Issue31961.cs (TestCases.Shared.Tests) reproduces the exact steps from the issue report: Main → Page1 → Open Modal → Close Modal → Page2 → Page3. The [Category(UITestCategories.Shell)] is appropriate. The test validates the fix end-to-end.

8. INavigationAware interface is public at namespace level in a test file

File: src/Controls/tests/TestCases.HostApp/Issues/Issue31961.cs (lines 7–10)

A public INavigationAware interface is defined at the namespace level inside a test file. This is a public symbol in the test host app assembly. It should be internal or nested inside the test class to avoid polluting the namespace and risking naming collisions with application or library code.


@rmarinho rmarinho added s/agent-changes-requested AI agent recommends changes - found a better alternative or issues s/agent-gate-failed AI could not verify tests catch the bug s/agent-reviewed PR was reviewed by AI agent workflow (full 4-phase review) labels Feb 16, 2026
Copy link
Copy Markdown
Contributor

@kubaflo kubaflo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi! Looks like the test doesn't catch the bug. Could you please have a look?

@devanathan-vaithiyanathan
Copy link
Copy Markdown
Contributor Author

Hi! Looks like the test doesn't catch the bug. Could you please have a look?

@kubaflo , As per the user’s instructions, when navigating from Page2 to Page3, a NullReferenceException is thrown in the simple sample. However, in the HostApp, the exception is not thrown. When navigating back to Page1 without the fix, a blank page is shown. With the fix, it works correctly. I have now modified the test accordingly.

PureWeen and others added 3 commits March 25, 2026 09:44
…otnet#34548)

<!-- Please let the below note in for people that find this PR -->
> [!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!

## Description

Adds a [gh-aw (GitHub Agentic
Workflows)](https://github.github.com/gh-aw/introduction/overview/)
workflow that automatically evaluates test quality on PRs using the
`evaluate-pr-tests` skill.

### What it does

When a PR adds or modifies test files, this workflow:
1. **Checks out the PR branch** (including fork PRs) in a pre-agent step
2. **Runs the `evaluate-pr-tests` skill** via Copilot CLI in a sandboxed
container
3. **Posts the evaluation report** as a PR comment using gh-aw
safe-outputs

### Triggers

| Trigger | When | Fork PR support |
|---------|------|-----------------|
| `pull_request` | Automatic on test file changes (`src/**/tests/**`) |
❌ Blocked by `pre_activation` gate |
| `workflow_dispatch` | Manual — enter PR number | ✅ Works for all PRs |
| `issue_comment` (`/evaluate-tests`) | Comment on PR | ⚠️ Same-repo
only (see Known Limitations) |

### Security model

| Layer | Implementation |
|-------|---------------|
| **gh-aw sandbox** | Agent runs in container with scrubbed credentials,
network firewall |
| **Safe outputs** | Max 1 PR comment per run, content-limited |
| **Checkout without execution** | `steps:` checks out PR code but never
executes workspace scripts |
| **Base branch restoration** | `.github/skills/`,
`.github/instructions/`, `.github/copilot-instructions.md` restored from
base branch after checkout |
| **Fork PR activation gate** | `pull_request` events blocked for forks
via `head.repo.id == repository_id` |
| **Pinned actions** | SHA-pinned `actions/checkout`,
`actions/github-script`, etc. |
| **Minimal permissions** | Each job declares only what it needs |
| **Concurrency** | One evaluation per PR, cancels in-progress |
| **Threat detection** | gh-aw built-in threat detection analyzes agent
output |

### Files added/modified

- `.github/workflows/copilot-evaluate-tests.md` — gh-aw workflow source
- `.github/workflows/copilot-evaluate-tests.lock.yml` — Compiled
workflow (auto-generated by `gh aw compile`)
- `.github/skills/evaluate-pr-tests/scripts/Gather-TestContext.ps1` —
Test context gathering script (binary-safe file download, path traversal
protection)
- `.github/instructions/gh-aw-workflows.instructions.md` — Copilot
instructions for gh-aw development

### Known Limitations

**Fork PR evaluation via `/evaluate-tests` comment is not supported in
v1.** The gh-aw platform inserts a `checkout_pr_branch.cjs` step after
all user steps, which may overwrite base-branch skill files restored for
fork PRs. This is a known gh-aw platform limitation — user steps always
run before platform-generated steps, with no way to insert steps after.

**Workaround:** Use `workflow_dispatch` (Actions UI → "Run workflow" →
enter PR number) to evaluate fork PRs. This trigger bypasses the
platform checkout step entirely and works correctly.

**Related upstream issues:**
- [github/gh-aw#18481](github/gh-aw#18481) —
"Using gh-aw in forks of repositories"
- [github/gh-aw#18518](github/gh-aw#18518) —
Fork detection and warning in `gh aw init`
- [github/gh-aw#18520](github/gh-aw#18520) —
Fork context hint in failure messages
- [github/gh-aw#18521](github/gh-aw#18521) —
Fork support documentation

### Fixes

- Fixes dotnet#34602

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Jakub Florkowski <kubaflo123@gmail.com>
## Summary

Enables the copilot-evaluate-tests gh-aw workflow to run on fork PRs by
adding `forks: ["*"]` to the `pull_request` trigger and removing the
fork guard from `Checkout-GhAwPr.ps1`.

## Changes

1. **copilot-evaluate-tests.md**: Added `forks: ["*"]` to opt out of
gh-aw auto-injected fork activation guard. Scoped `Checkout-GhAwPr.ps1`
step to `workflow_dispatch` only (redundant for other triggers since
platform handles checkout).

2. **copilot-evaluate-tests.lock.yml**: Recompiled via `gh aw compile` —
fork guard removed from activation `if:` conditions.

3. **Checkout-GhAwPr.ps1**: Removed the `isCrossRepository` fork guard.
Updated header docs and restore comments to accurately describe behavior
for all trigger×fork combinations (including corrected step ordering).

4. **gh-aw-workflows.instructions.md**: Updated all stale references to
the removed fork guard. Documented `forks: ["*"]` opt-in, clarified
residual risk model for fork PRs, and updated troubleshooting table.

## Security Model

Fork PRs are safe because:
- Agent runs in **sandboxed container** with all credentials scrubbed
- Output limited to **1 comment** via `safe-outputs: add-comment: max:
1`
- Agent **prompt comes from base branch** (`runtime-import`) — forks
cannot alter instructions
- Pre-flight check catches missing `SKILL.md` if fork isn't rebased on
`main`
- No workspace code is executed with `GITHUB_TOKEN` (checkout without
execution)

## Testing

- ✅ `workflow_dispatch` tested against fork PR dotnet#34621
- ✅ Lock.yml statically verified — fork guard removed from `if:`
conditions
- ⏳ `pull_request` trigger on fork PRs can only be verified post-merge
(GitHub Actions reads lock.yml from default branch)

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…taType is compiled (dotnet#34717)

## Description

Adds regression tests for dotnet#34713 verifying the XAML source generator
correctly handles bindings with `Converter={StaticResource ...}` inside
`x:DataType` scopes.

Closes dotnet#34713

## Investigation

After thorough investigation of the source generator pipeline
(`KnownMarkups.cs`, `CompiledBindingMarkup.cs`, `NodeSGExtensions.cs`):

### When converter IS in page resources (compile-time resolution ✅)

`GetResourceNode()` walks the XAML tree, finds the converter resource,
and `ProvideValueForStaticResourceExtension` returns the variable
directly — **no runtime `ProvideValue` call**. The converter is
referenced at compile time.

### When converter is NOT in page resources (runtime resolution ✅)

`GetResourceNode()` returns null → falls through to `IsValueProvider` →
generates `StaticResourceExtension.ProvideValue(serviceProvider)`. The
`SimpleValueTargetProvider` provides the full parent chain, and
`TryGetApplicationLevelResource` checks `Application.Current.Resources`.
The binding IS still compiled into a `TypedBinding` — only the converter
resolution is deferred.

### Verified on both `main` and `net11.0`

All tests pass on both branches.

## Tests added

| Test | What it verifies |
|------|-----------------|
| `SourceGenResolvesConverterAtCompileTime_ImplicitResources` |
Converter in implicit `<Resources>` → compile-time resolution, no
`ProvideValue` |
| `SourceGenResolvesConverterAtCompileTime_ExplicitResourceDictionary` |
Converter in explicit `<ResourceDictionary>` → compile-time resolution,
no `ProvideValue` |
| `SourceGenCompilesBindingWithConverterToTypedBinding` | Converter NOT
in page resources → still compiled to `TypedBinding`, no raw `Binding`
fallback |
| `BindingWithConverterFromAppResourcesWorksCorrectly` × 3 | Runtime
behavior correct for all inflators (Runtime, XamlC, SourceGen) |

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@MauiBot
Copy link
Copy Markdown
Collaborator

MauiBot commented Mar 29, 2026

🚦 Gate - Test Before and After Fix

📊 Expand Full Gate5004f68 · test modified

Gate Result: ✅ PASSED

Platform: IOS · Base: main · Merge base: 720a9d4a

Test Without Fix (expect FAIL) With Fix (expect PASS)
🖥️ Issue31961 Issue31961 ✅ FAIL — 216s ✅ PASS — 88s
🔴 Without fix — 🖥️ Issue31961: FAIL ✅ · 216s
  Determining projects to restore...
  Restored /Users/cloudtest/vss/_work/1/s/src/Controls/src/BindingSourceGen/Controls.BindingSourceGen.csproj (in 459 ms).
  Restored /Users/cloudtest/vss/_work/1/s/src/Graphics/src/Graphics/Graphics.csproj (in 644 ms).
  Restored /Users/cloudtest/vss/_work/1/s/src/Essentials/src/Essentials.csproj (in 4.68 sec).
  Restored /Users/cloudtest/vss/_work/1/s/src/Controls/Foldable/src/Controls.Foldable.csproj (in 6 sec).
  Restored /Users/cloudtest/vss/_work/1/s/src/Controls/tests/TestCases.HostApp/Controls.TestCases.HostApp.csproj (in 6 sec).
  Restored /Users/cloudtest/vss/_work/1/s/src/BlazorWebView/src/Maui/Microsoft.AspNetCore.Components.WebView.Maui.csproj (in 6 sec).
  Restored /Users/cloudtest/vss/_work/1/s/src/Core/src/Core.csproj (in 6 sec).
  Restored /Users/cloudtest/vss/_work/1/s/src/Controls/src/Xaml/Controls.Xaml.csproj (in 6 sec).
  Restored /Users/cloudtest/vss/_work/1/s/src/Controls/src/Core/Controls.Core.csproj (in 6.01 sec).
  Restored /Users/cloudtest/vss/_work/1/s/src/Controls/Maps/src/Controls.Maps.csproj (in 6.02 sec).
  Restored /Users/cloudtest/vss/_work/1/s/src/Core/maps/src/Maps.csproj (in 6.03 sec).
/Users/cloudtest/vss/_work/1/s/.dotnet/packs/Microsoft.iOS.Sdk.net10.0_26.0/26.0.11017/targets/Xamarin.Shared.Sdk.targets(309,3): warning : RuntimeIdentifier was set on the command line, and will override the value for RuntimeIdentifiers set in the project file. [/Users/cloudtest/vss/_work/1/s/src/Controls/tests/TestCases.HostApp/Controls.TestCases.HostApp.csproj::TargetFramework=net10.0-ios]
  ##vso[build.updatebuildnumber]10.0.60-ci+azdo.13687604
  Graphics -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Graphics/Debug/net10.0-ios26.0/Microsoft.Maui.Graphics.dll
  ##vso[build.updatebuildnumber]10.0.60-ci+azdo.13687604
  Essentials -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Essentials/Debug/net10.0-ios26.0/Microsoft.Maui.Essentials.dll
  ##vso[build.updatebuildnumber]10.0.60-ci+azdo.13687604
  Core -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Core/Debug/net10.0-ios26.0/Microsoft.Maui.dll
  ##vso[build.updatebuildnumber]10.0.60-ci+azdo.13687604
  Maps -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Maps/Debug/net10.0-ios26.0/Microsoft.Maui.Maps.dll
  Controls.BindingSourceGen -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Controls.BindingSourceGen/Debug/netstandard2.0/Microsoft.Maui.Controls.BindingSourceGen.dll
  ##vso[build.updatebuildnumber]10.0.60-ci+azdo.13687604
  Controls.Core -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Controls.Core/Debug/net10.0-ios26.0/Microsoft.Maui.Controls.dll
  ##vso[build.updatebuildnumber]10.0.60-ci+azdo.13687604
  ##vso[build.updatebuildnumber]10.0.60-ci+azdo.13687604
  ##vso[build.updatebuildnumber]10.0.60-ci+azdo.13687604
  ##vso[build.updatebuildnumber]10.0.60-ci+azdo.13687604
  Controls.Maps -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Controls.Maps/Debug/net10.0-ios26.0/Microsoft.Maui.Controls.Maps.dll
  Controls.Xaml -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Controls.Xaml/Debug/net10.0-ios26.0/Microsoft.Maui.Controls.Xaml.dll
  Microsoft.AspNetCore.Components.WebView.Maui -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Microsoft.AspNetCore.Components.WebView.Maui/Debug/net10.0-ios26.0/Microsoft.AspNetCore.Components.WebView.Maui.dll
  Controls.Foldable -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Controls.Foldable/Debug/net10.0-ios26.0/Microsoft.Maui.Controls.Foldable.dll
  Detected signing identity:
    Code Signing Key: "" (-)
    Provisioning Profile: "" () - no entitlements
    Bundle Id: com.microsoft.maui.uitests
    App Id: com.microsoft.maui.uitests
  Controls.TestCases.HostApp -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Controls.TestCases.HostApp/Debug/net10.0-ios/iossimulator-arm64/Controls.TestCases.HostApp.dll
  Optimizing assemblies for size may change the behavior of the app. Be sure to test after publishing. See: https://aka.ms/dotnet-illink
  Optimizing assemblies for size. This process might take a while.

Build succeeded.

/Users/cloudtest/vss/_work/1/s/.dotnet/packs/Microsoft.iOS.Sdk.net10.0_26.0/26.0.11017/targets/Xamarin.Shared.Sdk.targets(309,3): warning : RuntimeIdentifier was set on the command line, and will override the value for RuntimeIdentifiers set in the project file. [/Users/cloudtest/vss/_work/1/s/src/Controls/tests/TestCases.HostApp/Controls.TestCases.HostApp.csproj::TargetFramework=net10.0-ios]
    1 Warning(s)
    0 Error(s)

Time Elapsed 00:01:36.63
  Determining projects to restore...
  Restored /Users/cloudtest/vss/_work/1/s/src/Controls/tests/CustomAttributes/Controls.CustomAttributes.csproj (in 958 ms).
  Restored /Users/cloudtest/vss/_work/1/s/src/TestUtils/src/UITest.Core/UITest.Core.csproj (in 958 ms).
  Restored /Users/cloudtest/vss/_work/1/s/src/TestUtils/src/VisualTestUtils/VisualTestUtils.csproj (in 958 ms).
  Restored /Users/cloudtest/vss/_work/1/s/src/Controls/src/BindingSourceGen/Controls.BindingSourceGen.csproj (in 958 ms).
  Restored /Users/cloudtest/vss/_work/1/s/src/TestUtils/src/UITest.NUnit/UITest.NUnit.csproj (in 3.08 sec).
  Restored /Users/cloudtest/vss/_work/1/s/src/Graphics/src/Graphics/Graphics.csproj (in 3.12 sec).
  Restored /Users/cloudtest/vss/_work/1/s/src/TestUtils/src/UITest.Appium/UITest.Appium.csproj (in 2.23 sec).
  Restored /Users/cloudtest/vss/_work/1/s/src/Essentials/src/Essentials.csproj (in 3.28 sec).
  Restored /Users/cloudtest/vss/_work/1/s/src/Controls/src/Core/Controls.Core.csproj (in 3.65 sec).
  Restored /Users/cloudtest/vss/_work/1/s/src/Core/src/Core.csproj (in 3.66 sec).
  Restored /Users/cloudtest/vss/_work/1/s/src/TestUtils/src/UITest.Analyzers/UITest.Analyzers.csproj (in 4.09 sec).
  Restored /Users/cloudtest/vss/_work/1/s/src/TestUtils/src/VisualTestUtils.MagickNet/VisualTestUtils.MagickNet.csproj (in 3.67 sec).
  Restored /Users/cloudtest/vss/_work/1/s/src/Controls/tests/TestCases.iOS.Tests/Controls.TestCases.iOS.Tests.csproj (in 4.66 sec).
  ##vso[build.updatebuildnumber]10.0.60-ci+azdo.13687604
  Controls.CustomAttributes -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Controls.CustomAttributes/Debug/net10.0/Controls.CustomAttributes.dll
  Graphics -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Graphics/Debug/net10.0/Microsoft.Maui.Graphics.dll
  ##vso[build.updatebuildnumber]10.0.60-ci+azdo.13687604
  Essentials -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Essentials/Debug/net10.0/Microsoft.Maui.Essentials.dll
  ##vso[build.updatebuildnumber]10.0.60-ci+azdo.13687604
  Core -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Core/Debug/net10.0/Microsoft.Maui.dll
  Controls.BindingSourceGen -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Controls.BindingSourceGen/Debug/netstandard2.0/Microsoft.Maui.Controls.BindingSourceGen.dll
  ##vso[build.updatebuildnumber]10.0.60-ci+azdo.13687604
  Controls.Core -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Controls.Core/Debug/net10.0/Microsoft.Maui.Controls.dll
  UITest.Core -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/UITest.Core/Debug/net10.0/UITest.Core.dll
  VisualTestUtils -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/VisualTestUtils/Debug/netstandard2.0/VisualTestUtils.dll
  UITest.NUnit -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/UITest.NUnit/Debug/net10.0/UITest.NUnit.dll
  VisualTestUtils.MagickNet -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/VisualTestUtils.MagickNet/Debug/netstandard2.0/VisualTestUtils.MagickNet.dll
  UITest.Appium -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/UITest.Appium/Debug/net10.0/UITest.Appium.dll
  UITest.Analyzers -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/UITest.Analyzers/Debug/netstandard2.0/UITest.Analyzers.dll
  Controls.TestCases.iOS.Tests -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Controls.TestCases.iOS.Tests/Debug/net10.0/Controls.TestCases.iOS.Tests.dll
Test run for /Users/cloudtest/vss/_work/1/s/artifacts/bin/Controls.TestCases.iOS.Tests/Debug/net10.0/Controls.TestCases.iOS.Tests.dll (.NETCoreApp,Version=v10.0)
VSTest version 18.0.1 (arm64)

Starting test execution, please wait...
A total of 1 test files matched the specified pattern.
/Users/cloudtest/vss/_work/1/s/artifacts/bin/Controls.TestCases.iOS.Tests/Debug/net10.0/Controls.TestCases.iOS.Tests.dll
[xUnit.net 00:00:00.00] xUnit.net VSTest Adapter v2.8.2+699d445a1a (64-bit .NET 10.0.0)
[xUnit.net 00:00:00.05]   Discovering: Controls.TestCases.iOS.Tests
[xUnit.net 00:00:00.13]   Discovered:  Controls.TestCases.iOS.Tests
NUnit Adapter 4.5.0.0: Test execution started
Running selected tests in /Users/cloudtest/vss/_work/1/s/artifacts/bin/Controls.TestCases.iOS.Tests/Debug/net10.0/Controls.TestCases.iOS.Tests.dll
   NUnit3TestExecutor discovered 1 of 1 NUnit test cases using Current Discovery mode, Non-Explicit run
>>>>> 3/30/2026 7:11:33 AM FixtureSetup for Issue31961(iOS)
>>>>> 3/30/2026 7:11:37 AM VerifyShellNavigationWithModalNavigation Start
>>>>> 3/30/2026 7:11:57 AM VerifyShellNavigationWithModalNavigation Stop
>>>>> 3/30/2026 7:11:57 AM Log types: syslog, crashlog, performance, safariConsole, safariNetwork, server
  Failed VerifyShellNavigationWithModalNavigation [20 s]
  Error Message:
   System.TimeoutException : Timed out waiting for element...
  Stack Trace:
     at UITest.Appium.HelperExtensions.Wait(Func`1 query, Func`2 satisfactory, String timeoutMessage, Nullable`1 timeout, Nullable`1 retryFrequency) in /_/src/TestUtils/src/UITest.Appium/HelperExtensions.cs:line 2757
   at UITest.Appium.HelperExtensions.WaitForAtLeastOne(Func`1 query, String timeoutMessage, Nullable`1 timeout, Nullable`1 retryFrequency) in /_/src/TestUtils/src/UITest.Appium/HelperExtensions.cs:line 2784
   at UITest.Appium.HelperExtensions.WaitForElement(IApp app, String marked, String timeoutMessage, Nullable`1 timeout, Nullable`1 retryFrequency, Nullable`1 postTimeout) in /_/src/TestUtils/src/UITest.Appium/HelperExtensions.cs:line 793
   at Microsoft.Maui.TestCases.Tests.Issues.Issue31961.VerifyShellNavigationWithModalNavigation() in /_/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue31961.cs:line 28
   at System.Reflection.MethodBaseInvoker.InterpretedInvoke_Method(Object obj, IntPtr* args)
   at System.Reflection.MethodBaseInvoker.InvokeWithNoArgs(Object obj, BindingFlags invokeAttr)

NUnit Adapter 4.5.0.0: Test execution complete

Total tests: 1
     Failed: 1
Test Run Failed.
 Total time: 1.2688 Minutes

🟢 With fix — 🖥️ Issue31961: PASS ✅ · 88s
  Determining projects to restore...
  Restored /Users/cloudtest/vss/_work/1/s/src/Controls/src/BindingSourceGen/Controls.BindingSourceGen.csproj (in 339 ms).
  Restored /Users/cloudtest/vss/_work/1/s/src/Graphics/src/Graphics/Graphics.csproj (in 359 ms).
  Restored /Users/cloudtest/vss/_work/1/s/src/Essentials/src/Essentials.csproj (in 365 ms).
  Restored /Users/cloudtest/vss/_work/1/s/src/Controls/src/Core/Controls.Core.csproj (in 394 ms).
  Restored /Users/cloudtest/vss/_work/1/s/src/Core/src/Core.csproj (in 406 ms).
  6 of 11 projects are up-to-date for restore.
/Users/cloudtest/vss/_work/1/s/.dotnet/packs/Microsoft.iOS.Sdk.net10.0_26.0/26.0.11017/targets/Xamarin.Shared.Sdk.targets(309,3): warning : RuntimeIdentifier was set on the command line, and will override the value for RuntimeIdentifiers set in the project file. [/Users/cloudtest/vss/_work/1/s/src/Controls/tests/TestCases.HostApp/Controls.TestCases.HostApp.csproj::TargetFramework=net10.0-ios]
  ##vso[build.updatebuildnumber]10.0.60-ci+azdo.13687604
  Graphics -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Graphics/Debug/net10.0-ios26.0/Microsoft.Maui.Graphics.dll
  ##vso[build.updatebuildnumber]10.0.60-ci+azdo.13687604
  Essentials -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Essentials/Debug/net10.0-ios26.0/Microsoft.Maui.Essentials.dll
  ##vso[build.updatebuildnumber]10.0.60-ci+azdo.13687604
  Core -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Core/Debug/net10.0-ios26.0/Microsoft.Maui.dll
  Controls.BindingSourceGen -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Controls.BindingSourceGen/Debug/netstandard2.0/Microsoft.Maui.Controls.BindingSourceGen.dll
  ##vso[build.updatebuildnumber]10.0.60-ci+azdo.13687604
  ##vso[build.updatebuildnumber]10.0.60-ci+azdo.13687604
  Maps -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Maps/Debug/net10.0-ios26.0/Microsoft.Maui.Maps.dll
  Controls.Core -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Controls.Core/Debug/net10.0-ios26.0/Microsoft.Maui.Controls.dll
  ##vso[build.updatebuildnumber]10.0.60-ci+azdo.13687604
  ##vso[build.updatebuildnumber]10.0.60-ci+azdo.13687604
  ##vso[build.updatebuildnumber]10.0.60-ci+azdo.13687604
  Controls.Xaml -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Controls.Xaml/Debug/net10.0-ios26.0/Microsoft.Maui.Controls.Xaml.dll
  Microsoft.AspNetCore.Components.WebView.Maui -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Microsoft.AspNetCore.Components.WebView.Maui/Debug/net10.0-ios26.0/Microsoft.AspNetCore.Components.WebView.Maui.dll
  ##vso[build.updatebuildnumber]10.0.60-ci+azdo.13687604
  Controls.Foldable -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Controls.Foldable/Debug/net10.0-ios26.0/Microsoft.Maui.Controls.Foldable.dll
  Controls.Maps -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Controls.Maps/Debug/net10.0-ios26.0/Microsoft.Maui.Controls.Maps.dll
  Detected signing identity:
    Code Signing Key: "" (-)
    Provisioning Profile: "" () - no entitlements
    Bundle Id: com.microsoft.maui.uitests
    App Id: com.microsoft.maui.uitests
  Controls.TestCases.HostApp -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Controls.TestCases.HostApp/Debug/net10.0-ios/iossimulator-arm64/Controls.TestCases.HostApp.dll
  Optimizing assemblies for size may change the behavior of the app. Be sure to test after publishing. See: https://aka.ms/dotnet-illink
  Optimizing assemblies for size. This process might take a while.

Build succeeded.

/Users/cloudtest/vss/_work/1/s/.dotnet/packs/Microsoft.iOS.Sdk.net10.0_26.0/26.0.11017/targets/Xamarin.Shared.Sdk.targets(309,3): warning : RuntimeIdentifier was set on the command line, and will override the value for RuntimeIdentifiers set in the project file. [/Users/cloudtest/vss/_work/1/s/src/Controls/tests/TestCases.HostApp/Controls.TestCases.HostApp.csproj::TargetFramework=net10.0-ios]
    1 Warning(s)
    0 Error(s)

Time Elapsed 00:00:42.89
  Determining projects to restore...
  Restored /Users/cloudtest/vss/_work/1/s/src/Controls/src/BindingSourceGen/Controls.BindingSourceGen.csproj (in 342 ms).
  Restored /Users/cloudtest/vss/_work/1/s/src/Graphics/src/Graphics/Graphics.csproj (in 355 ms).
  Restored /Users/cloudtest/vss/_work/1/s/src/Essentials/src/Essentials.csproj (in 357 ms).
  Restored /Users/cloudtest/vss/_work/1/s/src/Controls/src/Core/Controls.Core.csproj (in 363 ms).
  Restored /Users/cloudtest/vss/_work/1/s/src/Core/src/Core.csproj (in 347 ms).
  8 of 13 projects are up-to-date for restore.
  ##vso[build.updatebuildnumber]10.0.60-ci+azdo.13687604
  Controls.CustomAttributes -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Controls.CustomAttributes/Debug/net10.0/Controls.CustomAttributes.dll
  Graphics -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Graphics/Debug/net10.0/Microsoft.Maui.Graphics.dll
  ##vso[build.updatebuildnumber]10.0.60-ci+azdo.13687604
  Essentials -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Essentials/Debug/net10.0/Microsoft.Maui.Essentials.dll
  ##vso[build.updatebuildnumber]10.0.60-ci+azdo.13687604
  Core -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Core/Debug/net10.0/Microsoft.Maui.dll
  Controls.BindingSourceGen -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Controls.BindingSourceGen/Debug/netstandard2.0/Microsoft.Maui.Controls.BindingSourceGen.dll
  ##vso[build.updatebuildnumber]10.0.60-ci+azdo.13687604
  Controls.Core -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Controls.Core/Debug/net10.0/Microsoft.Maui.Controls.dll
  UITest.Core -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/UITest.Core/Debug/net10.0/UITest.Core.dll
  VisualTestUtils -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/VisualTestUtils/Debug/netstandard2.0/VisualTestUtils.dll
  UITest.Appium -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/UITest.Appium/Debug/net10.0/UITest.Appium.dll
  UITest.NUnit -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/UITest.NUnit/Debug/net10.0/UITest.NUnit.dll
  VisualTestUtils.MagickNet -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/VisualTestUtils.MagickNet/Debug/netstandard2.0/VisualTestUtils.MagickNet.dll
  UITest.Analyzers -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/UITest.Analyzers/Debug/netstandard2.0/UITest.Analyzers.dll
  Controls.TestCases.iOS.Tests -> /Users/cloudtest/vss/_work/1/s/artifacts/bin/Controls.TestCases.iOS.Tests/Debug/net10.0/Controls.TestCases.iOS.Tests.dll
Test run for /Users/cloudtest/vss/_work/1/s/artifacts/bin/Controls.TestCases.iOS.Tests/Debug/net10.0/Controls.TestCases.iOS.Tests.dll (.NETCoreApp,Version=v10.0)
VSTest version 18.0.1 (arm64)

Starting test execution, please wait...
A total of 1 test files matched the specified pattern.
/Users/cloudtest/vss/_work/1/s/artifacts/bin/Controls.TestCases.iOS.Tests/Debug/net10.0/Controls.TestCases.iOS.Tests.dll
[xUnit.net 00:00:00.00] xUnit.net VSTest Adapter v2.8.2+699d445a1a (64-bit .NET 10.0.0)
[xUnit.net 00:00:00.04]   Discovering: Controls.TestCases.iOS.Tests
[xUnit.net 00:00:00.12]   Discovered:  Controls.TestCases.iOS.Tests
NUnit Adapter 4.5.0.0: Test execution started
Running selected tests in /Users/cloudtest/vss/_work/1/s/artifacts/bin/Controls.TestCases.iOS.Tests/Debug/net10.0/Controls.TestCases.iOS.Tests.dll
   NUnit3TestExecutor discovered 1 of 1 NUnit test cases using Current Discovery mode, Non-Explicit run
>>>>> 3/30/2026 7:13:18 AM FixtureSetup for Issue31961(iOS)
>>>>> 3/30/2026 7:13:22 AM VerifyShellNavigationWithModalNavigation Start
>>>>> 3/30/2026 7:13:27 AM VerifyShellNavigationWithModalNavigation Stop
  Passed VerifyShellNavigationWithModalNavigation [5 s]
NUnit Adapter 4.5.0.0: Test execution complete

Test Run Successful.
Total tests: 1
     Passed: 1
 Total time: 20.7868 Seconds

📁 Fix files reverted (2 files)
  • eng/pipelines/ci-copilot.yml
  • src/Controls/src/Core/Page/Page.cs

Copy link
Copy Markdown
Contributor

@kubaflo kubaflo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please verify the ai's summary?

@github-actions
Copy link
Copy Markdown
Contributor

🚀 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 -- 32109

Or

  • Run remotely in PowerShell:
iex "& { $(irm https://raw.githubusercontent.com/dotnet/maui/main/eng/scripts/get-maui-pr.ps1) } 32109"

@MauiBot
Copy link
Copy Markdown
Collaborator

MauiBot commented Mar 30, 2026

🤖 AI Summary

📊 Expand Full Review5004f68 · test modified
🔍 Pre-Flight — Context & Validation

Issue: #31961 - [iOS] App crash with NullReferenceException in ShellSectionRenderer
PR: #32109 - [iOS] Fix App crash with NullReferenceException in ShellSectionRenderer
Author: @devanathan-vaithiyanathan (Syncfusion partner)
Platforms Affected: iOS (regression from .NET 8 → .NET 9)
Files Changed: 1 implementation, 2 test

Issue Summary

When navigating back from Page A and then Page A navigates forward inside Shell's OnNavigated event, the Handler for Page A becomes null on iOS. This causes a NullReferenceException in ShellSectionRenderer.ElementForViewController. The crash is a regression introduced in .NET 9.

Reproduction steps (from issue):

  1. Navigate: MainPage → Page1
  2. Open modal from Page1
  3. Close modal (returns to Page1, triggers Shell OnNavigated)
  4. Page1's OnShellNavigated handler navigates to Page2
  5. Navigate Page2 → Page3 → CRASH (Page1's Handler is null)

Root Cause

iOS OnUnloaded fires immediately during navigation transitions, triggering premature Handler disposal in Page.SendNavigatedFrom() before confirming the page is still accessible via Shell's navigation stack. The NavigationType.Pop branch disposes the Handler even when the page is still reachable.

Fix Approach (PR's Fix)

In src/Controls/src/Core/Page/Page.cs, added an #if IOS guard inside SendNavigatedFrom():

  • Check Shell.Current.CurrentItem?.CurrentItem?.Stack.Contains(this)
  • If the page is still in the current ShellSection's stack, skip Handler disposal

Key Findings

  • Gate PASSED this time (prior review's gate failed — tests were updated since then)
  • Prior reviewer kubaflo confirmed tests didn't catch the bug in the prior review
  • The test was updated to now correctly detect the regression
  • Reviewer jsuarezruiz asked why cross-platform code needed iOS-specific fix → resolved with #if IOS
  • Copilot reviewer flagged trailing whitespace on blank line (line 824 of Page.cs)
  • The Stack check only inspects CurrentItem?.CurrentItem?.Stack — doesn't cover pages in non-current ShellSections or tabs

Edge Cases to Check

  • Page in a non-current tab (ShellSection) — Stack check only covers current section
  • Multi-step modal navigation (modal → modal)
  • Pop-to-root with multiple pages in stack
  • Non-Shell navigation scenarios (should be unaffected — Shell.Current null guard)
  • PageContainer pages (TabbedPage, NavigationPage nested in Shell)

Fix Candidates

# Source Approach Test Result Files Changed Notes
PR PR #32109 #if IOS guard in SendNavigatedFrom(): check Shell.Current.CurrentItem?.CurrentItem?.Stack.Contains(this) before disposing Handler ✅ PASSED (Gate) Page.cs (+18) Platform-scoped to iOS only; trailing whitespace nit

🔧 Fix — Analysis & Comparison

Fix Candidates

# Source Approach Test Result Files Changed Notes
PR PR #32109 #if IOS guard in Page.SendNavigatedFrom(): check Shell.Current.CurrentItem?.CurrentItem?.Stack.Contains(this) before disposing Handler ✅ PASSED (Gate) Page.cs (+18) iOS-only via #if IOS; narrow stack check (current ShellSection only)
1 claude-opus-4.6 Two-part: IsStillInNavigationStack() (this.Navigation?.NavigationStack) in Page.cs + tracker fallback in ShellSectionRenderer.ElementForViewController ✅ PASS Page.cs, ShellSectionRenderer.cs Cross-platform; also fixes crash site defensively
2 claude-sonnet-4.6 Entirely in ShellSectionRenderer.cs: tracker fallback in ElementForViewController + ReconnectPreemptivelyDisposedHandlers() in OnNavigated ✅ PASS ShellSectionRenderer.cs iOS only; more complex; reconnection could have side effects
3 gpt-5.3-codex ShellSection.ContainsInManagedStack() (_navStack + CurrentItem.Page) called from Page.ShouldSkipDisconnectHandlersForShellManagedPage() ✅ PASS Page.cs, ShellSection.cs Authoritative Shell-owned check; cross-platform
4 gpt-5.4 Renderer-owned UIViewController→Element dictionary in ShellSectionRenderer.cs only ❌ FAIL ShellSectionRenderer.cs VC mapping alone insufficient; didn't prevent Handler disposal

Cross-Pollination

Model Round New Ideas? Details
claude-opus-4.6 2 Yes ManualDisconnect policy on Shell-managed pages (prevent auto-disconnect while owned by ShellSection)
claude-sonnet-4.6 2 Yes Use Shell.Navigated event as disposal trigger instead of OnUnloaded for Shell-managed pages
gpt-5.3-codex 2 Yes Navigation-epoch check; PendingShellTransition flag; weak VC↔Page map at Shell level
gpt-5.4 2 Yes Narrower guard targeting specifically the modal-pop transition path (IsPoppingModalStack)

Exhausted: No — models suggested new ideas in Round 2, but all are more invasive architectural changes than the 3 already-passing solutions. With 3 passing candidates providing equivalent bug coverage, additional exploration would increase complexity without clear benefit.

Selected Fix: PR's fix — #if IOS guard in Page.SendNavigatedFrom()Reason: Simplest change (18 lines, 1 file), iOS-scoped via #if IOS which is appropriate since the regression is iOS-specific, passed Gate verification. Attempt 3 (ShellSection-based) is architecturally cleaner but introduces changes to 2 files. The PR fix's narrow stack check (CurrentItem?.CurrentItem?.Stack) is sufficient for the reported scenario.


📋 Report — Final Recommendation

✅ Final Recommendation: APPROVE

Phase Status

Phase Status Notes
Pre-Flight ✅ COMPLETE Issue #31961, iOS regression .NET 8→9, Shell + modal navigation
Gate ✅ PASSED ios — tests FAIL without fix, PASS with fix
Try-Fix ✅ COMPLETE 4 attempts: 3 passing, 1 failing; PR's fix selected as best
Report ✅ COMPLETE

Selected Fix: PR

Summary

PR #32109 fixes a regression introduced in .NET 9 where iOS OnUnloaded fires prematurely during modal close transitions, causing Page.SendNavigatedFrom() to dispose the Handler for a page that is still in Shell's navigation stack. This results in a NullReferenceException in ShellSectionRenderer.ElementForViewController when that page's ViewController is subsequently encountered during navigation.

The fix is minimal, correct, and verified by gate testing. Three independent alternative approaches also passed tests, confirming the PR's approach is sound.

Root Cause

In Page.SendNavigatedFrom(), when NavigationType.Pop or PopToRoot is detected, the Handler is scheduled for disposal. On iOS, the OnUnloaded lifecycle event fires during modal close even for pages that remain in Shell's navigation stack (e.g., Page1 underneath the modal). The disposal proceeds and sets Handler = null on Page1. When ShellSectionRenderer.ElementForViewController later iterates ShellSection.Stack looking for the ViewController, it hits child.Handler as IPlatformViewHandler on Page1 and gets null, returning null from the method. WillShowViewController then dereferences the null element and crashes.

This is a regression because .NET 9 changed the iOS OnUnloaded firing behavior during navigation transitions relative to .NET 8.

Fix Quality

PR's fix: #if IOS guard in Page.SendNavigatedFrom() that checks Shell.Current.CurrentItem?.CurrentItem?.Stack.Contains(this) before allowing Handler disposal.

Assessment: Acceptable — minor concerns

Strengths:

  • Minimal change (18 lines, 1 file)
  • Correctly scoped to iOS via #if IOS
  • Simple and readable logic
  • Gate confirmed: tests fail without fix, pass with fix

Concerns:

  1. Trailing whitespace (line 824) — noted by copilot reviewer, should be fixed
  2. Narrow stack check — only checks CurrentItem?.CurrentItem?.Stack (current ShellSection). Pages in non-current tabs would not be protected, though this is unlikely to be a practical issue for the reported scenario
  3. #if IOS in Page.cs — cross-platform core file with iOS-specific code. Not ideal architecturally, but justified since the issue is iOS-specific behavior

Alternative fix comparison:

  • Attempt 3 (ShellSection-based) is architecturally cleaner (ShellSection.ContainsInManagedStack avoids #if IOS and uses Shell's internal _navStack) but requires 2 files — not a meaningful improvement for the added complexity
  • PR's fix is the simplest passing solution

Required Changes Before Merge

  1. Remove trailing whitespace from blank line at Page.cs:824 (inline suggestion from copilot reviewer already provided)

@MauiBot MauiBot added s/agent-approved AI agent recommends approval - PR fix is correct and optimal s/agent-fix-pr-picked AI could not beat the PR fix - PR is the best among all candidates and removed s/agent-changes-requested AI agent recommends changes - found a better alternative or issues labels Mar 30, 2026
@dotnet dotnet deleted a comment from MauiBot Mar 30, 2026
@kubaflo kubaflo added the s/agent-fix-implemented PR author implemented the agent suggested fix label Mar 30, 2026
@kubaflo kubaflo changed the base branch from main to inflight/current March 30, 2026 21:41
@kubaflo kubaflo merged commit 4035904 into dotnet:inflight/current Mar 30, 2026
11 of 17 checks passed
PureWeen pushed a commit that referenced this pull request Apr 8, 2026
…er (#32109)

<!-- Please let the below note in for people that find this PR -->
> [!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!

<!--
!!!!!!! MAIN IS THE ONLY ACTIVE BRANCH. MAKE SURE THIS PR IS TARGETING
MAIN. !!!!!!!
-->

### Issue Details
In the ShellSectionRenderer class, the ElementForViewController method
is used to find the corresponding .NET MAUI page for a given
ViewController.
While traversing the entire ShellSection stack to locate the respective
page, a push and pop modal operation causes Page1’s handler to become
null.

### Root Cause
iOS OnUnloaded mechanism fires immediately during navigation
transitions, triggering premature Handler disposal before checking if
the page is still accessible for back navigation.

### Description of Change

In Page.cs, added Shell navigation stack check in SendNavigatedFrom() to
prevent Handler disposal when page is still in stack

<!-- Enter description of the fix in this section -->

### Issues Fixed

<!-- Please make sure that there is a bug logged for the issue being
fixed. The bug should describe the problem and how to reproduce it. -->

Fixes #31961 

<!--
Are you targeting main? All PRs should target the main branch unless
otherwise noted.
-->

**Tested the behavior in the following platforms.**
- [x] Android
- [x] Windows
- [x] iOS
- [x] Mac

### Output Screenshot

| Before  | After  |
|---------|--------|
| **iOS**<br> <video
src="https://github.com/user-attachments/assets/b599413f-931e-409b-823c-b39443f53e41"
width="300" height="600"> | **iOS**<br> <video
src="https://github.com/user-attachments/assets/d8f852e8-ed52-40ed-b81a-459e60945cf3"
width="300" height="600"> |

---------
devanathan-vaithiyanathan added a commit to devanathan-vaithiyanathan/maui that referenced this pull request Apr 9, 2026
…er (dotnet#32109)

<!-- Please let the below note in for people that find this PR -->
> [!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!

<!--
!!!!!!! MAIN IS THE ONLY ACTIVE BRANCH. MAKE SURE THIS PR IS TARGETING
MAIN. !!!!!!!
-->

### Issue Details
In the ShellSectionRenderer class, the ElementForViewController method
is used to find the corresponding .NET MAUI page for a given
ViewController.
While traversing the entire ShellSection stack to locate the respective
page, a push and pop modal operation causes Page1’s handler to become
null.

### Root Cause
iOS OnUnloaded mechanism fires immediately during navigation
transitions, triggering premature Handler disposal before checking if
the page is still accessible for back navigation.

### Description of Change

In Page.cs, added Shell navigation stack check in SendNavigatedFrom() to
prevent Handler disposal when page is still in stack

<!-- Enter description of the fix in this section -->

### Issues Fixed

<!-- Please make sure that there is a bug logged for the issue being
fixed. The bug should describe the problem and how to reproduce it. -->

Fixes dotnet#31961 

<!--
Are you targeting main? All PRs should target the main branch unless
otherwise noted.
-->

**Tested the behavior in the following platforms.**
- [x] Android
- [x] Windows
- [x] iOS
- [x] Mac

### Output Screenshot

| Before  | After  |
|---------|--------|
| **iOS**<br> <video
src="https://github.com/user-attachments/assets/b599413f-931e-409b-823c-b39443f53e41"
width="300" height="600"> | **iOS**<br> <video
src="https://github.com/user-attachments/assets/d8f852e8-ed52-40ed-b81a-459e60945cf3"
width="300" height="600"> |

---------
PureWeen pushed a commit that referenced this pull request Apr 14, 2026
…er (#32109)

<!-- Please let the below note in for people that find this PR -->
> [!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!

<!--
!!!!!!! MAIN IS THE ONLY ACTIVE BRANCH. MAKE SURE THIS PR IS TARGETING
MAIN. !!!!!!!
-->

### Issue Details
In the ShellSectionRenderer class, the ElementForViewController method
is used to find the corresponding .NET MAUI page for a given
ViewController.
While traversing the entire ShellSection stack to locate the respective
page, a push and pop modal operation causes Page1’s handler to become
null.

### Root Cause
iOS OnUnloaded mechanism fires immediately during navigation
transitions, triggering premature Handler disposal before checking if
the page is still accessible for back navigation.

### Description of Change

In Page.cs, added Shell navigation stack check in SendNavigatedFrom() to
prevent Handler disposal when page is still in stack

<!-- Enter description of the fix in this section -->

### Issues Fixed

<!-- Please make sure that there is a bug logged for the issue being
fixed. The bug should describe the problem and how to reproduce it. -->

Fixes #31961 

<!--
Are you targeting main? All PRs should target the main branch unless
otherwise noted.
-->

**Tested the behavior in the following platforms.**
- [x] Android
- [x] Windows
- [x] iOS
- [x] Mac

### Output Screenshot

| Before  | After  |
|---------|--------|
| **iOS**<br> <video
src="https://github.com/user-attachments/assets/b599413f-931e-409b-823c-b39443f53e41"
width="300" height="600"> | **iOS**<br> <video
src="https://github.com/user-attachments/assets/d8f852e8-ed52-40ed-b81a-459e60945cf3"
width="300" height="600"> |

---------
@PureWeen PureWeen mentioned this pull request Apr 14, 2026
devanathan-vaithiyanathan added a commit to Tamilarasan-Paranthaman/maui that referenced this pull request Apr 21, 2026
…er (dotnet#32109)

<!-- Please let the below note in for people that find this PR -->
> [!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!

<!--
!!!!!!! MAIN IS THE ONLY ACTIVE BRANCH. MAKE SURE THIS PR IS TARGETING
MAIN. !!!!!!!
-->

### Issue Details
In the ShellSectionRenderer class, the ElementForViewController method
is used to find the corresponding .NET MAUI page for a given
ViewController.
While traversing the entire ShellSection stack to locate the respective
page, a push and pop modal operation causes Page1’s handler to become
null.

### Root Cause
iOS OnUnloaded mechanism fires immediately during navigation
transitions, triggering premature Handler disposal before checking if
the page is still accessible for back navigation.

### Description of Change

In Page.cs, added Shell navigation stack check in SendNavigatedFrom() to
prevent Handler disposal when page is still in stack

<!-- Enter description of the fix in this section -->

### Issues Fixed

<!-- Please make sure that there is a bug logged for the issue being
fixed. The bug should describe the problem and how to reproduce it. -->

Fixes dotnet#31961 

<!--
Are you targeting main? All PRs should target the main branch unless
otherwise noted.
-->

**Tested the behavior in the following platforms.**
- [x] Android
- [x] Windows
- [x] iOS
- [x] Mac

### Output Screenshot

| Before  | After  |
|---------|--------|
| **iOS**<br> <video
src="https://github.com/user-attachments/assets/b599413f-931e-409b-823c-b39443f53e41"
width="300" height="600"> | **iOS**<br> <video
src="https://github.com/user-attachments/assets/d8f852e8-ed52-40ed-b81a-459e60945cf3"
width="300" height="600"> |

---------
Ahamed-Ali pushed a commit that referenced this pull request Apr 22, 2026
…er (#32109)

<!-- Please let the below note in for people that find this PR -->
> [!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!

<!--
!!!!!!! MAIN IS THE ONLY ACTIVE BRANCH. MAKE SURE THIS PR IS TARGETING
MAIN. !!!!!!!
-->

### Issue Details
In the ShellSectionRenderer class, the ElementForViewController method
is used to find the corresponding .NET MAUI page for a given
ViewController.
While traversing the entire ShellSection stack to locate the respective
page, a push and pop modal operation causes Page1’s handler to become
null.

### Root Cause
iOS OnUnloaded mechanism fires immediately during navigation
transitions, triggering premature Handler disposal before checking if
the page is still accessible for back navigation.

### Description of Change

In Page.cs, added Shell navigation stack check in SendNavigatedFrom() to
prevent Handler disposal when page is still in stack

<!-- Enter description of the fix in this section -->

### Issues Fixed

<!-- Please make sure that there is a bug logged for the issue being
fixed. The bug should describe the problem and how to reproduce it. -->

Fixes #31961 

<!--
Are you targeting main? All PRs should target the main branch unless
otherwise noted.
-->

**Tested the behavior in the following platforms.**
- [x] Android
- [x] Windows
- [x] iOS
- [x] Mac

### Output Screenshot

| Before  | After  |
|---------|--------|
| **iOS**<br> <video
src="https://github.com/user-attachments/assets/b599413f-931e-409b-823c-b39443f53e41"
width="300" height="600"> | **iOS**<br> <video
src="https://github.com/user-attachments/assets/d8f852e8-ed52-40ed-b81a-459e60945cf3"
width="300" height="600"> |

---------
PureWeen pushed a commit that referenced this pull request Apr 22, 2026
…er (#32109)

<!-- Please let the below note in for people that find this PR -->
> [!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!

<!--
!!!!!!! MAIN IS THE ONLY ACTIVE BRANCH. MAKE SURE THIS PR IS TARGETING
MAIN. !!!!!!!
-->

### Issue Details
In the ShellSectionRenderer class, the ElementForViewController method
is used to find the corresponding .NET MAUI page for a given
ViewController.
While traversing the entire ShellSection stack to locate the respective
page, a push and pop modal operation causes Page1’s handler to become
null.

### Root Cause
iOS OnUnloaded mechanism fires immediately during navigation
transitions, triggering premature Handler disposal before checking if
the page is still accessible for back navigation.

### Description of Change

In Page.cs, added Shell navigation stack check in SendNavigatedFrom() to
prevent Handler disposal when page is still in stack

<!-- Enter description of the fix in this section -->

### Issues Fixed

<!-- Please make sure that there is a bug logged for the issue being
fixed. The bug should describe the problem and how to reproduce it. -->

Fixes #31961 

<!--
Are you targeting main? All PRs should target the main branch unless
otherwise noted.
-->

**Tested the behavior in the following platforms.**
- [x] Android
- [x] Windows
- [x] iOS
- [x] Mac

### Output Screenshot

| Before  | After  |
|---------|--------|
| **iOS**<br> <video
src="https://github.com/user-attachments/assets/b599413f-931e-409b-823c-b39443f53e41"
width="300" height="600"> | **iOS**<br> <video
src="https://github.com/user-attachments/assets/d8f852e8-ed52-40ed-b81a-459e60945cf3"
width="300" height="600"> |

---------
PureWeen pushed a commit that referenced this pull request Apr 28, 2026
…er (#32109)

<!-- Please let the below note in for people that find this PR -->
> [!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!

<!--
!!!!!!! MAIN IS THE ONLY ACTIVE BRANCH. MAKE SURE THIS PR IS TARGETING
MAIN. !!!!!!!
-->

### Issue Details
In the ShellSectionRenderer class, the ElementForViewController method
is used to find the corresponding .NET MAUI page for a given
ViewController.
While traversing the entire ShellSection stack to locate the respective
page, a push and pop modal operation causes Page1’s handler to become
null.

### Root Cause
iOS OnUnloaded mechanism fires immediately during navigation
transitions, triggering premature Handler disposal before checking if
the page is still accessible for back navigation.

### Description of Change

In Page.cs, added Shell navigation stack check in SendNavigatedFrom() to
prevent Handler disposal when page is still in stack

<!-- Enter description of the fix in this section -->

### Issues Fixed

<!-- Please make sure that there is a bug logged for the issue being
fixed. The bug should describe the problem and how to reproduce it. -->

Fixes #31961 

<!--
Are you targeting main? All PRs should target the main branch unless
otherwise noted.
-->

**Tested the behavior in the following platforms.**
- [x] Android
- [x] Windows
- [x] iOS
- [x] Mac

### Output Screenshot

| Before  | After  |
|---------|--------|
| **iOS**<br> <video
src="https://github.com/user-attachments/assets/b599413f-931e-409b-823c-b39443f53e41"
width="300" height="600"> | **iOS**<br> <video
src="https://github.com/user-attachments/assets/d8f852e8-ed52-40ed-b81a-459e60945cf3"
width="300" height="600"> |

---------
PureWeen added a commit that referenced this pull request Apr 29, 2026
## Blazor
- Fix: Filter precompressed RCL assets from MAUI Blazor Hybrid APKs by
@mattleibow in #33917
  <details>
  <summary>🔧 Fixes</summary>

- [.NET MAUI Blazor Hybrid App should not precompress
assets](#33773)
  </details>

- [Windows] Fix for Runtime error when closing external window with WPF
Webview Control by @BagavathiPerumal in
#34006
  <details>
  <summary>🔧 Fixes</summary>

- [Runtime error when closing external window with WPF Webview
Control](#32944)
  </details>

## Button
- [Android] ImageButton CornerRadius not being applied - fix by @kubaflo
in #30074
  <details>
  <summary>🔧 Fixes</summary>

- [ImageButton CornerRadius not being applied on
Android](#23854)
  </details>

- Fix Disabled visual state ignored when Button has locally-set
BackgroundColor/TextColor by @Dhivya-SF4094 in
#34444
  <details>
  <summary>🔧 Fixes</summary>

- [[regression/9.0] VisualState "Disabled" is not properly applied for
Button with custom
appearance](#34363)
  </details>

## CollectionView
- Fix CollectionView grid spacing updates for first row and column by
@KarthikRajaKalaimani in #34527
  <details>
  <summary>🔧 Fixes</summary>

- [[MAUI] I2_Vertical grid for horizontal Item Spacing and Vertical Item
Spacing - horizontally updating the spacing only applies to the second
column](#34257)
  </details>

- Fix CollectionView record struct selection on Windows by
@jeremy-visionaid in #33488

- [Android] Ensure disconnected ItemsViewHandler doesn't hold onto the
items source by @filipnavara in
#24610
  <details>
  <summary>🔧 Fixes</summary>

- [Crash on NullReferenceException with measurement cells in
CollectionView](#24304)
  </details>

- [Windows] Fixed VisualState Setters not working properly for
CollectionView by @Dhivya-SF4094 in
#27230
  <details>
  <summary>🔧 Fixes</summary>

- [VisualState Setters not working properly on Windows for a
CollectionView](#27086)
- [[regression/8.0.3] [Windows][CollectionView]Label Disappear when set
Style in
ContentPage.Resources](#19209)
- [[Windows] Label style defined as ContentPage Resource doesn't
propagate to
CollectionView](#18701)
  </details>

- [Windows] Fixed Margin doesn't work inside CollectionView EmptyView by
@Dhivya-SF4094 in #29897
  <details>
  <summary>🔧 Fixes</summary>

- [Margin doesn't work inside CollectionView
EmptyView](#8494)
  </details>

- [Android, Windows] Fix CarouselView PreviousPosition/PreviousItem
incorrect during animated ScrollTo() by @praveenkumarkarunanithi in
#34570
  <details>
  <summary>🔧 Fixes</summary>

- [[Android] CurrentItemChangedEventArgs.PreviousItem and
PositionChangedEventArgs.PreviousPosition Not Updating Correctly When
Using ScrollTo or Setting
Position](#29544)
  </details>

- [iOS] CarouselView2: Update internal scroll indicators for
compositional layout by @SubhikshaSf4851 in
#33639
  <details>
  <summary>🔧 Fixes</summary>

- [[iOS] Horizontal Scroll Bar Not Visible on CarouselView
(CV2)](#29390)
  </details>

- [CarouselViewHandler2] Fir fox CurrentItem does not work when
ItemSpacing is set by @SyedAbdulAzeemSF4852 in
#32135
  <details>
  <summary>🔧 Fixes</summary>

- [[CarouselViewHandler2] CurrentItem does not work when ItemSpacing is
set](#32048)
  </details>

- [iOS] Fix for Incorrect Scroll in Loop Mode When CurrentItem Is Not
Found in ItemsSource by @SyedAbdulAzeemSF4852 in
#32141
  <details>
  <summary>🔧 Fixes</summary>

- [[Android & iOS] Setting an invalid CurrentItem causes scroll to last
item in looped
CarouselView](#32139)
  </details>

- [Android] IndicatorView: Add TalkBack accessibility descriptions for
indicators by @praveenkumarkarunanithi in
#31775
  <details>
  <summary>🔧 Fixes</summary>

- [[Android] IndicatorView does not convey correct accessibility
information](#31446)
  </details>

- [iOS, macOS] Fixed CollectionView KeepLastItemInView Not Updating
Correctly When Items Are Added Dynamically by @NanthiniMahalingam in
#32191
  <details>
  <summary>🔧 Fixes</summary>

- [[.NET10] I9 - Scroll_Position - "KeepLastItemInView" does not keep
the last item at the end of the displayed list when adding new
items.](#31825)
  </details>

- [Windows, Android] Resolved issue with dynamic Header/Footer
reassignment in CollectionView. by @prakashKannanSf3972 in
#28403
  <details>
  <summary>🔧 Fixes</summary>

- [[Windows, Android] Toggling Header/Footer in CollectionView
Dynamically is not working](#27959)
- [CollectionView HeaderTemplate and FooterTemplate are not displayed
when ItemsSource is initially set to
null](#28337)
- [[Android] Header and Footer Not Visible in CollectionView When
EmptyView is Selected
First](#28351)
  </details>

- [Android] Fix CollectionView inside disabled RefreshView blocks scroll
by @Vignesh-SF3580 in #34702
  <details>
  <summary>🔧 Fixes</summary>

- [C6-The C6 page cannot scroll on Windows and Android
platforms.](#34666)
  </details>

- [Android] CollectionView: Fix SelectedItem visual state not applying
when re-selecting same item by @KarthikRajaKalaimani in
#31591
  <details>
  <summary>🔧 Fixes</summary>

- [CollectionView - SelectedItem visual state manager not
working](#20062)
  </details>

- [Windows] Fixed CollectionView.EmptyView can not be removed by setting
it to Null by @Dhivya-SF4094 in
#29487
  <details>
  <summary>🔧 Fixes</summary>

- [[Windows] CollectionView.EmptyView can not be removed by setting it
to Null](#18657)
- [[Windows] EmptyViewTemplate Not Working in
CarouselView](#29463)
- [EmptyViewTemplate does not do
anything](#18551)
- [[MAUI] I5_EmptyView - The data template selector cannot display the
correct string.](#23330)
  </details>

- [iOS] Support for IsSwipeEnabled on CarouselView2 by @kubaflo in
#29996
  <details>
  <summary>🔧 Fixes</summary>

- [[iOS] IsSwipeEnabled Not Working on CarouselView
(CV2)](#29391)
  </details>

- [iOS, MacOS] Fixed FlowDirection not working on Header/Footer in
CollectionView by @Dhivya-SF4094 in
#32775
  <details>
  <summary>🔧 Fixes</summary>

- [[iOS, MacOS] FlowDirection not working on Header/Footer in
CollectionView](#32771)
  </details>

- [iOS] CollectionView: Fix drag-and-drop reordering into empty groups
by @SuthiYuvaraj in #34151
  <details>
  <summary>🔧 Fixes</summary>

- [CollectionView Drag and Drop Reordering Can't Drop in Empty
Group](#12008)
  </details>

- [Android] CollectionView: Fix drag-and-drop reordering into empty
groups by @SuthiYuvaraj in #31867
  <details>
  <summary>🔧 Fixes</summary>

- [CollectionView Drag and Drop Reordering Can't Drop in Empty
Group](#12008)
  </details>

- [iOS] Fix vertical CarouselView MandatorySingle snapping on iOS by
@Vignesh-SF3580 in #34700
  <details>
  <summary>🔧 Fixes</summary>

- [CarouselView vertical snap points ignored on iOS with
Microsoft.Maui.Controls v10.0.20 (regression from
v9.0.120)](#33308)
  </details>

- [iOS26] Fix CarouselView scrolling to wrong item when navigating to
last item by @Vignesh-SF3580 in
#34013
  <details>
  <summary>🔧 Fixes</summary>

- [[iOS 26] CarouselView does not scroll to the correct last
item](#33770)
  </details>

- Fixed the OnPlatform does not work for header property in Collection
view by @NanthiniMahalingam in #28935
  <details>
  <summary>🔧 Fixes</summary>

- [OnPlatform does not work in Header of
CollectionView](#25124)
  </details>

- [Android] [Candidate branch] Fix
VerifySelectedItemClearsOnNullAssignment,
CollectionViewSelectionShouldClear, SelectedItemVisualIsCleared UI test
failure on Android by @KarthikRajaKalaimani in
#34928

## DateTimePicker
- [iOS] Fix for DatePicker FlowDirection Not Working on iOS by
@SyedAbdulAzeemSF4852 in #30193
  <details>
  <summary>🔧 Fixes</summary>

- [[iOS] DatePicker FlowDirection Not Working on
iOS](#30065)
  </details>

## Drawing
- [Shapes] Line: Fix asymmetric Stretch.None path translation when
right/bottom edge overflows by @NirmalKumarYuvaraj in
#34385
  <details>
  <summary>🔧 Fixes</summary>

- [Line coordinates not computed
correctly](#11404)
- [Lines not drawing
correctly](#26961)
  </details>

- [Android] Fixed GraphicsView drawable is visible outside the canvas by
@NirmalKumarYuvaraj in #28353
  <details>
  <summary>🔧 Fixes</summary>

- [[Android] GraphicsView, The drawn image can also be visible outside
the canvas](#20834)
  </details>

- Fixed Custom Drawable does not support binding by @NirmalKumarYuvaraj
in #29442
  <details>
  <summary>🔧 Fixes</summary>

- [Custom IDrawable control does not databind to a model property when
used inside a CollectionView
ItemTemplate](#20991)
  </details>

- Added a support for GradientBrushes on Shape.Stroke by @kubaflo in
#22208
  <details>
  <summary>🔧 Fixes</summary>

- [GradientBrushes are not supported on
Shape.Stroke](#21983)
  </details>

## Editor
- Fixed Editor HorizontalTextAlignment does not update at run time by
@NirmalKumarYuvaraj in #25129
  <details>
  <summary>🔧 Fixes</summary>

- [Editor HorizontalTextAlignment Does not
Works.](#10987)
- [[iOS/MacOs] Right-To-Left (RTL) alignment is not applied to Editor
placeholder](#30052)
  </details>

- [Windows] Fixed Entry Editor placeholder Text CharacterSpacing by
@SubhikshaSf4851 in #30324
  <details>
  <summary>🔧 Fixes</summary>

- [[Windows] CharacterSpacing not applied to Placeholder text in Entry
and Editor controls](#30071)
  </details>

## Entry
- [Windows] Fix fo setting an Entry's Keyboard to Date causes it to be
interpreted as a password input by @SyedAbdulAzeemSF4852 in
#29344
  <details>
  <summary>🔧 Fixes</summary>

- [[Windows] Entry Keyboad-Type "Date" results in
Password-Entry](#28975)
  </details>

- [Android] Exception thrown when give more than 5000 characters to the
Text property of Entry. by @KarthikRajaKalaimani in
#30242
  <details>
  <summary>🔧 Fixes</summary>

- [Android crash when Entry has >5000
characters](#30144)
  </details>

## Essentials
- Bump MonoApiToolsMSBuildTasksPackageVersion to 0.5.0 and ship
Essentials.AI public APIs by @mattleibow via @Copilot in
#34574

- [Mac] DeviceDisplay.KeepScreenOn not being respected on Mac OS by
@HarishwaranVijayakumar in #32708
  <details>
  <summary>🔧 Fixes</summary>

- [[Mac Catalyst] DeviceDisplay.KeepScreenOn not being respected on Mac
OS](#26059)
  </details>

## Flyoutpage
- [Windows] FlyoutPage: update CollapseStyle at runtime by
@devanathan-vaithiyanathan in #29927
  <details>
  <summary>🔧 Fixes</summary>

- [Flyout Page SetCollapseStyle doesn't have any
change](#18200)
  </details>

## Gestures
- [Android] Fix for TapGestureRecognizer doesn't fire by
@HarishwaranVijayakumar in #34497
  <details>
  <summary>🔧 Fixes</summary>

- [[Android] TapGestureRecognizer doesn't
fire](#5825)
  </details>

## Image
- [Android] Fix Share.RequestAsync SecurityException on Android 10+
caused by missing ClipData by @HarishwaranVijayakumar in
#34417
  <details>
  <summary>🔧 Fixes</summary>

- [[Bug] Share.RequestAsync throws java.lang.SecurityException
(uid=1000) on Android 10+ due to missing
intent.ClipData](#34370)
  </details>

- [Windows]Fixed the MauiImage with logical name containing path issue
by @sheiksyedm in #32864
  <details>
  <summary>🔧 Fixes</summary>

- [MauiImage with LogicalName containing path - is not working on
Windows](#32356)
  </details>

- [Android, Windows & iOS] Fix Downsize/ScaleImage to maintain aspect
ratio and prevent upscaling by @SyedAbdulAzeemSF4852 in
#30808
  <details>
  <summary>🔧 Fixes</summary>

- [[Android & Windows] In GraphicsView, the aspect ratio is not
maintained when Downsize is called with both maxWidth and
maxHeight](#30803)
  </details>

## Label
- [iOS , macOS] Fixed Label text cropping when a width request is
specified on the label inside a VerticalStackLayout with specified width
request by @NanthiniMahalingam in
#29166
  <details>
  <summary>🔧 Fixes</summary>

- [Label text gets cropped when a width request is specified on the
label inside a
VerticalStackLayout](#28660)
- [[iOS] Label with a fixed WidthRequest has wrong
height](#26644)
  </details>

- [Android] Fix Label word wrapping clips text depending on alignment
and layout options by @Dhivya-SF4094 in
#34533
  <details>
  <summary>🔧 Fixes</summary>

- [Bug: Android Label word wrapping clips text depending on alignment
and layout options](#34459)
  </details>

- LineHeight and decorations for HTML Label - fix by @kubaflo in
#31202
  <details>
  <summary>🔧 Fixes</summary>

- [LineHeight with HTML Label not
working](#22193)
  - [lineheight is broken ](#22197)
  </details>

- [iOS] Fix Label with TailTruncation not rendering after
empty-to-non-empty text transition by @kubaflo in
#34812
  <details>
  <summary>🔧 Fixes</summary>

- [Label with LineBreakMode="TailTruncation" does not render text if
initial Text is null or empty on first render
(iOS)](#34591)
  </details>

## Layout
- [Android] Fix overflowing children clipped when parent Opacity < 1 by
@SyedAbdulAzeemSF4852 in #34565
  <details>
  <summary>🔧 Fixes</summary>

- [Maui Android parent view inappropriately creates clipping mask when
its opacity is less than 1, cropping out
children](#22038)
  </details>

- Fixed the FlexLayout reverse issue with the AlignContent by
@Ahamed-Ali in #32134
  <details>
  <summary>🔧 Fixes</summary>

- [FlexLayout alignment issue when Wrap is set to Reverse and
AlignContent is set to SpaceAround, SpaceBetween or
SpaceEvenly](#31565)
  </details>

- [iOS/Mac] Fixed BoxView in AbsoluteLayout did not return to its
default AutoSize for Height and Width after reset by @Dhivya-SF4094 in
#31648
  <details>
  <summary>🔧 Fixes</summary>

- [[iOS, Catalyst] BoxView in AbsoluteLayout does not return to default
AutoSize for Height/Width after
reset](#31496)
  </details>

## Map
- [Windows] Implement WinUI 3 MapControl handler using Azure Maps by
@jfversluis in #34138

## Modal
- [Android] PopToRootAsync for modal pages - improvements by @kubaflo in
#26851
  <details>
  <summary>🔧 Fixes</summary>

- [Shell PopToRootAsync doesn't happen instantly - previous pages flash
quickly. Only happens in NET
9](#26846)
  </details>

- [Android] Fix HideSoftInputOnTapped doesn't work on Modal Pages by
@HarishwaranVijayakumar in #34770
  <details>
  <summary>🔧 Fixes</summary>

- [HideSoftInputOnTapped doesn't work on Modal
Pages](#34730)
  </details>

## Navigation
- [iOS] Alert popup may be displayed on wrong window when modal page
navigation is in progress - fix by @kubaflo in
#31016
  <details>
  <summary>🔧 Fixes</summary>

- [Alert popup may be displayed on wrong window when modal page
navigation is in progress on
iOS/MacOS](#30970)
  </details>

- [Android] Page: Fix OnNavigatedTo called twice when NavigationPage is
FlyoutPage Detail by @KarthikRajaKalaimani in
#31931
  <details>
  <summary>🔧 Fixes</summary>

- [NavigationPage and FlyoutPage both call OnNavigatedTo, so it is
called twice](#23902)
  </details>

## Picker
- Fixed the Picker didn't dismiss it when tapping outside on iOS and
MacCatalyst platform. by @KarthikRajaKalaimani in
#30067
  <details>
  <summary>🔧 Fixes</summary>

- [[regression/8.0.3] iOS Picker dismiss does not work when clicking
outside of the Picker](#19168)
  </details>

- [Windows] Fixed Picker items width wont resize back by
@SubhikshaSf4851 in #33042
  <details>
  <summary>🔧 Fixes</summary>

- [Picker items width won't resize back when its container window gets
resized down.](#32984)
  </details>

## RadioButton
- Fix TalkBack not correctly narrating RadioButtons with Content by
@SubhikshaSf4851 in #34521
  <details>
  <summary>🔧 Fixes</summary>

- [[Android] TalkBack does not correctly narrate RadioButtons with
Content](#34322)
  </details>

## SafeArea
- [Android] Fix SafeAreaShouldWorkOnAllShellTabs test failure on API 36
by @praveenkumarkarunanithi in #34239

## ScrollView
- [iOS] Preserve ScrollView offsets when Orientation changes to Neither
by @Vignesh-SF3580 in #34672
  <details>
  <summary>🔧 Fixes</summary>

- [Incorrect implementation of
ScrollView.Orientation](#34583)
  </details>

## Searchbar
- [Android] Fix SearchBar text bleeding between instances after
navigation by @SyedAbdulAzeemSF4852 in
#34703
  <details>
  <summary>🔧 Fixes</summary>

- [MAUI Android: SearchBar copies content from one to the
other](#20348)
  </details>

- Fixed SearchBar CursorPosition and SelectionLength not updating when
typing by @Dhivya-SF4094 in #34347
  <details>
  <summary>🔧 Fixes</summary>

- [SearchBar - CursorPosition and SelectionLength are not updated when
the user types](#30779)
  </details>

## SearchBar
- [Windows] Fixed SearchHandler issues by @Tamilarasan-Paranthaman in
#29520
  <details>
  <summary>🔧 Fixes</summary>

- [[Windows] SearchHandler APIs are not functioning
properly](#29493)
  </details>

## Shell
- [iOS, Mac] Fix for Background set to Transparent doesn't have the same
behavior as BackgroundColor Transparent by @HarishwaranVijayakumar in
#32245
  <details>
  <summary>🔧 Fixes</summary>

- [Background set to Transparent doesn't have the same behavior as
BackgroundColor =
Transparent](#22769)
  </details>

- [iOS] Fix App crash with NullReferenceException in
ShellSectionRenderer by @devanathan-vaithiyanathan in
#32109
  <details>
  <summary>🔧 Fixes</summary>

- [[iOS] App crash with NullReferenceException in
ShellSectionRenderer](#31961)
  </details>

- [Android] Fixed back button icon selection logic in
ShellToolbarTracker by @kubaflo in
#32080
  <details>
  <summary>🔧 Fixes</summary>

- [IconOverride in Shell.BackButtonBehavior does not
work.](#32050)
  </details>

- Fix TabBarIsVisible Not Updating Dynamically When Set on ShellContent
by @Vignesh-SF3580 in #33090
  <details>
  <summary>🔧 Fixes</summary>

- [Shell.TabBarIsVisible is not updated dynamically at
runtime](#32994)
  </details>

- [iOS, macOS] Shell: Fix RTL flow direction for flyout, menu cells, tab
bar, and Locked flyout position by @NanthiniMahalingam in
#32701
  <details>
  <summary>🔧 Fixes</summary>

- [[iOS, Mac Catalyst] Shell Flyout and Content Do Not Fully Support
RightToLeft (RTL)](#32419)
  </details>

- [IOS] Inconsistent Resize Behavior for Header/Footer - fix by @kubaflo
in #28713
  <details>
  <summary>🔧 Fixes</summary>

- [[IOS, Mac] Inconsistent Resize Behavior for
Header/Footer](#26397)
- [Enable Shell Flyout Header/Footer resize tests on
iOS/Catalyst](#33501)
  </details>

- [Android] Fix for SearchHandler retaining previous page SearchView
data in pages within Shell sections by @BagavathiPerumal in
#29545
  <details>
  <summary>🔧 Fixes</summary>

- [[Shell][Android] The truth is out there...but not on top tab search
handlers](#8716)
  </details>

- [Android] Fix empty space above TabBar after navigating back when
TabBar visibility is toggled by @praveenkumarkarunanithi in
#34324
  <details>
  <summary>🔧 Fixes</summary>

- [Empty space appears above TabBar after navigating back when TabBar
visibility is toggled](#33703)
- [Grid with SafeAreaEdges=Container has incorrect size when tab bar
appears](#34256)
  </details>

## SwipeView
- [Android] SwipeView: Use MeasureSpecMode.Exactly for SwipeItem layout
to fix text visibility by @Ahamed-Ali in
#27399
  <details>
  <summary>🔧 Fixes</summary>

- [[Android] Right SwipeView items are not visible in the
SwipeView.](#27367)
  </details>

- [Android] Prevent the tap that closes an open SwipeView from being
propagated to children by @sjordanGSS in
#24275
  <details>
  <summary>🔧 Fixes</summary>

- [Tapping to close a SwipeView will activate TapGestureRecognizers on
.Content](#23921)
  </details>

## Switch
- [iOS & Mac] Fix for SearchHandler retains previous page state when
switching top tabs by @BagavathiPerumal in
#34735
  <details>
  <summary>🔧 Fixes</summary>

- [[Shell] [iOS & Mac] SearchHandler retains previous page state when
switching top tabs](#34693)
  </details>

## TabbedPage
- [Android] Fixed NullReferenceException in app with TabBar after
returning from minimized state by @NirmalKumarYuvaraj in
#34779
  <details>
  <summary>🔧 Fixes</summary>

- [NullReferenceException in app with TabBar after returning from
minimized state](#34720)
  </details>

## Titlebar
- Fixed BindingContext of the Window TitleBar is not being passed on to
its child content. by @NirmalKumarYuvaraj in
#30080
  <details>
  <summary>🔧 Fixes</summary>

- [The BindingContext of the Window TitleBar is not being passed on to
its child content.](#24831)
  </details>

- [Windows/Mac] Fix RTL FlowDirection causes overlap with native window
control buttons in TitleBar by @devanathan-vaithiyanathan in
#30400
  <details>
  <summary>🔧 Fixes</summary>

- [[Windows, Mac] RTL FlowDirection causes overlap with native window
control buttons in
TitleBar](#30399)
  </details>

## WebView
- [Windows] Fix WebView background color not being applied by
@SubhikshaSf4851 in #34599
  <details>
  <summary>🔧 Fixes</summary>

- [WebView background color has changed after update, can't
override.](#34518)
  </details>

- [Android] Fix for WebView/HybridWebView briefly flashes full screen
before layout completes by @praveenkumarkarunanithi in
#33207
  <details>
  <summary>🔧 Fixes</summary>

- [[Android] HybridWebView briefly resizes to full screen when page is
opened before snapping back to correct
size](#31475)
  </details>

## Xaml
- Improved style inheritance by @kubaflo in
#31317
  <details>
  <summary>🔧 Fixes</summary>

- [Styles based on a style that is based on another style that uses
AppThemeBinding do not inherit properties
correctly.](#31280)
  </details>

- Fix for VisualStateManager Setter.TargetName failing when
ControlTemplate is applied by @BagavathiPerumal in
#33208
  <details>
  <summary>🔧 Fixes</summary>

- [Setter.TargetName + ControlTemplate
crash](#26977)
  </details>


<details>
<summary>🧪 Testing (4)</summary>

- [Testing] Additional Feature Matrix Event Test Cases for Slider and
ScrollView by @nivetha-nagalingam in
#34352
- [Testing] Fixed Build error on inflight/ candidate PR 34885 by
@NafeelaNazhir in #34891
- [Testing] Fixed UI test image failure in PR 34885 - [13/4/2026] by
@NafeelaNazhir in #34933
- Fixed test failure - CursorPositionUpdatesWhenSearchBarGainsFocus by
@Dhivya-SF4094 in #34938

</details>

<details>
<summary>📦 Other (3)</summary>

- Fix Loaded event not called for MAUI View added to native View by
@NirmalKumarYuvaraj in #34345
  <details>
  <summary>🔧 Fixes</summary>

- [Loaded event not called for MAUI View added to native
View](#34310)
  </details>
- Add public IAlertManager and IAlertManagerSubscription interfaces by
@Redth in #34228
  <details>
  <summary>🔧 Fixes</summary>

- [Alert/Dialog system (`DisplayAlert`, `DisplayActionSheet`,
`DisplayPromptAsync`) needs a public extensibility
point](#34104)
  </details>
- Fix crash when displaying alerts on unloaded pages by @kubaflo in
#33288

</details>

<details>
<summary>📝 Issue References</summary>

Fixes #5825, Fixes #8494, Fixes #8716, Fixes #10987, Fixes #11404, Fixes
#12008, Fixes #18200, Fixes #18551, Fixes #18657, Fixes #18701, Fixes
#19168, Fixes #19209, Fixes #20062, Fixes #20348, Fixes #20834, Fixes
#20991, Fixes #21983, Fixes #22038, Fixes #22193, Fixes #22197, Fixes
#22769, Fixes #23330, Fixes #23854, Fixes #23902, Fixes #23921, Fixes
#24304, Fixes #24831, Fixes #25124, Fixes #26059, Fixes #26397, Fixes
#26644, Fixes #26846, Fixes #26961, Fixes #26977, Fixes #27086, Fixes
#27367, Fixes #27959, Fixes #28337, Fixes #28351, Fixes #28660, Fixes
#28975, Fixes #29390, Fixes #29391, Fixes #29463, Fixes #29493, Fixes
#29544, Fixes #30052, Fixes #30065, Fixes #30071, Fixes #30144, Fixes
#30399, Fixes #30779, Fixes #30803, Fixes #30970, Fixes #31280, Fixes
#31446, Fixes #31475, Fixes #31496, Fixes #31565, Fixes #31825, Fixes
#31961, Fixes #32048, Fixes #32050, Fixes #32139, Fixes #32356, Fixes
#32419, Fixes #32771, Fixes #32944, Fixes #32984, Fixes #32994, Fixes
#33308, Fixes #33501, Fixes #33703, Fixes #33770, Fixes #33773, Fixes
#34104, Fixes #34256, Fixes #34257, Fixes #34310, Fixes #34322, Fixes
#34363, Fixes #34370, Fixes #34459, Fixes #34518, Fixes #34583, Fixes
#34591, Fixes #34666, Fixes #34693, Fixes #34720, Fixes #34730

</details>

**Full Changelog**:
main...inflight/candidate
@github-actions github-actions Bot locked and limited conversation to collaborators Apr 30, 2026
@kubaflo kubaflo added s/agent-gate-passed AI verified tests catch the bug (fail without fix, pass with fix) and removed s/agent-gate-failed AI could not verify tests catch the bug labels May 20, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

area-controls-shell Shell Navigation, Routes, Tabs, Flyout community ✨ Community Contribution partner/syncfusion Issues / PR's with Syncfusion collaboration s/agent-approved AI agent recommends approval - PR fix is correct and optimal s/agent-fix-implemented PR author implemented the agent suggested fix s/agent-fix-pr-picked AI could not beat the PR fix - PR is the best among all candidates s/agent-gate-passed AI verified tests catch the bug (fail without fix, pass with fix) s/agent-reviewed PR was reviewed by AI agent workflow (full 4-phase review) s/agent-suggestions-implemented Maintainer applies when PR author adopts agent's recommendation

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[iOS] App crash with NullReferenceException in ShellSectionRenderer

10 participants