Skip to content

NumberValidatorError: static class -> enum #489

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

Open
LahaLuhem wants to merge 3 commits into
base: master
Choose a base branch
from
Open

NumberValidatorError: static class -> enum #489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
372f26f
NumberValidatorError: static class -> enum
LahaLuhem Aug 5, 2025
a06c783
Treat special empty String case as null
LahaLuhem Aug 6, 2025
8b2074b
works with locale that use a comma as a separator
LahaLuhem Aug 10, 2025
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
15 changes: 10 additions & 5 deletions lib/src/validators/number_validator.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ import 'package:reactive_forms/src/validators/number_validator_error.dart';
/// ```
class NumberValidator extends Validator<dynamic> {
/// The regex expression of a numeric string value.
static final RegExp notNumbersRegex = RegExp(r'[^0-9.]');
static final RegExp notNumbersRegex = RegExp(r'[^0-9.,]');

/// The allowed number of decimal places in the validated string.
///
Expand Down Expand Up @@ -74,11 +74,11 @@ class NumberValidator extends Validator<dynamic> {
@override
Map<String, dynamic>? validate(AbstractControl<dynamic> control) {
// Skip validation if null value is allowed
if (allowNull && control.value == null) {
if (allowNull && _isControlNullOrEmptyString(control)) {
return null;
}

if (control.value == null) {
if (_isControlNullOrEmptyString(control)) {
return <String, dynamic>{
ValidationMessage.number: NumberValidatorError.nullValue,
};
Expand Down Expand Up @@ -125,10 +125,11 @@ class NumberValidator extends Validator<dynamic> {
}

bool _validateNumberDecimals(int allowedDecimals, String numberString) {
final deLocalizedNumberString = numberString.replaceAll(',', '.');
// Split the number string at the decimal point
final parts = numberString.split('.');
final parts = deLocalizedNumberString.split('.');

if (parts.length > 2 || numberString == '.' || numberString.endsWith('.')) {
if (parts.length > 2 || deLocalizedNumberString == '.' || deLocalizedNumberString.endsWith('.')) {
// More than one decimal point, invalid format
return false;
}
Expand All @@ -141,4 +142,8 @@ class NumberValidator extends Validator<dynamic> {
// Check if the decimal part length is within the allowed limit
return parts[1].length <= allowedDecimals;
}

static bool _isControlNullOrEmptyString(AbstractControl<dynamic> control) =>
control.value == null ||
(control.value is String && (control.value as String).isEmpty);
}
10 changes: 5 additions & 5 deletions lib/src/validators/number_validator_error.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
class NumberValidatorError {
static const String nullValue = 'nullValue';
static const String invalidDecimals = 'invalidDecimals';
static const String unsignedNumber = 'unsignedNumber';
static const String invalidNumber = 'invalidNumber';
enum NumberValidatorError {
nullValue,
invalidDecimals,
unsignedNumber,
invalidNumber,
}