Fix text selection when renaming

src/Files/UserControls/Selection/RectangleSelection_ListViewBase.cs

@@ -186,7 +186,7 @@ private void RectangleSelection_PointerReleased(object sender, PointerRoutedEven
                     selectionChanged(sender, null);
                 }
             }
-            //if (selectionState == SelectionState.Active)
+            if (selectionState == SelectionState.Active || e.OriginalSource is ListViewBase)
             {
                 // Always trigger SelectionEnded to focus the file list when clicking on the empty space (#2977)
                 OnSelectionEnded();

src/Files/Views/LayoutModes/ColumnViewBase.xaml.cs

@@ -161,9 +161,8 @@ protected override void OnNavigatingFrom(NavigatingCancelEventArgs e)
             base.OnNavigatingFrom(e);
         }
 
-        private async void SelectionRectangle_SelectionEnded(object sender, EventArgs e)
+        private void SelectionRectangle_SelectionEnded(object sender, EventArgs e)
         {
-            await Task.Delay(200);
             FileList.Focus(FocusState.Programmatic);
         }
 
@@ -268,6 +267,10 @@ private void EndRename(TextBox textBox)
             textBox.KeyDown -= RenameTextBox_KeyDown;
             FileNameTeachingTip.IsOpen = false;
             IsRenamingItem = false;
+
+            // Re-focus selected list item
+            ListViewItem listViewItem = FileList.ContainerFromItem(RenamingItem) as ListViewItem;
+            listViewItem?.Focus(FocusState.Programmatic);
         }
 
         public override void ResetItemOpacity()

src/Files/Views/LayoutModes/DetailsLayoutBrowser.xaml.cs

@@ -282,9 +282,8 @@ protected override void OnNavigatingFrom(NavigatingCancelEventArgs e)
             ParentShellPageInstance.FilesystemViewModel.PageTypeUpdated -= FilesystemViewModel_PageTypeUpdated;
         }
 
-        private async void SelectionRectangle_SelectionEnded(object sender, EventArgs e)
+        private void SelectionRectangle_SelectionEnded(object sender, EventArgs e)
         {
-            await Task.Delay(200);
             FileList.Focus(FocusState.Programmatic);
         }
 
@@ -400,14 +399,14 @@ private async void CommitRename(TextBox textBox)
 
         private void EndRename(TextBox textBox)
         {
-            ListViewItem gridViewItem = FileList.ContainerFromItem(RenamingItem) as ListViewItem;
-            if (textBox == null || gridViewItem == null)
+            ListViewItem listViewItem = FileList.ContainerFromItem(RenamingItem) as ListViewItem;
+            if (textBox == null || listViewItem == null)
             {
                 // Navigating away, do nothing
             }
             else
             {
-                TextBlock textBlock = gridViewItem.FindDescendant("ItemName") as TextBlock;
+                TextBlock textBlock = listViewItem.FindDescendant("ItemName") as TextBlock;
                 textBox.Visibility = Visibility.Collapsed;
                 textBlock.Visibility = Visibility.Visible;
             }
@@ -416,6 +415,9 @@ private void EndRename(TextBox textBox)
             textBox.KeyDown -= RenameTextBox_KeyDown;
             FileNameTeachingTip.IsOpen = false;
             IsRenamingItem = false;
+
+            // Re-focus selected list item
+            listViewItem?.Focus(FocusState.Programmatic);
         }
 
         private async void FileList_PreviewKeyDown(object sender, KeyRoutedEventArgs e)

src/Files/Views/LayoutModes/GridViewBrowser.xaml.cs

@@ -169,9 +169,8 @@ protected override void OnNavigatingFrom(NavigatingCancelEventArgs e)
             FolderSettings.GridViewSizeChangeRequested -= FolderSettings_GridViewSizeChangeRequested;
         }
 
-        private async void SelectionRectangle_SelectionEnded(object sender, EventArgs e)
+        private void SelectionRectangle_SelectionEnded(object sender, EventArgs e)
         {
-            await Task.Delay(200);
             FileList.Focus(FocusState.Programmatic);
         }
 
@@ -359,6 +358,10 @@ private void EndRename(TextBox textBox)
             textBox.KeyDown -= RenameTextBox_KeyDown;
             FileNameTeachingTip.IsOpen = false;
             IsRenamingItem = false;
+
+            // Re-focus selected list item
+            GridViewItem gridViewItem = FileList.ContainerFromItem(RenamingItem) as GridViewItem;
+            gridViewItem?.Focus(FocusState.Programmatic);
         }
 
         private async void FileList_PreviewKeyDown(object sender, KeyRoutedEventArgs e)