Fix: isValidNumber returning false for extensions

jackocnr · Aug 7, 2024 · b550e01 · b550e01
1 parent e04b42c
commit b550e01
Show file tree

Hide file tree

Showing 15 changed files with 208 additions and 48 deletions.
diff --git a/build/js/intlTelInput.d.ts b/build/js/intlTelInput.d.ts
@@ -969,7 +969,9 @@ declare module "intl-tel-input" {
         getSelectedCountryData(): SelectedCountryData;
         getValidationError(): number;
         isValidNumber(): boolean | null;
+        private _utilsIsPossibleNumber;
         isValidNumberPrecise(): boolean | null;
+        private _utilsIsValidNumber;
         setCountry(iso2: string): void;
         setNumber(number: string): void;
         setPlaceholderNumberType(type: NumberType): void;

diff --git a/build/js/intlTelInput.js b/build/js/intlTelInput.js
@@ -2740,17 +2740,31 @@ var factoryOutput = (() => {
     //* Validate the input val
     isValidNumber() {
       const val = this._getFullNumber();
-      if (/\p{L}/u.test(val)) {
-        return false;
+      const alphaCharPosition = val.search(/\p{L}/u);
+      if (alphaCharPosition > -1) {
+        const beforeAlphaChar = val.substring(0, alphaCharPosition);
+        const beforeAlphaIsValid = this._utilsIsPossibleNumber(beforeAlphaChar);
+        const isValid = this._utilsIsPossibleNumber(val);
+        return beforeAlphaIsValid && isValid;
       }
+      return this._utilsIsPossibleNumber(val);
+    }
+    _utilsIsPossibleNumber(val) {
       return intlTelInput.utils ? intlTelInput.utils.isPossibleNumber(val, this.selectedCountryData.iso2, this.options.validationNumberType) : null;
     }
     //* Validate the input val (precise)
     isValidNumberPrecise() {
       const val = this._getFullNumber();
-      if (/\p{L}/u.test(val)) {
-        return false;
+      const alphaCharPosition = val.search(/\p{L}/u);
+      if (alphaCharPosition > -1) {
+        const beforeAlphaChar = val.substring(0, alphaCharPosition);
+        const beforeAlphaIsValid = this._utilsIsValidNumber(beforeAlphaChar);
+        const isValid = this._utilsIsValidNumber(val);
+        return beforeAlphaIsValid && isValid;
       }
+      return this._utilsIsValidNumber(val);
+    }
+    _utilsIsValidNumber(val) {
       return intlTelInput.utils ? intlTelInput.utils.isValidNumber(val, this.selectedCountryData.iso2) : null;
     }
     //* Update the selected country, and update the input val accordingly.

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
@@ -2739,17 +2739,31 @@ var factoryOutput = (() => {
     //* Validate the input val
     isValidNumber() {
       const val = this._getFullNumber();
-      if (/\p{L}/u.test(val)) {
-        return false;
+      const alphaCharPosition = val.search(/\p{L}/u);
+      if (alphaCharPosition > -1) {
+        const beforeAlphaChar = val.substring(0, alphaCharPosition);
+        const beforeAlphaIsValid = this._utilsIsPossibleNumber(beforeAlphaChar);
+        const isValid = this._utilsIsPossibleNumber(val);
+        return beforeAlphaIsValid && isValid;
       }
+      return this._utilsIsPossibleNumber(val);
+    }
+    _utilsIsPossibleNumber(val) {
       return intlTelInput.utils ? intlTelInput.utils.isPossibleNumber(val, this.selectedCountryData.iso2, this.options.validationNumberType) : null;
     }
     //* Validate the input val (precise)
     isValidNumberPrecise() {
       const val = this._getFullNumber();
-      if (/\p{L}/u.test(val)) {
-        return false;
+      const alphaCharPosition = val.search(/\p{L}/u);
+      if (alphaCharPosition > -1) {
+        const beforeAlphaChar = val.substring(0, alphaCharPosition);
+        const beforeAlphaIsValid = this._utilsIsValidNumber(beforeAlphaChar);
+        const isValid = this._utilsIsValidNumber(val);
+        return beforeAlphaIsValid && isValid;
       }
+      return this._utilsIsValidNumber(val);
+    }
+    _utilsIsValidNumber(val) {
       return intlTelInput.utils ? intlTelInput.utils.isValidNumber(val, this.selectedCountryData.iso2) : null;
     }
     //* Update the selected country, and update the input val accordingly.

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
@@ -2735,17 +2735,31 @@ var Iti = class {
   //* Validate the input val
   isValidNumber() {
     const val = this._getFullNumber();
-    if (/\p{L}/u.test(val)) {
-      return false;
+    const alphaCharPosition = val.search(/\p{L}/u);
+    if (alphaCharPosition > -1) {
+      const beforeAlphaChar = val.substring(0, alphaCharPosition);
+      const beforeAlphaIsValid = this._utilsIsPossibleNumber(beforeAlphaChar);
+      const isValid = this._utilsIsPossibleNumber(val);
+      return beforeAlphaIsValid && isValid;
     }
+    return this._utilsIsPossibleNumber(val);
+  }
+  _utilsIsPossibleNumber(val) {
     return intlTelInput.utils ? intlTelInput.utils.isPossibleNumber(val, this.selectedCountryData.iso2, this.options.validationNumberType) : null;
   }
   //* Validate the input val (precise)
   isValidNumberPrecise() {
     const val = this._getFullNumber();
-    if (/\p{L}/u.test(val)) {
-      return false;
+    const alphaCharPosition = val.search(/\p{L}/u);
+    if (alphaCharPosition > -1) {
+      const beforeAlphaChar = val.substring(0, alphaCharPosition);
+      const beforeAlphaIsValid = this._utilsIsValidNumber(beforeAlphaChar);
+      const isValid = this._utilsIsValidNumber(val);
+      return beforeAlphaIsValid && isValid;
     }
+    return this._utilsIsValidNumber(val);
+  }
+  _utilsIsValidNumber(val) {
     return intlTelInput.utils ? intlTelInput.utils.isValidNumber(val, this.selectedCountryData.iso2) : null;
   }
   //* Update the selected country, and update the input val accordingly.

diff --git a/react/build/IntlTelInput.d.ts b/react/build/IntlTelInput.d.ts
@@ -969,7 +969,9 @@ declare module "intl-tel-input" {
         getSelectedCountryData(): SelectedCountryData;
         getValidationError(): number;
         isValidNumber(): boolean | null;
+        private _utilsIsPossibleNumber;
         isValidNumberPrecise(): boolean | null;
+        private _utilsIsValidNumber;
         setCountry(iso2: string): void;
         setNumber(number: string): void;
         setPlaceholderNumberType(type: NumberType): void;

diff --git a/react/build/IntlTelInput.js b/react/build/IntlTelInput.js
@@ -2699,17 +2699,31 @@ var Iti = class {
   //* Validate the input val
   isValidNumber() {
     const val = this._getFullNumber();
-    if (/\p{L}/u.test(val)) {
-      return false;
+    const alphaCharPosition = val.search(/\p{L}/u);
+    if (alphaCharPosition > -1) {
+      const beforeAlphaChar = val.substring(0, alphaCharPosition);
+      const beforeAlphaIsValid = this._utilsIsPossibleNumber(beforeAlphaChar);
+      const isValid = this._utilsIsPossibleNumber(val);
+      return beforeAlphaIsValid && isValid;
     }
+    return this._utilsIsPossibleNumber(val);
+  }
+  _utilsIsPossibleNumber(val) {
     return intlTelInput.utils ? intlTelInput.utils.isPossibleNumber(val, this.selectedCountryData.iso2, this.options.validationNumberType) : null;
   }
   //* Validate the input val (precise)
   isValidNumberPrecise() {
     const val = this._getFullNumber();
-    if (/\p{L}/u.test(val)) {
-      return false;
+    const alphaCharPosition = val.search(/\p{L}/u);
+    if (alphaCharPosition > -1) {
+      const beforeAlphaChar = val.substring(0, alphaCharPosition);
+      const beforeAlphaIsValid = this._utilsIsValidNumber(beforeAlphaChar);
+      const isValid = this._utilsIsValidNumber(val);
+      return beforeAlphaIsValid && isValid;
     }
+    return this._utilsIsValidNumber(val);
+  }
+  _utilsIsValidNumber(val) {
     return intlTelInput.utils ? intlTelInput.utils.isValidNumber(val, this.selectedCountryData.iso2) : null;
   }
   //* Update the selected country, and update the input val accordingly.

diff --git a/react/build/IntlTelInputWithUtils.cjs b/react/build/IntlTelInputWithUtils.cjs
@@ -2735,17 +2735,31 @@ var Iti = class {
   //* Validate the input val
   isValidNumber() {
     const val = this._getFullNumber();
-    if (/\p{L}/u.test(val)) {
-      return false;
+    const alphaCharPosition = val.search(/\p{L}/u);
+    if (alphaCharPosition > -1) {
+      const beforeAlphaChar = val.substring(0, alphaCharPosition);
+      const beforeAlphaIsValid = this._utilsIsPossibleNumber(beforeAlphaChar);
+      const isValid = this._utilsIsPossibleNumber(val);
+      return beforeAlphaIsValid && isValid;
     }
+    return this._utilsIsPossibleNumber(val);
+  }
+  _utilsIsPossibleNumber(val) {
     return intlTelInput.utils ? intlTelInput.utils.isPossibleNumber(val, this.selectedCountryData.iso2, this.options.validationNumberType) : null;
   }
   //* Validate the input val (precise)
   isValidNumberPrecise() {
     const val = this._getFullNumber();
-    if (/\p{L}/u.test(val)) {
-      return false;
+    const alphaCharPosition = val.search(/\p{L}/u);
+    if (alphaCharPosition > -1) {
+      const beforeAlphaChar = val.substring(0, alphaCharPosition);
+      const beforeAlphaIsValid = this._utilsIsValidNumber(beforeAlphaChar);
+      const isValid = this._utilsIsValidNumber(val);
+      return beforeAlphaIsValid && isValid;
     }
+    return this._utilsIsValidNumber(val);
+  }
+  _utilsIsValidNumber(val) {
     return intlTelInput.utils ? intlTelInput.utils.isValidNumber(val, this.selectedCountryData.iso2) : null;
   }
   //* Update the selected country, and update the input val accordingly.

diff --git a/react/build/IntlTelInputWithUtils.js b/react/build/IntlTelInputWithUtils.js
@@ -2699,17 +2699,31 @@ var Iti = class {
   //* Validate the input val
   isValidNumber() {
     const val = this._getFullNumber();
-    if (/\p{L}/u.test(val)) {
-      return false;
+    const alphaCharPosition = val.search(/\p{L}/u);
+    if (alphaCharPosition > -1) {
+      const beforeAlphaChar = val.substring(0, alphaCharPosition);
+      const beforeAlphaIsValid = this._utilsIsPossibleNumber(beforeAlphaChar);
+      const isValid = this._utilsIsPossibleNumber(val);
+      return beforeAlphaIsValid && isValid;
     }
+    return this._utilsIsPossibleNumber(val);
+  }
+  _utilsIsPossibleNumber(val) {
     return intlTelInput.utils ? intlTelInput.utils.isPossibleNumber(val, this.selectedCountryData.iso2, this.options.validationNumberType) : null;
   }
   //* Validate the input val (precise)
   isValidNumberPrecise() {
     const val = this._getFullNumber();
-    if (/\p{L}/u.test(val)) {
-      return false;
+    const alphaCharPosition = val.search(/\p{L}/u);
+    if (alphaCharPosition > -1) {
+      const beforeAlphaChar = val.substring(0, alphaCharPosition);
+      const beforeAlphaIsValid = this._utilsIsValidNumber(beforeAlphaChar);
+      const isValid = this._utilsIsValidNumber(val);
+      return beforeAlphaIsValid && isValid;
     }
+    return this._utilsIsValidNumber(val);
+  }
+  _utilsIsValidNumber(val) {
     return intlTelInput.utils ? intlTelInput.utils.isValidNumber(val, this.selectedCountryData.iso2) : null;
   }
   //* Update the selected country, and update the input val accordingly.

diff --git a/react/demo/set-number-bundle.js b/react/demo/set-number-bundle.js
@@ -26228,17 +26228,31 @@
     //* Validate the input val
     isValidNumber() {
       const val = this._getFullNumber();
-      if (/\p{L}/u.test(val)) {
-        return false;
+      const alphaCharPosition = val.search(/\p{L}/u);
+      if (alphaCharPosition > -1) {
+        const beforeAlphaChar = val.substring(0, alphaCharPosition);
+        const beforeAlphaIsValid = this._utilsIsPossibleNumber(beforeAlphaChar);
+        const isValid = this._utilsIsPossibleNumber(val);
+        return beforeAlphaIsValid && isValid;
       }
+      return this._utilsIsPossibleNumber(val);
+    }
+    _utilsIsPossibleNumber(val) {
       return intlTelInput.utils ? intlTelInput.utils.isPossibleNumber(val, this.selectedCountryData.iso2, this.options.validationNumberType) : null;
     }
     //* Validate the input val (precise)
     isValidNumberPrecise() {
       const val = this._getFullNumber();
-      if (/\p{L}/u.test(val)) {
-        return false;
+      const alphaCharPosition = val.search(/\p{L}/u);
+      if (alphaCharPosition > -1) {
+        const beforeAlphaChar = val.substring(0, alphaCharPosition);
+        const beforeAlphaIsValid = this._utilsIsValidNumber(beforeAlphaChar);
+        const isValid = this._utilsIsValidNumber(val);
+        return beforeAlphaIsValid && isValid;
       }
+      return this._utilsIsValidNumber(val);
+    }
+    _utilsIsValidNumber(val) {
       return intlTelInput.utils ? intlTelInput.utils.isValidNumber(val, this.selectedCountryData.iso2) : null;
     }
     //* Update the selected country, and update the input val accordingly.

diff --git a/react/demo/simple-bundle.js b/react/demo/simple-bundle.js
@@ -26228,17 +26228,31 @@
     //* Validate the input val
     isValidNumber() {
       const val = this._getFullNumber();
-      if (/\p{L}/u.test(val)) {
-        return false;
+      const alphaCharPosition = val.search(/\p{L}/u);
+      if (alphaCharPosition > -1) {
+        const beforeAlphaChar = val.substring(0, alphaCharPosition);
+        const beforeAlphaIsValid = this._utilsIsPossibleNumber(beforeAlphaChar);
+        const isValid = this._utilsIsPossibleNumber(val);
+        return beforeAlphaIsValid && isValid;
       }
+      return this._utilsIsPossibleNumber(val);
+    }
+    _utilsIsPossibleNumber(val) {
       return intlTelInput.utils ? intlTelInput.utils.isPossibleNumber(val, this.selectedCountryData.iso2, this.options.validationNumberType) : null;
     }
     //* Validate the input val (precise)
     isValidNumberPrecise() {
       const val = this._getFullNumber();
-      if (/\p{L}/u.test(val)) {
-        return false;
+      const alphaCharPosition = val.search(/\p{L}/u);
+      if (alphaCharPosition > -1) {
+        const beforeAlphaChar = val.substring(0, alphaCharPosition);
+        const beforeAlphaIsValid = this._utilsIsValidNumber(beforeAlphaChar);
+        const isValid = this._utilsIsValidNumber(val);
+        return beforeAlphaIsValid && isValid;
       }
+      return this._utilsIsValidNumber(val);
+    }
+    _utilsIsValidNumber(val) {
       return intlTelInput.utils ? intlTelInput.utils.isValidNumber(val, this.selectedCountryData.iso2) : null;
     }
     //* Update the selected country, and update the input val accordingly.

diff --git a/react/demo/toggle-disabled-bundle.js b/react/demo/toggle-disabled-bundle.js
@@ -26228,17 +26228,31 @@
     //* Validate the input val
     isValidNumber() {
       const val = this._getFullNumber();
-      if (/\p{L}/u.test(val)) {
-        return false;
+      const alphaCharPosition = val.search(/\p{L}/u);
+      if (alphaCharPosition > -1) {
+        const beforeAlphaChar = val.substring(0, alphaCharPosition);
+        const beforeAlphaIsValid = this._utilsIsPossibleNumber(beforeAlphaChar);
+        const isValid = this._utilsIsPossibleNumber(val);
+        return beforeAlphaIsValid && isValid;
       }
+      return this._utilsIsPossibleNumber(val);
+    }
+    _utilsIsPossibleNumber(val) {
       return intlTelInput.utils ? intlTelInput.utils.isPossibleNumber(val, this.selectedCountryData.iso2, this.options.validationNumberType) : null;
     }
     //* Validate the input val (precise)
     isValidNumberPrecise() {
       const val = this._getFullNumber();
-      if (/\p{L}/u.test(val)) {
-        return false;
+      const alphaCharPosition = val.search(/\p{L}/u);
+      if (alphaCharPosition > -1) {
+        const beforeAlphaChar = val.substring(0, alphaCharPosition);
+        const beforeAlphaIsValid = this._utilsIsValidNumber(beforeAlphaChar);
+        const isValid = this._utilsIsValidNumber(val);
+        return beforeAlphaIsValid && isValid;
       }
+      return this._utilsIsValidNumber(val);
+    }
+    _utilsIsValidNumber(val) {
       return intlTelInput.utils ? intlTelInput.utils.isValidNumber(val, this.selectedCountryData.iso2) : null;
     }
     //* Update the selected country, and update the input val accordingly.

diff --git a/react/demo/validation-bundle.js b/react/demo/validation-bundle.js
@@ -26228,17 +26228,31 @@
     //* Validate the input val
     isValidNumber() {
       const val = this._getFullNumber();
-      if (/\p{L}/u.test(val)) {
-        return false;
+      const alphaCharPosition = val.search(/\p{L}/u);
+      if (alphaCharPosition > -1) {
+        const beforeAlphaChar = val.substring(0, alphaCharPosition);
+        const beforeAlphaIsValid = this._utilsIsPossibleNumber(beforeAlphaChar);
+        const isValid = this._utilsIsPossibleNumber(val);
+        return beforeAlphaIsValid && isValid;
       }
+      return this._utilsIsPossibleNumber(val);
+    }
+    _utilsIsPossibleNumber(val) {
       return intlTelInput.utils ? intlTelInput.utils.isPossibleNumber(val, this.selectedCountryData.iso2, this.options.validationNumberType) : null;
     }
     //* Validate the input val (precise)
     isValidNumberPrecise() {
       const val = this._getFullNumber();
-      if (/\p{L}/u.test(val)) {
-        return false;
+      const alphaCharPosition = val.search(/\p{L}/u);
+      if (alphaCharPosition > -1) {
+        const beforeAlphaChar = val.substring(0, alphaCharPosition);
+        const beforeAlphaIsValid = this._utilsIsValidNumber(beforeAlphaChar);
+        const isValid = this._utilsIsValidNumber(val);
+        return beforeAlphaIsValid && isValid;
       }
+      return this._utilsIsValidNumber(val);
+    }
+    _utilsIsValidNumber(val) {
       return intlTelInput.utils ? intlTelInput.utils.isValidNumber(val, this.selectedCountryData.iso2) : null;
     }
     //* Update the selected country, and update the input val accordingly.