Fixed focus issues

Author: yaira2

src/Files.App/Data/Contracts/IShellPanesPage.cs

@@ -69,6 +69,11 @@ public interface IShellPanesPage : IDisposable, INotifyPropertyChanged
 		/// </summary>
 		public void FocusActivePane();
 
+		/// <summary>
+		/// Locks the active pane.
+		/// </summary>
+		public void LockActivePane();
+
 		/// <summary>
 		/// Gets open panes.
 		/// </summary>

src/Files.App/UserControls/Toolbar.xaml

@@ -688,7 +688,10 @@
 				<controls:ThemedIcon Style="{x:Bind ViewModel.LayoutThemedIcon, Mode=OneWay}" />
 
 				<AppBarButton.Flyout>
-					<Flyout contract8Present:ShouldConstrainToRootBounds="False" Placement="Bottom">
+					<Flyout
+						x:Name="LayoutFlyout"
+						contract8Present:ShouldConstrainToRootBounds="False"
+						Placement="Bottom">
 						<StackPanel Spacing="12">
 
 							<!--  Header  -->
@@ -700,6 +703,7 @@
 								<!--  Details  -->
 								<RadioButton
 									AutomationProperties.Name="{x:Bind Commands.LayoutDetails.AutomationName}"
+									Click="LayoutButton_Click"
 									Command="{x:Bind Commands.LayoutDetails}"
 									GroupName="LayoutRadio"
 									IsChecked="{x:Bind ViewModel.IsDetailsLayout, Mode=OneWay}"
@@ -723,6 +727,7 @@
 								<!--  List  -->
 								<RadioButton
 									AutomationProperties.Name="{x:Bind Commands.LayoutList.AutomationName}"
+									Click="LayoutButton_Click"
 									Command="{x:Bind Commands.LayoutList}"
 									GroupName="LayoutRadio"
 									IsChecked="{x:Bind ViewModel.IsListLayout, Mode=OneWay}"
@@ -747,6 +752,7 @@
 								<!--  Cards  -->
 								<RadioButton
 									AutomationProperties.Name="{x:Bind Commands.LayoutCards.AutomationName}"
+									Click="LayoutButton_Click"
 									Command="{x:Bind Commands.LayoutCards}"
 									GroupName="LayoutRadio"
 									IsChecked="{x:Bind ViewModel.IsCardsLayout, Mode=OneWay}"
@@ -771,6 +777,7 @@
 								<!--  Grid  -->
 								<RadioButton
 									AutomationProperties.Name="{x:Bind Commands.LayoutGrid.AutomationName}"
+									Click="LayoutButton_Click"
 									Command="{x:Bind Commands.LayoutGrid}"
 									GroupName="LayoutRadio"
 									IsChecked="{x:Bind ViewModel.IsGridLayout, Mode=OneWay}"
@@ -795,6 +802,7 @@
 								<!--  Columns  -->
 								<RadioButton
 									AutomationProperties.Name="{x:Bind Commands.LayoutColumns.AutomationName}"
+									Click="LayoutButton_Click"
 									Command="{x:Bind Commands.LayoutColumns}"
 									GroupName="LayoutRadio"
 									IsChecked="{x:Bind ViewModel.IsColumnLayout, Mode=OneWay}"

src/Files.App/UserControls/Toolbar.xaml.cs

@@ -116,5 +116,11 @@ private void RootGrid_PointerReleased(object sender, PointerRoutedEventArgs e)
 			// shortcuts from working, see https://github.com/microsoft/microsoft-ui-xaml/issues/6467
 			DispatcherQueue.TryEnqueue(() => ContentPageContext.ShellPage!.PaneHolder.FocusActivePane());
 		}
+
+		private void LayoutButton_Click(object sender, RoutedEventArgs e)
+		{
+			// Hide flyout after choosing a layout
+			LayoutFlyout.Hide();
+		}
 	}
 }

src/Files.App/ViewModels/ShellViewModel.cs

@@ -584,6 +584,13 @@ public ShellViewModel(LayoutPreferencesManager folderSettingsViewModel)
 
 		private async void LayoutModeChangeRequested(object? sender, LayoutModeEventArgs e)
 		{
+			// Layout changes can cause the active pane to lose focus, to prevent this
+			// from happening, the pane is locked and focus is restored when file loading
+			// completes, this occurs in the `RefreshItem()` method in BaseLayoutPage.cs.
+			// See https://github.com/files-community/Files/issues/15397
+			// See https://github.com/files-community/Files/issues/16530
+			ContentPageContext.ShellPage!.PaneHolder.LockActivePane();
+
 			await dispatcherQueue.EnqueueOrInvokeAsync(CheckForBackgroundImage, Microsoft.UI.Dispatching.DispatcherQueuePriority.Low);
 		}
 

src/Files.App/Views/Layouts/BaseLayoutPage.cs

@@ -1240,8 +1240,14 @@ private void RefreshItem(SelectorItem container, object item, bool inRecycleQueu
 						if (ParentShellPageInstance.ShellViewModel.EnabledGitProperties is not GitProperties.None && listedItem is IGitItem gitItem)
 							await ParentShellPageInstance.ShellViewModel.LoadGitPropertiesAsync(gitItem);
 
-						// Focus file list when items finish loading (#16530)
-						ItemManipulationModel.FocusFileList();
+						// Layout changes can cause the active pane to lose focus, to prevent this
+						// from happening, the pane is locked and focus is restored when file loading
+						// completes, the locking occurs in the `LayoutModeChangeRequested()` method in ShellViewModel.cs.
+						// See https://github.com/files-community/Files/issues/15397
+						// See https://github.com/files-community/Files/issues/16530
+
+						if (ParentShellPageInstance.IsCurrentPane && !ParentShellPageInstance.IsColumnView)
+							ItemManipulationModel.FocusFileList();
 					});
 				}
 			}

src/Files.App/Views/ShellPanesPage.xaml.cs

@@ -228,6 +228,17 @@ public bool IsCurrentInstance
 			}
 		}
 
+		private bool _IsActivePaneLocked;
+		public bool IsActivePaneLocked
+		{
+			get => _IsActivePaneLocked;
+			set
+			{
+				if (_IsActivePaneLocked != value)
+					_IsActivePaneLocked = value;
+			}
+		}
+
 		// Events
 
 		public static event EventHandler<ShellPanesPage>? CurrentInstanceChanged;
@@ -378,6 +389,12 @@ public void FocusActivePane()
 				GetPane(1)?.Focus(FocusState.Programmatic);
 		}
 
+		/// <inheritdoc/>
+		public void LockActivePane()
+		{
+			IsActivePaneLocked = true;
+		}
+
 		/// <inheritdoc/>
 		public IEnumerable<ModernShellPage> GetPanes()
 		{
@@ -656,9 +673,19 @@ private void Pane_Loaded(object sender, RoutedEventArgs e)
 
 		private void Pane_GettingFocus(UIElement sender, GettingFocusEventArgs args)
 		{
-			// Workaround for https://github.com/files-community/Files/issues/15397
-			if (args?.NewFocusedElement is not null && args.NewFocusedElement is not (ListViewItem or GridViewItem or ListView or GridView or TextBox))
+			// Layout changes can cause the active pane to lose focus, to prevent this
+			// from happening, the pane is locked and focus is restored when file loading
+			// completes.
+			// The locking occurs in the `LayoutModeChangeRequested()` method in ShellViewModel.cs.
+			// The focus is restored in the `RefreshItem()` method in BaseLayoutPage.cs
+			// See https://github.com/files-community/Files/issues/15397
+			// See https://github.com/files-community/Files/issues/16530
+
+			if (IsActivePaneLocked)
+			{
+				IsActivePaneLocked = false;
 				args.TryCancel();
+			}
 		}
 
 		private void Pane_ContentChanged(object? sender, TabBarItemParameter e)