Fix validationNumberType=FIXED_LINE_OR_MOBILE

jackocnr · Jul 20, 2024 · bb34f63 · bb34f63
1 parent 18a25e7
commit bb34f63
Show file tree

Hide file tree

Showing 9 changed files with 1,610 additions and 1,550 deletions.
diff --git a/build/js/intlTelInputWithUtils.js b/build/js/intlTelInputWithUtils.js
diff --git a/build/js/intlTelInputWithUtils.min.js b/build/js/intlTelInputWithUtils.min.js
diff --git a/build/js/utils.js b/build/js/utils.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/set-number-bundle.js b/react/demo/set-number-bundle.js
diff --git a/react/demo/simple-bundle.js b/react/demo/simple-bundle.js
diff --git a/react/demo/validation-bundle.js b/react/demo/validation-bundle.js
diff --git a/src/js/utils.js b/src/js/utils.js
@@ -138,16 +138,28 @@ const isValidNumber = (number, countryCode) => {
   }
 };
 
+//* For internal use only - see isPossibleNumber.
+const isPossibleNumberForType = (phoneUtil, numberObj, numberTypeName) => {
+  const resultForType = phoneUtil.isPossibleNumberForTypeWithReason(numberObj, numberType[numberTypeName]);
+  const isPossibleForType = resultForType === i18n.phonenumbers.PhoneNumberUtil.ValidationResult.IS_POSSIBLE;
+  return isPossibleForType;
+};
+
 //* Check if given number is possible.
 const isPossibleNumber = (number, countryCode, numberTypeName) => {
   try {
     const phoneUtil = i18n.phonenumbers.PhoneNumberUtil.getInstance();
     const numberObj = phoneUtil.parseAndKeepRawInput(number, countryCode);
 
     if (numberTypeName) {
-      const resultForType = phoneUtil.isPossibleNumberForTypeWithReason(numberObj, numberType[numberTypeName]);
-      const isPossibleForType = resultForType === i18n.phonenumbers.PhoneNumberUtil.ValidationResult.IS_POSSIBLE;
-      return isPossibleForType;
+      const isPossible = isPossibleNumberForType(phoneUtil, numberObj, numberTypeName);
+      //* FIXED_LINE_OR_MOBILE does not behave how you would expect - it is its own category that is different to either MOBILE or FIXED_LINE (e.g. for US numbers which could be used for either purpose - it should really be called something like FIXED_LINE_SLASH_MOBILE). So here we make it more user friendly by checking if it's a possible number for any of those three categories. NOTE: this is actually in-line with how it behaves in other situations e.g. if you call isPossibleNumberForType with type="MOBILE" and the number set to a US number, it returns VALID even though it's type is technically FIXED_LINE_OR_MOBILE.
+      if (numberTypeName === "FIXED_LINE_OR_MOBILE") {
+        const isMobile = isPossibleNumberForType(phoneUtil, numberObj, "MOBILE");
+        const isFixedLine = isPossibleNumberForType(phoneUtil, numberObj, "FIXED_LINE");
+        return isMobile || isFixedLine || isPossible;
+      }
+      return isPossible;
     }
 
     //* Can't use phoneUtil.isPossibleNumber directly as it accepts IS_POSSIBLE_LOCAL_ONLY numbers e.g. local numbers that are much shorter.