Merge pull request #75 from israelins85/main

Fixing the search of Country

Author: deandreamatias

lib/src/form_builder_phone_field.dart

@@ -344,10 +344,10 @@ class _FormBuilderPhoneFieldState
     if (phone.isNotEmpty) {
       try {
         final parseResult = PhoneNumber.parse(phone);
+        final isoCode = parseResult.isoCode.name.split(".").last;
+        Country country = CountryPickerUtils.getCountryByIsoCode(isoCode);
         setState(() {
-          _selectedDialogCountry = CountryPickerUtils.getCountryByIsoCode(
-            parseResult.countryCode,
-          );
+          _selectedDialogCountry = country;
         });
         _effectiveController.text = parseResult.nsn;
       } catch (error) {

test/form_builder_phone_field_test.dart

@@ -60,6 +60,38 @@ void main() {
 
       expect(formFieldKey.currentState?.value, '$validCodePhone$validPhone');
     });
+    testWidgets('should found the correct country', (tester) async {
+      final formFieldKey = GlobalKey<FormBuilderFieldState>();
+      const fieldName = 'phone';
+      const validPhone = '8599999999';
+      const validCodePhone = '+55';
+      final testWidget = FormBuilderPhoneField(
+        name: fieldName,
+        key: formFieldKey,
+      );
+      await tester.pumpWidget(buildTestableFieldWidget(testWidget));
+
+      formFieldKey.currentState?.didChange('$validCodePhone$validPhone');
+      await tester.pumpAndSettle();
+
+      expect(formFieldKey.currentState?.value, '$validCodePhone$validPhone');
+    });
+    testWidgets('should not found the correct country', (tester) async {
+      final formFieldKey = GlobalKey<FormBuilderFieldState>();
+      const fieldName = 'phone';
+      const validPhone = '8599999999';
+      const invalidCodePhone = '+999';
+      final testWidget = FormBuilderPhoneField(
+        name: fieldName,
+        key: formFieldKey,
+      );
+      await tester.pumpWidget(buildTestableFieldWidget(testWidget));
+
+      formFieldKey.currentState?.didChange('$invalidCodePhone$validPhone');
+      await tester.pumpAndSettle();
+
+      expect(formFieldKey.currentState?.value, '$invalidCodePhone$validPhone');
+    });
   });
   group('by FormKey -', () {
     testWidgets('should reset value when call reset', (tester) async {