Revert

Author: 0x5bfa

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

@@ -8,4 +8,6 @@ public record class OmnibarQuerySubmittedEventArgs(OmnibarMode Mode, object? Ite
 	public record class OmnibarSuggestionChosenEventArgs(OmnibarMode Mode, object SelectedItem);
 
 	public record class OmnibarTextChangedEventArgs(OmnibarMode Mode, OmnibarTextChangeReason Reason);
+
+	public record class OmnibarModeChangedEventArgs(OmnibarMode? OldMode, OmnibarMode NewMode);
 }

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

@@ -41,6 +41,7 @@ public partial class Omnibar : Control
 		public event TypedEventHandler<Omnibar, OmnibarQuerySubmittedEventArgs>? QuerySubmitted;
 		public event TypedEventHandler<Omnibar, OmnibarSuggestionChosenEventArgs>? SuggestionChosen;
 		public event TypedEventHandler<Omnibar, OmnibarTextChangedEventArgs>? TextChanged;
+		public event TypedEventHandler<Omnibar, OmnibarModeChangedEventArgs>? ModeChanged;
 
 		// Constructor
 
@@ -155,6 +156,8 @@ protected void ChangeMode(OmnibarMode? oldMode, OmnibarMode newMode)
 			VisualStateManager.GoToState(newMode, "Focused", true);
 			newMode.IsTabStop = false;
 
+			ModeChanged?.Invoke(this, new(oldMode, newMode!));
+
 			_textBox.PlaceholderText = newMode.PlaceholderText ?? string.Empty;
 			_textBoxSuggestionsListView.ItemTemplate = newMode.ItemTemplate;
 			_textBoxSuggestionsListView.ItemsSource = newMode.ItemsSource;
@@ -179,10 +182,10 @@ protected void ChangeMode(OmnibarMode? oldMode, OmnibarMode newMode)
 				{
 					VisualStateManager.GoToState(_textBox, "InputAreaVisible", true);
 				}
-
-				TryToggleIsSuggestionsPopupOpen(true);
 			}
 
+			TryToggleIsSuggestionsPopupOpen(true);
+
 			// Remove the reposition transition from the all modes
 			foreach (var mode in Modes)
 			{
@@ -198,10 +201,15 @@ internal protected void FocusTextBox()
 
 		internal protected bool TryToggleIsSuggestionsPopupOpen(bool wantToOpen)
 		{
-			if (wantToOpen && (!IsFocused || CurrentSelectedMode?.ItemsSource is null || (CurrentSelectedMode?.ItemsSource is IList collection && collection.Count is 0)) ||
-				_textBoxSuggestionsPopup is null)
+			if (_textBoxSuggestionsPopup is null)
 				return false;
 
+			if (wantToOpen && (!IsFocused || CurrentSelectedMode?.ItemsSource is null || (CurrentSelectedMode?.ItemsSource is IList collection && collection.Count is 0)))
+			{
+				_textBoxSuggestionsPopup.IsOpen = false;
+				return false;
+			}
+
 			_textBoxSuggestionsPopup.IsOpen = wantToOpen;
 
 			return false;

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}"
-			GotFocus="Omnibar_GotFocus"
+			IsFocused="{x:Bind ViewModel.IsOmnibarFocused, Mode=TwoWay}"
 			LostFocus="Omnibar_LostFocus"
 			PreviewKeyDown="Omnibar_PreviewKeyDown"
 			QuerySubmitted="Omnibar_QuerySubmitted"

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

@@ -412,27 +412,6 @@ 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

@@ -231,6 +231,39 @@ 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); }
 
@@ -1041,6 +1074,8 @@ private static async Task<bool> LaunchApplicationFromPath(string currentInput, s
 
 		public async Task PopulateOmnibarSuggestionsForPathMode()
 		{
+			PathModeSuggestionItems.Clear();
+
 			var result = await SafetyExtensions.IgnoreExceptions((Func<Task<bool>>)(async () =>
 			{
 				List<OmnibarPathModeSuggestionModel>? newSuggestions = [];
@@ -1081,9 +1116,7 @@ public async Task PopulateOmnibarSuggestionsForPathMode()
 
 				// If there are no suggestions, show "No suggestions"
 				if (newSuggestions.Count is 0)
-				{
-					AddNoResultsItem();
-				}
+					return false;
 
 				// Check whether at least one item is in common between the old and the new suggestions
 				// since the suggestions popup becoming empty causes flickering