react-native-international-phone-number 0.10.3 → 0.10.5

package/lib/index.js

@@ -201,15 +201,21 @@ const PhoneInput = forwardRef(
         }
       }
 
-      return result;
+      if (ref) {
+        setInputValue(result);
+        updateRef(result, countryValue);
+      } else {
+        onChangePhoneNumber(result);
+      }
     }
 
     function formatPhoneNumber(phoneNumber, callingCode) {
       let formattedNumber = '';
 
       const metadata = new Metadata();
-      metadata.selectNumberingPlan(selectedCountry.cca2);
-      const possibleLengths = metadata.possibleLengths();
+      metadata.selectNumberingPlan(selectedCountry?.cca2);
+
+      const possibleLengths = selectedCountry ? metadata.possibleLengths() : [];
 
       let validCallingCode = callingCode
         ? callingCode
@@ -234,10 +240,15 @@ const PhoneInput = forwardRef(
         : possibleLengths.slice(-1)[0];
 
       if (formattedNumber?.replace(/\D/g, '')?.length > possibleLength) {
-        return phoneNumber.slice(0, -1);
+        return;
       }
 
-      return formattedNumber;
+      if (ref) {
+        setInputValue(formattedNumber);
+        updateRef(formattedNumber, countryValue);
+      } else {
+        onChangePhoneNumber(formattedNumber);
+      }
     }
 
     function onChangeText(phoneNumber, callingCode) {
@@ -263,20 +274,10 @@ const PhoneInput = forwardRef(
         return;
       }
 
-      let formattedNumber = '';
-
       if (customMask) {
-        formattedNumber = formatPhoneNumberWithCustomMask(phoneNumber);
-      } else {
-        formattedNumber = formatPhoneNumber(phoneNumber, callingCode);
-      }
-
-      if (ref) {
-        setInputValue(formattedNumber);
-        updateRef(formattedNumber, countryValue);
-      } else {
-        onChangePhoneNumber(formattedNumber);
+        return formatPhoneNumberWithCustomMask(phoneNumber);
       }
+      formatPhoneNumber(phoneNumber, callingCode);
     }
 
     useEffect(() => {

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.3",
+  "version": "0.10.5",
   "description": "International mobile phone input component with mask for React Native",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",