enhance: allow to use arrow keys to select changes up/down after stage/unstage previous selected changes by hotkey (#1361)

love-linger · love-linger · commit 22339ab61900 · 2025-05-24T21:29:48.000+08:00
Signed-off-by: leo &lt;longshuang@msn.cn&gt;
diff --git a/src/Views/ChangeCollectionView.axaml b/src/Views/ChangeCollectionView.axaml
@@ -30,7 +30,8 @@
 
   <UserControl.DataTemplates>
     <DataTemplate DataType="vm:ChangeCollectionAsTree">
-      <v:ChangeCollectionContainer ItemsSource="{Binding Rows}"
+      <v:ChangeCollectionContainer Focusable="True"
+                                   ItemsSource="{Binding Rows}"
                                    SelectedItems="{Binding SelectedRows, Mode=TwoWay}"
                                    SelectionMode="{Binding #ThisControl.SelectionMode}"
                                    SelectionChanged="OnRowSelectionChanged">
@@ -66,7 +67,8 @@
     </DataTemplate>
 
     <DataTemplate DataType="vm:ChangeCollectionAsGrid">
-      <v:ChangeCollectionContainer ItemsSource="{Binding Changes}"
+      <v:ChangeCollectionContainer Focusable="True"
+                                   ItemsSource="{Binding Changes}"
                                    SelectedItems="{Binding SelectedChanges, Mode=TwoWay}"
                                    SelectionMode="{Binding #ThisControl.SelectionMode}"
                                    SelectionChanged="OnRowSelectionChanged">
@@ -98,7 +100,8 @@
     </DataTemplate>
 
     <DataTemplate DataType="vm:ChangeCollectionAsList">
-      <v:ChangeCollectionContainer ItemsSource="{Binding Changes}"
+      <v:ChangeCollectionContainer Focusable="True"
+                                   ItemsSource="{Binding Changes}"
                                    SelectedItems="{Binding SelectedChanges, Mode=TwoWay}"
                                    SelectionMode="{Binding #ThisControl.SelectionMode}"
                                    SelectionChanged="OnRowSelectionChanged">
diff --git a/src/Views/ChangeCollectionView.axaml.cs b/src/Views/ChangeCollectionView.axaml.cs
@@ -145,6 +145,7 @@ public void ToggleNodeIsExpanded(ViewModels.ChangeTreeNode node)
 
                         removeCount++;
                     }
+
                     tree.Rows.RemoveRange(idx + 1, removeCount);
                 }
             }
@@ -209,6 +210,13 @@ public Models.Change GetNextChangeWithoutSelection()
             return null;
         }
 
+        public void TakeFocus()
+        {
+            var container = this.FindDescendantOfType<ChangeCollectionContainer>();
+            if (container is { IsFocused: false })
+                container.Focus();
+        }
+
         protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             base.OnPropertyChanged(change);
diff --git a/src/Views/WorkingCopy.axaml b/src/Views/WorkingCopy.axaml
@@ -122,7 +122,6 @@
         <!-- Unstaged Changes -->
         <v:ChangeCollectionView Grid.Row="1"
                                 x:Name="UnstagedChangesView"
-                                Focusable="True"
                                 IsUnstagedChange="True"
                                 SelectionMode="Multiple"
                                 Background="{DynamicResource Brush.Contents}"
@@ -173,7 +172,6 @@
         <!-- Staged Changes -->
         <v:ChangeCollectionView Grid.Row="1"
                                 x:Name="StagedChangesView"
-                                Focusable="True"
                                 IsUnstagedChange="False"
                                 SelectionMode="Multiple"
                                 Background="{DynamicResource Brush.Contents}"
diff --git a/src/Views/WorkingCopy.axaml.cs b/src/Views/WorkingCopy.axaml.cs
@@ -51,7 +51,7 @@ private void OnUnstagedChangeDoubleTapped(object _, RoutedEventArgs e)
             {
                 var next = UnstagedChangesView.GetNextChangeWithoutSelection();
                 vm.StageSelected(next);
-                UnstagedChangesView.Focus();
+                UnstagedChangesView.TakeFocus();
                 e.Handled = true;
             }
         }
@@ -62,7 +62,7 @@ private void OnStagedChangeDoubleTapped(object _, RoutedEventArgs e)
             {
                 var next = StagedChangesView.GetNextChangeWithoutSelection();
                 vm.UnstageSelected(next);
-                StagedChangesView.Focus();
+                StagedChangesView.TakeFocus();
                 e.Handled = true;
             }
         }
@@ -75,7 +75,7 @@ private void OnUnstagedKeyDown(object _, KeyEventArgs e)
                 {
                     var next = UnstagedChangesView.GetNextChangeWithoutSelection();
                     vm.StageSelected(next);
-                    UnstagedChangesView.Focus();
+                    UnstagedChangesView.TakeFocus();
                     e.Handled = true;
                     return;
                 }
@@ -94,7 +94,7 @@ private void OnStagedKeyDown(object _, KeyEventArgs e)
             {
                 var next = StagedChangesView.GetNextChangeWithoutSelection();
                 vm.UnstageSelected(next);
-                StagedChangesView.Focus();
+                StagedChangesView.TakeFocus();
                 e.Handled = true;
             }
         }
@@ -105,7 +105,7 @@ private void OnStageSelectedButtonClicked(object _, RoutedEventArgs e)
             {
                 var next = UnstagedChangesView.GetNextChangeWithoutSelection();
                 vm.StageSelected(next);
-                UnstagedChangesView.Focus();
+                UnstagedChangesView.TakeFocus();
             }
 
             e.Handled = true;
@@ -117,7 +117,7 @@ private void OnUnstageSelectedButtonClicked(object _, RoutedEventArgs e)
             {
                 var next = StagedChangesView.GetNextChangeWithoutSelection();
                 vm.UnstageSelected(next);
-                StagedChangesView.Focus();
+                StagedChangesView.TakeFocus();
             }
 
             e.Handled = true;

Original file line number	Diff line number	Diff line change
`@@ -145,6 +145,7 @@ public void ToggleNodeIsExpanded(ViewModels.ChangeTreeNode node)`
`145`	`145`
`146`	`146`	`removeCount++;`
`147`	`147`	`}`
	`148`	`+`
`148`	`149`	`tree.Rows.RemoveRange(idx + 1, removeCount);`
`149`	`150`	`}`
`150`	`151`	`}`
`@@ -209,6 +210,13 @@ public Models.Change GetNextChangeWithoutSelection()`
`209`	`210`	`return null;`
`210`	`211`	`}`
`211`	`212`
	`213`	`+ public void TakeFocus()`
	`214`	`+ {`
	`215`	`+ var container = this.FindDescendantOfType<ChangeCollectionContainer>();`
	`216`	`+ if (container is { IsFocused: false })`
	`217`	`+ container.Focus();`
	`218`	`+ }`
	`219`	`+`
`212`	`220`	`protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)`
`213`	`221`	`{`
`214`	`222`	`base.OnPropertyChanged(change);`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ private void OnUnstagedChangeDoubleTapped(object _, RoutedEventArgs e)`
`51`	`51`	`{`
`52`	`52`	`var next = UnstagedChangesView.GetNextChangeWithoutSelection();`
`53`	`53`	`vm.StageSelected(next);`
`54`		`- UnstagedChangesView.Focus();`
	`54`	`+ UnstagedChangesView.TakeFocus();`
`55`	`55`	`e.Handled = true;`
`56`	`56`	`}`
`57`	`57`	`}`
`@@ -62,7 +62,7 @@ private void OnStagedChangeDoubleTapped(object _, RoutedEventArgs e)`
`62`	`62`	`{`
`63`	`63`	`var next = StagedChangesView.GetNextChangeWithoutSelection();`
`64`	`64`	`vm.UnstageSelected(next);`
`65`		`- StagedChangesView.Focus();`
	`65`	`+ StagedChangesView.TakeFocus();`
`66`	`66`	`e.Handled = true;`
`67`	`67`	`}`
`68`	`68`	`}`
`@@ -75,7 +75,7 @@ private void OnUnstagedKeyDown(object _, KeyEventArgs e)`
`75`	`75`	`{`
`76`	`76`	`var next = UnstagedChangesView.GetNextChangeWithoutSelection();`
`77`	`77`	`vm.StageSelected(next);`
`78`		`- UnstagedChangesView.Focus();`
	`78`	`+ UnstagedChangesView.TakeFocus();`
`79`	`79`	`e.Handled = true;`
`80`	`80`	`return;`
`81`	`81`	`}`
`@@ -94,7 +94,7 @@ private void OnStagedKeyDown(object _, KeyEventArgs e)`
`94`	`94`	`{`
`95`	`95`	`var next = StagedChangesView.GetNextChangeWithoutSelection();`
`96`	`96`	`vm.UnstageSelected(next);`
`97`		`- StagedChangesView.Focus();`
	`97`	`+ StagedChangesView.TakeFocus();`
`98`	`98`	`e.Handled = true;`
`99`	`99`	`}`
`100`	`100`	`}`
`@@ -105,7 +105,7 @@ private void OnStageSelectedButtonClicked(object _, RoutedEventArgs e)`
`105`	`105`	`{`
`106`	`106`	`var next = UnstagedChangesView.GetNextChangeWithoutSelection();`
`107`	`107`	`vm.StageSelected(next);`
`108`		`- UnstagedChangesView.Focus();`
	`108`	`+ UnstagedChangesView.TakeFocus();`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`e.Handled = true;`
`@@ -117,7 +117,7 @@ private void OnUnstageSelectedButtonClicked(object _, RoutedEventArgs e)`
`117`	`117`	`{`
`118`	`118`	`var next = StagedChangesView.GetNextChangeWithoutSelection();`
`119`	`119`	`vm.UnstageSelected(next);`
`120`		`- StagedChangesView.Focus();`
	`120`	`+ StagedChangesView.TakeFocus();`
`121`	`121`	`}`
`122`	`122`
`123`	`123`	`e.Handled = true;`