Fix: Fixed issue that caused shortcut keys to be displayed incorrectly in the command palette (#15271)

Author: hishitetsu

src/Files.App/UserControls/KeyboardShortcut/KeyboardShortcut.cs

@@ -1,13 +1,7 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using CommunityToolkit.WinUI.UI;
-using Microsoft.UI.Input;
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Automation;
-using Microsoft.UI.Xaml.Automation.Peers;
 using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
 
 namespace Files.App.UserControls.KeyboardShortcut
 {
@@ -28,10 +22,24 @@ private void OnSizeChanged()
 		{
 		}
 
-		private void OnHotKeysChanged()
+		private async void OnHotKeysChanged()
 		{
+			var keyboardShortcutItemsControl = GetTemplateChild(KeyboardShortcutItemsControl) as ItemsControl;
+			for (int i = 0; i < 100 && keyboardShortcutItemsControl is null; i++)
+			{
+				// Wait for KeyboardShortcutItemsControl to be loaded
+				await Task.Delay(10);
+				keyboardShortcutItemsControl = GetTemplateChild(KeyboardShortcutItemsControl) as ItemsControl;
+			}
+
+			if (keyboardShortcutItemsControl is null)
+				return;
+
 			if (HotKeys.IsEmpty)
+			{
+				keyboardShortcutItemsControl.ItemsSource = null;
 				return;
+			}
 
 			List<KeyboardShortcutItem> items = [];
 
@@ -94,10 +102,7 @@ void GetModifierCode(KeyModifiers modifier)
 			}
 
 			// Set value
-			if (GetTemplateChild(KeyboardShortcutItemsControl) is ItemsControl keyboardShortcutItemsControl)
-			{
-				keyboardShortcutItemsControl.ItemsSource = items;
-			}
+			keyboardShortcutItemsControl.ItemsSource = items;
 		}
 	}
 }

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

@@ -946,7 +946,10 @@ public async Task SetAddressBarSuggestionsAsync(AutoSuggestBox sender, IShellPag
 						for (int index = 0; index < suggestions.Count; index++)
 						{
 							if (NavigationBarSuggestions.Count > index && NavigationBarSuggestions[index].PrimaryDisplay == suggestions[index].PrimaryDisplay)
+							{
 								NavigationBarSuggestions[index].SearchText = suggestions[index].SearchText;
+								NavigationBarSuggestions[index].HotKeys = suggestions[index].HotKeys;
+							}
 							else
 								NavigationBarSuggestions.Insert(index, suggestions[index]);
 						}