ensure focus-within is removed when focus moves to a different root.

5 years ago · d36b7a40df
1 changed files with 4 additions and 1 deletions
--- a/src/Avalonia.Input/KeyboardDevice.cs
+++ b/src/Avalonia.Input/KeyboardDevice.cs
@ -147,7 +147,10 @@ namespace Avalonia.Input
            {
                var interactive = FocusedElement as IInteractive;

-                if (FocusedElement != null && !FocusedElement.IsAttachedToVisualTree && _focusedRoot != null)
+                if (FocusedElement != null && 
+                    (!FocusedElement.IsAttachedToVisualTree ||
+                     _focusedRoot != element?.VisualRoot as IInputRoot) &&
+                    _focusedRoot != null)
                {
                    ClearChildrenFocusWithin(_focusedRoot, true);
                }