Fix: Allow dragging Shell: paths in sidebar reorder and remove old reorder dialog

Author: kalmix

src/Files.App.Controls/Sidebar/SidebarItem.cs

@@ -95,7 +95,7 @@ public void HandleItemChange()
 
 			if (Item is IDraggableSidebarItemModel draggableItem)
 			{
-				CanDrag = draggableItem.DropPath is not null && System.IO.Path.IsPathRooted(draggableItem.DropPath);
+				CanDrag = IsValidDropPath(draggableItem.DropPath);
 				UseReorderDrop = !IsGroupHeader && CanDrag && draggableItem.IsReorderDropItem;
 			}
 			else
@@ -148,9 +148,12 @@ private void HookupItemChangeListener(ISidebarItemModel? oldItem, ISidebarItemMo
 			}
 		}
 
+		private static bool IsValidDropPath(string? path)
+			=> path is not null && (System.IO.Path.IsPathRooted(path) || path.StartsWith("Shell:", StringComparison.OrdinalIgnoreCase));
+
 		private void SidebarItem_DragStarting(UIElement sender, DragStartingEventArgs args)
 		{
-			if (Item is not IDraggableSidebarItemModel draggableItem || draggableItem.DropPath is not string dragPath || !System.IO.Path.IsPathRooted(dragPath))
+			if (Item is not IDraggableSidebarItemModel draggableItem || draggableItem.DropPath is not string dragPath || !IsValidDropPath(dragPath))
 				return;
 
 			try

src/Files.App/Dialogs/ReorderSidebarItemsDialog.xaml

@@ -25,7 +25,6 @@ public DialogService()
 				{ typeof(DecompressArchiveDialogViewModel), () => new DecompressArchiveDialog() },
 				{ typeof(SettingsDialogViewModel), () => new SettingsDialog() },
 				{ typeof(CreateShortcutDialogViewModel), () => new CreateShortcutDialog() },
-				{ typeof(ReorderSidebarItemsDialogViewModel), () => new ReorderSidebarItemsDialog() },
 				{ typeof(AddBranchDialogViewModel), () => new AddBranchDialog() },
 				{ typeof(GitHubLoginDialogViewModel), () => new GitHubLoginDialog() },
 				{ typeof(FileTooLargeDialogViewModel), () => new FileTooLargeDialog() },

src/Files.App/Dialogs/ReorderSidebarItemsDialog.xaml.cs

@@ -270,7 +270,6 @@ public SidebarViewModel()
 			PinItemCommand = new RelayCommand(PinItem);
 			EjectDeviceCommand = new RelayCommand(EjectDevice);
 			OpenPropertiesCommand = new RelayCommand<CommandBarFlyout>(OpenProperties);
-			ReorderItemsCommand = new AsyncRelayCommand(ReorderItemsAsync);
 		}
 
 		private Task<LocationItem> CreateItemHomeAsync()
@@ -896,8 +895,6 @@ public async void HandleItemInvokedAsync(object item, PointerUpdateKind pointerU
 
 		private ICommand OpenPropertiesCommand { get; }
 
-		private ICommand ReorderItemsCommand { get; }
-
 		private void PinItem()
 		{
 			if (rightClickedItem is DriveItem)
@@ -937,13 +934,6 @@ private void HideSection()
 			}
 		}
 
-		private async Task ReorderItemsAsync()
-		{
-			var dialog = new ReorderSidebarItemsDialogViewModel();
-			var dialogService = Ioc.Default.GetRequiredService<IDialogService>();
-			var result = await dialogService.ShowDialogAsync(dialog);
-		}
-
 		private void OpenProperties(CommandBarFlyout menu)
 		{
 			EventHandler<object> flyoutClosed = null!;
@@ -1074,13 +1064,6 @@ private List<ContextMenuFlyoutItemViewModel> GetLocationItemMenuItems(INavigatio
 					ShowItem = options.ShowUnpinItem || isDriveItemPinned
 				},
 				new ContextMenuFlyoutItemViewModel()
-				{
-					Text = Strings.ReorderSidebarItemsDialogText.GetLocalizedResource(),
-					Glyph = "\uE8D8",
-					Command = ReorderItemsCommand,
-					ShowItem = isPinnedItem || item.Section is SectionType.Pinned
-				},
-				new ContextMenuFlyoutItemViewModel()
 				{
 					Text = string.Format(Strings.SideBarHideSectionFromSideBar_Text.GetLocalizedResource(), rightClickedItem.Text),
 					Glyph = "\uE77A",