react-native-international-phone-number 0.6.6 → 0.6.8

package/README.md

@@ -133,7 +133,7 @@ npx react-native-asset
  ...
 
  useFonts({
-    'TwemojiMozilla': require('./node_modules/react-native-international-phone-number/lib/assets/fonts/TwemojiMozilla.ttf'),
+    'TwemojiMozilla': require('./node_modules/react-native-international-phone-number/lib/assets/fonts/TwemojiMozilla.woff2'),
   });
 
  ...
@@ -149,7 +149,7 @@ npx react-native-asset
 ...
 <key>UIAppFonts</key>
 <array>
-	<string>TwemojiMozilla.ttf</string>
+	<string>TwemojiMozilla.woff2</string>
   ...
 </array>
 ```

package/lib/utils/getCountriesByCallingCode.js

@@ -5,8 +5,35 @@ export default function getCountriesByCallingCode(callingCode) {
     ? callingCode
     : `+${callingCode}`;
 
+  if (formatedCallingCode.includes('+1')) {
+    const matchingCountries = countries.filter((country) => {
+      return formatedCallingCode.includes(country.callingCode);
+    });
+
+    const newMatchingCountries = matchingCountries.filter((item) => {
+      return item.phoneMasks.some((mask) => {
+        return `+1${mask.replace(/\D/g, '')}`.includes(
+          formatedCallingCode
+        );
+      });
+    });
+
+    const formatedCountries = [];
+
+    newMatchingCountries.forEach((country) => {
+      formatedCountries.push({
+        name: country.name,
+        cca2: country.cca2,
+        flag: country.flag,
+        callingCode: country.callingCode,
+      });
+    });
+
+    return formatedCountries;
+  }
+
   const matchingCountries = countries.filter((country) => {
-    return country.callingCode === formatedCallingCode;
+    return formatedCallingCode === country.callingCode;
   });
 
   const formatedCountries = [];

package/lib/utils/getInputMask.js

@@ -29,7 +29,8 @@ export default function getInputMask(
 
         for (let i = 0; i < phoneMask.length; i++) {
           if (
-            phoneNumber.length > phoneMask[0].length &&
+            phoneNumber.replace(/\s/g, '').length >
+              phoneMask[0].replace(/\s/g, '').length &&
             newCode !== '+1'
           ) {
             hasDifferentLengthsOfPhoneNumbers = true;
@@ -45,7 +46,8 @@ export default function getInputMask(
         } else {
           for (let i = 0; i < phoneMask.length; i++) {
             if (
-              phoneNumber.length > phoneMask[i].length &&
+              phoneNumber.replace(/\s/g, '').length >
+                phoneMask[i].replace(/\s/g, '').length &&
               phoneMask[i + 1]
             ) {
               matrix = phoneMask[i + 1].replace(/[0-9]/g, '#').trim();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "react-native-international-phone-number",
   "author": "AstrOOnauta (https://github.com/AstrOOnauta)",
-  "version": "0.6.6",
+  "version": "0.6.8",
   "description": "International mobile phone input component with mask for React Native",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",