fix: Address review

AvaloniaUI · Aug 12, 2024 · 348dce1 · 348dce1
1 parent 122b204
commit 348dce1
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/Avalonia.Controls/Button.cs b/src/Avalonia.Controls/Button.cs
@@ -290,8 +290,8 @@ protected override void OnKeyDown(KeyEventArgs e)
                     e.Handled = true;
                     break;
                 case Key.Space:
-                    // Handle Space only current focus control
-                    if (TopLevel.GetTopLevel(this)?.FocusManager?.GetFocusedElement() == this)
+                    // Avoid handling Space if the button isn't focused: a child TextBox might need it for text input
+                    if (IsFocused)
                     {
                         if (ClickMode == ClickMode.Press)
                         {
@@ -313,8 +313,8 @@ protected override void OnKeyDown(KeyEventArgs e)
         /// <inheritdoc/>
         protected override void OnKeyUp(KeyEventArgs e)
         {
-            // Handle Space only current focus control
-            if (e.Key == Key.Space && TopLevel.GetTopLevel(this)?.FocusManager?.GetFocusedElement() == this)
+            // Avoid handling Space if the button isn't focused: a child TextBox might need it for text input
+            if (e.Key == Key.Space && IsFocused)
             {
                 if (ClickMode == ClickMode.Release)
                 {