Fix: Fixed issue where scroll position wasn't always in the correct position (#15281)

Author: hishitetsu

src/Files.App/Data/Models/ItemManipulationModel.cs

@@ -23,6 +23,8 @@ public sealed class ItemManipulationModel
 
 		public event EventHandler<ListedItem> ScrollIntoViewInvoked;
 
+		public event EventHandler ScrollToTopInvoked;
+
 		public event EventHandler SetDragModeForItemsInvoked;
 
 		public event EventHandler RefreshItemsOpacityInvoked;
@@ -104,6 +106,11 @@ public void ScrollIntoView(ListedItem item)
 			ScrollIntoViewInvoked?.Invoke(this, item);
 		}
 
+		public void ScrollToTop()
+		{
+			ScrollToTopInvoked?.Invoke(this, EventArgs.Empty);
+		}
+
 		public void SetDragModeForItems()
 		{
 			SetDragModeForItemsInvoked?.Invoke(this, EventArgs.Empty);

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

@@ -47,6 +47,7 @@ public BaseGroupableLayoutPage() : base()
 		protected abstract void ItemManipulationModel_RemoveSelectedItemInvoked(object? sender, ListedItem e);
 		protected abstract void ItemManipulationModel_FocusSelectedItemsInvoked(object? sender, EventArgs e);
 		protected abstract void ItemManipulationModel_ScrollIntoViewInvoked(object? sender, ListedItem e);
+		protected abstract void ItemManipulationModel_ScrollToTopInvoked(object? sender, EventArgs e);
 		protected abstract void FileList_PreviewKeyDown(object sender, KeyRoutedEventArgs e);
 		protected abstract void EndRename(TextBox textBox);
 
@@ -70,6 +71,7 @@ protected override void HookEvents()
 			ItemManipulationModel.FocusSelectedItemsInvoked += ItemManipulationModel_FocusSelectedItemsInvoked;
 			ItemManipulationModel.StartRenameItemInvoked += ItemManipulationModel_StartRenameItemInvoked;
 			ItemManipulationModel.ScrollIntoViewInvoked += ItemManipulationModel_ScrollIntoViewInvoked;
+			ItemManipulationModel.ScrollToTopInvoked += ItemManipulationModel_ScrollToTopInvoked;
 			ItemManipulationModel.RefreshItemThumbnailInvoked += ItemManipulationModel_RefreshItemThumbnail;
 			ItemManipulationModel.RefreshItemsThumbnailInvoked += ItemManipulationModel_RefreshItemsThumbnail;
 		}
@@ -88,6 +90,7 @@ protected override void UnhookEvents()
 			ItemManipulationModel.FocusSelectedItemsInvoked -= ItemManipulationModel_FocusSelectedItemsInvoked;
 			ItemManipulationModel.StartRenameItemInvoked -= ItemManipulationModel_StartRenameItemInvoked;
 			ItemManipulationModel.ScrollIntoViewInvoked -= ItemManipulationModel_ScrollIntoViewInvoked;
+			ItemManipulationModel.ScrollToTopInvoked -= ItemManipulationModel_ScrollToTopInvoked;
 			ItemManipulationModel.RefreshItemThumbnailInvoked -= ItemManipulationModel_RefreshItemThumbnail;
 			ItemManipulationModel.RefreshItemsThumbnailInvoked -= ItemManipulationModel_RefreshItemsThumbnail;
 		}

src/Files.App/Views/Layouts/ColumnLayoutPage.xaml.cs

@@ -109,6 +109,11 @@ protected override void ItemManipulationModel_ScrollIntoViewInvoked(object? send
 			}
 		}
 
+		protected override void ItemManipulationModel_ScrollToTopInvoked(object? sender, EventArgs e)
+		{
+			ContentScroller?.ChangeView(null, 0, null, true);
+		}
+
 		protected override void ItemManipulationModel_FocusSelectedItemsInvoked(object? sender, EventArgs e)
 		{
 			if (SelectedItems?.Any() ?? false)

src/Files.App/Views/Layouts/DetailsLayoutPage.xaml.cs

@@ -98,6 +98,11 @@ protected override void ItemManipulationModel_ScrollIntoViewInvoked(object? send
 			ContentScroller?.ChangeView(null, FileList.Items.IndexOf(e) * RowHeight, null, true); // Scroll to index * item height
 		}
 
+		protected override void ItemManipulationModel_ScrollToTopInvoked(object? sender, EventArgs e)
+		{
+			ContentScroller?.ChangeView(null, 0, null, true);
+		}
+
 		protected override void ItemManipulationModel_FocusSelectedItemsInvoked(object? sender, EventArgs e)
 		{
 			if (SelectedItems?.Any() ?? false)

src/Files.App/Views/Layouts/GridLayoutPage.xaml.cs

@@ -90,6 +90,14 @@ protected override void ItemManipulationModel_ScrollIntoViewInvoked(object? send
 			FileList.ScrollIntoView(e);
 		}
 
+		protected override void ItemManipulationModel_ScrollToTopInvoked(object? sender, EventArgs e)
+		{
+			if (FolderSettings?.LayoutMode is FolderLayoutModes.ListView)
+				ContentScroller?.ChangeView(0, null, null, true);
+			else
+				ContentScroller?.ChangeView(null, 0, null, true);
+		}
+
 		protected override void ItemManipulationModel_FocusSelectedItemsInvoked(object? sender, EventArgs e)
 		{
 			if (SelectedItems.Any())

src/Files.App/Views/Shells/BaseShellPage.cs

@@ -659,6 +659,10 @@ protected void FilesystemViewModel_ItemLoadStatusChanged(object sender, ItemLoad
 					break;
 				case ItemLoadStatusChangedEventArgs.ItemLoadStatus.Complete:
 					SetLoadingIndicatorForTabs(false);
+
+					if (ContentPage is not null)
+						ContentPage.ItemManipulationModel.ScrollToTop();
+
 					ToolbarViewModel.CanRefresh = true;
 					// Select previous directory
 					if (!string.IsNullOrWhiteSpace(e.PreviousDirectory) &&
@@ -694,13 +698,10 @@ protected void FilesystemViewModel_ItemLoadStatusChanged(object sender, ItemLoad
 
 						var itemToSelect = FilesystemViewModel.FilesAndFolders.ToList().FirstOrDefault((item) => item.ItemPath == folderToSelect);
 
-						if (itemToSelect is not null && ContentPage is not null)
+						if (itemToSelect is not null && ContentPage is not null && userSettingsService.FoldersSettingsService.ScrollToPreviousFolderWhenNavigatingUp)
 						{
-							if (userSettingsService.FoldersSettingsService.ScrollToPreviousFolderWhenNavigatingUp)
-							{
-								ContentPage.ItemManipulationModel.SetSelectedItem(itemToSelect);
-								ContentPage.ItemManipulationModel.ScrollIntoView(itemToSelect);
-							}
+							ContentPage.ItemManipulationModel.SetSelectedItem(itemToSelect);
+							ContentPage.ItemManipulationModel.ScrollIntoView(itemToSelect);
 						}
 					}
 					break;