Merge pull request #5491 from AvaloniaUI/fixes/5101-contextmenu-in-popup

Fix ContextMenu positioning when a popup is right-clicked

src/Avalonia.Controls/ContextMenu.cs

@@ -269,7 +269,43 @@ namespace Avalonia.Controls
             }
 
             control ??= _attachedControls![0];
+            Open(control, PlacementTarget ?? control);
+        }
+
+        /// <summary>
+        /// Closes the menu.
+        /// </summary>
+        public override void Close()
+        {
+            if (!IsOpen)
+            {
+                return;
+            }
 
+            if (_popup != null && _popup.IsVisible)
+            {
+                _popup.IsOpen = false;
+            }
+        }
+
+        void ISetterValue.Initialize(ISetter setter)
+        {
+            // ContextMenu can be assigned to the ContextMenu property in a setter. This overrides
+            // the behavior defined in Control which requires controls to be wrapped in a <template>.
+            if (!(setter is Setter s && s.Property == ContextMenuProperty))
+            {
+                throw new InvalidOperationException(
+                    "Cannot use a control as a Setter value. Wrap the control in a <Template>.");
+            }
+        }
+
+        protected override IItemContainerGenerator CreateItemContainerGenerator()
+        {
+            return new MenuItemContainerGenerator(this);
+        }
+
+        private void Open(Control control, Control placementTarget)
+        {
             if (IsOpen)
             {
                 return;
@@ -286,7 +322,6 @@ namespace Avalonia.Controls
                     PlacementGravity = PlacementGravity,
                     PlacementMode = PlacementMode,
                     PlacementRect = PlacementRect,
-                    PlacementTarget = PlacementTarget ?? control,
                     IsLightDismissEnabled = true,
                     OverlayDismissEventPassThrough = true,
                     WindowManagerAddShadowHint = WindowManagerAddShadowHint,
@@ -302,11 +337,7 @@ namespace Avalonia.Controls
                 ((ISetLogicalParent)_popup).SetParent(control);
             }
 
-            if (PlacementTarget is null && _popup.PlacementTarget != control)
-            {
-                _popup.PlacementTarget = control;
-            }
-
+            _popup.PlacementTarget = placementTarget;
             _popup.Child = this;
             IsOpen = true;
             _popup.IsOpen = true;
@@ -318,38 +349,6 @@ namespace Avalonia.Controls
             });
         }
 
-        /// <summary>
-        /// Closes the menu.
-        /// </summary>
-        public override void Close()
-        {
-            if (!IsOpen)
-            {
-                return;
-            }
-
-            if (_popup != null && _popup.IsVisible)
-            {
-                _popup.IsOpen = false;
-            }
-        }
-
-        void ISetterValue.Initialize(ISetter setter)
-        {
-            // ContextMenu can be assigned to the ContextMenu property in a setter. This overrides
-            // the behavior defined in Control which requires controls to be wrapped in a <template>.
-            if (!(setter is Setter s && s.Property == ContextMenuProperty))
-            {
-                throw new InvalidOperationException(
-                    "Cannot use a control as a Setter value. Wrap the control in a <Template>.");
-            }
-        }
-
-        protected override IItemContainerGenerator CreateItemContainerGenerator()
-        {
-            return new MenuItemContainerGenerator(this);
-        }
-
         private void PopupOpened(object sender, EventArgs e)
         {
             _previousFocus = FocusManager.Instance?.Current;
@@ -403,7 +402,7 @@ namespace Avalonia.Controls
                 if (contextMenu.CancelOpening())
                     return;
 
-                contextMenu.Open(control);
+                contextMenu.Open(control, e.Source as Control ?? control);
                 e.Handled = true;
             }
         }