Dont remove national prefix digit when separateDialCode enabled

jackocnr · Dec 8, 2024 · b8174f5 · b8174f5
1 parent 38d5137
commit b8174f5
Show file tree

Hide file tree

Showing 15 changed files with 16 additions and 15 deletions.
diff --git a/build/js/intlTelInput.js b/build/js/intlTelInput.js
@@ -2585,7 +2585,7 @@ var factoryOutput = (() => {
       if (alreadyHasPlus || !dialCode) {
         return number;
       }
-      const hasPrefix = nationalPrefix && number.charAt(0) === nationalPrefix;
+      const hasPrefix = nationalPrefix && number.charAt(0) === nationalPrefix && !this.options.separateDialCode;
       const cleanNumber = hasPrefix ? number.substring(1) : number;
       return `+${dialCode}${cleanNumber}`;
     }

diff --git a/build/js/intlTelInput.min.js b/build/js/intlTelInput.min.js
diff --git a/build/js/intlTelInputWithUtils.js b/build/js/intlTelInputWithUtils.js
@@ -2584,7 +2584,7 @@ var factoryOutput = (() => {
       if (alreadyHasPlus || !dialCode) {
         return number;
       }
-      const hasPrefix = nationalPrefix && number.charAt(0) === nationalPrefix;
+      const hasPrefix = nationalPrefix && number.charAt(0) === nationalPrefix && !this.options.separateDialCode;
       const cleanNumber = hasPrefix ? number.substring(1) : number;
       return `+${dialCode}${cleanNumber}`;
     }

diff --git a/build/js/intlTelInputWithUtils.min.js b/build/js/intlTelInputWithUtils.min.js
diff --git a/react/build/IntlTelInput.cjs b/react/build/IntlTelInput.cjs
@@ -2580,7 +2580,7 @@ var Iti = class {
     if (alreadyHasPlus || !dialCode) {
       return number;
     }
-    const hasPrefix = nationalPrefix && number.charAt(0) === nationalPrefix;
+    const hasPrefix = nationalPrefix && number.charAt(0) === nationalPrefix && !this.options.separateDialCode;
     const cleanNumber = hasPrefix ? number.substring(1) : number;
     return `+${dialCode}${cleanNumber}`;
   }

diff --git a/react/build/IntlTelInput.js b/react/build/IntlTelInput.js
@@ -2544,7 +2544,7 @@ var Iti = class {
     if (alreadyHasPlus || !dialCode) {
       return number;
     }
-    const hasPrefix = nationalPrefix && number.charAt(0) === nationalPrefix;
+    const hasPrefix = nationalPrefix && number.charAt(0) === nationalPrefix && !this.options.separateDialCode;
     const cleanNumber = hasPrefix ? number.substring(1) : number;
     return `+${dialCode}${cleanNumber}`;
   }

diff --git a/react/build/IntlTelInputWithUtils.cjs b/react/build/IntlTelInputWithUtils.cjs
@@ -2580,7 +2580,7 @@ var Iti = class {
     if (alreadyHasPlus || !dialCode) {
       return number;
     }
-    const hasPrefix = nationalPrefix && number.charAt(0) === nationalPrefix;
+    const hasPrefix = nationalPrefix && number.charAt(0) === nationalPrefix && !this.options.separateDialCode;
     const cleanNumber = hasPrefix ? number.substring(1) : number;
     return `+${dialCode}${cleanNumber}`;
   }

diff --git a/react/build/IntlTelInputWithUtils.js b/react/build/IntlTelInputWithUtils.js
@@ -2544,7 +2544,7 @@ var Iti = class {
     if (alreadyHasPlus || !dialCode) {
       return number;
     }
-    const hasPrefix = nationalPrefix && number.charAt(0) === nationalPrefix;
+    const hasPrefix = nationalPrefix && number.charAt(0) === nationalPrefix && !this.options.separateDialCode;
     const cleanNumber = hasPrefix ? number.substring(1) : number;
     return `+${dialCode}${cleanNumber}`;
   }

diff --git a/react/demo/set-number/set-number-bundle.js b/react/demo/set-number/set-number-bundle.js
@@ -26131,7 +26131,7 @@
       if (alreadyHasPlus || !dialCode) {
         return number;
       }
-      const hasPrefix = nationalPrefix && number.charAt(0) === nationalPrefix;
+      const hasPrefix = nationalPrefix && number.charAt(0) === nationalPrefix && !this.options.separateDialCode;
       const cleanNumber = hasPrefix ? number.substring(1) : number;
       return `+${dialCode}${cleanNumber}`;
     }

diff --git a/react/demo/simple/simple-bundle.js b/react/demo/simple/simple-bundle.js
@@ -26131,7 +26131,7 @@
       if (alreadyHasPlus || !dialCode) {
         return number;
       }
-      const hasPrefix = nationalPrefix && number.charAt(0) === nationalPrefix;
+      const hasPrefix = nationalPrefix && number.charAt(0) === nationalPrefix && !this.options.separateDialCode;
       const cleanNumber = hasPrefix ? number.substring(1) : number;
       return `+${dialCode}${cleanNumber}`;
     }

diff --git a/react/demo/toggle-disabled/toggle-disabled-bundle.js b/react/demo/toggle-disabled/toggle-disabled-bundle.js
@@ -26131,7 +26131,7 @@
       if (alreadyHasPlus || !dialCode) {
         return number;
       }
-      const hasPrefix = nationalPrefix && number.charAt(0) === nationalPrefix;
+      const hasPrefix = nationalPrefix && number.charAt(0) === nationalPrefix && !this.options.separateDialCode;
       const cleanNumber = hasPrefix ? number.substring(1) : number;
       return `+${dialCode}${cleanNumber}`;
     }

diff --git a/react/demo/validation/validation-bundle.js b/react/demo/validation/validation-bundle.js
@@ -26131,7 +26131,7 @@
       if (alreadyHasPlus || !dialCode) {
         return number;
       }
-      const hasPrefix = nationalPrefix && number.charAt(0) === nationalPrefix;
+      const hasPrefix = nationalPrefix && number.charAt(0) === nationalPrefix && !this.options.separateDialCode;
       const cleanNumber = hasPrefix ? number.substring(1) : number;
       return `+${dialCode}${cleanNumber}`;
     }

diff --git a/src/js/intl-tel-input.ts b/src/js/intl-tel-input.ts
@@ -1421,7 +1421,8 @@ export class Iti {
     if (alreadyHasPlus || !dialCode) {
       return number;
     }
-    const hasPrefix = nationalPrefix && number.charAt(0) === nationalPrefix;
+    //* Don't remove "nationalPrefix" digit if separateDialCode is enabled, as it can be part of a valid area code e.g. in Russia then have area codes starting with 8, which is also the national prefix digit.
+    const hasPrefix = nationalPrefix && number.charAt(0) === nationalPrefix && !this.options.separateDialCode;
     const cleanNumber = hasPrefix ? number.substring(1) : number;
     return `+${dialCode}${cleanNumber}`;
   }

diff --git a/vue/build/IntlTelInput.mjs b/vue/build/IntlTelInput.mjs
@@ -2153,7 +2153,7 @@ class G {
     const { dialCode: e, nationalPrefix: i } = this.selectedCountryData;
     if (t.charAt(0) === "+" || !e)
       return t;
-    const o = i && t.charAt(0) === i ? t.substring(1) : t;
+    const o = i && t.charAt(0) === i && !this.options.separateDialCode ? t.substring(1) : t;
     return `+${e}${o}`;
   }
   _getCountryFromNumber(t) {

diff --git a/vue/build/IntlTelInputWithUtils.mjs b/vue/build/IntlTelInputWithUtils.mjs
@@ -2153,7 +2153,7 @@ class K2 {
     const { dialCode: n, nationalPrefix: r } = this.selectedCountryData;
     if (e.charAt(0) === "+" || !n)
       return e;
-    const c = r && e.charAt(0) === r ? e.substring(1) : e;
+    const c = r && e.charAt(0) === r && !this.options.separateDialCode ? e.substring(1) : e;
     return `+${n}${c}`;
   }
   _getCountryFromNumber(e) {