fix(ComboBox): restore keyboard reselection for v6.1.4

This commit is contained in:
chinboy
2026-08-18 18:08:38 +08:00
parent 08002681a0
commit 287c697034
4 changed files with 144 additions and 2 deletions
@@ -910,7 +910,16 @@ public class ComboBox : AvaloniaComboBox,
private void HandlePopupOpened(object? sender, EventArgs e)
{
RefreshFilteredItemVisibility();
FocusEditableTextBox(NavigationMethod.Unspecified);
if (IsEditable)
{
FocusEditableTextBox(NavigationMethod.Unspecified);
}
else if (TopLevel.GetTopLevel(this)?.FocusManager.GetFocusedElement() is Visual focusedVisual &&
_popup?.IsInsidePopup(focusedVisual) == true)
{
Focus(NavigationMethod.Unspecified);
}
}
private void HandleEditableTextBoxTextInput(TextInputEventArgs e)