From af70f74c88163b9e0d5446163685ec9f0b748e7d Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Tue, 14 Feb 2023 23:03:11 -0500
Subject: [PATCH] Workaround for the inherited default value bug

---
 src/Avalonia.Controls/ThemeVariantScope.cs    |  3 +-
 .../Xaml/ThemeDictionariesTests.cs            | 73 ++++++++++++++++++-
 2 files changed, 73 insertions(+), 3 deletions(-)

diff --git a/src/Avalonia.Controls/ThemeVariantScope.cs b/src/Avalonia.Controls/ThemeVariantScope.cs
index ff950d3985..b29f1ee56e 100644
--- a/src/Avalonia.Controls/ThemeVariantScope.cs
+++ b/src/Avalonia.Controls/ThemeVariantScope.cs
@@ -13,8 +13,7 @@ namespace Avalonia.Controls
         public static readonly StyledProperty<ThemeVariant> ActualThemeVariantProperty =
             AvaloniaProperty.Register<ThemeVariantScope, ThemeVariant>(
                 nameof(ActualThemeVariant),
-                inherits: true,
-                defaultValue: ThemeVariant.Light);
+                inherits: true);
 
         /// <summary>
         /// Defines the <see cref="RequestedThemeVariant"/> property.
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ThemeDictionariesTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ThemeDictionariesTests.cs
index 20d76a3cc7..3ac4677694 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ThemeDictionariesTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ThemeDictionariesTests.cs
@@ -1,8 +1,12 @@
-using Avalonia.Controls;
+using System.Linq;
+using Avalonia.Controls;
+using Avalonia.Controls.Presenters;
+using Avalonia.Controls.Primitives;
 using Avalonia.Markup.Data;
 using Avalonia.Markup.Xaml.MarkupExtensions;
 using Avalonia.Media;
 using Avalonia.Styling;
+using Avalonia.UnitTests;
 using Moq;
 using Xunit;
 
@@ -444,4 +448,71 @@ public class ThemeDictionariesTests : XamlTestBase
 
         Assert.Equal(Colors.Black, ((ISolidColorBrush)border.Background)!.Color);
     }
+    
+    [Fact]
+    public void Theme_Switch_Works_In_Nested_Scope()
+    {
+        using (UnitTestApplication.Start(TestServices.StyledWindow))
+        {
+            var window = (Window)AvaloniaRuntimeXamlLoader.Load(@"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
+        RequestedThemeVariant='Dark'>
+    <ThemeVariantScope Name='Scope'>
+        <TextBlock Name='Text' />
+    </ThemeVariantScope>
+</Window>");
+            window.ApplyTemplate();
+
+            var scope = window.FindControl<ThemeVariantScope>("Scope")!;
+            var text = window.FindControl<TextBlock>("Text")!;
+
+            Assert.Equal(ThemeVariant.Dark, text.ActualThemeVariant);
+            Assert.Equal(Color.Parse("#dedede"), ((ISolidColorBrush)text.Foreground!).Color);
+            
+            scope.RequestedThemeVariant = ThemeVariant.Light;
+            Assert.Equal(ThemeVariant.Light, text.ActualThemeVariant);
+            Assert.Equal(Colors.Black, ((ISolidColorBrush)text.Foreground!).Color);
+        }
+    }
+    
+    [Fact]
+    public void Theme_Switch_Works_In_With_Popup()
+    {
+        using (UnitTestApplication.Start(TestServices.StyledWindow))
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(@"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <ThemeVariantScope Name='Scope' RequestedThemeVariant='Dark'>
+        <Popup Name='Popup'>
+            <Border Width='100' Height='100'
+                    Background='{DynamicResource ThemeBackgroundBrush}'>
+            </Border>
+        </Popup>
+    </ThemeVariantScope>
+</Window>");
+                window.Show();
+
+                var scope = window.FindControl<ThemeVariantScope>("Scope")!;
+                var popup = window.FindControl<Popup>("Popup")!;
+                
+                popup.IsOpen = true;
+
+                var border = (Border)popup.Child!;
+
+                Assert.Equal(ThemeVariant.Dark, popup.ActualThemeVariant);
+                Assert.Equal(ThemeVariant.Dark, border.ActualThemeVariant);
+                Assert.Equal(Color.Parse("#282828"), ((ISolidColorBrush)border.Background!).Color);
+                
+                scope.RequestedThemeVariant = ThemeVariant.Light;
+
+                Assert.Equal(ThemeVariant.Light, popup.ActualThemeVariant);
+                Assert.Equal(ThemeVariant.Light, border.ActualThemeVariant);
+                Assert.Equal(Colors.White, ((ISolidColorBrush)border.Background!).Color);
+            }
+        }
+    }
 }