react-native-international-phone-number 0.10.4 → 0.10.6

package/lib/index.js

@@ -213,8 +213,9 @@ const PhoneInput = forwardRef(
       let formattedNumber = '';
 
       const metadata = new Metadata();
-      metadata.selectNumberingPlan(selectedCountry.cca2);
-      const possibleLengths = metadata.possibleLengths();
+      metadata.selectNumberingPlan(countryValue?.cca2);
+
+      const possibleLengths = countryValue ? metadata.possibleLengths() : [];
 
       let validCallingCode = callingCode
         ? callingCode
@@ -308,12 +309,6 @@ const PhoneInput = forwardRef(
     }, [defaultCountry]);
 
     useEffect(() => {
-      if (ref) {
-        setInputValue('');
-      } else {
-        onChangePhoneNumber('');
-      }
-
       if (defaultValue) {
         const matchingCountry = getCountryByPhoneNumber(defaultValue);
 
@@ -327,31 +322,15 @@ const PhoneInput = forwardRef(
             onChangeSelectedCountry(matchingCountry);
           }
         } else {
-          setDefaultCca2(null);
-
-          if (ref) {
-            setCountryValue(null);
-            updateRef('', null);
-          } else {
-            onChangeSelectedCountry(null);
-          }
-
-          onChangeText('', null);
-
-          console.warn(
-            "The default number provided (defaultValue) don't match with anyone country. Please, correct it to be shown in the input. For more information: https://github.com/AstrOOnauta/react-native-international-phone-number#intermediate-usage---typescript--default-phone-number-value",
-          );
+          // console.warn(
+          //   "The default number provided (defaultValue) don't match with anyone country. Please, correct it to be shown in the input. For more information: https://github.com/AstrOOnauta/react-native-international-phone-number#intermediate-usage---typescript--default-phone-number-value",
+          // );
         }
       }
     }, [defaultValue]);
 
     useEffect(() => {
-      if (
-        defaultValue &&
-        countryValue &&
-        countryValue.cca2 === defaultCca2 &&
-        !inputValue
-      ) {
+      if (defaultValue && countryValue && countryValue.cca2 === defaultCca2) {
         const callingCode = countryValue?.idd?.root;
 
         let phoneNumber = defaultValue;

package/lib/utils/getCountryByPhoneNumber.js

@@ -1,10 +1,22 @@
 import parsePhoneNumber from 'libphonenumber-js';
-import {getCountryByCca2} from 'react-native-country-select';
+import {
+  getCountryByCca2,
+  getCountriesByCallingCode,
+} from 'react-native-country-select';
 
 export default function getCountryByPhoneNumber(phoneNumber) {
-  const matchingCountry = getCountryByCca2(
-    parsePhoneNumber(phoneNumber)?.getPossibleCountries()[0],
-  );
+  const country = parsePhoneNumber(phoneNumber)?.getPossibleCountries()[0];
+  let matchingCountry = getCountryByCca2(country);
+
+  if (!matchingCountry) {
+    const callingCode = parsePhoneNumber(
+      phoneNumber,
+    )?.countryCallingCode.includes('+')
+      ? parsePhoneNumber(phoneNumber)?.countryCallingCode
+      : `+${parsePhoneNumber(phoneNumber)?.countryCallingCode}`;
+
+    matchingCountry = getCountriesByCallingCode(callingCode)[0];
+  }
 
   return matchingCountry;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "react-native-international-phone-number",
   "author": "AstrOOnauta (https://github.com/AstrOOnauta)",
-  "version": "0.10.4",
+  "version": "0.10.6",
   "description": "International mobile phone input component with mask for React Native",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -45,7 +45,7 @@
   },
   "dependencies": {
     "react-native-country-select": "0.2.3",
-    "libphonenumber-js": "1.12.10"
+    "libphonenumber-js": "1.12.17"
   },
   "devDependencies": {
     "metro-react-native-babel-preset": "^0.61.0"