intl-tel-input 25.0.1 → 25.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "intl-tel-input",
-  "version": "25.0.1",
+  "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.1/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

@@ -45,8 +45,7 @@ var rawCountryData = [
     "ax",
     // Åland Islands
     "358",
-    1,
-    ["18"]
+    1
   ],
   [
     "al",
@@ -113,7 +112,9 @@ var rawCountryData = [
     "au",
     // Australia
     "61",
-    0
+    0,
+    null,
+    "0"
   ],
   [
     "at",
@@ -294,14 +295,16 @@ var rawCountryData = [
     // Christmas Island
     "61",
     2,
-    ["89164"]
+    ["89164"],
+    "0"
   ],
   [
     "cc",
     // Cocos (Keeling) Islands
     "61",
     1,
-    ["89162"]
+    ["89162"],
+    "0"
   ],
   [
     "co",
@@ -534,7 +537,8 @@ var rawCountryData = [
     // Guernsey
     "44",
     1,
-    ["1481", "7781", "7839", "7911"]
+    ["1481", "7781", "7839", "7911"],
+    "0"
   ],
   [
     "gn",
@@ -606,7 +610,8 @@ var rawCountryData = [
     // Isle of Man
     "44",
     2,
-    ["1624", "74576", "7524", "7924", "7624"]
+    ["1624", "74576", "7524", "7924", "7624"],
+    "0"
   ],
   [
     "il",
@@ -636,7 +641,8 @@ var rawCountryData = [
     // Jersey
     "44",
     3,
-    ["1534", "7509", "7700", "7797", "7829", "7937"]
+    ["1534", "7509", "7700", "7797", "7829", "7937"],
+    "0"
   ],
   [
     "jo",
@@ -648,7 +654,8 @@ var rawCountryData = [
     // Kazakhstan
     "7",
     1,
-    ["33", "7"]
+    ["33", "7"],
+    "8"
   ],
   [
     "ke",
@@ -780,7 +787,8 @@ var rawCountryData = [
     // Mayotte
     "262",
     1,
-    ["269", "639"]
+    ["269", "639"],
+    "0"
   ],
   [
     "mx",
@@ -823,7 +831,9 @@ var rawCountryData = [
     "ma",
     // Morocco
     "212",
-    0
+    0,
+    null,
+    "0"
   ],
   [
     "mz",
@@ -984,7 +994,9 @@ var rawCountryData = [
     "re",
     // Réunion
     "262",
-    0
+    0,
+    null,
+    "0"
   ],
   [
     "ro",
@@ -995,7 +1007,9 @@ var rawCountryData = [
     "ru",
     // Russia
     "7",
-    0
+    0,
+    null,
+    "8"
   ],
   [
     "rw",
@@ -1267,7 +1281,9 @@ var rawCountryData = [
     "gb",
     // United Kingdom
     "44",
-    0
+    0,
+    null,
+    "0"
   ],
   [
     "us",
@@ -1324,7 +1340,8 @@ var rawCountryData = [
     // Western Sahara
     "212",
     1,
-    ["5288", "5289"]
+    ["5288", "5289"],
+    "0"
   ],
   [
     "ye",
@@ -1352,7 +1369,8 @@ for (let i = 0; i < rawCountryData.length; i++) {
     dialCode: c[1],
     priority: c[2] || 0,
     areaCodes: c[3] || null,
-    nodeById: {}
+    nodeById: {},
+    nationalPrefix: c[4] || null
   };
 }
 var data_default = allCountries;
@@ -1895,7 +1913,8 @@ var Iti = class {
         for (let j = 0; j < c.areaCodes.length; j++) {
           const areaCode = c.areaCodes[j];
           for (let k = 1; k < areaCode.length; k++) {
-            const partialDialCode = c.dialCode + areaCode.substr(0, k);
+            const partialAreaCode = areaCode.substr(0, k);
+            const partialDialCode = c.dialCode + partialAreaCode;
             this._addToDialCodeMap(rootIso2Code, partialDialCode);
             this._addToDialCodeMap(c.iso2, partialDialCode);
           }
@@ -2555,25 +2574,35 @@ var Iti = class {
     }
     return false;
   }
+  _ensureHasDialCode(number) {
+    const { dialCode, nationalPrefix } = this.selectedCountryData;
+    const alreadyHasPlus = number.charAt(0) === "+";
+    if (alreadyHasPlus || !dialCode) {
+      return number;
+    }
+    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 iso2Codes = this.dialCodeToIso2Map[getNumeric(dialCode)];
-      const alreadySelected = iso2Codes.indexOf(this.selectedCountryData.iso2) !== -1 && numeric.length <= dialCode.length - 1;
+    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) {
         for (let j = 0; j < iso2Codes.length; j++) {
@@ -3139,7 +3168,7 @@ var intlTelInput = Object.assign(
     attachUtils,
     startedLoadingUtilsScript: false,
     startedLoadingAutoCountry: false,
-    version: "25.0.1"
+    version: "25.1.0"
   }
 );
 var intl_tel_input_default = intlTelInput;

package/react/build/IntlTelInput.d.ts

@@ -6,6 +6,7 @@ declare module "intl-tel-input/data" {
         priority: number;
         areaCodes: string[] | null;
         nodeById: object;
+        nationalPrefix: string | null;
     };
     const allCountries: Country[];
     export default allCountries;
@@ -324,10 +325,12 @@ declare module "intl-tel-input" {
         numberType: object;
     };
     type NumberType = "FIXED_LINE_OR_MOBILE" | "FIXED_LINE" | "MOBILE" | "PAGER" | "PERSONAL_NUMBER" | "PREMIUM_RATE" | "SHARED_COST" | "TOLL_FREE" | "UAN" | "UNKNOWN" | "VOICEMAIL" | "VOIP";
-    type SelectedCountryData = Country | {
+    type SelectedCountryData = {
         name?: string;
         iso2?: string;
         dialCode?: string;
+        areaCodes?: string[];
+        nationalPrefix?: string;
     };
     interface AllOptions {
         allowDropdown: boolean;
@@ -391,6 +394,7 @@ declare module "intl-tel-input" {
         private defaultCountry;
         private originalPaddingRight;
         private originalPaddingLeft;
+        private prevDialCodeMatch;
         private _handleHiddenInputSubmit;
         private _handleLabelClick;
         private _handleClickSelectedCountry;
@@ -438,6 +442,7 @@ declare module "intl-tel-input" {
         private _handleEnterKey;
         private _updateValFromNumber;
         private _updateCountryFromNumber;
+        private _ensureHasDialCode;
         private _getCountryFromNumber;
         private _highlightListItem;
         private _getCountryData;

package/react/build/IntlTelInput.js

@@ -9,8 +9,7 @@ var rawCountryData = [
     "ax",
     // Åland Islands
     "358",
-    1,
-    ["18"]
+    1
   ],
   [
     "al",
@@ -77,7 +76,9 @@ var rawCountryData = [
     "au",
     // Australia
     "61",
-    0
+    0,
+    null,
+    "0"
   ],
   [
     "at",
@@ -258,14 +259,16 @@ var rawCountryData = [
     // Christmas Island
     "61",
     2,
-    ["89164"]
+    ["89164"],
+    "0"
   ],
   [
     "cc",
     // Cocos (Keeling) Islands
     "61",
     1,
-    ["89162"]
+    ["89162"],
+    "0"
   ],
   [
     "co",
@@ -498,7 +501,8 @@ var rawCountryData = [
     // Guernsey
     "44",
     1,
-    ["1481", "7781", "7839", "7911"]
+    ["1481", "7781", "7839", "7911"],
+    "0"
   ],
   [
     "gn",
@@ -570,7 +574,8 @@ var rawCountryData = [
     // Isle of Man
     "44",
     2,
-    ["1624", "74576", "7524", "7924", "7624"]
+    ["1624", "74576", "7524", "7924", "7624"],
+    "0"
   ],
   [
     "il",
@@ -600,7 +605,8 @@ var rawCountryData = [
     // Jersey
     "44",
     3,
-    ["1534", "7509", "7700", "7797", "7829", "7937"]
+    ["1534", "7509", "7700", "7797", "7829", "7937"],
+    "0"
   ],
   [
     "jo",
@@ -612,7 +618,8 @@ var rawCountryData = [
     // Kazakhstan
     "7",
     1,
-    ["33", "7"]
+    ["33", "7"],
+    "8"
   ],
   [
     "ke",
@@ -744,7 +751,8 @@ var rawCountryData = [
     // Mayotte
     "262",
     1,
-    ["269", "639"]
+    ["269", "639"],
+    "0"
   ],
   [
     "mx",
@@ -787,7 +795,9 @@ var rawCountryData = [
     "ma",
     // Morocco
     "212",
-    0
+    0,
+    null,
+    "0"
   ],
   [
     "mz",
@@ -948,7 +958,9 @@ var rawCountryData = [
     "re",
     // Réunion
     "262",
-    0
+    0,
+    null,
+    "0"
   ],
   [
     "ro",
@@ -959,7 +971,9 @@ var rawCountryData = [
     "ru",
     // Russia
     "7",
-    0
+    0,
+    null,
+    "8"
   ],
   [
     "rw",
@@ -1231,7 +1245,9 @@ var rawCountryData = [
     "gb",
     // United Kingdom
     "44",
-    0
+    0,
+    null,
+    "0"
   ],
   [
     "us",
@@ -1288,7 +1304,8 @@ var rawCountryData = [
     // Western Sahara
     "212",
     1,
-    ["5288", "5289"]
+    ["5288", "5289"],
+    "0"
   ],
   [
     "ye",
@@ -1316,7 +1333,8 @@ for (let i = 0; i < rawCountryData.length; i++) {
     dialCode: c[1],
     priority: c[2] || 0,
     areaCodes: c[3] || null,
-    nodeById: {}
+    nodeById: {},
+    nationalPrefix: c[4] || null
   };
 }
 var data_default = allCountries;
@@ -1859,7 +1877,8 @@ var Iti = class {
         for (let j = 0; j < c.areaCodes.length; j++) {
           const areaCode = c.areaCodes[j];
           for (let k = 1; k < areaCode.length; k++) {
-            const partialDialCode = c.dialCode + areaCode.substr(0, k);
+            const partialAreaCode = areaCode.substr(0, k);
+            const partialDialCode = c.dialCode + partialAreaCode;
             this._addToDialCodeMap(rootIso2Code, partialDialCode);
             this._addToDialCodeMap(c.iso2, partialDialCode);
           }
@@ -2519,25 +2538,35 @@ var Iti = class {
     }
     return false;
   }
+  _ensureHasDialCode(number) {
+    const { dialCode, nationalPrefix } = this.selectedCountryData;
+    const alreadyHasPlus = number.charAt(0) === "+";
+    if (alreadyHasPlus || !dialCode) {
+      return number;
+    }
+    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 iso2Codes = this.dialCodeToIso2Map[getNumeric(dialCode)];
-      const alreadySelected = iso2Codes.indexOf(this.selectedCountryData.iso2) !== -1 && numeric.length <= dialCode.length - 1;
+    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) {
         for (let j = 0; j < iso2Codes.length; j++) {
@@ -3103,7 +3132,7 @@ var intlTelInput = Object.assign(
     attachUtils,
     startedLoadingUtilsScript: false,
     startedLoadingAutoCountry: false,
-    version: "25.0.1"
+    version: "25.1.0"
   }
 );
 var intl_tel_input_default = intlTelInput;