Mixed MVVM and Non-MVVM Windows Regression Coverage#1043
Merged
wieslawsoltes merged 1 commit intomasterfrom Feb 11, 2026
Merged
Mixed MVVM and Non-MVVM Windows Regression Coverage#1043wieslawsoltes merged 1 commit intomasterfrom
wieslawsoltes merged 1 commit intomasterfrom
Conversation
This was referenced Feb 16, 2026
Closed
This was referenced Feb 23, 2026
Closed
This was referenced Mar 2, 2026
Closed
This was referenced Mar 6, 2026
Closed
This was referenced Mar 16, 2026
Closed
This was referenced Mar 23, 2026
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.
PR Summary: Mixed MVVM and Non-MVVM Windows Regression Coverage
Branch
feature/mixed-docksite-regression-testsScope
This change implements feature 7: Mixed MVVM and non-MVVM windows in one dock site by adding focused regression tests only (no API changes).
The tests validate that a single root layout can host both:
ItemsSource(MVVM-driven windows),while preserving stable close and restore semantics.
Why
Dock already supports both static layouts and
ItemsSource-generated dockables. The missing piece was explicit regression coverage ensuring these modes remain compatible when used together in one dock tree.Without this coverage, regressions could appear in:
Implementation Details
New test file
tests/Dock.Model.Avalonia.UnitTests/Controls/MixedDockSiteItemsSourceRegressionTests.csTest topology
A helper fixture builds a mixed dock site with:
RootDock,DocumentDock,ToolDock,Documentand one manualTool,ItemsSourcecollection for documents and one for tools,Documentand one generatedTooltracked viaIFactory.GetContainerFromItem.Factory options:
HideDocumentsOnClose = trueHideToolsOnClose = trueThis forces a clear behavioral split:
Added regression tests
MixedDockSite_CloseSemantics_DistinguishesGeneratedAndStaticDockablesHiddenDockables,MixedDockSite_RestoreSemantics_RestoresOnlyHiddenStaticDockablesBehavioral Guarantees Added by Tests
GetContainerFromItemtracking for removed generated items is cleaned up and stays null after close/restore flows.API / Compatibility
Validation
Executed:
dotnet test tests/Dock.Model.Avalonia.UnitTests/Dock.Model.Avalonia.UnitTests.csproj --filter FullyQualifiedName~MixedDockSiteItemsSourceRegressionTestsdotnet test tests/Dock.Model.Avalonia.UnitTests/Dock.Model.Avalonia.UnitTests.csprojResult:
167tests)Commit(s)
2c87f9681