From 7d696903da912e60db1206402ffea30f934c87d3 Mon Sep 17 00:00:00 2001
From: Martin Zikmund <martin@zikmund.dev>
Date: Wed, 26 Jul 2023 11:12:27 +0200
Subject: [PATCH 1/5] fix: Ensure ThemeResource bindings are properly updated
 when style is applied

---
 src/Uno.UI/UI/Xaml/Style/Style.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Uno.UI/UI/Xaml/Style/Style.cs b/src/Uno.UI/UI/Xaml/Style/Style.cs
index b7a91cb5b436..d691f9621d99 100644
--- a/src/Uno.UI/UI/Xaml/Style/Style.cs
+++ b/src/Uno.UI/UI/Xaml/Style/Style.cs
@@ -73,7 +73,7 @@ internal void ApplyTo(DependencyObject o, DependencyPropertyValuePrecedences pre
 				return;
 			}
 
-			var localPrecedenceDisposable = DependencyObjectExtensions.OverrideLocalPrecedence(o, precedence);
+			IDisposable? localPrecedenceDisposable = DependencyObjectExtensions.OverrideLocalPrecedence(o, precedence);
 
 			EnsureSetterMap();
 
@@ -91,15 +91,17 @@ internal void ApplyTo(DependencyObject o, DependencyPropertyValuePrecedences pre
 					}
 				}
 
+				localPrecedenceDisposable?.Dispose();
+
 				// Check tree for resource binding values, since some Setters may have set ThemeResource-backed values
-				(o as IDependencyObjectStoreProvider)!.Store.UpdateResourceBindings(ResourceUpdateReason.StaticResourceLoading);
+				(o as IDependencyObjectStoreProvider)!.Store.UpdateResourceBindings(ResourceUpdateReason.ResolvedOnLoading);
 			}
 #if !HAS_EXPENSIVE_TRYFINALLY
 			finally
 #endif
 			{
-				ResourceResolver.PopScope();
 				localPrecedenceDisposable?.Dispose();
+				ResourceResolver.PopScope();
 			}
 		}
 

From e51e1207097c6e8eaafa94274826e64f0253b0a0 Mon Sep 17 00:00:00 2001
From: Martin Zikmund <martin@zikmund.dev>
Date: Wed, 26 Jul 2023 11:49:29 +0200
Subject: [PATCH 2/5] test: ThemeResource style switch

---
 .../When_ThemeResource_Style_Switch_Page.xaml | 28 +++++++++++++++++++
 ...en_ThemeResource_Style_Switch_Page.xaml.cs | 26 +++++++++++++++++
 .../Windows_UI_Xaml/Given_ThemeResource.cs    | 23 +++++++++++++++
 3 files changed, 77 insertions(+)
 create mode 100644 src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml/Controls/When_ThemeResource_Style_Switch_Page.xaml
 create mode 100644 src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml/Controls/When_ThemeResource_Style_Switch_Page.xaml.cs

diff --git a/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml/Controls/When_ThemeResource_Style_Switch_Page.xaml b/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml/Controls/When_ThemeResource_Style_Switch_Page.xaml
new file mode 100644
index 000000000000..34aae283f42d
--- /dev/null
+++ b/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml/Controls/When_ThemeResource_Style_Switch_Page.xaml
@@ -0,0 +1,28 @@
+<UserControl x:Class="Uno.UI.RuntimeTests.When_ThemeResource_Style_Switch_Page"
+			 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+			 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+			 xmlns:local="using:Uno.UI.RuntimeTests.Tests.Windows_UI_Xaml.Controls"
+			 xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+			 xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+			 mc:Ignorable="d"
+			 d:DesignHeight="300"
+			 d:DesignWidth="400">
+
+	<UserControl.Resources>
+		<Style x:Key="FirstButtonStyle" TargetType="Button">
+			<Setter Property="Background" Value="{ThemeResource ButtonBackground}" />
+		</Style>
+		<Style x:Key="SecondButtonStyle" TargetType="Button">
+			<Setter Property="Background" Value="{ThemeResource ButtonBackgroundPressed}" />
+		</Style>
+	</UserControl.Resources>
+	<StackPanel>
+		<Border>
+			<Border.Resources>
+				<SolidColorBrush x:Key="ButtonBackground" Color="Blue" />
+				<SolidColorBrush x:Key="ButtonBackgroundPressed" Color="Red" />
+			</Border.Resources>
+			<Button x:Name="TestBtn" Style="{StaticResource FirstButtonStyle}" Width="100" Height="100" />
+		</Border>
+	</StackPanel>
+</UserControl>
diff --git a/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml/Controls/When_ThemeResource_Style_Switch_Page.xaml.cs b/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml/Controls/When_ThemeResource_Style_Switch_Page.xaml.cs
new file mode 100644
index 000000000000..de26b622c6e1
--- /dev/null
+++ b/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml/Controls/When_ThemeResource_Style_Switch_Page.xaml.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+using Windows.UI.Xaml.Data;
+using Windows.UI.Xaml.Input;
+using Windows.UI.Xaml.Media;
+using Windows.UI.Xaml.Navigation;
+
+namespace Uno.UI.RuntimeTests;
+
+public sealed partial class When_ThemeResource_Style_Switch_Page : UserControl
+{
+	public When_ThemeResource_Style_Switch_Page()
+	{
+		this.InitializeComponent();
+	}
+
+	public Button TestButton => TestBtn;
+}
diff --git a/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml/Given_ThemeResource.cs b/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml/Given_ThemeResource.cs
index 8d40698555b5..be25605160b9 100644
--- a/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml/Given_ThemeResource.cs
+++ b/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml/Given_ThemeResource.cs
@@ -136,6 +136,29 @@ public async Task When_AppLevel_Resource_SplitButton_Override()
 			}
 		}
 
+		[TestMethod]
+		public async Task When_ThemeResource_Style_Switch()
+		{
+			using (StyleHelper.UseFluentStyles())
+			{
+				var SUT = new When_ThemeResource_Style_Switch_Page();
+				WindowHelper.WindowContent = SUT;
+				await WindowHelper.WaitForLoaded(SUT);
+
+				var color = ((SolidColorBrush)SUT.TestButton.Background).Color;
+
+				Assert.AreEqual(Colors.Blue, color);
+
+				SUT.TestButton.Style = (Style)SUT.Resources["SecondButtonStyle"];
+
+				await WindowHelper.WaitForIdle();
+
+				color = ((SolidColorBrush)SUT.TestButton.Background).Color;
+
+				Assert.AreEqual(Colors.Red, color);
+			}
+		}
+
 		private async Task When_DefaultForeground(Color lightThemeColor, Color darkThemeColor)
 		{
 			var run = new Run()

From 2249a3cf2644015f09506541b3f837d2f4ba7c97 Mon Sep 17 00:00:00 2001
From: Martin Zikmund <martin@zikmund.dev>
Date: Wed, 26 Jul 2023 13:31:47 +0200
Subject: [PATCH 3/5] chore: Set disposable null to avoid second dispose

---
 src/Uno.UI/UI/Xaml/Style/Style.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Uno.UI/UI/Xaml/Style/Style.cs b/src/Uno.UI/UI/Xaml/Style/Style.cs
index d691f9621d99..37d8fe864889 100644
--- a/src/Uno.UI/UI/Xaml/Style/Style.cs
+++ b/src/Uno.UI/UI/Xaml/Style/Style.cs
@@ -92,6 +92,7 @@ internal void ApplyTo(DependencyObject o, DependencyPropertyValuePrecedences pre
 				}
 
 				localPrecedenceDisposable?.Dispose();
+				localPrecedenceDisposable = null;
 
 				// Check tree for resource binding values, since some Setters may have set ThemeResource-backed values
 				(o as IDependencyObjectStoreProvider)!.Store.UpdateResourceBindings(ResourceUpdateReason.ResolvedOnLoading);

From 55ea0aea09b786dfc4f5d72c8c4c7369a677587e Mon Sep 17 00:00:00 2001
From: Martin Zikmund <martin@zikmund.dev>
Date: Wed, 26 Jul 2023 16:22:34 +0200
Subject: [PATCH 4/5] chore: Improve formatting for clarity

---
 src/Uno.UI/UI/Xaml/Style/Style.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Uno.UI/UI/Xaml/Style/Style.cs b/src/Uno.UI/UI/Xaml/Style/Style.cs
index 37d8fe864889..bf652d80ed19 100644
--- a/src/Uno.UI/UI/Xaml/Style/Style.cs
+++ b/src/Uno.UI/UI/Xaml/Style/Style.cs
@@ -73,7 +73,7 @@ internal void ApplyTo(DependencyObject o, DependencyPropertyValuePrecedences pre
 				return;
 			}
 
-			IDisposable? localPrecedenceDisposable = DependencyObjectExtensions.OverrideLocalPrecedence(o, precedence);
+			IDisposable? localPrecedenceDisposable = null;
 
 			EnsureSetterMap();
 
@@ -82,7 +82,8 @@ internal void ApplyTo(DependencyObject o, DependencyPropertyValuePrecedences pre
 #endif
 			{
 				ResourceResolver.PushNewScope(_xamlScope);
-
+				localPrecedenceDisposable = DependencyObjectExtensions.OverrideLocalPrecedence(o, precedence);
+				
 				if (_flattenedSetters != null)
 				{
 					for (var i = 0; i < _flattenedSetters.Length; i++)

From b97d8c51b4e9aeae34797c94685342b5267b4683 Mon Sep 17 00:00:00 2001
From: Martin Zikmund <martin@zikmund.dev>
Date: Thu, 27 Jul 2023 01:06:01 +0200
Subject: [PATCH 5/5] chore: Fix formatting

---
 src/Uno.UI/UI/Xaml/Style/Style.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/Uno.UI/UI/Xaml/Style/Style.cs b/src/Uno.UI/UI/Xaml/Style/Style.cs
index bf652d80ed19..6fd64e19980c 100644
--- a/src/Uno.UI/UI/Xaml/Style/Style.cs
+++ b/src/Uno.UI/UI/Xaml/Style/Style.cs
@@ -4,8 +4,6 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
-
-using Uno.Extensions;
 using Uno.Foundation.Logging;
 using Uno.UI;
 using Windows.UI.Xaml.Data;
@@ -83,7 +81,7 @@ internal void ApplyTo(DependencyObject o, DependencyPropertyValuePrecedences pre
 			{
 				ResourceResolver.PushNewScope(_xamlScope);
 				localPrecedenceDisposable = DependencyObjectExtensions.OverrideLocalPrecedence(o, precedence);
-				
+
 				if (_flattenedSetters != null)
 				{
 					for (var i = 0; i < _flattenedSetters.Length; i++)