Skip to content

AI Rename UI: fix highlighted item on focus #81445

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
akhera99 merged 2 commits into from
Nov 25, 2025
Merged

AI Rename UI: fix highlighted item on focus #81445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0bc1c7d
Enable highligh when item has keyboard focus
AmadeusW Nov 25, 2025
4f7e26f
Set selection on keyboard focus
AmadeusW Nov 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/EditorFeatures/Core/InlineRename/UI/SmartRename/SmartRenameUserInputComboBox.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,11 @@
<Setter TargetName="Bd" Property="BorderBrush" Value="{DynamicResource {x:Static vsui:EnvironmentColors.ComboBoxMouseOverBorderBrushKey}}" />
<Setter TargetName="Bd" Property="TextElement.Foreground" Value="{DynamicResource {x:Static vsui:EnvironmentColors.CommandBarTextHoverBrushKey}}" />
</Trigger>
<Trigger Property="IsKeyboardFocusWithin" Value="true">
<Setter TargetName="Bd" Property="Background" Value="{DynamicResource {x:Static vsui:EnvironmentColors.ComboBoxMouseOverBackgroundGradientBrushKey}}"/>
<Setter TargetName="Bd" Property="BorderBrush" Value="{DynamicResource {x:Static vsui:EnvironmentColors.ComboBoxMouseOverBorderBrushKey}}" />
<Setter TargetName="Bd" Property="TextElement.Foreground" Value="{DynamicResource {x:Static vsui:EnvironmentColors.CommandBarTextHoverBrushKey}}" />
</Trigger>
<Trigger Property="IsMouseOver" Value="true">
<Setter TargetName="Bd" Property="Background" Value="{DynamicResource {x:Static vsui:EnvironmentColors.ComboBoxMouseOverBackgroundGradientBrushKey}}"/>
<Setter TargetName="Bd" Property="BorderBrush" Value="{DynamicResource {x:Static vsui:EnvironmentColors.ComboBoxMouseOverBorderBrushKey}}" />
Expand Down
11 changes: 11 additions & 0 deletions src/EditorFeatures/Core/InlineRename/UI/SmartRename/SmartRenameUserInputComboBox.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ internal SmartRenameUserInputComboBox(RenameFlyoutViewModel viewModel)
});

_smartRenameViewModel.SuggestedNames.CollectionChanged += SuggestedNames_CollectionChanged;
AddHandler(Keyboard.GotKeyboardFocusEvent, new KeyboardFocusChangedEventHandler(OnItemGotKeyboardFocus), handledEventsToo: true);
}

public int TextSelectionStart
Expand Down Expand Up @@ -101,6 +102,16 @@ private void ComboBox_GotKeyboardFocus(object sender, KeyboardFocusChangedEventA
e.Handled = true;
}

private void OnItemGotKeyboardFocus(object sender, KeyboardFocusChangedEventArgs e)
{
// When a ComboBoxItem receives keyboard focus (e.g., via Tab navigation),
// update the ComboBox selection to match the focused item
if (e.NewFocus is ComboBoxItem comboBoxItem && comboBoxItem.DataContext != null)
{
SelectedItem = comboBoxItem.DataContext;
Copy link
Contributor

@olegtk olegtk Nov 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why is this needed?

Copy link
Member

@JoeRobich JoeRobich Nov 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems like we wouldn't want to select the item until the user hits enter or space.

Copy link
Contributor Author

@AmadeusW AmadeusW Nov 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Joey, "Seems like we wouldn't want to select the item until the user hits enter or space." is not consistent with current behavior.

Without this event handler, the highlighted item does not get previewed. Then, upon pressing Enter, it's not going to be committed (because it's not inserted into the TextBox)
{400AC562-8580-41E3-9788-821ECA0BFF14}

That's not how we currently handle up/down, where the item is selected, inserted into the TextBox, and ultimately used for rename on Enter.
{6C5EB5EE-6B5F-44FC-8C8B-A4618831BC10}

The above code makes the TAB selection behave the same way as Up/Down selection ^

Copy link
Member

@JoeRobich JoeRobich Nov 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, sounds good. Thanks @AmadeusW!

}
}

private void SuggestionsPanelScrollViewer_MouseDoubleClick(object sender, MouseEventArgs e)
{
_baseViewModel.Submit();
Expand Down
Loading