fix: text diff view in commit detail panel may display wrong data when switching between repositories (#1503)

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

Author: love-linger

src/ViewModels/BranchCompare.cs

@@ -184,7 +184,7 @@ private void Refresh()
                 {
                     var baseHead = new Commands.QuerySingleCommit(_repo, _based.Head).Result();
                     var toHead = new Commands.QuerySingleCommit(_repo, _to.Head).Result();
-                    Dispatcher.UIThread.Invoke(() =>
+                    Dispatcher.UIThread.Post(() =>
                     {
                         BaseHead = baseHead;
                         ToHead = toHead;
@@ -204,7 +204,15 @@ private void Refresh()
                     }
                 }
 
-                Dispatcher.UIThread.Invoke(() => VisibleChanges = visible);
+                Dispatcher.UIThread.Post(() =>
+                {
+                    VisibleChanges = visible;
+
+                    if (VisibleChanges.Count > 0)
+                        SelectedChanges = [VisibleChanges[0]];
+                    else
+                        SelectedChanges = [];
+                });
             });
         }
 

src/ViewModels/CommitDetail.cs

@@ -772,6 +772,8 @@ private void Refresh()
 
                         if (visible.Count == 0)
                             SelectedChanges = null;
+                        else
+                            SelectedChanges = [VisibleChanges[0]];
                     });
                 }
             }, token);

src/ViewModels/RevisionCompare.cs

@@ -227,7 +227,15 @@ private void Refresh()
                 }
             }
 
-            Dispatcher.UIThread.Invoke(() => VisibleChanges = visible);
+            Dispatcher.UIThread.Post(() =>
+            {
+                VisibleChanges = visible;
+
+                if (VisibleChanges.Count > 0)
+                    SelectedChanges = [VisibleChanges[0]];
+                else
+                    SelectedChanges = [];
+            });
         }
 
         private string GetSHA(object obj)

src/Views/BranchCompare.axaml

@@ -128,7 +128,6 @@
             <v:ChangeCollectionView ViewMode="{Binding Source={x:Static vm:Preferences.Instance}, Path=CommitChangeViewMode}"
                                     Changes="{Binding VisibleChanges}"
                                     SelectedChanges="{Binding SelectedChanges, Mode=TwoWay}"
-                                    AutoSelectFirstChange="True"
                                     ContextRequested="OnChangeContextRequested"/>
           </Border>
         </Grid>

src/Views/ChangeCollectionView.axaml.cs

@@ -87,15 +87,6 @@ public List<Models.Change> Changes
             set => SetValue(ChangesProperty, value);
         }
 
-        public static readonly StyledProperty<bool> AutoSelectFirstChangeProperty =
-            AvaloniaProperty.Register<ChangeCollectionView, bool>(nameof(AutoSelectFirstChange));
-
-        public bool AutoSelectFirstChange
-        {
-            get => GetValue(AutoSelectFirstChangeProperty);
-            set => SetValue(AutoSelectFirstChangeProperty, value);
-        }
-
         public static readonly StyledProperty<List<Models.Change>> SelectedChangesProperty =
             AvaloniaProperty.Register<ChangeCollectionView, List<Models.Change>>(nameof(SelectedChanges));
 
@@ -365,19 +356,7 @@ private void UpdateDataSource(bool onlyViewModeChange)
                 MakeTreeRows(rows, tree.Tree);
                 tree.Rows.AddRange(rows);
 
-                if (!onlyViewModeChange && AutoSelectFirstChange)
-                {
-                    foreach (var row in tree.Rows)
-                    {
-                        if (row.Change != null)
-                        {
-                            tree.SelectedRows.Add(row);
-                            SetCurrentValue(SelectedChangesProperty, [row.Change]);
-                            break;
-                        }
-                    }
-                }
-                else if (selected.Count > 0)
+                if (selected.Count > 0)
                 {
                     var sets = new HashSet<Models.Change>(selected);
                     var nodes = new List<ViewModels.ChangeTreeNode>();
@@ -396,33 +375,17 @@ private void UpdateDataSource(bool onlyViewModeChange)
             {
                 var grid = new ViewModels.ChangeCollectionAsGrid();
                 grid.Changes.AddRange(changes);
-
-                if (!onlyViewModeChange && AutoSelectFirstChange)
-                {
-                    grid.SelectedChanges.Add(changes[0]);
-                    SetCurrentValue(SelectedChangesProperty, [changes[0]]);
-                }
-                else if (selected.Count > 0)
-                {
+                if (selected.Count > 0)
                     grid.SelectedChanges.AddRange(selected);
-                }
 
                 Content = grid;
             }
             else
             {
                 var list = new ViewModels.ChangeCollectionAsList();
                 list.Changes.AddRange(changes);
-
-                if (!onlyViewModeChange && AutoSelectFirstChange)
-                {
-                    list.SelectedChanges.Add(changes[0]);
-                    SetCurrentValue(SelectedChangesProperty, [changes[0]]);
-                }
-                else if (selected.Count > 0)
-                {
+                if (selected.Count > 0)
                     list.SelectedChanges.AddRange(selected);
-                }
 
                 Content = list;
             }

src/Views/CommitChanges.axaml

@@ -50,7 +50,6 @@
                                 ViewMode="{Binding Source={x:Static vm:Preferences.Instance}, Path=CommitChangeViewMode}"
                                 Changes="{Binding VisibleChanges}"
                                 SelectedChanges="{Binding SelectedChanges, Mode=TwoWay}"
-                                AutoSelectFirstChange="True"
                                 ContextRequested="OnChangeContextRequested"/>
       </Border>
 

src/Views/RevisionCompare.axaml

@@ -99,7 +99,6 @@
           <v:ChangeCollectionView ViewMode="{Binding Source={x:Static vm:Preferences.Instance}, Path=CommitChangeViewMode}"
                                   Changes="{Binding VisibleChanges}"
                                   SelectedChanges="{Binding SelectedChanges, Mode=TwoWay}"
-                                  AutoSelectFirstChange="True"
                                   ContextRequested="OnChangeContextRequested"/>
         </Border>
       </Grid>