[Windows] - Fix Visual State Issue with Picker TextColor After Naviga…

…tion (#28746)

* Fixed-VS-Picker

* Added-iOS-SnapShot

src/Controls/tests/TestCases.HostApp/Issues/Issue28536.cs

@@ -0,0 +1,99 @@
+namespace Maui.Controls.Sample.Issues;
+
+[Issue(IssueTracker.Github, 28536, "Navigation breaks VisualState styles for Picker", PlatformAffected.UWP)]
+public class Issue28536NavigationPage : TestNavigationPage
+{
+	protected override void Init()
+	{
+		Issue28536 page = new Issue28536();
+		Navigation.PushAsync(page);
+	}
+
+	class Issue28536 : TestContentPage
+	{
+		protected override void Init()
+		{
+			Style visualStatePickerStyle = new Style(typeof(Picker))
+			{
+				Setters =
+			{
+				new Setter { Property = Picker.TextColorProperty, Value = Colors.Green },
+				new Setter
+				{
+					Property = VisualStateManager.VisualStateGroupsProperty,
+					Value = new VisualStateGroupList
+					{
+						new VisualStateGroup
+						{
+							Name = "CommonStates",
+							States =
+							{
+								new VisualState { Name = "Normal" },
+								new VisualState
+								{
+									Name = "Disabled",
+									Setters =
+									{
+										new Setter { Property = Picker.TextColorProperty, Value = Colors.Red },
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+			};
+
+			Switch enabledSwitch = new Switch
+			{
+				VerticalOptions = LayoutOptions.Center,
+				WidthRequest = 20,
+				Margin = 0,
+				HorizontalOptions = LayoutOptions.Start,
+				AutomationId = "Switch"
+			};
+
+			Picker picker = new Picker
+			{
+				HorizontalOptions = LayoutOptions.Center,
+				FontSize = 24,
+				Style = visualStatePickerStyle,
+				ItemsSource = new[]
+				{
+					"Baboon", "Capuchin Monkey", "Blue Monkey", "Squirrel Monkey",
+					"Golden Lion Tamarind", "Howler Monkey", "Japanese Macaque"
+				},
+				SelectedIndex = 1,
+				AutomationId = "VisualStatePicker"
+			};
+
+			picker.SetBinding(Picker.IsEnabledProperty, new Binding("IsToggled", source: enabledSwitch));
+
+			Button navigateButton = new Button
+			{
+				Text = "Go to Next Page",
+				HorizontalOptions = LayoutOptions.Center,
+				AutomationId = "NavigateButton"
+			};
+
+			navigateButton.Clicked += (_, _) => Navigation.PushAsync(new Issue28536SecondPage());
+
+			Content = new VerticalStackLayout
+			{
+				Padding = new Thickness(30, 0),
+				Spacing = 25,
+				Children = { enabledSwitch, picker, navigateButton }
+			};
+		}
+	}
+
+	class Issue28536SecondPage : TestContentPage
+	{
+		protected override void Init()
+		{
+			Content = new Label { Text = "Next Page" };
+		}
+	}
+}
+
+

src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue28536.cs

@@ -0,0 +1,27 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace Microsoft.Maui.TestCases.Tests.Issues;
+public class Issue28536 : _IssuesUITest
+{
+	const string Switch = "Switch";
+	public override string Issue => "Navigation breaks VisualState styles for Picker";
+
+	public Issue28536(TestDevice device)
+	: base(device)
+	{ }
+
+	[Test]
+	[Category(UITestCategories.Picker)]
+	public void CheckNavigationBreaksVisualStatesForPicker()
+	{
+		App.WaitForElement("VisualStatePicker");
+		App.Tap(Switch);
+		App.Tap("NavigateButton");
+		App.WaitForElement("Next Page");
+		App.TapBackArrow();
+		App.WaitForElement(Switch).Tap();
+		VerifyScreenshot();
+	}
+}

src/Core/src/Platform/Windows/PickerExtensions.cs

@@ -51,6 +51,8 @@ public static void UpdateTextColor(this ComboBox nativeComboBox, IPicker picker)
 				nativeComboBox.Resources.SetValueForAllKey(TextColorResourceKeys, platformBrush);
 				nativeComboBox.Foreground = platformBrush;
 			}
+
+			nativeComboBox.RefreshThemeResources();
 		}
 
 		// ResourceKeys controlling the foreground color of the ComboBox.