Change to INestedStorable

Author: d2dyno1

src/Files.App/Data/Items/ShelfItem.cs

@@ -6,7 +6,7 @@
 namespace Files.App.Data.Items
 {
 	[Bindable(true)]
-	public sealed partial class ShelfItem : ObservableObject, IWrapper<IStorable>, IAsyncInitialize
+	public sealed partial class ShelfItem : ObservableObject, IWrapper<INestedStorable>, IAsyncInitialize
 	{
 		private readonly IImageService _imageService;
 		private readonly ICollection<ShelfItem> _sourceCollection;
@@ -16,9 +16,9 @@ public sealed partial class ShelfItem : ObservableObject, IWrapper<IStorable>, I
 		[ObservableProperty] private string? _Path;
 
 		/// <inheritdoc/>
-		public IStorable Inner { get; }
+		public INestedStorable Inner { get; }
 
-		public ShelfItem(IStorable storable, ICollection<ShelfItem> sourceCollection, IImage? icon = null)
+		public ShelfItem(INestedStorable storable, ICollection<ShelfItem> sourceCollection, IImage? icon = null)
 		{
 			_imageService = Ioc.Default.GetRequiredService<IImageService>();
 			_sourceCollection = sourceCollection;
@@ -35,7 +35,7 @@ public async Task InitAsync(CancellationToken cancellationToken = default)
 		}
 
 		[RelayCommand]
-		private void Remove()
+		public void Remove()
 		{
 			_sourceCollection.Remove(this);
 		}

src/Files.App/UserControls/Pane/ShelfPane.xaml.cs

@@ -1,14 +1,12 @@
 // Copyright (c) Files Community
 // Licensed under the MIT License.
 
-using System.Runtime.InteropServices;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using System.Runtime.InteropServices.ComTypes;
 using System.Windows.Input;
 using Vanara.PInvoke;
-using Windows.ApplicationModel.DataTransfer;
 using Vanara.Windows.Shell;
+using Windows.ApplicationModel.DataTransfer;
 using WinRT;
 using DragEventArgs = Microsoft.UI.Xaml.DragEventArgs;
 
@@ -52,8 +50,8 @@ private async void Shelf_Drop(object sender, DragEventArgs e)
 
 				var storable = item switch
 				{
-					StorageFileWithPath => (IStorable?)await storageService.TryGetFileAsync(item.Path),
-					StorageFolderWithPath => (IStorable?)await storageService.TryGetFolderAsync(item.Path),
+					StorageFileWithPath => (INestedStorable?)await storageService.TryGetFileAsync(item.Path),
+					StorageFolderWithPath => (INestedStorable?)await storageService.TryGetFolderAsync(item.Path),
 					_ => null
 				};