@voyantjs/bookings-ui 0.80.16 → 0.80.17

package/dist/components/booking-create-dialog.d.ts

@@ -1,4 +1,22 @@
 import { type BookingRecord } from "@voyantjs/bookings-react";
+import { type OptionUnitsStepperUnit } from "./option-units-stepper-section.js";
+/**
+ * Pick the unit for a traveler. Priorities:
+ *   1. If we have an age (from DOB) and it falls into a unit's
+ *      `[minAge, maxAge]` window, use that unit.
+ *   2. Otherwise honor an explicit role hint (Child / Infant / Adult
+ *      buttons) by mapping the hint to a representative age and
+ *      matching the age band. This works for products whose units
+ *      encode the band in the code (`child_0_5`, `child_6_12`) instead
+ *      of bare `CHILD`/`INFANT`.
+ *   3. Fall back to code/name matching for legacy products that don't
+ *      configure min/max ages.
+ *
+ * `roleHint` covers the common case where the operator knows the
+ * traveler is a child but doesn't have the exact DOB. Without it, a
+ * roleless traveler would silently default to Adult pricing.
+ */
+export declare function pickUnitForAge(units: OptionUnitsStepperUnit[], age: number | null, roleHint?: "adult" | "child" | "infant" | null): OptionUnitsStepperUnit | undefined;
 export interface BookingCreateDialogProps {
     open: boolean;
     onOpenChange: (open: boolean) => void;

package/dist/components/booking-create-dialog.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"booking-create-dialog.d.ts","sourceRoot":"","sources":["../../src/components/booking-create-dialog.tsx"],"names":[],"mappings":"AASA,OAAO,EAML,KAAK,aAAa,EAGnB,MAAM,0BAA0B,CAAA;AA+XjC,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,OAAO,CAAA;IACb,YAAY,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,CAAA;IACrC,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,IAAI,CAAA;IAC5C,4EAA4E;IAC5E,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,+DAA+D;IAC/D,aAAa,CAAC,EAAE,MAAM,CAAA;CACvB;AAED,MAAM,WAAW,sBAAsB;IACrC,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,IAAI,CAAA;IAC5C,4EAA4E;IAC5E,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,+DAA+D;IAC/D,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,sEAAsE;IACtE,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAA;CACtB;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,mBAAmB,CAAC,EAClC,IAAI,EACJ,YAAY,EACZ,SAAS,EACT,gBAAgB,EAChB,aAAa,GACd,EAAE,wBAAwB,2CAsB1B;AAED,wBAAgB,iBAAiB,CAAC,EAChC,SAAS,EACT,gBAAgB,EAChB,aAAa,EACb,OAAc,EACd,QAAQ,GACT,EAAE,sBAAsB,2CAo5BxB"}
+{"version":3,"file":"booking-create-dialog.d.ts","sourceRoot":"","sources":["../../src/components/booking-create-dialog.tsx"],"names":[],"mappings":"AASA,OAAO,EAML,KAAK,aAAa,EAGnB,MAAM,0BAA0B,CAAA;AAiCjC,OAAO,EAGL,KAAK,sBAAsB,EAE5B,MAAM,mCAAmC,CAAA;AA6J1C;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,cAAc,CAC5B,KAAK,EAAE,sBAAsB,EAAE,EAC/B,GAAG,EAAE,MAAM,GAAG,IAAI,EAClB,QAAQ,GAAE,OAAO,GAAG,OAAO,GAAG,QAAQ,GAAG,IAAW,GACnD,sBAAsB,GAAG,SAAS,CAoCpC;AA4JD,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,OAAO,CAAA;IACb,YAAY,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,CAAA;IACrC,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,IAAI,CAAA;IAC5C,4EAA4E;IAC5E,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,+DAA+D;IAC/D,aAAa,CAAC,EAAE,MAAM,CAAA;CACvB;AAED,MAAM,WAAW,sBAAsB;IACrC,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,IAAI,CAAA;IAC5C,4EAA4E;IAC5E,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,+DAA+D;IAC/D,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,sEAAsE;IACtE,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAA;CACtB;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,mBAAmB,CAAC,EAClC,IAAI,EACJ,YAAY,EACZ,SAAS,EACT,gBAAgB,EAChB,aAAa,GACd,EAAE,wBAAwB,2CAsB1B;AAED,wBAAgB,iBAAiB,CAAC,EAChC,SAAS,EACT,gBAAgB,EAChB,aAAa,EACb,OAAc,EACd,QAAQ,GACT,EAAE,sBAAsB,2CAo5BxB"}

package/dist/components/booking-create-dialog.js

@@ -122,30 +122,48 @@ function stripOptionPrefix(name) {
  *   1. If we have an age (from DOB) and it falls into a unit's
  *      `[minAge, maxAge]` window, use that unit.
  *   2. Otherwise honor an explicit role hint (Child / Infant / Adult
- *      buttons) by matching unit code or name.
- *   3. Fall back to the ADULT-coded unit, or the first unit when
- *      nothing else matches.
+ *      buttons) by mapping the hint to a representative age and
+ *      matching the age band. This works for products whose units
+ *      encode the band in the code (`child_0_5`, `child_6_12`) instead
+ *      of bare `CHILD`/`INFANT`.
+ *   3. Fall back to code/name matching for legacy products that don't
+ *      configure min/max ages.
  *
  * `roleHint` covers the common case where the operator knows the
  * traveler is a child but doesn't have the exact DOB. Without it, a
  * roleless traveler would silently default to Adult pricing.
  */
-function pickUnitForAge(units, age, roleHint = null) {
+export function pickUnitForAge(units, age, roleHint = null) {
     if (units.length === 0)
         return undefined;
-    const findByCode = (code) => units.find((u) => (u.unitCode ?? "").toUpperCase() === code) ??
-        units.find((u) => new RegExp(`\\b${code}\\b`, "i").test(u.unitName));
-    const adult = findByCode("ADULT");
+    const personUnits = units.filter((u) => u.unitType == null || u.unitType === "person");
+    const pool = personUnits.length > 0 ? personUnits : units;
+    const sorted = [...pool].sort((a, b) => (a.minAge ?? 0) - (b.minAge ?? 0));
+    const matchByAge = (target) => sorted.find((u) => (u.minAge == null || target >= u.minAge) && (u.maxAge == null || target <= u.maxAge));
     if (age != null) {
-        const match = units.find((u) => (u.minAge == null || age >= u.minAge) && (u.maxAge == null || age <= u.maxAge));
+        const match = matchByAge(age);
         if (match)
             return match;
     }
+    if (roleHint) {
+        const HINT_AGE = { adult: 30, child: 8, infant: 1 };
+        const hintAge = HINT_AGE[roleHint];
+        // Only consider units with at least one explicit age bound. Without
+        // this, legacy units with null min/max (just bare ADULT/CHILD codes)
+        // would all match every hint age and collapse onto the first sorted
+        // entry (almost always Adult). Code-matching below handles those.
+        const banded = sorted.filter((u) => u.minAge != null || u.maxAge != null);
+        const match = banded.find((u) => (u.minAge == null || hintAge >= u.minAge) && (u.maxAge == null || hintAge <= u.maxAge));
+        if (match)
+            return match;
+    }
+    const findByCode = (code) => sorted.find((u) => (u.unitCode ?? "").toUpperCase() === code) ??
+        sorted.find((u) => new RegExp(`\\b${code}\\b`, "i").test(u.unitName));
     if (roleHint === "child")
-        return findByCode("CHILD") ?? adult ?? units[0];
+        return findByCode("CHILD") ?? sorted[0];
     if (roleHint === "infant")
-        return findByCode("INFANT") ?? adult ?? units[0];
-    return adult ?? units[0];
+        return findByCode("INFANT") ?? sorted[0];
+    return findByCode("ADULT") ?? sorted[sorted.length - 1] ?? sorted[0];
 }
 /**
  * Take the operator-picked per-option quantities (which are tracked

package/dist/components/travelers-section.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"travelers-section.d.ts","sourceRoot":"","sources":["../../src/components/travelers-section.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"travelers-section.d.ts","sourceRoot":"","sources":["../../src/components/travelers-section.tsx"],"names":[],"mappings":"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"}

package/dist/components/travelers-section.js

@@ -75,6 +75,32 @@ function matchUnitByDob(units, dob) {
     const match = personUnits.find((u) => (u.minAge == null || age >= u.minAge) && (u.maxAge == null || age <= u.maxAge));
     return match?.unitId ?? null;
 }
+/**
+ * Find the unit matching a role hint when DOB is missing. Maps the
+ * role to a representative age and matches against `[minAge, maxAge]`.
+ * Returns null when the role doesn't carry an age signal (e.g. `lead`).
+ *
+ * Routes `infant` to whichever band covers ~1y (e.g. `child_0_5`) and
+ * `child` to whichever covers ~8y (e.g. `child_6_12`), regardless of
+ * how the product codes the unit names.
+ */
+function matchUnitByRoleHint(units, role) {
+    if (!role || role === "lead")
+        return null;
+    const HINT_AGE = {
+        adult: 30,
+        child: 8,
+        infant: 1,
+    };
+    const hintAge = HINT_AGE[role];
+    if (hintAge == null)
+        return null;
+    // Only consider units with explicit age bands — units with null
+    // min/max would all spuriously match any hint age.
+    const banded = units.filter((u) => (u.unitType == null || u.unitType === "person") && (u.minAge != null || u.maxAge != null));
+    const match = banded.find((u) => (u.minAge == null || hintAge >= u.minAge) && (u.maxAge == null || hintAge <= u.maxAge));
+    return match?.unitId ?? null;
+}
 /**
  * The Room dropdown lists one item per option (keyed by the option's
  * primary/ADULT unit id), but a traveler's `roomUnitId` can point at any
@@ -147,10 +173,11 @@ export function TravelersSection({ value, onChange, roomUnits, roomGroups, billi
     // hunt for the dropdown on every traveler — they can still override
     // manually via the Room select. Picks the first option (ordering
     // mirrors the upstream `roomUnits` array, which comes from the
-    // stepper in catalog order). When `roomGroups` is wired and the
-    // traveler has DOB, also pre-pick the matching age-banded unit
-    // within that option so the Category buttons land on the right row.
-    const pickRoomUnitIdForNewTraveler = (dateOfBirth = null) => {
+    // stepper in catalog order). When `roomGroups` is wired, also
+    // pre-pick the matching age-banded unit within that option (DOB
+    // first, role hint second) so the Category buttons land on the
+    // right row and pricing reflects the operator's intent.
+    const pickRoomUnitIdForNewTraveler = React.useCallback((dateOfBirth = null, role = null) => {
         if (!roomUnits || roomUnits.length === 0)
             return null;
         const pickedRoom = roomUnits.find((unit) => unit.remainingCapacity > 0)?.unitId ?? roomUnits[0]?.unitId ?? null;
@@ -159,15 +186,39 @@ export function TravelersSection({ value, onChange, roomUnits, roomGroups, billi
         const group = roomGroups.find((g) => g.primaryUnitId === pickedRoom || g.units.some((u) => u.unitId === pickedRoom));
         if (!group)
             return pickedRoom;
-        return matchUnitByDob(group.units, dateOfBirth) ?? group.primaryUnitId;
-    };
+        return (matchUnitByDob(group.units, dateOfBirth) ??
+            matchUnitByRoleHint(group.units, role) ??
+            group.primaryUnitId);
+    }, [roomUnits, roomGroups]);
+    // Race fix: travelers added before the option-units queries resolve
+    // end up with `roomUnitId: null`. Once units arrive, back-fill any
+    // missing assignments so the static fallback's role hint (Child /
+    // Infant) is honored and `redistributeByAge` doesn't silently price
+    // them as adults.
+    React.useEffect(() => {
+        if (!roomUnits || roomUnits.length === 0)
+            return;
+        if (!value.travelers.some((t) => !t.roomUnitId))
+            return;
+        const next = value.travelers.map((t) => t.roomUnitId ? t : { ...t, roomUnitId: pickRoomUnitIdForNewTraveler(t.dateOfBirth, t.role) });
+        // Guard against infinite re-runs if hydration can't find a unit
+        // (e.g. empty roomGroups): no point dispatching an onChange that
+        // doesn't actually change anything.
+        const changed = next.some((t, i) => t.roomUnitId !== value.travelers[i]?.roomUnitId);
+        if (!changed)
+            return;
+        onChange({ travelers: next });
+    }, [roomUnits, value.travelers, onChange, pickRoomUnitIdForNewTraveler]);
     const addRow = () => {
         // First traveler defaults to `lead` so the operator doesn't have to
         // remember to flip the role on the initial row.
         const role = value.travelers.length === 0 ? "lead" : "adult";
         const blank = createBlankTraveler(role);
         onChange({
-            travelers: [...value.travelers, { ...blank, roomUnitId: pickRoomUnitIdForNewTraveler(null) }],
+            travelers: [
+                ...value.travelers,
+                { ...blank, roomUnitId: pickRoomUnitIdForNewTraveler(null, role) },
+            ],
         });
     };
     const addBillingPerson = () => {
@@ -178,7 +229,7 @@ export function TravelersSection({ value, onChange, roomUnits, roomGroups, billi
         onChange({
             travelers: [
                 ...value.travelers,
-                { ...traveler, roomUnitId: pickRoomUnitIdForNewTraveler(traveler.dateOfBirth) },
+                { ...traveler, roomUnitId: pickRoomUnitIdForNewTraveler(traveler.dateOfBirth, role) },
             ],
         });
     };
@@ -188,7 +239,7 @@ export function TravelersSection({ value, onChange, roomUnits, roomGroups, billi
         onChange({
             travelers: [
                 ...value.travelers,
-                { ...traveler, roomUnitId: pickRoomUnitIdForNewTraveler(traveler.dateOfBirth) },
+                { ...traveler, roomUnitId: pickRoomUnitIdForNewTraveler(traveler.dateOfBirth, role) },
             ],
         });
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@voyantjs/bookings-ui",
-  "version": "0.80.16",
+  "version": "0.80.17",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
@@ -51,24 +51,24 @@
     "react-dom": "^19.0.0",
     "react-hook-form": "^7.60.0",
     "zod": "^4.3.6",
-    "@voyantjs/availability-react": "0.80.16",
-    "@voyantjs/bookings-react": "0.80.16",
-    "@voyantjs/catalog": "0.80.16",
-    "@voyantjs/catalog-react": "0.80.16",
-    "@voyantjs/crm-react": "0.80.16",
-    "@voyantjs/crm-ui": "0.80.16",
-    "@voyantjs/extras-react": "0.80.16",
-    "@voyantjs/finance-react": "0.80.16",
-    "@voyantjs/identity-react": "0.80.16",
-    "@voyantjs/legal-react": "0.80.16",
-    "@voyantjs/pricing-react": "0.80.16",
-    "@voyantjs/products-react": "0.80.16",
-    "@voyantjs/suppliers-react": "0.80.16",
-    "@voyantjs/ui": "0.80.16"
+    "@voyantjs/availability-react": "0.80.17",
+    "@voyantjs/bookings-react": "0.80.17",
+    "@voyantjs/catalog": "0.80.17",
+    "@voyantjs/catalog-react": "0.80.17",
+    "@voyantjs/crm-react": "0.80.17",
+    "@voyantjs/crm-ui": "0.80.17",
+    "@voyantjs/extras-react": "0.80.17",
+    "@voyantjs/finance-react": "0.80.17",
+    "@voyantjs/identity-react": "0.80.17",
+    "@voyantjs/legal-react": "0.80.17",
+    "@voyantjs/pricing-react": "0.80.17",
+    "@voyantjs/products-react": "0.80.17",
+    "@voyantjs/suppliers-react": "0.80.17",
+    "@voyantjs/ui": "0.80.17"
   },
   "dependencies": {
     "sonner": "^2.0.7",
-    "@voyantjs/i18n": "0.80.16"
+    "@voyantjs/i18n": "0.80.17"
   },
   "devDependencies": {
     "@tanstack/react-query": "^5.100.11",
@@ -82,20 +82,20 @@
     "typescript": "^6.0.2",
     "vitest": "^4.1.2",
     "zod": "^4.3.6",
-    "@voyantjs/availability-react": "0.80.16",
-    "@voyantjs/bookings-react": "0.80.16",
-    "@voyantjs/catalog": "0.80.16",
-    "@voyantjs/catalog-react": "0.80.16",
-    "@voyantjs/crm-react": "0.80.16",
-    "@voyantjs/crm-ui": "0.80.16",
-    "@voyantjs/extras-react": "0.80.16",
-    "@voyantjs/finance-react": "0.80.16",
-    "@voyantjs/identity-react": "0.80.16",
-    "@voyantjs/legal-react": "0.80.16",
-    "@voyantjs/pricing-react": "0.80.16",
-    "@voyantjs/products-react": "0.80.16",
-    "@voyantjs/suppliers-react": "0.80.16",
-    "@voyantjs/ui": "0.80.16",
+    "@voyantjs/availability-react": "0.80.17",
+    "@voyantjs/bookings-react": "0.80.17",
+    "@voyantjs/catalog": "0.80.17",
+    "@voyantjs/catalog-react": "0.80.17",
+    "@voyantjs/crm-react": "0.80.17",
+    "@voyantjs/crm-ui": "0.80.17",
+    "@voyantjs/extras-react": "0.80.17",
+    "@voyantjs/finance-react": "0.80.17",
+    "@voyantjs/identity-react": "0.80.17",
+    "@voyantjs/legal-react": "0.80.17",
+    "@voyantjs/pricing-react": "0.80.17",
+    "@voyantjs/products-react": "0.80.17",
+    "@voyantjs/suppliers-react": "0.80.17",
+    "@voyantjs/ui": "0.80.17",
     "@voyantjs/voyant-typescript-config": "0.1.0"
   },
   "files": [