Code Quality: Removed ISidebarViewModel

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

@@ -7,43 +7,8 @@
 
 namespace Files.App.Controls
 {
+	public record ItemInvokedEventArgs(PointerUpdateKind PointerUpdateKind) { }
 	public record ItemDroppedEventArgs(object DropTarget, DataPackageView DroppedItem, SidebarItemDropPosition dropPosition, DragEventArgs RawEvent) { }
 	public record ItemDragOverEventArgs(object DropTarget, DataPackageView DroppedItem, SidebarItemDropPosition dropPosition, DragEventArgs RawEvent) { }
 	public record ItemContextInvokedArgs(object? Item, Point Position) { }
-
-	public interface ISidebarViewModel
-	{
-		/// <summary>
-		/// The source/list of items that will be rendered in the sidebar
-		/// </summary>
-		object SidebarItems { get; }
-
-		/// <summary>
-		/// Gets invoked when the context was requested for an item in the sidebar.
-		/// Also applies when context was requested for the pane itsself.
-		/// </summary>
-		/// <param name="sender">The sender of this event</param>
-		/// <param name="args">The <see cref="ItemContextInvokedArgs"/> for this event.</param>
-		void HandleItemContextInvokedAsync(object sender, ItemContextInvokedArgs args);
-
-		/// <summary>
-		/// Gets invoked when an item drags over any item of the sidebar.
-		/// </summary>
-		/// <param name="args">The <see cref="ItemDragOverEventArgs"/> for this event.</param>
-		/// <returns>A <see cref="Task"/> that represents the asynchronous operation.</returns>
-		Task HandleItemDragOverAsync(ItemDragOverEventArgs args);
-
-		/// <summary>
-		/// Gets invoked when an item is dropped on any item of the sidebar.
-		/// </summary>
-		/// <param name="args">The <see cref="ItemDroppedEventArgs"/> for this event.</param>
-		/// <returns>A <see cref="Task"/> that represents the asynchronous operation.</returns>
-		Task HandleItemDroppedAsync(ItemDroppedEventArgs args);
-
-		/// <summary>
-		/// Gets invoked when an item is invoked (double clicked) on any item of the sidebar.
-		/// </summary>
-		/// <param name="item">The item that was invoked.</param>
-		void HandleItemInvokedAsync(object item, PointerUpdateKind pointerUpdateKind);
-	}
 }

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

@@ -404,12 +404,7 @@ private async void ItemBorder_DragOver(object sender, DragEventArgs e)
 				VisualStateManager.GoToState(this, "DragInsertBelow", true);
 			}
 
-			if (Owner is not null)
-			{
-				var deferral = e.GetDeferral();
-				await Owner.RaiseItemDragOver(this, insertsAbove, e);
-				deferral.Complete();
-			}
+			Owner?.RaiseItemDragOver(this, insertsAbove, e);
 		}
 
 		private void ItemBorder_ContextRequested(UIElement sender, Microsoft.UI.Xaml.Input.ContextRequestedEventArgs args)
@@ -423,11 +418,10 @@ private void ItemBorder_DragLeave(object sender, DragEventArgs e)
 			UpdatePointerState();
 		}
 
-		private async void ItemBorder_Drop(object sender, DragEventArgs e)
+		private void ItemBorder_Drop(object sender, DragEventArgs e)
 		{
 			UpdatePointerState();
-			if (Owner is not null)
-				await Owner.RaiseItemDropped(this, DetermineDropTargetPosition(e), e);
+			Owner?.RaiseItemDropped(this, DetermineDropTargetPosition(e), e);
 		}
 
 		private SidebarItemDropPosition DetermineDropTargetPosition(DragEventArgs args)

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

@@ -9,6 +9,9 @@
 
 namespace Files.App.Controls
 {
+	/// <summary>
+	/// Exposes <see cref="SidebarItem"/> types to Microsoft UI Automation.
+	/// </summary>
 	public sealed partial class SidebarItemAutomationPeer : FrameworkElementAutomationPeer, IInvokeProvider, IExpandCollapseProvider, ISelectionItemProvider
 	{
 		public ExpandCollapseState ExpandCollapseState
@@ -17,6 +20,7 @@ public ExpandCollapseState ExpandCollapseState
 			{
 				if (Owner.HasChildren)
 					return Owner.IsExpanded ? ExpandCollapseState.Expanded : ExpandCollapseState.Collapsed;
+
 				return ExpandCollapseState.LeafNode;
 			}
 		}
@@ -27,7 +31,7 @@ public ExpandCollapseState ExpandCollapseState
 
 		public SidebarItemAutomationPeer(SidebarItem owner) : base(owner)
 		{
-			this.Owner = owner;
+			Owner = owner;
 		}
 
 		protected override AutomationControlType GetAutomationControlTypeCore()
@@ -49,28 +53,22 @@ protected override object GetPatternCore(PatternInterface patternInterface)
 			else if (patternInterface == PatternInterface.ExpandCollapse)
 			{
 				if (Owner.CollapseEnabled)
-				{
 					return this;
-				}
 			}
+
 			return base.GetPatternCore(patternInterface);
 		}
 
 		public void Collapse()
 		{
 			if (Owner.CollapseEnabled)
-			{
 				Owner.IsExpanded = false;
-			}
 		}
 
 		public void Expand()
 		{
-
 			if (Owner.CollapseEnabled)
-			{
 				Owner.IsExpanded = true;
-			}
 		}
 
 		public void Invoke()
@@ -106,13 +104,11 @@ protected override int GetPositionInSetCore()
 		private IList GetOwnerCollection()
 		{
 			if (Owner.FindAscendant<SidebarItem>() is SidebarItem parent && parent.Item?.Children is IList list)
-			{
 				return list;
-			}
-			if (Owner?.Owner is not null && Owner.Owner.ViewModel.SidebarItems is IList items)
-			{
+
+			if (Owner?.Owner is not null && Owner.Owner?.MenuItemsSource is IList items)
 				return items;
-			}
+
 			return new List<object>();
 		}
 	}

src/Files.App.Controls/Sidebar/SidebarView.Properties.cs

@@ -1,113 +1,53 @@
 // Copyright (c) Files Community
 // Licensed under the MIT License.
 
+using CommunityToolkit.WinUI;
+
 namespace Files.App.Controls
 {
 	public sealed partial class SidebarView
 	{
-		public SidebarDisplayMode DisplayMode
-		{
-			get { return (SidebarDisplayMode)GetValue(DisplayModeProperty); }
-			set { SetValue(DisplayModeProperty, value); }
-		}
-		public static readonly DependencyProperty DisplayModeProperty =
-			DependencyProperty.Register(nameof(DisplayMode), typeof(SidebarDisplayMode), typeof(SidebarView), new PropertyMetadata(SidebarDisplayMode.Expanded, OnPropertyChanged));
+		[GeneratedDependencyProperty(DefaultValue = SidebarDisplayMode.Expanded)]
+		public partial SidebarDisplayMode DisplayMode { get; set; }
 
-		public UIElement InnerContent
-		{
-			get { return (UIElement)GetValue(InnerContentProperty); }
-			set { SetValue(InnerContentProperty, value); }
-		}
-		public static readonly DependencyProperty InnerContentProperty =
-			DependencyProperty.Register(nameof(InnerContent), typeof(UIElement), typeof(SidebarView), new PropertyMetadata(null));
+		[GeneratedDependencyProperty]
+		public partial UIElement? InnerContent { get; set; }
 
-		public UIElement SidebarContent
-		{
-			get { return (UIElement)GetValue(SidebarContentProperty); }
-			set { SetValue(SidebarContentProperty, value); }
-		}
-		public static readonly DependencyProperty SidebarContentProperty =
-			DependencyProperty.Register("SidebarContent", typeof(UIElement), typeof(SidebarView), new PropertyMetadata(null));
+		[GeneratedDependencyProperty]
+		public partial UIElement? SidebarContent { get; set; }
 
-		public UIElement Footer
-		{
-			get { return (UIElement)GetValue(FooterProperty); }
-			set { SetValue(FooterProperty, value); }
-		}
-		public static readonly DependencyProperty FooterProperty =
-			DependencyProperty.Register("Footer", typeof(UIElement), typeof(SidebarView), new PropertyMetadata(null));
+		[GeneratedDependencyProperty]
+		public partial UIElement? Footer { get; set; }
 
-		public bool IsPaneOpen
-		{
-			get { return (bool)GetValue(IsPaneOpenProperty); }
-			set { SetValue(IsPaneOpenProperty, value); }
-		}
-		public static readonly DependencyProperty IsPaneOpenProperty =
-			DependencyProperty.Register(nameof(IsPaneOpen), typeof(bool), typeof(SidebarView), new PropertyMetadata(false, OnPropertyChanged));
+		[GeneratedDependencyProperty]
+		public partial bool IsPaneOpen { get; set; }
 
-		public double OpenPaneLength
-		{
-			get { return (double)GetValue(OpenPaneLengthProperty); }
-			set
-			{
-				SetValue(OpenPaneLengthProperty, value);
-				NegativeOpenPaneLength = -value;
-			}
-		}
-		public static readonly DependencyProperty OpenPaneLengthProperty =
-			DependencyProperty.Register(nameof(OpenPaneLength), typeof(double), typeof(SidebarView), new PropertyMetadata(240d, OnPropertyChanged));
+		[GeneratedDependencyProperty(DefaultValue = 240D)]
+		public partial double OpenPaneLength { get; set; }
 
-		public double NegativeOpenPaneLength
-		{
-			get { return (double)GetValue(NegativeOpenPaneLengthProperty); }
-			set { SetValue(NegativeOpenPaneLengthProperty, value); }
-		}
-		public static readonly DependencyProperty NegativeOpenPaneLengthProperty =
-			DependencyProperty.Register(nameof(NegativeOpenPaneLength), typeof(double), typeof(SidebarView), new PropertyMetadata(null));
+		[GeneratedDependencyProperty]
+		public partial double NegativeOpenPaneLength { get; set; }
 
-		public ISidebarViewModel ViewModel
-		{
-			get => (ISidebarViewModel)GetValue(ViewModelProperty);
-			set => SetValue(ViewModelProperty, value);
-		}
-		public static readonly DependencyProperty ViewModelProperty =
-			DependencyProperty.Register(nameof(ViewModel), typeof(ISidebarViewModel), typeof(SidebarView), new PropertyMetadata(null));
+		[GeneratedDependencyProperty]
+		public partial ISidebarItemModel? SelectedItem { get; set; }
 
-		public ISidebarItemModel SelectedItem
+		[GeneratedDependencyProperty]
+		public partial object? MenuItemsSource { get; set; }
+
+		partial void OnDisplayModePropertyChanged(DependencyPropertyChangedEventArgs e)
 		{
-			get => (ISidebarItemModel)GetValue(SelectedItemProperty);
-			set
-			{
-				SetValue(SelectedItemProperty, value);
-			}
+			UpdateDisplayMode();
 		}
-		public static readonly DependencyProperty SelectedItemProperty =
-			DependencyProperty.Register(nameof(SelectedItem), typeof(ISidebarItemModel), typeof(SidebarView), new PropertyMetadata(null));
 
-		public object MenuItemsSource
+		partial void OnIsPaneOpenPropertyChanged(DependencyPropertyChangedEventArgs e)
 		{
-			get => (object)GetValue(MenuItemsSourceProperty);
-			set => SetValue(MenuItemsSourceProperty, value);
+			UpdateMinimalMode();
 		}
-		public static readonly DependencyProperty MenuItemsSourceProperty =
-			DependencyProperty.Register(nameof(MenuItemsSource), typeof(object), typeof(SidebarView), new PropertyMetadata(null));
 
-		public static void OnPropertyChanged(DependencyObject sender, DependencyPropertyChangedEventArgs e)
+		partial void OnOpenPaneLengthPropertyChanged(DependencyPropertyChangedEventArgs e)
 		{
-			if (sender is not SidebarView control) return;
-
-			if (e.Property == OpenPaneLengthProperty)
-			{
-				control.UpdateOpenPaneLengthColumn();
-			}
-			else if (e.Property == DisplayModeProperty)
-			{
-				control.UpdateDisplayMode();
-			}
-			else if (e.Property == IsPaneOpenProperty)
-			{
-				control.UpdateMinimalMode();
-			}
+			NegativeOpenPaneLength = -(double)(e.NewValue);
+			UpdateOpenPaneLengthColumn();
 		}
 	}
 }

src/Files.App.Controls/Sidebar/SidebarView.xaml.cs

@@ -15,8 +15,10 @@ public sealed partial class SidebarView : UserControl, INotifyPropertyChanged
 	{
 		private const double COMPACT_MAX_WIDTH = 200;
 
-		public event EventHandler<object>? ItemInvoked;
+		public event EventHandler<ItemInvokedEventArgs>? ItemInvoked;
 		public event EventHandler<ItemContextInvokedArgs>? ItemContextInvoked;
+		public event EventHandler<ItemDragOverEventArgs>? ItemDragOver;
+		public event EventHandler<ItemDroppedEventArgs>? ItemDropped;
 		public event PropertyChangedEventHandler? PropertyChanged;
 
 		internal SidebarItem? SelectedItemContainer = null;
@@ -40,26 +42,24 @@ internal void RaiseItemInvoked(SidebarItem item, PointerUpdateKind pointerUpdate
 			if (item.Item is null || item.IsGroupHeader) return;
 
 			SelectedItem = item.Item;
-			ItemInvoked?.Invoke(item, item.Item);
-			ViewModel.HandleItemInvokedAsync(item.Item, pointerUpdateKind);
+			ItemInvoked?.Invoke(item, new(pointerUpdateKind));
 		}
 
 		internal void RaiseContextRequested(SidebarItem item, Point e)
 		{
-			ItemContextInvoked?.Invoke(item, new ItemContextInvokedArgs(item.Item, e));
-			ViewModel.HandleItemContextInvokedAsync(item, new ItemContextInvokedArgs(item.Item, e));
+			ItemContextInvoked?.Invoke(item, new(item.Item, e));
 		}
 
-		internal async Task RaiseItemDropped(SidebarItem sideBarItem, SidebarItemDropPosition dropPosition, DragEventArgs rawEvent)
+		internal void RaiseItemDropped(SidebarItem sideBarItem, SidebarItemDropPosition dropPosition, DragEventArgs rawEvent)
 		{
 			if (sideBarItem.Item is null) return;
-			await ViewModel.HandleItemDroppedAsync(new ItemDroppedEventArgs(sideBarItem.Item, rawEvent.DataView, dropPosition, rawEvent));
+			ItemDropped?.Invoke(this, new(sideBarItem.Item, rawEvent.DataView, dropPosition, rawEvent));
 		}
 
-		internal async Task RaiseItemDragOver(SidebarItem sideBarItem, SidebarItemDropPosition dropPosition, DragEventArgs rawEvent)
+		internal void RaiseItemDragOver(SidebarItem sideBarItem, SidebarItemDropPosition dropPosition, DragEventArgs rawEvent)
 		{
 			if (sideBarItem.Item is null) return;
-			await ViewModel.HandleItemDragOverAsync(new ItemDragOverEventArgs(sideBarItem.Item, rawEvent.DataView, dropPosition, rawEvent));
+			ItemDragOver?.Invoke(this, new(sideBarItem.Item, rawEvent.DataView, dropPosition, rawEvent));
 		}
 
 		private void UpdateMinimalMode()
@@ -230,8 +230,7 @@ private void SidebarResizer_ManipulationCompleted(object sender, ManipulationCom
 
 		private void MenuItemHostScrollViewer_ContextRequested(UIElement sender, ContextRequestedEventArgs e)
 		{
-			var newArgs = new ItemContextInvokedArgs(null, e.TryGetPosition(this, out var point) ? point : default);
-			ViewModel.HandleItemContextInvokedAsync(this, newArgs);
+			ItemContextInvoked?.Invoke(this, new(null, e.TryGetPosition(this, out var point) ? point : default));
 			e.Handled = true;
 		}
 

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

@@ -6,6 +6,9 @@
 
 namespace Files.App.Controls
 {
+	/// <summary>
+	/// Exposes <see cref="SidebarView"/> types to Microsoft UI Automation.
+	/// </summary>
 	public sealed partial class SidebarViewAutomationPeer : FrameworkElementAutomationPeer, ISelectionProvider
 	{
 		public bool CanSelectMultiple => false;
@@ -20,20 +23,17 @@ public SidebarViewAutomationPeer(SidebarView owner) : base(owner)
 
 		protected override object GetPatternCore(PatternInterface patternInterface)
 		{
-			if (patternInterface == PatternInterface.Selection)
-			{
+			if (patternInterface is PatternInterface.Selection)
 				return this;
-			}
+
 			return base.GetPatternCore(patternInterface);
 		}
 
 		public IRawElementProviderSimple[] GetSelection()
 		{
 			if (Owner.SelectedItemContainer != null)
-				return
-				[
-				ProviderFromPeer(CreatePeerForElement(Owner.SelectedItemContainer))
-				];
+				return [ProviderFromPeer(CreatePeerForElement(Owner.SelectedItemContainer))];
+
 			return [];
 		}
 	}

src/Files.App/ViewModels/UserControls/SidebarViewModel.cs

@@ -19,7 +19,7 @@
 
 namespace Files.App.ViewModels.UserControls
 {
-	public sealed partial class SidebarViewModel : ObservableObject, IDisposable, ISidebarViewModel
+	public sealed partial class SidebarViewModel : ObservableObject, IDisposable
 	{
 		private INetworkService NetworkService { get; } = Ioc.Default.GetRequiredService<INetworkService>();
 		private IUserSettingsService UserSettingsService { get; } = Ioc.Default.GetRequiredService<IUserSettingsService>();