Fix: Fixed an issue where the restore option was missing from recycle bin

src/Files.App/Helpers/ContextFlyoutItemHelper.cs

@@ -19,6 +19,7 @@
 using Microsoft.UI.Xaml.Input;
 using Microsoft.UI.Xaml.Media.Imaging;
 using System.Threading;
+using System.Runtime.CompilerServices;
 
 namespace Files.App.Helpers
 {
@@ -599,6 +600,14 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseLayoutMenuItems(Curren
                     ShowInRecycleBin = true,
                 },
                 new ContextMenuFlyoutItemViewModel()
+                {
+                    Text = "RestoreAllItems".GetLocalizedResource(),
+                    Glyph = "\xE777",
+                    Command = commandsViewModel.RestoreRecycleBinCommand,
+                    ShowItem = currentInstanceViewModel.IsPageTypeRecycleBin,
+                    ShowInRecycleBin = true,
+                },
+                new ContextMenuFlyoutItemViewModel()
                 {
                     ItemType = ItemType.Separator,
                     Tag = "OverflowSeparator",
@@ -625,7 +634,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(BaseLayo
                 new ContextMenuFlyoutItemViewModel()
                 {
                     Text = "BaseLayoutItemContextFlyoutRestore/Text".GetLocalizedResource(),
-                    Glyph = "\uE8E5",
+                    Glyph = "\xE777",
                     Command = commandsViewModel.RestoreItemCommand,
                     ShowInRecycleBin = true,
                     ShowItem = selectedItems.All(x => x.IsRecycleBinItem)

src/Files.App/Helpers/RecycleBinHelpers.cs

@@ -13,6 +13,7 @@
 using Microsoft.UI.Xaml.Controls;
 using Files.App.Shell;
 using Vanara.PInvoke;
+using Files.App.Filesystem;
 
 namespace Files.App.Helpers
 {
@@ -78,6 +79,55 @@ public async Task EmptyRecycleBin()
             }
         }
 
+        public static async Task S_RestoreRecycleBin(IShellPage associatedInstance)
+        {
+            await new RecycleBinHelpers().RestoreRecycleBin(associatedInstance);
+        }
+
+        public async Task RestoreRecycleBin(IShellPage associatedInstance)
+        {
+            var ConfirmEmptyBinDialog = new ContentDialog()
+            {
+                Title = "ConfirmRestoreBinDialogTitle".GetLocalizedResource(),
+                Content = "ConfirmRestoreBinDialogContent".GetLocalizedResource(),
+                PrimaryButtonText = "Yes".GetLocalizedResource(),
+                SecondaryButtonText = "Cancel".GetLocalizedResource(),
+                DefaultButton = ContentDialogButton.Primary
+            };
+
+            ContentDialogResult result = await this.SetContentDialogRoot(ConfirmEmptyBinDialog).ShowAsync();
+
+            if (result == ContentDialogResult.Primary)
+            {
+                associatedInstance.SlimContentPage.ItemManipulationModel.SelectAllItems();
+                await this.RestoreItem(associatedInstance);
+            }
+        }
+
+        public static async Task S_RestoreSelectionRecycleBin(IShellPage associatedInstance)
+        {
+            await new RecycleBinHelpers().RestoreSelectionRecycleBin(associatedInstance);
+        }
+
+        public async Task RestoreSelectionRecycleBin(IShellPage associatedInstance)
+        {
+            var ConfirmEmptyBinDialog = new ContentDialog()
+            {
+                Title = "ConfirmRestoreSelectionBinDialogTitle".GetLocalizedResource(),
+                Content = string.Format("ConfirmRestoreSelectionBinDialogContent".GetLocalizedResource(), associatedInstance.SlimContentPage.SelectedItems.Count),
+                PrimaryButtonText = "Yes".GetLocalizedResource(),
+                SecondaryButtonText = "Cancel".GetLocalizedResource(),
+                DefaultButton = ContentDialogButton.Primary
+            };
+
+            ContentDialogResult result = await this.SetContentDialogRoot(ConfirmEmptyBinDialog).ShowAsync();
+
+            if (result == ContentDialogResult.Primary)
+            {
+                await this.RestoreItem(associatedInstance);
+            }
+        }
+
         //WINUI3
         private ContentDialog SetContentDialogRoot(ContentDialog contentDialog)
         {
@@ -115,5 +165,35 @@ public bool RecycleBinHasItems()
         {
             return Win32Shell.QueryRecycleBin().NumItems > 0;
         }
+
+        public static async Task S_RestoreItem(IShellPage associatedInstance)
+        {
+            await new RecycleBinHelpers().RestoreItem(associatedInstance);
+        }
+
+        private async Task RestoreItem(IShellPage associatedInstance)
+        {
+            var items = associatedInstance.SlimContentPage.SelectedItems.ToList().Where(x => x is RecycleBinItem).Select((item) => new
+            {
+                Source = StorageHelpers.FromPathAndType(
+                    item.ItemPath,
+                    item.PrimaryItemAttribute == StorageItemTypes.File ? FilesystemItemType.File : FilesystemItemType.Directory),
+                Dest = ((RecycleBinItem)item).ItemOriginalPath
+            });
+            await associatedInstance.FilesystemHelpers.RestoreItemsFromTrashAsync(items.Select(x => x.Source), items.Select(x => x.Dest), true);
+        }
+
+        public static async Task S_DeleteItem(IShellPage associatedInstance)
+        {
+            await new RecycleBinHelpers().DeleteItem(associatedInstance);
+        }
+
+        public virtual async Task DeleteItem(IShellPage associatedInstance)
+        {
+            var items = associatedInstance.SlimContentPage.SelectedItems.ToList().Select((item) => StorageHelpers.FromPathAndType(
+                item.ItemPath,
+                item.PrimaryItemAttribute == StorageItemTypes.File ? FilesystemItemType.File : FilesystemItemType.Directory));
+            await associatedInstance.FilesystemHelpers.DeleteItemsAsync(items, true, false, true);
+        }
     }
 }

src/Files.App/Interacts/BaseLayoutCommandImplementationModel.cs

@@ -159,6 +159,16 @@ public virtual async void EmptyRecycleBin(RoutedEventArgs e)
             await RecycleBinHelpers.S_EmptyRecycleBin();
         }
 
+        public virtual async void RestoreRecycleBin(RoutedEventArgs e)
+        {
+            await RecycleBinHelpers.S_RestoreRecycleBin(associatedInstance);
+        }
+
+        public virtual async void RestoreSelectionRecycleBin(RoutedEventArgs e)
+        {
+            await RecycleBinHelpers.S_RestoreSelectionRecycleBin(associatedInstance);
+        }
+
         public virtual async void QuickLook(RoutedEventArgs e)
         {
             await QuickLookHelpers.ToggleQuickLook(associatedInstance);
@@ -176,22 +186,12 @@ public virtual void CutItem(RoutedEventArgs e)
 
         public virtual async void RestoreItem(RoutedEventArgs e)
         {
-            var items = SlimContentPage.SelectedItems.ToList().Where(x => x is RecycleBinItem).Select((item) => new
-            {
-                Source = StorageHelpers.FromPathAndType(
-                    item.ItemPath,
-                    item.PrimaryItemAttribute == StorageItemTypes.File ? FilesystemItemType.File : FilesystemItemType.Directory),
-                Dest = (item as RecycleBinItem).ItemOriginalPath
-            });
-            await FilesystemHelpers.RestoreItemsFromTrashAsync(items.Select(x => x.Source), items.Select(x => x.Dest), true);
+            await RecycleBinHelpers.S_RestoreItem(associatedInstance);
         }
 
         public virtual async void DeleteItem(RoutedEventArgs e)
         {
-            var items = SlimContentPage.SelectedItems.ToList().Select((item) => StorageHelpers.FromPathAndType(
-                item.ItemPath,
-                item.PrimaryItemAttribute == StorageItemTypes.File ? FilesystemItemType.File : FilesystemItemType.Directory));
-            await FilesystemHelpers.DeleteItemsAsync(items, true, false, true);
+            await RecycleBinHelpers.S_DeleteItem(associatedInstance);
         }
 
         public virtual void ShowFolderProperties(RoutedEventArgs e)

src/Files.App/Interacts/BaseLayoutCommandsViewModel.cs

@@ -39,6 +39,8 @@ private void InitializeCommands()
             UnpinDirectoryFromFavoritesCommand = new RelayCommand<RoutedEventArgs>(CommandsModel.UnpinDirectoryFromFavorites);
             OpenItemCommand = new RelayCommand<RoutedEventArgs>(CommandsModel.OpenItem);
             EmptyRecycleBinCommand = new RelayCommand<RoutedEventArgs>(CommandsModel.EmptyRecycleBin);
+            RestoreRecycleBinCommand = new RelayCommand<RoutedEventArgs>(CommandsModel.RestoreRecycleBin);
+            RestoreSelectionRecycleBinCommand = new RelayCommand<RoutedEventArgs>(CommandsModel.RestoreSelectionRecycleBin);
             QuickLookCommand = new RelayCommand<RoutedEventArgs>(CommandsModel.QuickLook);
             CopyItemCommand = new RelayCommand<RoutedEventArgs>(CommandsModel.CopyItem);
             CutItemCommand = new RelayCommand<RoutedEventArgs>(CommandsModel.CutItem);
@@ -107,6 +109,10 @@ private void InitializeCommands()
 
         public ICommand EmptyRecycleBinCommand { get; private set; }
 
+        public ICommand RestoreRecycleBinCommand { get; private set; }
+
+        public ICommand RestoreSelectionRecycleBinCommand { get; private set; }
+
         public ICommand QuickLookCommand { get; private set; }
 
         public ICommand CopyItemCommand { get; private set; }

src/Files.App/Interacts/IBaseLayoutCommandImplementationModel.cs

@@ -32,6 +32,10 @@ public interface IBaseLayoutCommandImplementationModel : IDisposable
 
         void EmptyRecycleBin(RoutedEventArgs e);
 
+        void RestoreRecycleBin(RoutedEventArgs e);
+
+        void RestoreSelectionRecycleBin(RoutedEventArgs e);
+
         void QuickLook(RoutedEventArgs e);
 
         void CopyItem(RoutedEventArgs e);

src/Files.App/Strings/en-US/Resources.resw

@@ -2828,4 +2828,22 @@ We use App Center to track which settings are being used, find bugs, and fix cra
   <data name="SelectFilesAndFoldersOnHover" xml:space="preserve">
     <value>Select files and folders when hovering over them</value>
   </data>
+  <data name="ConfirmRestoreBinDialogContent" xml:space="preserve">
+    <value>Are you sure you want to restore all items in the recycle bin?</value>
+  </data>
+  <data name="ConfirmRestoreBinDialogTitle" xml:space="preserve">
+    <value>Restore all items</value>
+  </data>
+  <data name="ConfirmRestoreSelectionBinDialogContent" xml:space="preserve">
+    <value>Do you want to restore the {0} selected item(s)?</value>
+  </data>
+  <data name="ConfirmRestoreSelectionBinDialogTitle" xml:space="preserve">
+    <value>Restore selection</value>
+  </data>
+  <data name="RestoreAllItems" xml:space="preserve">
+    <value>Restore All Items</value>
+  </data>
+  <data name="RestoreSelection" xml:space="preserve">
+    <value>Restore</value>
+  </data>
 </root>

src/Files.App/UserControls/InnerNavigationToolbar.xaml

@@ -195,19 +195,45 @@
 					</AppBarButton.Content>
 				</AppBarButton>
 				<AppBarSeparator x:Name="AdditionalActionSeparator" x:Load="{x:Bind ViewModel.HasAdditionalAction, Mode=OneWay}" />
-				<AppBarButton
+                <AppBarButton
 					x:Name="EmptyRecycleBinButton"
 					x:Load="{x:Bind ViewModel.InstanceViewModel.IsPageTypeRecycleBin, Mode=OneWay, FallbackValue=False}"
 					AccessKey="B"
 					Command="{x:Bind ViewModel.EmptyRecycleBinCommand, Mode=OneWay}"
 					IsEnabled="{x:Bind ViewModel.CanEmptyRecycleBin, Mode=OneWay}"
 					Label="{helpers:ResourceString Name=EmptyRecycleBin}"
 					ToolTipService.ToolTip="{helpers:ResourceString Name=EmptyRecycleBin}">
-					<AppBarButton.Icon>
-						<FontIcon FontFamily="{StaticResource RecycleBinIcons}" Glyph="&#xEF88;" />
-					</AppBarButton.Icon>
-				</AppBarButton>
-				<AppBarButton
+                    <AppBarButton.Icon>
+                        <FontIcon FontFamily="{StaticResource RecycleBinIcons}" Glyph="&#xEF88;" />
+                    </AppBarButton.Icon>
+                </AppBarButton>
+                <AppBarButton
+                    x:Name="RestoreRecycleBinButton"
+                    x:Load="{x:Bind ViewModel.InstanceViewModel.IsPageTypeRecycleBin, Mode=OneWay, FallbackValue=False}"
+                    AccessKey="R"
+                    Command="{x:Bind ViewModel.RestoreRecycleBinCommand, Mode=OneWay}"
+                    IsEnabled="{x:Bind ViewModel.CanRestoreRecycleBin, Mode=OneWay}"
+                    Visibility="{x:Bind ViewModel.CanRestoreRecycleBin, Mode=OneWay}"
+                    Label="{helpers:ResourceString Name=RestoreAllItems}"
+                    ToolTipService.ToolTip="{helpers:ResourceString Name=RestoreAllItems}">
+                    <AppBarButton.Icon>
+                        <FontIcon Glyph="&#xE777;" />
+                    </AppBarButton.Icon>
+                </AppBarButton>
+                <AppBarButton
+                    x:Name="RestoreSelectionRecycleBinButton"
+                    x:Load="{x:Bind ViewModel.InstanceViewModel.IsPageTypeRecycleBin, Mode=OneWay, FallbackValue=False}"
+                    AccessKey="R"
+                    Command="{x:Bind ViewModel.RestoreSelectionRecycleBinCommand, Mode=OneWay}"
+                    IsEnabled="{x:Bind ViewModel.CanRestoreSelectionRecycleBin, Mode=OneWay}"
+                    Visibility="{x:Bind ViewModel.CanRestoreSelectionRecycleBin, Mode=OneWay}"
+                    Label="{helpers:ResourceString Name=RestoreSelection}"
+                    ToolTipService.ToolTip="{helpers:ResourceString Name=RestoreSelection}">
+                    <AppBarButton.Icon>
+                        <FontIcon Glyph="&#xE777;" />
+                    </AppBarButton.Icon>
+                </AppBarButton>
+                <AppBarButton
 					x:Name="ExtractButton"
 					Width="Auto"
 					MinWidth="40"

src/Files.App/ViewModels/ToolbarViewModel.cs

@@ -757,6 +757,8 @@ public void UpdateAdditionalActions()
         {
             OnPropertyChanged(nameof(HasAdditionalAction));
             OnPropertyChanged(nameof(CanEmptyRecycleBin));
+            OnPropertyChanged(nameof(CanRestoreRecycleBin));
+            OnPropertyChanged(nameof(CanRestoreSelectionRecycleBin));
         }
 
         private AddressToolbar AddressToolbar => (App.Window.Content as Frame).FindDescendant<AddressToolbar>();
@@ -880,6 +882,10 @@ public void SearchRegion_LostFocus(object sender, RoutedEventArgs e)
 
         public ICommand EmptyRecycleBinCommand { get; set; }
 
+        public ICommand RestoreRecycleBinCommand { get; set; }
+
+        public ICommand RestoreSelectionRecycleBinCommand { get; set; }
+
         public ICommand PropertiesCommand { get; set; }
 
         public ICommand ExtractCommand { get; set; }
@@ -1186,6 +1192,8 @@ public bool HasItem
                 if (SetProperty(ref hasItem, value))
                 {
                     OnPropertyChanged(nameof(CanEmptyRecycleBin));
+                    OnPropertyChanged(nameof(CanRestoreRecycleBin));
+                    OnPropertyChanged(nameof(CanRestoreSelectionRecycleBin));
                 }
             }
         }
@@ -1212,6 +1220,9 @@ public List<ListedItem> SelectedItems
                     OnPropertyChanged(nameof(IsMultipleImageSelected));
                     OnPropertyChanged(nameof(IsFont));
                     OnPropertyChanged(nameof(HasAdditionalAction));
+                    OnPropertyChanged(nameof(CanEmptyRecycleBin));
+                    OnPropertyChanged(nameof(CanRestoreRecycleBin));
+                    OnPropertyChanged(nameof(CanRestoreSelectionRecycleBin));
                 }
             }
         }
@@ -1222,6 +1233,8 @@ public List<ListedItem> SelectedItems
         public bool CanRename => SelectedItems is not null && SelectedItems.Count == 1;
         public bool CanViewProperties => SelectedItems is not null && SelectedItems.Any();
         public bool CanEmptyRecycleBin => InstanceViewModel.IsPageTypeRecycleBin && HasItem;
+        public bool CanRestoreRecycleBin => InstanceViewModel.IsPageTypeRecycleBin && HasItem && (SelectedItems is null || SelectedItems.Count == 0);
+        public bool CanRestoreSelectionRecycleBin => InstanceViewModel.IsPageTypeRecycleBin && HasItem && SelectedItems is not null && SelectedItems.Count > 0;
         public bool CanExtract => SelectedItems is not null && SelectedItems.Any() && SelectedItems.All(x => FileExtensionHelpers.IsZipFile(x.FileExtension)) && !InstanceViewModel.IsPageTypeRecycleBin;
         public string ExtractToText => CanExtract ? SelectedItems.Count > 1 ? string.Format("ExtractToChildFolder".GetLocalizedResource(), $"*{Path.DirectorySeparatorChar}") : string.Format("ExtractToChildFolder".GetLocalizedResource() + "\\", Path.GetFileNameWithoutExtension(selectedItems.First().ItemName)) : "ExtractToChildFolder".GetLocalizedResource();
         public bool IsMultipleArchivesSelected => CanExtract && SelectedItems.Count > 1;

src/Files.App/Views/ColumnShellPage.xaml.cs

@@ -289,6 +289,8 @@ private void InitToolbarCommands()
             ToolbarViewModel.DeleteCommand = new RelayCommand(() => SlimContentPage?.CommandsViewModel.DeleteItemCommand.Execute(null));
             ToolbarViewModel.CutCommand = new RelayCommand(() => SlimContentPage?.CommandsViewModel.CutItemCommand.Execute(null));
             ToolbarViewModel.EmptyRecycleBinCommand = new RelayCommand(() => SlimContentPage?.CommandsViewModel.EmptyRecycleBinCommand.Execute(null));
+            ToolbarViewModel.RestoreRecycleBinCommand = new RelayCommand(() => SlimContentPage?.CommandsViewModel.RestoreRecycleBinCommand.Execute(null));
+            ToolbarViewModel.RestoreSelectionRecycleBinCommand = new RelayCommand(() => SlimContentPage?.CommandsViewModel.RestoreSelectionRecycleBinCommand.Execute(null));
             ToolbarViewModel.RunWithPowerShellCommand = new RelayCommand(async () => await Win32Helpers.InvokeWin32ComponentAsync("powershell", this, PathNormalization.NormalizePath(SlimContentPage?.SelectedItem.ItemPath)));
             ToolbarViewModel.PropertiesCommand = new RelayCommand(() => SlimContentPage?.CommandsViewModel.ShowPropertiesCommand.Execute(null));
             ToolbarViewModel.SetAsBackgroundCommand = new RelayCommand(() => SlimContentPage?.CommandsViewModel.SetAsDesktopBackgroundItemCommand.Execute(null));

src/Files.App/Views/ModernShellPage.xaml.cs

@@ -272,6 +272,8 @@ private void InitToolbarCommands()
             ToolbarViewModel.DeleteCommand = new RelayCommand(() => SlimContentPage?.CommandsViewModel.DeleteItemCommand.Execute(null));
             ToolbarViewModel.CutCommand = new RelayCommand(() => SlimContentPage?.CommandsViewModel.CutItemCommand.Execute(null));
             ToolbarViewModel.EmptyRecycleBinCommand = new RelayCommand(() => SlimContentPage?.CommandsViewModel.EmptyRecycleBinCommand.Execute(null));
+            ToolbarViewModel.RestoreRecycleBinCommand = new RelayCommand(() => SlimContentPage?.CommandsViewModel.RestoreRecycleBinCommand.Execute(null));
+            ToolbarViewModel.RestoreSelectionRecycleBinCommand = new RelayCommand(() => SlimContentPage?.CommandsViewModel.RestoreSelectionRecycleBinCommand.Execute(null));
             ToolbarViewModel.RunWithPowerShellCommand = new RelayCommand(async () => await Win32Helpers.InvokeWin32ComponentAsync("powershell", this, PathNormalization.NormalizePath(SlimContentPage?.SelectedItem.ItemPath)));
             ToolbarViewModel.PropertiesCommand = new RelayCommand(() => SlimContentPage?.CommandsViewModel.ShowPropertiesCommand.Execute(null));
             ToolbarViewModel.SetAsBackgroundCommand = new RelayCommand(() => SlimContentPage?.CommandsViewModel.SetAsDesktopBackgroundItemCommand.Execute(null));