Fix: Fixed issue where dragged items sometimes could not be dropped (#12898)

Author: hishitetsu

src/Files.App/Views/LayoutModes/BaseLayout.cs

@@ -2,7 +2,6 @@
 // Licensed under the MIT License. See the LICENSE.
 
 using CommunityToolkit.WinUI.UI;
-using Files.App.Utils.StorageItems;
 using Files.App.Helpers.ContextFlyouts;
 using Files.App.UserControls.Menus;
 using Microsoft.UI.Xaml;
@@ -35,6 +34,8 @@ public abstract class BaseLayout : Page, IBaseLayout, INotifyPropertyChanged
 	{
 		private readonly DispatcherQueueTimer jumpTimer;
 
+		private readonly DragEventHandler Item_DragOverEventHandler;
+
 		protected IUserSettingsService UserSettingsService { get; } = Ioc.Default.GetService<IUserSettingsService>()!;
 
 		protected IFileTagsSettingsService FileTagsSettingsService { get; } = Ioc.Default.GetService<IFileTagsSettingsService>()!;
@@ -263,6 +264,8 @@ public BaseLayout()
 			jumpTimer.Interval = TimeSpan.FromSeconds(0.8);
 			jumpTimer.Tick += JumpTimer_Tick;
 
+			Item_DragOverEventHandler = new DragEventHandler(Item_DragOver);
+
 			SelectedItemsPropertiesViewModel = new SelectedItemsPropertiesViewModel();
 			DirectoryPropertiesViewModel = new DirectoryPropertiesViewModel();
 
@@ -944,7 +947,7 @@ private void Item_DragLeave(object sender, DragEventArgs e)
 				dragOverItem = null;
 		}
 
-		protected async void Item_DragOver(object sender, DragEventArgs e)
+		private async void Item_DragOver(object sender, DragEventArgs e)
 		{
 			var item = GetItemFromElement(sender);
 			if (item is null)
@@ -956,23 +959,6 @@ protected async void Item_DragOver(object sender, DragEventArgs e)
 			{
 				deferral = e.GetDeferral();
 
-				if (dragOverItem != item)
-				{
-					dragOverItem = item;
-					dragOverTimer.Stop();
-					dragOverTimer.Debounce(() =>
-					{
-						if (dragOverItem is not null && !dragOverItem.IsExecutable)
-						{
-							dragOverTimer.Stop();
-							ItemManipulationModel.SetSelectedItem(dragOverItem);
-							dragOverItem = null;
-							_ = NavigationHelpers.OpenSelectedItems(ParentShellPageInstance!, false);
-						}
-					},
-					TimeSpan.FromMilliseconds(1000), false);
-				}
-
 				if (FilesystemHelpers.HasDraggedStorageItems(e.DataView))
 				{
 					e.Handled = true;
@@ -1030,14 +1016,35 @@ protected async void Item_DragOver(object sender, DragEventArgs e)
 						}
 					}
 				}
+
+				if (dragOverItem != item)
+				{
+					dragOverItem = item;
+					dragOverTimer.Stop();
+
+					if (e.AcceptedOperation != DataPackageOperation.None)
+					{
+						dragOverTimer.Debounce(() =>
+						{
+							if (dragOverItem is not null && !dragOverItem.IsExecutable)
+							{
+								dragOverTimer.Stop();
+								ItemManipulationModel.SetSelectedItem(dragOverItem);
+								dragOverItem = null;
+								_ = NavigationHelpers.OpenSelectedItems(ParentShellPageInstance!, false);
+							}
+						},
+						TimeSpan.FromMilliseconds(1000), false);
+					}
+				}
 			}
 			finally
 			{
 				deferral?.Complete();
 			}
 		}
 
-		protected async void Item_Drop(object sender, DragEventArgs e)
+		private async void Item_Drop(object sender, DragEventArgs e)
 		{
 			var deferral = e.GetDeferral();
 
@@ -1188,26 +1195,25 @@ protected void FileListItem_RightTapped(object sender, RightTappedRoutedEventArg
 			if (rightClickedItem is not null && !((SelectorItem)sender).IsSelected)
 				ItemManipulationModel.SetSelectedItem(rightClickedItem);
 		}
-
-		protected void InitializeDrag(UIElement containter, ListedItem item)
+		protected void InitializeDrag(UIElement container, ListedItem item)
 		{
 			if (item is null)
 				return;
 
-			UninitializeDrag(containter);
+			UninitializeDrag(container);
 			if ((item.PrimaryItemAttribute == StorageItemTypes.Folder && !RecycleBinHelpers.IsPathUnderRecycleBin(item.ItemPath)) || item.IsExecutable)
 			{
-				containter.AllowDrop = true;
-				containter.DragOver += Item_DragOver;
-				containter.DragLeave += Item_DragLeave;
-				containter.Drop += Item_Drop;
+				container.AllowDrop = true;
+				container.AddHandler(UIElement.DragOverEvent, Item_DragOverEventHandler, true);
+				container.DragLeave += Item_DragLeave;
+				container.Drop += Item_Drop;
 			}
 		}
 
 		protected void UninitializeDrag(UIElement element)
 		{
 			element.AllowDrop = false;
-			element.DragOver -= Item_DragOver;
+			element.RemoveHandler(UIElement.DragOverEvent, Item_DragOverEventHandler);
 			element.DragLeave -= Item_DragLeave;
 			element.Drop -= Item_Drop;
 		}