feature: allows change rebase action for multiple commits from context menu command (#1775)

Signed-off-by: leo <[email protected]>

Author: love-linger

src/ViewModels/InteractiveRebase.cs

@@ -185,7 +185,6 @@ public void MoveItemUp(InteractiveRebaseItem item)
                 var prev = Items[idx - 1];
                 Items.RemoveAt(idx - 1);
                 Items.Insert(idx, prev);
-                PreSelected = item;
                 UpdateItems();
             }
         }
@@ -198,7 +197,6 @@ public void MoveItemDown(InteractiveRebaseItem item)
                 var next = Items[idx + 1];
                 Items.RemoveAt(idx + 1);
                 Items.Insert(idx, next);
-                PreSelected = item;
                 UpdateItems();
             }
         }

src/Views/InteractiveRebase.axaml

@@ -53,6 +53,7 @@
     <Border Grid.Row="2" Margin="8,0,8,8" BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}">
       <Grid RowDefinitions="*,3,*">
         <v:InteractiveRebaseListBox Grid.Row="0"
+                                    x:Name="IRItemListBox"
                                     Focusable="True"
                                     Background="{DynamicResource Brush.Contents}"
                                     ItemsSource="{Binding Items}"

src/Views/InteractiveRebase.axaml.cs

@@ -75,15 +75,14 @@ protected override void OnKeyDown(KeyEventArgs e)
             }
             else if (e.KeyModifiers.HasFlag(OperatingSystem.IsMacOS() ? KeyModifiers.Meta : KeyModifiers.Control) && items.Count == 1)
             {
-                var item = items[0];
                 if (e.Key == Key.Up)
                 {
-                    vm.MoveItemUp(item);
+                    vm.MoveItemUp(items[0]);
                     e.Handled = true;
                 }
                 else if (e.Key == Key.Down)
                 {
-                    vm.MoveItemDown(item);
+                    vm.MoveItemDown(items[0]);
                     e.Handled = true;
                 }
             }
@@ -99,6 +98,7 @@ public InteractiveRebase()
         {
             CloseOnESC = true;
             InitializeComponent();
+            IRItemListBox?.Focus();
         }
 
         public void OpenCommitMessageEditor(ViewModels.InteractiveRebaseItem item)
@@ -108,29 +108,21 @@ public void OpenCommitMessageEditor(ViewModels.InteractiveRebaseItem item)
             dialog.ShowDialog(this);
         }
 
-        protected override void OnLoaded(RoutedEventArgs e)
-        {
-            base.OnLoaded(e);
-
-            var list = this.FindDescendantOfType<InteractiveRebaseListBox>();
-            list?.Focus();
-        }
-
         private void CloseWindow(object _1, RoutedEventArgs _2)
         {
             Close();
         }
 
-        private void OnRowsSelectionChanged(object sender, SelectionChangedEventArgs e)
+        private void OnRowsSelectionChanged(object _, SelectionChangedEventArgs e)
         {
-            if (DataContext is not ViewModels.InteractiveRebase vm || sender is not InteractiveRebaseListBox listBox)
+            if (DataContext is not ViewModels.InteractiveRebase vm)
                 return;
 
             var isFirstTimeHere = !_firstSelectionChangedHandled;
             if (isFirstTimeHere)
                 _firstSelectionChangedHandled = true;
 
-            var selected = listBox.SelectedItems ?? new List<object>();
+            var selected = IRItemListBox.SelectedItems ?? new List<object>();
             var items = new List<ViewModels.InteractiveRebaseItem>();
             foreach (var item in selected)
             {
@@ -270,20 +262,34 @@ private void CreateActionMenuItem(MenuFlyout flyout, ViewModels.InteractiveRebas
             menuItem.Icon = new Ellipse() { Width = 14, Height = 14, Fill = iconBrush };
             menuItem.Header = header;
             menuItem.Tag = hotkey;
-            menuItem.Click += (_, e) =>
+            menuItem.Click += (_, __) => ChangeItemsAction(item, action);
+
+            flyout.Items.Add(menuItem);
+        }
+
+        private void ChangeItemsAction(ViewModels.InteractiveRebaseItem target, Models.InteractiveRebaseAction action)
+        {
+            if (DataContext is not ViewModels.InteractiveRebase vm)
+                return;
+
+            var selected = IRItemListBox.SelectedItems ?? new List<object>();
+            var items = new List<ViewModels.InteractiveRebaseItem>();
+            foreach (var item in selected)
             {
-                if (DataContext is ViewModels.InteractiveRebase vm)
-                {
-                    vm.ChangeAction([item], action);
+                if (item is ViewModels.InteractiveRebaseItem rebaseItem)
+                    items.Add(rebaseItem);
+            }
 
-                    if (action == Models.InteractiveRebaseAction.Reword)
-                        OpenCommitMessageEditor(item);
-                }
+            if (!items.Contains(target))
+            {
+                items.Clear();
+                items.Add(target);
+            }
 
-                e.Handled = true;
-            };
+            vm.ChangeAction(items, action);
 
-            flyout.Items.Add(menuItem);
+            if (items.Count == 1 && action == Models.InteractiveRebaseAction.Reword)
+                OpenCommitMessageEditor(items[0]);
         }
 
         private bool _firstSelectionChangedHandled = false;