fiexed #97

caseyryan · Oct 20, 2022 · fe2f925 · fe2f925
1 parent 3160674
commit fe2f925
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 27 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,5 @@
+## [2.8.2]
+- Fixed https://github.com/caseyryan/flutter_multi_formatter/issues/97
 ## [2.8.1]
 - Added a utility method PinyinUtils.simplifyPinyin();
 ## [2.8.0]

diff --git a/example/lib/pages/money_format_page.dart b/example/lib/pages/money_format_page.dart
@@ -16,12 +16,12 @@ class _MoneyFormatPageState extends State<MoneyFormatPage> {
 
   @override
   Widget build(BuildContext context) {
-    print(toCurrencyString(
-      '33422220',
-      trailingSymbol: '',
-      thousandSeparator: ThousandSeparator.Period,
-      mantissaLength: 0,
-    ));
+    // print(toCurrencyString(
+    //   1000.0.toString(),
+    //   trailingSymbol: '',
+    //   thousandSeparator: ThousandSeparator.Period,
+    //   mantissaLength: 0,
+    // ));
     return Unfocuser(
       child: Scaffold(
         appBar: AppBar(
@@ -59,11 +59,10 @@ class _MoneyFormatPageState extends State<MoneyFormatPage> {
                   ),
                   inputFormatters: [
                     CurrencyInputFormatter(
-                      // trailingSymbol: '',
-                      // thousandSeparator: ThousandSeparator.Period,
+                      // thousandSeparator: ThousandSeparator.Comma,
                       // mantissaLength: 0,
                       thousandSeparator: ThousandSeparator.Space,
-                      mantissaLength: 0,
+                      mantissaLength: 2,
                       trailingSymbol: "\$",
                     )
                   ],

diff --git a/example/pubspec.lock b/example/pubspec.lock
@@ -96,7 +96,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "2.8.1"
+    version: "2.8.2"
   flutter_test:
     dependency: "direct dev"
     description: flutter

diff --git a/lib/formatters/currency_input_formatter.dart b/lib/formatters/currency_input_formatter.dart
@@ -127,7 +127,7 @@ class CurrencyInputFormatter extends TextInputFormatter {
     final oldCaretIndex = max(oldValue.selection.start, oldValue.selection.end);
     final newCaretIndex = max(newValue.selection.start, newValue.selection.end);
     var newText = newValue.text;
-
+    // print(newText);
     final newAsNumeric = toNumericString(
       newText,
       allowPeriod: true,
@@ -137,14 +137,14 @@ class CurrencyInputFormatter extends TextInputFormatter {
 
     var oldText = oldValue.text;
     if (oldValue == newValue) {
-      // print('RETURN 0 ${oldValue.text}');
+      print('RETURN 0 ${oldValue.text}');
       return newValue;
     }
     bool isErasing = newText.length < oldText.length;
     if (isErasing) {
       if (mantissaLength == 0 && oldCaretIndex == oldValue.text.length) {
         if (trailingLength > 0) {
-          // print('RETURN 1 ${oldValue.text}');
+          print('RETURN 1 ${oldValue.text}');
           return oldValue.copyWith(
             selection: TextSelection.collapsed(
               offset: min(
@@ -159,7 +159,7 @@ class CurrencyInputFormatter extends TextInputFormatter {
         shorterString: newText,
         longerString: oldText,
       )) {
-        // print('RETURN 2 ${oldValue.text}');
+        print('RETURN 2 ${oldValue.text}');
         return oldValue.copyWith(
           selection: TextSelection.collapsed(
             offset: min(
@@ -171,7 +171,7 @@ class CurrencyInputFormatter extends TextInputFormatter {
       }
     } else {
       if (_containsIllegalChars(newText)) {
-        // print('RETURN 3 ${oldValue.text}');
+        print('RETURN 3 ${oldValue.text}');
         return oldValue;
       }
     }
@@ -194,7 +194,7 @@ class CurrencyInputFormatter extends TextInputFormatter {
       newText: newText,
       oldText: oldText,
     )) {
-      // print('RETURN 4 ${oldValue.text.length} $oldCaretIndex');
+      print('RETURN 4 ${oldValue.text.length} $oldCaretIndex');
       return oldValue.copyWith(
         selection: TextSelection.collapsed(
           offset: min(
@@ -211,15 +211,15 @@ class CurrencyInputFormatter extends TextInputFormatter {
         oldText: oldText,
         caretPosition: newCaretIndex,
       )) {
-        // print('RETURN 5 $newAsCurrency');
+        print('RETURN 5 $newAsCurrency');
         return TextEditingValue(
           selection: TextSelection.collapsed(
             offset: newCaretIndex,
           ),
           text: newAsCurrency,
         );
       } else {
-        // print('RETURN 6 $newAsCurrency');
+        print('RETURN 6 $newAsCurrency');
         int offset = min(
           newCaretIndex,
           newAsCurrency.length - trailingLength,
@@ -235,14 +235,18 @@ class CurrencyInputFormatter extends TextInputFormatter {
 
     var initialCaretOffset = leadingLength;
     if (_isZeroOrEmpty(newAsNumeric)) {
-      // print('RETURN 7 ${newValue.text}');
+      print('RETURN 7 ${newValue.text}');
+      int offset = min(
+        newValue.text.length,
+        initialCaretOffset + 1,
+      );
+      if (newValue.text == '') {
+        offset = 1;
+      }
       return newValue.copyWith(
         text: newAsCurrency,
         selection: TextSelection.collapsed(
-          offset: min(
-            newValue.text.length,
-            initialCaretOffset + 1,
-          ),
+          offset: offset,
         ),
       );
     }
@@ -267,7 +271,7 @@ class CurrencyInputFormatter extends TextInputFormatter {
         initialCaretOffset += 1;
       }
     }
-    // print('RETURN 8 $newAsCurrency');
+    print('RETURN 8 $newAsCurrency');
     return TextEditingValue(
       selection: TextSelection.collapsed(
         offset: initialCaretOffset,

diff --git a/lib/formatters/formatter_utils.dart b/lib/formatters/formatter_utils.dart
@@ -271,6 +271,14 @@ String toCurrencyString(
   }
   // print(thousandSeparator);
   value = value.replaceAll(_repeatingDotsRegExp, '.');
+  if (mantissaLength == 0) {
+    if (value.contains('.')) {
+      value = value.substring(
+        0,
+        value.indexOf('.'),
+      );
+    }
+  }
   value = toNumericString(
     value,
     allowPeriod: mantissaLength > 0,

diff --git a/lib/utils/pinyin_utils.dart b/lib/utils/pinyin_utils.dart
@@ -87,9 +87,13 @@ class PinyinUtils {
 
   static String splitToSyllablesBySeparator(
     String value, [
-    String separator = '\'',
+    String separator = " ",
   ]) {
-    return splitToSyllables(value).join(separator);
+    final result = splitToSyllables(value)
+        .join(" ")
+        .replaceAll(RegExp(r"[']+"), " ")
+        .replaceAll(RegExp(r"\s+"), separator);
+    return result;
   }
 
   /// [value] a string to split into pinyin syllables

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: flutter_multi_formatter
 description: A package of formatters for international phone numbers, credit / debit cards and a masked formatter
-version: 2.8.1
+version: 2.8.2
 homepage: https://github.com/caseyryan/flutter_multi_formatter
 
 environment: