Fixed an issue

Author: 0x5bfa

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

@@ -26,5 +26,10 @@ partial void OnCurrentSelectedModeChanged(OmnibarMode? newValue)
 		{
 			CurrentSelectedModeName = newValue?.ModeName;
 		}
+
+		partial void OnIsFocusedChanged(bool newValue)
+		{
+			//_textBox?.Focus(newValue ? FocusState.Programmatic : FocusState.Unfocused);
+		}
 	}
 }

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

@@ -261,8 +261,9 @@ private async void Omnibar_QuerySubmitted(Omnibar sender, OmnibarQuerySubmittedE
 
 		private async void Omnibar_SuggestionChosen(Omnibar sender, OmnibarSuggestionChosenEventArgs args)
 		{
-			if (args.SelectedItem is OmnibarPathModeSuggestionModel item)
-				await ViewModel.HandleFolderNavigationAsync(item.Path);
+			if (args.SelectedItem is OmnibarPathModeSuggestionModel item &&
+				!string.IsNullOrEmpty(item.Path))
+				await ViewModel.HandleItemNavigationAsync(item.Path);
 		}
 
 		private async void Omnibar_TextChanged(Omnibar sender, OmnibarTextChangedEventArgs args)
@@ -274,7 +275,7 @@ private async void BreadcrumbBar_ItemClicked(Controls.BreadcrumbBar sender, Cont
 		{
 			if (args.IsRootItem)
 			{
-				// TODO: Go to Home
+				await ViewModel.HandleItemNavigationAsync("Home");
 				return;
 			}
 

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

@@ -1068,48 +1068,48 @@ public async Task PopulateOmnibarSuggestionsForPathMode()
 						newSuggestions.AddRange(currPath.Select(x => new OmnibarPathModeSuggestionModel(x.Path, x.Item.DisplayName)));
 						newSuggestions.AddRange(subPath.Select(x => new OmnibarPathModeSuggestionModel(x.Path, PathNormalization.Combine(currPath.First().Item.DisplayName, x.Item.DisplayName))));
 					}
+				}
 
-					// If there are no suggestions, show "No suggestions"
-					if (newSuggestions.Count is 0)
-					{
-						AddNoResultsItem();
-					}
+				// If there are no suggestions, show "No suggestions"
+				if (newSuggestions.Count is 0)
+				{
+					AddNoResultsItem();
+				}
 
-					// Check whether at least one item is in common between the old and the new suggestions
-					// since Omnibar suggestions popup becoming empty causes flickering
-					if (!PathModeSuggestionItems.IntersectBy(newSuggestions, x => x.DisplayName).Any())
+				// Check whether at least one item is in common between the old and the new suggestions
+				// since the suggestions popup becoming empty causes flickering
+				if (!PathModeSuggestionItems.IntersectBy(newSuggestions, x => x.DisplayName).Any())
+				{
+					// No items in common, update the list in-place
+					for (int index = 0; index < newSuggestions.Count; index++)
 					{
-						// No items in common, update the list in-place
-						for (int index = 0; index < newSuggestions.Count; index++)
+						if (index < PathModeSuggestionItems.Count)
 						{
-							if (index < PathModeSuggestionItems.Count)
-							{
-								PathModeSuggestionItems[index] = newSuggestions[index];
-							}
-							else
-							{
-								PathModeSuggestionItems.Add(newSuggestions[index]);
-							}
+							PathModeSuggestionItems[index] = newSuggestions[index];
+						}
+						else
+						{
+							PathModeSuggestionItems.Add(newSuggestions[index]);
 						}
-
-						while (PathModeSuggestionItems.Count > newSuggestions.Count)
-							PathModeSuggestionItems.RemoveAt(PathModeSuggestionItems.Count - 1);
 					}
-					else
-					{
-						// At least an element in common, show animation
-						foreach (var s in PathModeSuggestionItems.ExceptBy(newSuggestions, x => x.DisplayName).ToList())
-							PathModeSuggestionItems.Remove(s);
 
-						for (int index = 0; index < newSuggestions.Count; index++)
+					while (PathModeSuggestionItems.Count > newSuggestions.Count)
+						PathModeSuggestionItems.RemoveAt(PathModeSuggestionItems.Count - 1);
+				}
+				else
+				{
+					// At least an element in common, show animation
+					foreach (var s in PathModeSuggestionItems.ExceptBy(newSuggestions, x => x.DisplayName).ToList())
+						PathModeSuggestionItems.Remove(s);
+
+					for (int index = 0; index < newSuggestions.Count; index++)
+					{
+						if (PathModeSuggestionItems.Count > index && PathModeSuggestionItems[index].DisplayName == newSuggestions[index].DisplayName)
 						{
-							if (PathModeSuggestionItems.Count > index && PathModeSuggestionItems[index].DisplayName == newSuggestions[index].DisplayName)
-							{
-								PathModeSuggestionItems[index] = newSuggestions[index];
-							}
-							else
-								PathModeSuggestionItems.Insert(index, newSuggestions[index]);
+							PathModeSuggestionItems[index] = newSuggestions[index];
 						}
+						else
+							PathModeSuggestionItems.Insert(index, newSuggestions[index]);
 					}
 				}