fix: #4545 update up and down button states on manual input

Author: punker76

src/Directory.packages.props

@@ -29,6 +29,7 @@
         <PackageVersion Include="System.Configuration.ConfigurationManager" Version="8.0.1" />
         <PackageVersion Include="System.Memory" Version="4.6.2" />
         <PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.1" Condition="'$(TargetFramework)' != 'net8.0-windows'" />
+        <PackageVersion Include="System.ValueTuple" Version="4.6.1" Condition="$(DefineConstants.Contains(NETCOREAPP)) == false" />
 
         <PackageVersion Include="WpfAnalyzers" Version="4.1.1" />
     </ItemGroup>

src/MahApps.Metro/Controls/NumericUpDown.cs

@@ -307,7 +307,7 @@ public static readonly DependencyProperty InterceptArrowKeysProperty
                                           new FrameworkPropertyMetadata(BooleanBoxes.TrueBox));
 
         /// <summary>
-        /// Gets or sets a value indicating whether the user can use the arrow keys <see cref="Key.Up"/> and <see cref="Key.Down"/> to change the value. 
+        /// Gets or sets a value indicating whether the user can use the arrow keys <see cref="Key.Up"/> and <see cref="Key.Down"/> to change the value.
         /// </summary>
         [Bindable(true)]
         [Category("Behavior")]
@@ -373,7 +373,7 @@ public static readonly DependencyProperty ValueProperty
                                           new FrameworkPropertyMetadata(default(double?),
                                                                         FrameworkPropertyMetadataOptions.BindsTwoWayByDefault,
                                                                         OnValuePropertyChanged,
-                                                                        (o, value) => CoerceValue(o, value).Item1));
+                                                                        (o, value) => CoerceValue(o, value).value));
 
         private static void OnValuePropertyChanged(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs e)
         {
@@ -384,12 +384,12 @@ private static void OnValuePropertyChanged(DependencyObject dependencyObject, De
         }
 
         [MustUseReturnValue]
-        private static Tuple<double?, bool> CoerceValue(DependencyObject d, object? baseValue)
+        private static (double? value, bool isValid) CoerceValue(DependencyObject d, object? baseValue)
         {
             var numericUpDown = (NumericUpDown)d;
             if (baseValue is null)
             {
-                return new Tuple<double?, bool>(numericUpDown.DefaultValue, false);
+                return (numericUpDown.DefaultValue, false);
             }
 
             var value = ((double?)baseValue).Value;
@@ -401,15 +401,15 @@ private static void OnValuePropertyChanged(DependencyObject dependencyObject, De
 
             if (value < numericUpDown.Minimum)
             {
-                return new Tuple<double?, bool>(numericUpDown.Minimum, true);
+                return (numericUpDown.Minimum, false);
             }
 
             if (value > numericUpDown.Maximum)
             {
-                return new Tuple<double?, bool>(numericUpDown.Maximum, true);
+                return (numericUpDown.Maximum, false);
             }
 
-            return new Tuple<double?, bool>(value, false);
+            return (value, true);
         }
 
         /// <summary>
@@ -757,7 +757,7 @@ public static readonly DependencyProperty ButtonUpContentStringFormatProperty
         /// <summary>
         /// Gets or sets a composite string that specifies how to format the ButtonUpContent property if it is displayed as a string.
         /// </summary>
-        /// <remarks> 
+        /// <remarks>
         /// This property is ignored if <seealso cref="ButtonUpContentTemplate"/> is set.
         /// </remarks>
         [Bindable(true)]
@@ -811,7 +811,7 @@ public static readonly DependencyProperty ButtonDownContentStringFormatProperty
         /// <summary>
         /// Gets or sets a composite string that specifies how to format the ButtonDownContent property if it is displayed as a string.
         /// </summary>
-        /// <remarks> 
+        /// <remarks>
         /// This property is ignored if <seealso cref="ButtonDownContentTemplate"/> is set.
         /// </remarks>
         [Bindable(true)]
@@ -960,7 +960,7 @@ static NumericUpDown()
             EventManager.RegisterClassHandler(typeof(NumericUpDown), GotFocusEvent, new RoutedEventHandler(OnGotFocus));
         }
 
-        /// <summary> 
+        /// <summary>
         ///     Called when this element or any below gets focus.
         /// </summary>
         private static void OnGotFocus(object sender, RoutedEventArgs e)
@@ -1171,7 +1171,8 @@ protected void OnPreviewTextInput(object sender, TextCompositionEventArgs e)
             var fullText = textBox.Text.Remove(textBox.SelectionStart, textBox.SelectionLength).Insert(textBox.CaretIndex, e.Text);
             var textIsValid = this.ValidateText(fullText, out var convertedValue);
             // Value must be valid and not coerced
-            e.Handled = !textIsValid || CoerceValue(this, convertedValue as double?).Item2;
+            var coerceValue = CoerceValue(this, convertedValue as double?);
+            e.Handled = !textIsValid || !coerceValue.isValid;
             this.manualChange = !e.Handled;
         }
 
@@ -1195,6 +1196,8 @@ protected virtual void OnValueChanged(double? oldValue, double? newValue)
                         this.valueTextBox.Text = null;
                     }
 
+                    this.EnableDisableUpDown();
+
                     if (oldValue != newValue)
                     {
                         this.RaiseEvent(new RoutedPropertyChangedEventArgs<double?>(oldValue, newValue, ValueChangedEvent));
@@ -1203,22 +1206,12 @@ protected virtual void OnValueChanged(double? oldValue, double? newValue)
                     return;
                 }
 
-                if (this.repeatUp != null && !this.repeatUp.IsEnabled)
-                {
-                    this.repeatUp.IsEnabled = true;
-                }
-
-                if (this.repeatDown != null && !this.repeatDown.IsEnabled)
-                {
-                    this.repeatDown.IsEnabled = true;
-                }
+                this.repeatUp?.SetCurrentValue(RepeatButton.IsEnabledProperty, BooleanBoxes.TrueBox);
+                this.repeatDown?.SetCurrentValue(RepeatButton.IsEnabledProperty, BooleanBoxes.TrueBox);
 
                 if (newValue <= this.Minimum)
                 {
-                    if (this.repeatDown != null)
-                    {
-                        this.repeatDown.IsEnabled = false;
-                    }
+                    this.repeatDown?.SetCurrentValue(RepeatButton.IsEnabledProperty, BooleanBoxes.FalseBox);
 
                     this.ResetInternal();
 
@@ -1230,12 +1223,10 @@ protected virtual void OnValueChanged(double? oldValue, double? newValue)
 
                 if (newValue >= this.Maximum)
                 {
-                    if (this.repeatUp != null)
-                    {
-                        this.repeatUp.IsEnabled = false;
-                    }
+                    this.repeatUp?.SetCurrentValue(RepeatButton.IsEnabledProperty, BooleanBoxes.FalseBox);
 
                     this.ResetInternal();
+
                     if (this.IsLoaded)
                     {
                         this.RaiseEvent(new RoutedEventArgs(MaximumReachedEvent));
@@ -1248,6 +1239,8 @@ protected virtual void OnValueChanged(double? oldValue, double? newValue)
                 }
             }
 
+            this.EnableDisableUpDown();
+
             if (oldValue != newValue)
             {
                 this.RaiseEvent(new RoutedPropertyChangedEventArgs<double?>(oldValue, newValue, ValueChangedEvent));
@@ -1457,29 +1450,13 @@ private void SetValueTo(double newValue)
                 value = this.Minimum;
             }
 
-            this.SetCurrentValue(ValueProperty, CoerceValue(this, value).Item1);
-        }
-
-        private void EnableDisableDown()
-        {
-            if (this.repeatDown != null)
-            {
-                this.repeatDown.IsEnabled = this.Value is null || this.Value > this.Minimum;
-            }
-        }
-
-        private void EnableDisableUp()
-        {
-            if (this.repeatUp != null)
-            {
-                this.repeatUp.IsEnabled = this.Value is null || this.Value < this.Maximum;
-            }
+            this.SetCurrentValue(ValueProperty, CoerceValue(this, value).value);
         }
 
         private void EnableDisableUpDown()
         {
-            this.EnableDisableUp();
-            this.EnableDisableDown();
+            this.repeatUp?.SetCurrentValue(RepeatButton.IsEnabledProperty, BooleanBoxes.Box(this.Value is null || this.Value < this.Maximum));
+            this.repeatDown?.SetCurrentValue(RepeatButton.IsEnabledProperty, BooleanBoxes.Box(this.Value is null || this.Value > this.Minimum));
         }
 
         private void OnTextBoxKeyDown(object sender, KeyEventArgs e)
@@ -1578,6 +1555,8 @@ private void ChangeValueFromTextInput(string text)
                 return;
             }
 
+            var oldValue = this.Value;
+
             if (string.IsNullOrEmpty(text))
             {
                 if (this.DefaultValue.HasValue)
@@ -1603,15 +1582,15 @@ private void ChangeValueFromTextInput(string text)
                 else if (this.DefaultValue.HasValue)
                 {
                     this.SetValueTo(this.DefaultValue.Value);
-                    this.InternalSetText(this.Value);
+                    this.InternalSetText(oldValue);
                 }
                 else
                 {
                     this.SetCurrentValue(ValueProperty, null);
                 }
             }
 
-            this.OnValueChanged(this.Value, this.Value);
+            this.OnValueChanged(oldValue, this.Value);
 
             this.manualChange = false;
         }

src/MahApps.Metro/MahApps.Metro.csproj

@@ -44,6 +44,7 @@
     <ItemGroup Condition="$(DefineConstants.Contains(NETCOREAPP)) == false">
         <Reference Include="System.ComponentModel.DataAnnotations" />
         <Reference Include="System.Configuration" />
+        <PackageReference Include="System.ValueTuple" />
     </ItemGroup>
 
     <!-- Items include -->