monkey-style-guide-v2 0.0.66 → 0.0.67

package/fesm2022/monkey-style-guide-v2.mjs

@@ -16,8 +16,9 @@ import { HttpClient } from '@angular/common/http';
 import { format, parseISO, addYears, subYears, subMonths, addMonths, getMonth, getYear, startOfWeek, startOfMonth, endOfWeek, endOfMonth, isSameMonth, isBefore, isAfter, isToday, addDays, isWithinInterval, subDays } from 'date-fns';
 import { coerceBooleanProperty } from '@angular/cdk/coercion';
 import { getSupportedInputTypes } from '@angular/cdk/platform';
-import parsePhoneNumberFromString, { getCountries, getCountryCallingCode, getExampleNumber, AsYouType, isValidPhoneNumber } from 'libphonenumber-js';
+import parsePhoneNumberFromString, { getCountries, getCountryCallingCode, getExampleNumber, AsYouType } from 'libphonenumber-js';
 import examples from 'libphonenumber-js/examples.mobile.json';
+import { isValidPhoneNumber } from 'libphonenumber-js/max';
 import { hasModifierKey } from '@angular/cdk/keycodes';
 
 const counters = {};
@@ -5649,7 +5650,7 @@ class MonkeyInputPhoneComponent {
     getCountryByCallingCode(code) {
         const cleanCode = code.replace('+', '');
         return (getCountries().find((country) => {
-            return getCountryCallingCode(country) === cleanCode;
+            return country === cleanCode;
         }) || null);
     }
     isoToFlagEmoji(isoCode) {
@@ -5671,18 +5672,21 @@ class MonkeyInputPhoneComponent {
         return this.selectedCallingCode;
     }
     performValue(value) {
-        this._value = `${this.selectedCallingCode}${value}`;
+        const countryCode = `+${getCountryCallingCode(this.selectedCallingCode)}`;
+        this._value = `${countryCode}${value}`;
         this._onChange(this._value);
         this._onTouched(this._value);
     }
     validateValue() {
         const { phoneValid } = this;
         if (!phoneValid) {
-            const countryCode = this.getCountryByCallingCode(this.selectedCallingCode);
+            const countryCode = this.selectedCallingCode;
             const example = getExampleNumber(countryCode, examples);
+            const formatter = new AsYouType(countryCode);
+            const phoneAllowed = formatter.input(example.nationalNumber);
             this.ngControl?.control?.setErrors({
                 phone: true,
-                phoneAllowed: example?.nationalNumber
+                phoneAllowed
             });
         }
     }
@@ -5698,18 +5702,19 @@ class MonkeyInputPhoneComponent {
         if (isCountryChanged && detectedCallingCode) {
             this.selectedCallingCode = detectedCallingCode;
         }
-        const countryCode = this.getCountryByCallingCode(this.selectedCallingCode);
+        const countryCode = `+${getCountryCallingCode(this.selectedCallingCode)}`;
         if (!countryCode) {
             this.phoneFormatted = value;
             this.phoneValid = false;
             this.validateValue();
             return;
         }
-        const nationalPart = value.replace(this.selectedCallingCode, '').replace(/[^\d+]/g, '');
-        const formatter = new AsYouType(countryCode);
+        let nationalPart = value.replace(this.selectedCallingCode, '').replace(/[^\d+]/g, '');
+        nationalPart = nationalPart.replace(countryCode, '');
+        const formatter = new AsYouType(this.selectedCallingCode);
         this.phoneFormatted = formatter.input(nationalPart);
         this.performValue(nationalPart);
-        this.phoneValid = isValidPhoneNumber(nationalPart, countryCode);
+        this.phoneValid = isValidPhoneNumber(nationalPart, this.selectedCallingCode);
         this.validateValue();
     }
     ngAfterContentInit() { }