@influenzanet/case-web-app-core 2.9.7-staging → 2.9.8-staging

package/build/index.es.js

@@ -20990,6 +20990,67 @@ var COUNTRY_CODES = [
 	}
 ];
 
+var DEFAULT_COUNTRY_CODES = COUNTRY_CODES.map(function (country) { return country.code; });
+// "+" and the "00" international dialling prefix are the only markers that make a number
+// unambiguously international. A bare country code is not one: several of them (31, 33, 34, 36,
+// 39, ...) are also valid starts of an Italian mobile number, so reading those as a prefix would
+// corrupt numbers entered in national form.
+var INTERNATIONAL_PREFIX = /^\s*(?:\+|00)/;
+/**
+ * Splits a number written in international form into its country code and its national part, so a
+ * pasted or autofilled number that already carries the prefix does not get prefixed a second time.
+ * Returns null when the value is not in international form, or when no known country code matches
+ * it yet, leaving the caller free to keep treating it as a national number.
+ */
+var parseInternationalPhoneNumber = function (value, countryCodes) {
+    if (countryCodes === void 0) { countryCodes = DEFAULT_COUNTRY_CODES; }
+    var marker = INTERNATIONAL_PREFIX.exec(value);
+    if (!marker) {
+        return null;
+    }
+    var digits = value.slice(marker[0].length).replace(/\D/g, '');
+    var matches = countryCodes.filter(function (code) { return digits.startsWith(code.slice(1)); });
+    if (matches.length === 0) {
+        return null;
+    }
+    // The longest match wins, so a country code starting with another one is not shadowed by it.
+    var countryCode = matches.reduce(function (longest, code) {
+        return code.length > longest.length ? code : longest;
+    });
+    return { countryCode: countryCode, localNumber: digits.slice(countryCode.length - 1) };
+};
+/**
+ * Keeps the characters a national number may contain: digits, plus the spaces and hyphens people
+ * use to group them. A leading "+" is kept as well, so a number being typed in international form
+ * stays recognisable until enough digits are there to identify its country code.
+ */
+var sanitizePhoneNumberInput = function (value) {
+    // Both international markers are kept as a single "+", so a "00" number, or a "+" typed after a
+    // space, is still recognised as international by composePhoneNumber and never prefixed again.
+    var marker = INTERNATIONAL_PREFIX.exec(value);
+    if (marker) {
+        return '+' + value.slice(marker[0].length).replace(/[^\d\s-]/g, '');
+    }
+    return value.replace(/[^\d\s-]/g, '');
+};
+/**
+ * Builds the value the form works with out of the selected prefix and the national number.
+ */
+var composePhoneNumber = function (countryCode, localNumber) {
+    // A prefix on its own is not a phone number: emitting one would make an empty field read as a
+    // malformed number to the forms that treat the phone as optional. A value without any digit
+    // (a stray "+" or spaces) counts as empty for the same reason.
+    if (!/\d/.test(localNumber)) {
+        return '';
+    }
+    // A number still in international form has no country code of its own yet, so it is reported as
+    // it was typed rather than being prefixed again.
+    if (localNumber.startsWith('+')) {
+        return localNumber;
+    }
+    return countryCode + localNumber;
+};
+
 var PhoneNumberInput = function (_a) {
     var value = _a.value, onChange = _a.onChange, label = _a.label, placeholder = _a.placeholder, className = _a.className, autoFocus = _a.autoFocus, disabled = _a.disabled, error = _a.error, onBlur = _a.onBlur;
     var t = useTranslation(['dialogs']).t;
@@ -21004,18 +21065,26 @@ var PhoneNumberInput = function (_a) {
     }), phoneNumber = _c[0], setPhoneNumber = _c[1];
     var handleCountryCodeChange = function (newCode) {
         setCountryCode(newCode);
-        onChange(newCode + phoneNumber);
+        onChange(composePhoneNumber(newCode, phoneNumber));
     };
     var handlePhoneNumberChange = function (newNumber) {
-        // Strip non-numeric characters (keep spaces and hyphens for readability)
-        var cleanNumber = newNumber.replace(/[^\d\s-]/g, '');
+        // A number pasted or autofilled with its own prefix is split again, instead of being prefixed
+        // a second time with the selected country code.
+        var parsed = parseInternationalPhoneNumber(newNumber);
+        if (parsed) {
+            setCountryCode(parsed.countryCode);
+            setPhoneNumber(parsed.localNumber);
+            onChange(composePhoneNumber(parsed.countryCode, parsed.localNumber));
+            return;
+        }
+        var cleanNumber = sanitizePhoneNumberInput(newNumber);
         setPhoneNumber(cleanNumber);
-        onChange(countryCode + cleanNumber);
+        onChange(composePhoneNumber(countryCode, cleanNumber));
     };
     return (jsxs("div", __assign({ className: className }, { children: [label && (jsx("label", __assign({ className: "form-label mb-1" }, { children: label }), void 0)), jsxs("div", __assign({ className: "d-flex" }, { children: [jsx(SelectField, { className: "me-2", style: { width: '120px', flexShrink: 0 }, value: countryCode, onChange: function (event) { return handleCountryCodeChange(event.target.value); }, disabled: disabled, values: COUNTRY_CODES.map(function (country) { return ({
                             code: country.code,
                             label: "".concat(country.code, " ").concat(country.country)
-                        }); }) }, void 0), jsx(TextField, { type: "text", placeholder: placeholder || t('addPhone.phoneInputPlaceholder'), value: phoneNumber, autoFocus: autoFocus, autoComplete: "tel", disabled: disabled, className: "flex-grow-1", onChange: function (event) { return handlePhoneNumberChange(event.target.value); }, onBlur: onBlur, style: { marginBottom: 0 } }, void 0)] }), void 0), jsxs("small", __assign({ className: "text-muted mt-1 d-block" }, { children: [t('addPhone.completeNumber'), ": ", countryCode + phoneNumber] }), void 0), error && (jsx("div", __assign({ className: "text-danger mt-1 small" }, { children: error }), void 0))] }), void 0));
+                        }); }) }, void 0), jsx(TextField, { type: "text", placeholder: placeholder || t('addPhone.phoneInputPlaceholder'), value: phoneNumber, autoFocus: autoFocus, autoComplete: "tel", disabled: disabled, className: "flex-grow-1", onChange: function (event) { return handlePhoneNumberChange(event.target.value); }, onBlur: onBlur, style: { marginBottom: 0 } }, void 0)] }), void 0), jsxs("small", __assign({ className: "text-muted mt-1 d-block" }, { children: [t('addPhone.completeNumber'), ": ", composePhoneNumber(countryCode, phoneNumber) || countryCode] }), void 0), error && (jsx("div", __assign({ className: "text-danger mt-1 small" }, { children: error }), void 0))] }), void 0));
 };
 
 var marginBottomClass = "mb-2";
@@ -22712,9 +22781,14 @@ var AddPhone = function () {
         });
     };
     var updateFullPhoneNumber = function (countryCode, phoneNumber) {
-        var cleanNumber = phoneNumber.replace(/[^\d\s-]/g, "");
-        var fullPhone = countryCode + cleanNumber;
-        setFormData(function (prev) { return (__assign(__assign({}, prev), { countryCode: countryCode, phoneNumber: cleanNumber, newPhone: fullPhone })); });
+        // A number pasted or autofilled with its own prefix is split again, instead of being prefixed
+        // a second time with the selected country code.
+        var parsed = parseInternationalPhoneNumber(phoneNumber);
+        var nextCountryCode = parsed ? parsed.countryCode : countryCode;
+        var cleanNumber = parsed
+            ? parsed.localNumber
+            : sanitizePhoneNumberInput(phoneNumber);
+        setFormData(function (prev) { return (__assign(__assign({}, prev), { countryCode: nextCountryCode, phoneNumber: cleanNumber, newPhone: composePhoneNumber(nextCountryCode, cleanNumber) })); });
     };
     var handleCountryCodeChange = function (event) {
         var newCountryCode = event.target.value;