fix: input mask with allowZeroAfterCallingCode props

AstrOOnauta · Nov 20, 2024 · cfcb0ce · cfcb0ce
1 parent a9ceada
commit cfcb0ce
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -198,7 +198,7 @@ const PhoneInput = forwardRef(
         callingCode ? callingCode : countryValue?.callingCode,
         countryValue?.cca2,
         customMask ? customMask : null,
-        allowZeroAfterCallingCode
+        allowZeroAfterCallingCode === false ? false : true
       );
 
       if (ref) {

diff --git a/lib/utils/getInputMask.js b/lib/utils/getInputMask.js
@@ -1,10 +1,16 @@
 import { countries } from '../constants/countries';
 
-function eliminateZeroAfterCallingCode(phoneNumber, callingCode) {
+function startsWithZero(phoneNumber, callingCode) {
   const newCode = callingCode.replace('+', '');
-  return phoneNumber.startsWith('0') ||
+  return (
+    phoneNumber.startsWith('0') ||
     phoneNumber.startsWith(`${newCode}0`)
-    ? phoneNumber.slice(newCode.length + 1, phoneNumber.length)
+  );
+}
+
+function eliminateZeroAfterCallingCode(phoneNumber, callingCode) {
+  return startsWithZero(phoneNumber, callingCode)
+    ? phoneNumber.slice(1, phoneNumber.length)
     : phoneNumber;
 }
 
@@ -73,7 +79,12 @@ export default function getInputMask(
     ? value
     : eliminateZeroAfterCallingCode(value, callingCode);
 
-  return matrix.replace(/(?!\+)./g, function (a) {
+  const newMatrix =
+    allowZeroAfterCallingCode && startsWithZero(value, callingCode)
+      ? '#' + matrix
+      : matrix;
+
+  return newMatrix.replace(/(?!\+)./g, function (a) {
     return /[#\d]/.test(a) && i < newValue.length
       ? newValue.charAt(i++)
       : i >= newValue.length