Click on a suggestion

Author: 0x5bfa

src/Files.App.Controls/Omnibar/Omnibar.cs

@@ -237,7 +237,7 @@ private string GetObjectText(object obj)
 			return obj is string text
 				? text
 				: obj is IOmnibarTextMemberPathProvider textMemberPathProvider
-					? textMemberPathProvider.GetTextMemberPath(CurrentSelectedMode.DisplayMemberPath ?? string.Empty)
+					? textMemberPathProvider.GetTextMemberPath(CurrentSelectedMode.TextMemberPath ?? string.Empty)
 					: obj.ToString() ?? string.Empty;
 		}
 

src/Files.App.Controls/Omnibar/OmnibarMode.Properties.cs

@@ -35,7 +35,10 @@ public partial class OmnibarMode
 		public partial DataTemplate? SuggestionItemTemplate { get; set; }
 
 		[GeneratedDependencyProperty]
-		public partial string? DisplayMemberPath { get; set; }
+		/// <remark>
+		/// Implement <see cref="IOmnibarTextMemberPathProvider"/> in <see cref="SuggestionItemsSource"/> to get the text member path from the suggestion item correctly.
+		/// </remark>
+		public partial string? TextMemberPath { get; set; }
 
 		[GeneratedDependencyProperty(DefaultValue = true)]
 		public partial bool UpdateTextOnSelect { get; set; }

src/Files.App/Data/Models/OmnibarPathModeSuggestionModel.cs

@@ -1,7 +1,20 @@
 // Copyright (c) Files Community
 // Licensed under the MIT License.
 
+using Files.App.Controls;
+
 namespace Files.App.Data.Models
 {
-	internal record OmnibarPathModeSuggestionModel(string Path, string DisplayName);
+	internal record OmnibarPathModeSuggestionModel(string Path, string DisplayName) : IOmnibarTextMemberPathProvider
+	{
+		public string GetTextMemberPath(string textMemberPath)
+		{
+			return textMemberPath switch
+			{
+				nameof(Path) => Path,
+				nameof(DisplayName) => DisplayName,
+				_ => string.Empty
+			};
+		}
+	}
 }

src/Files.App/UserControls/NavigationToolbar.xaml

@@ -345,14 +345,14 @@
 			SuggestionChosen="Omnibar_SuggestionChosen">
 
 			<controls:OmnibarMode
-				DisplayMemberPath="Path"
 				IconOnActive="{controls:ThemedIconMarkup Style={StaticResource App.ThemedIcons.Omnibar.Path}, IsFilled=True}"
 				IconOnInactive="{controls:ThemedIconMarkup Style={StaticResource App.ThemedIcons.Omnibar.Path}, IconType=Outline}"
 				IsDefault="True"
 				ModeName="Path"
 				PlaceholderText="{helpers:ResourceString Name=OmnibarPathModeTextPlaceholder}"
 				SuggestionItemsSource="{x:Bind ViewModel.PathModeSuggestionItems, Mode=OneWay}"
-				Text="{x:Bind ViewModel.OmnibarPathModeText, Mode=OneWay}">
+				Text="{x:Bind ViewModel.OmnibarPathModeText, Mode=OneWay}"
+				TextMemberPath="Path">
 				<controls:OmnibarMode.ContentOnInactive>
 					<controls:BreadcrumbBar
 						x:Name="BreadcrumbBar"

src/Files.App/UserControls/NavigationToolbar.xaml.cs

@@ -254,9 +254,10 @@ private void ClickablePath_GettingFocus(UIElement sender, GettingFocusEventArgs
 				ViewModel.IsEditModeEnabled = true;
 		}
 
-		private void Omnibar_SuggestionChosen(Controls.Omnibar sender, Controls.OmnibarSuggestionChosenEventArgs args)
+		private async void Omnibar_SuggestionChosen(Omnibar sender, OmnibarSuggestionChosenEventArgs args)
 		{
-
+			if (args.SelectedItem is OmnibarPathModeSuggestionModel item)
+				await ViewModel.HandleFolderNavigationAsync(item.Path);
 		}
 
 		private async void BreadcrumbBar_ItemClicked(Controls.BreadcrumbBar sender, Controls.BreadcrumbBarItemClickedEventArgs args)
@@ -267,7 +268,7 @@ private async void BreadcrumbBar_ItemClicked(Controls.BreadcrumbBar sender, Cont
 				return;
 			}
 
-			await ViewModel.HandleBreadcrumbBarItemClicked(ViewModel.PathComponents[args.Index].Path);
+			await ViewModel.HandleFolderNavigationAsync(ViewModel.PathComponents[args.Index].Path);
 		}
 
 		private async void BreadcrumbBar_ItemDropDownFlyoutOpening(object sender, BreadcrumbBarItemDropDownFlyoutEventArgs e)
@@ -286,13 +287,14 @@ private async void BreadcrumbBar_ItemDropDownFlyoutOpening(object sender, Breadc
 				e.Flyout.Items.Add(new MenuFlyoutHeaderItem() { Text = "Drives" });
 				e.Flyout.Items.Add(new MenuFlyoutItem() { Text = "Local Disk (C:)" });
 				e.Flyout.Items.Add(new MenuFlyoutItem() { Text = "Local Disk (D:)" });
+
 				return;
 			}
 
 			await ViewModel.SetPathBoxDropDownFlyoutAsync(e.Flyout, ViewModel.PathComponents[e.Index]);
 		}
 
-		private void BreadcrumbBar_ItemDropDownFlyoutClosed(object sender, Controls.BreadcrumbBarItemDropDownFlyoutEventArgs e)
+		private void BreadcrumbBar_ItemDropDownFlyoutClosed(object sender, BreadcrumbBarItemDropDownFlyoutEventArgs e)
 		{
 			// Clear the flyout items to save memory
 			e.Flyout.Items.Clear();

src/Files.App/UserControls/PathBreadcrumb.xaml.cs

@@ -56,7 +56,7 @@ textBlock.DataContext is not PathBoxItem item ||
 				return;
 
 			// TODO: Implement middle click retrieving.
-			await ViewModel.HandleBreadcrumbBarItemClicked(path);
+			await ViewModel.HandleFolderNavigationAsync(path);
 
 			e.Handled = true;
 		}

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

@@ -582,7 +582,7 @@ public void PathBoxItem_PointerPressed(object sender, PointerRoutedEventArgs e)
 			_pointerRoutedEventArgs = ptrPt.Properties.IsMiddleButtonPressed ? e : null;
 		}
 
-		public async Task HandleBreadcrumbBarItemClicked(string path, bool? isMiddleButtonPressed = null)
+		public async Task HandleFolderNavigationAsync(string path, bool? isMiddleButtonPressed = null)
 		{
 			isMiddleButtonPressed ??= _pointerRoutedEventArgs is not null;
 			if (isMiddleButtonPressed is true)