From d1195ce4a4fb08f2dc8c02858293b84f48ced07d Mon Sep 17 00:00:00 2001
From: David Kallesen <david@lmdk.dk>
Date: Tue, 6 May 2025 16:59:51 +0200
Subject: [PATCH 1/2] feat: add TerminalViewer

---
 sample/Atc.Wpf.Sample/GlobalUsings.cs         |   2 +
 .../Viewers/TerminalViewerView.xaml           |  56 +++++
 .../Viewers/TerminalViewerView.xaml.cs        |  59 +++++
 .../SamplesWpfControlsTreeView.xaml           |   4 +
 src/Atc.Wpf.Controls/Atc.Wpf.Controls.csproj  |   1 +
 .../Data/Models/TerminalLineItem.cs           |   5 +
 .../EventArgs/TerminalClearEventArgs.cs       |   4 +
 .../TerminalReceivedDataEventArgs.cs          |  10 +
 src/Atc.Wpf.Controls/GlobalUsings.cs          |   2 +
 .../Viewers/TerminalViewer.xaml               |  68 ++++++
 .../Viewers/TerminalViewer.xaml.cs            | 229 ++++++++++++++++++
 .../StringToSplitStringListValueConverter.cs  |  38 +++
 12 files changed, 478 insertions(+)
 create mode 100644 sample/Atc.Wpf.Sample/SamplesWpfControls/Viewers/TerminalViewerView.xaml
 create mode 100644 sample/Atc.Wpf.Sample/SamplesWpfControls/Viewers/TerminalViewerView.xaml.cs
 create mode 100644 src/Atc.Wpf.Controls/Data/Models/TerminalLineItem.cs
 create mode 100644 src/Atc.Wpf.Controls/EventArgs/TerminalClearEventArgs.cs
 create mode 100644 src/Atc.Wpf.Controls/EventArgs/TerminalReceivedDataEventArgs.cs
 create mode 100644 src/Atc.Wpf.Controls/Viewers/TerminalViewer.xaml
 create mode 100644 src/Atc.Wpf.Controls/Viewers/TerminalViewer.xaml.cs
 create mode 100644 src/Atc.Wpf/ValueConverters/StringTo/StringToSplitStringListValueConverter.cs

diff --git a/sample/Atc.Wpf.Sample/GlobalUsings.cs b/sample/Atc.Wpf.Sample/GlobalUsings.cs
index afddcfa6..0fd7dc2e 100644
--- a/sample/Atc.Wpf.Sample/GlobalUsings.cs
+++ b/sample/Atc.Wpf.Sample/GlobalUsings.cs
@@ -23,6 +23,8 @@
 global using Atc.Helpers;
 global using Atc.Serialization.JsonConverters;
 global using Atc.Wpf.Collections;
+global using Atc.Wpf.Controls;
+global using Atc.Wpf.Controls.Data.Models;
 global using Atc.Wpf.Controls.Dialogs;
 global using Atc.Wpf.Controls.LabelControls;
 global using Atc.Wpf.Controls.LabelControls.Abstractions;
diff --git a/sample/Atc.Wpf.Sample/SamplesWpfControls/Viewers/TerminalViewerView.xaml b/sample/Atc.Wpf.Sample/SamplesWpfControls/Viewers/TerminalViewerView.xaml
new file mode 100644
index 00000000..ecccbf7f
--- /dev/null
+++ b/sample/Atc.Wpf.Sample/SamplesWpfControls/Viewers/TerminalViewerView.xaml
@@ -0,0 +1,56 @@
+<UserControl
+    x:Class="Atc.Wpf.Sample.SamplesWpfControls.Viewers.TerminalViewerView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:atc="https://github.com/atc-net/atc-wpf/tree/main/schemas"
+    xmlns:atcValueConverters="https://github.com/atc-net/atc-wpf/tree/main/schemas/value-converters"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+
+    <atc:AutoGrid Columns="*" Rows="Auto,*">
+
+        <GroupBox
+            Margin="0,0,0,10"
+            Padding="10"
+            Header="Features">
+
+            <atc:UniformSpacingPanel Orientation="Horizontal" Spacing="10">
+                <atc:UniformSpacingPanel Orientation="Vertical" Spacing="10">
+                    <Button Click="SendLineOnClick" Content="Send Line" />
+                    <Button Click="SendLineWithErrorOnClick" Content="Send Line of with Error" />
+                    <Button Click="SendLineWithSuccessfulOnClick" Content="Send Line of with Successful" />
+                </atc:UniformSpacingPanel>
+                <atc:UniformSpacingPanel Orientation="Vertical" Spacing="10">
+                    <Button Click="SendLineWithOneOfTerms1OnClick" Content="Send Line of with Terms1" />
+                    <Button Click="SendLineWithOneOfTerms2OnClick" Content="Send Line of with Terms2" />
+                    <Button Click="SendLineWithOneOfTerms3OnClick" Content="Send Line of with Terms3" />
+                </atc:UniformSpacingPanel>
+            </atc:UniformSpacingPanel>
+
+        </GroupBox>
+
+        <GroupBox Header="Usage">
+            <ScrollViewer>
+
+                <atc:TerminalViewer
+                    x:Name="UcTerminalViewer"
+                    DefaultTextColor="Teal"
+                    ErrorTextColor="Red"
+                    SuccessfulTextColor="LimeGreen"
+                    Terms1="{Binding Source='+', Converter={x:Static atcValueConverters:StringToSplitStringListValueConverter.Instance}}"
+                    Terms1TextColor="Chocolate"
+                    Terms2="{Binding Source='[sudo]', Converter={x:Static atcValueConverters:StringToSplitStringListValueConverter.Instance}}"
+                    Terms2TextColor="DarkOrange"
+                    Terms3="{Binding Source='upgraded;installed;connected;disconnected', Converter={x:Static atcValueConverters:StringToSplitStringListValueConverter.Instance}}"
+                    Terms3TextColor="CornflowerBlue"
+                    TermsError="{Binding Source='error', Converter={x:Static atcValueConverters:StringToSplitStringListValueConverter.Instance}}"
+                    TermsSuccessful="{Binding Source='Done;100%', Converter={x:Static atcValueConverters:StringToSplitStringListValueConverter.Instance}}" />
+
+            </ScrollViewer>
+        </GroupBox>
+    </atc:AutoGrid>
+
+</UserControl>
\ No newline at end of file
diff --git a/sample/Atc.Wpf.Sample/SamplesWpfControls/Viewers/TerminalViewerView.xaml.cs b/sample/Atc.Wpf.Sample/SamplesWpfControls/Viewers/TerminalViewerView.xaml.cs
new file mode 100644
index 00000000..c0d60158
--- /dev/null
+++ b/sample/Atc.Wpf.Sample/SamplesWpfControls/Viewers/TerminalViewerView.xaml.cs
@@ -0,0 +1,59 @@
+namespace Atc.Wpf.Sample.SamplesWpfControls.Viewers;
+
+public partial class TerminalViewerView
+{
+    public TerminalViewerView()
+    {
+        InitializeComponent();
+
+        DataContext = this;
+    }
+
+    private void SendLineOnClick(
+        object sender,
+        RoutedEventArgs e)
+    {
+        Messenger.Default.Send(
+            new TerminalReceivedDataEventArgs(["hello world"]));
+    }
+
+    private void SendLineWithErrorOnClick(
+        object sender,
+        RoutedEventArgs e)
+    {
+        Messenger.Default.Send(
+            new TerminalReceivedDataEventArgs(["error"]));
+    }
+
+    private void SendLineWithSuccessfulOnClick(
+        object sender,
+        RoutedEventArgs e)
+    {
+        Messenger.Default.Send(
+            new TerminalReceivedDataEventArgs(["100%"]));
+    }
+
+    private void SendLineWithOneOfTerms1OnClick(
+        object sender,
+        RoutedEventArgs e)
+    {
+        Messenger.Default.Send(
+            new TerminalReceivedDataEventArgs(["+ xxx"]));
+    }
+
+    private void SendLineWithOneOfTerms2OnClick(
+        object sender,
+        RoutedEventArgs e)
+    {
+        Messenger.Default.Send(
+            new TerminalReceivedDataEventArgs(["[sudo] xxx"]));
+    }
+
+    private void SendLineWithOneOfTerms3OnClick(
+        object sender,
+        RoutedEventArgs e)
+    {
+        Messenger.Default.Send(
+            new TerminalReceivedDataEventArgs(["installed"]));
+    }
+}
\ No newline at end of file
diff --git a/sample/Atc.Wpf.Sample/SamplesWpfControlsTreeView.xaml b/sample/Atc.Wpf.Sample/SamplesWpfControlsTreeView.xaml
index 50d79914..1becbff4 100644
--- a/sample/Atc.Wpf.Sample/SamplesWpfControlsTreeView.xaml
+++ b/sample/Atc.Wpf.Sample/SamplesWpfControlsTreeView.xaml
@@ -249,6 +249,10 @@
             Header="JsonViewer"
             IsExpanded="True"
             SamplePath="Viewers.JsonViewerView" />
+        <sample:SampleTreeViewItem
+            Header="TerminalViewer"
+            IsExpanded="True"
+            SamplePath="Viewers.TerminalViewerView" />
     </TreeViewItem>
 
 </TreeView>
\ No newline at end of file
diff --git a/src/Atc.Wpf.Controls/Atc.Wpf.Controls.csproj b/src/Atc.Wpf.Controls/Atc.Wpf.Controls.csproj
index 57140902..505e5376 100644
--- a/src/Atc.Wpf.Controls/Atc.Wpf.Controls.csproj
+++ b/src/Atc.Wpf.Controls/Atc.Wpf.Controls.csproj
@@ -54,6 +54,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\Atc.Wpf.FontIcons\Atc.Wpf.FontIcons.csproj" />
     <ProjectReference Include="..\Atc.Wpf.Theming\Atc.Wpf.Theming.csproj" />
     <ProjectReference Include="..\Atc.Wpf\Atc.Wpf.csproj" />
   </ItemGroup>
diff --git a/src/Atc.Wpf.Controls/Data/Models/TerminalLineItem.cs b/src/Atc.Wpf.Controls/Data/Models/TerminalLineItem.cs
new file mode 100644
index 00000000..b1bec760
--- /dev/null
+++ b/src/Atc.Wpf.Controls/Data/Models/TerminalLineItem.cs
@@ -0,0 +1,5 @@
+namespace Atc.Wpf.Controls.Data.Models;
+
+public record TerminalLineItem(
+    string Text,
+    Brush Foreground);
\ No newline at end of file
diff --git a/src/Atc.Wpf.Controls/EventArgs/TerminalClearEventArgs.cs b/src/Atc.Wpf.Controls/EventArgs/TerminalClearEventArgs.cs
new file mode 100644
index 00000000..1c09ccd6
--- /dev/null
+++ b/src/Atc.Wpf.Controls/EventArgs/TerminalClearEventArgs.cs
@@ -0,0 +1,4 @@
+// ReSharper disable CheckNamespace
+namespace Atc.Wpf.Controls;
+
+public sealed class TerminalClearEventArgs : EventArgs;
\ No newline at end of file
diff --git a/src/Atc.Wpf.Controls/EventArgs/TerminalReceivedDataEventArgs.cs b/src/Atc.Wpf.Controls/EventArgs/TerminalReceivedDataEventArgs.cs
new file mode 100644
index 00000000..3ade5967
--- /dev/null
+++ b/src/Atc.Wpf.Controls/EventArgs/TerminalReceivedDataEventArgs.cs
@@ -0,0 +1,10 @@
+// ReSharper disable CheckNamespace
+namespace Atc.Wpf.Controls;
+
+public sealed class TerminalReceivedDataEventArgs(string[] lines) : EventArgs
+{
+    public IReadOnlyList<string> Lines { get; } = lines;
+
+    public override string ToString()
+        => $"{nameof(Lines)}.Count: {Lines.Count}";
+}
\ No newline at end of file
diff --git a/src/Atc.Wpf.Controls/GlobalUsings.cs b/src/Atc.Wpf.Controls/GlobalUsings.cs
index fe63a0c9..95749b7c 100644
--- a/src/Atc.Wpf.Controls/GlobalUsings.cs
+++ b/src/Atc.Wpf.Controls/GlobalUsings.cs
@@ -17,6 +17,7 @@
 global using System.Text;
 global using System.Text.Json;
 global using System.Text.RegularExpressions;
+global using System.Threading.Channels;
 global using System.Windows;
 global using System.Windows.Automation;
 global using System.Windows.Automation.Peers;
@@ -41,6 +42,7 @@
 global using Atc.Wpf.Controls.BaseControls;
 global using Atc.Wpf.Controls.BaseControls.Internal;
 global using Atc.Wpf.Controls.ColorControls.Internal;
+global using Atc.Wpf.Controls.Data.Models;
 global using Atc.Wpf.Controls.Dialogs;
 global using Atc.Wpf.Controls.Documents.ColorSchemas;
 global using Atc.Wpf.Controls.Documents.TextFormatters;
diff --git a/src/Atc.Wpf.Controls/Viewers/TerminalViewer.xaml b/src/Atc.Wpf.Controls/Viewers/TerminalViewer.xaml
new file mode 100644
index 00000000..55d279a5
--- /dev/null
+++ b/src/Atc.Wpf.Controls/Viewers/TerminalViewer.xaml
@@ -0,0 +1,68 @@
+<UserControl
+    x:Class="Atc.Wpf.Controls.Viewers.TerminalViewer"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:atcValueConverters="https://github.com/atc-net/atc-wpf/tree/main/schemas/value-converters"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:fontIcons="clr-namespace:Atc.Wpf.FontIcons;assembly=Atc.Wpf.FontIcons"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:models="clr-namespace:Atc.Wpf.Controls.Data.Models"
+    x:Name="UcTerminalViewer"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+
+    <Grid>
+        <ListView
+            x:Name="ListViewTerminal"
+            Background="{Binding TerminalBackground, RelativeSource={RelativeSource AncestorType=UserControl}}"
+            FontFamily="{Binding TerminalFontFamily, RelativeSource={RelativeSource AncestorType=UserControl}}"
+            FontSize="{Binding TerminalFontSize, RelativeSource={RelativeSource AncestorType=UserControl}}"
+            ScrollViewer.HorizontalScrollBarVisibility="Auto"
+            ScrollViewer.VerticalScrollBarVisibility="Auto"
+            VirtualizingStackPanel.IsVirtualizing="True"
+            VirtualizingStackPanel.VirtualizationMode="Standard">
+            <ListView.ContextMenu>
+                <ContextMenu>
+                    <!--  ReSharper disable Xaml.BindingWithContextNotResolved  -->
+                    <MenuItem Command="{Binding PlacementTarget.DataContext.CopyToClipboardCommand, RelativeSource={RelativeSource AncestorType=ContextMenu}}" Header="Copy to Clipboard">
+                        <MenuItem.Icon>
+                            <Image Source="{Binding Source={x:Static fontIcons:FontAwesomeRegularType.Clipboard}, Converter={x:Static atcValueConverters:FontIconImageSourceValueConverter.Instance}, ConverterParameter={StaticResource AtcApps.Brushes.ThemeForeground}}" />
+                        </MenuItem.Icon>
+                    </MenuItem>
+                    <MenuItem Command="{Binding PlacementTarget.DataContext.ClearScreenCommand, RelativeSource={RelativeSource AncestorType=ContextMenu}}" Header="Clear">
+                        <MenuItem.Icon>
+                            <Image Source="{Binding Source={x:Static fontIcons:FontBootstrapType.Remove}, Converter={x:Static atcValueConverters:FontIconImageSourceValueConverter.Instance}, ConverterParameter={StaticResource AtcApps.Brushes.ThemeForeground}}" />
+                        </MenuItem.Icon>
+                    </MenuItem>
+                    <!--  ReSharper restore Xaml.BindingWithContextNotResolved  -->
+                </ContextMenu>
+            </ListView.ContextMenu>
+            <ListView.ItemContainerStyle>
+                <Style TargetType="{x:Type ListViewItem}">
+                    <Setter Property="BorderThickness" Value="0" />
+                    <Setter Property="Padding" Value="0" />
+                    <Setter Property="Margin" Value="0" />
+                    <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+                    <Setter Property="Template">
+                        <Setter.Value>
+                            <ControlTemplate TargetType="{x:Type ListViewItem}">
+                                <ContentPresenter />
+                            </ControlTemplate>
+                        </Setter.Value>
+                    </Setter>
+                </Style>
+            </ListView.ItemContainerStyle>
+            <ListView.ItemTemplate>
+                <DataTemplate DataType="{x:Type models:TerminalLineItem}">
+                    <TextBlock
+                        Background="{Binding TerminalBackground, RelativeSource={RelativeSource AncestorType=UserControl}}"
+                        Foreground="{Binding Foreground}"
+                        Text="{Binding Text}"
+                        TextWrapping="Wrap" />
+                </DataTemplate>
+            </ListView.ItemTemplate>
+        </ListView>
+    </Grid>
+
+</UserControl>
diff --git a/src/Atc.Wpf.Controls/Viewers/TerminalViewer.xaml.cs b/src/Atc.Wpf.Controls/Viewers/TerminalViewer.xaml.cs
new file mode 100644
index 00000000..dc48cdfa
--- /dev/null
+++ b/src/Atc.Wpf.Controls/Viewers/TerminalViewer.xaml.cs
@@ -0,0 +1,229 @@
+namespace Atc.Wpf.Controls.Viewers;
+
+public sealed partial class TerminalViewer : IDisposable
+{
+    private readonly Channel<TerminalReceivedDataEventArgs> receivedDataChannel =
+        Channel.CreateUnbounded<TerminalReceivedDataEventArgs>(
+            new UnboundedChannelOptions
+            {
+                SingleReader = true,
+                SingleWriter = false,
+                AllowSynchronousContinuations = false,
+            });
+
+    private readonly CancellationTokenSource cts = new();
+    private readonly Task? queueProcessingTask;
+
+    public TerminalViewer()
+    {
+        InitializeComponent();
+
+        DataContext = this;
+
+        Messenger.Default.Register<TerminalReceivedDataEventArgs>(this, TerminalReceivedDataHandle);
+        Messenger.Default.Register<TerminalClearEventArgs>(this, TerminalClearEventArgsHandle);
+
+        queueProcessingTask = Task.Run(
+            () => ProcessQueueContinuously(cts.Token),
+            cts.Token);
+    }
+
+    [DependencyProperty(DefaultValue = "Black")]
+    private Brush terminalBackground;
+
+    [DependencyProperty(DefaultValue = "Consolas")]
+    private FontFamily terminalFontFamily;
+
+    [DependencyProperty(DefaultValue = "12.0")]
+    private double terminalFontSize;
+
+    [DependencyProperty(DefaultValue = "Teal")]
+    private Brush defaultTextColor;
+
+    [DependencyProperty(DefaultValue = "Red")]
+    private Brush errorTextColor;
+
+    [DependencyProperty]
+    private IList<string>? termsError;
+
+    [DependencyProperty(DefaultValue = "LimeGreen")]
+    private Brush successfulTextColor;
+
+    [DependencyProperty]
+    private IList<string>? termsSuccessful;
+
+    [DependencyProperty(DefaultValue = "Chocolate")]
+    private Brush terms1TextColor;
+
+    [DependencyProperty]
+    private IList<string>? terms1;
+
+    [DependencyProperty(DefaultValue = "DarkOrange")]
+    private Brush terms2TextColor;
+
+    [DependencyProperty]
+    private IList<string>? terms2;
+
+    [DependencyProperty(DefaultValue = "CornflowerBlue")]
+    private Brush terms3TextColor;
+
+    [DependencyProperty]
+    private IList<string>? terms3;
+
+    public void Dispose()
+    {
+        cts.Dispose();
+        queueProcessingTask?.Dispose();
+    }
+
+    private bool CanExecuteHasItems()
+        => ListViewTerminal.Items.Count > 0;
+
+    [RelayCommand(CanExecute = nameof(CanExecuteHasItems))]
+    private void CopyToClipboard()
+    {
+        var sb = new StringBuilder();
+        foreach (var item in ListViewTerminal.Items)
+        {
+            var terminalLineItem = (TerminalLineItem)item;
+            sb.AppendLine(terminalLineItem.Text);
+        }
+
+        Clipboard.SetText(sb.ToString());
+    }
+
+    [RelayCommand(CanExecute = nameof(CanExecuteHasItems))]
+    private void ClearScreen()
+        => ListViewTerminal.Items.Clear();
+
+    private void TerminalReceivedDataHandle(
+        TerminalReceivedDataEventArgs obj)
+        => receivedDataChannel.Writer.TryWrite(obj);
+
+    private void TerminalClearEventArgsHandle(
+        TerminalClearEventArgs obj)
+    {
+        while (receivedDataChannel.Reader.TryRead(out _))
+        {
+            // Skip, just clear receivedDataChannel
+        }
+
+        ListViewTerminal.Dispatcher.Invoke(
+            () => ListViewTerminal.Items.Clear(),
+            DispatcherPriority.Render,
+            CancellationToken.None);
+    }
+
+    private async Task ProcessQueueContinuously(
+        CancellationToken token)
+    {
+        var reader = receivedDataChannel.Reader;
+
+        while (await reader.WaitToReadAsync(token))
+        {
+            var batch = new List<TerminalReceivedDataEventArgs>();
+
+            while (reader.TryRead(out var data))
+            {
+                batch.Add(data);
+            }
+
+            if (batch.Count == 0)
+            {
+                continue;
+            }
+
+            await ListViewTerminal.Dispatcher.InvokeAsync(
+                () =>
+                {
+                    foreach (var line in batch.SelectMany(e => e.Lines))
+                    {
+                        var item = new TerminalLineItem(
+                            line,
+                            GetColorForLine(line));
+                        ListViewTerminal.Items.Add(item);
+                    }
+
+                    ListViewTerminal.UpdateLayout();
+                },
+                DispatcherPriority.Render,
+                token);
+
+            await ListViewTerminal.Dispatcher.InvokeAsync(
+                () =>
+                {
+                    var scrollViewer = VisualTreeHelperEx.FindChild<ScrollViewer>(ListViewTerminal);
+
+                    if (scrollViewer is null)
+                    {
+                        ListViewTerminal.ScrollIntoView(ListViewTerminal.Items[^1]!);
+                    }
+                    else
+                    {
+                        scrollViewer.ScrollToBottom();
+                    }
+                },
+                DispatcherPriority.Background,
+                token);
+        }
+    }
+
+    private Brush GetColorForLine(
+        string line)
+    {
+        var lineSpan = line.AsSpan();
+
+        var checks = new (
+            IEnumerable<string>? Terms,
+            Brush Colour,
+            StringComparison Comparison)[]
+            {
+                (TermsError,      ErrorTextColor,      StringComparison.OrdinalIgnoreCase),
+                (TermsSuccessful, SuccessfulTextColor, StringComparison.OrdinalIgnoreCase),
+                (Terms1,          Terms1TextColor,     StringComparison.OrdinalIgnoreCase),
+                (Terms2,          Terms2TextColor,     StringComparison.OrdinalIgnoreCase),
+                (Terms3,          Terms3TextColor,     StringComparison.OrdinalIgnoreCase),
+            };
+
+        foreach (var (terms, colour, cmp) in checks)
+        {
+            if (terms is null)
+            {
+                continue;
+            }
+
+            foreach (var term in terms)
+            {
+                if (ContainsTermAsWord(lineSpan, term.AsSpan(), cmp))
+                {
+                    return colour;
+                }
+            }
+        }
+
+        return DefaultTextColor;
+    }
+
+    private static bool ContainsTermAsWord(
+        ReadOnlySpan<char> line,
+        ReadOnlySpan<char> term,
+        StringComparison comparison)
+    {
+        int index;
+        while ((index = line.IndexOf(term, comparison)) >= 0)
+        {
+            var atStart = index == 0 || char.IsWhiteSpace(line[index - 1]);
+            var end = index + term.Length;
+            var atEnd = end == line.Length || (end < line.Length && char.IsWhiteSpace(line[end]));
+
+            if (atStart && atEnd)
+            {
+                return true;
+            }
+
+            line = line[(index + 1)..];
+        }
+
+        return false;
+    }
+}
\ No newline at end of file
diff --git a/src/Atc.Wpf/ValueConverters/StringTo/StringToSplitStringListValueConverter.cs b/src/Atc.Wpf/ValueConverters/StringTo/StringToSplitStringListValueConverter.cs
new file mode 100644
index 00000000..69e356c4
--- /dev/null
+++ b/src/Atc.Wpf/ValueConverters/StringTo/StringToSplitStringListValueConverter.cs
@@ -0,0 +1,38 @@
+// ReSharper disable CheckNamespace
+namespace Atc.Wpf.ValueConverters;
+
+/// <summary>
+/// ValueConverter: String To List of Strings.
+/// </summary>
+[ValueConversion(typeof(string), typeof(List<string>))]
+public sealed class StringToSplitStringListValueConverter : IValueConverter
+{
+    public static readonly StringToSplitStringListValueConverter Instance = new();
+
+    public char Separator { get; set; } = ';';
+
+    public object? Convert(
+        object? value,
+        Type targetType,
+        object? parameter,
+        CultureInfo culture)
+        => value is string stringValue
+            ? stringValue.Split([Separator], StringSplitOptions.RemoveEmptyEntries)
+                .Select(x => x.Trim())
+                .ToList()
+            : value;
+
+    public object? ConvertBack(
+        object? value,
+        Type targetType,
+        object? parameter,
+        CultureInfo culture)
+    {
+        if (value is IList<string> list)
+        {
+            return string.Join(Separator.ToString(), list);
+        }
+
+        return value;
+    }
+}
\ No newline at end of file

From 42b0c69825a6be3048e3c69d4873f0720df72f34 Mon Sep 17 00:00:00 2001
From: David Kallesen <david@lmdk.dk>
Date: Wed, 7 May 2025 02:02:29 +0200
Subject: [PATCH 2/2] refactor: update nuget for Atc.XamlToolkit, and fix some
 "Note: DependencyProperty-SourceGenerator don't support"

---
 sample/Atc.Wpf.Sample/Atc.Wpf.Sample.csproj   |  4 +-
 sample/Atc.Wpf.Sample/GlobalUsings.cs         |  1 -
 src/Atc.Wpf.Controls/Atc.Wpf.Controls.csproj  |  4 +-
 .../BaseControls/ColorPicker.xaml.cs          | 40 ++++-------------
 .../WellKnownColorPicker.xaml.cs              | 15 +------
 .../LabelControls/LabelColorPicker.xaml.cs    | 40 ++++-------------
 .../LabelControls/LabelComboBox.xaml.cs       | 43 +++++--------------
 .../Selectors/LabelCountrySelector.xaml.cs    | 28 ++++--------
 .../Selectors/LabelFontFamilySelector.xaml.cs | 26 +++--------
 .../Selectors/LabelLanguageSelector.xaml.cs   | 26 +++--------
 .../LabelWellKnownColorSelector.xaml.cs       | 26 +++--------
 .../Selectors/WellKnownColorSelector.xaml.cs  | 22 +++-------
 src/Atc.Wpf/Atc.Wpf.csproj                    |  4 +-
 src/Atc.Wpf/Controls/Media/SvgImage.cs        | 20 ++-------
 ...Atc.Wpf.Generator.FontIconResources.csproj |  4 +-
 15 files changed, 78 insertions(+), 225 deletions(-)

diff --git a/sample/Atc.Wpf.Sample/Atc.Wpf.Sample.csproj b/sample/Atc.Wpf.Sample/Atc.Wpf.Sample.csproj
index 9ce50fa8..534ab2d4 100644
--- a/sample/Atc.Wpf.Sample/Atc.Wpf.Sample.csproj
+++ b/sample/Atc.Wpf.Sample/Atc.Wpf.Sample.csproj
@@ -51,8 +51,8 @@
 
   <ItemGroup>
     <PackageReference Include="Atc" Version="2.0.552" />
-    <PackageReference Include="Atc.XamlToolkit" Version="1.5.34" />
-    <PackageReference Include="Atc.XamlToolkit.Wpf" Version="1.5.34" />
+    <PackageReference Include="Atc.XamlToolkit" Version="1.5.36" />
+    <PackageReference Include="Atc.XamlToolkit.Wpf" Version="1.5.36" />
     <PackageReference Include="ControlzEx" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.4" />
     <PackageReference Include="Microsoft.Extensions.Options.DataAnnotations" Version="9.0.4" />
diff --git a/sample/Atc.Wpf.Sample/GlobalUsings.cs b/sample/Atc.Wpf.Sample/GlobalUsings.cs
index 0fd7dc2e..24b5a48a 100644
--- a/sample/Atc.Wpf.Sample/GlobalUsings.cs
+++ b/sample/Atc.Wpf.Sample/GlobalUsings.cs
@@ -24,7 +24,6 @@
 global using Atc.Serialization.JsonConverters;
 global using Atc.Wpf.Collections;
 global using Atc.Wpf.Controls;
-global using Atc.Wpf.Controls.Data.Models;
 global using Atc.Wpf.Controls.Dialogs;
 global using Atc.Wpf.Controls.LabelControls;
 global using Atc.Wpf.Controls.LabelControls.Abstractions;
diff --git a/src/Atc.Wpf.Controls/Atc.Wpf.Controls.csproj b/src/Atc.Wpf.Controls/Atc.Wpf.Controls.csproj
index 505e5376..617bd435 100644
--- a/src/Atc.Wpf.Controls/Atc.Wpf.Controls.csproj
+++ b/src/Atc.Wpf.Controls/Atc.Wpf.Controls.csproj
@@ -48,8 +48,8 @@
 
   <ItemGroup>
     <PackageReference Include="Atc" Version="2.0.552" />
-    <PackageReference Include="Atc.XamlToolkit" Version="1.5.34" />
-    <PackageReference Include="Atc.XamlToolkit.Wpf" Version="1.5.34" />
+    <PackageReference Include="Atc.XamlToolkit" Version="1.5.36" />
+    <PackageReference Include="Atc.XamlToolkit.Wpf" Version="1.5.36" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 
diff --git a/src/Atc.Wpf.Controls/BaseControls/ColorPicker.xaml.cs b/src/Atc.Wpf.Controls/BaseControls/ColorPicker.xaml.cs
index 76008545..2f278abe 100644
--- a/src/Atc.Wpf.Controls/BaseControls/ColorPicker.xaml.cs
+++ b/src/Atc.Wpf.Controls/BaseControls/ColorPicker.xaml.cs
@@ -5,37 +5,15 @@ public partial class ColorPicker
     [DependencyProperty(DefaultValue = RenderColorIndicatorType.Square)]
     private RenderColorIndicatorType renderColorIndicatorType;
 
-    // Note: DependencyProperty-SourceGenerator don't support "typeof(Color) as null" for now
-    public static readonly DependencyProperty ColorValueProperty = DependencyProperty.Register(
-        nameof(ColorValue),
-        typeof(Color),
-        typeof(LabelColorPicker),
-        new PropertyMetadata(
-            Colors.Black,
-            OnColorValueChanged));
-
-    // Note: DependencyProperty-SourceGenerator don't support "typeof(Color) as null" for now
-    public Color? ColorValue
-    {
-        get => (Color?)GetValue(ColorValueProperty);
-        set => SetValue(ColorValueProperty, value);
-    }
-
-    // Note: DependencyProperty-SourceGenerator don't support "typeof(SolidColorBrush) as null" for now
-    public static readonly DependencyProperty BrushValueProperty = DependencyProperty.Register(
-        nameof(BrushValue),
-        typeof(SolidColorBrush),
-        typeof(ColorPicker),
-        new PropertyMetadata(
-            Brushes.Black,
-            OnBrushValueChanged));
-
-    // Note: DependencyProperty-SourceGenerator don't support "typeof(SolidColorBrush) as null" for now
-    public SolidColorBrush? BrushValue
-    {
-        get => (SolidColorBrush?)GetValue(BrushValueProperty);
-        set => SetValue(BrushValueProperty, value);
-    }
+    [DependencyProperty(
+        DefaultValue = "Black",
+        PropertyChangedCallback = nameof(OnColorValueChanged))]
+    private Color? colorValue;
+
+    [DependencyProperty(
+        DefaultValue = "Black",
+        PropertyChangedCallback = nameof(OnBrushValueChanged))]
+    private SolidColorBrush? brushValue;
 
     public static readonly DependencyProperty DisplayHexCodeProperty = DependencyProperty.Register(
         nameof(DisplayHexCode),
diff --git a/src/Atc.Wpf.Controls/ColorControls/WellKnownColorPicker.xaml.cs b/src/Atc.Wpf.Controls/ColorControls/WellKnownColorPicker.xaml.cs
index bf3e2d7e..9f6dbdf5 100644
--- a/src/Atc.Wpf.Controls/ColorControls/WellKnownColorPicker.xaml.cs
+++ b/src/Atc.Wpf.Controls/ColorControls/WellKnownColorPicker.xaml.cs
@@ -6,19 +6,8 @@ public partial class WellKnownColorPicker
     [DependencyProperty(DefaultValue = false, PropertyChangedCallback = nameof(OnShowOnlyStandardChanged))]
     private bool showOnlyBasicColors;
 
-    // Note: DependencyProperty-SourceGenerator don't support "List<ColorItem>" for now
-    public static readonly DependencyProperty PaletteProperty = DependencyProperty.Register(
-        nameof(Palette),
-        typeof(List<ColorItem>),
-        typeof(WellKnownColorPicker),
-        new PropertyMetadata(default(List<ColorItem>)));
-
-    // Note: DependencyProperty-SourceGenerator don't support "List<ColorItem>" for now
-    public List<ColorItem> Palette
-    {
-        get => (List<ColorItem>)GetValue(PaletteProperty);
-        set => SetValue(PaletteProperty, value);
-    }
+    [DependencyProperty]
+    private List<ColorItem> palette;
 
     [DependencyProperty(DefaultValue = "Transparent")]
     private Brush colorBrush;
diff --git a/src/Atc.Wpf.Controls/LabelControls/LabelColorPicker.xaml.cs b/src/Atc.Wpf.Controls/LabelControls/LabelColorPicker.xaml.cs
index ba295641..45760b36 100644
--- a/src/Atc.Wpf.Controls/LabelControls/LabelColorPicker.xaml.cs
+++ b/src/Atc.Wpf.Controls/LabelControls/LabelColorPicker.xaml.cs
@@ -5,37 +5,15 @@ public partial class LabelColorPicker : ILabelColorPicker
     [DependencyProperty(DefaultValue = RenderColorIndicatorType.Square)]
     private RenderColorIndicatorType renderColorIndicatorType;
 
-    // Note: DependencyProperty-SourceGenerator don't support "typeof(Color) as null" for now
-    public static readonly DependencyProperty ColorValueProperty = DependencyProperty.Register(
-        nameof(ColorValue),
-        typeof(Color),
-        typeof(LabelColorPicker),
-        new PropertyMetadata(
-            Colors.Black,
-            OnColorValueChanged));
-
-    // Note: DependencyProperty-SourceGenerator don't support "typeof(Color) as null" for now
-    public Color? ColorValue
-    {
-        get => (Color?)GetValue(ColorValueProperty);
-        set => SetValue(ColorValueProperty, value);
-    }
-
-    // Note: DependencyProperty-SourceGenerator don't support "typeof(SolidColorBrush) as null" for now
-    public static readonly DependencyProperty BrushValueProperty = DependencyProperty.Register(
-        nameof(BrushValue),
-        typeof(SolidColorBrush),
-        typeof(LabelColorPicker),
-        new PropertyMetadata(
-            Brushes.Black,
-            OnBrushValueChanged));
-
-    // Note: DependencyProperty-SourceGenerator don't support "typeof(SolidColorBrush) as null" for now
-    public SolidColorBrush? BrushValue
-    {
-        get => (SolidColorBrush?)GetValue(BrushValueProperty);
-        set => SetValue(BrushValueProperty, value);
-    }
+    [DependencyProperty(
+        DefaultValue = "Black",
+        PropertyChangedCallback = nameof(OnColorValueChanged))]
+    private Color? colorValue;
+
+    [DependencyProperty(
+        DefaultValue = "Black",
+        PropertyChangedCallback = nameof(OnBrushValueChanged))]
+    private SolidColorBrush? brushValue;
 
     public event EventHandler<ValueChangedEventArgs<Color>>? ColorChanged;
 
diff --git a/src/Atc.Wpf.Controls/LabelControls/LabelComboBox.xaml.cs b/src/Atc.Wpf.Controls/LabelControls/LabelComboBox.xaml.cs
index d79b4fc9..da452363 100644
--- a/src/Atc.Wpf.Controls/LabelControls/LabelComboBox.xaml.cs
+++ b/src/Atc.Wpf.Controls/LabelControls/LabelComboBox.xaml.cs
@@ -2,39 +2,16 @@ namespace Atc.Wpf.Controls.LabelControls;
 
 public partial class LabelComboBox : ILabelComboBox
 {
-    // Note: DependencyProperty-SourceGenerator don't support "Dictionary<string, string>" for now
-    public static readonly DependencyProperty ItemsProperty = DependencyProperty.Register(
-        nameof(Items),
-        typeof(Dictionary<string, string>),
-        typeof(LabelComboBox),
-        new PropertyMetadata(default(Dictionary<string, string>)));
-
-    // Note: DependencyProperty-SourceGenerator don't support "Dictionary<string, string>" for now
-    public Dictionary<string, string> Items
-    {
-        get => (Dictionary<string, string>)GetValue(ItemsProperty);
-        set => SetValue(ItemsProperty, value);
-    }
-
-    // Note: DependencyProperty-SourceGenerator don't support "coerceValueCallback / isAnimationProhibited" correctly for now
-    public static readonly DependencyProperty SelectedKeyProperty = DependencyProperty.Register(
-        nameof(SelectedKey),
-        typeof(string),
-        typeof(LabelComboBox),
-        new FrameworkPropertyMetadata(
-            defaultValue: null,
-            FrameworkPropertyMetadataOptions.BindsTwoWayByDefault | FrameworkPropertyMetadataOptions.Journal,
-            OnSelectedKeyLostFocus,
-            coerceValueCallback: null,
-            isAnimationProhibited: true,
-            UpdateSourceTrigger.LostFocus));
-
-    // Note: DependencyProperty-SourceGenerator don't support "coerceValueCallback / isAnimationProhibited" correctly for now
-    public string SelectedKey
-    {
-        get => (string)GetValue(SelectedKeyProperty);
-        set => SetValue(SelectedKeyProperty, value);
-    }
+    [DependencyProperty]
+    private Dictionary<string, string> items;
+
+    [DependencyProperty(
+        DefaultValue = "",
+        Flags = FrameworkPropertyMetadataOptions.BindsTwoWayByDefault | FrameworkPropertyMetadataOptions.Journal,
+        PropertyChangedCallback = nameof(OnSelectedKeyLostFocus),
+        IsAnimationProhibited = true,
+        DefaultUpdateSourceTrigger = UpdateSourceTrigger.LostFocus)]
+    private string selectedKey;
 
     public event EventHandler<ValueChangedEventArgs<string?>>? SelectorChanged;
 
diff --git a/src/Atc.Wpf.Controls/LabelControls/Selectors/LabelCountrySelector.xaml.cs b/src/Atc.Wpf.Controls/LabelControls/Selectors/LabelCountrySelector.xaml.cs
index 73292be4..ad6a8373 100644
--- a/src/Atc.Wpf.Controls/LabelControls/Selectors/LabelCountrySelector.xaml.cs
+++ b/src/Atc.Wpf.Controls/LabelControls/Selectors/LabelCountrySelector.xaml.cs
@@ -16,25 +16,13 @@ public partial class LabelCountrySelector : ILabelCountrySelector
     [DependencyProperty]
     private string defaultCultureIdentifier;
 
-    // Note: DependencyProperty-SourceGenerator don't support "coerceValueCallback / isAnimationProhibited" correctly for now
-    public static readonly DependencyProperty SelectedKeyProperty = DependencyProperty.Register(
-        nameof(SelectedKey),
-        typeof(string),
-        typeof(LabelCountrySelector),
-        new FrameworkPropertyMetadata(
-            string.Empty,
-            FrameworkPropertyMetadataOptions.BindsTwoWayByDefault | FrameworkPropertyMetadataOptions.Journal,
-            OnSelectorLostFocus,
-            coerceValueCallback: null,
-            isAnimationProhibited: true,
-            UpdateSourceTrigger.LostFocus));
-
-    // Note: DependencyProperty-SourceGenerator don't support "coerceValueCallback / isAnimationProhibited" correctly for now
-    public string SelectedKey
-    {
-        get => (string)GetValue(SelectedKeyProperty);
-        set => SetValue(SelectedKeyProperty, value);
-    }
+    [DependencyProperty(
+        DefaultValue = "",
+        Flags = FrameworkPropertyMetadataOptions.BindsTwoWayByDefault | FrameworkPropertyMetadataOptions.Journal,
+        PropertyChangedCallback = nameof(OnSelectedLostFocus),
+        IsAnimationProhibited = true,
+        DefaultUpdateSourceTrigger = UpdateSourceTrigger.LostFocus)]
+    private string selectedKey;
 
     public event EventHandler<ValueChangedEventArgs<string?>>? SelectorChanged;
 
@@ -112,7 +100,7 @@ private static void ValidateValue(
                 selectedKey));
     }
 
-    private static void OnSelectorLostFocus(
+    private static void OnSelectedLostFocus(
         DependencyObject d,
         DependencyPropertyChangedEventArgs e)
     {
diff --git a/src/Atc.Wpf.Controls/LabelControls/Selectors/LabelFontFamilySelector.xaml.cs b/src/Atc.Wpf.Controls/LabelControls/Selectors/LabelFontFamilySelector.xaml.cs
index b4f9ff6a..ca5e1017 100644
--- a/src/Atc.Wpf.Controls/LabelControls/Selectors/LabelFontFamilySelector.xaml.cs
+++ b/src/Atc.Wpf.Controls/LabelControls/Selectors/LabelFontFamilySelector.xaml.cs
@@ -7,25 +7,13 @@ public partial class LabelFontFamilySelector : ILabelFontFamilySelector
     [DependencyProperty(DefaultValue = DropDownFirstItemType.None)]
     private DropDownFirstItemType dropDownFirstItemType;
 
-    // Note: DependencyProperty-SourceGenerator don't support "coerceValueCallback / isAnimationProhibited" correctly for now
-    public static readonly DependencyProperty SelectedKeyProperty = DependencyProperty.Register(
-        nameof(SelectedKey),
-        typeof(string),
-        typeof(LabelFontFamilySelector),
-        new FrameworkPropertyMetadata(
-            string.Empty,
-            FrameworkPropertyMetadataOptions.BindsTwoWayByDefault | FrameworkPropertyMetadataOptions.Journal,
-            OnSelectorLostFocus,
-            coerceValueCallback: null,
-            isAnimationProhibited: true,
-            UpdateSourceTrigger.LostFocus));
-
-    // Note: DependencyProperty-SourceGenerator don't support "coerceValueCallback / isAnimationProhibited" correctly for now
-    public string SelectedKey
-    {
-        get => (string)GetValue(SelectedKeyProperty);
-        set => SetValue(SelectedKeyProperty, value);
-    }
+    [DependencyProperty(
+        DefaultValue = "",
+        Flags = FrameworkPropertyMetadataOptions.BindsTwoWayByDefault | FrameworkPropertyMetadataOptions.Journal,
+        PropertyChangedCallback = nameof(OnSelectorLostFocus),
+        IsAnimationProhibited = true,
+        DefaultUpdateSourceTrigger = UpdateSourceTrigger.LostFocus)]
+    private string selectedKey;
 
     public event EventHandler<ValueChangedEventArgs<string?>>? SelectorChanged;
 
diff --git a/src/Atc.Wpf.Controls/LabelControls/Selectors/LabelLanguageSelector.xaml.cs b/src/Atc.Wpf.Controls/LabelControls/Selectors/LabelLanguageSelector.xaml.cs
index efa02ab2..a88b34d3 100644
--- a/src/Atc.Wpf.Controls/LabelControls/Selectors/LabelLanguageSelector.xaml.cs
+++ b/src/Atc.Wpf.Controls/LabelControls/Selectors/LabelLanguageSelector.xaml.cs
@@ -17,25 +17,13 @@ public partial class LabelLanguageSelector : ILabelLanguageSelector
     [DependencyProperty(DefaultValue = "")]
     private string defaultCultureIdentifier;
 
-    // Note: DependencyProperty-SourceGenerator don't support "coerceValueCallback / isAnimationProhibited" correctly for now
-    public static readonly DependencyProperty SelectedKeyProperty = DependencyProperty.Register(
-        nameof(SelectedKey),
-        typeof(string),
-        typeof(LabelLanguageSelector),
-        new FrameworkPropertyMetadata(
-            string.Empty,
-            FrameworkPropertyMetadataOptions.BindsTwoWayByDefault | FrameworkPropertyMetadataOptions.Journal,
-            OnSelectorLostFocus,
-            coerceValueCallback: null,
-            isAnimationProhibited: true,
-            defaultUpdateSourceTrigger: UpdateSourceTrigger.LostFocus));
-
-    // Note: DependencyProperty-SourceGenerator don't support "coerceValueCallback / isAnimationProhibited" correctly for now
-    public string SelectedKey
-    {
-        get => (string)GetValue(SelectedKeyProperty);
-        set => SetValue(SelectedKeyProperty, value);
-    }
+    [DependencyProperty(
+        DefaultValue = "",
+        Flags = FrameworkPropertyMetadataOptions.BindsTwoWayByDefault | FrameworkPropertyMetadataOptions.Journal,
+        PropertyChangedCallback = nameof(OnSelectorLostFocus),
+        IsAnimationProhibited = true,
+        DefaultUpdateSourceTrigger = UpdateSourceTrigger.LostFocus)]
+    private string selectedKey;
 
     [DependencyProperty(DefaultValue = true)]
     private bool updateUiCultureOnChangeEvent;
diff --git a/src/Atc.Wpf.Controls/LabelControls/Selectors/LabelWellKnownColorSelector.xaml.cs b/src/Atc.Wpf.Controls/LabelControls/Selectors/LabelWellKnownColorSelector.xaml.cs
index 293db05f..ad869cda 100644
--- a/src/Atc.Wpf.Controls/LabelControls/Selectors/LabelWellKnownColorSelector.xaml.cs
+++ b/src/Atc.Wpf.Controls/LabelControls/Selectors/LabelWellKnownColorSelector.xaml.cs
@@ -22,25 +22,13 @@ public partial class LabelWellKnownColorSelector : ILabelWellKnownColorSelector
     [DependencyProperty(DefaultValue = "")]
     private string defaultColorName;
 
-    // Note: DependencyProperty-SourceGenerator don't support "coerceValueCallback / isAnimationProhibited" correctly for now
-    public static readonly DependencyProperty SelectedKeyProperty = DependencyProperty.Register(
-        nameof(SelectedKey),
-        typeof(string),
-        typeof(LabelWellKnownColorSelector),
-        new FrameworkPropertyMetadata(
-            defaultValue: string.Empty,
-            FrameworkPropertyMetadataOptions.BindsTwoWayByDefault | FrameworkPropertyMetadataOptions.Journal,
-            OnSelectedKeyLostFocus,
-            coerceValueCallback: null,
-            isAnimationProhibited: true,
-            UpdateSourceTrigger.LostFocus));
-
-    // Note: DependencyProperty-SourceGenerator don't support "coerceValueCallback / isAnimationProhibited" correctly for now
-    public string SelectedKey
-    {
-        get => (string)GetValue(SelectedKeyProperty);
-        set => SetValue(SelectedKeyProperty, value);
-    }
+    [DependencyProperty(
+        DefaultValue = "",
+        Flags = FrameworkPropertyMetadataOptions.BindsTwoWayByDefault | FrameworkPropertyMetadataOptions.Journal,
+        PropertyChangedCallback = nameof(OnSelectedKeyLostFocus),
+        IsAnimationProhibited = true,
+        DefaultUpdateSourceTrigger = UpdateSourceTrigger.LostFocus)]
+    private string selectedKey;
 
     public event EventHandler<ValueChangedEventArgs<string?>>? SelectorChanged;
 
diff --git a/src/Atc.Wpf.Theming/Controls/Selectors/WellKnownColorSelector.xaml.cs b/src/Atc.Wpf.Theming/Controls/Selectors/WellKnownColorSelector.xaml.cs
index 2e387ee2..0939dcba 100644
--- a/src/Atc.Wpf.Theming/Controls/Selectors/WellKnownColorSelector.xaml.cs
+++ b/src/Atc.Wpf.Theming/Controls/Selectors/WellKnownColorSelector.xaml.cs
@@ -24,21 +24,13 @@ public partial class WellKnownColorSelector
     [DependencyProperty(DefaultValue = "")]
     private string defaultColorName;
 
-    // Note: DependencyProperty-SourceGenerator don't support "coerceValueCallback / isAnimationProhibited" correctly for now
-    public static readonly DependencyProperty SelectedKeyProperty = DependencyProperty.Register(
-        nameof(SelectedKey),
-        typeof(string),
-        typeof(WellKnownColorSelector),
-        new PropertyMetadata(
-            string.Empty,
-            OnSelectedKeyChanged));
-
-    // Note: DependencyProperty-SourceGenerator don't support "coerceValueCallback / isAnimationProhibited" correctly for now
-    public string SelectedKey
-    {
-        get => (string)GetValue(SelectedKeyProperty);
-        set => SetValue(SelectedKeyProperty, value);
-    }
+    [DependencyProperty(
+        DefaultValue = "",
+        Flags = FrameworkPropertyMetadataOptions.BindsTwoWayByDefault | FrameworkPropertyMetadataOptions.Journal,
+        PropertyChangedCallback = nameof(OnSelectedKeyChanged),
+        IsAnimationProhibited = true,
+        DefaultUpdateSourceTrigger = UpdateSourceTrigger.LostFocus)]
+    private string selectedKey;
 
     public event EventHandler<ValueChangedEventArgs<string?>>? SelectorChanged;
 
diff --git a/src/Atc.Wpf/Atc.Wpf.csproj b/src/Atc.Wpf/Atc.Wpf.csproj
index 0e2052fc..218d47f1 100644
--- a/src/Atc.Wpf/Atc.Wpf.csproj
+++ b/src/Atc.Wpf/Atc.Wpf.csproj
@@ -1014,8 +1014,8 @@
 
   <ItemGroup>
     <PackageReference Include="Atc" Version="2.0.552" />
-    <PackageReference Include="Atc.XamlToolkit" Version="1.5.34" />
-    <PackageReference Include="Atc.XamlToolkit.Wpf" Version="1.5.34" />
+    <PackageReference Include="Atc.XamlToolkit" Version="1.5.36" />
+    <PackageReference Include="Atc.XamlToolkit.Wpf" Version="1.5.36" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Atc.Wpf/Controls/Media/SvgImage.cs b/src/Atc.Wpf/Controls/Media/SvgImage.cs
index f266d6d4..5cf70611 100644
--- a/src/Atc.Wpf/Controls/Media/SvgImage.cs
+++ b/src/Atc.Wpf/Controls/Media/SvgImage.cs
@@ -72,22 +72,10 @@ public sealed partial class SvgImage : Control
         PropertyChangedCallback = nameof(OverrideStrokeWidthPropertyChanged))]
     private double? overrideStrokeWidth;
 
-    // Note: DependencyProperty-SourceGenerator don't support "Dictionary<string, Brush>" for now
-    public static readonly DependencyProperty CustomBrushesProperty = DependencyProperty.Register(
-        nameof(CustomBrushes),
-        typeof(Dictionary<string, Brush>),
-        typeof(SvgImage),
-        new FrameworkPropertyMetadata(
-            defaultValue: null,
-            FrameworkPropertyMetadataOptions.AffectsRender,
-            CustomBrushesPropertyChanged));
-
-    // Note: DependencyProperty-SourceGenerator don't support "Dictionary<string, Brush>" for now
-    public Dictionary<string, Brush> CustomBrushes
-    {
-        get => (Dictionary<string, Brush>)GetValue(CustomBrushesProperty);
-        set => SetValue(CustomBrushesProperty, value);
-    }
+    [DependencyProperty(
+        Flags = FrameworkPropertyMetadataOptions.AffectsRender,
+        PropertyChangedCallback = nameof(CustomBrushesPropertyChanged))]
+    private Dictionary<string, Brush> customBrushes;
 
     [DependencyProperty(
         DefaultValue = "FileSystemLoader.Instance")]
diff --git a/tool/Atc.Wpf.Generator.FontIconResources/Atc.Wpf.Generator.FontIconResources.csproj b/tool/Atc.Wpf.Generator.FontIconResources/Atc.Wpf.Generator.FontIconResources.csproj
index 866e2549..081e7753 100644
--- a/tool/Atc.Wpf.Generator.FontIconResources/Atc.Wpf.Generator.FontIconResources.csproj
+++ b/tool/Atc.Wpf.Generator.FontIconResources/Atc.Wpf.Generator.FontIconResources.csproj
@@ -9,8 +9,8 @@
 
   <ItemGroup>
     <PackageReference Include="Atc" Version="2.0.552" />
-    <PackageReference Include="Atc.XamlToolkit" Version="1.5.34" />
-    <PackageReference Include="Atc.XamlToolkit.Wpf" Version="1.5.34" />
+    <PackageReference Include="Atc.XamlToolkit" Version="1.5.36" />
+    <PackageReference Include="Atc.XamlToolkit.Wpf" Version="1.5.36" />
     <PackageReference Include="ControlzEx" Version="7.0.0" />
     <PackageReference Include="CssParser" Version="1.3.0">
       <NoWarn>NU1701</NoWarn>