From a43c546e3454438f2660555b49459eb4a63e630c Mon Sep 17 00:00:00 2001 From: Corentin Thomasset Date: Sun, 7 May 2023 13:04:55 +0200 Subject: [PATCH] fix(phone-parser): use default country code --- .../phone-parser-and-formatter.models.ts | 6 +++--- .../phone-parser-and-formatter.vue | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/tools/phone-parser-and-formatter/phone-parser-and-formatter.models.ts b/src/tools/phone-parser-and-formatter/phone-parser-and-formatter.models.ts index 1e2a483d..e8bbb177 100644 --- a/src/tools/phone-parser-and-formatter/phone-parser-and-formatter.models.ts +++ b/src/tools/phone-parser-and-formatter/phone-parser-and-formatter.models.ts @@ -1,4 +1,4 @@ -import type { NumberType } from 'libphonenumber-js/types'; +import type { CountryCode, NumberType } from 'libphonenumber-js/types'; import lookup from 'country-code-lookup'; export { formatTypeToHumanReadable, getFullCountryName, getDefaultCountryCode }; @@ -32,10 +32,10 @@ function getFullCountryName(countryCode: string | undefined) { function getDefaultCountryCode({ locale = window.navigator.language, defaultCode = 'FR', -}: { locale?: string; defaultCode?: string } = {}): string { +}: { locale?: string; defaultCode?: CountryCode } = {}): CountryCode { const countryCode = locale.split('-')[1]?.toUpperCase(); if (!countryCode) return defaultCode; - return lookup.byIso(countryCode)?.iso2 ?? defaultCode; + return (lookup.byIso(countryCode)?.iso2 ?? defaultCode) as CountryCode; } diff --git a/src/tools/phone-parser-and-formatter/phone-parser-and-formatter.vue b/src/tools/phone-parser-and-formatter/phone-parser-and-formatter.vue index d17356a9..dad4ddc3 100644 --- a/src/tools/phone-parser-and-formatter/phone-parser-and-formatter.vue +++ b/src/tools/phone-parser-and-formatter/phone-parser-and-formatter.vue @@ -50,7 +50,7 @@ const validation = useValidation({ const parsedDetails = computed(() => { if (!validation.isValid) return undefined; - const parsed = withDefaultOnError(() => parsePhoneNumber(rawPhone.value, 'FR'), undefined); + const parsed = withDefaultOnError(() => parsePhoneNumber(rawPhone.value, defaultCountryCode.value), undefined); if (!parsed) return undefined;