Fix: Fixed issue where drag and drop from Edge didn't work (#14976)

hishitetsu · web-flow · commit d50ed7c74321 · 2024-03-18T07:50:14.000-07:00
diff --git a/src/Files.App/Utils/Storage/Operations/FilesystemHelpers.cs b/src/Files.App/Utils/Storage/Operations/FilesystemHelpers.cs
@@ -245,14 +245,14 @@ public async Task<ReturnResult> PerformOperationTypeAsync(
 				{
 					return await RecycleItemsFromClipboard(packageView, destination, UserSettingsService.FoldersSettingsService.DeleteConfirmationPolicy, registerHistory);
 				}
-				else if (operation.HasFlag(DataPackageOperation.Copy))
-				{
-					return await CopyItemsFromClipboard(packageView, destination, showDialog, registerHistory);
-				}
 				else if (operation.HasFlag(DataPackageOperation.Move))
 				{
 					return await MoveItemsFromClipboard(packageView, destination, showDialog, registerHistory);
 				}
+				else if (operation.HasFlag(DataPackageOperation.Copy))
+				{
+					return await CopyItemsFromClipboard(packageView, destination, showDialog, registerHistory);
+				}
 				else if (operation.HasFlag(DataPackageOperation.Link))
 				{
 					// Open with piggybacks off of the link operation, since there isn't one for it
diff --git a/src/Files.App/ViewModels/Layouts/BaseLayoutViewModel.cs b/src/Files.App/ViewModels/Layouts/BaseLayoutViewModel.cs
@@ -123,7 +123,8 @@ public async Task DragOverAsync(DragEventArgs e)
 					if (pwd.StartsWith(Constants.UserEnvironmentPaths.RecycleBinPath, StringComparison.Ordinal))
 					{
 						e.DragUIOverride.Caption = string.Format("MoveToFolderCaptionText".GetLocalizedResource(), folderName);
-						e.AcceptedOperation = DataPackageOperation.Move;
+						// Some applications such as Edge can't raise the drop event by the Move flag (#14008), so we set the Copy flag as well.
+						e.AcceptedOperation = DataPackageOperation.Move | DataPackageOperation.Copy;
 					}
 					else if (e.Modifiers.HasFlag(DragDropModifiers.Alt) || e.Modifiers.HasFlag(DragDropModifiers.Control | DragDropModifiers.Shift))
 					{
@@ -138,7 +139,8 @@ public async Task DragOverAsync(DragEventArgs e)
 					else if (e.Modifiers.HasFlag(DragDropModifiers.Shift))
 					{
 						e.DragUIOverride.Caption = string.Format("MoveToFolderCaptionText".GetLocalizedResource(), folderName);
-						e.AcceptedOperation = DataPackageOperation.Move;
+						// Some applications such as Edge can't raise the drop event by the Move flag (#14008), so we set the Copy flag as well.
+						e.AcceptedOperation = DataPackageOperation.Move | DataPackageOperation.Copy;
 					}
 					else if (draggedItems.Any(x =>
 						x.Item is ZipStorageFile ||
@@ -151,7 +153,8 @@ x.Item is ZipStorageFile ||
 					else if (draggedItems.AreItemsInSameDrive(_associatedInstance.FilesystemViewModel.WorkingDirectory))
 					{
 						e.DragUIOverride.Caption = string.Format("MoveToFolderCaptionText".GetLocalizedResource(), folderName);
-						e.AcceptedOperation = DataPackageOperation.Move;
+						// Some applications such as Edge can't raise the drop event by the Move flag (#14008), so we set the Copy flag as well.
+						e.AcceptedOperation = DataPackageOperation.Move | DataPackageOperation.Copy;
 					}
 					else
 					{
diff --git a/src/Files.App/ViewModels/UserControls/AddressToolbarViewModel.cs b/src/Files.App/ViewModels/UserControls/AddressToolbarViewModel.cs
@@ -410,7 +410,8 @@ x.Item is ZipStorageFile ||
 			{
 				e.DragUIOverride.IsCaptionVisible = true;
 				e.DragUIOverride.Caption = string.Format("MoveToFolderCaptionText".GetLocalizedResource(), pathBoxItem.Title);
-				e.AcceptedOperation = DataPackageOperation.Move;
+				// Some applications such as Edge can't raise the drop event by the Move flag (#14008), so we set the Copy flag as well.
+				e.AcceptedOperation = DataPackageOperation.Move | DataPackageOperation.Copy;
 			}
 
 			deferral.Complete();
diff --git a/src/Files.App/ViewModels/UserControls/SidebarViewModel.cs b/src/Files.App/ViewModels/UserControls/SidebarViewModel.cs
@@ -1130,7 +1130,8 @@ private async Task HandleLocationItemDragOverAsync(LocationItem locationItem, It
 					if (locationItem.Path.StartsWith(Constants.UserEnvironmentPaths.RecycleBinPath, StringComparison.Ordinal))
 					{
 						captionText = string.Format("MoveToFolderCaptionText".GetLocalizedResource(), locationItem.Text);
-						operationType = DataPackageOperation.Move;
+						// Some applications such as Edge can't raise the drop event by the Move flag (#14008), so we set the Copy flag as well.
+						operationType = DataPackageOperation.Move | DataPackageOperation.Copy;
 					}
 					else if (rawEvent.Modifiers.HasFlag(DragDropModifiers.Alt) || rawEvent.Modifiers.HasFlag(DragDropModifiers.Control | DragDropModifiers.Shift))
 					{
@@ -1145,7 +1146,8 @@ private async Task HandleLocationItemDragOverAsync(LocationItem locationItem, It
 					else if (rawEvent.Modifiers.HasFlag(DragDropModifiers.Shift))
 					{
 						captionText = string.Format("MoveToFolderCaptionText".GetLocalizedResource(), locationItem.Text);
-						operationType = DataPackageOperation.Move;
+						// Some applications such as Edge can't raise the drop event by the Move flag (#14008), so we set the Copy flag as well.
+						operationType = DataPackageOperation.Move | DataPackageOperation.Copy;
 					}
 					else if (storageItems.Any(x => x.Item is ZipStorageFile || x.Item is ZipStorageFolder)
 						|| ZipStorageFolder.IsZipPath(locationItem.Path))
@@ -1156,7 +1158,8 @@ private async Task HandleLocationItemDragOverAsync(LocationItem locationItem, It
 					else if (locationItem.IsDefaultLocation || storageItems.AreItemsInSameDrive(locationItem.Path))
 					{
 						captionText = string.Format("MoveToFolderCaptionText".GetLocalizedResource(), locationItem.Text);
-						operationType = DataPackageOperation.Move;
+						// Some applications such as Edge can't raise the drop event by the Move flag (#14008), so we set the Copy flag as well.
+						operationType = DataPackageOperation.Move | DataPackageOperation.Copy;
 					}
 					else
 					{
@@ -1204,12 +1207,14 @@ private async Task HandleDriveItemDragOverAsync(DriveItem driveItem, ItemDragOve
 				else if (args.RawEvent.Modifiers.HasFlag(DragDropModifiers.Shift))
 				{
 					captionText = string.Format("MoveToFolderCaptionText".GetLocalizedResource(), driveItem.Text);
-					operationType = DataPackageOperation.Move;
+					// Some applications such as Edge can't raise the drop event by the Move flag (#14008), so we set the Copy flag as well.
+					operationType = DataPackageOperation.Move | DataPackageOperation.Copy;
 				}
 				else if (storageItems.AreItemsInSameDrive(driveItem.Path))
 				{
 					captionText = string.Format("MoveToFolderCaptionText".GetLocalizedResource(), driveItem.Text);
-					operationType = DataPackageOperation.Move;
+					// Some applications such as Edge can't raise the drop event by the Move flag (#14008), so we set the Copy flag as well.
+					operationType = DataPackageOperation.Move | DataPackageOperation.Copy;
 				}
 				else
 				{
diff --git a/src/Files.App/Views/Layouts/BaseLayoutPage.cs b/src/Files.App/Views/Layouts/BaseLayoutPage.cs
@@ -1052,7 +1052,8 @@ private async void Item_DragOver(object sender, DragEventArgs e)
 						else if (e.Modifiers.HasFlag(DragDropModifiers.Shift))
 						{
 							e.DragUIOverride.Caption = string.Format("MoveToFolderCaptionText".GetLocalizedResource(), item.Name);
-							e.AcceptedOperation = DataPackageOperation.Move;
+							// Some applications such as Edge can't raise the drop event by the Move flag (#14008), so we set the Copy flag as well.
+							e.AcceptedOperation = DataPackageOperation.Move | DataPackageOperation.Copy;
 						}
 						else if (draggedItems.Any(x => x.Item is ZipStorageFile || x.Item is ZipStorageFolder)
 							|| ZipStorageFolder.IsZipPath(item.ItemPath))
@@ -1063,7 +1064,8 @@ private async void Item_DragOver(object sender, DragEventArgs e)
 						else if (draggedItems.AreItemsInSameDrive(item.ItemPath))
 						{
 							e.DragUIOverride.Caption = string.Format("MoveToFolderCaptionText".GetLocalizedResource(), item.Name);
-							e.AcceptedOperation = DataPackageOperation.Move;
+							// Some applications such as Edge can't raise the drop event by the Move flag (#14008), so we set the Copy flag as well.
+							e.AcceptedOperation = DataPackageOperation.Move | DataPackageOperation.Copy;
 						}
 						else
 						{

Original file line number	Diff line number	Diff line change
`@@ -245,14 +245,14 @@ public async Task<ReturnResult> PerformOperationTypeAsync(`
`245`	`245`	`{`
`246`	`246`	`return await RecycleItemsFromClipboard(packageView, destination, UserSettingsService.FoldersSettingsService.DeleteConfirmationPolicy, registerHistory);`
`247`	`247`	`}`
`248`		`- else if (operation.HasFlag(DataPackageOperation.Copy))`
`249`		`- {`
`250`		`- return await CopyItemsFromClipboard(packageView, destination, showDialog, registerHistory);`
`251`		`- }`
`252`	`248`	`else if (operation.HasFlag(DataPackageOperation.Move))`
`253`	`249`	`{`
`254`	`250`	`return await MoveItemsFromClipboard(packageView, destination, showDialog, registerHistory);`
`255`	`251`	`}`
	`252`	`+ else if (operation.HasFlag(DataPackageOperation.Copy))`
	`253`	`+ {`
	`254`	`+ return await CopyItemsFromClipboard(packageView, destination, showDialog, registerHistory);`
	`255`	`+ }`
`256`	`256`	`else if (operation.HasFlag(DataPackageOperation.Link))`
`257`	`257`	`{`
`258`	`258`	`// Open with piggybacks off of the link operation, since there isn't one for it`
Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,8 @@ public async Task DragOverAsync(DragEventArgs e)`
`123`	`123`	`if (pwd.StartsWith(Constants.UserEnvironmentPaths.RecycleBinPath, StringComparison.Ordinal))`
`124`	`124`	`{`
`125`	`125`	`e.DragUIOverride.Caption = string.Format("MoveToFolderCaptionText".GetLocalizedResource(), folderName);`
`126`		`- e.AcceptedOperation = DataPackageOperation.Move;`
	`126`	`+ // Some applications such as Edge can't raise the drop event by the Move flag (#14008), so we set the Copy flag as well.`
	`127`	`+ e.AcceptedOperation = DataPackageOperation.Move \| DataPackageOperation.Copy;`
`127`	`128`	`}`
`128`	`129`	`else if (e.Modifiers.HasFlag(DragDropModifiers.Alt) \|\| e.Modifiers.HasFlag(DragDropModifiers.Control \| DragDropModifiers.Shift))`
`129`	`130`	`{`
`@@ -138,7 +139,8 @@ public async Task DragOverAsync(DragEventArgs e)`
`138`	`139`	`else if (e.Modifiers.HasFlag(DragDropModifiers.Shift))`
`139`	`140`	`{`
`140`	`141`	`e.DragUIOverride.Caption = string.Format("MoveToFolderCaptionText".GetLocalizedResource(), folderName);`
`141`		`- e.AcceptedOperation = DataPackageOperation.Move;`
	`142`	`+ // Some applications such as Edge can't raise the drop event by the Move flag (#14008), so we set the Copy flag as well.`
	`143`	`+ e.AcceptedOperation = DataPackageOperation.Move \| DataPackageOperation.Copy;`
`142`	`144`	`}`
`143`	`145`	`else if (draggedItems.Any(x =>`
`144`	`146`	`x.Item is ZipStorageFile \|\|`
`@@ -151,7 +153,8 @@ x.Item is ZipStorageFile \|\|`
`151`	`153`	`else if (draggedItems.AreItemsInSameDrive(_associatedInstance.FilesystemViewModel.WorkingDirectory))`
`152`	`154`	`{`
`153`	`155`	`e.DragUIOverride.Caption = string.Format("MoveToFolderCaptionText".GetLocalizedResource(), folderName);`
`154`		`- e.AcceptedOperation = DataPackageOperation.Move;`
	`156`	`+ // Some applications such as Edge can't raise the drop event by the Move flag (#14008), so we set the Copy flag as well.`
	`157`	`+ e.AcceptedOperation = DataPackageOperation.Move \| DataPackageOperation.Copy;`
`155`	`158`	`}`
`156`	`159`	`else`
`157`	`160`	`{`
Original file line number	Diff line number	Diff line change
`@@ -410,7 +410,8 @@ x.Item is ZipStorageFile \|\|`
`410`	`410`	`{`
`411`	`411`	`e.DragUIOverride.IsCaptionVisible = true;`
`412`	`412`	`e.DragUIOverride.Caption = string.Format("MoveToFolderCaptionText".GetLocalizedResource(), pathBoxItem.Title);`
`413`		`- e.AcceptedOperation = DataPackageOperation.Move;`
	`413`	`+ // Some applications such as Edge can't raise the drop event by the Move flag (#14008), so we set the Copy flag as well.`
	`414`	`+ e.AcceptedOperation = DataPackageOperation.Move \| DataPackageOperation.Copy;`
`414`	`415`	`}`
`415`	`416`
`416`	`417`	`deferral.Complete();`
Original file line number	Diff line number	Diff line change
`@@ -1130,7 +1130,8 @@ private async Task HandleLocationItemDragOverAsync(LocationItem locationItem, It`
`1130`	`1130`	`if (locationItem.Path.StartsWith(Constants.UserEnvironmentPaths.RecycleBinPath, StringComparison.Ordinal))`
`1131`	`1131`	`{`
`1132`	`1132`	`captionText = string.Format("MoveToFolderCaptionText".GetLocalizedResource(), locationItem.Text);`
`1133`		`- operationType = DataPackageOperation.Move;`
	`1133`	`+ // Some applications such as Edge can't raise the drop event by the Move flag (#14008), so we set the Copy flag as well.`
	`1134`	`+ operationType = DataPackageOperation.Move \| DataPackageOperation.Copy;`
`1134`	`1135`	`}`
`1135`	`1136`	`else if (rawEvent.Modifiers.HasFlag(DragDropModifiers.Alt) \|\| rawEvent.Modifiers.HasFlag(DragDropModifiers.Control \| DragDropModifiers.Shift))`
`1136`	`1137`	`{`
`@@ -1145,7 +1146,8 @@ private async Task HandleLocationItemDragOverAsync(LocationItem locationItem, It`
`1145`	`1146`	`else if (rawEvent.Modifiers.HasFlag(DragDropModifiers.Shift))`
`1146`	`1147`	`{`
`1147`	`1148`	`captionText = string.Format("MoveToFolderCaptionText".GetLocalizedResource(), locationItem.Text);`
`1148`		`- operationType = DataPackageOperation.Move;`
	`1149`	`+ // Some applications such as Edge can't raise the drop event by the Move flag (#14008), so we set the Copy flag as well.`
	`1150`	`+ operationType = DataPackageOperation.Move \| DataPackageOperation.Copy;`
`1149`	`1151`	`}`
`1150`	`1152`	`else if (storageItems.Any(x => x.Item is ZipStorageFile \|\| x.Item is ZipStorageFolder)`
`1151`	`1153`	`\|\| ZipStorageFolder.IsZipPath(locationItem.Path))`
`@@ -1156,7 +1158,8 @@ private async Task HandleLocationItemDragOverAsync(LocationItem locationItem, It`
`1156`	`1158`	`else if (locationItem.IsDefaultLocation \|\| storageItems.AreItemsInSameDrive(locationItem.Path))`
`1157`	`1159`	`{`
`1158`	`1160`	`captionText = string.Format("MoveToFolderCaptionText".GetLocalizedResource(), locationItem.Text);`
`1159`		`- operationType = DataPackageOperation.Move;`
	`1161`	`+ // Some applications such as Edge can't raise the drop event by the Move flag (#14008), so we set the Copy flag as well.`
	`1162`	`+ operationType = DataPackageOperation.Move \| DataPackageOperation.Copy;`
`1160`	`1163`	`}`
`1161`	`1164`	`else`
`1162`	`1165`	`{`
`@@ -1204,12 +1207,14 @@ private async Task HandleDriveItemDragOverAsync(DriveItem driveItem, ItemDragOve`
`1204`	`1207`	`else if (args.RawEvent.Modifiers.HasFlag(DragDropModifiers.Shift))`
`1205`	`1208`	`{`
`1206`	`1209`	`captionText = string.Format("MoveToFolderCaptionText".GetLocalizedResource(), driveItem.Text);`
`1207`		`- operationType = DataPackageOperation.Move;`
	`1210`	`+ // Some applications such as Edge can't raise the drop event by the Move flag (#14008), so we set the Copy flag as well.`
	`1211`	`+ operationType = DataPackageOperation.Move \| DataPackageOperation.Copy;`
`1208`	`1212`	`}`
`1209`	`1213`	`else if (storageItems.AreItemsInSameDrive(driveItem.Path))`
`1210`	`1214`	`{`
`1211`	`1215`	`captionText = string.Format("MoveToFolderCaptionText".GetLocalizedResource(), driveItem.Text);`
`1212`		`- operationType = DataPackageOperation.Move;`
	`1216`	`+ // Some applications such as Edge can't raise the drop event by the Move flag (#14008), so we set the Copy flag as well.`
	`1217`	`+ operationType = DataPackageOperation.Move \| DataPackageOperation.Copy;`
`1213`	`1218`	`}`
`1214`	`1219`	`else`
`1215`	`1220`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1052,7 +1052,8 @@ private async void Item_DragOver(object sender, DragEventArgs e)`
`1052`	`1052`	`else if (e.Modifiers.HasFlag(DragDropModifiers.Shift))`
`1053`	`1053`	`{`
`1054`	`1054`	`e.DragUIOverride.Caption = string.Format("MoveToFolderCaptionText".GetLocalizedResource(), item.Name);`
`1055`		`- e.AcceptedOperation = DataPackageOperation.Move;`
	`1055`	`+ // Some applications such as Edge can't raise the drop event by the Move flag (#14008), so we set the Copy flag as well.`
	`1056`	`+ e.AcceptedOperation = DataPackageOperation.Move \| DataPackageOperation.Copy;`
`1056`	`1057`	`}`
`1057`	`1058`	`else if (draggedItems.Any(x => x.Item is ZipStorageFile \|\| x.Item is ZipStorageFolder)`
`1058`	`1059`	`\|\| ZipStorageFolder.IsZipPath(item.ItemPath))`
`@@ -1063,7 +1064,8 @@ private async void Item_DragOver(object sender, DragEventArgs e)`
`1063`	`1064`	`else if (draggedItems.AreItemsInSameDrive(item.ItemPath))`
`1064`	`1065`	`{`
`1065`	`1066`	`e.DragUIOverride.Caption = string.Format("MoveToFolderCaptionText".GetLocalizedResource(), item.Name);`
`1066`		`- e.AcceptedOperation = DataPackageOperation.Move;`
	`1067`	`+ // Some applications such as Edge can't raise the drop event by the Move flag (#14008), so we set the Copy flag as well.`
	`1068`	`+ e.AcceptedOperation = DataPackageOperation.Move \| DataPackageOperation.Copy;`
`1067`	`1069`	`}`
`1068`	`1070`	`else`
`1069`	`1071`	`{`