FIXES

Toolkit.Foundation/ObservableConfiguration.cs

@@ -1,28 +1,46 @@
 using CommunityToolkit.Mvvm.Messaging;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Toolkit.Foundation;
 
-public partial class ObservableConfiguration<TConfiguration, TValue>(IServiceProvider provider,
-    IServiceFactory factory,
-    IMessenger messenger,
-    IDisposer disposer,
-    TConfiguration configuration,
-    IWritableConfiguration<TConfiguration> writer,
-    Func<TConfiguration, TValue?> read,
-    Action<TValue?, TConfiguration> write) :
-    Observable<TValue>(provider, factory, messenger, disposer),
-    IHandler<ChangedEventArgs<TConfiguration>>
+public partial class ObservableConfiguration<TConfiguration, TValue> :
+    Observable<TValue>,
+    IRecipient<ChangedEventArgs<TConfiguration>>
     where TConfiguration : class
 {
-    public void Handle(ChangedEventArgs<TConfiguration> args)
+    private readonly TConfiguration configuration;
+    private readonly IWritableConfiguration<TConfiguration> writer;
+    private readonly Func<TConfiguration, TValue?> read;
+    private readonly Action<TValue?, TConfiguration> write;
+    private readonly IDispatcher dispatcher;
+
+    public ObservableConfiguration(IServiceProvider provider,
+        IServiceFactory factory,
+        IMessenger messenger,
+        IDisposer disposer,
+        TConfiguration configuration,
+        IWritableConfiguration<TConfiguration> writer,
+        Func<TConfiguration, TValue?> read,
+        Action<TValue?, TConfiguration> write,
+        TValue? value = default) : base(provider, factory, messenger, disposer)
+    {
+        this.configuration = configuration;
+        this.writer = writer;
+        this.read = read;
+        this.write = write;
+
+        dispatcher = provider.GetRequiredService<IDispatcher>();
+    }
+
+    public void Receive(ChangedEventArgs<TConfiguration> args)
     {
         if (args.Sender is TConfiguration configuration)
         {
-            Value = read(configuration);
+            dispatcher.Invoke(() => Value = read(configuration));
         }
     }
 
-    protected override void Activated() => Value = read(configuration);
+    protected override void Activated() => dispatcher.Invoke(() => Value = read(configuration));
 
     protected override void Changed(TValue? value)
     {
@@ -30,5 +48,7 @@ public partial class ObservableConfiguration<TConfiguration, TValue>(IServicePro
         {
             writer.Write(args => write(value, args));
         }
+
+        base.Changed(value);
     }
 }