Fixed "On a fresh start, focusing on the Path Mode textbox doesn't open the suggestion flyout"

Author: 0x5bfa

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

@@ -4,7 +4,7 @@
 namespace Files.App.Controls
 {
 	/// <summary>
-	/// An interface that provides a way to get the text member path of <see cref="OmnibarMode.SuggestionItemsSource"/>.
+	/// An interface that provides a way to get the text member path of <see cref="OmnibarMode.ItemsSource"/>.
 	/// </summary>
 	/// <remarks>
 	/// An alternative to this interface is to use an <see cref="Microsoft.UI.Xaml.Data.IBindableCustomPropertyImplementation"/> powered by CsWinRT.

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

@@ -156,8 +156,8 @@ protected void ChangeMode(OmnibarMode? oldMode, OmnibarMode newMode)
 			newMode.IsTabStop = false;
 
 			_textBox.PlaceholderText = newMode.PlaceholderText ?? string.Empty;
-			_textBoxSuggestionsListView.ItemTemplate = newMode.SuggestionItemTemplate;
-			_textBoxSuggestionsListView.ItemsSource = newMode.SuggestionItemsSource;
+			_textBoxSuggestionsListView.ItemTemplate = newMode.ItemTemplate;
+			_textBoxSuggestionsListView.ItemsSource = newMode.ItemsSource;
 
 			if (newMode.IsAutoFocusEnabled)
 			{
@@ -196,9 +196,9 @@ internal protected void FocusTextBox()
 			_textBox.Focus(FocusState.Keyboard);
 		}
 
-		public bool TryToggleIsSuggestionsPopupOpen(bool wantToOpen)
+		internal protected bool TryToggleIsSuggestionsPopupOpen(bool wantToOpen)
 		{
-			if (wantToOpen && (!IsFocused || CurrentSelectedMode?.SuggestionItemsSource is null || (CurrentSelectedMode?.SuggestionItemsSource is IList collection && collection.Count is 0)) ||
+			if (wantToOpen && (!IsFocused || CurrentSelectedMode?.ItemsSource is null || (CurrentSelectedMode?.ItemsSource is IList collection && collection.Count is 0)) ||
 				_textBoxSuggestionsPopup is null)
 				return false;
 

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

@@ -28,15 +28,9 @@ public partial class OmnibarMode
 		[GeneratedDependencyProperty]
 		public partial FrameworkElement? IconOnInactive { get; set; }
 
-		[GeneratedDependencyProperty]
-		public partial object? SuggestionItemsSource { get; set; }
-
-		[GeneratedDependencyProperty]
-		public partial DataTemplate? SuggestionItemTemplate { get; set; }
-
 		[GeneratedDependencyProperty]
 		/// <remark>
-		/// Implement <see cref="IOmnibarTextMemberPathProvider"/> in <see cref="SuggestionItemsSource"/> to get the text member path from the suggestion item correctly.
+		/// Implement <see cref="IOmnibarTextMemberPathProvider"/> in <see cref="ItemsSource"/> to get the text member path from the suggestion item correctly.
 		/// </remark>
 		public partial string? TextMemberPath { get; set; }
 

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

@@ -6,7 +6,7 @@
 namespace Files.App.Controls
 {
 	[DebuggerDisplay("{" + nameof(ToString) + "(),nq}")]
-	public partial class OmnibarMode : Control
+	public partial class OmnibarMode : ItemsControl
 	{
 		// Constants
 
@@ -66,6 +66,14 @@ protected override void OnKeyUp(KeyRoutedEventArgs args)
 			}
 		}
 
+		protected override void OnItemsChanged(object e)
+		{
+			base.OnItemsChanged(e);
+
+			if (_ownerRef is not null && _ownerRef.TryGetTarget(out var owner))
+				owner.TryToggleIsSuggestionsPopupOpen(true);
+		}
+
 		private void OmnibarMode_Loaded(object sender, RoutedEventArgs e)
 		{
 			// Set this mode as the current mode if it is the default mode

src/Files.App/UserControls/NavigationToolbar.xaml

@@ -322,7 +322,7 @@
 			Grid.Column="1"
 			x:Load="{x:Bind ViewModel.EnableOmnibar, Mode=OneWay}"
 			CurrentSelectedModeName="{x:Bind ViewModel.OmnibarCurrentSelectedModeName, Mode=TwoWay}"
-			IsFocused="{x:Bind ViewModel.IsOmnibarFocused, Mode=TwoWay}"
+			GotFocus="Omnibar_GotFocus"
 			LostFocus="Omnibar_LostFocus"
 			PreviewKeyDown="Omnibar_PreviewKeyDown"
 			QuerySubmitted="Omnibar_QuerySubmitted"
@@ -333,9 +333,9 @@
 				IconOnActive="{controls:ThemedIconMarkup Style={StaticResource App.ThemedIcons.Omnibar.Path}, IsFilled=True}"
 				IconOnInactive="{controls:ThemedIconMarkup Style={StaticResource App.ThemedIcons.Omnibar.Path}, IconType=Outline}"
 				IsDefault="True"
+				ItemsSource="{x:Bind ViewModel.PathModeSuggestionItems, Mode=OneWay}"
 				ModeName="{x:Bind Commands.EditPath.LabelWithHotKey, Mode=OneWay}"
 				PlaceholderText="{helpers:ResourceString Name=OmnibarPathModeTextPlaceholder}"
-				SuggestionItemsSource="{x:Bind ViewModel.PathModeSuggestionItems, Mode=OneWay}"
 				Text="{x:Bind ViewModel.PathText, Mode=TwoWay}"
 				TextMemberPath="Path">
 				<controls:OmnibarMode.ContentOnInactive>
@@ -364,25 +364,25 @@
 						</controls:BreadcrumbBar.ItemTemplate>
 					</controls:BreadcrumbBar>
 				</controls:OmnibarMode.ContentOnInactive>
-				<controls:OmnibarMode.SuggestionItemTemplate>
+				<controls:OmnibarMode.ItemTemplate>
 					<DataTemplate x:DataType="datamodels:OmnibarPathModeSuggestionModel">
 						<TextBlock Text="{x:Bind DisplayName, Mode=OneWay}" />
 					</DataTemplate>
-				</controls:OmnibarMode.SuggestionItemTemplate>
+				</controls:OmnibarMode.ItemTemplate>
 			</controls:OmnibarMode>
 
 			<controls:OmnibarMode
 				x:Name="OmnibarCommandPaletteMode"
 				IconOnActive="{controls:ThemedIconMarkup Style={StaticResource App.ThemedIcons.Omnibar.Commands}, IsFilled=True}"
 				IconOnInactive="{controls:ThemedIconMarkup Style={StaticResource App.ThemedIcons.Omnibar.Commands}, IconType=Outline}"
 				IsAutoFocusEnabled="True"
+				ItemsSource="{x:Bind ViewModel.OmnibarCommandPaletteModeSuggestionItems, Mode=OneWay}"
 				ModeName="{x:Bind Commands.OpenCommandPalette.LabelWithHotKey, Mode=OneWay}"
 				PlaceholderText="{helpers:ResourceString Name=OmnibarCommandPaletteModeTextPlaceholder}"
-				SuggestionItemsSource="{x:Bind ViewModel.OmnibarCommandPaletteModeSuggestionItems, Mode=OneWay}"
 				Text="{x:Bind ViewModel.OmnibarCommandPaletteModeText, Mode=TwoWay}"
 				TextMemberPath="Text"
 				UpdateTextOnSelect="False">
-				<controls:OmnibarMode.SuggestionItemTemplate>
+				<controls:OmnibarMode.ItemTemplate>
 					<DataTemplate x:DataType="dataitems:NavigationBarSuggestionItem">
 						<Grid ColumnSpacing="12">
 							<Grid.ColumnDefinitions>
@@ -421,7 +421,7 @@
 								HotKeys="{x:Bind HotKeys}" />
 						</Grid>
 					</DataTemplate>
-				</controls:OmnibarMode.SuggestionItemTemplate>
+				</controls:OmnibarMode.ItemTemplate>
 			</controls:OmnibarMode>
 
 			<controls:OmnibarMode

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

@@ -23,6 +23,7 @@ public sealed partial class NavigationToolbar : UserControl
 		private readonly MainPageViewModel MainPageViewModel = Ioc.Default.GetRequiredService<MainPageViewModel>();
 		private readonly ICommandManager Commands = Ioc.Default.GetRequiredService<ICommandManager>();
 		private readonly StatusCenterViewModel OngoingTasksViewModel = Ioc.Default.GetRequiredService<StatusCenterViewModel>();
+		private readonly IContentPageContext ContentPageContext = Ioc.Default.GetRequiredService<IContentPageContext>();
 
 		// Properties
 
@@ -411,6 +412,27 @@ private void BreadcrumbBar_ItemDropDownFlyoutClosed(object sender, BreadcrumbBar
 			e.Flyout.Items.Clear();
 		}
 
+		private async void Omnibar_GotFocus(object sender, RoutedEventArgs e)
+		{
+			switch (ViewModel.OmnibarCurrentSelectedModeName)
+			{
+				case NavigationToolbarViewModel.OmnibarPathModeName:
+					ViewModel.PathText =
+						string.IsNullOrEmpty(ContentPageContext.ShellPage?.ShellViewModel?.WorkingDirectory)
+							? Constants.UserEnvironmentPaths.HomePath
+							: ContentPageContext.ShellPage.ShellViewModel.WorkingDirectory;
+					await ViewModel.PopulateOmnibarSuggestionsForPathMode();
+					break;
+				case NavigationToolbarViewModel.OmnibarPaletteModeName:
+					ViewModel.PopulateOmnibarSuggestionsForCommandPaletteMode();
+					break;
+				case NavigationToolbarViewModel.OmnibarSearchModeName:
+					break;
+				default:
+					break;
+			}
+		}
+
 		private void Omnibar_LostFocus(object sender, RoutedEventArgs e)
 		{
 			if (Omnibar.CurrentSelectedMode == OmnibarCommandPaletteMode)

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

@@ -4,6 +4,7 @@
 using CommunityToolkit.WinUI;
 using Files.App.Controls;
 using Files.Shared.Helpers;
+using Microsoft.Extensions.Logging;
 using Microsoft.UI.Dispatching;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
@@ -230,39 +231,6 @@ public string? PathText
 		private string? _OmnibarCommandPaletteModeText;
 		public string? OmnibarCommandPaletteModeText { get => _OmnibarCommandPaletteModeText; set => SetProperty(ref _OmnibarCommandPaletteModeText, value); }
 
-		private bool _IsOmnibarFocused;
-		public bool IsOmnibarFocused
-		{
-			get => _IsOmnibarFocused;
-			set
-			{
-				// NOTE: Don't call ObservableObject.SetProperty() here since we don't want to change focus logic outside of the control.
-
-				_IsOmnibarFocused = value;
-
-				if (value)
-				{
-					switch (OmnibarCurrentSelectedModeName)
-					{
-						case OmnibarPathModeName:
-							PathText =
-								string.IsNullOrEmpty(ContentPageContext.ShellPage?.ShellViewModel?.WorkingDirectory)
-									? Constants.UserEnvironmentPaths.HomePath
-									: ContentPageContext.ShellPage.ShellViewModel.WorkingDirectory;
-							_ = PopulateOmnibarSuggestionsForPathMode();
-							break;
-						case OmnibarPaletteModeName:
-							PopulateOmnibarSuggestionsForCommandPaletteMode();
-							break;
-						case OmnibarSearchModeName:
-							break;
-						default:
-							break;
-					}
-				}
-			}
-		}
-
 		private string _OmnibarCurrentSelectedModeName = OmnibarPathModeName;
 		public string OmnibarCurrentSelectedModeName { get => _OmnibarCurrentSelectedModeName; set => SetProperty(ref _OmnibarCurrentSelectedModeName, value); }
 
@@ -735,7 +703,6 @@ await DialogDisplayHelper.ShowDialogAsync(Strings.InvalidItemDialogTitle.GetLoca
 			}
 
 			PathControlDisplayText = ContentPageContext.ShellPage.ShellViewModel.WorkingDirectory;
-			IsOmnibarFocused = false;
 		}
 
 		public void PathBoxItem_PreviewKeyDown(object sender, KeyRoutedEventArgs e)