Merged
Conversation
github-actions
bot
added
the
area/skia ✏️
Contributor
There was a problem hiding this comment.
Pull request overview
Updates flyout-related dependency properties and FlyoutBase behavior to prevent DataContext-based retention (leaks) when flyouts are shared across multiple controls, with Skia-focused runtime test coverage.
Changes:
- Prevent flyout DP values (ContextFlyout/SelectionFlyout/ProofingMenuFlyout) from inheriting DataContext.
- Ensure flyout presenters receive the placement target DataContext while open, and clear it on close to avoid leaks.
- Add Skia runtime tests validating no ViewModel leak and correct DataContext forwarding.
Reviewed changes
Copilot reviewed 5 out of 5 changed files in this pull request and generated 3 comments.
Show a summary per file
| File | Description |
|---|---|
src/Uno.UI/UI/Xaml/UIElement.Properties.cs |
Changes ContextFlyout DP metadata to avoid DataContext inheritance. |
src/Uno.UI/UI/Xaml/Controls/TextBox/TextBox.skia.cs |
Updates SelectionFlyout/ProofingMenuFlyout DP metadata to avoid DataContext inheritance. |
src/Uno.UI/UI/Xaml/Controls/TextBlock/TextBlock.skia.cs |
Updates SelectionFlyout DP metadata to avoid DataContext inheritance. |
src/Uno.UI/UI/Xaml/Controls/Flyout/FlyoutBase.cs |
Forwards DataContext to presenter on show and clears it on close to prevent retention. |
src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml/Given_UIElement.ContextFlyoutLeak.cs |
Adds runtime tests for shared ContextFlyout leak regression and presenter DataContext forwarding. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml/Given_UIElement.ContextFlyoutLeak.cs
Outdated
Show resolved
Hide resolved
src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml/Given_UIElement.ContextFlyoutLeak.cs
Outdated
Show resolved
Hide resolved
Contributor
|
🤖 Your WebAssembly Skia Sample App stage site is ready! Visit it here: https://unowasmprstaging.z20.web.core.windows.net/pr-22750/wasm-skia-net9/index.html |
Contributor
|
The build 198930 found UI Test snapshots differences: Details
|
Contributor
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 7 out of 7 changed files in this pull request and generated 1 comment.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml/Given_UIElement.ContextFlyoutLeak.cs
Outdated
Show resolved
Hide resolved
Contributor
|
🤖 Your WebAssembly Skia Sample App stage site is ready! Visit it here: https://unowasmprstaging.z20.web.core.windows.net/pr-22750/wasm-skia-net9/index.html |
Contributor
|
The build 199022 found UI Test snapshots differences: Details
|
Contributor
|
🤖 Your WebAssembly Skia Sample App stage site is ready! Visit it here: https://unowasmprstaging.z20.web.core.windows.net/pr-22750/wasm-skia-net9/index.html |
Contributor
|
The build 199026 found UI Test snapshots differences: Details
|
Contributor
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 7 out of 7 changed files in this pull request and generated 1 comment.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Contributor
|
🤖 Your WebAssembly Skia Sample App stage site is ready! Visit it here: https://unowasmprstaging.z20.web.core.windows.net/pr-22750/wasm-skia-net9/index.html |
Xiaoy312
reviewed
Mar 2, 2026
src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml/Given_UIElement.ContextFlyoutLeak.cs
Outdated
Show resolved
Hide resolved
Contributor
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 7 out of 7 changed files in this pull request and generated 3 comments.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml/Given_UIElement.ContextFlyoutLeak.cs
Outdated
Show resolved
Hide resolved
src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml/Given_UIElement.ContextFlyoutLeak.cs
Outdated
Show resolved
Hide resolved
Contributor
|
🤖 Your WebAssembly Skia Sample App stage site is ready! Visit it here: https://unowasmprstaging.z20.web.core.windows.net/pr-22750/wasm-skia-net9/index.html |
Contributor
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 7 out of 7 changed files in this pull request and generated 6 comments.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Contributor
|
The build 199164 found UI Test snapshots differences: Details
|
Contributor
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 7 out of 7 changed files in this pull request and generated no new comments.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Contributor
|
🤖 Your WebAssembly Skia Sample App stage site is ready! Visit it here: https://unowasmprstaging.z20.web.core.windows.net/pr-22750/wasm-skia-net9/index.html |
Contributor
|
The build 199232 found UI Test snapshots differences: Details
|
Contributor
|
|
Contributor
|
The build 199232 found UI Test snapshots differences: Details
|
Contributor
|
The build 199232 found UI Test snapshots differences: Details
|
Contributor
|
The build 199232 found UI Test snapshots differences: Details
|
`XamlRoot` propagation is not needed - it is done implicitly in ShowAt
MartinZikmund
force-pushed
the
dev/mazi/memleak-flyout
branch
from
8a3d94a to
4503efe
Compare
Contributor
|
🤖 Your WebAssembly Skia Sample App stage site is ready! Visit it here: https://unowasmprstaging.z20.web.core.windows.net/pr-22750/wasm-skia-net9/index.html |
Contributor
|
The build 199407 found UI Test snapshots differences: Details
|
Contributor
|
|
Xiaoy312
approved these changes
Mar 3, 2026
Contributor
|
The build 199407 found UI Test snapshots differences: Details
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
GitHub Issue: closes https://github.com/unoplatform/add-private/issues/44
PR Type:
🐞 Bugfix
What is the current behavior? 🤔
When a single
MenuFlyout(orTextCommandBarFlyout) instance is shared as theContextFlyoutorSelectionFlyoutacross multiple controls, the flyout's presenter captures a strong reference to theDataContextof whichever control last opened it. After that control is removed from the visual tree itsDataContext(e.g. a ViewModel) cannot be garbage-collected, causing a memory leak.What is the new behavior? 🚀
The flyout presenter now holds only a weak reference to the target element when propagating
DataContext, so removing a control from the tree allows itsDataContextto be collected even when the flyout is still assigned to another control.Runtime tests covering both
ContextFlyoutandSelectionFlyoutleak scenarios are included.PR Checklist ✅
Please check if your PR fulfills the following requirements:
Screenshots Compare Test Runresults.Other information ℹ️
Reproducer pattern: assign a
MenuFlyouttoTextBox.ContextFlyout, open/close it, remove theTextBoxfrom the tree, reassign the flyout to a second control — then verify the firstTextBox'sDataContextis collectable.