Fixed a severe issue when entering text or refocusing Omnibar after command invocation.

Author: 0x5bfa

src/Files.App/Data/Items/NavigationBarSuggestionItem.cs

@@ -2,25 +2,25 @@
 // Licensed under the MIT License.
 
 using Files.App.Controls;
+using Microsoft.UI.Xaml;
 
 namespace Files.App.Data.Items
 {
 	[Obsolete("Remove once Omnibar goes out of experimental.")]
 	public sealed partial class NavigationBarSuggestionItem : ObservableObject, IOmnibarTextMemberPathProvider
 	{
+		// Obsolete but left as is for backwards compatibility
 		private object? _Icon;
-		public object? Icon
-		{
-			get => _Icon;
-			set => SetProperty(ref _Icon, value);
-		}
+		public object? Icon { get => _Icon; set => SetProperty(ref _Icon, value); }
+
+		private Style? _ThemedIconStyle;
+		public Style? ThemedIconStyle { get => _ThemedIconStyle; set => SetProperty(ref _ThemedIconStyle, value); }
+
+		private string? _Glyph;
+		public string? Glyph { get => _Glyph; set => SetProperty(ref _Glyph, value); }
 
 		private string? _Text;
-		public string? Text
-		{
-			get => _Text;
-			set => SetProperty(ref _Text, value);
-		}
+		public string? Text { get => _Text; set => SetProperty(ref _Text, value); }
 
 		private string? _PrimaryDisplay;
 		public string? PrimaryDisplay

src/Files.App/UserControls/NavigationToolbar.xaml

@@ -27,6 +27,7 @@
 	<UserControl.Resources>
 		<ResourceDictionary>
 			<converters:NullToTrueConverter x:Key="NullToFalseConverter" Inverse="True" />
+			<converters:NullToVisibilityCollapsedConverter x:Key="NullToVisibilityCollapsedConverter" />
 			<converters1:BoolNegationConverter x:Key="BoolNegationConverter" />
 
 			<ResourceDictionary.MergedDictionaries>
@@ -396,14 +397,15 @@
 								<ColumnDefinition Width="Auto" />
 							</Grid.ColumnDefinitions>
 
-							<Viewbox
-								x:Name="OmnibarCommandPaletteModeSuggestionItemIconViewbox"
-								Grid.Column="0"
-								Width="16"
-								Height="16"
-								x:Load="{x:Bind Icon, Converter={StaticResource NullToFalseConverter}, Mode=OneWay}">
-								<ContentPresenter Content="{x:Bind Icon, Mode=OneWay}" Foreground="{ThemeResource App.Theme.IconBaseBrush}" />
-							</Viewbox>
+							<Grid Grid.Column="0">
+								<Viewbox
+									Width="16"
+									Height="16"
+									Visibility="{x:Bind Glyph, Converter={StaticResource NullToVisibilityCollapsedConverter}}">
+									<FontIcon Foreground="{ThemeResource App.Theme.IconBaseBrush}" Glyph="{x:Bind Glyph}" />
+								</Viewbox>
+								<controls:ThemedIcon Style="{x:Bind ThemedIconStyle}" Visibility="{x:Bind ThemedIconStyle, Converter={StaticResource NullToVisibilityCollapsedConverter}}" />
+							</Grid>
 
 							<!--  Primary Title  -->
 							<TextBlock
@@ -422,7 +424,7 @@
 								x:Name="RightAlignedKeyboardShortcut"
 								Grid.Column="2"
 								VerticalAlignment="Center"
-								HotKeys="{x:Bind HotKeys, Mode=OneWay}" />
+								HotKeys="{x:Bind HotKeys}" />
 						</Grid>
 					</DataTemplate>
 				</controls:OmnibarMode.SuggestionItemTemplate>

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

@@ -1135,27 +1135,26 @@ void AddNoResultsItem()
 		public void PopulateOmnibarSuggestionsForCommandPaletteMode()
 		{
 			OmnibarCommandPaletteModeText ??= string.Empty;
-
 			OmnibarCommandPaletteModeSuggestionItems.Clear();
 
-			IList<NavigationBarSuggestionItem>? suggestions = null;
-
-			suggestions = [.. Commands.Where(command =>
+			var suggestionItems = Commands.Where(command =>
 				command.IsExecutable &&
 				command.IsAccessibleGlobally &&
 				(command.Description.Contains(OmnibarCommandPaletteModeText, StringComparison.OrdinalIgnoreCase) ||
 				command.Code.ToString().Contains(OmnibarCommandPaletteModeText, StringComparison.OrdinalIgnoreCase)))
 			.Select(command => new NavigationBarSuggestionItem()
 			{
 				Icon = command.Icon,
+				ThemedIconStyle = command.Glyph.ToThemedIconStyle(),
+				Glyph = command.Glyph.BaseGlyph,
 				Text = command.Code.ToString(),
 				PrimaryDisplay = command.Description,
 				HotKeys = command.HotKeys,
 				SearchText = OmnibarCommandPaletteModeText,
-			})];
+			});
 
-			foreach (var suggestionItem in suggestions)
-				OmnibarCommandPaletteModeSuggestionItems.Add(suggestionItem);
+			foreach (var item in suggestionItems)
+				OmnibarCommandPaletteModeSuggestionItems.Add(item);
 		}
 
 		[Obsolete("Remove once Omnibar goes out of experimental.")]