WIP auto focus impl

Author: 0x5bfa

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

@@ -51,8 +51,6 @@ partial void OnIsFocusedChanged(bool newValue)
 			if (CurrentSelectedMode is null || _textBox is null)
 				return;
 
-			_textBox.Focus(FocusState.Keyboard);
-
 			if (newValue)
 			{
 				VisualStateManager.GoToState(CurrentSelectedMode, "Focused", true);

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

@@ -114,8 +114,7 @@ protected void ChangeMode(OmnibarMode? oldMode, OmnibarMode newMode)
 				// Add the reposition transition to the all modes
 				mode.Transitions = [new RepositionThemeTransition()];
 				mode.UpdateLayout();
-
-				mode.OnChangingCurrentMode(false);
+				mode.IsTabStop = true;
 			}
 
 			var index = _modesHostGrid.Children.IndexOf(newMode);
@@ -145,24 +144,30 @@ protected void ChangeMode(OmnibarMode? oldMode, OmnibarMode newMode)
 			ChangeTextBoxText(newMode.Text ?? string.Empty);
 
 			VisualStateManager.GoToState(newMode, "Focused", true);
-			newMode.OnChangingCurrentMode(true);
-
-			if (IsFocused)
-			{
-				VisualStateManager.GoToState(newMode, "Focused", true);
-				VisualStateManager.GoToState(_textBox, "InputAreaVisible", true);
-			}
-			else if (newMode?.ContentOnInactive is not null)
+			newMode.IsTabStop = false;
+			if (newMode.IsAutoFocusEnabled)
 			{
-				VisualStateManager.GoToState(newMode, "CurrentUnfocused", true);
-				VisualStateManager.GoToState(_textBox, "InputAreaCollapsed", true);
+				_textBox.Focus(FocusState.Pointer);
 			}
 			else
 			{
-				VisualStateManager.GoToState(_textBox, "InputAreaVisible", true);
-			}
+				if (IsFocused)
+				{
+					VisualStateManager.GoToState(newMode, "Focused", true);
+					VisualStateManager.GoToState(_textBox, "InputAreaVisible", true);
+				}
+				else if (newMode?.ContentOnInactive is not null)
+				{
+					VisualStateManager.GoToState(newMode, "CurrentUnfocused", true);
+					VisualStateManager.GoToState(_textBox, "InputAreaCollapsed", true);
+				}
+				else
+				{
+					VisualStateManager.GoToState(_textBox, "InputAreaVisible", true);
+				}
 
-			TryToggleIsSuggestionsPopupOpen(IsFocused && newMode?.SuggestionItemsSource is not null);
+				TryToggleIsSuggestionsPopupOpen(true);
+			}
 
 			// Remove the reposition transition from the all modes
 			foreach (var mode in Modes)

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

@@ -43,6 +43,9 @@ public partial class OmnibarMode
 		[GeneratedDependencyProperty(DefaultValue = true)]
 		public partial bool UpdateTextOnSelect { get; set; }
 
+		[GeneratedDependencyProperty]
+		public partial bool IsAutoFocusEnabled { get; set; }
+
 		partial void OnTextChanged(string? newValue)
 		{
 			if (_ownerRef is null || _ownerRef.TryGetTarget(out var owner) is false)

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

@@ -78,11 +78,6 @@ public void SetOwner(Omnibar owner)
 			_ownerRef = new(owner);
 		}
 
-		public void OnChangingCurrentMode(bool isCurrentMode)
-		{
-			_modeButton.IsTabStop = !isCurrentMode;
-		}
-
 		public override string ToString()
 		{
 			return ModeName ?? string.Empty;

src/Files.App/UserControls/NavigationToolbar.xaml

@@ -324,7 +324,6 @@
 			CurrentSelectedModeName="{x:Bind ViewModel.OmnibarCurrentSelectedModeName, Mode=TwoWay}"
 			IsFocused="{x:Bind ViewModel.IsOmnibarFocused, Mode=TwoWay}"
 			QuerySubmitted="Omnibar_QuerySubmitted"
-			SuggestionChosen="Omnibar_SuggestionChosen"
 			TextChanged="Omnibar_TextChanged">
 
 			<controls:OmnibarMode
@@ -368,6 +367,7 @@
 				x:Name="OmnibarCommandPaletteMode"
 				IconOnActive="{controls:ThemedIconMarkup Style={StaticResource App.ThemedIcons.Omnibar.Commands}, IsFilled=True}"
 				IconOnInactive="{controls:ThemedIconMarkup Style={StaticResource App.ThemedIcons.Omnibar.Commands}, IconType=Outline}"
+				IsAutoFocusEnabled="True"
 				ModeName="{x:Bind Commands.OpenCommandPalette.LabelWithHotKey, Mode=OneWay}"
 				PlaceholderText="{helpers:ResourceString Name=OmnibarCommandPaletteModeTextPlaceholder}"
 				SuggestionItemsSource="{x:Bind ViewModel.OmnibarCommandPaletteModeSuggestionItems, Mode=OneWay}"

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

@@ -262,23 +262,7 @@ private async void Omnibar_QuerySubmitted(Omnibar sender, OmnibarQuerySubmittedE
 			}
 			else if (Omnibar.CurrentSelectedMode == OmnibarCommandPaletteMode)
 			{
-			}
-			else if (Omnibar.CurrentSelectedMode == OmnibarSearchMode)
-			{
-			}
-		}
-
-		private async void Omnibar_SuggestionChosen(Omnibar sender, OmnibarSuggestionChosenEventArgs args)
-		{
-			if (Omnibar.CurrentSelectedMode == OmnibarPathMode)
-			{
-				if (args.SelectedItem is OmnibarPathModeSuggestionModel item &&
-					!string.IsNullOrEmpty(item.Path))
-					await ViewModel.HandleItemNavigationAsync(item.Path);
-			}
-			else if (Omnibar.CurrentSelectedMode == OmnibarCommandPaletteMode)
-			{
-				if (args.SelectedItem is not NavigationBarSuggestionItem item || item.Text is not { } commandText)
+				if (args.Item is not NavigationBarSuggestionItem item || item.Text is not { } commandText)
 					return;
 
 				var command = Commands[commandText];
@@ -300,6 +284,9 @@ await DialogDisplayHelper.ShowDialogAsync(Strings.CommandNotExecutable.GetLocali
 
 		private async void Omnibar_TextChanged(Omnibar sender, OmnibarTextChangedEventArgs args)
 		{
+			if (args.Reason is not OmnibarTextChangeReason.UserInput)
+				return;
+
 			if (Omnibar.CurrentSelectedMode == OmnibarPathMode)
 			{
 				await ViewModel.PopulateOmnibarSuggestionsForPathMode();

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

@@ -228,29 +228,29 @@ public bool IsOmnibarFocused
 			get => _IsOmnibarFocused;
 			set
 			{
-				if (SetProperty(ref _IsOmnibarFocused, value))
+				// NOTE: Don't call ObservableObject.SetProperty() here since we don't want to change focus logic outside of the control.
+
+				_IsOmnibarFocused = value;
+
+				if (value)
 				{
-					if (value)
+					switch (OmnibarCurrentSelectedMode.Name)
 					{
-						switch (OmnibarCurrentSelectedMode.Name)
-						{
-							case OmnibarPathModeName:
-								PathText =
-									string.IsNullOrEmpty(ContentPageContext.ShellPage?.ShellViewModel?.WorkingDirectory)
-										? Constants.UserEnvironmentPaths.HomePath
-										: ContentPageContext.ShellPage.ShellViewModel.WorkingDirectory;
-								_ = PopulateOmnibarSuggestionsForPathMode();
-								break;
-							case OmnibarPaletteModeName:
-								if (OmnibarCommandPaletteModeSuggestionItems.Count is 0)
-									PopulateOmnibarSuggestionsForCommandPaletteMode();
-								break;
-							case OmnibarSearchModeName:
-								break;
-							default:
-								break;
-						}
-
+						case OmnibarPathModeName:
+							PathText =
+								string.IsNullOrEmpty(ContentPageContext.ShellPage?.ShellViewModel?.WorkingDirectory)
+									? Constants.UserEnvironmentPaths.HomePath
+									: ContentPageContext.ShellPage.ShellViewModel.WorkingDirectory;
+							_ = PopulateOmnibarSuggestionsForPathMode();
+							break;
+						case OmnibarPaletteModeName:
+							if (OmnibarCommandPaletteModeSuggestionItems.Count is 0)
+								PopulateOmnibarSuggestionsForCommandPaletteMode();
+							break;
+						case OmnibarSearchModeName:
+							break;
+						default:
+							break;
 					}
 				}
 			}