Resolved merge conflicts

Author: workbysaran

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

@@ -69,11 +69,6 @@ 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/Views/Layouts/BaseLayoutPage.cs

@@ -372,13 +372,6 @@ protected virtual void BaseFolderSettings_LayoutModeChangeRequested(object? send
 
 				if (layoutType != ParentShellPageInstance.CurrentPageType)
 				{
-					// Layout changes can cause the active pane to lose focus. To prevent this,
-					// the pane is locked here and focus is restored when file loading completes
-					// 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
-					ParentShellPageInstance!.PaneHolder.LockActivePane();
-
 					ParentShellPageInstance.NavigateWithArguments(layoutType, new NavigationArguments()
 					{
 						NavPathParam = navigationArguments!.NavPathParam,
@@ -395,6 +388,12 @@ protected virtual void BaseFolderSettings_LayoutModeChangeRequested(object? send
 				}
 
 				ParentShellPageInstance.ShellViewModel.UpdateEmptyTextType();
+
+				// Focus on the active pane in case it was lost during the layout switch.
+				// Allthough the focus is also set from SetSelectedItemsOnNavigation,
+				// that is only called when switching between a Grid based layout and Details,
+				// not between different Grid based layouts (eg. List and Cards).
+				ParentShellPageInstance!.PaneHolder.FocusActivePane();
 			}
 		}
 
@@ -513,7 +512,7 @@ protected override async void OnNavigatedTo(NavigationEventArgs e)
 			BaseContextMenuFlyout.Opening += BaseContextFlyout_Opening;
 		}
 
-		public void SetSelectedItemsOnNavigation()
+		public async void SetSelectedItemsOnNavigation()
 		{
 			try
 			{
@@ -527,12 +526,21 @@ navigationArguments.SelectItems is not null &&
 					];
 
 					ItemManipulationModel.SetSelectedItems(listedItemsToSelect);
-					ItemManipulationModel.FocusSelectedItems();
+
+					// Don't focus file list if TextBox is focused
+					if (FocusManager.GetFocusedElement() is not TextBox)
+						ItemManipulationModel.FocusSelectedItems();
 				}
-				else if (navigationArguments is not null && navigationArguments.FocusOnNavigation)
+				else if (navigationArguments is not null && ParentShellPageInstance!.InstanceViewModel.FolderSettings.LayoutMode is not FolderLayoutModes.ColumnView)
 				{
-					// Set focus on layout specific file list control
-					ItemManipulationModel.FocusFileList();
+					// Delay to ensure the new layout is loaded
+					if (navigationArguments.IsLayoutSwitch)
+						await Task.Delay(100);
+
+					// Focus on the active pane in case it was lost during navigation
+					// Don't focus file list if TextBox is focused
+					if (FocusManager.GetFocusedElement() is not TextBox)
+						ParentShellPageInstance!.PaneHolder.FocusActivePane();
 				}
 			}
 			catch (Exception) { }
@@ -1246,14 +1254,6 @@ private void RefreshItem(SelectorItem container, object item, bool inRecycleQueu
 						await ParentShellPageInstance!.ShellViewModel.LoadExtendedItemPropertiesAsync(listedItem);
 						if (ParentShellPageInstance.ShellViewModel.EnabledGitProperties is not GitProperties.None && listedItem is IGitItem gitItem)
 							await ParentShellPageInstance.ShellViewModel.LoadGitPropertiesAsync(gitItem);
-
-						// Layout changes can cause the active pane to lose focus. To prevent this,
-						// the pane is locked in LayoutModeChangeRequested() and focus is restored here
-						// when file loading completes.
-						// See https://github.com/files-community/Files/issues/15397
-						// See https://github.com/files-community/Files/issues/16530
-						if (ParentShellPageInstance.IsCurrentPane && ParentShellPageInstance.InstanceViewModel.FolderSettings.LayoutMode is not FolderLayoutModes.ColumnView)
-							ItemManipulationModel.FocusFileList();
 					});
 				}
 			}

src/Files.App/Views/ShellPanesPage.xaml

@@ -24,5 +24,6 @@
 		</ResourceDictionary>
 	</Page.Resources>
 
-	<Grid x:Name="RootGrid" />
+	<!--  TabFocusNavigation is set to 'once' to prevent focus from auto switching to the next pane  -->
+	<Grid x:Name="RootGrid" TabFocusNavigation="Once" />
 </Page>

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

@@ -229,16 +229,6 @@ public bool IsCurrentInstance
 			}
 		}
 
-		private bool _IsActivePaneLocked;
-		public bool IsActivePaneLocked
-		{
-			get => _IsActivePaneLocked;
-			set
-			{
-				if (_IsActivePaneLocked != value)
-					_IsActivePaneLocked = value;
-			}
-		}
 
 		// Events
 
@@ -394,12 +384,6 @@ public void FocusActivePane()
 				baseShellPage.ContentPage?.ItemManipulationModel.FocusFileList();
 		}
 
-		/// <inheritdoc/>
-		public void LockActivePane()
-		{
-			IsActivePaneLocked = true;
-		}
-
 		/// <inheritdoc/>
 		public IEnumerable<ModernShellPage> GetPanes()
 		{
@@ -669,27 +653,12 @@ private void Pane_Loaded(object sender, RoutedEventArgs e)
 		{
 			if (sender is UIElement element)
 			{
-				element.GettingFocus += Pane_GettingFocus;
 				element.GotFocus += Pane_GotFocus;
 				element.RightTapped += Pane_RightTapped;
 				element.PointerPressed += Pane_PointerPressed;
 			}
 		}
 
-		private void Pane_GettingFocus(UIElement sender, GettingFocusEventArgs args)
-		{
-			// Cancel focus attempts while the active pane is locked during layout changes.
-			// Pane locking occurs in BaseFolderSettings_LayoutModeChangeRequested() in BaseLayoutPage.cs.
-			// Focus is restored in RefreshItem() in BaseLayoutPage.cs when file loading completes.
-			// 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)
 		{
 			TabBarItemParameter = new()
@@ -804,7 +773,6 @@ public void Dispose()
 			{
 				pane.Loaded -= Pane_Loaded;
 				pane.ContentChanged -= Pane_ContentChanged;
-				pane.GettingFocus -= Pane_GettingFocus;
 				pane.GotFocus -= Pane_GotFocus;
 				pane.RightTapped -= Pane_RightTapped;
 				pane.PointerPressed -= Pane_PointerPressed;

src/Files.App/Views/Shells/ModernShellPage.xaml

@@ -130,6 +130,7 @@
 			Padding="26,8,12,8"
 			BorderBrush="{ThemeResource DividerStrokeColorDefaultBrush}"
 			BorderThickness="0,0,0,1"
+			IsTabStop="False"
 			Visibility="{x:Bind ShellViewModel.ShowFilterHeader, Mode=OneWay}">
 			<StackPanel
 				VerticalAlignment="Center"
@@ -158,7 +159,8 @@
 			x:Name="ItemDisplayFrame"
 			Grid.Row="2"
 			x:FieldModifier="public"
-			Navigated="ItemDisplayFrame_Navigated" />
+			Navigated="ItemDisplayFrame_Navigated"
+			TabIndex="1" />
 
 		<VisualStateManager.VisualStateGroups>
 			<VisualStateGroup x:Name="ShellBorderFocusState">