Added text boxes to examine validity

Author: 0x5bfa

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

@@ -67,7 +67,7 @@
 							FontStretch="{TemplateBinding FontStretch}"
 							FontWeight="{TemplateBinding FontWeight}"
 							Foreground="{TemplateBinding Foreground}"
-							PlaceholderText="{Binding CurrentSelectedMode.TextPlaceholder, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+							PlaceholderText="{Binding CurrentSelectedMode.PlaceholderText, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
 							ScrollViewer.BringIntoViewOnFocusChange="False"
 							Style="{StaticResource DefaultOmnibarTextBoxStyle}"
 							Text="{Binding CurrentSelectedMode.Text, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"

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

@@ -14,7 +14,7 @@ public partial class OmnibarMode
 		public partial bool IsDefault { get; set; }
 
 		[GeneratedDependencyProperty]
-		public partial string? TextPlaceholder { get; set; }
+		public partial string? PlaceholderText { get; set; }
 
 		[GeneratedDependencyProperty]
 		public partial string? ModeName { get; set; }

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

@@ -3,6 +3,7 @@
 
 namespace Files.App.Controls
 {
+	[DebuggerDisplay("{" + nameof(ToString) + "(),nq}")]
 	public partial class OmnibarMode : Control
 	{
 		// Constants
@@ -49,5 +50,10 @@ public void SetOwner(Omnibar owner)
 		{
 			_ownerRef = new(owner);
 		}
+
+		public override string ToString()
+		{
+			return ModeName ?? string.Empty;
+		}
 	}
 }

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

@@ -15,13 +15,17 @@
 		<controls:SamplePanel Header="Default usage">
 			<controls:SamplePanel.MainContent>
 				<Grid>
-					<controls:Omnibar x:Name="Omnibar1">
+					<controls:Omnibar
+						x:Name="Omnibar1"
+						QuerySubmitted="Omnibar1_QuerySubmitted"
+						SuggestionChosen="Omnibar1_SuggestionChosen"
+						TextChanged="Omnibar1_TextChanged">
 
 						<controls:OmnibarMode
 							IsDefault="True"
 							ModeName="Path"
-							Text="Path..."
-							TextPlaceholder="Enter text...">
+							PlaceholderText="Enter text..."
+							Text="Path...">
 							<controls:OmnibarMode.IconOnActive>
 								<controls:ThemedIcon IsFilled="True" Style="{StaticResource App.ThemedIcons.Omnibar.Path}" />
 							</controls:OmnibarMode.IconOnActive>
@@ -31,8 +35,8 @@
 							<controls:OmnibarMode.ContentOnInactive>
 								<controls:BreadcrumbBar
 									x:Name="BreadcrumbBar1"
-									ItemDropDownFlyoutClosed="BreadcrumbBar1_ItemDropDownFlyoutClosed"
-									ItemDropDownFlyoutOpening="BreadcrumbBar1_ItemDropDownFlyoutOpening"
+									ItemDropDownFlyoutClosed="Omnibar1_BreadcrumbBar_ItemDropDownFlyoutClosed"
+									ItemDropDownFlyoutOpening="Omnibar1_BreadcrumbBar_ItemDropDownFlyoutOpening"
 									ItemsSource="{x:Bind Omnibar1_BreadcrumbBarItems, Mode=OneWay}">
 									<controls:BreadcrumbBar.RootItem>
 										<Image
@@ -52,8 +56,8 @@
 						<controls:OmnibarMode
 							DisplayMemberPath="Title"
 							ModeName="Palette"
-							SuggestionItemsSource="{x:Bind Omnibar1_PaletteSuggestions, Mode=OneWay}"
-							TextPlaceholder="Enter a palette command...">
+							PlaceholderText="Enter a palette command..."
+							SuggestionItemsSource="{x:Bind Omnibar1_PaletteSuggestions, Mode=OneWay}">
 							<controls:OmnibarMode.IconOnActive>
 								<controls:ThemedIcon IsFilled="True" Style="{StaticResource App.ThemedIcons.Omnibar.Commands}" />
 							</controls:OmnibarMode.IconOnActive>
@@ -95,7 +99,7 @@
 							</controls:OmnibarMode.SuggestionItemTemplate>
 						</controls:OmnibarMode>
 
-						<controls:OmnibarMode ModeName="Search" TextPlaceholder="Enter a search query...">
+						<controls:OmnibarMode ModeName="Search" PlaceholderText="Enter a search query...">
 							<controls:OmnibarMode.IconOnActive>
 								<controls:ThemedIcon IsFilled="True" Style="{StaticResource App.ThemedIcons.Omnibar.Search}" />
 							</controls:OmnibarMode.IconOnActive>
@@ -107,6 +111,41 @@
 					</controls:Omnibar>
 				</Grid>
 			</controls:SamplePanel.MainContent>
+			<controls:SamplePanel.SideContent>
+				<StackPanel Spacing="8">
+
+					<TextBox
+						Header="Current mode:"
+						IsReadOnly="True"
+						Text="{x:Bind Omnibar1.CurrentSelectedMode, Mode=OneWay}" />
+
+					<TextBox
+						Header="Text:"
+						IsReadOnly="True"
+						Text="{x:Bind Omnibar1_Text, Mode=OneWay}" />
+
+					<Grid ColumnSpacing="8">
+						<Grid.ColumnDefinitions>
+							<ColumnDefinition Width="*" />
+							<ColumnDefinition Width="*" />
+						</Grid.ColumnDefinitions>
+
+						<TextBox
+							Grid.Column="0"
+							Header="Suggestion index:"
+							IsReadOnly="True"
+							Text="{x:Bind Omnibar1_ChosenSuggestionIndex, Mode=OneWay}" />
+
+						<TextBox
+							Grid.Column="1"
+							Header="Submitted query:"
+							IsReadOnly="True"
+							Text="{x:Bind Omnibar1_SubmittedQuery, Mode=OneWay}" />
+
+					</Grid>
+
+				</StackPanel>
+			</controls:SamplePanel.SideContent>
 		</controls:SamplePanel>
 
 	</StackPanel>

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

@@ -1,6 +1,7 @@
 // Copyright (c) Files Community
 // Licensed under the MIT License.
 
+using CommunityToolkit.WinUI;
 using Files.App.Controls;
 using Files.App.UITests.Data;
 using Microsoft.UI.Xaml;
@@ -12,9 +13,17 @@ namespace Files.App.UITests.Views
 	public sealed partial class OmnibarPage : Page
 	{
 		private readonly ObservableCollection<OmnibarPaletteSuggestionItem> Omnibar1_PaletteSuggestions;
-
 		private readonly ObservableCollection<BreadcrumbBarItemModel> Omnibar1_BreadcrumbBarItems;
 
+		[GeneratedDependencyProperty(DefaultValue = "")]
+		private partial string Omnibar1_Text { get; set; }
+
+		[GeneratedDependencyProperty]
+		private partial int Omnibar1_ChosenSuggestionIndex { get; set; }
+
+		[GeneratedDependencyProperty(DefaultValue = "")]
+		private partial string Omnibar1_SubmittedQuery { get; set; }
+
 		public OmnibarPage()
 		{
 			InitializeComponent();
@@ -44,16 +53,34 @@ public OmnibarPage()
 			];
 		}
 
-		private void BreadcrumbBar1_ItemDropDownFlyoutOpening(object sender, BreadcrumbBarItemDropDownFlyoutEventArgs e)
+		private void Omnibar1_BreadcrumbBar_ItemDropDownFlyoutOpening(object sender, BreadcrumbBarItemDropDownFlyoutEventArgs e)
 		{
 			e.Flyout.Items.Add(new MenuFlyoutItem { Icon = new FontIcon() { Glyph = "\uE8B7" }, Text = "Item 1" });
 			e.Flyout.Items.Add(new MenuFlyoutItem { Icon = new FontIcon() { Glyph = "\uE8B7" }, Text = "Item 2" });
 			e.Flyout.Items.Add(new MenuFlyoutItem { Icon = new FontIcon() { Glyph = "\uE8B7" }, Text = "Item 3" });
 		}
 
-		private void BreadcrumbBar1_ItemDropDownFlyoutClosed(object sender, BreadcrumbBarItemDropDownFlyoutEventArgs e)
+		private void Omnibar1_BreadcrumbBar_ItemDropDownFlyoutClosed(object sender, BreadcrumbBarItemDropDownFlyoutEventArgs e)
 		{
 			e.Flyout.Items.Clear();
 		}
+
+		private void Omnibar1_QuerySubmitted(Omnibar sender, OmnibarQuerySubmittedEventArgs args)
+		{
+			Omnibar1_ChosenSuggestionIndex = args.Item is null ? -1 : 0;
+			Omnibar1_SubmittedQuery = args.Mode.Text ?? string.Empty;
+		}
+
+		private void Omnibar1_TextChanged(Omnibar sender, OmnibarTextChangedEventArgs args)
+		{
+			Omnibar1_ChosenSuggestionIndex = -1;
+			Omnibar1_Text = args.Mode.Text ?? string.Empty;
+		}
+
+		private void Omnibar1_SuggestionChosen(Omnibar sender, OmnibarSuggestionChosenEventArgs args)
+		{
+			Omnibar1_ChosenSuggestionIndex = 0;
+			Omnibar1_SubmittedQuery = args.Mode.Text ?? string.Empty;
+		}
 	}
 }