@movalib/movalib-commons 1.59.16 → 1.59.17

package/devIndex.tsx

@@ -19,7 +19,7 @@ import Logger from './src/helpers/Logger';
 import Garage from './src/models/Garage';
 import ScheduleFields, { DaySchedule } from './src/ScheduleFields';
 import Schedule from './src/models/Schedule';
-import { flexCenter } from './src/helpers/Tools';
+import { flexCenter, formatVehicleTire } from './src/helpers/Tools';
 import AccountValidation from './src/AccountValidation';
 import VehiclePlateField from './src/components/vehicle/VehiclePlateField';
 import GaragePLV from './src/GaragePLV';
@@ -127,7 +127,7 @@ const App = () => {
           </Container>
           <Container style={flexCenter} sx={{ width: '400px', mt: 2}}>
             <MovaVehicleTireField onChangeVehicleTire={(vehicleTire) => {
-              console.log(vehicleTire);
+              console.log('formatVehicleTire', formatVehicleTire(vehicleTire));
             }}/>
           </Container>
 

package/dist/devIndex.js

@@ -133,7 +133,7 @@ var App = function () {
                                 } }), (0, jsx_runtime_1.jsx)(material_1.Container, __assign({ style: Tools_1.flexCenter, sx: { width: '400px', mt: 2 } }, { children: (0, jsx_runtime_1.jsx)(VehiclePlateField_1.default, { onValidVehiclePlate: function (vehiclePlate) {
                                         alert('plaque valide');
                                     } }) })), (0, jsx_runtime_1.jsx)(material_1.Container, __assign({ style: Tools_1.flexCenter, sx: { width: '400px', mt: 2 } }, { children: (0, jsx_runtime_1.jsx)(MovaVehicleTireField_1.default, { onChangeVehicleTire: function (vehicleTire) {
-                                        console.log(vehicleTire);
+                                        console.log('formatVehicleTire', (0, Tools_1.formatVehicleTire)(vehicleTire));
                                     } }) })), (0, jsx_runtime_1.jsx)(MovaLogin_1.default, { darkMode: false, movaAppType: Enums_1.MovaAppType.INDIVIDUAL, version: "0.1.3", onSubmit: function (form) {
                                     alert('Form Submitted !');
                                 }, onSubmitForgotPassword: function (email) {

package/dist/src/MovaVehicleTireField.js

@@ -9,7 +9,7 @@ var react_1 = require("react");
 var VehicleTire_1 = __importDefault(require("./models/VehicleTire"));
 var Tools_1 = require("./helpers/Tools");
 // Regex pour une taille de pneumatique Française
-var regex = /^\d{9,10}[A-Za-z]$/;
+var regex = /^[A-Za-z0-9]{7}/;
 var MovaVehicleTireField = function (_a) {
     var vehicleTire = _a.vehicleTire, onChangeVehicleTire = _a.onChangeVehicleTire;
     var _b = (0, react_1.useState)(''), tireInfo = _b[0], setTireInfo = _b[1];
@@ -25,12 +25,13 @@ var MovaVehicleTireField = function (_a) {
         var rawValue = e.target.value;
         // Cette expression régulière supprimera tous les caractères qui ne sont pas des chiffres ou des lettres alphabétiques, à l'exception de "R" et "r".
         // On ne peut saisir que 10 caractères maximum (ex : 245551791V)
-        var value = rawValue.toUpperCase().replace(/[^0-9A-QS-Za-qs-z]/g, '').slice(0, 11);
+        var value = rawValue.toUpperCase().replace(/[^0-9A-QS-Za-qs-z]/g, '').slice(0, 15);
         // On valide la saisie (le champ n'est pas obligatoire)
         var isValid = value.length == 0 || (value.length > 0 && regex.test(value));
         setError(!regex.test(value));
         // Vérifier si l'utilisateur est en train de supprimer un caractère
-        var isDeleting = value.length < lastLength;
+        var isDeleting = rawValue.length < lastLength;
+        console.log(isDeleting);
         // Ajout du " / "
         if (value.length >= 3 && !(rawValue.length == 5 && isDeleting)) {
             value = "".concat(value.substring(0, 3), " / ").concat(value.substring(3));
@@ -39,19 +40,46 @@ var MovaVehicleTireField = function (_a) {
         if (value.length >= 8 && !(rawValue.length == 9 && isDeleting)) {
             value = "".concat(value.substring(0, 8), " R").concat(value.substring(8));
         }
+        var additonalChar = false;
+        if (value[12] && /^[A-Z]$/.test(value[12])) {
+            if (rawValue.length === 14 && isDeleting) {
+                value = "".concat(value.substring(0, 12));
+            }
+            else {
+                additonalChar = true;
+                value = "".concat(value.substring(0, 13), " ").concat(value.substring(13));
+            }
+        }
         // Ajout d'un espace après la saisie du diamètre des pneus
         if (value.length >= 12 && !(rawValue.length <= 12 && isDeleting)) {
             value = "".concat(value.substring(0, 12), " ").concat(value.substring(12));
         }
-        setTireInfo(value);
+        //console.log('2 valeu',JSON.stringify(value));
+        if (additonalChar) {
+            var endString = rawValue.substring(15);
+            value = value.substring(0, 15) + (endString !== undefined ? endString : '');
+            console.log(rawValue.split(' ')[5]);
+        }
+        else {
+            var endString = rawValue.substring(12);
+            if (endString && endString.length > 1) {
+                value = value.substring(0, 13) + endString.trimStart();
+            }
+        }
         var parts = value.split(" ");
-        if (value.length >= 16 && !(rawValue.length == 18 && isDeleting) && parts.length === 5) {
+        setTireInfo(value);
+        console.log(parts);
+        if (value.length >= 16) {
             var width = parts[0], _separator = parts[1], height = parts[2], diameter = parts[3], speedIndex = parts[4];
+            speedIndex = value.substring(13);
+            console.log('YYY', width, height, diameter, speedIndex, _separator);
             var vehicleTire_1 = new VehicleTire_1.default(width, height, diameter, speedIndex);
             onChangeVehicleTire(vehicleTire_1, isValid);
         }
         else {
             var width = parts[0], _separator = parts[1], height = parts[2], diameter = parts[3], speedIndex = parts[4];
+            speedIndex = value.substring(13);
+            console.log('XXX', width, height, diameter, speedIndex, _separator);
             var vehicleTire_2 = new VehicleTire_1.default(width !== null && width !== void 0 ? width : '', height !== null && height !== void 0 ? height : '', diameter !== null && diameter !== void 0 ? diameter : '', speedIndex !== null && speedIndex !== void 0 ? speedIndex : '');
             onChangeVehicleTire(vehicleTire_2, isValid);
         }

package/dist/src/helpers/Tools.js

@@ -218,20 +218,18 @@ var formatVehicleTire = function (vehicleTire) {
 };
 exports.formatVehicleTire = formatVehicleTire;
 var formatVehicleTireStr = function (input) {
-    var formatted = input.toUpperCase().replace(/[^0-9A-QS-Za-qs-z]/g, '').slice(0, 10);
-    if (formatted.length >= 3) {
+    var formatted = input.toUpperCase().replace(/[^0-9A-QS-Za-qs-z]/g, '').slice(0, 7);
+    if (formatted.length > 3) {
         formatted = "".concat(formatted.substring(0, 3), " / ").concat(formatted.substring(3));
     }
-    var indexOfR = formatted.indexOf(" R");
-    if (formatted.length >= 8 && indexOfR === -1) {
-        formatted = "".concat(formatted.substring(0, 8), " R").concat(formatted.substring(8));
-        if (formatted.length >= 12 && indexOfR === -1)
-            formatted = "".concat(formatted.substring(0, 12), " ").concat(formatted.substring(12));
+    var indexOfRraw = input.indexOf("R");
+    var toAdd = indexOfRraw !== -1 ? input.substring(indexOfRraw + 3) : '';
+    if (toAdd.length > 0) {
+        toAdd = ' ' + toAdd;
     }
-    else if (indexOfR !== -1 && formatted.length > indexOfR + 2) {
-        formatted = "".concat(formatted.substring(0, indexOfR + 2), " ").concat(formatted.substring(indexOfR + 2));
+    if (formatted.length > 8) {
+        formatted = "".concat(formatted.substring(0, 8), " R").concat(formatted.substring(8)).concat(toAdd);
     }
-    console.log(formatted);
     return formatted;
 };
 exports.formatVehicleTireStr = formatVehicleTireStr;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@movalib/movalib-commons",
-	"version": "1.59.16",
+	"version": "1.59.17",
 	"description": "Bibliothèque d'objets communs à l'ensemble des projets React de Movalib",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",

package/src/MovaVehicleTireField.tsx

@@ -9,7 +9,7 @@ interface MovaVehicleTireFieldProps {
 }
 
 // Regex pour une taille de pneumatique Française
-const regex = /^\d{9,10}[A-Za-z]$/;
+const regex = /^[A-Za-z0-9]{7}/;
 
 const MovaVehicleTireField: FC<MovaVehicleTireFieldProps> = ({ vehicleTire, onChangeVehicleTire }) => {
 
@@ -27,46 +27,67 @@ const MovaVehicleTireField: FC<MovaVehicleTireFieldProps> = ({ vehicleTire, onCh
     const handleChange = (e: React.ChangeEvent<HTMLInputElement>) => {
         e.preventDefault();
         const rawValue = e.target.value;
-
         // Cette expression régulière supprimera tous les caractères qui ne sont pas des chiffres ou des lettres alphabétiques, à l'exception de "R" et "r".
         // On ne peut saisir que 10 caractères maximum (ex : 245551791V)
-        let value = rawValue.toUpperCase().replace(/[^0-9A-QS-Za-qs-z]/g, '').slice(0, 11);
+        let value = rawValue.toUpperCase().replace(/[^0-9A-QS-Za-qs-z]/g, '').slice(0, 15);
 
         // On valide la saisie (le champ n'est pas obligatoire)
         let isValid = value.length == 0  || (value.length > 0 && regex.test(value));
         setError(!regex.test(value));
 
         // Vérifier si l'utilisateur est en train de supprimer un caractère
-        const isDeleting = value.length < lastLength;
-
+        const isDeleting = rawValue.length < lastLength;
         // Ajout du " / "
         if (value.length >= 3 && !(rawValue.length == 5 && isDeleting)) {
             value = `${value.substring(0, 3)} / ${value.substring(3)}`;
         }
-
+    
         // Ajout du " R"
         if (value.length >= 8 && !(rawValue.length == 9 && isDeleting)) {
             value = `${value.substring(0, 8)} R${value.substring(8)}`;
         }
 
+        let additonalChar = false;
+
+        if (value[12] && /^[A-Z]$/.test(value[12])) {
+            if(rawValue.length === 14 && isDeleting) {
+                value = `${value.substring(0, 12)}`;
+            } else {
+            additonalChar = true;
+            value = `${value.substring(0, 13)} ${value.substring(13)}`;
+            }
+        }
+
 
         // Ajout d'un espace après la saisie du diamètre des pneus
         if (value.length >= 12 && !(rawValue.length <= 12 && isDeleting)) {
             value = `${value.substring(0, 12)} ${value.substring(12)}`;
         }
+        //console.log('2 valeu',JSON.stringify(value));
+        if (additonalChar) {
+            let endString = rawValue.substring(15);
+            value = value.substring(0,15) + (endString !== undefined ? endString :'');
+            console.log(rawValue.split(' ')[5]);
+        } else {
+            let endString = rawValue.substring(12);
+            if(endString && endString.length > 1) {
+                value = value.substring(0,13) + endString.trimStart();
+            } 
+        }
 
-        setTireInfo(value);
 
         const parts = value.split(" ");
 
-        if (value.length >= 16 && !(rawValue.length == 18 && isDeleting) && parts.length === 5) {
-                const [width, _separator, height, diameter, speedIndex] = parts;
+        setTireInfo(value);
+        if (value.length >= 16) {
+                let [width, _separator, height, diameter, speedIndex] = parts;
+                speedIndex = value.substring(13);
                 const vehicleTire = new VehicleTire(width, height, diameter, speedIndex);
                 onChangeVehicleTire(vehicleTire, isValid);
         } else {
-            const [width, _separator, height, diameter, speedIndex] = parts;
+            let [width, _separator, height, diameter, speedIndex] = parts;
+            speedIndex = value.substring(13);
             const vehicleTire = new VehicleTire(width ?? '', height ?? '', diameter ?? '', speedIndex ?? '');
-
             onChangeVehicleTire(vehicleTire, isValid);
         }
 

package/src/helpers/Tools.ts

@@ -239,26 +239,18 @@ export const formatVehicleTire = (vehicleTire: VehicleTire) => {
 }
 
 export const formatVehicleTireStr = (input: string) => {
-
-  let formatted = input.toUpperCase().replace(/[^0-9A-QS-Za-qs-z]/g, '').slice(0, 10);
-
-  if (formatted.length >= 3) {
+  let formatted = input.toUpperCase().replace(/[^0-9A-QS-Za-qs-z]/g, '').slice(0, 7);
+  if (formatted.length > 3) {
     formatted = `${formatted.substring(0, 3)} / ${formatted.substring(3)}`;
   }
-
-  const indexOfR = formatted.indexOf(" R");
-
-  if (formatted.length >= 8 && indexOfR === -1) {
-    formatted = `${formatted.substring(0, 8)} R${formatted.substring(8)}`;
-
-  if (formatted.length >= 12 && indexOfR === -1)
-    formatted = `${formatted.substring(0, 12)} ${formatted.substring(12)}`;
-
-  } else if (indexOfR !== -1 && formatted.length > indexOfR + 2) {
-    formatted = `${formatted.substring(0, indexOfR + 2)} ${formatted.substring(indexOfR + 2)}`;
+  const indexOfRraw = input.indexOf("R");
+  let toAdd = indexOfRraw !== -1 ? input.substring(indexOfRraw + 3) : '';
+  if(toAdd.length > 0) {
+    toAdd = ' ' + toAdd;
+  }
+  if(formatted.length > 8) {
+    formatted = `${formatted.substring(0, 8)} R${formatted.substring(8)}${toAdd}`;
   }
-
-  console.log(formatted);
   return formatted;
 };