mautourco-components 0.2.86 → 0.2.88

package/dist/components/molecules/VehicleSupplement/VehicleSupplement.js

@@ -51,6 +51,9 @@ var VehicleSupplement = function (_a) {
     };
     var getTransferTypeIcon = function (transferType) {
         var type = transferType.toLowerCase();
+        if (type.includes('harbour')) {
+            return 'ship';
+        }
         if (type.includes('arrival') || type.includes('airport') || type.includes('inbound')) {
             return 'plane-landing-outline';
         }

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

@@ -1,3 +1,3 @@
 export * from './Booking';
-export type { BookingDocketProps } from './BookingDocket/BookingDocket';
+export type { BookingDocketItem, BookingDocketProps, BookingResumeData, } from './BookingDocket/BookingDocket';
 export type { BookingStepProps } from './BookingStep/BookingStep';

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

@@ -1,22 +1,22 @@
 import React from "react";
 import "../../../styles/components/organism/round-trip.css";
-import { LocationData, LocationGroup, LocationOption } from "../../molecules/LocationDropdown/LocationDropdown";
+import { LocationGroup, LocationOption } from "../../molecules/LocationDropdown/LocationDropdown";
 import { PaxData } from "../PaxSelector/PaxSelector";
-export type { LocationData };
+export type { LocationOption };
 export interface RoundTripTransfer {
     type: "arrival" | "departure";
     paxData?: PaxData;
     transferDate?: string;
-    pickupPoint?: LocationData;
-    dropoffPoint?: LocationData;
+    pickupPoint?: LocationOption;
+    dropoffPoint?: LocationOption;
 }
 export interface RoundTripData {
     id: string;
     paxData?: PaxData;
     arrivalDate?: string;
     departureDate?: string;
-    pickupDropoffPoint?: LocationData;
-    accommodation?: LocationData;
+    pickupDropoffPoint?: LocationOption;
+    accommodation?: LocationOption;
     transfers: [RoundTripTransfer, RoundTripTransfer];
 }
 export interface RoundTripProps {
@@ -28,10 +28,10 @@ export interface RoundTripProps {
     arrivalDate?: string;
     /** Departure date */
     departureDate?: string;
-    /** Selected pickup/dropoff point ID (for initial value) */
-    pickupDropoffPoint?: string;
-    /** Selected accommodation ID (for initial value) */
-    accommodation?: string;
+    /** Selected pickup/dropoff point - can be an ID string or LocationOption object */
+    pickupDropoffPoint?: string | LocationOption;
+    /** Selected accommodation - can be an ID string or LocationOption object */
+    accommodation?: string | LocationOption;
     /** All location options */
     locations?: {
         options?: LocationOption[];
@@ -42,9 +42,9 @@ export interface RoundTripProps {
     /** Callback when dates change */
     onDatesChange?: (arrivalDate: string, departureDate: string) => void;
     /** Callback when pickup/dropoff point changes */
-    onPickupDropoffChange?: (location: LocationData | null) => void;
+    onPickupDropoffChange?: (location: LocationOption | null) => void;
     /** Callback when accommodation changes */
-    onAccommodationChange?: (location: LocationData | null) => void;
+    onAccommodationChange?: (location: LocationOption | null) => void;
     /** Callback when any data changes - returns array of 2 transfers */
     onChange?: (data: RoundTripData) => void;
     /** Additional CSS classes */

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

@@ -75,43 +75,53 @@ var RoundTrip = function (_a) {
             groups: accommodationGroups,
         };
     };
-    // Initialize location data from IDs
+    // 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;
+    };
+    // Initialize location data from IDs or LocationOption objects
     useEffect(function () {
+        // If pickupDropoffPoint is already a LocationOption object, use it directly
+        if (isLocationOption(pickupDropoffPoint)) {
+            // Only update if the ID is different to prevent infinite loops
+            if ((internalPickupDropoffPoint === null || internalPickupDropoffPoint === void 0 ? void 0 : internalPickupDropoffPoint.id) !== pickupDropoffPoint.id) {
+                setInternalPickupDropoffPoint(pickupDropoffPoint);
+            }
+            return;
+        }
         var _a = getPickupDropoffOptions(), options = _a.options, groups = _a.groups;
         var allLocations = getAllLocations(options, groups);
         if (pickupDropoffPoint) {
             var location_1 = allLocations.find(function (loc) { return loc.id === pickupDropoffPoint; });
-            if (location_1) {
-                setInternalPickupDropoffPoint({
-                    id: location_1.id,
-                    locationName: location_1.label,
-                });
+            if (location_1 && (internalPickupDropoffPoint === null || internalPickupDropoffPoint === void 0 ? void 0 : internalPickupDropoffPoint.id) !== location_1.id) {
+                setInternalPickupDropoffPoint(location_1);
             }
         }
-        else {
-            // Set default to first airport if available
+        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"; });
             if (defaultAirport) {
-                var defaultData = {
-                    id: defaultAirport.id,
-                    locationName: defaultAirport.label,
-                };
-                setInternalPickupDropoffPoint(defaultData);
-                onPickupDropoffChange === null || onPickupDropoffChange === void 0 ? void 0 : onPickupDropoffChange(defaultData);
+                setInternalPickupDropoffPoint(defaultAirport);
+                onPickupDropoffChange === null || onPickupDropoffChange === void 0 ? void 0 : onPickupDropoffChange(defaultAirport);
             }
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [pickupDropoffPoint, locations]);
     useEffect(function () {
+        // If accommodation is already a LocationOption object, use it directly
+        if (isLocationOption(accommodation)) {
+            // Only update if the ID is different to prevent infinite loops
+            if ((internalAccommodation === null || internalAccommodation === void 0 ? void 0 : internalAccommodation.id) !== accommodation.id) {
+                setInternalAccommodation(accommodation);
+            }
+            return;
+        }
         var _a = getAccommodationOptions(), options = _a.options, groups = _a.groups;
         var allLocations = getAllLocations(options, groups);
         if (accommodation) {
             var location_2 = allLocations.find(function (loc) { return loc.id === accommodation; });
-            if (location_2) {
-                setInternalAccommodation({
-                    id: location_2.id,
-                    locationName: location_2.label,
-                });
+            if (location_2 && (internalAccommodation === null || internalAccommodation === void 0 ? void 0 : internalAccommodation.id) !== location_2.id) {
+                setInternalAccommodation(location_2);
             }
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -164,13 +174,41 @@ var RoundTrip = function (_a) {
             onDatesChange === null || onDatesChange === void 0 ? void 0 : onDatesChange(dates[0], dates[1]);
         }
     };
+    // Helper to convert LocationData to LocationOption
+    var toLocationOption = function (locationData, locationType) {
+        if (!locationData)
+            return null;
+        // Try to find in the options to get the type
+        var _a = locationType === 'pickup-dropoff' ? getPickupDropoffOptions() : getAccommodationOptions(), options = _a.options, groups = _a.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 id = String(locationData.id).toLowerCase();
+        var type = 'accommodation';
+        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,
+            type: type,
+        };
+    };
     var handlePickupDropoffChange = function (location) {
-        setInternalPickupDropoffPoint(location);
-        onPickupDropoffChange === null || onPickupDropoffChange === void 0 ? void 0 : onPickupDropoffChange(location);
+        var locationOption = toLocationOption(location, 'pickup-dropoff');
+        setInternalPickupDropoffPoint(locationOption);
+        onPickupDropoffChange === null || onPickupDropoffChange === void 0 ? void 0 : onPickupDropoffChange(locationOption);
     };
     var handleAccommodationChange = function (location) {
-        setInternalAccommodation(location);
-        onAccommodationChange === null || onAccommodationChange === void 0 ? void 0 : onAccommodationChange(location);
+        var locationOption = toLocationOption(location, 'accommodation');
+        setInternalAccommodation(locationOption);
+        onAccommodationChange === null || onAccommodationChange === void 0 ? void 0 : onAccommodationChange(locationOption);
     };
     // Check if inputs are empty (when checkEmpty is true)
     var isPaxEmpty = checkEmpty && (!internalPaxData ||
@@ -184,13 +222,18 @@ var RoundTrip = function (_a) {
     var isAccommodationEmpty = checkEmpty && !internalAccommodation;
     var pickupDropoffOptions = getPickupDropoffOptions();
     var accommodationOptions = getAccommodationOptions();
-    // Helper function to find LocationOption from ID for defaultValue
-    var findLocationOption = function (id, locationType) {
-        if (!id)
+    // Helper function to find LocationOption from ID or LocationOption for defaultValue
+    var findLocationOption = function (value, locationType) {
+        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
         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 === id; });
+        return allLocations.find(function (loc) { return loc.id === value; });
     };
     var defaultPickupDropoffOption = findLocationOption(pickupDropoffPoint, 'pickup-dropoff');
     var defaultAccommodationOption = findLocationOption(accommodation, 'accommodation');

package/dist/components/organisms/SearchBarTransfer/SearchBarTransfer.js

@@ -31,8 +31,7 @@ import RoundTrip from "../RoundTrip/RoundTrip";
 import TransferLine from "../TransferLine/TransferLine";
 var transferIdCounter = 0;
 var SearchBarTransfer = function (_a) {
-    var _b, _c;
-    var _d = _a.mode, initialMode = _d === void 0 ? "roundtrip" : _d, _e = _a.locations, locations = _e === void 0 ? { options: [], groups: [] } : _e, defaultRoundTripData = _a.defaultRoundTripData, defaultTransferLines = _a.defaultTransferLines, _f = _a.defaultSameVehicle, defaultSameVehicle = _f === void 0 ? false : _f, onSearch = _a.onSearch, onChange = _a.onChange, onRemove = _a.onRemove, _g = _a.className, className = _g === void 0 ? "" : _g, _h = _a.scrollOnOpen, scrollOnOpen = _h === void 0 ? false : _h;
+    var _b = _a.mode, initialMode = _b === void 0 ? "roundtrip" : _b, _c = _a.locations, locations = _c === void 0 ? { options: [], groups: [] } : _c, defaultRoundTripData = _a.defaultRoundTripData, defaultTransferLines = _a.defaultTransferLines, _d = _a.defaultSameVehicle, defaultSameVehicle = _d === void 0 ? false : _d, onSearch = _a.onSearch, onChange = _a.onChange, onRemove = _a.onRemove, _e = _a.className, className = _e === void 0 ? "" : _e, _f = _a.scrollOnOpen, scrollOnOpen = _f === void 0 ? false : _f;
     // Generate unique ID for transfer lines
     var generateTransferId = function () {
         transferIdCounter += 1;
@@ -44,11 +43,11 @@ var SearchBarTransfer = function (_a) {
             return [];
         return lines.map(function (line) { return (__assign(__assign({}, line), { id: line.id || generateTransferId() })); });
     };
-    var _j = useState(initialMode), mode = _j[0], setMode = _j[1];
-    var _k = useState(defaultSameVehicle), sameVehicle = _k[0], setSameVehicle = _k[1];
-    var _l = useState(defaultRoundTripData), roundTripData = _l[0], setRoundTripData = _l[1];
-    var _m = useState(initializeTransferLines(defaultTransferLines)), transferLines = _m[0], setTransferLines = _m[1];
-    var _o = useState(null), error = _o[0], setError = _o[1];
+    var _g = useState(initialMode), mode = _g[0], setMode = _g[1];
+    var _h = useState(defaultSameVehicle), sameVehicle = _h[0], setSameVehicle = _h[1];
+    var _j = useState(defaultRoundTripData), roundTripData = _j[0], setRoundTripData = _j[1];
+    var _k = useState(initializeTransferLines(defaultTransferLines)), transferLines = _k[0], setTransferLines = _k[1];
+    var _l = useState(null), error = _l[0], setError = _l[1];
     // Notify parent of changes
     useEffect(function () {
         var data = {
@@ -310,7 +309,7 @@ var SearchBarTransfer = function (_a) {
             onSearch === null || onSearch === void 0 ? void 0 : onSearch(data);
         }
     };
-    return (_jsxs("div", { className: "search-bar-transfer ".concat(className), children: [_jsxs("div", { className: "search-bar-transfer__header", children: [_jsx(Heading, { level: 5, variant: "bold", color: "accent", children: "Select your transfer details" }), _jsx("div", { className: "search-bar-transfer__mode-selector", children: _jsx(SegmentedButton, { options: modeOptions, value: mode, onChange: handleModeChange, name: "transfer-mode" }) })] }), mode === "roundtrip" ? (_jsxs(_Fragment, { children: [_jsx(RoundTrip, { id: "roundtrip-main", locations: locations, paxData: roundTripData === null || roundTripData === void 0 ? void 0 : roundTripData.paxData, arrivalDate: roundTripData === null || roundTripData === void 0 ? void 0 : roundTripData.arrivalDate, departureDate: roundTripData === null || roundTripData === void 0 ? void 0 : roundTripData.departureDate, pickupDropoffPoint: (_b = roundTripData === null || roundTripData === void 0 ? void 0 : roundTripData.pickupDropoffPoint) === null || _b === void 0 ? void 0 : _b.id, accommodation: (_c = roundTripData === null || roundTripData === void 0 ? void 0 : roundTripData.accommodation) === null || _c === void 0 ? void 0 : _c.id, onChange: setRoundTripData, checkEmpty: error !== null, scrollOnOpen: scrollOnOpen }), _jsx("div", { className: "search-bar-transfer__transfer-type", children: renderTransferTypeButtons(handleAddTransferFromRoundTrip) })] })) : (_jsxs(_Fragment, { children: [_jsxs("div", { className: "search-bar-transfer__transfer-type", children: [_jsx(Text, { size: "lg", variant: "bold", color: "subtle", as: "div", className: "search-bar-transfer__transfer-type-label", children: "Select a transfer type you want to add" }), renderTransferTypeButtons(handleAddTransfer)] }), transferLines.length === 0 && (_jsx(TransferLine, { id: "placeholder-transfer", type: "inter-hotel", locations: locations, onDataChange: function () { }, showDelete: false, disabled: true, scrollOnOpen: scrollOnOpen })), transferLines.length > 0 && (_jsx("div", { className: "search-bar-transfer__transfer-lines", children: (function () {
+    return (_jsxs("div", { className: "search-bar-transfer ".concat(className), children: [_jsxs("div", { className: "search-bar-transfer__header", children: [_jsx(Heading, { level: 5, variant: "bold", color: "accent", children: "Select your transfer details" }), _jsx("div", { className: "search-bar-transfer__mode-selector", children: _jsx(SegmentedButton, { options: modeOptions, value: mode, onChange: handleModeChange, name: "transfer-mode" }) })] }), mode === "roundtrip" ? (_jsxs(_Fragment, { children: [_jsx(RoundTrip, { id: "roundtrip-main", locations: locations, paxData: roundTripData === null || roundTripData === void 0 ? void 0 : roundTripData.paxData, arrivalDate: roundTripData === null || roundTripData === void 0 ? void 0 : roundTripData.arrivalDate, departureDate: roundTripData === null || roundTripData === void 0 ? void 0 : roundTripData.departureDate, pickupDropoffPoint: roundTripData === null || roundTripData === void 0 ? void 0 : roundTripData.pickupDropoffPoint, accommodation: roundTripData === null || roundTripData === void 0 ? void 0 : roundTripData.accommodation, onChange: setRoundTripData, checkEmpty: error !== null, scrollOnOpen: scrollOnOpen }), _jsx("div", { className: "search-bar-transfer__transfer-type", children: renderTransferTypeButtons(handleAddTransferFromRoundTrip) })] })) : (_jsxs(_Fragment, { children: [_jsxs("div", { className: "search-bar-transfer__transfer-type", children: [_jsx(Text, { size: "lg", variant: "bold", color: "subtle", as: "div", className: "search-bar-transfer__transfer-type-label", children: "Select a transfer type you want to add" }), renderTransferTypeButtons(handleAddTransfer)] }), transferLines.length === 0 && (_jsx(TransferLine, { id: "placeholder-transfer", type: "inter-hotel", locations: locations, onDataChange: function () { }, showDelete: false, disabled: true, scrollOnOpen: scrollOnOpen })), transferLines.length > 0 && (_jsx("div", { className: "search-bar-transfer__transfer-lines", children: (function () {
                             // Group transfers by type
                             var groupedTransfers = {
                                 arrival: [],
@@ -329,10 +328,7 @@ var SearchBarTransfer = function (_a) {
                                 departure: { label: "Departure", icon: "departure" },
                                 "inter-hotel": { label: "Inter-Hotel", icon: "building" },
                             };
-                            return nonEmptyGroups.map(function (type, groupIndex) { return (_jsxs(React.Fragment, { children: [_jsxs("div", { className: "search-bar-transfer__category-header", children: [_jsx(Icon, { name: categoryInfo[type].icon, size: "md" }), _jsx(Text, { size: "md", variant: "bold", color: "default", as: "span", children: categoryInfo[type].label })] }), groupedTransfers[type].map(function (line) {
-                                        var _a, _b;
-                                        return (_jsx(TransferLine, { id: line.id, type: line.type, paxData: line.paxData, transferDate: line.transferDate, pickupPoint: (_a = line.pickupPoint) === null || _a === void 0 ? void 0 : _a.id, dropoffPoint: (_b = line.dropoffPoint) === null || _b === void 0 ? void 0 : _b.id, locations: locations, onDataChange: function (data) { return handleTransferLineChange(line.id, data); }, onDelete: function () { return handleDeleteTransferLine(line.id); }, showDelete: transferLines.length > 1, checkEmpty: error !== null, scrollOnOpen: scrollOnOpen }, line.id));
-                                    }), groupIndex < nonEmptyGroups.length - 1 && (_jsx("svg", { className: "search-bar-transfer__divider", xmlns: "http://www.w3.org/2000/svg", width: "100%", height: "1", viewBox: "0 0 1076 1", fill: "none", preserveAspectRatio: "none", children: _jsx("path", { d: "M0 0.5L1076 0.499906", stroke: "var(--color-border-medium, #A3A3A3)", strokeWidth: "1", strokeDasharray: "10 10" }) }))] }, type)); });
+                            return nonEmptyGroups.map(function (type, groupIndex) { return (_jsxs(React.Fragment, { children: [_jsxs("div", { className: "search-bar-transfer__category-header", children: [_jsx(Icon, { name: categoryInfo[type].icon, size: "md" }), _jsx(Text, { size: "md", variant: "bold", color: "default", as: "span", children: categoryInfo[type].label })] }), groupedTransfers[type].map(function (line) { return (_jsx(TransferLine, { id: line.id, type: line.type, paxData: line.paxData, transferDate: line.transferDate, pickupPoint: line.pickupPoint, dropoffPoint: line.dropoffPoint, locations: locations, onDataChange: function (data) { return handleTransferLineChange(line.id, data); }, onDelete: function () { return handleDeleteTransferLine(line.id); }, showDelete: transferLines.length > 1, checkEmpty: error !== null, scrollOnOpen: scrollOnOpen }, line.id)); }), groupIndex < nonEmptyGroups.length - 1 && (_jsx("svg", { className: "search-bar-transfer__divider", xmlns: "http://www.w3.org/2000/svg", width: "100%", height: "1", viewBox: "0 0 1076 1", fill: "none", preserveAspectRatio: "none", children: _jsx("path", { d: "M0 0.5L1076 0.499906", stroke: "var(--color-border-medium, #A3A3A3)", strokeWidth: "1", strokeDasharray: "10 10" }) }))] }, type)); });
                         })() }))] })), _jsxs("div", { className: "search-bar-transfer__actions", children: [_jsx(Checkbox, { checked: sameVehicle, onChange: setSameVehicle, label: "Use the same vehicle for all your transfers" }), _jsxs("div", { className: "search-bar-transfer__cta", children: [error && (_jsx(Toast, { text: error, type: "danger" })), _jsx(Button, { variant: "primary", size: "lg", onClick: handleSearch, children: "Search" })] })] })] }));
 };
 export default SearchBarTransfer;

package/dist/components/organisms/SearchBarTransfer/index.d.ts

@@ -1,2 +1,2 @@
 export { default } from './SearchBarTransfer';
-export type { SearchBarTransferProps, SearchBarTransferData, TransferMode } from './SearchBarTransfer';
+export type { SearchBarTransferData, SearchBarTransferProps, TransferMode } from './SearchBarTransfer';

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

@@ -1,16 +1,16 @@
 import React from 'react';
 import '../../../styles/components/organism/transfer-line.css';
-import { LocationData, LocationGroup, LocationOption } from '../../molecules/LocationDropdown/LocationDropdown';
+import { LocationGroup, LocationOption } from '../../molecules/LocationDropdown/LocationDropdown';
 import { PaxData } from '../PaxSelector/PaxSelector';
 export type TransferType = 'arrival' | 'departure' | 'inter-hotel';
-export type { LocationData };
+export type { LocationOption };
 export interface TransferLineData {
     id: string;
     type: TransferType;
     paxData?: PaxData;
     transferDate?: string;
-    pickupPoint?: LocationData;
-    dropoffPoint?: LocationData;
+    pickupPoint?: LocationOption;
+    dropoffPoint?: LocationOption;
 }
 export interface TransferLineProps {
     /** Unique identifier for this transfer line */
@@ -21,10 +21,10 @@ export interface TransferLineProps {
     paxData?: PaxData;
     /** Transfer date */
     transferDate?: string;
-    /** Selected pickup point ID (for initial value) */
-    pickupPoint?: string | number;
-    /** Selected dropoff point ID (for initial value) */
-    dropoffPoint?: string | number;
+    /** Selected pickup point - can be an ID (string/number) or LocationOption object */
+    pickupPoint?: string | number | LocationOption;
+    /** Selected dropoff point - can be an ID (string/number) or LocationOption object */
+    dropoffPoint?: string | number | LocationOption;
     /** All location options - will be filtered based on transfer type */
     locations?: {
         options?: LocationOption[];
@@ -35,9 +35,9 @@ export interface TransferLineProps {
     /** Callback when transfer date changes */
     onDateChange?: (date: string) => void;
     /** Callback when pickup point changes */
-    onPickupChange?: (location: LocationData | null) => void;
+    onPickupChange?: (location: LocationOption | null) => void;
     /** Callback when dropoff point changes */
-    onDropoffChange?: (location: LocationData | null) => void;
+    onDropoffChange?: (location: LocationOption | null) => void;
     /** Callback when any data changes - returns complete TransferLineData */
     onDataChange?: (data: TransferLineData) => void;
     /** Callback when delete button is clicked */

package/dist/components/organisms/TransferLine/TransferLine.js

@@ -68,55 +68,61 @@ var TransferLine = function (_a) {
         }
         return null;
     };
-    // Initialize location data from IDs or set defaults
+    // 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;
+    };
+    // Initialize location data from IDs, LocationOption objects, or set defaults
     React.useEffect(function () {
+        // If pickupPoint is already a LocationOption object, use it directly
+        if (isLocationOption(pickupPoint)) {
+            // Only update if the ID is different to prevent infinite loops
+            if ((internalPickupPoint === null || internalPickupPoint === void 0 ? void 0 : internalPickupPoint.id) !== pickupPoint.id) {
+                setInternalPickupPoint(pickupPoint);
+            }
+            return;
+        }
         var _a = filterLocations('pickup'), options = _a.options, groups = _a.groups;
         var allPickupLocations = getAllLocations(options, groups);
         if (pickupPoint) {
             var location_1 = allPickupLocations.find(function (loc) { return loc.id === pickupPoint; });
-            if (location_1) {
-                setInternalPickupPoint({
-                    id: location_1.id,
-                    locationName: location_1.label,
-                });
+            if (location_1 && (internalPickupPoint === null || internalPickupPoint === void 0 ? void 0 : internalPickupPoint.id) !== location_1.id) {
+                setInternalPickupPoint(location_1);
             }
         }
-        else {
-            // Set default location if applicable
+        else if (!internalPickupPoint) {
+            // Set default location if applicable (only if not already set)
             var defaultLocation = getDefaultLocation('pickup');
             if (defaultLocation) {
-                var defaultData = {
-                    id: defaultLocation.id,
-                    locationName: defaultLocation.label,
-                };
-                setInternalPickupPoint(defaultData);
-                onPickupChange === null || onPickupChange === void 0 ? void 0 : onPickupChange(defaultData);
+                setInternalPickupPoint(defaultLocation);
+                onPickupChange === null || onPickupChange === void 0 ? void 0 : onPickupChange(defaultLocation);
             }
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [pickupPoint, type, locations]);
     React.useEffect(function () {
+        // If dropoffPoint is already a LocationOption object, use it directly
+        if (isLocationOption(dropoffPoint)) {
+            // Only update if the ID is different to prevent infinite loops
+            if ((internalDropoffPoint === null || internalDropoffPoint === void 0 ? void 0 : internalDropoffPoint.id) !== dropoffPoint.id) {
+                setInternalDropoffPoint(dropoffPoint);
+            }
+            return;
+        }
         var _a = filterLocations('dropoff'), options = _a.options, groups = _a.groups;
         var allDropoffLocations = getAllLocations(options, groups);
         if (dropoffPoint) {
             var location_2 = allDropoffLocations.find(function (loc) { return loc.id === dropoffPoint; });
-            if (location_2) {
-                setInternalDropoffPoint({
-                    id: location_2.id,
-                    locationName: location_2.label,
-                });
+            if (location_2 && (internalDropoffPoint === null || internalDropoffPoint === void 0 ? void 0 : internalDropoffPoint.id) !== location_2.id) {
+                setInternalDropoffPoint(location_2);
             }
         }
-        else {
-            // Set default location if applicable
+        else if (!internalDropoffPoint) {
+            // Set default location if applicable (only if not already set)
             var defaultLocation = getDefaultLocation('dropoff');
             if (defaultLocation) {
-                var defaultData = {
-                    id: defaultLocation.id,
-                    locationName: defaultLocation.label,
-                };
-                setInternalDropoffPoint(defaultData);
-                onDropoffChange === null || onDropoffChange === void 0 ? void 0 : onDropoffChange(defaultData);
+                setInternalDropoffPoint(defaultLocation);
+                onDropoffChange === null || onDropoffChange === void 0 ? void 0 : onDropoffChange(defaultLocation);
             }
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -174,13 +180,41 @@ var TransferLine = function (_a) {
         setInternalTransferDate(dateValue);
         onDateChange === null || onDateChange === void 0 ? void 0 : onDateChange(dateValue);
     };
+    // Helper to convert LocationData to LocationOption
+    var toLocationOption = function (locationData, position) {
+        if (!locationData)
+            return null;
+        // Try to find in the options to get the type
+        var _a = filterLocations(position), options = _a.options, groups = _a.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 id = String(locationData.id).toLowerCase();
+        var locType = 'accommodation';
+        if (name.includes('harbour') || name.includes('port') || id.includes('harbour') || id.includes('port')) {
+            locType = 'port';
+        }
+        else if (name.includes('airport') || id.includes('airport')) {
+            locType = 'airport';
+        }
+        return {
+            id: locationData.id,
+            label: locationData.locationName,
+            type: locType,
+        };
+    };
     var handlePickupChange = function (location) {
-        setInternalPickupPoint(location);
-        onPickupChange === null || onPickupChange === void 0 ? void 0 : onPickupChange(location);
+        var locationOption = toLocationOption(location, 'pickup');
+        setInternalPickupPoint(locationOption);
+        onPickupChange === null || onPickupChange === void 0 ? void 0 : onPickupChange(locationOption);
     };
     var handleDropoffChange = function (location) {
-        setInternalDropoffPoint(location);
-        onDropoffChange === null || onDropoffChange === void 0 ? void 0 : onDropoffChange(location);
+        var locationOption = toLocationOption(location, 'dropoff');
+        setInternalDropoffPoint(locationOption);
+        onDropoffChange === null || onDropoffChange === void 0 ? void 0 : onDropoffChange(locationOption);
     };
     // Check if inputs are empty (when checkEmpty is true)
     var isPaxEmpty = checkEmpty &&
@@ -192,13 +226,18 @@ var TransferLine = function (_a) {
     var isDateEmpty = checkEmpty && (!internalTransferDate || internalTransferDate === '');
     var isPickupEmpty = checkEmpty && !internalPickupPoint;
     var isDropoffEmpty = checkEmpty && !internalDropoffPoint;
-    // Helper function to find LocationOption from ID for defaultValue
-    var findLocationOption = function (id, position) {
-        if (!id)
+    // Helper function to find LocationOption from ID or LocationOption for defaultValue
+    var findLocationOption = function (value, position) {
+        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
         var _a = filterLocations(position), options = _a.options, groups = _a.groups;
         var allLocations = getAllLocations(options, groups);
-        return allLocations.find(function (loc) { return loc.id === id; });
+        return allLocations.find(function (loc) { return loc.id === value; });
     };
     var defaultPickupOption = findLocationOption(pickupPoint, 'pickup');
     var defaultDropoffOption = findLocationOption(dropoffPoint, 'dropoff');

package/package.json

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

package/src/components/molecules/VehicleSupplement/VehicleSupplement.tsx

@@ -88,6 +88,9 @@ const VehicleSupplement: React.FC<VehicleSupplementProps> = ({
 
   const getTransferTypeIcon = (transferType: string) => {
     const type = transferType.toLowerCase();
+    if (type.includes('harbour')) {
+      return 'ship';
+    }
     if (type.includes('arrival') || type.includes('airport') || type.includes('inbound')) {
       return 'plane-landing-outline';
     }

package/src/components/organisms/Booking/index.ts

@@ -1,3 +1,7 @@
 export * from './Booking';
-export type { BookingDocketProps } from './BookingDocket/BookingDocket';
+export type {
+  BookingDocketItem,
+  BookingDocketProps,
+  BookingResumeData,
+} from './BookingDocket/BookingDocket';
 export type { BookingStepProps } from './BookingStep/BookingStep';

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

@@ -9,15 +9,15 @@ import LocationDropdown, {
 import DateTimePicker from "../DateTimePicker/DateTimePicker";
 import PaxSelector, { PaxData } from "../PaxSelector/PaxSelector";
 
-// Re-export LocationData for convenience
-export type { LocationData };
+// Re-export LocationOption for convenience
+export type { LocationOption };
 
 export interface RoundTripTransfer {
   type: "arrival" | "departure";
   paxData?: PaxData;
   transferDate?: string;
-  pickupPoint?: LocationData;
-  dropoffPoint?: LocationData;
+  pickupPoint?: LocationOption;
+  dropoffPoint?: LocationOption;
 }
 
 export interface RoundTripData {
@@ -25,8 +25,8 @@ export interface RoundTripData {
   paxData?: PaxData;
   arrivalDate?: string;
   departureDate?: string;
-  pickupDropoffPoint?: LocationData;
-  accommodation?: LocationData;
+  pickupDropoffPoint?: LocationOption;
+  accommodation?: LocationOption;
   transfers: [RoundTripTransfer, RoundTripTransfer];
 }
 
@@ -39,10 +39,10 @@ export interface RoundTripProps {
   arrivalDate?: string;
   /** Departure date */
   departureDate?: string;
-  /** Selected pickup/dropoff point ID (for initial value) */
-  pickupDropoffPoint?: string;
-  /** Selected accommodation ID (for initial value) */
-  accommodation?: string;
+  /** Selected pickup/dropoff point - can be an ID string or LocationOption object */
+  pickupDropoffPoint?: string | LocationOption;
+  /** Selected accommodation - can be an ID string or LocationOption object */
+  accommodation?: string | LocationOption;
   /** All location options */
   locations?: {
     options?: LocationOption[];
@@ -53,9 +53,9 @@ export interface RoundTripProps {
   /** Callback when dates change */
   onDatesChange?: (arrivalDate: string, departureDate: string) => void;
   /** Callback when pickup/dropoff point changes */
-  onPickupDropoffChange?: (location: LocationData | null) => void;
+  onPickupDropoffChange?: (location: LocationOption | null) => void;
   /** Callback when accommodation changes */
-  onAccommodationChange?: (location: LocationData | null) => void;
+  onAccommodationChange?: (location: LocationOption | null) => void;
   /** Callback when any data changes - returns array of 2 transfers */
   onChange?: (data: RoundTripData) => void;
   /** Additional CSS classes */
@@ -93,9 +93,9 @@ const RoundTrip: React.FC<RoundTripProps> = ({
     string | undefined
   >(departureDate);
   const [internalPickupDropoffPoint, setInternalPickupDropoffPoint] =
-    useState<LocationData | null>(null);
+    useState<LocationOption | null>(null);
   const [internalAccommodation, setInternalAccommodation] =
-    useState<LocationData | null>(null);
+    useState<LocationOption | null>(null);
 
   // Helper function to get all locations (from options and groups)
   const getAllLocations = (
@@ -165,8 +165,22 @@ const RoundTrip: React.FC<RoundTripProps> = ({
     };
   };
 
-  // Initialize location data from IDs
+  // 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;
+  };
+
+  // Initialize location data from IDs or LocationOption objects
   useEffect(() => {
+    // If pickupDropoffPoint is already a LocationOption object, use it directly
+    if (isLocationOption(pickupDropoffPoint)) {
+      // Only update if the ID is different to prevent infinite loops
+      if (internalPickupDropoffPoint?.id !== pickupDropoffPoint.id) {
+        setInternalPickupDropoffPoint(pickupDropoffPoint);
+      }
+      return;
+    }
+
     const { options, groups } = getPickupDropoffOptions();
     const allLocations = getAllLocations(options, groups);
 
@@ -174,38 +188,37 @@ const RoundTrip: React.FC<RoundTripProps> = ({
       const location = allLocations.find(
         (loc) => loc.id === pickupDropoffPoint
       );
-      if (location) {
-        setInternalPickupDropoffPoint({
-          id: location.id,
-          locationName: location.label,
-        });
+      if (location && internalPickupDropoffPoint?.id !== location.id) {
+        setInternalPickupDropoffPoint(location);
       }
-    } else {
-      // Set default to first airport if available
+    } else if (!internalPickupDropoffPoint) {
+      // Set default to first airport if available (only if not already set)
       const defaultAirport = allLocations.find((loc) => loc.type === "airport");
       if (defaultAirport) {
-        const defaultData: LocationData = {
-          id: defaultAirport.id,
-          locationName: defaultAirport.label,
-        };
-        setInternalPickupDropoffPoint(defaultData);
-        onPickupDropoffChange?.(defaultData);
+        setInternalPickupDropoffPoint(defaultAirport);
+        onPickupDropoffChange?.(defaultAirport);
       }
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [pickupDropoffPoint, locations]);
 
   useEffect(() => {
+    // If accommodation is already a LocationOption object, use it directly
+    if (isLocationOption(accommodation)) {
+      // Only update if the ID is different to prevent infinite loops
+      if (internalAccommodation?.id !== accommodation.id) {
+        setInternalAccommodation(accommodation);
+      }
+      return;
+    }
+
     const { options, groups } = getAccommodationOptions();
     const allLocations = getAllLocations(options, groups);
 
     if (accommodation) {
       const location = allLocations.find((loc) => loc.id === accommodation);
-      if (location) {
-        setInternalAccommodation({
-          id: location.id,
-          locationName: location.label,
-        });
+      if (location && internalAccommodation?.id !== location.id) {
+        setInternalAccommodation(location);
       }
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -265,14 +278,43 @@ const RoundTrip: React.FC<RoundTripProps> = ({
     }
   };
 
+  // Helper to convert LocationData to LocationOption
+  const toLocationOption = (locationData: LocationData | null, locationType: 'pickup-dropoff' | 'accommodation'): LocationOption | null => {
+    if (!locationData) return null;
+    
+    // Try to find in the options to get the type
+    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 id = String(locationData.id).toLowerCase();
+    let type: 'airport' | 'port' | 'accommodation' = 'accommodation';
+    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,
+      type,
+    };
+  };
+
   const handlePickupDropoffChange = (location: LocationData | null) => {
-    setInternalPickupDropoffPoint(location);
-    onPickupDropoffChange?.(location);
+    const locationOption = toLocationOption(location, 'pickup-dropoff');
+    setInternalPickupDropoffPoint(locationOption);
+    onPickupDropoffChange?.(locationOption);
   };
 
   const handleAccommodationChange = (location: LocationData | null) => {
-    setInternalAccommodation(location);
-    onAccommodationChange?.(location);
+    const locationOption = toLocationOption(location, 'accommodation');
+    setInternalAccommodation(locationOption);
+    onAccommodationChange?.(locationOption);
   };
 
   // Check if inputs are empty (when checkEmpty is true)
@@ -292,12 +334,19 @@ const RoundTrip: React.FC<RoundTripProps> = ({
   const pickupDropoffOptions = getPickupDropoffOptions();
   const accommodationOptions = getAccommodationOptions();
 
-  // Helper function to find LocationOption from ID for defaultValue
-  const findLocationOption = (id: string | undefined, locationType: 'pickup-dropoff' | 'accommodation'): LocationOption | undefined => {
-    if (!id) return undefined;
+  // Helper function to find LocationOption from ID or LocationOption for defaultValue
+  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 allLocations = getAllLocations(options, groups);
-    return allLocations.find((loc) => loc.id === id);
+    return allLocations.find((loc) => loc.id === value);
   };
 
   const defaultPickupDropoffOption = findLocationOption(pickupDropoffPoint, 'pickup-dropoff');

package/src/components/organisms/SearchBarTransfer/SearchBarTransfer.tsx

@@ -430,8 +430,8 @@ const SearchBarTransfer: React.FC<SearchBarTransferProps> = ({
             paxData={roundTripData?.paxData}
             arrivalDate={roundTripData?.arrivalDate}
             departureDate={roundTripData?.departureDate}
-            pickupDropoffPoint={roundTripData?.pickupDropoffPoint?.id as string}
-            accommodation={roundTripData?.accommodation?.id as string}
+            pickupDropoffPoint={roundTripData?.pickupDropoffPoint}
+            accommodation={roundTripData?.accommodation}
             onChange={setRoundTripData}
             checkEmpty={error !== null}
             scrollOnOpen={scrollOnOpen}
@@ -508,8 +508,8 @@ const SearchBarTransfer: React.FC<SearchBarTransferProps> = ({
                         type={line.type}
                         paxData={line.paxData}
                         transferDate={line.transferDate}
-                        pickupPoint={line.pickupPoint?.id}
-                        dropoffPoint={line.dropoffPoint?.id}
+                        pickupPoint={line.pickupPoint}
+                        dropoffPoint={line.dropoffPoint}
                         locations={locations}
                         onDataChange={(data) => handleTransferLineChange(line.id, data)}
                         onDelete={() => handleDeleteTransferLine(line.id)}

package/src/components/organisms/SearchBarTransfer/index.ts

@@ -1,5 +1,5 @@
 export { default } from './SearchBarTransfer';
-export type { SearchBarTransferProps, SearchBarTransferData, TransferMode } from './SearchBarTransfer';
+export type { SearchBarTransferData, SearchBarTransferProps, TransferMode } from './SearchBarTransfer';
 
 
 

package/src/components/organisms/TransferLine/TransferLine.tsx

@@ -12,16 +12,16 @@ import PaxSelector, { PaxData } from '../PaxSelector/PaxSelector';
 
 export type TransferType = 'arrival' | 'departure' | 'inter-hotel';
 
-// Re-export LocationData for convenience
-export type { LocationData };
+// Re-export LocationOption for convenience
+export type { LocationOption };
 
 export interface TransferLineData {
   id: string;
   type: TransferType;
   paxData?: PaxData;
   transferDate?: string;
-  pickupPoint?: LocationData;
-  dropoffPoint?: LocationData;
+  pickupPoint?: LocationOption;
+  dropoffPoint?: LocationOption;
 }
 
 export interface TransferLineProps {
@@ -33,10 +33,10 @@ export interface TransferLineProps {
   paxData?: PaxData;
   /** Transfer date */
   transferDate?: string;
-  /** Selected pickup point ID (for initial value) */
-  pickupPoint?: string | number;
-  /** Selected dropoff point ID (for initial value) */
-  dropoffPoint?: string | number;
+  /** Selected pickup point - can be an ID (string/number) or LocationOption object */
+  pickupPoint?: string | number | LocationOption;
+  /** Selected dropoff point - can be an ID (string/number) or LocationOption object */
+  dropoffPoint?: string | number | LocationOption;
   /** All location options - will be filtered based on transfer type */
   locations?: {
     options?: LocationOption[];
@@ -47,9 +47,9 @@ export interface TransferLineProps {
   /** Callback when transfer date changes */
   onDateChange?: (date: string) => void;
   /** Callback when pickup point changes */
-  onPickupChange?: (location: LocationData | null) => void;
+  onPickupChange?: (location: LocationOption | null) => void;
   /** Callback when dropoff point changes */
-  onDropoffChange?: (location: LocationData | null) => void;
+  onDropoffChange?: (location: LocationOption | null) => void;
   /** Callback when any data changes - returns complete TransferLineData */
   onDataChange?: (data: TransferLineData) => void;
   /** Callback when delete button is clicked */
@@ -93,10 +93,10 @@ const TransferLine: React.FC<TransferLineProps> = ({
   const [internalTransferDate, setInternalTransferDate] = useState<string | undefined>(
     transferDate
   );
-  const [internalPickupPoint, setInternalPickupPoint] = useState<LocationData | null>(
+  const [internalPickupPoint, setInternalPickupPoint] = useState<LocationOption | null>(
     null
   );
-  const [internalDropoffPoint, setInternalDropoffPoint] = useState<LocationData | null>(
+  const [internalDropoffPoint, setInternalDropoffPoint] = useState<LocationOption | null>(
     null
   );
 
@@ -153,56 +153,65 @@ const TransferLine: React.FC<TransferLineProps> = ({
     return null;
   };
 
-  // Initialize location data from IDs or set defaults
+  // Helper to check if value is LocationOption
+  const isLocationOption = (value: string | number | 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, LocationOption objects, or set defaults
   React.useEffect(() => {
+    // If pickupPoint is already a LocationOption object, use it directly
+    if (isLocationOption(pickupPoint)) {
+      // Only update if the ID is different to prevent infinite loops
+      if (internalPickupPoint?.id !== pickupPoint.id) {
+        setInternalPickupPoint(pickupPoint);
+      }
+      return;
+    }
+
     const { options, groups } = filterLocations('pickup');
     const allPickupLocations = getAllLocations(options, groups);
 
     if (pickupPoint) {
       const location = allPickupLocations.find((loc) => loc.id === pickupPoint);
-      if (location) {
-        setInternalPickupPoint({
-          id: location.id,
-          locationName: location.label,
-        });
+      if (location && internalPickupPoint?.id !== location.id) {
+        setInternalPickupPoint(location);
       }
-    } else {
-      // Set default location if applicable
+    } else if (!internalPickupPoint) {
+      // Set default location if applicable (only if not already set)
       const defaultLocation = getDefaultLocation('pickup');
       if (defaultLocation) {
-        const defaultData: LocationData = {
-          id: defaultLocation.id,
-          locationName: defaultLocation.label,
-        };
-        setInternalPickupPoint(defaultData);
-        onPickupChange?.(defaultData);
+        setInternalPickupPoint(defaultLocation);
+        onPickupChange?.(defaultLocation);
       }
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [pickupPoint, type, locations]);
 
   React.useEffect(() => {
+    // If dropoffPoint is already a LocationOption object, use it directly
+    if (isLocationOption(dropoffPoint)) {
+      // Only update if the ID is different to prevent infinite loops
+      if (internalDropoffPoint?.id !== dropoffPoint.id) {
+        setInternalDropoffPoint(dropoffPoint);
+      }
+      return;
+    }
+
     const { options, groups } = filterLocations('dropoff');
     const allDropoffLocations = getAllLocations(options, groups);
 
     if (dropoffPoint) {
       const location = allDropoffLocations.find((loc) => loc.id === dropoffPoint);
-      if (location) {
-        setInternalDropoffPoint({
-          id: location.id,
-          locationName: location.label,
-        });
+      if (location && internalDropoffPoint?.id !== location.id) {
+        setInternalDropoffPoint(location);
       }
-    } else {
-      // Set default location if applicable
+    } else if (!internalDropoffPoint) {
+      // Set default location if applicable (only if not already set)
       const defaultLocation = getDefaultLocation('dropoff');
       if (defaultLocation) {
-        const defaultData: LocationData = {
-          id: defaultLocation.id,
-          locationName: defaultLocation.label,
-        };
-        setInternalDropoffPoint(defaultData);
-        onDropoffChange?.(defaultData);
+        setInternalDropoffPoint(defaultLocation);
+        onDropoffChange?.(defaultLocation);
       }
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -266,14 +275,43 @@ const TransferLine: React.FC<TransferLineProps> = ({
     onDateChange?.(dateValue);
   };
 
+  // Helper to convert LocationData to LocationOption
+  const toLocationOption = (locationData: LocationData | null, position: 'pickup' | 'dropoff'): LocationOption | null => {
+    if (!locationData) return null;
+    
+    // Try to find in the options to get the type
+    const { options, groups } = filterLocations(position);
+    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 id = String(locationData.id).toLowerCase();
+    let locType: 'airport' | 'port' | 'accommodation' = 'accommodation';
+    if (name.includes('harbour') || name.includes('port') || id.includes('harbour') || id.includes('port')) {
+      locType = 'port';
+    } else if (name.includes('airport') || id.includes('airport')) {
+      locType = 'airport';
+    }
+    
+    return {
+      id: locationData.id,
+      label: locationData.locationName,
+      type: locType,
+    };
+  };
+
   const handlePickupChange = (location: LocationData | null) => {
-    setInternalPickupPoint(location);
-    onPickupChange?.(location);
+    const locationOption = toLocationOption(location, 'pickup');
+    setInternalPickupPoint(locationOption);
+    onPickupChange?.(locationOption);
   };
 
   const handleDropoffChange = (location: LocationData | null) => {
-    setInternalDropoffPoint(location);
-    onDropoffChange?.(location);
+    const locationOption = toLocationOption(location, 'dropoff');
+    setInternalDropoffPoint(locationOption);
+    onDropoffChange?.(locationOption);
   };
 
   // Check if inputs are empty (when checkEmpty is true)
@@ -292,12 +330,19 @@ const TransferLine: React.FC<TransferLineProps> = ({
 
   const isDropoffEmpty = checkEmpty && !internalDropoffPoint;
 
-  // Helper function to find LocationOption from ID for defaultValue
-  const findLocationOption = (id: string | number | undefined, position: 'pickup' | 'dropoff'): LocationOption | undefined => {
-    if (!id) return undefined;
+  // Helper function to find LocationOption from ID or LocationOption for defaultValue
+  const findLocationOption = (value: string | number | LocationOption | undefined, position: 'pickup' | 'dropoff'): 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 } = filterLocations(position);
     const allLocations = getAllLocations(options, groups);
-    return allLocations.find((loc) => loc.id === id);
+    return allLocations.find((loc) => loc.id === value);
   };
 
   const defaultPickupOption = findLocationOption(pickupPoint, 'pickup');