Fix strictMode issue: type max len number, select all, can't type 0

jackocnr · May 12, 2024 · fef25d9 · fef25d9
1 parent 9bb2c9a
commit fef25d9
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 11 deletions.
diff --git a/build/js/intlTelInput.js b/build/js/intlTelInput.js
@@ -2061,7 +2061,9 @@ var factoryOutput = (() => {
               const fullNumber = this._getFullNumber();
               const coreNumber = intlTelInput.utils.getCoreNumber(fullNumber, this.selectedCountryData.iso2);
               const hasReachedMaxLength = this.maxCoreNumberLength && coreNumber.length >= this.maxCoreNumberLength;
-              if (!isAllowedChar || hasReachedMaxLength) {
+              const selectedText = this.telInput.value.substring(this.telInput.selectionStart, this.telInput.selectionEnd);
+              const hasSelectedDigit = /\d/.test(selectedText);
+              if (!isAllowedChar || hasReachedMaxLength && !hasSelectedDigit) {
                 e.preventDefault();
               }
             }

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
@@ -2060,7 +2060,9 @@ var factoryOutput = (() => {
               const fullNumber = this._getFullNumber();
               const coreNumber = intlTelInput.utils.getCoreNumber(fullNumber, this.selectedCountryData.iso2);
               const hasReachedMaxLength = this.maxCoreNumberLength && coreNumber.length >= this.maxCoreNumberLength;
-              if (!isAllowedChar || hasReachedMaxLength) {
+              const selectedText = this.telInput.value.substring(this.telInput.selectionStart, this.telInput.selectionEnd);
+              const hasSelectedDigit = /\d/.test(selectedText);
+              if (!isAllowedChar || hasReachedMaxLength && !hasSelectedDigit) {
                 e.preventDefault();
               }
             }

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
diff --git a/react/build/IntlTelInput.js b/react/build/IntlTelInput.js
diff --git a/react/build/IntlTelInputWithUtils.cjs b/react/build/IntlTelInputWithUtils.cjs
diff --git a/react/build/IntlTelInputWithUtils.js b/react/build/IntlTelInputWithUtils.js
diff --git a/react/demo/simple-bundle.js b/react/demo/simple-bundle.js
@@ -25578,7 +25578,9 @@
               const fullNumber = this._getFullNumber();
               const coreNumber = intlTelInput.utils.getCoreNumber(fullNumber, this.selectedCountryData.iso2);
               const hasReachedMaxLength = this.maxCoreNumberLength && coreNumber.length >= this.maxCoreNumberLength;
-              if (!isAllowedChar || hasReachedMaxLength) {
+              const selectedText = this.telInput.value.substring(this.telInput.selectionStart, this.telInput.selectionEnd);
+              const hasSelectedDigit = /\d/.test(selectedText);
+              if (!isAllowedChar || hasReachedMaxLength && !hasSelectedDigit) {
                 e.preventDefault();
               }
             }

diff --git a/react/demo/validation-bundle.js b/react/demo/validation-bundle.js
@@ -25578,7 +25578,9 @@
               const fullNumber = this._getFullNumber();
               const coreNumber = intlTelInput.utils.getCoreNumber(fullNumber, this.selectedCountryData.iso2);
               const hasReachedMaxLength = this.maxCoreNumberLength && coreNumber.length >= this.maxCoreNumberLength;
-              if (!isAllowedChar || hasReachedMaxLength) {
+              const selectedText = this.telInput.value.substring(this.telInput.selectionStart, this.telInput.selectionEnd);
+              const hasSelectedDigit = /\d/.test(selectedText);
+              if (!isAllowedChar || hasReachedMaxLength && !hasSelectedDigit) {
                 e.preventDefault();
               }
             }

diff --git a/src/js/intl-tel-input.ts b/src/js/intl-tel-input.ts
@@ -1232,7 +1232,10 @@ export class Iti {
             const fullNumber = this._getFullNumber();
             const coreNumber = intlTelInput.utils.getCoreNumber(fullNumber, this.selectedCountryData.iso2);
             const hasReachedMaxLength = this.maxCoreNumberLength && coreNumber.length >= this.maxCoreNumberLength;
-            if (!isAllowedChar || hasReachedMaxLength) {
+            const selectedText = this.telInput.value.substring(this.telInput.selectionStart, this.telInput.selectionEnd);
+            const hasSelectedDigit = /\d/.test(selectedText);
+            // ignore the char if (1) it's not an allowed char, or (2) the input has reached max length and no digit is selected (which will be replaced by the new char)
+            if (!isAllowedChar || (hasReachedMaxLength && !hasSelectedDigit)) {
               e.preventDefault();
             }
           }