Skip to content

Improves UpDown text input clamping behavior #4064

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Keboo merged 1 commit into from
Jun 5, 2026
+33 −2
Merged

Improves UpDown text input clamping behavior #4064

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions src/MaterialDesignThemes.Wpf/UpDownBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ private static bool TryParse(string text, IFormatProvider? formatProvider, [NotN
private static int Compare(T value1, T value2) => _arithmetic.Compare(value1, value2);
#endif

private bool _isTextChanging;

#region DependencyProperties

#region DependencyProperty : MinimumProperty
Expand Down Expand Up @@ -116,7 +118,7 @@ private static void OnNumericValueChanged(DependencyObject d, DependencyProperty
};
upDownBase.RaiseEvent(args);

if (upDownBase._textBoxField is { } textBox)
if (!upDownBase._isTextChanging && upDownBase._textBoxField is { } textBox)
{
textBox.Text = Convert.ToString(e.NewValue, CultureInfo.CurrentCulture);
}
Expand Down Expand Up @@ -196,10 +198,13 @@ public event RoutedPropertyChangedEventHandler<T> ValueChanged
public override void OnApplyTemplate()
{
if (_increaseButton != null)
{
_increaseButton.Click -= IncreaseButtonOnClick;

}
if (_decreaseButton != null)
{
_decreaseButton.Click -= DecreaseButtonOnClick;
}
if (_textBoxField != null)
{
_textBoxField.TextChanged -= OnTextBoxTextChanged;
Expand Down Expand Up @@ -243,7 +248,9 @@ private void OnTextBoxTextChanged(object sender, EventArgs e)
{
if (TryParse(textBoxField.Text, CultureInfo.CurrentCulture, out T? value))
{
_isTextChanging = true;
SetCurrentValue(ValueProperty, ClampValue(value));
_isTextChanging = false;
}
}
}
Expand Down
24 changes: 24 additions & 0 deletions tests/MaterialDesignThemes.UITests/WPF/UpDownControls/NumericUpDownTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,30 @@ public async Task NumericUpDown_WhenBindingUpdateTriggerIsPropertyChanged_ItUpda
await Assert.That(tag?.ToString()).IsEqualTo("4");
}

[Test]
[Description("Issue 4061")]
public async Task NumericUpDown_WhenMinimumIsPositiveNumber_ItAllowsTextToBeChangedWithoutClamping()
{
//Arrange
//NB: Value should be something that is not equal to the minimum
var numericUpDown = await LoadXaml<NumericUpDown>("""
<materialDesign:NumericUpDown Tag="{Binding Value, RelativeSource={RelativeSource Self}, UpdateSourceTrigger=PropertyChanged}" Maximum="150" Minimum="60" Value="70" />
""");

var textBox = await numericUpDown.GetElement<TextBox>("PART_TextBox");

//Act
await textBox.MoveKeyboardFocus();
await textBox.SendKeyboardInput($"{ModifierKeys.Control}{Key.A}{ModifierKeys.None}8");
object? firstValue = await numericUpDown.GetTag();
await textBox.SendKeyboardInput($"7");
object? secondValue = await numericUpDown.GetTag();

//Assert
await Assert.That(firstValue?.ToString()).IsEqualTo("60");
await Assert.That(secondValue?.ToString()).IsEqualTo("87");
}

[Test]
[Description("Issue 3827")]
public async Task NumericUpDown_WhenBindingUpdateTriggerIsLostFocus_ItDoesNotUpdateUntilItLoosesFocus()
Expand Down
Loading