mautourco-components 0.2.155 → 0.2.157

package/dist/components/molecules/BookingPax/BookingPaxAccom.js

@@ -1,6 +1,6 @@
 import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
 import useBookingPax from '../../../hooks/useBookingPax';
-import { useEffect, useMemo, useRef } from 'react';
+import { useEffect, useMemo } from 'react';
 import TextWithIcon from '../TextWithIcon/TextWithIcon';
 import { BookingPaxClient, } from './BookingPaxClient/BookingPaxClient';
 import { BookingPaxHeader } from './BookingPaxHeader';
@@ -24,27 +24,14 @@ export function BookingPaxAccom(props) {
                 isPaxCountError: isPaxCountError,
             };
         });
-    }, [rooms, selectedClientsInfoIds, isSubmitted, isSelectedClient]);
-    // Track previous error states to only call onError when it changes
-    var previousErrorsRef = useRef({});
-    // Call onError only when error state changes
-    useEffect(function () {
-        if (!onError)
-            return;
-        roomData.forEach(function (_a) {
-            var roomIndex = _a.roomIndex, isPaxCountError = _a.isPaxCountError;
-            var previousError = previousErrorsRef.current[roomIndex];
-            if (previousError !== isPaxCountError) {
-                onError(roomIndex, isPaxCountError);
-                previousErrorsRef.current[roomIndex] = isPaxCountError;
-            }
-        });
-    }, [roomData, onError]);
+    }, [rooms, selectedClientsInfoIds, changeOptions, isSubmitted, isSelectedClient]);
     useEffect(function () {
         onSelectedClients(clientsInfo, onPaxChange);
     }, [changeOptions, onPaxChange]);
     return (_jsxs(BookingPaxLayout, { title: "Accommodation", icon: "accom", className: "booking-pax-accom", header: _jsx(BookingPaxHeader, { children: _jsx(BookingPaxHeader.Name, { name: hotelName, icon: "accom", location: roomName }) }), children: [roomData.map(function (_a) {
                 var room = _a.room, roomIndex = _a.roomIndex;
-                return (_jsxs("div", { className: "space-y-2", children: [_jsxs(TextWithIcon, { icon: "accom", children: ["Room ", roomIndex + 1] }), _jsx(BookingPaxClient, { id: "accommodation-".concat(roomIndex), clients: clientsInfo, selectedClientsInfoIds: selectedClientsInfoIds, selectedIndex: roomIndex, paxCount: room.paxCount, onPaxChange: onPaxOptionsChange, isSubmitted: isSubmitted })] }, "rm-".concat(roomIndex)));
+                return (_jsxs("div", { className: "space-y-2", children: [_jsxs(TextWithIcon, { icon: "accom", children: ["Room ", roomIndex + 1] }), _jsx(BookingPaxClient, { id: "accommodation-".concat(roomIndex), clients: clientsInfo, selectedClientsInfoIds: selectedClientsInfoIds, selectedIndex: roomIndex, paxCount: room.paxCount, onPaxChange: onPaxOptionsChange, isSubmitted: isSubmitted, onError: function (hasError) {
+                                onError === null || onError === void 0 ? void 0 : onError(roomIndex, hasError);
+                            } })] }, "rm-".concat(roomIndex)));
             }), _jsx(BookingPaxRemarks, { onChange: onRemarkChange })] }));
 }

package/dist/components/molecules/BookingPax/BookingPaxClient/BookingPaxClient.js

@@ -100,8 +100,8 @@ export function BookingPaxClient(props) {
         }
     }, [defaultSelectedClientsInfoIds]);
     useEffect(function () {
-        onError === null || onError === void 0 ? void 0 : onError(hasError);
-    }, [hasError, onError]);
+        onError === null || onError === void 0 ? void 0 : onError(hasError && clients.length !== paxCount);
+    }, [hasError]);
     return (_jsxs("div", { className: "space-y-2", children: [_jsxs(Text, { children: ["Please confirm the pax which applies on this service (", paxCount, " Pax)", ' ', _jsx(Text, { color: "state-error", as: "span", children: "*" })] }), _jsx("div", { className: cn('booking-pax-client', {
                     'booking-pax-accom--error': hasError,
                 }), children: clients.map(function (client) {

package/dist/components/organisms/Booking/BookingPaxList.d.ts

@@ -28,6 +28,12 @@ export interface BookingPaxAutoFilledData {
      */
     selectedClients: BookingPaxClientInfo[];
 }
+export interface BookingPaxErrorData {
+    parentIndex: number;
+    childIndex?: number;
+    type: BookingPaxData['type'];
+    hasError: boolean;
+}
 export interface BookingPaxProps {
     /**
      * The data of the booking pax.
@@ -52,7 +58,7 @@ export interface BookingPaxProps {
     /**
      * The callback function to call when the error changes.
      */
-    onError?: (index: number, type: BookingPaxData['type'], hasError: boolean) => void;
+    onError?: (data: BookingPaxErrorData) => void;
     /**
      * The callback function to call when the time changes.
      */

package/dist/components/organisms/Booking/BookingPaxList.js

@@ -60,8 +60,8 @@ export function BookingPaxList(props) {
     var handleRemarkChange = useCallback(function (type, index, value) {
         onRemarkChange === null || onRemarkChange === void 0 ? void 0 : onRemarkChange(index, type, value);
     }, [onRemarkChange]);
-    var handleError = useCallback(function (index, type, hasError) {
-        onError === null || onError === void 0 ? void 0 : onError(index, type, hasError);
+    var handleError = useCallback(function (errorData) {
+        onError === null || onError === void 0 ? void 0 : onError(errorData);
     }, [onError]);
     var handleTimeChange = useCallback(function (value, index) {
         // Don't need type because only transfer has this callback
@@ -123,13 +123,24 @@ export function BookingPaxList(props) {
                 onRemarkChange: function (value) { return handleRemarkChange(type, index, value); },
             };
             if (type === 'accommodation' && isAccommodationData(itemData)) {
-                return (_jsx(BookingPax.Accom, __assign({}, itemData, callbacks, { clientsInfo: clientsInfo, isSubmitted: isSubmitted, onError: function (roomIndex, hasError) { return handleError(roomIndex, type, hasError); } }), "bp-accom-".concat(index)));
+                return (_jsx(BookingPax.Accom, __assign({}, itemData, callbacks, { clientsInfo: clientsInfo, isSubmitted: isSubmitted, onError: function (roomIndex, hasError) {
+                        return handleError({ parentIndex: index, childIndex: roomIndex, type: type, hasError: hasError });
+                    } }), "bp-accom-".concat(index)));
             }
             if (type === 'excursion' && isExcursionData(itemData)) {
-                return (_jsx(BookingPax.Excursion, __assign({}, itemData, { clientsInfo: clientsInfo, isSubmitted: isSubmitted, onError: function (hasError) { return handleError(index, type, hasError); } }, callbacks), "bp-excursion-".concat(index)));
+                return (_jsx(BookingPax.Excursion, __assign({}, itemData, { clientsInfo: clientsInfo, isSubmitted: isSubmitted, onError: function (hasError) {
+                        handleError({
+                            parentIndex: index,
+                            childIndex: undefined,
+                            type: type,
+                            hasError: hasError,
+                        });
+                    } }, callbacks), "bp-excursion-".concat(index)));
             }
             if (type === 'transfer' && isTransferData(itemData)) {
-                return (_jsx(BookingPax.Transfer, __assign({}, itemData, { onTimeChange: function (value) { return handleTimeChange(value, index); }, onFlightNumberChange: function (value) { return handleFlightNumberChange(value, index); }, clientsInfo: clientsInfo, isSubmitted: isSubmitted, onError: function (hasError) { return handleError(index, type, hasError); } }, callbacks), "bp-transfer-".concat(index)));
+                return (_jsx(BookingPax.Transfer, __assign({}, itemData, { onTimeChange: function (value) { return handleTimeChange(value, index); }, onFlightNumberChange: function (value) { return handleFlightNumberChange(value, index); }, clientsInfo: clientsInfo, isSubmitted: isSubmitted, onError: function (hasError) {
+                        return handleError({ parentIndex: index, childIndex: undefined, type: type, hasError: hasError });
+                    } }, callbacks), "bp-transfer-".concat(index)));
             }
             return null;
         }) }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mautourco-components",
-  "version": "0.2.155",
+  "version": "0.2.157",
   "private": false,
   "description": "Bibliothèque de composants Mautourco pour le redesign",
   "main": "dist/index.js",

package/src/components/molecules/BookingPax/BookingPaxAccom.tsx

@@ -1,5 +1,5 @@
 import useBookingPax from '@/src/hooks/useBookingPax';
-import { useEffect, useMemo, useRef } from 'react';
+import { useEffect, useMemo } from 'react';
 import TextWithIcon from '../TextWithIcon/TextWithIcon';
 import {
   BookingPaxClient,
@@ -101,23 +101,7 @@ export function BookingPaxAccom(props: BookingPaxAccomProps) {
         isPaxCountError,
       };
     });
-  }, [rooms, selectedClientsInfoIds, isSubmitted, isSelectedClient]);
-
-  // Track previous error states to only call onError when it changes
-  const previousErrorsRef = useRef<Record<number, boolean>>({});
-
-  // Call onError only when error state changes
-  useEffect(() => {
-    if (!onError) return;
-
-    roomData.forEach(({ roomIndex, isPaxCountError }) => {
-      const previousError = previousErrorsRef.current[roomIndex];
-      if (previousError !== isPaxCountError) {
-        onError(roomIndex, isPaxCountError);
-        previousErrorsRef.current[roomIndex] = isPaxCountError;
-      }
-    });
-  }, [roomData, onError]);
+  }, [rooms, selectedClientsInfoIds, changeOptions, isSubmitted, isSelectedClient]);
 
   useEffect(() => {
     onSelectedClients(clientsInfo, onPaxChange);
@@ -145,6 +129,9 @@ export function BookingPaxAccom(props: BookingPaxAccomProps) {
             paxCount={room.paxCount}
             onPaxChange={onPaxOptionsChange}
             isSubmitted={isSubmitted}
+            onError={(hasError) => {
+              onError?.(roomIndex, hasError);
+            }}
           />
         </div>
       ))}

package/src/components/molecules/BookingPax/BookingPaxClient/BookingPaxClient.tsx

@@ -215,8 +215,8 @@ export function BookingPaxClient(props: BookingPaxClientProps) {
   }, [defaultSelectedClientsInfoIds]);
 
   useEffect(() => {
-    onError?.(hasError);
-  }, [hasError, onError]);
+    onError?.(hasError && clients.length !== paxCount);
+  }, [hasError]);
 
   return (
     <div className="space-y-2">

package/src/components/organisms/Booking/BookingPaxList.tsx

@@ -43,6 +43,13 @@ export interface BookingPaxAutoFilledData {
   selectedClients: BookingPaxClientInfo[];
 }
 
+export interface BookingPaxErrorData {
+  parentIndex: number;
+  childIndex?: number;
+  type: BookingPaxData['type'];
+  hasError: boolean;
+}
+
 export interface BookingPaxProps {
   /**
    * The data of the booking pax.
@@ -71,7 +78,7 @@ export interface BookingPaxProps {
   /**
    * The callback function to call when the error changes.
    */
-  onError?: (index: number, type: BookingPaxData['type'], hasError: boolean) => void;
+  onError?: (data: BookingPaxErrorData) => void;
   /**
    * The callback function to call when the time changes.
    */
@@ -162,8 +169,8 @@ export function BookingPaxList(props: BookingPaxProps) {
   );
 
   const handleError = useCallback(
-    (index: number, type: BookingPaxData['type'], hasError: boolean) => {
-      onError?.(index, type, hasError);
+    (errorData: BookingPaxErrorData) => {
+      onError?.(errorData);
     },
     [onError]
   );
@@ -248,7 +255,9 @@ export function BookingPaxList(props: BookingPaxProps) {
               {...callbacks}
               clientsInfo={clientsInfo}
               isSubmitted={isSubmitted}
-              onError={(roomIndex, hasError) => handleError(roomIndex, type, hasError)}
+              onError={(roomIndex, hasError) =>
+                handleError({ parentIndex: index, childIndex: roomIndex, type, hasError })
+              }
             />
           );
         }
@@ -260,7 +269,14 @@ export function BookingPaxList(props: BookingPaxProps) {
               {...itemData}
               clientsInfo={clientsInfo}
               isSubmitted={isSubmitted}
-              onError={(hasError) => handleError(index, type, hasError)}
+              onError={(hasError) => {
+                handleError({
+                  parentIndex: index,
+                  childIndex: undefined,
+                  type,
+                  hasError,
+                });
+              }}
               {...callbacks}
             />
           );
@@ -275,7 +291,9 @@ export function BookingPaxList(props: BookingPaxProps) {
               onFlightNumberChange={(value) => handleFlightNumberChange(value, index)}
               clientsInfo={clientsInfo}
               isSubmitted={isSubmitted}
-              onError={(hasError) => handleError(index, type, hasError)}
+              onError={(hasError) =>
+                handleError({ parentIndex: index, childIndex: undefined, type, hasError })
+              }
               {...callbacks}
             />
           );