Merge pull request #152 from zii-dmg/patch-1

Fixed FocusBehavior
AvaloniaUI · Apr 2, 2024 · b5e0c13 · b5e0c13
2 parents 4e04758 + a6d81d1
commit b5e0c13
Showing 1 changed file with 21 additions and 14 deletions.
diff --git a/src/Avalonia.Xaml.Interactions.Custom/FocusBehavior.cs b/src/Avalonia.Xaml.Interactions.Custom/FocusBehavior.cs
@@ -31,20 +31,27 @@ public bool IsFocused
     /// <param name="disposables"></param>
     protected override void OnAttached(CompositeDisposable disposables)
     {
-        base.OnAttached();
+		if (AssociatedObject is not null)
+		{
+			disposables.Add(AssociatedObject.GetObservable(Avalonia.Input.InputElement.IsFocusedProperty)
+				.Subscribe(new AnonymousObserver<bool>(
+					focused =>
+					{
+						if (!focused)
+						{
+							SetCurrentValue(IsFocusedProperty, false);
+						}
+					})));
 
-        if (AssociatedObject is not null)
-        {
-            AssociatedObject.AttachedToLogicalTree += (_, _) =>
-                disposables.Add(this.GetObservable(IsFocusedProperty)
-                    .Subscribe(new AnonymousObserver<bool>(
-                        focused =>
-                        {
-                            if (focused)
-                            {
-                                AssociatedObject.Focus();
-                            }
-                        })));
-        }
+			disposables.Add(this.GetObservable(IsFocusedProperty)
+				.Subscribe(new AnonymousObserver<bool>(
+					focused =>
+					{
+						if (focused)
+						{
+							AssociatedObject.Focus();
+						}
+					})));
+		}
     }
 }