intl-tel-input 25.4.7 → 25.5.0

package/build/js/intlTelInputWithUtils.js

@@ -1,5 +1,5 @@
 /*
- * International Telephone Input v25.4.7
+ * International Telephone Input v25.5.0
  * https://github.com/jackocnr/intl-tel-input.git
  * Licensed under the MIT license
  */
@@ -2338,12 +2338,8 @@ var factoryOutput = (() => {
               const newFullNumber = this._getFullNumber(newValue);
               const coreNumber = intlTelInput.utils.getCoreNumber(newFullNumber, this.selectedCountryData.iso2);
               const hasExceededMaxLength = this.maxCoreNumberLength && coreNumber.length > this.maxCoreNumberLength;
-              let isChangingDialCode = false;
-              if (alreadyHasPlus) {
-                const currentCountry = this.selectedCountryData.iso2;
-                const newCountry = this._getCountryFromNumber(newFullNumber);
-                isChangingDialCode = newCountry !== currentCountry;
-              }
+              const newCountry = this._getNewCountryFromNumber(newFullNumber);
+              const isChangingDialCode = newCountry !== null;
               if (!isAllowedChar || hasExceededMaxLength && !isChangingDialCode && !isInitialPlus) {
                 e.preventDefault();
               }
@@ -2502,16 +2498,45 @@ var factoryOutput = (() => {
       let noCountriesAddedYet = true;
       this.countryList.innerHTML = "";
       const normalisedQuery = normaliseString(query);
+      const queryLength = normalisedQuery.length;
+      const iso2Matches = [];
+      const nameStartWith = [];
+      const nameContains = [];
+      const dialCodeMatches = [];
+      const dialCodeContains = [];
+      const initialsMatches = [];
       for (let i = 0; i < this.countries.length; i++) {
         const c = this.countries[i];
         const normalisedCountryName = normaliseString(c.name);
         const countryInitials = c.name.split(/[^a-zA-ZÀ-ÿа-яА-Я]/).map((word) => word[0]).join("").toLowerCase();
-        const fullDialCode = `+${c.dialCode}`;
-        if (isReset || normalisedCountryName.includes(normalisedQuery) || fullDialCode.includes(normalisedQuery) || c.iso2.includes(normalisedQuery) || countryInitials.includes(normalisedQuery)) {
-          const listItem = c.nodeById[this.id];
-          if (listItem) {
-            this.countryList.appendChild(listItem);
-          }
+        if (isReset || queryLength === 0) {
+          nameContains.push(c);
+        } else if (c.iso2.toLowerCase() === normalisedQuery) {
+          iso2Matches.push(c);
+        } else if (normalisedCountryName.startsWith(normalisedQuery)) {
+          nameStartWith.push(c);
+        } else if (normalisedCountryName.includes(normalisedQuery)) {
+          nameContains.push(c);
+        } else if (normalisedQuery === c.dialCode || normalisedQuery === `+${c.dialCode}`) {
+          dialCodeMatches.push(c);
+        } else if (`+${c.dialCode}`.includes(normalisedQuery)) {
+          dialCodeContains.push(c);
+        } else if (countryInitials.includes(normalisedQuery)) {
+          initialsMatches.push(c);
+        }
+      }
+      const matchedCountries = [
+        ...iso2Matches.sort((a, b) => a.priority - b.priority),
+        ...nameStartWith.sort((a, b) => a.priority - b.priority),
+        ...nameContains.sort((a, b) => a.priority - b.priority),
+        ...dialCodeMatches.sort((a, b) => a.priority - b.priority),
+        ...dialCodeContains.sort((a, b) => a.priority - b.priority),
+        ...initialsMatches.sort((a, b) => a.priority - b.priority)
+      ];
+      for (const c of matchedCountries) {
+        const listItem = c.nodeById[this.id];
+        if (listItem) {
+          this.countryList.appendChild(listItem);
           if (noCountriesAddedYet) {
             this._highlightListItem(listItem, false);
             noCountriesAddedYet = false;
@@ -2579,7 +2604,7 @@ var factoryOutput = (() => {
     //* Check if need to select a new country based on the given number
     //* Note: called from _setInitialState, keyup handler, setNumber.
     _updateCountryFromNumber(fullNumber) {
-      const iso2 = this._getCountryFromNumber(fullNumber);
+      const iso2 = this._getNewCountryFromNumber(fullNumber);
       if (iso2 !== null) {
         return this._setCountry(iso2);
       }
@@ -2595,7 +2620,10 @@ var factoryOutput = (() => {
       const cleanNumber = hasPrefix ? number.substring(1) : number;
       return `+${dialCode}${cleanNumber}`;
     }
-    _getCountryFromNumber(fullNumber) {
+    // Get the country ISO2 code from the given number
+    // BUT ONLY IF ITS CHANGED FROM THE CURRENTLY SELECTED COUNTRY
+    // NOTE: consider refactoring this to be more clear
+    _getNewCountryFromNumber(fullNumber) {
       const plusIndex = fullNumber.indexOf("+");
       let number = plusIndex ? fullNumber.substring(plusIndex) : fullNumber;
       const selectedIso2 = this.selectedCountryData.iso2;
@@ -2609,7 +2637,8 @@ var factoryOutput = (() => {
         if (!selectedIso2 && this.defaultCountry && iso2Codes.includes(this.defaultCountry)) {
           return this.defaultCountry;
         }
-        const alreadySelected = selectedIso2 && iso2Codes.includes(selectedIso2) && (numeric.length === dialCodeMatchNumeric.length || !this.selectedCountryData.areaCodes);
+        const hasAreaCodesButNoneMatched = this.selectedCountryData.areaCodes && numeric.length > dialCodeMatchNumeric.length;
+        const alreadySelected = selectedIso2 && iso2Codes.includes(selectedIso2) && !hasAreaCodesButNoneMatched;
         const isRegionlessNanpNumber = selectedDialCode === "1" && isRegionlessNanp(numeric);
         if (!isRegionlessNanpNumber && !alreadySelected) {
           for (let j = 0; j < iso2Codes.length; j++) {
@@ -3177,7 +3206,7 @@ var factoryOutput = (() => {
       attachUtils,
       startedLoadingUtilsScript: false,
       startedLoadingAutoCountry: false,
-      version: "25.4.7"
+      version: "25.5.0"
     }
   );
   var intl_tel_input_default = intlTelInput;