From db444da8c085d0957dcd171ae216c75367cceead Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Tue, 20 Oct 2020 16:54:48 +0300
Subject: [PATCH 1/3] Enable light dismiss overlay for popups

---
 src/Avalonia.Controls/Primitives/VisualLayerManager.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Avalonia.Controls/Primitives/VisualLayerManager.cs b/src/Avalonia.Controls/Primitives/VisualLayerManager.cs
index d8d3450c6f..457a9ea282 100644
--- a/src/Avalonia.Controls/Primitives/VisualLayerManager.cs
+++ b/src/Avalonia.Controls/Primitives/VisualLayerManager.cs
@@ -67,8 +67,6 @@ namespace Avalonia.Controls.Primitives
         {
             get
             {
-                if (IsPopup)
-                    return null;
                 var rv = FindLayer<LightDismissOverlayLayer>();
                 if (rv == null)
                 {

From 111edb0d82cb3408d6fbfd9d3c6618f9978503ce Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Thu, 14 Jan 2021 20:34:50 -0500
Subject: [PATCH 2/3] Set OverlayInputPassThroughElement in the MenuItem to
 avoid problems with Menu and ContextMenu

---
 src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml b/src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml
index 39683b837c..4950043a99 100644
--- a/src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml
@@ -112,6 +112,7 @@
           <Popup Name="PART_Popup"
                  WindowManagerAddShadowHint="False"
                  PlacementMode="Right"
+                 OverlayInputPassThroughElement="{Binding $parent[MenuItem]}"
                  HorizontalOffset="{DynamicResource MenuFlyoutSubItemPopupHorizontalOffset}"
                  IsLightDismissEnabled="True"
                  IsOpen="{TemplateBinding IsSubMenuOpen, Mode=TwoWay}">

From 0199b5acbb38e182071f529d0b9d63825777c7d9 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Fri, 22 Jan 2021 23:36:17 -0500
Subject: [PATCH 3/3] Add OverlayInputPassThroughElement to the detault theme
 MenuItem

---
 src/Avalonia.Themes.Default/MenuItem.xaml | 1 +
 1 file changed, 1 insertion(+)

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