From 079d1d64360a2b0689628ce9cc0967f1a6c93008 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Tue, 16 Feb 2021 16:47:05 +0100
Subject: [PATCH 1/3] Turn off light dismiss for non-toplevel menus.

#5295 enabled the light dismiss overlay for popups, which in turn broke submenu interactions (#5475). The fix seems to be simple: turn off light dismiss for non-toplevel menus. These menus will be in popups so this means their behavior will be reverted to that of before #5295.

Fixes #5475
---
 src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml b/src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml
index 4950043a99..4c098afe16 100644
--- a/src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml
@@ -112,9 +112,8 @@
           <Popup Name="PART_Popup"
                  WindowManagerAddShadowHint="False"
                  PlacementMode="Right"
-                 OverlayInputPassThroughElement="{Binding $parent[MenuItem]}"
                  HorizontalOffset="{DynamicResource MenuFlyoutSubItemPopupHorizontalOffset}"
-                 IsLightDismissEnabled="True"
+                 IsLightDismissEnabled="False"
                  IsOpen="{TemplateBinding IsSubMenuOpen, Mode=TwoWay}">
             <Border Background="{DynamicResource MenuFlyoutPresenterBackground}"
                     BorderBrush="{DynamicResource MenuFlyoutPresenterBorderBrush}"

From 47250e1426df0f2943bc5483349b04c5d5265ce8 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Tue, 23 Feb 2021 16:34:34 +0100
Subject: [PATCH 2/3] Turn off light dismiss for non-toplevel menus.

For default theme.
---
 src/Avalonia.Themes.Default/MenuItem.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Themes.Default/MenuItem.xaml b/src/Avalonia.Themes.Default/MenuItem.xaml
index 9ce19cff6e..b58d2ff808 100644
--- a/src/Avalonia.Themes.Default/MenuItem.xaml
+++ b/src/Avalonia.Themes.Default/MenuItem.xaml
@@ -59,7 +59,7 @@
                   Grid.Column="4"/>
             <Popup Name="PART_Popup"
                    PlacementMode="Right"
-                   IsLightDismissEnabled="True"
+                   IsLightDismissEnabled="False"
                    OverlayInputPassThroughElement="{Binding $parent[MenuItem]}"
                    IsOpen="{TemplateBinding IsSubMenuOpen, Mode=TwoWay}">
               <Border Background="{TemplateBinding Background}"

From 1fff724478bc5cecfbd41b82903dc79f5722f350 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@users.noreply.github.com>
Date: Tue, 23 Feb 2021 21:21:44 +0100
Subject: [PATCH 3/3] Removed unneeded binding.

Co-authored-by: Max Katz <maxkatz6@outlook.com>
---
 src/Avalonia.Themes.Default/MenuItem.xaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Avalonia.Themes.Default/MenuItem.xaml b/src/Avalonia.Themes.Default/MenuItem.xaml
index b58d2ff808..4bfae4c223 100644
--- a/src/Avalonia.Themes.Default/MenuItem.xaml
+++ b/src/Avalonia.Themes.Default/MenuItem.xaml
@@ -60,7 +60,6 @@
             <Popup Name="PART_Popup"
                    PlacementMode="Right"
                    IsLightDismissEnabled="False"
-                   OverlayInputPassThroughElement="{Binding $parent[MenuItem]}"
                    IsOpen="{TemplateBinding IsSubMenuOpen, Mode=TwoWay}">
               <Border Background="{TemplateBinding Background}"
                       BorderBrush="{DynamicResource ThemeBorderMidBrush}"