Improved

Author: 0x5bfa

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

@@ -146,6 +146,9 @@ public void ChangeMode(OmnibarMode modeToExpand, bool useTransition = true)
 
 			CurrentSelectedMode = modeToExpand;
 
+			_textChangeReason = OmnibarTextChangeReason.ProgrammaticChange;
+			_textBox.Text = CurrentSelectedMode.Text ?? string.Empty;
+
 			// Move cursor of the TextBox to the tail
 			_textBox.Select(_textBox.Text.Length, 0);
 
@@ -197,7 +200,7 @@ public void ChooseSuggestionItem(object obj)
 			if (CurrentSelectedMode.UpdateTextOnSelect)
 			{
 				_textChangeReason = OmnibarTextChangeReason.SuggestionChosen;
-				CurrentSelectedMode.Text = GetObjectText(obj);
+				_textBox.Text = GetObjectText(obj);
 			}
 
 			SuggestionChosen?.Invoke(this, new(CurrentSelectedMode, obj));
@@ -237,7 +240,7 @@ private void RevertTextToUserInput()
 			_textBoxSuggestionsListView.SelectedIndex = -1;
 			_textChangeReason = OmnibarTextChangeReason.ProgrammaticChange;
 
-			CurrentSelectedMode.Text = _userInput ?? "";
+			_textBox.Text = _userInput ?? "";
 
 			// Move the cursor to the end of the TextBox
 			_textBox?.Select(_textBox.Text.Length, 0);

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

@@ -51,15 +51,13 @@
 							Grid.Row="0"
 							Width="{TemplateBinding Width}"
 							Height="{TemplateBinding Height}"
-							Margin="0"
 							Padding="{Binding AutoSuggestBoxPadding, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
 							HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
 							VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
 							Background="{TemplateBinding Background}"
 							BackgroundSizing="{TemplateBinding BackgroundSizing}"
 							BorderBrush="{TemplateBinding BorderBrush}"
 							BorderThickness="{TemplateBinding BorderThickness}"
-							Canvas.ZIndex="0"
 							CornerRadius="{TemplateBinding CornerRadius}"
 							DesiredCandidateWindowAlignment="BottomEdge"
 							FontFamily="{TemplateBinding FontFamily}"
@@ -70,7 +68,6 @@
 							PlaceholderText="{Binding CurrentSelectedMode.PlaceholderText, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
 							ScrollViewer.BringIntoViewOnFocusChange="False"
 							Style="{StaticResource DefaultOmnibarTextBoxStyle}"
-							Text="{Binding CurrentSelectedMode.Text, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
 							UseSystemFocusVisuals="{TemplateBinding UseSystemFocusVisuals}" />
 
 						<Grid

tests/Files.App.UITests/Views/OmnibarPage.xaml

@@ -64,9 +64,11 @@
 											<ColumnDefinition Width="*" />
 											<ColumnDefinition Width="Auto" />
 										</Grid.ColumnDefinitions>
-										<StackPanel VerticalAlignment="Center">
-											<controls:ThemedIcon IconSize="20" Style="{StaticResource App.ThemedIcons.Actions.Copying}" />
-										</StackPanel>
+										<controls:ThemedIcon
+											Width="20"
+											Height="20"
+											VerticalAlignment="Center"
+											Style="{StaticResource App.ThemedIcons.Actions.Copying}" />
 										<StackPanel Grid.Column="1" VerticalAlignment="Center">
 											<TextBlock
 												Style="{StaticResource BodyStrongTextBlockStyle}"
@@ -113,6 +115,11 @@
 						IsReadOnly="True"
 						Text="{x:Bind Omnibar1_Text, Mode=OneWay}" />
 
+					<TextBox
+						Header="Text changed reason:"
+						IsReadOnly="True"
+						Text="{x:Bind Omnibar1_TextChangedReason, Mode=OneWay}" />
+
 					<Grid ColumnSpacing="8">
 						<Grid.ColumnDefinitions>
 							<ColumnDefinition Width="*" />

tests/Files.App.UITests/Views/OmnibarPage.xaml.cs

@@ -18,6 +18,9 @@ public sealed partial class OmnibarPage : Page
 		[GeneratedDependencyProperty(DefaultValue = "")]
 		private partial string Omnibar1_Text { get; set; }
 
+		[GeneratedDependencyProperty(DefaultValue = "")]
+		private partial string Omnibar1_TextChangedReason { get; set; }
+
 		[GeneratedDependencyProperty]
 		private partial int Omnibar1_ChosenSuggestionIndex { get; set; }
 
@@ -67,19 +70,22 @@ private void Omnibar1_BreadcrumbBar_ItemDropDownFlyoutClosed(object sender, Brea
 
 		private void Omnibar1_QuerySubmitted(Omnibar sender, OmnibarQuerySubmittedEventArgs args)
 		{
-			Omnibar1_ChosenSuggestionIndex = args.Item is null ? -1 : 0;
+			Omnibar1_ChosenSuggestionIndex = args.Item is OmnibarPaletteSuggestionItem item ? Omnibar1_PaletteSuggestions.IndexOf(item) : -1;
 			Omnibar1_SubmittedQuery = args.Mode.Text ?? string.Empty;
 		}
 
 		private void Omnibar1_TextChanged(Omnibar sender, OmnibarTextChangedEventArgs args)
 		{
-			Omnibar1_ChosenSuggestionIndex = -1;
+			if (args.Reason is not OmnibarTextChangeReason.SuggestionChosen)
+				Omnibar1_ChosenSuggestionIndex = -1;
+
 			Omnibar1_Text = args.Mode.Text ?? string.Empty;
+			Omnibar1_TextChangedReason = args.Reason.ToString();
 		}
 
 		private void Omnibar1_SuggestionChosen(Omnibar sender, OmnibarSuggestionChosenEventArgs args)
 		{
-			Omnibar1_ChosenSuggestionIndex = 0;
+			Omnibar1_ChosenSuggestionIndex = args.SelectedItem is OmnibarPaletteSuggestionItem item ? Omnibar1_PaletteSuggestions.IndexOf(item) : -1;
 			Omnibar1_SubmittedQuery = args.Mode.Text ?? string.Empty;
 		}
 	}