Clear PopupFlyout target on flyout close

AvaloniaUI · Apr 22, 2024 · 44fa44f · 44fa44f
1 parent edb66a7
commit 44fa44f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/Avalonia.Controls/Flyouts/PopupFlyoutBase.cs b/src/Avalonia.Controls/Flyouts/PopupFlyoutBase.cs
@@ -201,6 +201,7 @@ protected virtual bool HideCore(bool canCancel = true)
             {
                 Target.DetachedFromVisualTree -= PlacementTarget_DetachedFromVisualTree;
                 Target.KeyUp -= OnPlacementTargetOrPopupKeyUp;
+                Target = null;
             }
 
             OnClosed();

diff --git a/src/Avalonia.Controls/Primitives/TextSelectorLayer.cs b/src/Avalonia.Controls/Primitives/TextSelectorLayer.cs
@@ -21,7 +21,7 @@ public class TextSelectorLayer : Canvas
             }
 
             return null;
-        }
+        } 
 
         protected override Size MeasureOverride(Size availableSize)
         {
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,7 +21,7 @@ public class TextSelectorLayer : Canvas @@
                 }
                 return null;
-            }
+            }
             protected override Size MeasureOverride(Size availableSize)
             {
@@ Expand Down @@