fix: context menu did NOT closed after its placement target being recycled (#140)

Author: love-linger

src/Views/Blame.axaml.cs

@@ -299,7 +299,8 @@ private void OnTextViewContextRequested(object sender, ContextRequestedEventArgs
 
             var menu = new ContextMenu();
             menu.Items.Add(copy);
-            menu.Open(TextArea.TextView);
+
+            TextArea.TextView.OpenContextMenu(menu);
             e.Handled = true;
         }
 

src/Views/CommitChanges.axaml.cs

@@ -24,7 +24,7 @@ private void OnDataGridContextRequested(object sender, ContextRequestedEventArgs
             {
                 var detail = DataContext as ViewModels.CommitDetail;
                 var menu = detail.CreateChangeContextMenu(datagrid.SelectedItem as Models.Change);
-                menu.Open(datagrid);
+                datagrid.OpenContextMenu(menu);
             }
 
             e.Handled = true;
@@ -39,7 +39,7 @@ private void OnTreeViewContextRequested(object sender, ContextRequestedEventArgs
                 if (node != null && !node.IsFolder)
                 {
                     var menu = detail.CreateChangeContextMenu(node.Backend as Models.Change);
-                    menu.Open(view);
+                    view.OpenContextMenu(menu);
                 }
             }
 

src/Views/CommitDetail.axaml.cs

@@ -33,7 +33,7 @@ private void OnChangeListContextRequested(object sender, ContextRequestedEventAr
                 }
 
                 var menu = detail.CreateChangeContextMenu(datagrid.SelectedItem as Models.Change);
-                menu.Open(datagrid);
+                datagrid.OpenContextMenu(menu);
             }
             e.Handled = true;
         }

src/Views/ContextMenuExtension.cs

@@ -0,0 +1,25 @@
+using System;
+using System.ComponentModel;
+
+using Avalonia.Controls;
+
+namespace SourceGit.Views
+{
+    public static class ContextMenuExtension
+    {
+        public static void OpenContextMenu(this Control control, ContextMenu menu)
+        {
+            menu.PlacementTarget = control;
+            menu.Closing += OnContextMenuClosing; // Clear context menu because it is dynamic.
+
+            control.ContextMenu = menu;
+            control.ContextMenu.Open();
+        }
+
+        private static void OnContextMenuClosing(object sender, CancelEventArgs e)
+        {
+            if (sender is ContextMenu menu && menu.PlacementTarget != null)
+                menu.PlacementTarget.ContextMenu = null;
+        }
+    }
+}

src/Views/Histories.axaml.cs

@@ -300,7 +300,7 @@ private void OnCommitDataGridContextRequested(object sender, ContextRequestedEve
             if (DataContext is ViewModels.Histories histories)
             {
                 var menu = histories.MakeContextMenu();
-                menu?.Open(sender as Control);
+                (sender as Control)?.OpenContextMenu(menu);
             }
             e.Handled = true;
         }

src/Views/Repository.axaml.cs

@@ -66,11 +66,8 @@ private void OnOpenWithExternalTools(object sender, RoutedEventArgs e)
             if (sender is Button button && DataContext is ViewModels.Repository repo)
             {
                 var menu = repo.CreateContextMenuForExternalTools();
-                if (menu != null)
-                {
-                    menu.Open(button);
-                    e.Handled = true;
-                }
+                button.OpenContextMenu(menu);
+                e.Handled = true;
             }
         }
 
@@ -201,8 +198,7 @@ private void OnLocalBranchContextMenuRequested(object sender, ContextRequestedEv
                 if (node.IsBranch && DataContext is ViewModels.Repository repo)
                 {
                     var menu = repo.CreateContextMenuForLocalBranch(node.Backend as Models.Branch);
-                    if (menu != null)
-                        menu.Open(grid);
+                    grid.OpenContextMenu(menu);
                 }
             }
 
@@ -218,14 +214,12 @@ private void OnRemoteBranchContextMenuRequested(object sender, ContextRequestedE
                 if (node.IsRemote)
                 {
                     var menu = repo.CreateContextMenuForRemote(node.Backend as Models.Remote);
-                    if (menu != null)
-                        menu.Open(grid);
+                    grid.OpenContextMenu(menu);
                 }
                 else if (node.IsBranch)
                 {
                     var menu = repo.CreateContextMenuForRemoteBranch(node.Backend as Models.Branch);
-                    if (menu != null)
-                        menu.Open(grid);
+                    grid.OpenContextMenu(menu);
                 }
             }
 
@@ -238,8 +232,7 @@ private void OnTagContextRequested(object sender, ContextRequestedEventArgs e)
             {
                 var tag = datagrid.SelectedItem as Models.Tag;
                 var menu = repo.CreateContextMenuForTag(tag);
-                if (menu != null)
-                    menu.Open(datagrid);
+                datagrid.OpenContextMenu(menu);
             }
 
             e.Handled = true;
@@ -251,8 +244,7 @@ private void OnSubmoduleContextRequested(object sender, ContextRequestedEventArg
             {
                 var submodule = datagrid.SelectedItem as string;
                 var menu = repo.CreateContextMenuForSubmodule(submodule);
-                if (menu != null)
-                    menu.Open(datagrid);
+                datagrid.OpenContextMenu(menu);
             }
 
             e.Handled = true;
@@ -263,8 +255,7 @@ private void OpenGitFlowMenu(object sender, RoutedEventArgs e)
             if (DataContext is ViewModels.Repository repo)
             {
                 var menu = repo.CreateContextMenuForGitFlow();
-                if (menu != null)
-                    menu.Open(sender as Button);
+                (sender as Control)?.OpenContextMenu(menu);
             }
 
             e.Handled = true;

src/Views/RevisionCompare.axaml.cs

@@ -25,7 +25,7 @@ private void OnDataGridContextRequested(object sender, ContextRequestedEventArgs
             {
                 var compare = DataContext as ViewModels.RevisionCompare;
                 var menu = compare.CreateChangeContextMenu(datagrid.SelectedItem as Models.Change);
-                menu.Open(datagrid);
+                datagrid.OpenContextMenu(menu);
             }
 
             e.Handled = true;
@@ -40,7 +40,7 @@ private void OnTreeViewContextRequested(object sender, ContextRequestedEventArgs
                 if (node != null && !node.IsFolder)
                 {
                     var menu = compare.CreateChangeContextMenu(node.Backend as Models.Change);
-                    menu.Open(view);
+                    view.OpenContextMenu(menu);
                 }
             }
 

src/Views/RevisionFiles.axaml.cs

@@ -198,7 +198,8 @@ private void OnTextViewContextRequested(object sender, ContextRequestedEventArgs
 
             var menu = new ContextMenu();
             menu.Items.Add(copy);
-            menu.Open(TextArea.TextView);
+
+            TextArea.TextView.OpenContextMenu(menu);
             e.Handled = true;
         }
 
@@ -219,7 +220,7 @@ private void OnTreeViewContextRequested(object sender, ContextRequestedEventArgs
             if (!node.IsFolder)
             {
                 var menu = detail.CreateRevisionFileContextMenu(node.Backend as Models.Object);
-                menu.Open(sender as Control);
+                (sender as Control)?.OpenContextMenu(menu);
             }
 
             e.Handled = true;

src/Views/TextDiffView.axaml.cs

@@ -320,7 +320,8 @@ private void OnTextViewContextRequested(object sender, ContextRequestedEventArgs
             };
 
             menu.Items.Add(copy);
-            menu.Open(TextArea.TextView);
+
+            TextArea.TextView.OpenContextMenu(menu);
             e.Handled = true;
         }
 
@@ -731,7 +732,8 @@ private void OnTextViewContextRequested(object sender, ContextRequestedEventArgs
             };
 
             menu.Items.Add(copy);
-            menu.Open(TextArea.TextView);
+            
+            TextArea.TextView.OpenContextMenu(menu);
             e.Handled = true;
         }
 

src/Views/Welcome.axaml.cs

@@ -42,7 +42,7 @@ private void OnTreeNodeContextRequested(object sender, ContextRequestedEventArgs
             if (sender is Grid grid && DataContext is ViewModels.Welcome vm)
             {
                 var menu = vm.CreateContextMenu(grid.DataContext as ViewModels.RepositoryNode);
-                menu?.Open(grid);
+                grid.OpenContextMenu(menu);
                 e.Handled = true;
             }
         }