diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 00000000..11d127b9
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,53 @@
+---
+name: "\U0001F41B Bug"
+about: Something is crashing or not working as intended
+labels: bug
+
+---
+
+## Environment
+
+**Package version:**  
+
+<details>
+  <summary>Flutter doctor</summary>
+
+<!-- Paste the output of running `flutter doctor -v` below inside ``` and ``` -->
+```
+```
+
+</details>
+
+<details>
+  <summary>Code sample</summary>
+
+<!--
+      Please create a minimal reproducible sample that shows the problem
+      and attach it below between the lines with the backticks.
+
+      You can use a example code or Flutter sample app
+
+      Without this we will unlikely be able to progress on the issue, and because of that
+      we regretfully will have to close it.
+-->
+
+```dart
+```
+
+</details>
+
+## Description
+
+**Expected behavior:**
+
+**Current behavior:**
+
+## Steps to reproduce
+
+1. This
+2. Than that
+3. Then
+
+## Images <!-- if available, else delete -->  
+
+## Stacktrace/Logcat <!-- if available, else delete -->  
diff --git a/.github/ISSUE_TEMPLATE/documentation.md b/.github/ISSUE_TEMPLATE/documentation.md
new file mode 100644
index 00000000..b243d471
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/documentation.md
@@ -0,0 +1,18 @@
+---
+name: "\U0001F4C3 Documentation Bug"
+about: You want to report something that is wrong or missing from the documentation.
+labels: documentation
+
+---
+
+### Describe the change you would like to see
+<!-- A clear and concise description of the bug or documentation you feel is missing.
+For example: The Technical Reference does not include information about the FormBuilderFilterChip widget. -->
+
+### How would the suggested change make the documentation more useful?
+<!-- Provide context for how the requested change would make the docs easier to use and improve your ability to develop successful applications with this packages.
+For example: It's hard to know a method exists or understand its use when you have to search through the code base to learn about it. Properly documenting it in the Technical Reference makes it easier for me to know what the flutter_fom_builder is (and is not capable of).  -->
+
+### Additional context
+<!-- Add any other context about your feedback here. 
+For example: I am reading the docs directly from GitHub, so it's harder for me to find information on a particular method if it's not included in the documentation. -->
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 00000000..a6b3c866
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,18 @@
+---
+name: "\U0001F680 Feature request"
+about: Suggest new feature or request for this project
+labels: enhancement
+
+---
+
+## Environment
+
+**Package version:**
+
+## Description
+
+**What you'd like to happen:**
+
+**Alternatives you've considered:** <!-- if available, else delete -->  
+
+**Images:** <!-- if available, else delete -->  
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
new file mode 100644
index 00000000..0e9a57f1
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -0,0 +1,14 @@
+---
+name: "\U0001F914 Questions and Help"
+about: You have a quetion or need help using this packages
+labels: question
+
+---
+
+## Environment
+
+**Package version:**
+
+## Describe your question
+<!-- A clear and concise description of your question or help wanted.
+For example: How can I add a datetime field? -->
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0beb7c18..a731f1f8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,10 @@
 
 ## Breaking changes
 
-- Remove `onWillPop` from `ReactiveForm` and `ReactiveFormBuilder` widgets.
+- Removed deprecated `onWillPop` from `ReactiveForm` and `ReactiveFormBuilder` widgets. 
+It was replaced with the `PopScope` widget.
+- `Validators.number` allows now to define negative numbers and decimal numbers with the addition
+of two optional arguments `allowNegatives` and `allowedDecimals`.
 
 ## Features
 
diff --git a/README.md b/README.md
index 631cb8a0..b9eaa6a8 100644
--- a/README.md
+++ b/README.md
@@ -64,8 +64,8 @@ samples, guidance on mobile development, and a full API reference.
 
 ## Minimum Requirements
 
-- Dart SDK: >=3.0.0 <4.0.0
-- Flutter: >=3.10.0
+- Dart SDK: >=3.2.0 <4.0.0
+- Flutter: >=3.16.0
 
 > For using **Reactive Forms** in projects below Flutter 2.8.0 please use the version <= 10.7.0 of
 > **Reactive Forms**.
@@ -88,7 +88,7 @@ dependencies:
   flutter:
     sdk: flutter
 
-  reactive_forms: ^16.1.1
+  reactive_forms: ^17.0.0
 ```
 
 Then run the command `flutter packages get` on the console.
diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
index f852a55f..6a21e162 100644
--- a/example/android/app/build.gradle
+++ b/example/android/app/build.gradle
@@ -39,7 +39,7 @@ android {
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.example.reactive_forms_example"
-        minSdkVersion 16
+        minSdkVersion flutter.minSdkVersion
         targetSdkVersion 29
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
diff --git a/example/lib/sample_screen.dart b/example/lib/sample_screen.dart
index 8aff4871..a168e88b 100644
--- a/example/lib/sample_screen.dart
+++ b/example/lib/sample_screen.dart
@@ -5,8 +5,7 @@ class SampleScreen extends StatelessWidget {
   final Widget body;
   final Widget? title;
 
-  const SampleScreen({Key? key, required this.body, this.title})
-      : super(key: key);
+  const SampleScreen({super.key, required this.body, this.title});
 
   @override
   Widget build(BuildContext context) {
diff --git a/example/lib/samples/add_dynamic_controls_sample.dart b/example/lib/samples/add_dynamic_controls_sample.dart
index fc34097e..48ed0aea 100644
--- a/example/lib/samples/add_dynamic_controls_sample.dart
+++ b/example/lib/samples/add_dynamic_controls_sample.dart
@@ -7,8 +7,8 @@ class ViewModelProvider extends InheritedWidget {
 
   ViewModelProvider({
     required this.viewModel,
-    required Widget child,
-  }) : super(child: child);
+    required super.child,
+  });
 
   static NewContactViewModel? of(BuildContext context) =>
       context.findAncestorWidgetOfExactType<ViewModelProvider>()?.viewModel;
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
index 9dcfa6c8..850092e5 100644
--- a/example/pubspec.yaml
+++ b/example/pubspec.yaml
@@ -18,34 +18,30 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.17.0 <3.0.0"
-  flutter: ">=3.0.0"
+  sdk: ">=3.2.0 <4.0.0"
+  flutter: ">=3.16.0"
 
 dependencies:
   flutter:
     sdk: flutter
-  intl: ^0.18.0
+  intl: ^0.19.0
   reactive_forms:
     path: ../
   #reactive_forms_widgets: ^0.3.1
 
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
-  cupertino_icons: ^1.0.5
+  cupertino_icons: ^1.0.6
   #reactive_dropdown_search: ^0.9.0
   #reactive_touch_spin: ^0.6.0
   #reactive_segmented_control: ^0.4.0
   #reactive_date_time_picker: ^0.4.0
 
 dev_dependencies:
-  lints: ^2.0.0
+  flutter_lints: ^3.0.2
   flutter_test:
     sdk: flutter
 
-dependency_overrides:
-  reactive_forms:
-    path: ../
-
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec
 
diff --git a/lib/src/models/models.dart b/lib/src/models/models.dart
index 0040ea71..9d809f32 100644
--- a/lib/src/models/models.dart
+++ b/lib/src/models/models.dart
@@ -833,18 +833,12 @@ class FormControl<T> extends AbstractControl<T> {
   ///
   FormControl({
     T? value,
-    List<Validator<dynamic>> validators = const [],
-    List<AsyncValidator<dynamic>> asyncValidators = const [],
-    int asyncValidatorsDebounceTime = 250,
-    bool touched = false,
-    bool disabled = false,
-  }) : super(
-          validators: validators,
-          asyncValidators: asyncValidators,
-          asyncValidatorsDebounceTime: asyncValidatorsDebounceTime,
-          disabled: disabled,
-          touched: touched,
-        ) {
+    super.validators,
+    super.asyncValidators,
+    super.asyncValidatorsDebounceTime,
+    super.touched,
+    super.disabled,
+  }) {
     if (value != null) {
       this.value = value;
     } else {
@@ -1039,16 +1033,11 @@ class FormControl<T> extends AbstractControl<T> {
 /// that emits events each time you add or remove a control to the collection.
 abstract class FormControlCollection<T> extends AbstractControl<T> {
   FormControlCollection({
-    List<Validator<dynamic>> validators = const [],
-    List<AsyncValidator<dynamic>> asyncValidators = const [],
-    int asyncValidatorsDebounceTime = 250,
-    bool disabled = false,
-  }) : super(
-          validators: validators,
-          asyncValidators: asyncValidators,
-          asyncValidatorsDebounceTime: asyncValidatorsDebounceTime,
-          disabled: disabled,
-        );
+    super.validators,
+    super.asyncValidators,
+    super.asyncValidatorsDebounceTime,
+    super.disabled,
+  });
 
   final _collectionChanges =
       StreamController<List<AbstractControl<Object?>>>.broadcast();
@@ -1156,17 +1145,14 @@ class FormGroup extends FormControlCollection<Map<String, Object?>> {
   /// See also [AbstractControl.validators]
   FormGroup(
     Map<String, AbstractControl<dynamic>> controls, {
-    List<Validator<dynamic>> validators = const [],
-    List<AsyncValidator<dynamic>> asyncValidators = const [],
-    int asyncValidatorsDebounceTime = 250,
+    super.validators,
+    super.asyncValidators,
+    super.asyncValidatorsDebounceTime,
     bool disabled = false,
   })  : assert(
             !controls.keys.any((name) => name.contains(_controlNameDelimiter)),
             'Control name should not contain dot($_controlNameDelimiter)'),
         super(
-          validators: validators,
-          asyncValidators: asyncValidators,
-          asyncValidatorsDebounceTime: asyncValidatorsDebounceTime,
           disabled: disabled,
         ) {
     addAll(controls);
@@ -1670,14 +1656,11 @@ class FormArray<T> extends FormControlCollection<List<T?>> {
   /// See also [AbstractControl.validators]
   FormArray(
     List<AbstractControl<T>> controls, {
-    List<Validator<dynamic>> validators = const [],
-    List<AsyncValidator<dynamic>> asyncValidators = const [],
-    int asyncValidatorsDebounceTime = 250,
+    super.validators,
+    super.asyncValidators,
+    super.asyncValidatorsDebounceTime,
     bool disabled = false,
   }) : super(
-          validators: validators,
-          asyncValidators: asyncValidators,
-          asyncValidatorsDebounceTime: asyncValidatorsDebounceTime,
           disabled: disabled,
         ) {
     addAll(controls);
diff --git a/lib/src/validators/credit_card_validator.dart b/lib/src/validators/credit_card_validator.dart
index 4d6c7883..a77ef808 100644
--- a/lib/src/validators/credit_card_validator.dart
+++ b/lib/src/validators/credit_card_validator.dart
@@ -7,6 +7,8 @@ import 'package:reactive_forms/reactive_forms.dart';
 /// A credit card validator that validates that the control's value is a valid
 /// credit card.
 class CreditCardValidator extends Validator<dynamic> {
+  static final RegExp onlyNumbersRegex = RegExp(r'^[0-9]+$');
+
   const CreditCardValidator() : super();
 
   @override
@@ -18,7 +20,7 @@ class CreditCardValidator extends Validator<dynamic> {
     }
 
     final cardNumber = control.value.toString().replaceAll(' ', '');
-    final isNumber = NumberValidator.numberRegex.hasMatch(cardNumber);
+    final isNumber = onlyNumbersRegex.hasMatch(cardNumber);
 
     return isNumber &&
             cardNumber.length >= 13 &&
diff --git a/lib/src/validators/number_validator.dart b/lib/src/validators/number_validator.dart
index 0332a305..2dd322de 100644
--- a/lib/src/validators/number_validator.dart
+++ b/lib/src/validators/number_validator.dart
@@ -3,19 +3,97 @@
 // found in the LICENSE file.
 
 import 'package:reactive_forms/reactive_forms.dart';
+import 'package:reactive_forms/src/validators/number_validator_error.dart';
 
 /// Validator that validates if control's value is a numeric value.
 class NumberValidator extends Validator<dynamic> {
   /// The regex expression of a numeric string value.
-  static final RegExp numberRegex = RegExp(r'^-?[0-9]+$');
+  static final RegExp notNumbersRegex = RegExp(r'[^0-9.]');
 
-  const NumberValidator() : super();
+  /// The allowed number of decimal places in the validated string.
+  ///
+  /// This value specifies the maximum number of digits allowed after the
+  /// decimal point in the validated string. Defaults to 0 (no decimals).
+  final int allowedDecimals;
+
+  /// Whether the validator allows negative numbers.
+  ///
+  /// If set to `true`, the validator will accept strings representing
+  /// negative numbers (prefixed with a '-'). Defaults to `true`.
+  final bool allowNegatives;
+
+  /// Creates a new NumberValidator instance to validate strings representing numbers.
+  ///
+  /// [allowedDecimals] (optional): The allowed number of decimal places. Defaults to 0.
+  /// [allowNegatives] (optional): Whether to allow negative numbers. Defaults to true.
+  const NumberValidator({
+    this.allowedDecimals = 0,
+    this.allowNegatives = true,
+  }) : super();
 
   @override
   Map<String, dynamic>? validate(AbstractControl<dynamic> control) {
-    return (control.value == null) ||
-            !numberRegex.hasMatch(control.value.toString())
-        ? <String, dynamic>{ValidationMessage.number: true}
-        : null;
+    if (control.value == null) {
+      return <String, dynamic>{
+        ValidationMessage.number: NumberValidatorError.nullValue,
+      };
+    }
+
+    // Check for leading/trailing spaces
+    final numberString = control.value.toString().trim();
+
+    // Check for empty string
+    if (numberString.isEmpty) {
+      return <String, dynamic>{
+        ValidationMessage.number: NumberValidatorError.invalidNumber,
+      };
+    }
+
+    // Check for negative sign, if allowed
+    final hasNegativeSign = numberString.startsWith('-');
+    if (hasNegativeSign && !allowNegatives) {
+      return <String, dynamic>{
+        ValidationMessage.number: NumberValidatorError.unsignedNumber,
+      };
+    }
+
+    // Remove the negative sign, if present, for further validation
+    final unsignedNumberString =
+        hasNegativeSign ? numberString.substring(1) : numberString;
+
+    // Check for valid decimal positions
+    if (!_validateNumberDecimals(allowedDecimals, unsignedNumberString)) {
+      return <String, dynamic>{
+        ValidationMessage.number: NumberValidatorError.invalidDecimals,
+      };
+    }
+
+    // Check for valid numeric characters using a regular expression
+    if (unsignedNumberString.contains(notNumbersRegex)) {
+      return <String, dynamic>{
+        ValidationMessage.number: NumberValidatorError.invalidNumber,
+      };
+    }
+
+    // No errors, the control value is a valid number
+    return null;
+  }
+
+  bool _validateNumberDecimals(int allowedDecimals, String numberString) {
+    // Split the number string at the decimal point
+    final parts = numberString.split('.');
+
+    if (parts.length > 2) {
+      // More than one decimal point, invalid format
+      return false;
+    }
+
+    if (parts.length == 1) {
+      // No decimal part, validate it has 0 decimals
+      return allowedDecimals == 0;
+    }
+
+    // Check if the decimal part length is equal to the allowed decimals
+    return parts[1].length == allowedDecimals;
   }
 }
diff --git a/lib/src/validators/number_validator_error.dart b/lib/src/validators/number_validator_error.dart
new file mode 100644
index 00000000..5d75643d
--- /dev/null
+++ b/lib/src/validators/number_validator_error.dart
@@ -0,0 +1,6 @@
+class NumberValidatorError {
+  static const String nullValue = 'nullValue';
+  static const String invalidDecimals = 'invalidDecimals';
+  static const String unsignedNumber = 'unsignedNumber';
+  static const String invalidNumber = 'invalidNumber';
+}
diff --git a/lib/src/validators/validators.dart b/lib/src/validators/validators.dart
index 49a918c1..e587b4b9 100644
--- a/lib/src/validators/validators.dart
+++ b/lib/src/validators/validators.dart
@@ -7,71 +7,81 @@ import 'package:reactive_forms/reactive_forms.dart';
 /// Provides a set of built-in validators that can be used by form controls,
 /// form groups, and form arrays.
 class Validators {
-  /// Gets a validator that delegates the validation to the external [validator]
+  /// Creates a validator that delegates the validation to the external [validator]
   /// function.
   static Validator<dynamic> delegate(ValidatorFunction validator) =>
       DelegateValidator(validator);
 
-  /// Gets a validator that delegates the validation to the external
+  /// Creates a validator that delegates the validation to the external
   /// asynchronous [validator] function.
   static AsyncValidator<dynamic> delegateAsync(
           AsyncValidatorFunction validator) =>
       DelegateAsyncValidator(validator);
 
-  /// Gets a validator that requires the control have a non-empty value.
+  /// Creates a validator that requires the control have a non-empty value.
   static Validator<dynamic> get required => const RequiredValidator();
 
-  /// Gets a validator that requires the control's value be true.
+  /// Creates a validator that requires the control's value be true.
   /// This validator is commonly used for required checkboxes.
   static Validator<dynamic> get requiredTrue => const EqualsValidator<bool>(
         true,
         validationMessage: ValidationMessage.requiredTrue,
       );
 
-  /// Gets a validator that requires the control's value pass an email
+  /// Creates a validator that requires the control's value pass an email
   /// validation test.
   static Validator<dynamic> get email => const EmailValidator();
 
-  /// Gets a validator that validates if control's value is a numeric value.
-  static Validator<dynamic> get number => const NumberValidator();
+  /// Creates a validator function that checks if a control's value is a valid number.
+  ///
+  /// [allowedDecimals] (optional): The allowed number of decimal places. Defaults to 0.
+  /// [allowNegatives] (optional): Whether to allow negative numbers. Defaults to true.
+  static Validator<dynamic> number({
+    int allowedDecimals = 0,
+    bool allowNegatives = true,
+  }) =>
+      NumberValidator(
+        allowedDecimals: allowedDecimals,
+        allowNegatives: allowNegatives,
+      );
 
-  /// Gets a validator that validates if the control's value is a valid
+  /// Creates a validator that validates if the control's value is a valid
   /// credit card number.
   static Validator<dynamic> get creditCard => const CreditCardValidator();
 
-  /// Gets a validator that requires the control's value to be equals to
+  /// Creates a validator that requires the control's value to be equals to
   /// argument [value].
   ///
   /// The argument [value] must not be null.
   static Validator<dynamic> equals<T>(T value) => EqualsValidator<T>(value);
 
-  /// Gets a validator that requires the control's value to be greater than
+  /// Creates a validator that requires the control's value to be greater than
   /// or equal to [min] value.
   ///
   /// The argument [min] must not be null.
   static Validator<dynamic> min<T>(T min) => MinValidator<T>(min);
 
-  /// Gets a validator that requires the control's value to be less than
+  /// Creates a validator that requires the control's value to be less than
   /// or equal to [max] value.
   ///
   /// The argument [max] must not be null.
   static Validator<dynamic> max<T>(T max) => MaxValidator<T>(max);
 
-  /// Gets a validator that requires the length of the control's value to be
+  /// Creates a validator that requires the length of the control's value to be
   /// greater than or equal to the provided [minLength].
   ///
   /// The argument [minLength] argument must not be null.
   static Validator<dynamic> minLength(int minLength) =>
       MinLengthValidator(minLength);
 
-  /// Gets a validator that requires the length of the control's value to be
+  /// Creates a validator that requires the length of the control's value to be
   /// less than or equal to the provided [maxLength].
   ///
   /// The argument [maxLength] must not be null.
   static Validator<dynamic> maxLength(int maxLength) =>
       MaxLengthValidator(maxLength);
 
-  /// Gets a validator that requires the control's value to match a
+  /// Creates a validator that requires the control's value to match a
   /// regex [pattern].
   ///
   /// The argument [pattern] must not be null.
@@ -145,7 +155,7 @@ class Validators {
     return PatternValidator(evaluator, validationMessage: validationMessage);
   }
 
-  /// Gets a [FormGroup] validator that checks the controls [controlName] and
+  /// Creates a [FormGroup] validator that checks the controls [controlName] and
   /// [matchingControlName] have the same values.
   ///
   /// The arguments [controlName] and [matchingControlName] must not be null.
@@ -208,7 +218,7 @@ class Validators {
     return MustMatchValidator(controlName, matchingControlName, markAsDirty);
   }
 
-  /// Gets a [FormGroup] validator that compares two controls in the group.
+  /// Creates a [FormGroup] validator that compares two controls in the group.
   ///
   /// The arguments [controlName], [compareControlName] and [compareOption]
   /// must not be null.
@@ -251,7 +261,7 @@ class Validators {
     return ComposeOrValidator(validators);
   }
 
-  /// Gets a validator that requires the control's value contains all the
+  /// Creates a validator that requires the control's value contains all the
   /// values specified in [values].
   ///
   /// The argument [values] must not be null.
@@ -277,7 +287,7 @@ class Validators {
     return ContainsValidator<T>(values);
   }
 
-  /// Gets a validator that requires any element of the control's iterable value
+  /// Creates a validator that requires any element of the control's iterable value
   /// satisfies [test].
   ///
   /// Checks every element in control's value in iteration order, and marks
diff --git a/lib/src/widgets/inherited_streamer.dart b/lib/src/widgets/inherited_streamer.dart
index 7203a7e0..15f27360 100644
--- a/lib/src/widgets/inherited_streamer.dart
+++ b/lib/src/widgets/inherited_streamer.dart
@@ -7,8 +7,8 @@ import 'dart:async';
 import 'package:flutter/material.dart';
 
 abstract class InheritedStreamer<T> extends InheritedWidget {
-  const InheritedStreamer(this.stream, Widget child, {Key? key})
-      : super(key: key, child: child);
+  const InheritedStreamer(this.stream, Widget child, {super.key})
+      : super(child: child);
 
   final Stream<T> stream;
 
diff --git a/lib/src/widgets/reactive_checkbox.dart b/lib/src/widgets/reactive_checkbox.dart
index 42cc0541..b47ad73d 100644
--- a/lib/src/widgets/reactive_checkbox.dart
+++ b/lib/src/widgets/reactive_checkbox.dart
@@ -21,9 +21,9 @@ class ReactiveCheckbox extends ReactiveFocusableFormField<bool, bool> {
   /// For documentation about the various parameters, see the [Checkbox] class
   /// and the [Checkbox] constructor.
   ReactiveCheckbox({
-    Key? key,
-    String? formControlName,
-    FormControl<bool>? formControl,
+    super.key,
+    super.formControlName,
+    super.formControl,
     bool tristate = false,
     Color? activeColor,
     Color? checkColor,
@@ -36,16 +36,12 @@ class ReactiveCheckbox extends ReactiveFocusableFormField<bool, bool> {
     MaterialStateProperty<Color?>? fillColor,
     MaterialStateProperty<Color?>? overlayColor,
     double? splashRadius,
-    FocusNode? focusNode,
+    super.focusNode,
     OutlinedBorder? shape,
     BorderSide? side,
     ReactiveFormFieldCallback<bool>? onChanged,
     ShowErrorsFunction<bool>? showErrors,
   }) : super(
-          key: key,
-          formControl: formControl,
-          formControlName: formControlName,
-          focusNode: focusNode,
           showErrors: showErrors ??
               (control) =>
                   control.invalid && (control.dirty || control.touched),
diff --git a/lib/src/widgets/reactive_checkbox_list_tile.dart b/lib/src/widgets/reactive_checkbox_list_tile.dart
index 3417d22f..a350de75 100644
--- a/lib/src/widgets/reactive_checkbox_list_tile.dart
+++ b/lib/src/widgets/reactive_checkbox_list_tile.dart
@@ -21,9 +21,9 @@ class ReactiveCheckboxListTile extends ReactiveFocusableFormField<bool, bool> {
   /// For documentation about the various parameters, see the [CheckboxListTile]
   /// class and the [CheckboxListTile] constructor.
   ReactiveCheckboxListTile({
-    Key? key,
-    String? formControlName,
-    FormControl<bool>? formControl,
+    super.key,
+    super.formControlName,
+    super.formControl,
     Color? activeColor,
     Color? checkColor,
     Widget? title,
@@ -40,7 +40,7 @@ class ReactiveCheckboxListTile extends ReactiveFocusableFormField<bool, bool> {
     Color? tileColor,
     ShapeBorder? shape,
     VisualDensity? visualDensity,
-    FocusNode? focusNode,
+    super.focusNode,
     bool? enableFeedback,
     OutlinedBorder? checkboxShape,
     BorderSide? side,
@@ -54,10 +54,6 @@ class ReactiveCheckboxListTile extends ReactiveFocusableFormField<bool, bool> {
     ValueChanged<bool>? onFocusChange,
     ShowErrorsFunction<bool>? showErrors,
   }) : super(
-          key: key,
-          formControl: formControl,
-          formControlName: formControlName,
-          focusNode: focusNode,
           showErrors: showErrors ??
               (control) =>
                   control.invalid && (control.dirty || control.touched),
diff --git a/lib/src/widgets/reactive_date_picker.dart b/lib/src/widgets/reactive_date_picker.dart
index 318e090f..644cf67e 100644
--- a/lib/src/widgets/reactive_date_picker.dart
+++ b/lib/src/widgets/reactive_date_picker.dart
@@ -55,9 +55,9 @@ class ReactiveDatePicker<T> extends ReactiveFormField<T, DateTime> {
   /// For documentation about the various parameters, see the [showTimePicker]
   /// function parameters.
   ReactiveDatePicker({
-    Key? key,
-    String? formControlName,
-    FormControl<T>? formControl,
+    super.key,
+    super.formControlName,
+    super.formControl,
     required ReactiveDatePickerBuilder<T> builder,
     required DateTime firstDate,
     required DateTime lastDate,
@@ -82,9 +82,6 @@ class ReactiveDatePicker<T> extends ReactiveFormField<T, DateTime> {
     TextInputType? keyboardType,
     Offset? anchorPoint,
   }) : super(
-          key: key,
-          formControl: formControl,
-          formControlName: formControlName,
           builder: (ReactiveFormFieldState<T, DateTime> field) {
             return builder(
               field.context,
diff --git a/lib/src/widgets/reactive_dropdown_field.dart b/lib/src/widgets/reactive_dropdown_field.dart
index 353a37e7..cab9f763 100644
--- a/lib/src/widgets/reactive_dropdown_field.dart
+++ b/lib/src/widgets/reactive_dropdown_field.dart
@@ -25,13 +25,13 @@ class ReactiveDropdownField<T> extends ReactiveFocusableFormField<T, T> {
   /// For more information about all various parameters,
   /// see [DropdownButtonFormField] constructor.
   ReactiveDropdownField({
-    Key? key,
-    String? formControlName,
-    FormControl<T>? formControl,
-    FocusNode? focusNode,
+    super.key,
+    super.formControlName,
+    super.formControl,
+    super.focusNode,
     required List<DropdownMenuItem<T>> items,
-    Map<String, ValidationMessageFunction>? validationMessages,
-    ShowErrorsFunction<T>? showErrors,
+    super.validationMessages,
+    super.showErrors,
     DropdownButtonBuilder? selectedItemBuilder,
     Widget? hint,
     InputDecoration decoration = const InputDecoration(),
@@ -58,12 +58,6 @@ class ReactiveDropdownField<T> extends ReactiveFocusableFormField<T, T> {
     ReactiveFormFieldCallback<T>? onChanged,
   })  : assert(itemHeight == null || itemHeight > 0),
         super(
-          key: key,
-          formControl: formControl,
-          formControlName: formControlName,
-          validationMessages: validationMessages,
-          showErrors: showErrors,
-          focusNode: focusNode,
           builder: (ReactiveFormFieldState<T, T> field) {
             final effectiveDecoration = decoration.applyDefaults(
               Theme.of(field.context).inputDecorationTheme,
diff --git a/lib/src/widgets/reactive_form.dart b/lib/src/widgets/reactive_form.dart
index 979f3a2a..d99aeaae 100644
--- a/lib/src/widgets/reactive_form.dart
+++ b/lib/src/widgets/reactive_form.dart
@@ -20,21 +20,21 @@ class ReactiveForm extends StatelessWidget {
   final FormGroup formGroup;
 
   /// Determine whether a route can popped. See [PopScope] for more details.
-  final bool Function(FormGroup formGroup)? canPop;
+  final ReactiveFormCanPopCallback? canPop;
 
   /// A callback invoked when a route is popped. See [PopScope] for more details.
-  final void Function(FormGroup formGroup, bool didPop)? onPopInvoked;
+  final ReactiveFormPopInvokedCallback? onPopInvoked;
 
   /// Creates and instance of [ReactiveForm].
   ///
   /// The [formGroup] and [child] arguments are required.
   const ReactiveForm({
-    Key? key,
+    super.key,
     required this.formGroup,
     required this.child,
     this.canPop,
     this.onPopInvoked,
-  }) : super(key: key);
+  });
 
   /// Returns the nearest model up its widget tree.
   ///
@@ -63,13 +63,11 @@ class ReactiveForm extends StatelessWidget {
     return FormControlInheritedStreamer(
       control: formGroup,
       stream: formGroup.statusChanged,
-      child: canPop != null || onPopInvoked != null
-          ? ReactiveFormPopScope(
-              canPop: canPop,
-              onPopInvoked: onPopInvoked,
-              child: child,
-            )
-          : child,
+      child: ReactiveFormPopScope(
+        canPop: canPop,
+        onPopInvoked: onPopInvoked,
+        child: child,
+      ),
     );
   }
 }
diff --git a/lib/src/widgets/reactive_form_array.dart b/lib/src/widgets/reactive_form_array.dart
index 3f5de0b6..48f40ef8 100644
--- a/lib/src/widgets/reactive_form_array.dart
+++ b/lib/src/widgets/reactive_form_array.dart
@@ -33,16 +33,15 @@ class ReactiveFormArray<T> extends StatefulWidget {
   /// subtree does not depend on the value of the [FormArray] that is bind
   /// with this widget.
   const ReactiveFormArray({
-    Key? key,
+    super.key,
     required this.builder,
     this.formArrayName,
     this.formArray,
     this.child,
-  })  : assert(
+  }) : assert(
             (formArrayName != null && formArray == null) ||
                 (formArrayName == null && formArray != null),
-            'Must provide a formArrayName or a formArray, but not both at the same time.'),
-        super(key: key);
+            'Must provide a formArrayName or a formArray, but not both at the same time.');
 
   @override
   ReactiveFormArrayState<T> createState() => ReactiveFormArrayState<T>();
diff --git a/lib/src/widgets/reactive_form_builder.dart b/lib/src/widgets/reactive_form_builder.dart
index d1913875..03c60950 100644
--- a/lib/src/widgets/reactive_form_builder.dart
+++ b/lib/src/widgets/reactive_form_builder.dart
@@ -21,7 +21,7 @@ class ReactiveFormBuilder extends StatefulWidget {
   /// Called to create the FormGroup that will be bind to this widget.
   final ReactiveFormBuilderCreator form;
 
-  /// Determine whether a route can popped. See [PopScope] for more details.
+  /// Determine whether a route can be popped. See [PopScope] for more details.
   final bool Function(FormGroup formGroup)? canPop;
 
   /// A callback invoked when a route is popped. See [PopScope] for more details.
@@ -50,14 +50,31 @@ class ReactiveFormBuilder extends StatefulWidget {
   ///   }
   /// }
   /// ```
+  /// ### Example: Allows the route to be popped only if the form is valid.
+  /// ```dart
+  /// class MyWidget extends StatelessWidget {
+  ///   @override
+  ///   Widget build(BuildContext context) {
+  ///     return ReactiveFormBuilder(
+  ///       form: (context) => FormGroup({'name': FormControl<String>()}),
+  ///       canPop: (formGroup) => formGroup.valid
+  ///       builder: (context, form, child) {
+  ///         return ReactiveTextField(
+  ///           formControlName: 'name',
+  ///         );
+  ///       },
+  ///     );
+  ///   }
+  /// }
+  /// ```
   const ReactiveFormBuilder({
-    Key? key,
+    super.key,
     required this.form,
     required this.builder,
     this.canPop,
     this.onPopInvoked,
     this.child,
-  }) : super(key: key);
+  });
 
   @override
   ReactiveFormBuilderState createState() => ReactiveFormBuilderState();
diff --git a/lib/src/widgets/reactive_form_config.dart b/lib/src/widgets/reactive_form_config.dart
index f90ea389..fc4028fa 100644
--- a/lib/src/widgets/reactive_form_config.dart
+++ b/lib/src/widgets/reactive_form_config.dart
@@ -33,10 +33,10 @@ class ReactiveFormConfig extends InheritedWidget {
   /// );
   /// ```
   const ReactiveFormConfig({
-    required Widget child,
+    required super.child,
     required this.validationMessages,
-    Key? key,
-  }) : super(child: child, key: key);
+    super.key,
+  });
 
   @override
   bool updateShouldNotify(covariant ReactiveFormConfig oldWidget) {
diff --git a/lib/src/widgets/reactive_form_consumer.dart b/lib/src/widgets/reactive_form_consumer.dart
index e0e51309..f9159968 100644
--- a/lib/src/widgets/reactive_form_consumer.dart
+++ b/lib/src/widgets/reactive_form_consumer.dart
@@ -36,10 +36,10 @@ class ReactiveFormConsumer extends StatelessWidget {
   /// subtree does not depend on the value of the [FormGroup] that is bind
   /// with this widget.
   const ReactiveFormConsumer({
-    Key? key,
+    super.key,
     required this.builder,
     this.child,
-  }) : super(key: key);
+  });
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/src/widgets/reactive_form_field.dart b/lib/src/widgets/reactive_form_field.dart
index 8a0db6f1..35b7366a 100644
--- a/lib/src/widgets/reactive_form_field.dart
+++ b/lib/src/widgets/reactive_form_field.dart
@@ -61,7 +61,7 @@ class ReactiveFormField<ModelDataType, ViewDataType> extends StatefulWidget {
   ///
   /// The [builder] arguments are required.
   ReactiveFormField({
-    Key? key,
+    super.key,
     this.formControl,
     this.formControlName,
     this.valueAccessor,
@@ -73,8 +73,7 @@ class ReactiveFormField<ModelDataType, ViewDataType> extends StatefulWidget {
             (formControlName != null && formControl == null) ||
                 (formControlName == null && formControl != null),
             'Must provide a formControlName or a formControl, but not both at the same time.'),
-        _builder = builder,
-        super(key: key);
+        _builder = builder;
 
   @override
   ReactiveFormFieldState<ModelDataType, ViewDataType> createState() =>
diff --git a/lib/src/widgets/reactive_form_pop_scope.dart b/lib/src/widgets/reactive_form_pop_scope.dart
index 51f9b1c4..932f6171 100644
--- a/lib/src/widgets/reactive_form_pop_scope.dart
+++ b/lib/src/widgets/reactive_form_pop_scope.dart
@@ -1,11 +1,29 @@
+// Copyright 2020 Joan Pablo Jimenez Milian. All rights reserved.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
 import 'package:flutter/material.dart';
 import 'package:reactive_forms/reactive_forms.dart';
 
+/// This is the signature to determine whether a route can popped.
+/// See [PopScope] for more details.
+typedef ReactiveFormCanPopCallback = bool Function(FormGroup formGroup);
+
+/// This is the signature of the callback invoked when a route is popped.
+/// See [PopScope] for more details.
+typedef ReactiveFormPopInvokedCallback = void Function(
+    FormGroup formGroup, bool didPop);
+
 class ReactiveFormPopScope extends StatelessWidget {
-  final bool Function(FormGroup formGroup)? canPop;
-  final void Function(FormGroup formGroup, bool didPop)? onPopInvoked;
+  /// The widget below this widget in the tree.
   final Widget child;
 
+  /// Determine whether a route can popped. See [PopScope] for more details.
+  final ReactiveFormCanPopCallback? canPop;
+
+  /// A callback invoked when a route is popped. See [PopScope] for more details.
+  final ReactiveFormPopInvokedCallback? onPopInvoked;
+
   const ReactiveFormPopScope({
     super.key,
     this.canPop,
@@ -15,10 +33,14 @@ class ReactiveFormPopScope extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    if (canPop == null && onPopInvoked == null) {
+      return child;
+    }
+
     return ReactiveFormConsumer(
       builder: (context, formGroup, _) {
         return PopScope(
-          canPop: canPop != null ? canPop!(formGroup) : true,
+          canPop: canPop?.call(formGroup) ?? true,
           onPopInvoked: onPopInvoked != null
               ? (didPop) => onPopInvoked!(formGroup, didPop)
               : null,
diff --git a/lib/src/widgets/reactive_radio.dart b/lib/src/widgets/reactive_radio.dart
index 38bb7e0c..7afdbd9a 100644
--- a/lib/src/widgets/reactive_radio.dart
+++ b/lib/src/widgets/reactive_radio.dart
@@ -29,9 +29,9 @@ class ReactiveRadio<T> extends ReactiveFocusableFormField<T, T> {
   /// For documentation about the various parameters, see the [Radio] class
   /// and [Radio], the constructor.
   ReactiveRadio({
-    Key? key,
-    String? formControlName,
-    FormControl<T>? formControl,
+    super.key,
+    super.formControlName,
+    super.formControl,
     required T value,
     Color? activeColor,
     Color? focusColor,
@@ -44,13 +44,9 @@ class ReactiveRadio<T> extends ReactiveFocusableFormField<T, T> {
     double? splashRadius,
     bool autofocus = false,
     bool toggleable = false,
-    FocusNode? focusNode,
+    super.focusNode,
     ReactiveFormFieldCallback<T>? onChanged,
   }) : super(
-          key: key,
-          formControl: formControl,
-          formControlName: formControlName,
-          focusNode: focusNode,
           builder: (field) {
             return Radio<T>(
               value: value,
diff --git a/lib/src/widgets/reactive_radio_list_tile.dart b/lib/src/widgets/reactive_radio_list_tile.dart
index 35603d21..f21f9611 100644
--- a/lib/src/widgets/reactive_radio_list_tile.dart
+++ b/lib/src/widgets/reactive_radio_list_tile.dart
@@ -26,9 +26,9 @@ class ReactiveRadioListTile<T> extends ReactiveFocusableFormField<T, T> {
   ///
   /// See also [RadioListTile]
   ReactiveRadioListTile({
-    Key? key,
-    String? formControlName,
-    FormControl<T>? formControl,
+    super.key,
+    super.formControlName,
+    super.formControl,
     required T value,
     Color? activeColor,
     Color? selectedTileColor,
@@ -45,7 +45,7 @@ class ReactiveRadioListTile<T> extends ReactiveFocusableFormField<T, T> {
     bool autofocus = false,
     bool selected = false,
     VisualDensity? visualDensity,
-    FocusNode? focusNode,
+    super.focusNode,
     bool? enableFeedback,
     ReactiveFormFieldCallback<T>? onChanged,
     MouseCursor? mouseCursor,
@@ -56,10 +56,6 @@ class ReactiveRadioListTile<T> extends ReactiveFocusableFormField<T, T> {
     MaterialTapTargetSize? materialTapTargetSize,
     ValueChanged<bool>? onFocusChange,
   }) : super(
-          key: key,
-          formControl: formControl,
-          formControlName: formControlName,
-          focusNode: focusNode,
           builder: (field) {
             return RadioListTile<T>(
               value: value,
diff --git a/lib/src/widgets/reactive_slider.dart b/lib/src/widgets/reactive_slider.dart
index f5d413ef..d7ff9504 100644
--- a/lib/src/widgets/reactive_slider.dart
+++ b/lib/src/widgets/reactive_slider.dart
@@ -31,9 +31,9 @@ class ReactiveSlider extends ReactiveFocusableFormField<num, double> {
   /// The [labelBuilder] is called each time the [FormControl] changes its value
   /// so you can supply a label to the Slider.
   ReactiveSlider(
-      {Key? key,
-      String? formControlName,
-      FormControl<num>? formControl,
+      {super.key,
+      super.formControlName,
+      super.formControl,
       double min = 0.0,
       double max = 1.0,
       int? divisions,
@@ -44,7 +44,7 @@ class ReactiveSlider extends ReactiveFocusableFormField<num, double> {
       SemanticFormatterCallback? semanticFormatterCallback,
       bool autofocus = false,
       MouseCursor? mouseCursor,
-      FocusNode? focusNode,
+      super.focusNode,
       ReactiveFormFieldCallback<num>? onChangeEnd,
       ReactiveFormFieldCallback<num>? onChangeStart,
       ReactiveFormFieldCallback<num>? onChanged,
@@ -52,10 +52,6 @@ class ReactiveSlider extends ReactiveFocusableFormField<num, double> {
       Color? secondaryActiveColor,
       MaterialStateProperty<Color?>? overlayColor})
       : super(
-          key: key,
-          formControl: formControl,
-          formControlName: formControlName,
-          focusNode: focusNode,
           builder: (field) {
             var value = field.value;
             if (value == null) {
diff --git a/lib/src/widgets/reactive_status_listenable_builder.dart b/lib/src/widgets/reactive_status_listenable_builder.dart
index 540305da..1268d2e1 100644
--- a/lib/src/widgets/reactive_status_listenable_builder.dart
+++ b/lib/src/widgets/reactive_status_listenable_builder.dart
@@ -32,16 +32,15 @@ class ReactiveStatusListenableBuilder extends StatelessWidget {
   /// at the same time.
   ///
   const ReactiveStatusListenableBuilder({
-    Key? key,
+    super.key,
     this.formControlName,
     this.formControl,
     required this.builder,
     this.child,
-  })  : assert(
+  }) : assert(
             (formControlName != null && formControl == null) ||
                 (formControlName == null && formControl != null),
-            'Must provide a formControlName or a formControl, but not both at the same time.'),
-        super(key: key);
+            'Must provide a formControlName or a formControl, but not both at the same time.');
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/src/widgets/reactive_switch.dart b/lib/src/widgets/reactive_switch.dart
index a9d69863..92028b9d 100644
--- a/lib/src/widgets/reactive_switch.dart
+++ b/lib/src/widgets/reactive_switch.dart
@@ -33,10 +33,10 @@ class ReactiveSwitch extends ReactiveFocusableFormField<bool, bool> {
   /// For documentation about the various parameters, see the [Switch] class
   /// and [Switch], the constructor.
   ReactiveSwitch({
-    Key? key,
-    String? formControlName,
-    FormControl<bool>? formControl,
-    FocusNode? focusNode,
+    super.key,
+    super.formControlName,
+    super.formControl,
+    super.focusNode,
     Color? activeColor,
     Color? activeTrackColor,
     Color? inactiveThumbColor,
@@ -60,10 +60,6 @@ class ReactiveSwitch extends ReactiveFocusableFormField<bool, bool> {
     MaterialStateProperty<Icon?>? thumbIcon,
     ValueChanged<bool>? onFocusChange,
   }) : super(
-          key: key,
-          formControl: formControl,
-          formControlName: formControlName,
-          focusNode: focusNode,
           builder: (field) {
             return Switch(
               value: field.value ?? false,
@@ -120,10 +116,10 @@ class ReactiveSwitch extends ReactiveFocusableFormField<bool, bool> {
   /// For documentation about the various parameters, see the [Switch.adaptive]
   /// constructor.
   ReactiveSwitch.adaptive({
-    Key? key,
-    String? formControlName,
-    FormControl<bool>? formControl,
-    FocusNode? focusNode,
+    super.key,
+    super.formControlName,
+    super.formControl,
+    super.focusNode,
     Color? activeColor,
     Color? activeTrackColor,
     Color? inactiveThumbColor,
@@ -144,10 +140,6 @@ class ReactiveSwitch extends ReactiveFocusableFormField<bool, bool> {
     double? splashRadius,
     ReactiveFormFieldCallback<bool>? onChanged,
   }) : super(
-          key: key,
-          formControl: formControl,
-          formControlName: formControlName,
-          focusNode: focusNode,
           builder: (field) {
             return Switch.adaptive(
               value: field.value ?? false,
diff --git a/lib/src/widgets/reactive_switch_list_tile.dart b/lib/src/widgets/reactive_switch_list_tile.dart
index fd230ce3..66c970fe 100644
--- a/lib/src/widgets/reactive_switch_list_tile.dart
+++ b/lib/src/widgets/reactive_switch_list_tile.dart
@@ -26,9 +26,9 @@ class ReactiveSwitchListTile extends ReactiveFocusableFormField<bool, bool> {
   ///
   /// See also [CheckboxListTile]
   ReactiveSwitchListTile({
-    Key? key,
-    String? formControlName,
-    FormControl<bool>? formControl,
+    super.key,
+    super.formControlName,
+    super.formControl,
     Color? tileColor,
     Color? activeColor,
     Color? activeTrackColor,
@@ -50,7 +50,7 @@ class ReactiveSwitchListTile extends ReactiveFocusableFormField<bool, bool> {
     Color? selectedTileColor,
     VisualDensity? visualDensity,
     bool? enableFeedback,
-    FocusNode? focusNode,
+    super.focusNode,
     ReactiveFormFieldCallback<bool>? onChanged,
     ImageErrorListener? onActiveThumbImageError,
     ImageErrorListener? onInactiveThumbImageError,
@@ -65,10 +65,6 @@ class ReactiveSwitchListTile extends ReactiveFocusableFormField<bool, bool> {
     double? splashRadius,
     ValueChanged<bool>? onFocusChange,
   }) : super(
-          key: key,
-          formControl: formControl,
-          formControlName: formControlName,
-          focusNode: focusNode,
           builder: (field) {
             return SwitchListTile(
               value: field.value ?? false,
@@ -132,9 +128,9 @@ class ReactiveSwitchListTile extends ReactiveFocusableFormField<bool, bool> {
   /// For documentation about the various parameters, see the
   /// [SwitchListTile.adaptive] constructor.
   ReactiveSwitchListTile.adaptative({
-    Key? key,
-    String? formControlName,
-    FormControl<bool>? formControl,
+    super.key,
+    super.formControlName,
+    super.formControl,
     Color? activeColor,
     Color? activeTrackColor,
     Color? inactiveThumbColor,
@@ -158,7 +154,7 @@ class ReactiveSwitchListTile extends ReactiveFocusableFormField<bool, bool> {
     ListTileControlAffinity controlAffinity = ListTileControlAffinity.platform,
     bool? dense,
     bool? enableFeedback,
-    FocusNode? focusNode,
+    super.focusNode,
     ValueChanged<bool>? onFocusChange,
     Color? hoverColor,
     bool isThreeLine = false,
@@ -172,10 +168,6 @@ class ReactiveSwitchListTile extends ReactiveFocusableFormField<bool, bool> {
     VisualDensity? visualDensity,
     ReactiveFormFieldCallback<bool>? onChanged,
   }) : super(
-          key: key,
-          formControl: formControl,
-          formControlName: formControlName,
-          focusNode: focusNode,
           builder: (field) {
             return SwitchListTile.adaptive(
               value: field.value ?? false,
diff --git a/lib/src/widgets/reactive_text_field.dart b/lib/src/widgets/reactive_text_field.dart
index 72e4ec5c..40cda1bf 100644
--- a/lib/src/widgets/reactive_text_field.dart
+++ b/lib/src/widgets/reactive_text_field.dart
@@ -90,13 +90,13 @@ class ReactiveTextField<T> extends ReactiveFormField<T, String> {
   /// For documentation about the various parameters, see the [TextField] class
   /// and [TextField], the constructor.
   ReactiveTextField({
-    Key? key,
-    String? formControlName,
-    FormControl<T>? formControl,
-    Map<String, ValidationMessageFunction>? validationMessages,
-    ControlValueAccessor<T, String>? valueAccessor,
-    ShowErrorsFunction<T>? showErrors,
-    FocusNode? focusNode,
+    super.key,
+    super.formControlName,
+    super.formControl,
+    super.validationMessages,
+    super.valueAccessor,
+    super.showErrors,
+    super.focusNode,
     InputDecoration decoration = const InputDecoration(),
     TextInputType? keyboardType,
     TextCapitalization textCapitalization = TextCapitalization.none,
@@ -158,13 +158,6 @@ class ReactiveTextField<T> extends ReactiveFormField<T, String> {
     TextMagnifierConfiguration? magnifierConfiguration,
   })  : _textController = controller,
         super(
-          key: key,
-          formControl: formControl,
-          formControlName: formControlName,
-          valueAccessor: valueAccessor,
-          validationMessages: validationMessages,
-          showErrors: showErrors,
-          focusNode: focusNode,
           builder: (ReactiveFormFieldState<T, String> field) {
             final state = field as _ReactiveTextFieldState<T>;
             final effectiveDecoration = decoration
@@ -302,9 +295,10 @@ class _ReactiveTextFieldState<T>
 
   @override
   void dispose() {
-    if (widget.textController == null) {
+    final currentWidget = widget as ReactiveTextField<T>;
+    if (currentWidget._textController == null) {
       _textController.dispose();
-    }    
+    }
     super.dispose();
   }
 }
diff --git a/lib/src/widgets/reactive_time_picker.dart b/lib/src/widgets/reactive_time_picker.dart
index 22a25d5d..501bf975 100644
--- a/lib/src/widgets/reactive_time_picker.dart
+++ b/lib/src/widgets/reactive_time_picker.dart
@@ -60,9 +60,9 @@ class ReactiveTimePicker extends ReactiveFormField<TimeOfDay, TimeOfDay> {
   /// For documentation about the various parameters, see the [showTimePicker]
   /// function parameters.
   ReactiveTimePicker({
-    Key? key,
-    String? formControlName,
-    FormControl<TimeOfDay>? formControl,
+    super.key,
+    super.formControlName,
+    super.formControl,
     required ReactiveTimePickerBuilder builder,
     TransitionBuilder? transitionBuilder,
     bool useRootNavigator = true,
@@ -78,9 +78,6 @@ class ReactiveTimePicker extends ReactiveFormField<TimeOfDay, TimeOfDay> {
     EntryModeChangeCallback? onEntryModeChanged,
     Offset? anchorPoint,
   }) : super(
-          key: key,
-          formControl: formControl,
-          formControlName: formControlName,
           builder: (ReactiveFormFieldState<TimeOfDay, TimeOfDay> field) {
             return builder(
               field.context,
diff --git a/lib/src/widgets/reactive_value_listenable_builder.dart b/lib/src/widgets/reactive_value_listenable_builder.dart
index 09a19aeb..af355f40 100644
--- a/lib/src/widgets/reactive_value_listenable_builder.dart
+++ b/lib/src/widgets/reactive_value_listenable_builder.dart
@@ -38,16 +38,15 @@ class ReactiveValueListenableBuilder<T> extends StatelessWidget {
   /// subtree does not depend on the value of the [FormControl] that is bind
   /// with this widget.
   const ReactiveValueListenableBuilder({
-    Key? key,
+    super.key,
     required this.builder,
     this.formControlName,
     this.formControl,
     this.child,
-  })  : assert(
+  }) : assert(
             (formControlName != null && formControl == null) ||
                 (formControlName == null && formControl != null),
-            'Must provide a formControlName or a formControl, but not both at the same time.'),
-        super(key: key);
+            'Must provide a formControlName or a formControl, but not both at the same time.');
 
   @override
   Widget build(BuildContext context) {
diff --git a/pubspec.yaml b/pubspec.yaml
index 550638e7..61eef461 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -4,17 +4,16 @@ version: 17.0.0
 homepage: "https://github.com/joanpablo/reactive_forms"
 
 environment:
-  sdk: ">=3.0.0 <4.0.0"
-  flutter: ">=3.10.0"
+  sdk: ">=3.2.0 <4.0.0"
+  flutter: ">=3.16.0"
 
 dependencies:
   flutter:
     sdk: flutter
-  # when using flutter 3.10, flutter_localizations depends on intl 0.18.0
-  intl: ">=0.18.0 <1.0.0"
+  intl: ">=0.19.0 <1.0.0"
 
 dev_dependencies:
-  lints: ^2.1.0
+  flutter_lints: ^3.0.2
   flutter_test:
     sdk: flutter
 
diff --git a/test/src/validators/compose_validators_test.dart b/test/src/validators/compose_validators_test.dart
index 77ae2544..0d4c3bd8 100644
--- a/test/src/validators/compose_validators_test.dart
+++ b/test/src/validators/compose_validators_test.dart
@@ -114,7 +114,7 @@ void main() {
               Validators.compose([
                 Validators.minLength(10),
                 Validators.maxLength(10),
-                Validators.number,
+                Validators.number(),
               ]),
             ]),
           ],
diff --git a/test/src/validators/number_validator_test.dart b/test/src/validators/number_validator_test.dart
index f6999156..d6354ddd 100644
--- a/test/src/validators/number_validator_test.dart
+++ b/test/src/validators/number_validator_test.dart
@@ -1,10 +1,11 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:reactive_forms/reactive_forms.dart';
+import 'package:reactive_forms/src/validators/number_validator_error.dart';
 
 void main() {
   group('Number Validator Tests', () {
     test('FormControl invalid if not a number', () {
-      final control = FormControl<String>(validators: [Validators.number]);
+      final control = FormControl<String>(validators: [Validators.number()]);
 
       control.value = 'hello';
 
@@ -13,11 +14,57 @@ void main() {
     });
 
     test('FormControl valid if a number', () {
-      final control = FormControl<String>(validators: [Validators.number]);
+      final control = FormControl<String>(validators: [Validators.number()]);
 
       control.value = '10';
 
       expect(control.valid, true);
     });
+
+    test('FormControl negative number', () {
+      final control = FormControl<String>(validators: [Validators.number()]);
+
+      control.value = '-10';
+
+      expect(control.valid, true);
+    });
+
+    test('FormControl decimal numbers', () {
+      final control = FormControl<String>(
+        validators: [Validators.number(allowedDecimals: 3)],
+      );
+
+      control.value = '10.123';
+
+      expect(control.valid, true);
+    });
+
+    test('FormControl invalid decimal number with default allowedDecimals', () {
+      final control = FormControl<String>(
+        validators: [Validators.number()],
+      );
+
+      control.value = '10.123';
+
+      expect(control.valid, false);
+      expect(
+        control.errors[ValidationMessage.number],
+        NumberValidatorError.invalidDecimals,
+      );
+    });
+
+    test('FormControl invalid decimal numbers', () {
+      final control = FormControl<String>(
+        validators: [Validators.number(allowedDecimals: 2)],
+      );
+
+      control.value = '10.123';
+
+      expect(control.valid, false);
+      expect(
+        control.errors[ValidationMessage.number],
+        NumberValidatorError.invalidDecimals,
+      );
+    });
   });
 }
diff --git a/test/src/widgets/reactive_checkbox_list_tile_testing_widget.dart b/test/src/widgets/reactive_checkbox_list_tile_testing_widget.dart
index f49abc4c..73418b59 100644
--- a/test/src/widgets/reactive_checkbox_list_tile_testing_widget.dart
+++ b/test/src/widgets/reactive_checkbox_list_tile_testing_widget.dart
@@ -10,12 +10,12 @@ class ReactiveCheckboxListTileTestingWidget extends StatelessWidget {
   final ReactiveFormFieldCallback<bool>? onChanged;
 
   const ReactiveCheckboxListTileTestingWidget({
-    Key? key,
+    super.key,
     required this.form,
     this.tristate = false,
     this.focusNode,
     this.onChanged,
-  }) : super(key: key);
+  });
 
   @override
   Widget build(BuildContext context) {
diff --git a/test/src/widgets/reactive_checkbox_testing_widget.dart b/test/src/widgets/reactive_checkbox_testing_widget.dart
index 2f12079d..d72dca60 100644
--- a/test/src/widgets/reactive_checkbox_testing_widget.dart
+++ b/test/src/widgets/reactive_checkbox_testing_widget.dart
@@ -10,12 +10,12 @@ class ReactiveCheckboxTestingWidget extends StatelessWidget {
   final ReactiveFormFieldCallback<bool>? onChanged;
 
   const ReactiveCheckboxTestingWidget({
-    Key? key,
+    super.key,
     required this.form,
     this.tristate = false,
     this.focusNode,
     this.onChanged,
-  }) : super(key: key);
+  });
 
   @override
   Widget build(BuildContext context) {
diff --git a/test/src/widgets/reactive_date_picker_testing_widget.dart b/test/src/widgets/reactive_date_picker_testing_widget.dart
index 510badcb..db5386c7 100644
--- a/test/src/widgets/reactive_date_picker_testing_widget.dart
+++ b/test/src/widgets/reactive_date_picker_testing_widget.dart
@@ -8,12 +8,12 @@ class ReactiveDatePickerTestingWidget<T> extends StatelessWidget {
   final DateTime? initialDate;
 
   const ReactiveDatePickerTestingWidget({
-    Key? key,
+    super.key,
     required this.form,
     this.lastDate,
     this.firstDate,
     this.initialDate,
-  }) : super(key: key);
+  });
 
   @override
   Widget build(BuildContext context) {
diff --git a/test/src/widgets/reactive_dropdown_testing_widget.dart b/test/src/widgets/reactive_dropdown_testing_widget.dart
index 74ecd13c..bd2c4641 100644
--- a/test/src/widgets/reactive_dropdown_testing_widget.dart
+++ b/test/src/widgets/reactive_dropdown_testing_widget.dart
@@ -11,7 +11,7 @@ class ReactiveDropdownTestingWidget extends StatelessWidget {
   final DropdownButtonBuilder? selectedItemBuilder;
 
   const ReactiveDropdownTestingWidget({
-    Key? key,
+    super.key,
     required this.form,
     required this.items,
     this.onChanged,
@@ -19,7 +19,7 @@ class ReactiveDropdownTestingWidget extends StatelessWidget {
     this.readOnly = false,
     this.disabledHint,
     this.selectedItemBuilder,
-  }) : super(key: key);
+  });
 
   @override
   Widget build(BuildContext context) {
diff --git a/test/src/widgets/reactive_form_array_testing_widget.dart b/test/src/widgets/reactive_form_array_testing_widget.dart
index 6173a00d..dede3eac 100644
--- a/test/src/widgets/reactive_form_array_testing_widget.dart
+++ b/test/src/widgets/reactive_form_array_testing_widget.dart
@@ -5,9 +5,9 @@ class ReactiveFormArrayTestingWidget extends StatelessWidget {
   final FormGroup form;
 
   const ReactiveFormArrayTestingWidget({
-    Key? key,
+    super.key,
     required this.form,
-  }) : super(key: key);
+  });
 
   @override
   Widget build(BuildContext context) {
diff --git a/test/src/widgets/reactive_form_builder_testing_widget.dart b/test/src/widgets/reactive_form_builder_testing_widget.dart
index b62b4546..748b1833 100644
--- a/test/src/widgets/reactive_form_builder_testing_widget.dart
+++ b/test/src/widgets/reactive_form_builder_testing_widget.dart
@@ -7,13 +7,13 @@ class ReactiveFormBuilderTestingWidget<T> extends StatelessWidget {
   final Map<String, String> bindings;
 
   const ReactiveFormBuilderTestingWidget({
-    Key? key,
+    super.key,
     required this.form,
     this.validationMessages,
     this.bindings = const {
       'textField': 'name',
     },
-  }) : super(key: key);
+  });
 
   @override
   Widget build(BuildContext context) {
diff --git a/test/src/widgets/reactive_form_consumer_testing_widget.dart b/test/src/widgets/reactive_form_consumer_testing_widget.dart
index c950417d..a7149585 100644
--- a/test/src/widgets/reactive_form_consumer_testing_widget.dart
+++ b/test/src/widgets/reactive_form_consumer_testing_widget.dart
@@ -5,9 +5,9 @@ class ReactiveFormConsumerTestingWidget extends StatelessWidget {
   final FormGroup form;
 
   const ReactiveFormConsumerTestingWidget({
-    Key? key,
+    super.key,
     required this.form,
-  }) : super(key: key);
+  });
 
   @override
   Widget build(BuildContext context) {
diff --git a/test/src/widgets/reactive_radio_list_tile_testing_widget.dart b/test/src/widgets/reactive_radio_list_tile_testing_widget.dart
index 8f034421..953ec2b3 100644
--- a/test/src/widgets/reactive_radio_list_tile_testing_widget.dart
+++ b/test/src/widgets/reactive_radio_list_tile_testing_widget.dart
@@ -9,11 +9,11 @@ class ReactiveRadioListTileTestingWidget extends StatelessWidget {
   final ReactiveFormFieldCallback<bool>? onChanged;
 
   const ReactiveRadioListTileTestingWidget({
-    Key? key,
+    super.key,
     required this.form,
     this.focusNode,
     this.onChanged,
-  }) : super(key: key);
+  });
 
   @override
   Widget build(BuildContext context) {
diff --git a/test/src/widgets/reactive_radio_testing_widget.dart b/test/src/widgets/reactive_radio_testing_widget.dart
index b7cc83ed..74e63825 100644
--- a/test/src/widgets/reactive_radio_testing_widget.dart
+++ b/test/src/widgets/reactive_radio_testing_widget.dart
@@ -9,11 +9,11 @@ class ReactiveRadioTestingWidget extends StatelessWidget {
   final ReactiveFormFieldCallback<bool>? onChanged;
 
   const ReactiveRadioTestingWidget({
-    Key? key,
+    super.key,
     required this.form,
     this.focusNode,
     this.onChanged,
-  }) : super(key: key);
+  });
 
   @override
   Widget build(BuildContext context) {
diff --git a/test/src/widgets/reactive_slider_testing_widget.dart b/test/src/widgets/reactive_slider_testing_widget.dart
index fd588044..b6e5d905 100644
--- a/test/src/widgets/reactive_slider_testing_widget.dart
+++ b/test/src/widgets/reactive_slider_testing_widget.dart
@@ -12,14 +12,14 @@ class ReactiveSliderTestingWidget extends StatelessWidget {
   final ReactiveFormFieldCallback<num>? onChanged;
 
   const ReactiveSliderTestingWidget({
-    Key? key,
+    super.key,
     required this.form,
     this.focusNode,
     this.labelBuilder,
     this.onChanged,
     this.onChangeStart,
     this.onChangeEnd,
-  }) : super(key: key);
+  });
 
   @override
   Widget build(BuildContext context) {
diff --git a/test/src/widgets/reactive_status_listenable_builder_testing_widget.dart b/test/src/widgets/reactive_status_listenable_builder_testing_widget.dart
index f3ba460b..666e2b32 100644
--- a/test/src/widgets/reactive_status_listenable_builder_testing_widget.dart
+++ b/test/src/widgets/reactive_status_listenable_builder_testing_widget.dart
@@ -5,9 +5,9 @@ class ReactiveStatusListenableTestingWidget extends StatelessWidget {
   final FormGroup form;
 
   const ReactiveStatusListenableTestingWidget({
-    Key? key,
+    super.key,
     required this.form,
-  }) : super(key: key);
+  });
 
   @override
   Widget build(BuildContext context) {
diff --git a/test/src/widgets/reactive_switch_list_tile_testing_widget.dart b/test/src/widgets/reactive_switch_list_tile_testing_widget.dart
index 9da1ba3f..b30b729a 100644
--- a/test/src/widgets/reactive_switch_list_tile_testing_widget.dart
+++ b/test/src/widgets/reactive_switch_list_tile_testing_widget.dart
@@ -12,14 +12,14 @@ class ReactiveSwitchListTileTestingWidget extends StatelessWidget {
   final bool renderAdaptative;
 
   const ReactiveSwitchListTileTestingWidget({
-    Key? key,
+    super.key,
     required this.form,
     this.renderAdaptative = true,
     this.focusNode,
     this.adaptativeFocusNode,
     this.onChanged,
     this.adaptativeOnChanged,
-  }) : super(key: key);
+  });
 
   @override
   Widget build(BuildContext context) {
diff --git a/test/src/widgets/reactive_switch_testing_widget.dart b/test/src/widgets/reactive_switch_testing_widget.dart
index 48da1665..47e6d3f9 100644
--- a/test/src/widgets/reactive_switch_testing_widget.dart
+++ b/test/src/widgets/reactive_switch_testing_widget.dart
@@ -10,12 +10,12 @@ class ReactiveSwitchTestingWidget extends StatelessWidget {
   final ReactiveFormFieldCallback<bool>? adaptativeOnChanged;
 
   const ReactiveSwitchTestingWidget({
-    Key? key,
+    super.key,
     required this.form,
     this.focusNode,
     this.onChanged,
     this.adaptativeOnChanged,
-  }) : super(key: key);
+  });
 
   @override
   Widget build(BuildContext context) {
diff --git a/test/src/widgets/reactive_text_field_testing_widget.dart b/test/src/widgets/reactive_text_field_testing_widget.dart
index 3cc11a13..e3210dbe 100644
--- a/test/src/widgets/reactive_text_field_testing_widget.dart
+++ b/test/src/widgets/reactive_text_field_testing_widget.dart
@@ -13,7 +13,7 @@ class ReactiveTextFieldTestingWidget<T> extends StatelessWidget {
   final ReactiveFormFieldCallback<T>? onEditingComplete;
 
   const ReactiveTextFieldTestingWidget({
-    Key? key,
+    super.key,
     required this.form,
     this.validationMessages,
     this.showErrors,
@@ -25,7 +25,7 @@ class ReactiveTextFieldTestingWidget<T> extends StatelessWidget {
     this.onTap,
     this.onSubmitted,
     this.onEditingComplete,
-  }) : super(key: key);
+  });
 
   @override
   Widget build(BuildContext context) {
diff --git a/test/src/widgets/reactive_time_picker_testing_widget.dart b/test/src/widgets/reactive_time_picker_testing_widget.dart
index abda518a..97d1c592 100644
--- a/test/src/widgets/reactive_time_picker_testing_widget.dart
+++ b/test/src/widgets/reactive_time_picker_testing_widget.dart
@@ -5,9 +5,9 @@ class ReactiveTimePickerTestingWidget extends StatelessWidget {
   final FormGroup form;
 
   const ReactiveTimePickerTestingWidget({
-    Key? key,
+    super.key,
     required this.form,
-  }) : super(key: key);
+  });
 
   @override
   Widget build(BuildContext context) {
diff --git a/test/src/widgets/reactive_value_listenable_builder_testing_widget.dart b/test/src/widgets/reactive_value_listenable_builder_testing_widget.dart
index d0b006cb..0eb6a570 100644
--- a/test/src/widgets/reactive_value_listenable_builder_testing_widget.dart
+++ b/test/src/widgets/reactive_value_listenable_builder_testing_widget.dart
@@ -5,9 +5,9 @@ class ReactiveValueListenableTestingWidget extends StatelessWidget {
   final FormGroup form;
 
   const ReactiveValueListenableTestingWidget({
-    Key? key,
+    super.key,
     required this.form,
-  }) : super(key: key);
+  });
 
   @override
   Widget build(BuildContext context) {