Aot safe mode change in XAML

Author: 0x5bfa

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

@@ -153,6 +153,11 @@ protected void ChangeMode(OmnibarMode? oldMode, OmnibarMode newMode)
 
 			VisualStateManager.GoToState(newMode, "Focused", true);
 			newMode.IsTabStop = false;
+
+			_textBox.PlaceholderText = newMode.PlaceholderText ?? string.Empty;
+			_textBoxSuggestionsListView.ItemTemplate = newMode.SuggestionItemTemplate;
+			_textBoxSuggestionsListView.ItemsSource = newMode.SuggestionItemsSource;
+
 			if (newMode.IsAutoFocusEnabled)
 			{
 				_textBox.Focus(FocusState.Pointer);

src/Files.App.Controls/Omnibar/Omnibar.xaml

@@ -67,7 +67,6 @@
 							FontStretch="{TemplateBinding FontStretch}"
 							FontWeight="{TemplateBinding FontWeight}"
 							Foreground="{TemplateBinding Foreground}"
-							PlaceholderText="{Binding CurrentSelectedMode.PlaceholderText, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
 							ScrollViewer.BringIntoViewOnFocusChange="False"
 							Style="{StaticResource DefaultOmnibarTextBoxStyle}"
 							UseSystemFocusVisuals="{TemplateBinding UseSystemFocusVisuals}" />
@@ -96,11 +95,7 @@
 									MaxHeight="{ThemeResource AutoSuggestListMaxHeight}"
 									Margin="{ThemeResource AutoSuggestListPadding}"
 									IsItemClickEnabled="True"
-									ItemTemplate="{Binding CurrentSelectedMode.SuggestionItemTemplate, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
-									ItemsSource="{Binding CurrentSelectedMode.SuggestionItemsSource, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
-									SelectionMode="Single">
-									<ListView.ItemContainerTransitions />
-								</ListView>
+									SelectionMode="Single" />
 							</Border>
 						</Popup>
 

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

@@ -262,7 +262,13 @@ private async void Omnibar_QuerySubmitted(Omnibar sender, OmnibarQuerySubmittedE
 			}
 			else if (Omnibar.CurrentSelectedMode == OmnibarCommandPaletteMode)
 			{
-				if (args.Item is not NavigationBarSuggestionItem item || item.Text is not { } commandText)
+				string commandText = args.Item is NavigationBarSuggestionItem { Text: string itemText }
+					? itemText
+					: args.Text is string text
+						? text
+						: string.Empty;
+
+				if (string.IsNullOrEmpty(commandText))
 					return;
 
 				var command = Commands[commandText];
@@ -276,6 +282,7 @@ await DialogDisplayHelper.ShowDialogAsync(Strings.CommandNotExecutable.GetLocali
 					await command.ExecuteAsync();
 
 				ViewModel.OmnibarCurrentSelectedMode = OmnibarPathMode;
+				ViewModel.OmnibarCommandPaletteModeText = string.Empty;
 			}
 			else if (Omnibar.CurrentSelectedMode == OmnibarSearchMode)
 			{