From 9933fd04ce136e0376b78b57355556267b28493e Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Tue, 14 Feb 2023 23:47:55 -0500
Subject: [PATCH] Bind target theme variant to the popup root

---
 src/Avalonia.Controls/Primitives/Popup.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/Avalonia.Controls/Primitives/Popup.cs b/src/Avalonia.Controls/Primitives/Popup.cs
index d6cd71aedc..142db71761 100644
--- a/src/Avalonia.Controls/Primitives/Popup.cs
+++ b/src/Avalonia.Controls/Primitives/Popup.cs
@@ -387,6 +387,15 @@ namespace Avalonia.Controls.Primitives
                 popupHost.Transform = null;
             }
 
+            if (popupHost is PopupRoot topLevelPopup)
+            {
+                topLevelPopup
+                    .Bind(
+                        ThemeVariantScope.ActualThemeVariantProperty,
+                        placementTarget.GetBindingObservable(ThemeVariantScope.ActualThemeVariantProperty))
+                    .DisposeWith(handlerCleanup);
+            }
+
             UpdateHostPosition(popupHost, placementTarget);
 
             SubscribeToEventHandler<IPopupHost, EventHandler<TemplateAppliedEventArgs>>(popupHost, RootTemplateApplied,