intl-tel-input 25.0.2 → 25.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "intl-tel-input",
-  "version": "25.0.2",
+  "version": "25.1.0",
   "description": "A JavaScript plugin for entering and validating international telephone numbers",
   "keywords": [
     "international",

package/react/README.md

@@ -28,7 +28,7 @@ import "intl-tel-input/styles";
 
 See the [Validation demo](https://github.com/jackocnr/intl-tel-input/blob/master/react/demo/validation/ValidationApp.tsx) for a more fleshed-out example of how to handle validation.
 
-A note on the utils script (~260KB): if you're lazy loading the IntlTelInput chunk (and so less worried about filesize) then you can just import IntlTelInput from `"intl-tel-input/reactWithUtils"`, to include the utils script. Alternatively, if you use the main `"intl-tel-input/react"` import, then you should couple this with the `loadUtils` initialisation option - you will need to host the [utils.js](https://github.com/jackocnr/intl-tel-input/blob/master/build/js/utils.js) file, and then set the `loadUtils` option to that URL, or alternatively just point it to a CDN hosted version e.g. `"https://cdn.jsdelivr.net/npm/intl-tel-input@25.0.2/build/js/utils.js"`.
+A note on the utils script (~260KB): if you're lazy loading the IntlTelInput chunk (and so less worried about filesize) then you can just import IntlTelInput from `"intl-tel-input/reactWithUtils"`, to include the utils script. Alternatively, if you use the main `"intl-tel-input/react"` import, then you should couple this with the `loadUtils` initialisation option - you will need to host the [utils.js](https://github.com/jackocnr/intl-tel-input/blob/master/build/js/utils.js) file, and then set the `loadUtils` option to that URL, or alternatively just point it to a CDN hosted version e.g. `"https://cdn.jsdelivr.net/npm/intl-tel-input@25.1.0/build/js/utils.js"`.
 
 ## Props
 Here's a list of all of the current props you can pass to the IntlTelInput React component.

package/react/build/IntlTelInput.cjs

@@ -112,7 +112,9 @@ var rawCountryData = [
     "au",
     // Australia
     "61",
-    0
+    0,
+    null,
+    "0"
   ],
   [
     "at",
@@ -293,14 +295,16 @@ var rawCountryData = [
     // Christmas Island
     "61",
     2,
-    ["89164"]
+    ["89164"],
+    "0"
   ],
   [
     "cc",
     // Cocos (Keeling) Islands
     "61",
     1,
-    ["89162"]
+    ["89162"],
+    "0"
   ],
   [
     "co",
@@ -533,7 +537,8 @@ var rawCountryData = [
     // Guernsey
     "44",
     1,
-    ["1481", "7781", "7839", "7911"]
+    ["1481", "7781", "7839", "7911"],
+    "0"
   ],
   [
     "gn",
@@ -605,7 +610,8 @@ var rawCountryData = [
     // Isle of Man
     "44",
     2,
-    ["1624", "74576", "7524", "7924", "7624"]
+    ["1624", "74576", "7524", "7924", "7624"],
+    "0"
   ],
   [
     "il",
@@ -635,7 +641,8 @@ var rawCountryData = [
     // Jersey
     "44",
     3,
-    ["1534", "7509", "7700", "7797", "7829", "7937"]
+    ["1534", "7509", "7700", "7797", "7829", "7937"],
+    "0"
   ],
   [
     "jo",
@@ -647,7 +654,8 @@ var rawCountryData = [
     // Kazakhstan
     "7",
     1,
-    ["33", "7"]
+    ["33", "7"],
+    "8"
   ],
   [
     "ke",
@@ -779,7 +787,8 @@ var rawCountryData = [
     // Mayotte
     "262",
     1,
-    ["269", "639"]
+    ["269", "639"],
+    "0"
   ],
   [
     "mx",
@@ -822,7 +831,9 @@ var rawCountryData = [
     "ma",
     // Morocco
     "212",
-    0
+    0,
+    null,
+    "0"
   ],
   [
     "mz",
@@ -983,7 +994,9 @@ var rawCountryData = [
     "re",
     // Réunion
     "262",
-    0
+    0,
+    null,
+    "0"
   ],
   [
     "ro",
@@ -994,7 +1007,9 @@ var rawCountryData = [
     "ru",
     // Russia
     "7",
-    0
+    0,
+    null,
+    "8"
   ],
   [
     "rw",
@@ -1266,7 +1281,9 @@ var rawCountryData = [
     "gb",
     // United Kingdom
     "44",
-    0
+    0,
+    null,
+    "0"
   ],
   [
     "us",
@@ -1323,7 +1340,8 @@ var rawCountryData = [
     // Western Sahara
     "212",
     1,
-    ["5288", "5289"]
+    ["5288", "5289"],
+    "0"
   ],
   [
     "ye",
@@ -1351,8 +1369,8 @@ for (let i = 0; i < rawCountryData.length; i++) {
     dialCode: c[1],
     priority: c[2] || 0,
     areaCodes: c[3] || null,
-    partialAreaCodes: null,
-    nodeById: {}
+    nodeById: {},
+    nationalPrefix: c[4] || null
   };
 }
 var data_default = allCountries;
@@ -1876,7 +1894,7 @@ var Iti = class {
       }
     }
   }
-  //* Generate this.dialCodes and this.dialCodeToIso2Map and country.partialAreaCodes.
+  //* Generate this.dialCodes and this.dialCodeToIso2Map.
   _processDialCodes() {
     this.dialCodes = {};
     this.dialCodeMaxLen = 0;
@@ -1899,12 +1917,6 @@ var Iti = class {
             const partialDialCode = c.dialCode + partialAreaCode;
             this._addToDialCodeMap(rootIso2Code, partialDialCode);
             this._addToDialCodeMap(c.iso2, partialDialCode);
-            if (!c.partialAreaCodes) {
-              c.partialAreaCodes = [];
-            }
-            if (!c.partialAreaCodes.includes(partialAreaCode)) {
-              c.partialAreaCodes.push(partialAreaCode);
-            }
           }
           this._addToDialCodeMap(c.iso2, c.dialCode + areaCode);
         }
@@ -2562,49 +2574,37 @@ var Iti = class {
     }
     return false;
   }
-  //* Check if the given number matches an area code from the selected country.
-  _isAreaCodeMatch(numeric, dialCodeNumerics) {
-    const { areaCodes, partialAreaCodes, dialCode } = this.selectedCountryData;
-    const typedNumber = numeric.substring(dialCode.length);
-    const typedAreaCode = dialCodeNumerics.substring(dialCode.length);
-    if (areaCodes.includes(typedAreaCode)) {
-      return true;
+  _ensureHasDialCode(number) {
+    const { dialCode, nationalPrefix } = this.selectedCountryData;
+    const alreadyHasPlus = number.charAt(0) === "+";
+    if (alreadyHasPlus || !dialCode) {
+      return number;
     }
-    if (partialAreaCodes.includes(typedNumber)) {
-      return true;
-    }
-    return false;
+    const hasPrefix = nationalPrefix && number.charAt(0) === nationalPrefix && !this.options.separateDialCode;
+    const cleanNumber = hasPrefix ? number.substring(1) : number;
+    return `+${dialCode}${cleanNumber}`;
   }
   _getCountryFromNumber(fullNumber) {
     const plusIndex = fullNumber.indexOf("+");
     let number = plusIndex ? fullNumber.substring(plusIndex) : fullNumber;
+    const selectedIso2 = this.selectedCountryData.iso2;
     const selectedDialCode = this.selectedCountryData.dialCode;
-    const isNanp = selectedDialCode === "1";
-    if (number && isNanp && number.charAt(0) !== "+") {
-      if (number.charAt(0) !== "1") {
-        number = `1${number}`;
-      }
-      number = `+${number}`;
-    }
-    if (this.options.separateDialCode && selectedDialCode && number.charAt(0) !== "+") {
-      number = `+${selectedDialCode}${number}`;
+    number = this._ensureHasDialCode(number);
+    const dialCodeMatch = this._getDialCode(number, true);
+    if (dialCodeMatch && dialCodeMatch === this.prevDialCodeMatch) {
+      return null;
     }
-    const dialCode = this._getDialCode(number, true);
+    this.prevDialCodeMatch = dialCodeMatch;
     const numeric = getNumeric(number);
-    if (dialCode) {
-      const dialCodeNumerics = getNumeric(dialCode);
-      const iso2Codes = this.dialCodeToIso2Map[dialCodeNumerics];
-      const alreadySelected = this.selectedCountryData.iso2 && iso2Codes.includes(this.selectedCountryData.iso2);
-      let areaCodeMatch = false;
-      if (alreadySelected) {
-        if (this.selectedCountryData.areaCodes && numeric.length > selectedDialCode.length) {
-          areaCodeMatch = this._isAreaCodeMatch(numeric, dialCodeNumerics);
-        } else {
-          areaCodeMatch = true;
-        }
+    if (dialCodeMatch) {
+      const dialCodeMatchNumeric = getNumeric(dialCodeMatch);
+      const iso2Codes = this.dialCodeToIso2Map[dialCodeMatchNumeric];
+      if (!selectedIso2 && this.defaultCountry && iso2Codes.includes(this.defaultCountry)) {
+        return this.defaultCountry;
       }
+      const alreadySelected = selectedIso2 && iso2Codes.includes(selectedIso2) && numeric.length === dialCodeMatchNumeric.length;
       const isRegionlessNanpNumber = selectedDialCode === "1" && isRegionlessNanp(numeric);
-      if (!isRegionlessNanpNumber && (!alreadySelected || !areaCodeMatch)) {
+      if (!isRegionlessNanpNumber && !alreadySelected) {
         for (let j = 0; j < iso2Codes.length; j++) {
           if (iso2Codes[j]) {
             return iso2Codes[j];
@@ -3168,7 +3168,7 @@ var intlTelInput = Object.assign(
     attachUtils,
     startedLoadingUtilsScript: false,
     startedLoadingAutoCountry: false,
-    version: "25.0.2"
+    version: "25.1.0"
   }
 );
 var intl_tel_input_default = intlTelInput;

package/react/build/IntlTelInput.d.ts

@@ -5,8 +5,8 @@ declare module "intl-tel-input/data" {
         dialCode: string;
         priority: number;
         areaCodes: string[] | null;
-        partialAreaCodes: string[] | null;
         nodeById: object;
+        nationalPrefix: string | null;
     };
     const allCountries: Country[];
     export default allCountries;
@@ -330,7 +330,7 @@ declare module "intl-tel-input" {
         iso2?: string;
         dialCode?: string;
         areaCodes?: string[];
-        partialAreaCodes?: string[];
+        nationalPrefix?: string;
     };
     interface AllOptions {
         allowDropdown: boolean;
@@ -394,6 +394,7 @@ declare module "intl-tel-input" {
         private defaultCountry;
         private originalPaddingRight;
         private originalPaddingLeft;
+        private prevDialCodeMatch;
         private _handleHiddenInputSubmit;
         private _handleLabelClick;
         private _handleClickSelectedCountry;
@@ -441,7 +442,7 @@ declare module "intl-tel-input" {
         private _handleEnterKey;
         private _updateValFromNumber;
         private _updateCountryFromNumber;
-        private _isAreaCodeMatch;
+        private _ensureHasDialCode;
         private _getCountryFromNumber;
         private _highlightListItem;
         private _getCountryData;

package/react/build/IntlTelInput.js

@@ -76,7 +76,9 @@ var rawCountryData = [
     "au",
     // Australia
     "61",
-    0
+    0,
+    null,
+    "0"
   ],
   [
     "at",
@@ -257,14 +259,16 @@ var rawCountryData = [
     // Christmas Island
     "61",
     2,
-    ["89164"]
+    ["89164"],
+    "0"
   ],
   [
     "cc",
     // Cocos (Keeling) Islands
     "61",
     1,
-    ["89162"]
+    ["89162"],
+    "0"
   ],
   [
     "co",
@@ -497,7 +501,8 @@ var rawCountryData = [
     // Guernsey
     "44",
     1,
-    ["1481", "7781", "7839", "7911"]
+    ["1481", "7781", "7839", "7911"],
+    "0"
   ],
   [
     "gn",
@@ -569,7 +574,8 @@ var rawCountryData = [
     // Isle of Man
     "44",
     2,
-    ["1624", "74576", "7524", "7924", "7624"]
+    ["1624", "74576", "7524", "7924", "7624"],
+    "0"
   ],
   [
     "il",
@@ -599,7 +605,8 @@ var rawCountryData = [
     // Jersey
     "44",
     3,
-    ["1534", "7509", "7700", "7797", "7829", "7937"]
+    ["1534", "7509", "7700", "7797", "7829", "7937"],
+    "0"
   ],
   [
     "jo",
@@ -611,7 +618,8 @@ var rawCountryData = [
     // Kazakhstan
     "7",
     1,
-    ["33", "7"]
+    ["33", "7"],
+    "8"
   ],
   [
     "ke",
@@ -743,7 +751,8 @@ var rawCountryData = [
     // Mayotte
     "262",
     1,
-    ["269", "639"]
+    ["269", "639"],
+    "0"
   ],
   [
     "mx",
@@ -786,7 +795,9 @@ var rawCountryData = [
     "ma",
     // Morocco
     "212",
-    0
+    0,
+    null,
+    "0"
   ],
   [
     "mz",
@@ -947,7 +958,9 @@ var rawCountryData = [
     "re",
     // Réunion
     "262",
-    0
+    0,
+    null,
+    "0"
   ],
   [
     "ro",
@@ -958,7 +971,9 @@ var rawCountryData = [
     "ru",
     // Russia
     "7",
-    0
+    0,
+    null,
+    "8"
   ],
   [
     "rw",
@@ -1230,7 +1245,9 @@ var rawCountryData = [
     "gb",
     // United Kingdom
     "44",
-    0
+    0,
+    null,
+    "0"
   ],
   [
     "us",
@@ -1287,7 +1304,8 @@ var rawCountryData = [
     // Western Sahara
     "212",
     1,
-    ["5288", "5289"]
+    ["5288", "5289"],
+    "0"
   ],
   [
     "ye",
@@ -1315,8 +1333,8 @@ for (let i = 0; i < rawCountryData.length; i++) {
     dialCode: c[1],
     priority: c[2] || 0,
     areaCodes: c[3] || null,
-    partialAreaCodes: null,
-    nodeById: {}
+    nodeById: {},
+    nationalPrefix: c[4] || null
   };
 }
 var data_default = allCountries;
@@ -1840,7 +1858,7 @@ var Iti = class {
       }
     }
   }
-  //* Generate this.dialCodes and this.dialCodeToIso2Map and country.partialAreaCodes.
+  //* Generate this.dialCodes and this.dialCodeToIso2Map.
   _processDialCodes() {
     this.dialCodes = {};
     this.dialCodeMaxLen = 0;
@@ -1863,12 +1881,6 @@ var Iti = class {
             const partialDialCode = c.dialCode + partialAreaCode;
             this._addToDialCodeMap(rootIso2Code, partialDialCode);
             this._addToDialCodeMap(c.iso2, partialDialCode);
-            if (!c.partialAreaCodes) {
-              c.partialAreaCodes = [];
-            }
-            if (!c.partialAreaCodes.includes(partialAreaCode)) {
-              c.partialAreaCodes.push(partialAreaCode);
-            }
           }
           this._addToDialCodeMap(c.iso2, c.dialCode + areaCode);
         }
@@ -2526,49 +2538,37 @@ var Iti = class {
     }
     return false;
   }
-  //* Check if the given number matches an area code from the selected country.
-  _isAreaCodeMatch(numeric, dialCodeNumerics) {
-    const { areaCodes, partialAreaCodes, dialCode } = this.selectedCountryData;
-    const typedNumber = numeric.substring(dialCode.length);
-    const typedAreaCode = dialCodeNumerics.substring(dialCode.length);
-    if (areaCodes.includes(typedAreaCode)) {
-      return true;
+  _ensureHasDialCode(number) {
+    const { dialCode, nationalPrefix } = this.selectedCountryData;
+    const alreadyHasPlus = number.charAt(0) === "+";
+    if (alreadyHasPlus || !dialCode) {
+      return number;
     }
-    if (partialAreaCodes.includes(typedNumber)) {
-      return true;
-    }
-    return false;
+    const hasPrefix = nationalPrefix && number.charAt(0) === nationalPrefix && !this.options.separateDialCode;
+    const cleanNumber = hasPrefix ? number.substring(1) : number;
+    return `+${dialCode}${cleanNumber}`;
   }
   _getCountryFromNumber(fullNumber) {
     const plusIndex = fullNumber.indexOf("+");
     let number = plusIndex ? fullNumber.substring(plusIndex) : fullNumber;
+    const selectedIso2 = this.selectedCountryData.iso2;
     const selectedDialCode = this.selectedCountryData.dialCode;
-    const isNanp = selectedDialCode === "1";
-    if (number && isNanp && number.charAt(0) !== "+") {
-      if (number.charAt(0) !== "1") {
-        number = `1${number}`;
-      }
-      number = `+${number}`;
-    }
-    if (this.options.separateDialCode && selectedDialCode && number.charAt(0) !== "+") {
-      number = `+${selectedDialCode}${number}`;
+    number = this._ensureHasDialCode(number);
+    const dialCodeMatch = this._getDialCode(number, true);
+    if (dialCodeMatch && dialCodeMatch === this.prevDialCodeMatch) {
+      return null;
     }
-    const dialCode = this._getDialCode(number, true);
+    this.prevDialCodeMatch = dialCodeMatch;
     const numeric = getNumeric(number);
-    if (dialCode) {
-      const dialCodeNumerics = getNumeric(dialCode);
-      const iso2Codes = this.dialCodeToIso2Map[dialCodeNumerics];
-      const alreadySelected = this.selectedCountryData.iso2 && iso2Codes.includes(this.selectedCountryData.iso2);
-      let areaCodeMatch = false;
-      if (alreadySelected) {
-        if (this.selectedCountryData.areaCodes && numeric.length > selectedDialCode.length) {
-          areaCodeMatch = this._isAreaCodeMatch(numeric, dialCodeNumerics);
-        } else {
-          areaCodeMatch = true;
-        }
+    if (dialCodeMatch) {
+      const dialCodeMatchNumeric = getNumeric(dialCodeMatch);
+      const iso2Codes = this.dialCodeToIso2Map[dialCodeMatchNumeric];
+      if (!selectedIso2 && this.defaultCountry && iso2Codes.includes(this.defaultCountry)) {
+        return this.defaultCountry;
       }
+      const alreadySelected = selectedIso2 && iso2Codes.includes(selectedIso2) && numeric.length === dialCodeMatchNumeric.length;
       const isRegionlessNanpNumber = selectedDialCode === "1" && isRegionlessNanp(numeric);
-      if (!isRegionlessNanpNumber && (!alreadySelected || !areaCodeMatch)) {
+      if (!isRegionlessNanpNumber && !alreadySelected) {
         for (let j = 0; j < iso2Codes.length; j++) {
           if (iso2Codes[j]) {
             return iso2Codes[j];
@@ -3132,7 +3132,7 @@ var intlTelInput = Object.assign(
     attachUtils,
     startedLoadingUtilsScript: false,
     startedLoadingAutoCountry: false,
-    version: "25.0.2"
+    version: "25.1.0"
   }
 );
 var intl_tel_input_default = intlTelInput;