Code Quality: Improved Omnibar 5

src/Files.App.Controls/BreadcrumbBar/BreadcrumbBar.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT License.
 
 using Microsoft.UI.Xaml.Automation;
+using Microsoft.UI.Xaml.Input;
 using Windows.Foundation;
 
 namespace Files.App.Controls
@@ -25,6 +26,8 @@ public partial class BreadcrumbBar : Control
 
 		private bool _isEllipsisRendered;
 
+		private bool _focusedViaKeyboard = false; // Used to determine if the BreadcrumbBar was focused via keyboard on Tab focus
+
 		// Properties
 
 		public int IndexAfterEllipsis
@@ -62,10 +65,18 @@ protected override void OnApplyTemplate()
 			_ellipsisBreadcrumbBarItem.SetOwner(this);
 			_itemsRepeater.Layout = _itemsRepeaterLayout;
 
+			//GettingFocus += BreadcrumbBar_GettingFocus;
+			//GettingFocus += BreadcrumbBar_GotFocus;
 			_itemsRepeater.ElementPrepared += ItemsRepeater_ElementPrepared;
+			_itemsRepeater.ElementClearing += ItemsRepeater_ElementClearing;
 			_itemsRepeater.ItemsSourceView.CollectionChanged += ItemsSourceView_CollectionChanged;
 		}
 
+		private void BreadcrumbBar_GettingFocus(UIElement sender, GettingFocusEventArgs args)
+		{
+			_focusedViaKeyboard = args.InputDevice is FocusInputDeviceKind.Keyboard;
+		}
+
 		internal protected virtual void RaiseItemClickedEvent(BreadcrumbBarItem item)
 		{
 			var index = _itemsRepeater?.GetElementIndex(item) ?? throw new ArgumentNullException($"{_itemsRepeater} is null.");
@@ -121,11 +132,19 @@ internal bool TryGetElement(int index, out BreadcrumbBarItem? item)
 
 		// Event methods
 
+		private void BreadcrumbBar_GotFocus(object sender, RoutedEventArgs e)
+		{
+			_rootBreadcrumbBarItem?.Focus(FocusState.Keyboard);
+		}
+
 		private void ItemsRepeater_ElementPrepared(ItemsRepeater sender, ItemsRepeaterElementPreparedEventArgs args)
 		{
 			if (args.Element is not BreadcrumbBarItem item || _itemsRepeater is null)
 				return;
 
+			item.IsLastItem = false;
+			item.IsEllipsis = false;
+
 			if (args.Index == _itemsRepeater.ItemsSourceView.Count - 1)
 			{
 				_lastBreadcrumbBarItem = item;
@@ -148,5 +167,14 @@ private void ItemsSourceView_CollectionChanged(object? sender, System.Collection
 				item.IsLastItem = true;
 			}
 		}
+
+		private void ItemsRepeater_ElementClearing(ItemsRepeater sender, ItemsRepeaterElementClearingEventArgs args)
+		{
+			if (args.Element is BreadcrumbBarItem item)
+			{
+				item.IsLastItem = false;
+				item.IsEllipsis = false;
+			}
+		}
 	}
 }

src/Files.App.Controls/BreadcrumbBar/BreadcrumbBar.xaml

@@ -57,7 +57,8 @@
 							Grid.Column="0"
 							Padding="{StaticResource BreadcrumbBarRootItemPadding}"
 							CornerRadius="{StaticResource BreadcrumbBarRootItemCornerRadius}"
-							ItemToolTip="{TemplateBinding RootItemToolTip}">
+							ItemToolTip="{TemplateBinding RootItemToolTip}"
+							TabIndex="0">
 							<ContentPresenter Content="{Binding RootItem, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
 						</local:BreadcrumbBarItem>
 

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

@@ -30,6 +30,11 @@ private void AutoSuggestBox_LosingFocus(UIElement sender, LosingFocusEventArgs a
 				args.TryCancel();
 				return;
 			}
+
+			if (args.InputDevice is FocusInputDeviceKind.Keyboard || args.Direction is FocusNavigationDirection.Next or FocusNavigationDirection.Previous)
+			{
+				CurrentSelectedMode?.ContentOnInactive?.Focus(FocusState.Programmatic);
+			}
 		}
 
 		private void AutoSuggestBox_GotFocus(object sender, RoutedEventArgs e)

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

@@ -124,7 +124,6 @@ protected void ChangeMode(OmnibarMode? oldMode, OmnibarMode newMode)
 				// Add the reposition transition to the all modes
 				mode.Transitions = [new RepositionThemeTransition()];
 				mode.UpdateLayout();
-				mode.IsTabStop = true;
 			}
 
 			var index = _modesHostGrid.Children.IndexOf(newMode);
@@ -154,7 +153,6 @@ protected void ChangeMode(OmnibarMode? oldMode, OmnibarMode newMode)
 			ChangeTextBoxText(newMode.Text ?? string.Empty);
 
 			VisualStateManager.GoToState(newMode, "Focused", true);
-			newMode.IsTabStop = false;
 
 			ModeChanged?.Invoke(this, new(oldMode, newMode!));
 

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

@@ -117,8 +117,8 @@
 		<Setter Property="HorizontalContentAlignment" Value="Left" />
 		<Setter Property="VerticalAlignment" Value="Stretch" />
 
-		<Setter Property="IsTabStop" Value="True" />
-		<Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
+		<!--<Setter Property="IsTabStop" Value="True" />
+		<Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />-->
 
 		<Setter Property="Template">
 			<Setter.Value>

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

@@ -7,6 +7,17 @@ namespace Files.App.Controls
 {
 	public partial class OmnibarMode
 	{
+		private void ModeButton_KeyDown(object sender, KeyRoutedEventArgs e)
+		{
+			if (_ownerRef is null || _ownerRef.TryGetTarget(out var owner) is false || owner.CurrentSelectedMode == this)
+				return;
+
+			if (e.Key is Windows.System.VirtualKey.Enter)
+			{
+				owner.CurrentSelectedMode = this;
+			}
+		}
+
 		private void ModeButton_PointerEntered(object sender, PointerRoutedEventArgs e)
 		{
 			if (_ownerRef is null || _ownerRef.TryGetTarget(out var owner) is false || owner.CurrentSelectedMode == this)

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

@@ -35,6 +35,7 @@ protected override void OnApplyTemplate()
 				?? throw new MissingFieldException($"Could not find {TemplatePartName_ModeButton} in the given {nameof(OmnibarMode)}'s style.");
 
 			Loaded += OmnibarMode_Loaded;
+			_modeButton.KeyDown += ModeButton_KeyDown;
 			_modeButton.PointerEntered += ModeButton_PointerEntered;
 			_modeButton.PointerPressed += ModeButton_PointerPressed;
 			_modeButton.PointerReleased += ModeButton_PointerReleased;

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

@@ -253,7 +253,8 @@ public bool IsOmnibarFocused
 							_ = PopulateOmnibarSuggestionsForPathMode();
 							break;
 						case OmnibarPaletteModeName:
-							PopulateOmnibarSuggestionsForCommandPaletteMode();
+							if (OmnibarCommandPaletteModeSuggestionItems.Count is 0)
+								PopulateOmnibarSuggestionsForCommandPaletteMode();
 							break;
 						case OmnibarSearchModeName:
 							break;
@@ -282,7 +283,8 @@ public string OmnibarCurrentSelectedModeName
 							_ = PopulateOmnibarSuggestionsForPathMode();
 							break;
 						case OmnibarPaletteModeName:
-							PopulateOmnibarSuggestionsForCommandPaletteMode();
+							if (OmnibarCommandPaletteModeSuggestionItems.Count is 0)
+								PopulateOmnibarSuggestionsForCommandPaletteMode();
 							break;
 						case OmnibarSearchModeName:
 							break;
@@ -1100,8 +1102,6 @@ private static async Task<bool> LaunchApplicationFromPath(string currentInput, s
 
 		public async Task PopulateOmnibarSuggestionsForPathMode()
 		{
-			PathModeSuggestionItems.Clear();
-
 			var result = await SafetyExtensions.IgnoreExceptions((Func<Task<bool>>)(async () =>
 			{
 				List<OmnibarPathModeSuggestionModel>? newSuggestions = [];