From adcbc7d95a30dec771b671c228298b032a4af632 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 24 Sep 2024 17:39:50 -0500
Subject: [PATCH] [release/8.0.1xx-sr9] [C] fix specificity comparison (#24908)

* test for #24849

* failing test

* [C] OR EQUAL !

- fixes #24849

---------

Co-authored-by: Stephane Delcroix <stephane@delcroix.org>
---
 src/Controls/src/Core/Element/Element.cs      |  2 +-
 .../AppResources/Style24849.xaml              | 26 +++++++
 .../AppResources/Style24849.xaml.cs           | 16 +++++
 .../Xaml.UnitTests/Issues/Maui24849.xaml      |  7 ++
 .../Xaml.UnitTests/Issues/Maui24849.xaml.cs   | 71 +++++++++++++++++++
 5 files changed, 121 insertions(+), 1 deletion(-)
 create mode 100644 src/Controls/tests/Xaml.UnitTests/AppResources/Style24849.xaml
 create mode 100644 src/Controls/tests/Xaml.UnitTests/AppResources/Style24849.xaml.cs
 create mode 100644 src/Controls/tests/Xaml.UnitTests/Issues/Maui24849.xaml
 create mode 100644 src/Controls/tests/Xaml.UnitTests/Issues/Maui24849.xaml.cs

diff --git a/src/Controls/src/Core/Element/Element.cs b/src/Controls/src/Core/Element/Element.cs
index 8c3c13e013af..f8a193e6c3e1 100644
--- a/src/Controls/src/Core/Element/Element.cs
+++ b/src/Controls/src/Core/Element/Element.cs
@@ -747,7 +747,7 @@ internal void OnResourcesChanged(IEnumerable<KeyValuePair<string, object>> value
 		internal override void OnSetDynamicResource(BindableProperty property, string key, SetterSpecificity specificity)
 		{
 			base.OnSetDynamicResource(property, key, specificity);
-			if (!DynamicResources.TryGetValue(property, out var existing) || existing.Item2.CompareTo(specificity) < 0)
+			if (!DynamicResources.TryGetValue(property, out var existing) || existing.Item2.CompareTo(specificity) <= 0)
 				DynamicResources[property] = (key, specificity);
 			if (this.TryGetResource(key, out var value))
 				OnResourceChanged(property, value, specificity);
diff --git a/src/Controls/tests/Xaml.UnitTests/AppResources/Style24849.xaml b/src/Controls/tests/Xaml.UnitTests/AppResources/Style24849.xaml
new file mode 100644
index 000000000000..afab77d71927
--- /dev/null
+++ b/src/Controls/tests/Xaml.UnitTests/AppResources/Style24849.xaml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ResourceDictionary xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" 
+             x:Class="Microsoft.Maui.Controls.Xaml.UnitTests.Style24849">
+    <Color x:Key="PrimaryButtonTextColor">White</Color>
+    <Color x:Key="PrimaryButtonDisabledTextColor">#3c3c3b</Color>
+    <Style TargetType="Button">                
+        <Setter Property="TextColor" Value="{DynamicResource PrimaryButtonTextColor}" />
+        <Setter Property="VisualStateManager.VisualStateGroups">
+            <VisualStateGroupList>
+                <VisualStateGroup x:Name="CommonStates">
+                    <VisualState x:Name="Normal">
+                        <VisualState.Setters>
+                            <Setter Property="TextColor" Value="{DynamicResource PrimaryButtonTextColor}" />
+                        </VisualState.Setters>
+                    </VisualState>
+                    <VisualState x:Name="Disabled">
+                        <VisualState.Setters>
+                            <Setter Property="TextColor" Value="{DynamicResource PrimaryButtonDisabledTextColor}" />
+                        </VisualState.Setters>
+                    </VisualState>
+                </VisualStateGroup>
+            </VisualStateGroupList>
+        </Setter>
+    </Style>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Controls/tests/Xaml.UnitTests/AppResources/Style24849.xaml.cs b/src/Controls/tests/Xaml.UnitTests/AppResources/Style24849.xaml.cs
new file mode 100644
index 000000000000..e2be8a4d8adc
--- /dev/null
+++ b/src/Controls/tests/Xaml.UnitTests/AppResources/Style24849.xaml.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui.Controls.Core.UnitTests;
+using NUnit.Framework;
+
+namespace Microsoft.Maui.Controls.Xaml.UnitTests
+{
+	public partial class Style24849 : ResourceDictionary
+	{
+		public Style24849()
+		{
+			InitializeComponent();
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/tests/Xaml.UnitTests/Issues/Maui24849.xaml b/src/Controls/tests/Xaml.UnitTests/Issues/Maui24849.xaml
new file mode 100644
index 000000000000..d8e47a6bf560
--- /dev/null
+++ b/src/Controls/tests/Xaml.UnitTests/Issues/Maui24849.xaml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:local="clr-namespace:Microsoft.Maui.Controls.Xaml.UnitTests"
+             x:Class="Microsoft.Maui.Controls.Xaml.UnitTests.Maui24849">
+    <Button x:Name="button"  IsEnabled="False" />
+</ContentPage>
\ No newline at end of file
diff --git a/src/Controls/tests/Xaml.UnitTests/Issues/Maui24849.xaml.cs b/src/Controls/tests/Xaml.UnitTests/Issues/Maui24849.xaml.cs
new file mode 100644
index 000000000000..3617240d5897
--- /dev/null
+++ b/src/Controls/tests/Xaml.UnitTests/Issues/Maui24849.xaml.cs
@@ -0,0 +1,71 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+using System.Linq;
+using Microsoft.Maui.ApplicationModel;
+using Microsoft.Maui.Controls.Core.UnitTests;
+using Microsoft.Maui.Controls.Shapes;
+using Microsoft.Maui.Devices;
+using Microsoft.Maui.Dispatching;
+
+using Microsoft.Maui.Graphics;
+using Microsoft.Maui.UnitTests;
+using NUnit.Framework;
+
+namespace Microsoft.Maui.Controls.Xaml.UnitTests;
+
+public partial class Maui24849 : ContentPage
+{
+    public Maui24849()
+    {
+        InitializeComponent();
+    }
+
+    public Maui24849(bool useCompiledXaml)
+    {
+        //this stub will be replaced at compile time
+    }
+
+    [TestFixture]
+    class Test
+    {
+        MockDeviceInfo mockDeviceInfo;
+
+        [SetUp]
+        public void Setup()
+        {
+            Application.SetCurrentApplication(new MockApplication());
+            DeviceInfo.SetCurrent(mockDeviceInfo = new MockDeviceInfo());
+            DispatcherProvider.SetCurrent(new DispatcherProviderStub());
+        }
+
+
+        [TearDown] public void TearDown()
+        {
+            AppInfo.SetCurrent(null);
+            DeviceInfo.SetCurrent(null);
+        }
+
+        [Test]
+        public void VSGReturnsToNormal([Values(false, true)] bool useCompiledXaml)
+        {            
+            var app = new MockApplication();
+            app.Resources.Add(new Style24849());
+            var page = new Maui24849(useCompiledXaml);       
+                         
+            app.MainPage = page;
+
+            Assert.That(page.button.IsEnabled, Is.False);
+            Assert.That(page.button.TextColor, Is.EqualTo(Color.FromHex("#3c3c3b")));
+
+            page.button.IsEnabled = true;
+            Assert.That(page.button.IsEnabled, Is.True);
+            Assert.That(page.button.TextColor, Is.EqualTo(Colors.White));
+
+            page.button.IsEnabled = false;
+            Assert.That(page.button.IsEnabled, Is.False);
+            Assert.That(page.button.TextColor, Is.EqualTo(Color.FromHex("#3c3c3b")));
+        }
+    }
+}
\ No newline at end of file