Merge pull request #2 from joutvhu/develop

Fix maxDecimal issue.

Author: joutvhu

CHANGELOG.md

@@ -10,3 +10,8 @@
 ## 1.0.0+2
 
 - Fix maxValue issue.
+
+
+## 1.0.0+3
+
+- Fix maxDecimal issue.

lib/src/filter.dart

@@ -33,7 +33,7 @@ class TextNumberFilter {
   int decimalDigits = 0;
   bool limitedNumber = false;
   bool limitedInteger = false;
-  bool limitedDecimal = false;
+  bool? limitedDecimal;
   bool numberStarted = false;
   bool hasNumber = false;
   bool foundNumbers = false;
@@ -65,7 +65,7 @@ class TextNumberFilter {
     decimalDigits = 0;
     limitedNumber = false;
     limitedInteger = false;
-    limitedDecimal = false;
+    limitedDecimal = null;
     numberStarted = false;
     hasNumber = false;
     foundNumbers = false;
@@ -188,9 +188,11 @@ class TextNumberFilter {
   bool filterDecimal(int value, int index, LookupTextValueEditor state) {
     var allow = false;
     if (maxDecimalDigits == null || decimalDigits < maxDecimalDigits!) {
-      if (maxDecimalDigits == null || value == _number_0) {
+      if (maxDecimalDigits == null) {
         allow = true;
-      } else if (limitedDecimal) {
+      } else if (limitedDecimal == false) {
+        allow = true;
+      } else if (limitedDecimal == true) {
         allow = false;
       } else if (limitedNumber && options.maxDecimal != null && options.maxDecimal!.length == maxDecimalDigits) {
         allow = filterMaximumDecimal(value, state.index, state);
@@ -209,6 +211,7 @@ class TextNumberFilter {
     var char = codes[state.index - decimalPoint! - 1];
     if (value < char) {
       limitedNumber = false;
+      limitedDecimal = false;
       return true;
     } else if (value > char) {
       limitedDecimal = true;

pubspec.yaml

@@ -1,6 +1,6 @@
 name: number_text_input_formatter
 description: Number Text Input Formatter for Flutter
-version: 1.0.0+2
+version: 1.0.0+3
 
 homepage: https://github.com/joutvhu/number_text_input_formatter
 repository: https://github.com/joutvhu/number_text_input_formatter.git

test/number_text_input_formatter_test.dart

@@ -97,7 +97,7 @@ void main() {
         selection: TextSelection.collapsed(offset: 4),
       ),
     );
-    expect(result.text, '1.00');
+    expect(result.text, '1.05');
   });
 
   test('overflow_decimal_part_2', () {
@@ -115,7 +115,7 @@ void main() {
         selection: TextSelection.collapsed(offset: 5),
       ),
     );
-    expect(result.text, '1.00');
+    expect(result.text, '1.05');
   });
 
   test('integer_part_greater_than_max_value_1', () {
@@ -154,7 +154,7 @@ void main() {
     expect(result.text, '0');
   });
 
-  test('integer_part_greater_than_maxValue_3', () {
+  test('integer_part_greater_than_max_value_3', () {
     var result = NumberTextInputFormatter(
       integerDigits: 2,
       decimalDigits: 2,
@@ -172,7 +172,7 @@ void main() {
     expect(result.text, '1');
   });
 
-  test('integer_part_greater_than_maxValue_4', () {
+  test('integer_part_greater_than_max_value_4', () {
     var result = NumberTextInputFormatter(
       integerDigits: 2,
       decimalDigits: 2,
@@ -190,7 +190,7 @@ void main() {
     expect(result.text, '1');
   });
 
-  test('integer_part_greater_than_maxValue_5', () {
+  test('integer_part_greater_than_max_value_5', () {
     var result = NumberTextInputFormatter(
       integerDigits: 3,
       decimalDigits: 2,
@@ -208,7 +208,7 @@ void main() {
     expect(result.text, '10');
   });
 
-  test('integer_part_greater_than_maxValue_6', () {
+  test('integer_part_greater_than_max_value_6', () {
     var result = NumberTextInputFormatter(
       maxValue: '100.09',
     ).formatEditUpdate(
@@ -296,6 +296,54 @@ void main() {
     expect(result.text, '1.4');
   });
 
+  test('decimal_part_greater_than_max_value_5', () {
+    var result = NumberTextInputFormatter(
+      integerDigits: 2,
+      decimalDigits: 2,
+      maxValue: '1.33'
+    ).formatEditUpdate(
+      const TextEditingValue(
+        text: '',
+      ),
+      const TextEditingValue(
+        text: '1.41',
+      ),
+    );
+    expect(result.text, '1.00');
+  });
+
+  test('decimal_part_less_than_max_value_1', () {
+    var result = NumberTextInputFormatter(
+      integerDigits: 1,
+      decimalDigits: 2,
+      maxValue: '1.33',
+    ).formatEditUpdate(
+      const TextEditingValue(
+        text: '',
+      ),
+      const TextEditingValue(
+        text: '1.09',
+      ),
+    );
+    expect(result.text, '1.09');
+  });
+
+  test('decimal_part_less_than_max_value_2', () {
+    var result = NumberTextInputFormatter(
+      integerDigits: 1,
+      decimalDigits: 2,
+      maxValue: '1.33',
+    ).formatEditUpdate(
+      const TextEditingValue(
+        text: '',
+      ),
+      const TextEditingValue(
+        text: '1.19',
+      ),
+    );
+    expect(result.text, '1.19');
+  });
+
   test('change_decimal_separator_1', () {
     var result = NumberTextInputFormatter(
       integerDigits: 13,
@@ -707,6 +755,38 @@ void main() {
     expect(result.text, '804583.60');
   });
 
+  test('filter_other_decimal_point_1', () {
+    var result = NumberTextInputFormatter(
+      integerDigits: 13,
+      decimalDigits: 2,
+      overrideDecimalPoint: true,
+    ).formatEditUpdate(
+      const TextEditingValue(
+        text: '',
+      ),
+      const TextEditingValue(
+        text: '1.3a.66',
+      ),
+    );
+    expect(result.text, '13.66');
+  });
+
+  test('filter_other_decimal_point_2', () {
+    var result = NumberTextInputFormatter(
+      integerDigits: 13,
+      decimalDigits: 2,
+      overrideDecimalPoint: true,
+    ).formatEditUpdate(
+      const TextEditingValue(
+        text: '',
+      ),
+      const TextEditingValue(
+        text: '0.3.66',
+      ),
+    );
+    expect(result.text, '3.66');
+  });
+
   test('currency_text_input_formatter_1', () {
     var result = CurrencyTextInputFormatter(
       prefix: '\$'