NumberBox: Fix header foreground color not being properly updated whe…

…n NumberBox is disabled. (microsoft/microsoft-ui-xaml#3005)
Kinnara · Aug 17, 2020 · a6fab17 · a6fab17
1 parent 468801a
commit a6fab17
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 0 deletions.
diff --git a/ModernWpf.Controls/NumberBox/NumberBox.cs b/ModernWpf.Controls/NumberBox/NumberBox.cs
@@ -159,12 +159,16 @@ TextBox GetTextBox()
                 popupSpinUp.Click += OnSpinUpClick;
             }
 
+            IsEnabledChanged += OnIsEnabledChanged;
+
             // .NET rounds to 12 significant digits when displaying doubles, so we will do the same.
             //m_displayRounder.SignificantDigits(12);
 
             UpdateSpinButtonPlacement();
             UpdateSpinButtonEnabled();
 
+            UpdateVisualStateForIsEnabledChange();
+
             if (ReadLocalValue(ValueProperty) == DependencyProperty.UnsetValue
                 && ReadLocalValue(TextProperty) != DependencyProperty.UnsetValue)
             {
@@ -304,6 +308,16 @@ private void OnValidationModePropertyChanged(DependencyPropertyChangedEventArgs
             UpdateSpinButtonEnabled();
         }
 
+        private void OnIsEnabledChanged(object sender, DependencyPropertyChangedEventArgs args)
+        {
+            UpdateVisualStateForIsEnabledChange();
+        }
+
+        private void UpdateVisualStateForIsEnabledChange()
+        {
+            VisualStateManager.GoToState(this, IsEnabled ? "Normal" : "Disabled", false);
+        }
+
         private void OnNumberBoxGotFocus(object sender, RoutedEventArgs e)
         {
             // When the control receives focus, select the text

diff --git a/ModernWpf.Controls/NumberBox/NumberBox.xaml b/ModernWpf.Controls/NumberBox/NumberBox.xaml
@@ -270,6 +270,10 @@
 
                     <Grid ui:ThemeManager.HasThemeResources="True">
                         <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal" />
+                                <VisualState x:Name="Disabled" />
+                            </VisualStateGroup>
                             <VisualStateGroup x:Name="SpinButtonStates">
                                 <VisualState x:Name="SpinButtonsCollapsed" />
                                 <VisualState x:Name="SpinButtonsVisible" />

diff --git a/test/ModernWpfTestApp/ApiTests/NumberBoxTests.cs b/test/ModernWpfTestApp/ApiTests/NumberBoxTests.cs
@@ -88,6 +88,43 @@ public void VerifyNumberBoxCornerRadius()
             });
         }
 
+        [TestMethod]
+        public void VerifyIsEnabledChangeUpdatesVisualState()
+        {
+            var numberBox = SetupNumberBox();
+
+            VisualStateGroup commonStatesGroup = null;
+            RunOnUIThread.Execute(() =>
+            {
+                // Check 1: Set IsEnabled to true.
+                numberBox.IsEnabled = true;
+                Content.UpdateLayout();
+
+                var numberBoxLayoutRoot = (FrameworkElement)VisualTreeHelper.GetChild(numberBox, 0);
+                commonStatesGroup = VisualStateManager.GetVisualStateGroups(numberBoxLayoutRoot).Cast<VisualStateGroup>().First(vsg => vsg.Name.Equals("CommonStates"));
+
+                Verify.AreEqual("Normal", commonStatesGroup.CurrentState.Name);
+
+                // Check 2: Set IsEnabled to false.
+                numberBox.IsEnabled = false;
+            });
+            IdleSynchronizer.Wait();
+
+            RunOnUIThread.Execute(() =>
+            {
+                Verify.AreEqual("Disabled", commonStatesGroup.CurrentState.Name);
+
+                // Check 3: Set IsEnabled back to true.
+                numberBox.IsEnabled = true;
+            });
+            IdleSynchronizer.Wait();
+
+            RunOnUIThread.Execute(() =>
+            {
+                Verify.AreEqual("Normal", commonStatesGroup.CurrentState.Name);
+            });
+        }
+
         private NumberBox SetupNumberBox()
         {
             NumberBox numberBox = null;