Code Quality: Improved Omnibar 14.1 (#17255)

Co-authored-by: Yair <[email protected]>

Author: 0x5bfa

src/Files.App/UserControls/NavigationToolbar.xaml

@@ -419,7 +419,7 @@
 					<DataTemplate x:DataType="dataitems:NavigationBarSuggestionItem">
 						<Grid Padding="0,0,4,0" ColumnSpacing="12">
 							<Grid.ColumnDefinitions>
-								<ColumnDefinition Width="Auto" />
+								<ColumnDefinition Width="16" />
 								<ColumnDefinition Width="*" />
 								<ColumnDefinition Width="Auto" />
 							</Grid.ColumnDefinitions>

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

@@ -330,7 +330,10 @@ private async void Omnibar_TextChanged(Omnibar sender, OmnibarTextChangedEventAr
 			}
 			else if (Omnibar.CurrentSelectedMode == OmnibarCommandPaletteMode)
 			{
-				ViewModel.PopulateOmnibarSuggestionsForCommandPaletteMode();
+				await DispatcherQueue.EnqueueOrInvokeAsync(() =>
+				{
+					ViewModel.PopulateOmnibarSuggestionsForCommandPaletteMode();
+				});
 			}
 			else if (Omnibar.CurrentSelectedMode == OmnibarSearchMode)
 			{
@@ -475,13 +478,10 @@ await DispatcherQueue.EnqueueOrInvokeAsync(async () =>
 				{
 					ViewModel.OmnibarCommandPaletteModeText = string.Empty;
 
-					if (ViewModel.OmnibarCommandPaletteModeSuggestionItems.Count is 0)
+					await DispatcherQueue.EnqueueOrInvokeAsync(() =>
 					{
-						await DispatcherQueue.EnqueueOrInvokeAsync(() =>
-						{
-							ViewModel.PopulateOmnibarSuggestionsForCommandPaletteMode();
-						});
-					}
+						ViewModel.PopulateOmnibarSuggestionsForCommandPaletteMode();
+					});
 				}
 				else if (Omnibar.CurrentSelectedMode == OmnibarSearchMode)
 				{

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

@@ -1148,6 +1148,8 @@ void AddNoResultsItem()
 
 		public void PopulateOmnibarSuggestionsForCommandPaletteMode()
 		{
+			var newSuggestions = new List<NavigationBarSuggestionItem>();
+
 			if (ContentPageContext.SelectedItems.Count == 1 && ContentPageContext.SelectedItem is not null && !ContentPageContext.SelectedItem.IsFolder)
 			{
 				try
@@ -1176,7 +1178,7 @@ public void PopulateOmnibarSuggestionsForCommandPaletteMode()
 							}
 						}
 
-						OmnibarCommandPaletteModeSuggestionItems.Add(newItem);
+						newSuggestions.Add(newItem);
 					}
 				}
 				catch (Exception ex)
@@ -1198,22 +1200,52 @@ public void PopulateOmnibarSuggestionsForCommandPaletteMode()
 					PrimaryDisplay = command.Description,
 					HotKeys = command.HotKeys,
 					SearchText = OmnibarCommandPaletteModeText,
-				});
+				})
+				.Where(item => item.Text != Commands.OpenCommandPalette.Description.ToString()
+					&& item.Text != Commands.EditPath.Description.ToString());
 
-			foreach (var item in suggestionItems)
-			{
-				if (item.Text != Commands.OpenCommandPalette.Description.ToString())
-					OmnibarCommandPaletteModeSuggestionItems.Add(item);
-			}
+			newSuggestions.AddRange(suggestionItems);
 
-			if (OmnibarCommandPaletteModeSuggestionItems.Count is 0)
+			if (newSuggestions.Count == 0)
 			{
-				OmnibarCommandPaletteModeSuggestionItems.Add(new NavigationBarSuggestionItem()
+				newSuggestions.Add(new NavigationBarSuggestionItem()
 				{
 					PrimaryDisplay = string.Format(Strings.NoCommandsFound.GetLocalizedResource(), OmnibarCommandPaletteModeText),
 					SearchText = OmnibarCommandPaletteModeText,
 				});
 			}
+
+			if (!OmnibarCommandPaletteModeSuggestionItems.IntersectBy(newSuggestions, x => x.PrimaryDisplay).Any())
+			{
+				for (int index = 0; index < newSuggestions.Count; index++)
+				{
+					if (index < OmnibarCommandPaletteModeSuggestionItems.Count)
+						OmnibarCommandPaletteModeSuggestionItems[index] = newSuggestions[index];
+					else
+						OmnibarCommandPaletteModeSuggestionItems.Add(newSuggestions[index]);
+				}
+
+				while (OmnibarCommandPaletteModeSuggestionItems.Count > newSuggestions.Count)
+					OmnibarCommandPaletteModeSuggestionItems.RemoveAt(OmnibarCommandPaletteModeSuggestionItems.Count - 1);
+			}
+			else
+			{
+				foreach (var s in OmnibarCommandPaletteModeSuggestionItems.ExceptBy(newSuggestions, x => x.PrimaryDisplay).ToList())
+					OmnibarCommandPaletteModeSuggestionItems.Remove(s);
+
+				for (int index = 0; index < newSuggestions.Count; index++)
+				{
+					if (OmnibarCommandPaletteModeSuggestionItems.Count > index
+						&& OmnibarCommandPaletteModeSuggestionItems[index].PrimaryDisplay == newSuggestions[index].PrimaryDisplay)
+					{
+						OmnibarCommandPaletteModeSuggestionItems[index] = newSuggestions[index];
+					}
+					else
+					{
+						OmnibarCommandPaletteModeSuggestionItems.Insert(index, newSuggestions[index]);
+					}
+				}
+			}
 		}
 
 		[Obsolete("Remove once Omnibar goes out of experimental.")]