From 76fcc1cb1597e024d97fc1d26941bd4ce9a5616a Mon Sep 17 00:00:00 2001
From: Ionite <dev@ionite.io>
Date: Sun, 22 Oct 2023 00:02:35 -0400
Subject: [PATCH] Use relay command form of RemoveFromParentList

---
 .../Controls/StackExpander.axaml              |  2 +-
 .../ViewModels/Base/ViewModelBase.cs          | 30 +++++++++----------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/StabilityMatrix.Avalonia/Controls/StackExpander.axaml b/StabilityMatrix.Avalonia/Controls/StackExpander.axaml
index 3c8b9d9e..9e7af392 100644
--- a/StabilityMatrix.Avalonia/Controls/StackExpander.axaml
+++ b/StabilityMatrix.Avalonia/Controls/StackExpander.axaml
@@ -52,7 +52,7 @@
                                 Text="{Binding Title}"/>
                             <Button 
                                 IsVisible="{Binding IsEditEnabled}"
-                                Command="{Binding RemoveFromParentList}"
+                                Command="{Binding RemoveFromParentListCommand}"
                                 Classes="transparent-red"
                                 Grid.Column="3" 
                                 Padding="10,4"
diff --git a/StabilityMatrix.Avalonia/ViewModels/Base/ViewModelBase.cs b/StabilityMatrix.Avalonia/ViewModels/Base/ViewModelBase.cs
index 0cce47ba..05b50371 100644
--- a/StabilityMatrix.Avalonia/ViewModels/Base/ViewModelBase.cs
+++ b/StabilityMatrix.Avalonia/ViewModels/Base/ViewModelBase.cs
@@ -2,14 +2,15 @@
 using System.Threading.Tasks;
 using AsyncAwaitBestPractices;
 using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
 using StabilityMatrix.Avalonia.Models;
 
 namespace StabilityMatrix.Avalonia.ViewModels.Base;
 
-public class ViewModelBase : ObservableValidator, IRemovableListItem
+public partial class ViewModelBase : ObservableValidator, IRemovableListItem
 {
     private WeakEventManager? parentListRemoveRequestedEventManager;
-    
+
     public event EventHandler ParentListRemoveRequested
     {
         add
@@ -20,24 +21,23 @@ public class ViewModelBase : ObservableValidator, IRemovableListItem
         remove => parentListRemoveRequestedEventManager?.RemoveEventHandler(value);
     }
 
-    protected void RemoveFromParentList() => parentListRemoveRequestedEventManager?.RaiseEvent(
-        this, EventArgs.Empty, nameof(ParentListRemoveRequested));
-    
-    public virtual void OnLoaded()
-    {
-        
-    }
+    [RelayCommand]
+    protected void RemoveFromParentList() =>
+        parentListRemoveRequestedEventManager?.RaiseEvent(
+            this,
+            EventArgs.Empty,
+            nameof(ParentListRemoveRequested)
+        );
+
+    public virtual void OnLoaded() { }
 
     public virtual Task OnLoadedAsync()
     {
         return Task.CompletedTask;
     }
-    
-    public virtual void OnUnloaded()
-    {
-        
-    }
-    
+
+    public virtual void OnUnloaded() { }
+
     public virtual Task OnUnloadedAsync()
     {
         return Task.CompletedTask;