Support area codes updating selected flag in national format

jackocnr · Dec 7, 2024 · a7427cc · a7427cc
1 parent 5313e92
commit a7427cc
Show file tree

Hide file tree

Showing 20 changed files with 1,515 additions and 1,224 deletions.
diff --git a/build/js/data.js b/build/js/data.js
@@ -114,7 +114,9 @@ var factoryOutput = (() => {
       "au",
       // Australia
       "61",
-      0
+      0,
+      null,
+      "0"
     ],
     [
       "at",
@@ -295,14 +297,16 @@ var factoryOutput = (() => {
       // Christmas Island
       "61",
       2,
-      ["89164"]
+      ["89164"],
+      "0"
     ],
     [
       "cc",
       // Cocos (Keeling) Islands
       "61",
       1,
-      ["89162"]
+      ["89162"],
+      "0"
     ],
     [
       "co",
@@ -535,7 +539,8 @@ var factoryOutput = (() => {
       // Guernsey
       "44",
       1,
-      ["1481", "7781", "7839", "7911"]
+      ["1481", "7781", "7839", "7911"],
+      "0"
     ],
     [
       "gn",
@@ -607,7 +612,8 @@ var factoryOutput = (() => {
       // Isle of Man
       "44",
       2,
-      ["1624", "74576", "7524", "7924", "7624"]
+      ["1624", "74576", "7524", "7924", "7624"],
+      "0"
     ],
     [
       "il",
@@ -637,7 +643,8 @@ var factoryOutput = (() => {
       // Jersey
       "44",
       3,
-      ["1534", "7509", "7700", "7797", "7829", "7937"]
+      ["1534", "7509", "7700", "7797", "7829", "7937"],
+      "0"
     ],
     [
       "jo",
@@ -649,7 +656,8 @@ var factoryOutput = (() => {
       // Kazakhstan
       "7",
       1,
-      ["33", "7"]
+      ["33", "7"],
+      "8"
     ],
     [
       "ke",
@@ -781,7 +789,8 @@ var factoryOutput = (() => {
       // Mayotte
       "262",
       1,
-      ["269", "639"]
+      ["269", "639"],
+      "0"
     ],
     [
       "mx",
@@ -824,7 +833,9 @@ var factoryOutput = (() => {
       "ma",
       // Morocco
       "212",
-      0
+      0,
+      null,
+      "0"
     ],
     [
       "mz",
@@ -985,7 +996,9 @@ var factoryOutput = (() => {
       "re",
       // Réunion
       "262",
-      0
+      0,
+      null,
+      "0"
     ],
     [
       "ro",
@@ -996,7 +1009,9 @@ var factoryOutput = (() => {
       "ru",
       // Russia
       "7",
-      0
+      0,
+      null,
+      "8"
     ],
     [
       "rw",
@@ -1268,7 +1283,9 @@ var factoryOutput = (() => {
       "gb",
       // United Kingdom
       "44",
-      0
+      0,
+      null,
+      "0"
     ],
     [
       "us",
@@ -1325,7 +1342,8 @@ var factoryOutput = (() => {
       // Western Sahara
       "212",
       1,
-      ["5288", "5289"]
+      ["5288", "5289"],
+      "0"
     ],
     [
       "ye",
@@ -1354,7 +1372,8 @@ var factoryOutput = (() => {
       priority: c[2] || 0,
       areaCodes: c[3] || null,
       partialAreaCodes: null,
-      nodeById: {}
+      nodeById: {},
+      nationalPrefix: c[4] || null
     };
   }
   var data_default = allCountries;

diff --git a/build/js/data.min.js b/build/js/data.min.js
diff --git a/build/js/intlTelInput.d.ts b/build/js/intlTelInput.d.ts
@@ -7,6 +7,7 @@ declare module "intl-tel-input/data" {
         areaCodes: string[] | null;
         partialAreaCodes: string[] | null;
         nodeById: object;
+        nationalPrefix: string | null;
     };
     const allCountries: Country[];
     export default allCountries;
@@ -331,6 +332,7 @@ declare module "intl-tel-input" {
         dialCode?: string;
         areaCodes?: string[];
         partialAreaCodes?: string[];
+        nationalPrefix?: string;
     };
     interface AllOptions {
         allowDropdown: boolean;
@@ -442,6 +444,7 @@ declare module "intl-tel-input" {
         private _updateValFromNumber;
         private _updateCountryFromNumber;
         private _isAreaCodeMatch;
+        private _ensureHasDialCode;
         private _getCountryFromNumber;
         private _highlightListItem;
         private _getCountryData;

diff --git a/build/js/intlTelInput.js b/build/js/intlTelInput.js
@@ -117,7 +117,9 @@ var factoryOutput = (() => {
       "au",
       // Australia
       "61",
-      0
+      0,
+      null,
+      "0"
     ],
     [
       "at",
@@ -298,14 +300,16 @@ var factoryOutput = (() => {
       // Christmas Island
       "61",
       2,
-      ["89164"]
+      ["89164"],
+      "0"
     ],
     [
       "cc",
       // Cocos (Keeling) Islands
       "61",
       1,
-      ["89162"]
+      ["89162"],
+      "0"
     ],
     [
       "co",
@@ -538,7 +542,8 @@ var factoryOutput = (() => {
       // Guernsey
       "44",
       1,
-      ["1481", "7781", "7839", "7911"]
+      ["1481", "7781", "7839", "7911"],
+      "0"
     ],
     [
       "gn",
@@ -610,7 +615,8 @@ var factoryOutput = (() => {
       // Isle of Man
       "44",
       2,
-      ["1624", "74576", "7524", "7924", "7624"]
+      ["1624", "74576", "7524", "7924", "7624"],
+      "0"
     ],
     [
       "il",
@@ -640,7 +646,8 @@ var factoryOutput = (() => {
       // Jersey
       "44",
       3,
-      ["1534", "7509", "7700", "7797", "7829", "7937"]
+      ["1534", "7509", "7700", "7797", "7829", "7937"],
+      "0"
     ],
     [
       "jo",
@@ -652,7 +659,8 @@ var factoryOutput = (() => {
       // Kazakhstan
       "7",
       1,
-      ["33", "7"]
+      ["33", "7"],
+      "8"
     ],
     [
       "ke",
@@ -784,7 +792,8 @@ var factoryOutput = (() => {
       // Mayotte
       "262",
       1,
-      ["269", "639"]
+      ["269", "639"],
+      "0"
     ],
     [
       "mx",
@@ -827,7 +836,9 @@ var factoryOutput = (() => {
       "ma",
       // Morocco
       "212",
-      0
+      0,
+      null,
+      "0"
     ],
     [
       "mz",
@@ -988,7 +999,9 @@ var factoryOutput = (() => {
       "re",
       // Réunion
       "262",
-      0
+      0,
+      null,
+      "0"
     ],
     [
       "ro",
@@ -999,7 +1012,9 @@ var factoryOutput = (() => {
       "ru",
       // Russia
       "7",
-      0
+      0,
+      null,
+      "8"
     ],
     [
       "rw",
@@ -1271,7 +1286,9 @@ var factoryOutput = (() => {
       "gb",
       // United Kingdom
       "44",
-      0
+      0,
+      null,
+      "0"
     ],
     [
       "us",
@@ -1328,7 +1345,8 @@ var factoryOutput = (() => {
       // Western Sahara
       "212",
       1,
-      ["5288", "5289"]
+      ["5288", "5289"],
+      "0"
     ],
     [
       "ye",
@@ -1357,7 +1375,8 @@ var factoryOutput = (() => {
       priority: c[2] || 0,
       areaCodes: c[3] || null,
       partialAreaCodes: null,
-      nodeById: {}
+      nodeById: {},
+      nationalPrefix: c[4] || null
     };
   }
   var data_default = allCountries;
@@ -2580,20 +2599,21 @@ var factoryOutput = (() => {
       }
       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;
+      const cleanNumber = hasPrefix ? number.substring(1) : number;
+      return `+${dialCode}${cleanNumber}`;
+    }
     _getCountryFromNumber(fullNumber) {
       const plusIndex = fullNumber.indexOf("+");
       let number = plusIndex ? fullNumber.substring(plusIndex) : fullNumber;
       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 dialCode = this._getDialCode(number, true);
       const numeric = getNumeric(number);
       if (dialCode) {

diff --git a/build/js/intlTelInput.min.js b/build/js/intlTelInput.min.js