Fix: Fixed issue where switching directory while renaming item wouldn't cancel rename (#14676)

Author: hishitetsu

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

@@ -1287,31 +1287,28 @@ protected virtual void ItemsLayout_Drop(object sender, DragEventArgs e)
 			CommandsViewModel?.DropCommand?.Execute(e);
 		}
 
-		private CollectionViewSource _CollectionViewSource;
-		private CollectionViewSource _GroupedCollectionViewSource;
-
 		private void UpdateCollectionViewSource()
 		{
 			if (ParentShellPageInstance is null)
 				return;
 
 			if (ParentShellPageInstance.FilesystemViewModel.FilesAndFolders.IsGrouped)
 			{
-				_GroupedCollectionViewSource ??= new CollectionViewSource()
+				var newSource = new CollectionViewSource()
 				{
-					IsSourceGrouped = true
+					IsSourceGrouped = true,
+					Source = ParentShellPageInstance.FilesystemViewModel.FilesAndFolders.GroupedCollection
 				};
-				_GroupedCollectionViewSource.Source = ParentShellPageInstance.FilesystemViewModel.FilesAndFolders.GroupedCollection;
-				CollectionViewSource = _GroupedCollectionViewSource;
+				CollectionViewSource = newSource;
 			}
 			else
 			{
-				_CollectionViewSource ??= new CollectionViewSource()
+				var newSource = new CollectionViewSource()
 				{
 					IsSourceGrouped = false,
 					Source = ParentShellPageInstance.FilesystemViewModel.FilesAndFolders
 				};
-				CollectionViewSource = _CollectionViewSource;
+				CollectionViewSource = newSource;
 			}
 		}