@ews-admin/global-design-system 1.23.0 → 1.25.0

package/dist/index.js

@@ -172,6 +172,17 @@ function extractCountryCodeFromPhoneNumber(phoneNumber, country) {
             .trim();
         return { countryCode: matched.code, cleanedPhoneNumber: cleaned };
     }
+    // Same dial code, but without the leading "+" — e.g. the backend's canonical
+    // digits-only storage format ("221770000010" instead of "+221770000010").
+    // Without this check the caller below would treat the whole string (dial
+    // code digits included) as the local part.
+    const bareMatch = COUNTRY_CODES.find(({ code }) => phoneNumber.startsWith(code.slice(1)));
+    if (bareMatch) {
+        const cleaned = phoneNumber
+            .replace(new RegExp(`^${bareMatch.code.slice(1)}\\s*`), "")
+            .trim();
+        return { countryCode: bareMatch.code, cleanedPhoneNumber: cleaned };
+    }
     return {
         countryCode: getDefaultCountryCode(phoneNumber, country),
         cleanedPhoneNumber: phoneNumber.trim(),
@@ -179,13 +190,19 @@ function extractCountryCodeFromPhoneNumber(phoneNumber, country) {
 }
 /**
  * Formats a phone number by prepending the country code if not already present.
- * If the number already starts with a known country code it is returned as-is.
- * Leading zeros, spaces and dashes are stripped from the local part before formatting.
+ * If the number already starts with a known country code (with or without the
+ * leading "+") it is returned unchanged except for the "+" being added when
+ * missing. Leading zeros, spaces and dashes are stripped from the local part
+ * before formatting.
  *
  * @example
- * formatPhoneNumberWithCountryCode("77123456", "+221")    // "+22177123456"
+ * formatPhoneNumberWithCountryCode("77123456", "+221")     // "+22177123456"
  * formatPhoneNumberWithCountryCode("+22177123456", "+221") // "+22177123456" (unchanged)
- * formatPhoneNumberWithCountryCode("077123456", "+221")   // "+22177123456" (leading 0 stripped)
+ * formatPhoneNumberWithCountryCode("077123456", "+221")    // "+22177123456" (leading 0 stripped)
+ * formatPhoneNumberWithCountryCode("22177123456")          // "+22177123456" (backend's
+ *                                                           //   canonical digits-only
+ *                                                           //   storage format — just add "+",
+ *                                                           //   don't re-prepend the dial code)
  */
 function formatPhoneNumberWithCountryCode(phoneNumber, countryCode = "+221") {
     const trimmed = phoneNumber?.trim() || "";
@@ -195,6 +212,14 @@ function formatPhoneNumberWithCountryCode(phoneNumber, countryCode = "+221") {
     if (COUNTRY_CODES.some(({ code }) => trimmed.startsWith(code))) {
         return trimmed;
     }
+    // Same dial code, but without the leading "+" (e.g. "221770000010", the
+    // backend's canonical digits-only storage format). Just add the "+" —
+    // re-prepending countryCode here would double the dial-code digits
+    // ("+221221770000010").
+    const bareMatch = COUNTRY_CODES.find(({ code }) => trimmed.startsWith(code.slice(1)));
+    if (bareMatch) {
+        return `+${trimmed}`;
+    }
     // Strip leading zeros, spaces, dashes and + signs from the local part
     const cleaned = trimmed.replace(/^[\s+0-]*/, "").trim();
     if (!cleaned)