refactor: all command palette should derived from ViewModels.ICommandPalette

love-linger · love-linger · commit 66676dde93fa · 2025-10-28T10:43:24.000+08:00
Signed-off-by: leo &lt;longshuang@msn.cn&gt;
diff --git a/src/ViewModels/BlameCommandPalette.cs b/src/ViewModels/BlameCommandPalette.cs
@@ -2,11 +2,10 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Avalonia.Threading;
-using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace SourceGit.ViewModels
 {
-    public class BlameCommandPalette : ObservableObject, IDisposable
+    public class BlameCommandPalette : ICommandPalette
     {
         public bool IsLoading
         {
@@ -62,7 +61,7 @@ public BlameCommandPalette(Launcher launcher, string repo)
             });
         }
 
-        public void Dispose()
+        public override void Cleanup()
         {
             _launcher = null;
             _repo = null;
diff --git a/src/ViewModels/FileHistoryCommandPalette.cs b/src/ViewModels/FileHistoryCommandPalette.cs
@@ -2,11 +2,10 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Avalonia.Threading;
-using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace SourceGit.ViewModels
 {
-    public class FileHistoryCommandPalette : ObservableObject, IDisposable
+    public class FileHistoryCommandPalette : ICommandPalette
     {
         public bool IsLoading
         {
@@ -57,7 +56,7 @@ public FileHistoryCommandPalette(Launcher launcher, string repo)
             });
         }
 
-        public void Dispose()
+        public override void Cleanup()
         {
             _launcher = null;
             _repo = null;
diff --git a/src/ViewModels/ICommandPalette.cs b/src/ViewModels/ICommandPalette.cs
@@ -0,0 +1,17 @@
+﻿using System;
+using CommunityToolkit.Mvvm.ComponentModel;
+
+namespace SourceGit.ViewModels
+{
+    public class ICommandPalette : ObservableObject, IDisposable
+    {
+        public void Dispose()
+        {
+            Cleanup();
+        }
+
+        public virtual void Cleanup()
+        {
+        }
+    }
+}
diff --git a/src/ViewModels/Launcher.cs b/src/ViewModels/Launcher.cs
@@ -44,7 +44,7 @@ public LauncherPage ActivePage
             }
         }
 
-        public IDisposable CommandPalette
+        public ICommandPalette CommandPalette
         {
             get => _commandPalette;
             set => SetProperty(ref _commandPalette, value);
@@ -378,10 +378,11 @@ public void OpenRepositoryInTab(RepositoryNode node, LauncherPage page)
                 ActiveWorkspace.ActiveIdx = ActiveWorkspace.Repositories.IndexOf(node.Id);
         }
 
-        public void OpenCommandPalette(IDisposable commandPalette)
+        public void OpenCommandPalette(ICommandPalette commandPalette)
         {
-            _commandPalette?.Dispose();
+            var old = _commandPalette;
             CommandPalette = commandPalette;
+            old?.Dispose();
         }
 
         public void CancelCommandPalette()
@@ -495,6 +496,6 @@ private void UpdateTitle()
         private LauncherPage _activePage = null;
         private bool _ignoreIndexChange = false;
         private string _title = string.Empty;
-        private IDisposable _commandPalette = null;
+        private ICommandPalette _commandPalette = null;
     }
 }
diff --git a/src/ViewModels/LauncherPagesCommandPalette.cs b/src/ViewModels/LauncherPagesCommandPalette.cs
@@ -1,10 +1,9 @@
 using System;
 using System.Collections.Generic;
-using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace SourceGit.ViewModels
 {
-    public class LauncherPagesCommandPalette : ObservableObject, IDisposable
+    public class LauncherPagesCommandPalette : ICommandPalette
     {
         public List<LauncherPage> VisiblePages
         {
@@ -61,7 +60,7 @@ public LauncherPagesCommandPalette(Launcher launcher)
             UpdateVisible();
         }
 
-        public void Dispose()
+        public override void Cleanup()
         {
             _launcher = null;
             _opened.Clear();
diff --git a/src/ViewModels/MergeCommandPalette.cs b/src/ViewModels/MergeCommandPalette.cs
@@ -1,10 +1,9 @@
 ﻿using System;
 using System.Collections.Generic;
-using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace SourceGit.ViewModels
 {
-    public class MergeCommandPalette : ObservableObject, IDisposable
+    public class MergeCommandPalette : ICommandPalette
     {
         public List<Models.Branch> Branches
         {
@@ -35,7 +34,7 @@ public MergeCommandPalette(Launcher launcher, Repository repo)
             UpdateBranches();
         }
 
-        public void Dispose()
+        public override void Cleanup()
         {
             _launcher = null;
             _repo = null;
diff --git a/src/ViewModels/RepositoryCommandPalette.cs b/src/ViewModels/RepositoryCommandPalette.cs
@@ -1,12 +1,11 @@
 ﻿using System;
 using System.Collections.Generic;
-using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace SourceGit.ViewModels
 {
     public record RepositoryCommandPaletteCmd(string Name, string Label, bool AutoCloseCommandPalette, Action Action);
 
-    public class RepositoryCommandPalette : ObservableObject, IDisposable
+    public class RepositoryCommandPalette : ICommandPalette
     {
         public List<RepositoryCommandPaletteCmd> VisibleCmds
         {
@@ -56,7 +55,7 @@ public RepositoryCommandPalette(Launcher launcher, Repository repo)
             _visibleCmds = _cmds;
         }
 
-        public void Dispose()
+        public override void Cleanup()
         {
             _launcher = null;
             _repo = null;
diff --git a/src/Views/CommandPaletteDataTemplates.cs b/src/Views/CommandPaletteDataTemplates.cs
@@ -0,0 +1,11 @@
+﻿using Avalonia.Controls;
+using Avalonia.Controls.Templates;
+
+namespace SourceGit.Views
+{
+    public class CommandPaletteDataTemplates : IDataTemplate
+    {
+        public Control Build(object param) => App.CreateViewForViewModel(param);
+        public bool Match(object data) => data is ViewModels.ICommandPalette;
+    }
+}
diff --git a/src/Views/Launcher.axaml.cs b/src/Views/Launcher.axaml.cs
@@ -2,7 +2,6 @@
 
 using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Controls.Templates;
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.Media;
@@ -11,26 +10,6 @@
 
 namespace SourceGit.Views
 {
-    public class CommandPaletteDataTemplates : IDataTemplate
-    {
-        public Control Build(object param)
-        {
-            return App.CreateViewForViewModel(param);
-        }
-
-        public bool Match(object data)
-        {
-            if (data is not IDisposable)
-                return false;
-
-            var name = data.GetType().FullName;
-            if (!name.EndsWith("CommandPalette", StringComparison.Ordinal) || !name.Contains(".ViewModels.", StringComparison.Ordinal))
-                return false;
-
-            return true;
-        }
-    }
-
     public partial class Launcher : ChromelessWindow
     {
         public static readonly StyledProperty<GridLength> CaptionHeightProperty =
diff --git a/src/Views/LauncherPage.axaml b/src/Views/LauncherPage.axaml
@@ -70,9 +70,13 @@
               <DataTemplate DataType="vm:Popup">
                 <StackPanel Orientation="Vertical" Background="{DynamicResource Brush.Popup}">
                   <!-- Popup Widget -->
-                  <ContentPresenter Margin="8,16,8,8"
-                                    DataContextChanged="OnPopupDataContextChanged"
-                                    IsHitTestVisible="{Binding InProgress, Converter={x:Static BoolConverters.Not}}"/>
+                  <ContentControl Margin="8,16,8,8"
+                                  Content="{Binding}"
+                                  IsHitTestVisible="{Binding InProgress, Converter={x:Static BoolConverters.Not}}">
+                    <ContentControl.DataTemplates>
+                      <v:PopupDataTemplates/>
+                    </ContentControl.DataTemplates>
+                  </ContentControl>
 
                   <!-- Options -->
                   <StackPanel Margin="8,4,8,8"
diff --git a/src/Views/LauncherPage.axaml.cs b/src/Views/LauncherPage.axaml.cs
@@ -1,7 +1,4 @@
-using System;
-
 using Avalonia.Controls;
-using Avalonia.Controls.Presenters;
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.LogicalTree;
@@ -84,17 +81,6 @@ private void OnDismissNotification(object sender, RoutedEventArgs e)
             e.Handled = true;
         }
 
-        private void OnPopupDataContextChanged(object sender, EventArgs e)
-        {
-            if (sender is ContentPresenter presenter)
-            {
-                if (presenter.DataContext is not ViewModels.Popup)
-                    presenter.Content = null;
-                else
-                    presenter.Content = App.CreateViewForViewModel(presenter.DataContext);
-            }
-        }
-
         private void OnToolBarPointerPressed(object sender, PointerPressedEventArgs e)
         {
             this.FindAncestorOfType<ChromelessWindow>()?.BeginMoveWindow(sender, e);
diff --git a/src/Views/PopupDataTemplates.cs b/src/Views/PopupDataTemplates.cs
@@ -0,0 +1,11 @@
+﻿using Avalonia.Controls;
+using Avalonia.Controls.Templates;
+
+namespace SourceGit.Views
+{
+    public class PopupDataTemplates : IDataTemplate
+    {
+        public Control Build(object param) => App.CreateViewForViewModel(param);
+        public bool Match(object data) => data is ViewModels.Popup;
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -2,11 +2,10 @@`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using System.Threading.Tasks;`
`4`	`4`	`using Avalonia.Threading;`
`5`		`-using CommunityToolkit.Mvvm.ComponentModel;`
`6`	`5`
`7`	`6`	`namespace SourceGit.ViewModels`
`8`	`7`	`{`
`9`		`- public class BlameCommandPalette : ObservableObject, IDisposable`
	`8`	`+ public class BlameCommandPalette : ICommandPalette`
`10`	`9`	`{`
`11`	`10`	`public bool IsLoading`
`12`	`11`	`{`
`@@ -62,7 +61,7 @@ public BlameCommandPalette(Launcher launcher, string repo)`
`62`	`61`	`});`
`63`	`62`	`}`
`64`	`63`
`65`		`- public void Dispose()`
	`64`	`+ public override void Cleanup()`
`66`	`65`	`{`
`67`	`66`	`_launcher = null;`
`68`	`67`	`_repo = null;`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public LauncherPage ActivePage`
`44`	`44`	`}`
`45`	`45`	`}`
`46`	`46`
`47`		`- public IDisposable CommandPalette`
	`47`	`+ public ICommandPalette CommandPalette`
`48`	`48`	`{`
`49`	`49`	`get => _commandPalette;`
`50`	`50`	`set => SetProperty(ref _commandPalette, value);`
`@@ -378,10 +378,11 @@ public void OpenRepositoryInTab(RepositoryNode node, LauncherPage page)`
`378`	`378`	`ActiveWorkspace.ActiveIdx = ActiveWorkspace.Repositories.IndexOf(node.Id);`
`379`	`379`	`}`
`380`	`380`
`381`		`- public void OpenCommandPalette(IDisposable commandPalette)`
	`381`	`+ public void OpenCommandPalette(ICommandPalette commandPalette)`
`382`	`382`	`{`
`383`		`- _commandPalette?.Dispose();`
	`383`	`+ var old = _commandPalette;`
`384`	`384`	`CommandPalette = commandPalette;`
	`385`	`+ old?.Dispose();`
`385`	`386`	`}`
`386`	`387`
`387`	`388`	`public void CancelCommandPalette()`
`@@ -495,6 +496,6 @@ private void UpdateTitle()`
`495`	`496`	`private LauncherPage _activePage = null;`
`496`	`497`	`private bool _ignoreIndexChange = false;`
`497`	`498`	`private string _title = string.Empty;`
`498`		`- private IDisposable _commandPalette = null;`
	`499`	`+ private ICommandPalette _commandPalette = null;`
`499`	`500`	`}`
`500`	`501`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,9 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Collections.Generic;`
`3`		`-using CommunityToolkit.Mvvm.ComponentModel;`
`4`	`3`
`5`	`4`	`namespace SourceGit.ViewModels`
`6`	`5`	`{`
`7`		`- public class LauncherPagesCommandPalette : ObservableObject, IDisposable`
	`6`	`+ public class LauncherPagesCommandPalette : ICommandPalette`
`8`	`7`	`{`
`9`	`8`	`public List<LauncherPage> VisiblePages`
`10`	`9`	`{`
`@@ -61,7 +60,7 @@ public LauncherPagesCommandPalette(Launcher launcher)`
`61`	`60`	`UpdateVisible();`
`62`	`61`	`}`
`63`	`62`
`64`		`- public void Dispose()`
	`63`	`+ public override void Cleanup()`
`65`	`64`	`{`
`66`	`65`	`_launcher = null;`
`67`	`66`	`_opened.Clear();`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,11 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Collections.Generic;`
`3`		`-using CommunityToolkit.Mvvm.ComponentModel;`
`4`	`3`
`5`	`4`	`namespace SourceGit.ViewModels`
`6`	`5`	`{`
`7`	`6`	`public record RepositoryCommandPaletteCmd(string Name, string Label, bool AutoCloseCommandPalette, Action Action);`
`8`	`7`
`9`		`- public class RepositoryCommandPalette : ObservableObject, IDisposable`
	`8`	`+ public class RepositoryCommandPalette : ICommandPalette`
`10`	`9`	`{`
`11`	`10`	`public List<RepositoryCommandPaletteCmd> VisibleCmds`
`12`	`11`	`{`
`@@ -56,7 +55,7 @@ public RepositoryCommandPalette(Launcher launcher, Repository repo)`
`56`	`55`	`_visibleCmds = _cmds;`
`57`	`56`	`}`
`58`	`57`
`59`		`- public void Dispose()`
	`58`	`+ public override void Cleanup()`
`60`	`59`	`{`
`61`	`60`	`_launcher = null;`
`62`	`61`	`_repo = null;`