Fix: Fixed an issue where canceling drag & dropped cleared the selected items (#16445)

yaira2 · web-flow · commit 0ed13ebd1667 · 2024-11-07T10:07:24.000-05:00
diff --git a/src/Files.App/ViewModels/Layouts/BaseLayoutViewModel.cs b/src/Files.App/ViewModels/Layouts/BaseLayoutViewModel.cs
@@ -100,8 +100,6 @@ public async Task DragOverAsync(DragEventArgs e)
 				return;
 			}
 
-			_itemManipulationModel.ClearSelection();
-
 			if (FilesystemHelpers.HasDraggedStorageItems(e.DataView))
 			{
 				e.Handled = true;
@@ -166,6 +164,8 @@ x.Item is ZipStorageFile ||
 							e.DragUIOverride.Caption = string.Format("CopyToFolderCaptionText".GetLocalizedResource(), folderName);
 							e.AcceptedOperation = DataPackageOperation.Copy;
 						}
+
+						_itemManipulationModel.ClearSelection();
 					}
 					catch (COMException ex) when (ex.Message.Contains("RPC server is unavailable"))
 					{

Original file line number	Diff line number	Diff line change
`@@ -100,8 +100,6 @@ public async Task DragOverAsync(DragEventArgs e)`
`100`	`100`	`return;`
`101`	`101`	`}`
`102`	`102`
`103`		`- _itemManipulationModel.ClearSelection();`
`104`		`-`
`105`	`103`	`if (FilesystemHelpers.HasDraggedStorageItems(e.DataView))`
`106`	`104`	`{`
`107`	`105`	`e.Handled = true;`
`@@ -166,6 +164,8 @@ x.Item is ZipStorageFile \|\|`
`166`	`164`	`e.DragUIOverride.Caption = string.Format("CopyToFolderCaptionText".GetLocalizedResource(), folderName);`
`167`	`165`	`e.AcceptedOperation = DataPackageOperation.Copy;`
`168`	`166`	`}`
	`167`	`+`
	`168`	`+ _itemManipulationModel.ClearSelection();`
`169`	`169`	`}`
`170`	`170`	`catch (COMException ex) when (ex.Message.Contains("RPC server is unavailable"))`
`171`	`171`	`{`