ItemsSource Container Lookup + Unregister Policy#1041
Merged
wieslawsoltes merged 4 commits intomasterfrom Feb 11, 2026
Merged
Conversation
This was referenced Feb 16, 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: ItemsSource Container Lookup + Unregister Policy
Branch
feature/item-container-lookup-unregister-policyCommits
abd15c753feat(itemsource): add container lookup and unregister update policy8fa6ffb87test(itemsource): cover lookup, unregister policy, and serializer behavior0d72b6aeafeat(sample): add itemsource unregister policy and container lookup demo1447aa962docs(itemsource): document lookup API and unregister policy controlsProblem Statement
Dock supported source-backed document/tool generation via
ItemsSource, but lacked:Scope of This PR
This PR fully implements feature 5 from the parity plan:
API Changes
New
IFactoryAPIIDockable? GetContainerFromItem(object item)src/Dock.Model/Core/IFactory.csNew per-dock policy property
bool? CanUpdateItemsSourceOnUnregister { get; set; }IItemsSourceDock(src/Dock.Model/Core/IItemsSourceDock.cs)IToolItemsSourceDock(src/Dock.Model/Core/IToolItemsSourceDock.cs)DocumentDock(src/Dock.Model.Avalonia/Controls/DocumentDock.cs)ToolDock(src/Dock.Model.Avalonia/Controls/ToolDock.cs)New global setting
DockSettings.UpdateItemsSourceOnUnregister(defaulttrue)src/Dock.Settings/DockSettings.cssrc/Dock.Settings/DockSettingsOptions.cssrc/Dock.Settings/AppBuilderExtensions.cs.UpdateItemsSourceOnUnregister(bool update = true)Implementation Details
Factory item tracking and lookup
FactoryBasenow tracks generated source-item associations in addition to owner mapping.GetContainerFromItemreturns the first still-tracked generated container for the item and prunes stale entries.src/Dock.Model/FactoryBase.csRegistration / unregistration wiring
DocumentDockandToolDocknow register generated dockables with both owner and source item.src/Dock.Model.Avalonia/Controls/DocumentDock.cssrc/Dock.Model.Avalonia/Controls/ToolDock.csUnregister/remove policy behavior
RemoveItemFromSourcein both docks now evaluates effective policy:CanUpdateItemsSourceOnUnregisterwhen set.DockSettings.UpdateItemsSourceOnUnregister.Policy propagation across dock operations
src/Dock.Model/DockService.cssrc/Dock.Model/FactoryBase.cssrc/Dock.Model/FactoryBase.Dockable.csSerializer alignment
CanUpdateItemsSourceOnUnregisterto serializer allow-lists forDocumentDockandToolDock.src/Dock.Model.Avalonia/Json/AvaloniaDockSerializer.csTests Added/Updated
Model/Avalonia tests
tests/Dock.Model.Avalonia.UnitTests/Controls/DocumentDockItemsSourceSampleTests.cstests/Dock.Model.Avalonia.UnitTests/Controls/ToolDockItemsSourceTests.csGetContainerFromItemlookup for docs/tools.Serializer tests
tests/Dock.Model.Avalonia.UnitTests/AvaloniaDockSerializerTests.csCanUpdateItemsSourceOnUnregisterfor bothDocumentDockandToolDock.Settings tests
tests/Dock.Settings.UnitTests/AppBuilderExtensionsTests.csDockSettings.UpdateItemsSourceOnUnregister.Sample App Updates
samples/DockXamlReactiveUISampleUpdateItemsSourceOnUnregister,bool?via three-state checkbox),Factory.GetContainerFromItem.MainWindowViewModelnow receivesIFactoryvia constructor.App.axaml.cs(composition root).Documentation Updates
docfx/articles/dock-itemssource.mddocfx/articles/dock-reference.mddocfx/articles/dock-model-controls.mddocfx/articles/dock-settings.mdDocs now include:
IFactory.GetContainerFromItemusage,Validation
Executed and passed:
dotnet test Dock.slnx -c Release --no-restore --no-builddotnet build samples/DockXamlReactiveUISample/DockXamlReactiveUISample.csproj -c Release --no-restoreAdditional focused passes were run for:
Dock.Model.Avalonia.UnitTestsDock.Settings.UnitTestsBehavior Notes
UpdateItemsSourceOnUnregister = true), so close->remove stays on by default.Dock.ModeltoDock.Settings; policy resolution remains in Avalonia dock control layer.Breaking Changes