allaw-ui 4.3.2 → 4.3.4

package/dist/components/molecules/phoneNumberField/PhoneInput.js

@@ -12,24 +12,26 @@ var __assign = (this && this.__assign) || function () {
 import React, { useState, useRef, useEffect } from "react";
 import styles from "./PhoneInput.module.css";
 var formatPhone = function (value) {
-    // Garde uniquement les chiffres, espace tous les 2 chiffres (début)
+    // Garde uniquement les chiffres
     var digits = value.replace(/\D/g, "");
-    return digits.replace(/(\d{2})(?=\d)/g, "$1 ").trim();
-};
-var formatPhoneEnd = function (value) {
-    // Espace tous les 2 chiffres à partir de la fin, gère aussi les cas impairs
-    var digits = value.replace(/\D/g, "");
-    if (digits.length <= 2)
-        return digits;
-    var res = "";
-    var i = digits.length;
-    while (i > 2) {
-        res = " " + digits.slice(i - 2, i) + res;
-        i -= 2;
+    if (digits.startsWith("0")) {
+        // Espace tous les 2 chiffres (06 11 22 33 44)
+        return digits.replace(/(\d{2})(?=\d)/g, "$1 ").trim();
+    }
+    else {
+        // Espace tous les 2 chiffres à partir du premier chiffre (6 11 22 33 44)
+        if (digits.length === 0)
+            return "";
+        var res = digits[0];
+        var i = 1;
+        while (i < digits.length) {
+            res += (i % 2 === 1 ? " " : "") + digits[i];
+            i++;
+        }
+        return res.trim();
     }
-    res = digits.slice(0, i) + res;
-    return res.trim();
 };
+var formatPhoneEnd = formatPhone;
 var PhoneInput = function (_a) {
     var _b = _a.defaultValue, defaultValue = _b === void 0 ? "" : _b, placeholder = _a.placeholder, isRequired = _a.isRequired, disabled = _a.disabled, validationPattern = _a.validationPattern, onChange = _a.onChange, onError = _a.onError, _c = _a.disableAutofill, disableAutofill = _c === void 0 ? true : _c, onBlur = _a.onBlur, isValid = _a.isValid;
     var _d = useState(formatPhone(defaultValue)), value = _d[0], setValue = _d[1];
@@ -73,16 +75,13 @@ var PhoneInput = function (_a) {
     var handleBlur = function () {
         setIsTouched(true);
         var raw = value.replace(/\s/g, "");
-        // Supprime le 0 initial si présent
+        var formatted = raw;
         if (raw.startsWith("0")) {
-            raw = raw.slice(1);
-            setValue(formatPhoneEnd(raw));
-            onChange === null || onChange === void 0 ? void 0 : onChange(raw);
-        }
-        else {
-            setValue(formatPhoneEnd(raw));
+            formatted = raw.slice(1);
         }
-        validate(raw);
+        setValue(formatPhoneEnd(formatted));
+        onChange === null || onChange === void 0 ? void 0 : onChange(formatted);
+        validate(formatted);
         if (typeof onBlur === "function")
             onBlur();
     };

package/dist/components/molecules/phoneNumberField/PhoneNumberField.js

@@ -13,6 +13,9 @@ var PhoneNumberField = function (_a) {
     var _f = useState(false), isValid = _f[0], setIsValid = _f[1];
     var selectedCountryObj = countryItems.find(function (c) { return c.value === country; });
     var effectivePattern = (selectedCountryObj === null || selectedCountryObj === void 0 ? void 0 : selectedCountryObj.regex) || validationPattern;
+    if ((selectedCountryObj === null || selectedCountryObj === void 0 ? void 0 : selectedCountryObj.value) === "fr") {
+        effectivePattern = /^(0)?[1-9](?:\d{8})$/;
+    }
     var handleCountry = function (c) {
         setCountry(c);
         if (onChange)
@@ -22,11 +25,15 @@ var PhoneNumberField = function (_a) {
     var handleNumber = function (n) {
         setNumber(n);
         var valid = false;
+        var testValue = n.replace(/\s/g, "");
+        if ((selectedCountryObj === null || selectedCountryObj === void 0 ? void 0 : selectedCountryObj.value) === "fr" && testValue.startsWith("0")) {
+            testValue = testValue.slice(1);
+        }
         if (effectivePattern) {
             var regex = typeof effectivePattern === "string"
                 ? new RegExp(effectivePattern)
                 : effectivePattern;
-            valid = regex.test(n.replace(/\s/g, ""));
+            valid = regex.test(testValue);
         }
         setIsValid(valid);
         if (onChange)
@@ -49,7 +56,7 @@ var PhoneNumberField = function (_a) {
             React.createElement("div", { className: styles.selectWrapper },
                 React.createElement(CountrySelect, { items: countryItems, defaultCountry: defaultCountry, buttonWidth: selectButtonWidth, listWidth: selectListWidth, isRequired: isRequired, disabled: disabled, onSelect: handleCountry, onError: setErrorMsg })),
             React.createElement("div", { className: styles.inputWrapper },
-                React.createElement(PhoneInput, { defaultValue: defaultNumber, placeholder: numberPlaceholder, validationPattern: effectivePattern ? new RegExp(effectivePattern) : undefined, isRequired: isRequired, disabled: disabled, onChange: handleNumber, onError: setErrorMsg, onBlur: handleInputBlur, isValid: isValid }),
+                React.createElement(PhoneInput, { defaultValue: defaultNumber, placeholder: numberPlaceholder, validationPattern: effectivePattern, isRequired: isRequired, disabled: disabled, onChange: handleNumber, onError: setErrorMsg, onBlur: handleInputBlur, isValid: isValid }),
                 isTouched && !isValid && error && (React.createElement("div", { className: styles.errorMessage },
                     React.createElement(TinyInfo, { variant: "medium12", color: "actions-error", text: error })))))));
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "allaw-ui",
-  "version": "4.3.2",
+  "version": "4.3.4",
   "description": "Composants UI pour l'application Allaw",
   "main": "dist/index.js",
   "module": "dist/index.esm.js",