mautourco-components 0.2.111 → 0.2.113

package/dist/components/atoms/Chip/Chip.d.ts

@@ -27,5 +27,5 @@ export interface ChipProps {
     /** Icon externe */
     externalIcon?: string;
 }
-declare const Chip: React.FC<ChipProps>;
+declare function Chip({ label, children, size, type, color, leadingIcon, trailingIcon, iconSize, className, isBlackText, externalIcon, onClick, }: ChipProps): import("react/jsx-runtime").JSX.Element;
 export default Chip;

package/dist/components/atoms/Chip/Chip.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import Icon from '../Icon/Icon';
 import './Chip.css';
-var Chip = function (_a) {
+function Chip(_a) {
     var label = _a.label, children = _a.children, _b = _a.size, size = _b === void 0 ? 'sm' : _b, _c = _a.type, type = _c === void 0 ? 'filled' : _c, _d = _a.color, color = _d === void 0 ? 'brand' : _d, leadingIcon = _a.leadingIcon, trailingIcon = _a.trailingIcon, _e = _a.iconSize, iconSize = _e === void 0 ? 'sm' : _e, _f = _a.className, className = _f === void 0 ? '' : _f, _g = _a.isBlackText, isBlackText = _g === void 0 ? false : _g, externalIcon = _a.externalIcon, onClick = _a.onClick;
     var baseClasses = 'chip';
     var sizeClass = "chip--".concat(size);
@@ -24,5 +24,5 @@ var Chip = function (_a) {
     var hasTrailingIcon = Boolean(trailingIcon);
     var content = label || children;
     return (_jsxs("div", { className: chipClasses, onClick: onClick, role: onClick ? 'button' : undefined, tabIndex: onClick ? 0 : undefined, children: [hasLeadingIcon && (_jsx("span", { className: "chip__icon chip__icon--leading", children: _jsx(Icon, { name: leadingIcon, size: iconSize }) })), externalIcon && (_jsx("img", { src: externalIcon, alt: "", className: "w-4 h-4 object-contain" })), _jsx("span", { className: "chip__label", children: content }), hasTrailingIcon && (_jsx("span", { className: "chip__icon chip__icon--trailing", children: _jsx(Icon, { name: trailingIcon, size: iconSize }) }))] }));
-};
+}
 export default Chip;

package/dist/components/molecules/LocationDropdown/LocationDropdown.d.ts

@@ -14,6 +14,7 @@ export interface LocationGroup {
 export interface LocationData {
     id: string | number;
     locationName: string;
+    label?: string;
 }
 export interface LocationDropdownProps {
     options?: LocationOption[];

package/dist/components/organisms/RoundTrip/RoundTrip.d.ts

@@ -1,10 +1,10 @@
-import React from "react";
-import "../../../styles/components/organism/round-trip.css";
-import { LocationGroup, LocationOption } from "../../molecules/LocationDropdown/LocationDropdown";
-import { PaxData } from "../PaxSelector/PaxSelector";
+import React from 'react';
+import '../../../styles/components/organism/round-trip.css';
+import { LocationGroup, LocationOption } from '../../molecules/LocationDropdown/LocationDropdown';
+import { PaxData } from '../PaxSelector/PaxSelector';
 export type { LocationOption };
 export interface RoundTripTransfer {
-    type: "arrival" | "departure";
+    type: 'arrival' | 'departure';
     paxData?: PaxData;
     transferDate?: string;
     pickupPoint?: LocationOption;

package/dist/components/organisms/RoundTrip/RoundTrip.js

@@ -19,14 +19,14 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     return to.concat(ar || Array.prototype.slice.call(from));
 };
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { useEffect, useState } from "react";
-import "../../../styles/components/organism/round-trip.css";
-import { Text } from "../../atoms/Typography/Typography";
-import LocationDropdown from "../../molecules/LocationDropdown/LocationDropdown";
-import DateTimePicker from "../DateTimePicker/DateTimePicker";
-import PaxSelector from "../PaxSelector/PaxSelector";
+import { useEffect, useState } from 'react';
+import '../../../styles/components/organism/round-trip.css';
+import { Text } from '../../atoms/Typography/Typography';
+import LocationDropdown from '../../molecules/LocationDropdown/LocationDropdown';
+import DateTimePicker from '../DateTimePicker/DateTimePicker';
+import PaxSelector from '../PaxSelector/PaxSelector';
 var RoundTrip = function (_a) {
-    var id = _a.id, paxData = _a.paxData, arrivalDate = _a.arrivalDate, departureDate = _a.departureDate, pickupDropoffPoint = _a.pickupDropoffPoint, accommodation = _a.accommodation, _b = _a.locations, locations = _b === void 0 ? { options: [], groups: [] } : _b, onPaxChange = _a.onPaxChange, onDatesChange = _a.onDatesChange, onPickupDropoffChange = _a.onPickupDropoffChange, onAccommodationChange = _a.onAccommodationChange, onChange = _a.onChange, _c = _a.className, className = _c === void 0 ? "" : _c, _d = _a.checkEmpty, checkEmpty = _d === void 0 ? false : _d, _e = _a.scrollOnOpen, scrollOnOpen = _e === void 0 ? false : _e;
+    var id = _a.id, paxData = _a.paxData, arrivalDate = _a.arrivalDate, departureDate = _a.departureDate, pickupDropoffPoint = _a.pickupDropoffPoint, accommodation = _a.accommodation, _b = _a.locations, locations = _b === void 0 ? { options: [], groups: [] } : _b, onPaxChange = _a.onPaxChange, onDatesChange = _a.onDatesChange, onPickupDropoffChange = _a.onPickupDropoffChange, onAccommodationChange = _a.onAccommodationChange, onChange = _a.onChange, _c = _a.className, className = _c === void 0 ? '' : _c, _d = _a.checkEmpty, checkEmpty = _d === void 0 ? false : _d, _e = _a.scrollOnOpen, scrollOnOpen = _e === void 0 ? false : _e;
     var _f = useState(paxData), internalPaxData = _f[0], setInternalPaxData = _f[1];
     var _g = useState(arrivalDate), internalArrivalDate = _g[0], setInternalArrivalDate = _g[1];
     var _h = useState(departureDate), internalDepartureDate = _h[0], setInternalDepartureDate = _h[1];
@@ -42,18 +42,18 @@ var RoundTrip = function (_a) {
         var allOptions = locations.options || [];
         var allGroups = locations.groups || [];
         // Filter for airport and port
-        var airportPortOptions = allOptions.filter(function (opt) { return opt.type === "airport" || opt.type === "port"; });
+        var airportPortOptions = allOptions.filter(function (opt) { return opt.type === 'airport' || opt.type === 'port'; });
         // Filter for accommodations
-        var accommodationOptions = allOptions.filter(function (opt) { return opt.type === "accommodation"; });
+        var accommodationOptions = allOptions.filter(function (opt) { return opt.type === 'accommodation'; });
         // Create groups
         var airportPortGroup = {
-            id: "airport-port-group",
-            label: "Airport & Port",
+            id: 'airport-port-group',
+            label: 'Airport & Port',
             options: airportPortOptions,
         };
         var accommodationGroup = {
-            id: "accommodation-group",
-            label: "Accommodations",
+            id: 'accommodation-group',
+            label: 'Accommodations',
             options: accommodationOptions,
         };
         return {
@@ -65,10 +65,10 @@ var RoundTrip = function (_a) {
         var allOptions = locations.options || [];
         var allGroups = locations.groups || [];
         // Filter for accommodations only
-        var accommodationOptions = allOptions.filter(function (opt) { return opt.type === "accommodation"; });
+        var accommodationOptions = allOptions.filter(function (opt) { return opt.type === 'accommodation'; });
         // Extract accommodation groups if they exist
         var accommodationGroups = allGroups
-            .map(function (group) { return (__assign(__assign({}, group), { options: group.options.filter(function (opt) { return opt.type === "accommodation"; }) })); })
+            .map(function (group) { return (__assign(__assign({}, group), { options: group.options.filter(function (opt) { return opt.type === 'accommodation'; }) })); })
             .filter(function (group) { return group.options.length > 0; });
         return {
             options: accommodationOptions,
@@ -77,7 +77,11 @@ var RoundTrip = function (_a) {
     };
     // Helper to check if value is LocationOption
     var isLocationOption = function (value) {
-        return typeof value === 'object' && value !== null && 'id' in value && 'label' in value && 'type' in value;
+        return (typeof value === 'object' &&
+            value !== null &&
+            'id' in value &&
+            'label' in value &&
+            'type' in value);
     };
     // Initialize location data from IDs or LocationOption objects
     useEffect(function () {
@@ -99,7 +103,7 @@ var RoundTrip = function (_a) {
         }
         else if (!internalPickupDropoffPoint) {
             // Set default to first airport if available (only if not already set)
-            var defaultAirport = allLocations.find(function (loc) { return loc.type === "airport"; });
+            var defaultAirport = allLocations.find(function (loc) { return loc.type === 'airport'; });
             if (defaultAirport) {
                 setInternalPickupDropoffPoint(defaultAirport);
                 onPickupDropoffChange === null || onPickupDropoffChange === void 0 ? void 0 : onPickupDropoffChange(defaultAirport);
@@ -130,7 +134,7 @@ var RoundTrip = function (_a) {
     useEffect(function () {
         // Create arrival transfer
         var arrivalTransfer = {
-            type: "arrival",
+            type: 'arrival',
             paxData: internalPaxData,
             transferDate: internalArrivalDate,
             pickupPoint: internalPickupDropoffPoint || undefined,
@@ -138,7 +142,7 @@ var RoundTrip = function (_a) {
         };
         // Create departure transfer
         var departureTransfer = {
-            type: "departure",
+            type: 'departure',
             paxData: internalPaxData,
             transferDate: internalDepartureDate,
             pickupPoint: internalAccommodation || undefined,
@@ -176,19 +180,26 @@ var RoundTrip = function (_a) {
     };
     // Helper to convert LocationData to LocationOption
     var toLocationOption = function (locationData, locationType) {
+        var _a;
         if (!locationData)
             return null;
+        var locationName = (_a = locationData.locationName) !== null && _a !== void 0 ? _a : locationData.label;
         // Try to find in the options to get the type
-        var _a = locationType === 'pickup-dropoff' ? getPickupDropoffOptions() : getAccommodationOptions(), options = _a.options, groups = _a.groups;
+        var _b = locationType === 'pickup-dropoff'
+            ? getPickupDropoffOptions()
+            : getAccommodationOptions(), options = _b.options, groups = _b.groups;
         var allLocations = getAllLocations(options, groups);
         var found = allLocations.find(function (loc) { return loc.id === locationData.id; });
         if (found)
             return found;
         // If not found, infer the type
-        var name = locationData.locationName.toLowerCase();
+        var name = locationName.toLowerCase();
         var id = String(locationData.id).toLowerCase();
         var type = 'accommodation';
-        if (name.includes('harbour') || name.includes('port') || id.includes('harbour') || id.includes('port')) {
+        if (name.includes('harbour') ||
+            name.includes('port') ||
+            id.includes('harbour') ||
+            id.includes('port')) {
             type = 'port';
         }
         else if (name.includes('airport') || id.includes('airport')) {
@@ -196,7 +207,7 @@ var RoundTrip = function (_a) {
         }
         return {
             id: locationData.id,
-            label: locationData.locationName,
+            label: locationName,
             type: type,
         };
     };
@@ -211,14 +222,18 @@ var RoundTrip = function (_a) {
         onAccommodationChange === null || onAccommodationChange === void 0 ? void 0 : onAccommodationChange(locationOption);
     };
     // Check if inputs are empty (when checkEmpty is true)
-    var isPaxEmpty = checkEmpty && (!internalPaxData ||
-        (internalPaxData.adults === 0 &&
-            internalPaxData.teens === 0 &&
-            internalPaxData.children === 0 &&
-            (internalPaxData.infants === undefined || internalPaxData.infants === 0)));
+    var isPaxEmpty = checkEmpty &&
+        (!internalPaxData ||
+            (internalPaxData.adults === 0 &&
+                internalPaxData.teens === 0 &&
+                internalPaxData.children === 0 &&
+                (internalPaxData.infants === undefined || internalPaxData.infants === 0)));
     // Show error if checkEmpty is true and either date is missing
-    var isDateEmpty = checkEmpty && (!internalArrivalDate || !internalDepartureDate ||
-        internalArrivalDate === '' || internalDepartureDate === '');
+    var isDateEmpty = checkEmpty &&
+        (!internalArrivalDate ||
+            !internalDepartureDate ||
+            internalArrivalDate === '' ||
+            internalDepartureDate === '');
     // Check if user filled one date but not the other (even without checkEmpty)
     var hasPartialDates = function () {
         if (!checkEmpty)
@@ -243,12 +258,16 @@ var RoundTrip = function (_a) {
             return value;
         }
         // Otherwise, look up by ID in the locations
-        var _a = locationType === 'pickup-dropoff' ? getPickupDropoffOptions() : getAccommodationOptions(), options = _a.options, groups = _a.groups;
+        var _a = locationType === 'pickup-dropoff'
+            ? getPickupDropoffOptions()
+            : getAccommodationOptions(), options = _a.options, groups = _a.groups;
         var allLocations = getAllLocations(options, groups);
         return allLocations.find(function (loc) { return loc.id === value; });
     };
     var defaultPickupDropoffOption = findLocationOption(pickupDropoffPoint, 'pickup-dropoff');
     var defaultAccommodationOption = findLocationOption(accommodation, 'accommodation');
-    return (_jsx("div", { className: "round-trip ".concat(className), "data-round-trip-id": id, children: _jsxs("div", { className: "round-trip__content", children: [_jsx("div", { className: "round-trip__field round-trip__field--pax ".concat(isPaxEmpty ? 'round-trip__field--error' : ''), children: _jsx(PaxSelector, { label: "Number of pax", value: internalPaxData, onChange: handlePaxChange, placeholder: "2 pax", className: isPaxEmpty ? 'pax-selector--error' : '', scrollOnOpen: scrollOnOpen, checkEmpty: checkEmpty }) }), _jsxs("div", { className: "round-trip__field round-trip__field--dates", children: [_jsx(Text, { size: "sm", variant: "regular", className: "round-trip__field-label", children: "Arrival date - Departure date" }), _jsx(DateTimePicker, { placeholder: "DD/MM/YYYY - DD/MM/YYYY", mode: "calendar", iconPosition: "left", numberOfMonths: 2, iconBGFull: false, showChevron: true, onValueChange: handleDateRangeChange, selectionMode: "range", defaultValue: internalArrivalDate && internalDepartureDate ? [internalArrivalDate, internalDepartureDate] : undefined, inputClassName: "round-trip__date-picker--input", state: isDateError() ? 'error' : undefined, scrollOnOpen: scrollOnOpen })] }), _jsx("div", { className: "round-trip__field round-trip__field--pickup-dropoff", children: _jsx(LocationDropdown, { label: "Pick up / Drop-off point", options: pickupDropoffOptions.options, groups: pickupDropoffOptions.groups, selectedValue: (internalPickupDropoffPoint === null || internalPickupDropoffPoint === void 0 ? void 0 : internalPickupDropoffPoint.id) || null, onSelectionChange: handlePickupDropoffChange, placeholder: "Select pick-up / drop-off point", direction: undefined, type: "airport-port", showGroupTitles: true, error: isPickupDropoffEmpty, scrollOnOpen: scrollOnOpen, defaultValue: defaultPickupDropoffOption }) }), _jsx("div", { className: "round-trip__field round-trip__field--accommodation", children: _jsx(LocationDropdown, { label: "Accommodation", options: accommodationOptions.options, groups: accommodationOptions.groups, selectedValue: (internalAccommodation === null || internalAccommodation === void 0 ? void 0 : internalAccommodation.id) || null, onSelectionChange: handleAccommodationChange, placeholder: "Select accommodation", direction: "dropoff", type: "accommodation", showGroupTitles: false, error: isAccommodationEmpty, scrollOnOpen: scrollOnOpen, defaultValue: defaultAccommodationOption }) })] }) }));
+    return (_jsx("div", { className: "round-trip ".concat(className), "data-round-trip-id": id, children: _jsxs("div", { className: "round-trip__content", children: [_jsx("div", { className: "round-trip__field round-trip__field--pax ".concat(isPaxEmpty ? 'round-trip__field--error' : ''), children: _jsx(PaxSelector, { label: "Number of pax", value: internalPaxData, onChange: handlePaxChange, placeholder: "2 pax", className: isPaxEmpty ? 'pax-selector--error' : '', scrollOnOpen: scrollOnOpen, checkEmpty: checkEmpty }) }), _jsxs("div", { className: "round-trip__field round-trip__field--dates", children: [_jsx(Text, { size: "sm", variant: "regular", className: "round-trip__field-label", children: "Arrival date - Departure date" }), _jsx(DateTimePicker, { placeholder: "DD/MM/YYYY - DD/MM/YYYY", mode: "calendar", iconPosition: "left", numberOfMonths: 2, iconBGFull: false, showChevron: true, onValueChange: handleDateRangeChange, selectionMode: "range", defaultValue: internalArrivalDate && internalDepartureDate
+                                ? [internalArrivalDate, internalDepartureDate]
+                                : undefined, inputClassName: "round-trip__date-picker--input", state: isDateError() ? 'error' : undefined, scrollOnOpen: scrollOnOpen })] }), _jsx("div", { className: "round-trip__field round-trip__field--pickup-dropoff", children: _jsx(LocationDropdown, { label: "Pick up / Drop-off point", options: pickupDropoffOptions.options, groups: pickupDropoffOptions.groups, selectedValue: (internalPickupDropoffPoint === null || internalPickupDropoffPoint === void 0 ? void 0 : internalPickupDropoffPoint.id) || null, onSelectionChange: handlePickupDropoffChange, placeholder: "Select pick-up / drop-off point", direction: undefined, type: "airport-port", showGroupTitles: true, error: isPickupDropoffEmpty, scrollOnOpen: scrollOnOpen, defaultValue: defaultPickupDropoffOption }) }), _jsx("div", { className: "round-trip__field round-trip__field--accommodation", children: _jsx(LocationDropdown, { label: "Accommodation", options: accommodationOptions.options, groups: accommodationOptions.groups, selectedValue: (internalAccommodation === null || internalAccommodation === void 0 ? void 0 : internalAccommodation.id) || null, onSelectionChange: handleAccommodationChange, placeholder: "Select accommodation", direction: "dropoff", type: "accommodation", showGroupTitles: false, error: isAccommodationEmpty, scrollOnOpen: scrollOnOpen, defaultValue: defaultAccommodationOption }) })] }) }));
 };
 export default RoundTrip;

package/package.json

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

package/src/components/atoms/Chip/Chip.tsx

@@ -29,7 +29,7 @@ export interface ChipProps {
   externalIcon?: string;
 }
 
-const Chip: React.FC<ChipProps> = ({
+function Chip({
   label,
   children,
   size = 'sm',
@@ -42,7 +42,7 @@ const Chip: React.FC<ChipProps> = ({
   isBlackText = false,
   externalIcon,
   onClick,
-}) => {
+}: ChipProps) {
   const baseClasses = 'chip';
   const sizeClass = `chip--${size}`;
   const typeClass = `chip--${type}`;
@@ -88,6 +88,6 @@ const Chip: React.FC<ChipProps> = ({
       )}
     </div>
   );
-};
+}
 
 export default Chip;

package/src/components/molecules/LocationDropdown/LocationDropdown.tsx

@@ -20,6 +20,7 @@ export interface LocationGroup {
 export interface LocationData {
   id: string | number;
   locationName: string;
+  label?: string;
 }
 
 export interface LocationDropdownProps {

package/src/components/organisms/RoundTrip/RoundTrip.tsx

@@ -1,19 +1,19 @@
-import React, { useEffect, useState } from "react";
-import "../../../styles/components/organism/round-trip.css";
-import { Text } from "../../atoms/Typography/Typography";
+import React, { useEffect, useState } from 'react';
+import '../../../styles/components/organism/round-trip.css';
+import { Text } from '../../atoms/Typography/Typography';
 import LocationDropdown, {
-    LocationData,
-    LocationGroup,
-    LocationOption,
-} from "../../molecules/LocationDropdown/LocationDropdown";
-import DateTimePicker from "../DateTimePicker/DateTimePicker";
-import PaxSelector, { PaxData } from "../PaxSelector/PaxSelector";
+  LocationData,
+  LocationGroup,
+  LocationOption,
+} from '../../molecules/LocationDropdown/LocationDropdown';
+import DateTimePicker from '../DateTimePicker/DateTimePicker';
+import PaxSelector, { PaxData } from '../PaxSelector/PaxSelector';
 
 // Re-export LocationOption for convenience
 export type { LocationOption };
 
 export interface RoundTripTransfer {
-  type: "arrival" | "departure";
+  type: 'arrival' | 'departure';
   paxData?: PaxData;
   transferDate?: string;
   pickupPoint?: LocationOption;
@@ -79,19 +79,17 @@ const RoundTrip: React.FC<RoundTripProps> = ({
   onPickupDropoffChange,
   onAccommodationChange,
   onChange,
-  className = "",
+  className = '',
   checkEmpty = false,
   scrollOnOpen = false,
 }) => {
-  const [internalPaxData, setInternalPaxData] = useState<PaxData | undefined>(
-    paxData
+  const [internalPaxData, setInternalPaxData] = useState<PaxData | undefined>(paxData);
+  const [internalArrivalDate, setInternalArrivalDate] = useState<string | undefined>(
+    arrivalDate
+  );
+  const [internalDepartureDate, setInternalDepartureDate] = useState<string | undefined>(
+    departureDate
   );
-  const [internalArrivalDate, setInternalArrivalDate] = useState<
-    string | undefined
-  >(arrivalDate);
-  const [internalDepartureDate, setInternalDepartureDate] = useState<
-    string | undefined
-  >(departureDate);
   const [internalPickupDropoffPoint, setInternalPickupDropoffPoint] =
     useState<LocationOption | null>(null);
   const [internalAccommodation, setInternalAccommodation] =
@@ -113,32 +111,28 @@ const RoundTrip: React.FC<RoundTripProps> = ({
 
     // Filter for airport and port
     const airportPortOptions = allOptions.filter(
-      (opt) => opt.type === "airport" || opt.type === "port"
+      (opt) => opt.type === 'airport' || opt.type === 'port'
     );
 
     // Filter for accommodations
-    const accommodationOptions = allOptions.filter(
-      (opt) => opt.type === "accommodation"
-    );
+    const accommodationOptions = allOptions.filter((opt) => opt.type === 'accommodation');
 
     // Create groups
     const airportPortGroup: LocationGroup = {
-      id: "airport-port-group",
-      label: "Airport & Port",
+      id: 'airport-port-group',
+      label: 'Airport & Port',
       options: airportPortOptions,
     };
 
     const accommodationGroup: LocationGroup = {
-      id: "accommodation-group",
-      label: "Accommodations",
+      id: 'accommodation-group',
+      label: 'Accommodations',
       options: accommodationOptions,
     };
 
     return {
       options: [],
-      groups: [airportPortGroup, accommodationGroup].filter(
-        (g) => g.options.length > 0
-      ),
+      groups: [airportPortGroup, accommodationGroup].filter((g) => g.options.length > 0),
     };
   };
 
@@ -147,15 +141,13 @@ const RoundTrip: React.FC<RoundTripProps> = ({
     const allGroups = locations.groups || [];
 
     // Filter for accommodations only
-    const accommodationOptions = allOptions.filter(
-      (opt) => opt.type === "accommodation"
-    );
+    const accommodationOptions = allOptions.filter((opt) => opt.type === 'accommodation');
 
     // Extract accommodation groups if they exist
     const accommodationGroups = allGroups
       .map((group) => ({
         ...group,
-        options: group.options.filter((opt) => opt.type === "accommodation"),
+        options: group.options.filter((opt) => opt.type === 'accommodation'),
       }))
       .filter((group) => group.options.length > 0);
 
@@ -166,8 +158,16 @@ const RoundTrip: React.FC<RoundTripProps> = ({
   };
 
   // Helper to check if value is LocationOption
-  const isLocationOption = (value: string | LocationOption | undefined): value is LocationOption => {
-    return typeof value === 'object' && value !== null && 'id' in value && 'label' in value && 'type' in value;
+  const isLocationOption = (
+    value: string | LocationOption | undefined
+  ): value is LocationOption => {
+    return (
+      typeof value === 'object' &&
+      value !== null &&
+      'id' in value &&
+      'label' in value &&
+      'type' in value
+    );
   };
 
   // Initialize location data from IDs or LocationOption objects
@@ -185,15 +185,13 @@ const RoundTrip: React.FC<RoundTripProps> = ({
     const allLocations = getAllLocations(options, groups);
 
     if (pickupDropoffPoint) {
-      const location = allLocations.find(
-        (loc) => loc.id === pickupDropoffPoint
-      );
+      const location = allLocations.find((loc) => loc.id === pickupDropoffPoint);
       if (location && internalPickupDropoffPoint?.id !== location.id) {
         setInternalPickupDropoffPoint(location);
       }
     } else if (!internalPickupDropoffPoint) {
       // Set default to first airport if available (only if not already set)
-      const defaultAirport = allLocations.find((loc) => loc.type === "airport");
+      const defaultAirport = allLocations.find((loc) => loc.type === 'airport');
       if (defaultAirport) {
         setInternalPickupDropoffPoint(defaultAirport);
         onPickupDropoffChange?.(defaultAirport);
@@ -228,7 +226,7 @@ const RoundTrip: React.FC<RoundTripProps> = ({
   useEffect(() => {
     // Create arrival transfer
     const arrivalTransfer: RoundTripTransfer = {
-      type: "arrival",
+      type: 'arrival',
       paxData: internalPaxData,
       transferDate: internalArrivalDate,
       pickupPoint: internalPickupDropoffPoint || undefined,
@@ -237,7 +235,7 @@ const RoundTrip: React.FC<RoundTripProps> = ({
 
     // Create departure transfer
     const departureTransfer: RoundTripTransfer = {
-      type: "departure",
+      type: 'departure',
       paxData: internalPaxData,
       transferDate: internalDepartureDate,
       pickupPoint: internalAccommodation || undefined,
@@ -279,28 +277,41 @@ const RoundTrip: React.FC<RoundTripProps> = ({
   };
 
   // Helper to convert LocationData to LocationOption
-  const toLocationOption = (locationData: LocationData | null, locationType: 'pickup-dropoff' | 'accommodation'): LocationOption | null => {
+  const toLocationOption = (
+    locationData: LocationData | null,
+    locationType: 'pickup-dropoff' | 'accommodation'
+  ): LocationOption | null => {
     if (!locationData) return null;
-    
+
+    const locationName = locationData.locationName ?? locationData.label;
+
     // Try to find in the options to get the type
-    const { options, groups } = locationType === 'pickup-dropoff' ? getPickupDropoffOptions() : getAccommodationOptions();
+    const { options, groups } =
+      locationType === 'pickup-dropoff'
+        ? getPickupDropoffOptions()
+        : getAccommodationOptions();
     const allLocations = getAllLocations(options, groups);
     const found = allLocations.find((loc) => loc.id === locationData.id);
     if (found) return found;
-    
+
     // If not found, infer the type
-    const name = locationData.locationName.toLowerCase();
+    const name = locationName.toLowerCase();
     const id = String(locationData.id).toLowerCase();
     let type: 'airport' | 'port' | 'accommodation' = 'accommodation';
-    if (name.includes('harbour') || name.includes('port') || id.includes('harbour') || id.includes('port')) {
+    if (
+      name.includes('harbour') ||
+      name.includes('port') ||
+      id.includes('harbour') ||
+      id.includes('port')
+    ) {
       type = 'port';
     } else if (name.includes('airport') || id.includes('airport')) {
       type = 'airport';
     }
-    
+
     return {
       id: locationData.id,
-      label: locationData.locationName,
+      label: locationName,
       type,
     };
   };
@@ -318,23 +329,29 @@ const RoundTrip: React.FC<RoundTripProps> = ({
   };
 
   // Check if inputs are empty (when checkEmpty is true)
-  const isPaxEmpty = checkEmpty && (!internalPaxData || 
-    (internalPaxData.adults === 0 && 
-     internalPaxData.teens === 0 && 
-     internalPaxData.children === 0 && 
-     (internalPaxData.infants === undefined || internalPaxData.infants === 0)));
+  const isPaxEmpty =
+    checkEmpty &&
+    (!internalPaxData ||
+      (internalPaxData.adults === 0 &&
+        internalPaxData.teens === 0 &&
+        internalPaxData.children === 0 &&
+        (internalPaxData.infants === undefined || internalPaxData.infants === 0)));
 
   // Show error if checkEmpty is true and either date is missing
-  const isDateEmpty = checkEmpty && (!internalArrivalDate || !internalDepartureDate || 
-    internalArrivalDate === '' || internalDepartureDate === '');
-  
+  const isDateEmpty =
+    checkEmpty &&
+    (!internalArrivalDate ||
+      !internalDepartureDate ||
+      internalArrivalDate === '' ||
+      internalDepartureDate === '');
+
   // Check if user filled one date but not the other (even without checkEmpty)
   const hasPartialDates = (): boolean => {
     if (!checkEmpty) return false;
     if (!internalArrivalDate || !internalDepartureDate) return true;
     return internalArrivalDate === internalDepartureDate;
   };
-  
+
   const isDateError = (): boolean => {
     return isDateEmpty || hasPartialDates();
   };
@@ -347,27 +364,37 @@ const RoundTrip: React.FC<RoundTripProps> = ({
   const accommodationOptions = getAccommodationOptions();
 
   // Helper function to find LocationOption from ID or LocationOption for defaultValue
-  const findLocationOption = (value: string | LocationOption | undefined, locationType: 'pickup-dropoff' | 'accommodation'): LocationOption | undefined => {
+  const findLocationOption = (
+    value: string | LocationOption | undefined,
+    locationType: 'pickup-dropoff' | 'accommodation'
+  ): LocationOption | undefined => {
     if (!value) return undefined;
-    
+
     // If value is already a LocationOption object, use it directly
     if (isLocationOption(value)) {
       return value;
     }
-    
+
     // Otherwise, look up by ID in the locations
-    const { options, groups } = locationType === 'pickup-dropoff' ? getPickupDropoffOptions() : getAccommodationOptions();
+    const { options, groups } =
+      locationType === 'pickup-dropoff'
+        ? getPickupDropoffOptions()
+        : getAccommodationOptions();
     const allLocations = getAllLocations(options, groups);
     return allLocations.find((loc) => loc.id === value);
   };
 
-  const defaultPickupDropoffOption = findLocationOption(pickupDropoffPoint, 'pickup-dropoff');
+  const defaultPickupDropoffOption = findLocationOption(
+    pickupDropoffPoint,
+    'pickup-dropoff'
+  );
   const defaultAccommodationOption = findLocationOption(accommodation, 'accommodation');
 
   return (
     <div className={`round-trip ${className}`} data-round-trip-id={id}>
       <div className="round-trip__content">
-        <div className={`round-trip__field round-trip__field--pax ${isPaxEmpty ? 'round-trip__field--error' : ''}`}>
+        <div
+          className={`round-trip__field round-trip__field--pax ${isPaxEmpty ? 'round-trip__field--error' : ''}`}>
           <PaxSelector
             label="Number of pax"
             value={internalPaxData}
@@ -392,7 +419,11 @@ const RoundTrip: React.FC<RoundTripProps> = ({
             showChevron={true}
             onValueChange={handleDateRangeChange}
             selectionMode="range"
-            defaultValue={internalArrivalDate && internalDepartureDate ? [internalArrivalDate, internalDepartureDate] : undefined}
+            defaultValue={
+              internalArrivalDate && internalDepartureDate
+                ? [internalArrivalDate, internalDepartureDate]
+                : undefined
+            }
             inputClassName="round-trip__date-picker--input"
             state={isDateError() ? 'error' : undefined}
             scrollOnOpen={scrollOnOpen}