fixes

Toolkit.Foundation/Observable.cs

@@ -24,6 +24,9 @@ public partial class Observable(IServiceProvider provider,
 {
     private readonly Dictionary<string, object> trackedProperties = [];
 
+    [ObservableProperty]
+    private bool isActivated;
+
     [ObservableProperty]
     private bool isActive;
 
@@ -42,6 +45,12 @@ public partial class Observable(IServiceProvider provider,
 
     public ISubscriber Subscriber { get; } = subscriber;
 
+    public virtual Task OnActivated()
+    {
+        IsActivated = true;
+        return Task.CompletedTask;
+    }
+
     public void Commit()
     {
         foreach (object trackedProperty in trackedProperties.Values)
@@ -50,6 +59,15 @@ public partial class Observable(IServiceProvider provider,
         }
     }
 
+    public virtual Task OnDeactivated()
+    {
+        IsActivated = false;
+        return Task.CompletedTask;
+    }
+
+    public virtual Task OnDeactivating() =>
+        Task.CompletedTask;
+
     public virtual void Dispose()
     {
         GC.SuppressFinalize(this);
@@ -67,25 +85,6 @@ public partial class Observable(IServiceProvider provider,
         Subscriber.Subscribe(this);
     }
 
-    [ObservableProperty]
-    private bool isActivated;
-
-    public virtual Task Activated()
-    {
-        IsActivated = true;
-        return Task.CompletedTask;
-    }
-
-
-    public virtual Task Deactivated()
-    {
-        IsActivated = false;
-        return Task.CompletedTask;
-    }
-
-    public virtual Task Deactivating() =>
-        Task.CompletedTask;
-
     public void Revert()
     {
         foreach (object trackedProperty in trackedProperties.Values)