diff --git a/components/HotelReservation/SelectRate/RoomFilter/index.tsx b/components/HotelReservation/SelectRate/RoomFilter/index.tsx index eb7c442b3..92d2fde3d 100644 --- a/components/HotelReservation/SelectRate/RoomFilter/index.tsx +++ b/components/HotelReservation/SelectRate/RoomFilter/index.tsx @@ -6,7 +6,7 @@ import { FormProvider, useForm } from "react-hook-form" import { useIntl } from "react-intl" import { z } from "zod" -import { InfoCircleIcon } from "@/components/Icons" +import { CheckIcon, InfoCircleIcon } from "@/components/Icons" import CheckboxChip from "@/components/TempDesignSystem/Form/FilterChip/Checkbox" import Body from "@/components/TempDesignSystem/Text/Body" import Caption from "@/components/TempDesignSystem/Text/Caption" @@ -114,7 +114,7 @@ export default function RoomFilter({ /> ))} - + diff --git a/components/HotelReservation/SelectRate/RoomFilter/roomFilter.module.css b/components/HotelReservation/SelectRate/RoomFilter/roomFilter.module.css index 9cce04e43..4af90296c 100644 --- a/components/HotelReservation/SelectRate/RoomFilter/roomFilter.module.css +++ b/components/HotelReservation/SelectRate/RoomFilter/roomFilter.module.css @@ -12,11 +12,6 @@ align-items: center; } -.roomsFilter .infoIcon, -.roomsFilter .infoIcon path { - stroke: var(--UI-Text-Medium-contrast); - fill: transparent; -} .filterInfo { display: flex; flex-direction: row; diff --git a/components/HotelReservation/SelectRate/RoomSelection/FlexibilityOption/PriceList/priceList.module.css b/components/HotelReservation/SelectRate/RoomSelection/FlexibilityOption/PriceList/priceList.module.css index 4f3431525..b7767cb92 100644 --- a/components/HotelReservation/SelectRate/RoomSelection/FlexibilityOption/PriceList/priceList.module.css +++ b/components/HotelReservation/SelectRate/RoomSelection/FlexibilityOption/PriceList/priceList.module.css @@ -1,6 +1,11 @@ +.priceList { + margin: 0; +} + .priceRow { display: flex; justify-content: space-between; + align-items: flex-end; padding: var(--Spacing-x-quarter) 0; } diff --git a/components/HotelReservation/SelectRate/RoomSelection/FlexibilityOption/flexibilityOption.module.css b/components/HotelReservation/SelectRate/RoomSelection/FlexibilityOption/flexibilityOption.module.css index 6d7bc5daf..852f5260d 100644 --- a/components/HotelReservation/SelectRate/RoomSelection/FlexibilityOption/flexibilityOption.module.css +++ b/components/HotelReservation/SelectRate/RoomSelection/FlexibilityOption/flexibilityOption.module.css @@ -3,6 +3,7 @@ border-radius: var(--Corner-radius-Large); padding: var(--Spacing-x-one-and-half) var(--Spacing-x2); background-color: var(--Base-Surface-Secondary-light-Normal); + border: 1px solid var(--Base-Surface-Secondary-light-Normal); position: relative; display: flex; flex-direction: column; @@ -22,6 +23,13 @@ background-color: var(--Base-Surface-Primary-light-Hover-alt); } .checkIcon { + width: 24px; + height: 24px; + border-radius: 100px; + background-color: var(--UI-Input-Controls-Fill-Selected); + border: 2px solid var(--Base-Border-Inverted); + justify-content: center; + align-items: center; display: none; } input[type="radio"]:checked + .card { @@ -29,7 +37,7 @@ input[type="radio"]:checked + .card { background-color: var(--Base-Surface-Primary-light-Hover-alt); } input[type="radio"]:checked + .card .checkIcon { - display: block; + display: flex; position: absolute; top: -10px; right: -10px; @@ -40,12 +48,6 @@ input[type="radio"]:checked + .card .checkIcon { gap: var(--Spacing-x-half); } -.header .infoIcon, -.header .infoIcon path { - stroke: var(--UI-Text-Medium-contrast); - fill: transparent; -} - .button { background: none; border: none; @@ -53,7 +55,7 @@ input[type="radio"]:checked + .card .checkIcon { grid-area: chevron; height: 100%; justify-self: flex-end; - padding: 0; + padding: 1px 0 0 0; } .popover { diff --git a/components/HotelReservation/SelectRate/RoomSelection/FlexibilityOption/index.tsx b/components/HotelReservation/SelectRate/RoomSelection/FlexibilityOption/index.tsx index f1781d978..afbfb632b 100644 --- a/components/HotelReservation/SelectRate/RoomSelection/FlexibilityOption/index.tsx +++ b/components/HotelReservation/SelectRate/RoomSelection/FlexibilityOption/index.tsx @@ -1,8 +1,8 @@ "use client" -import { useState } from "react" +import { useRef, useState } from "react" import { Button, DialogTrigger } from "react-aria-components" -import { CheckCircleIcon, InfoCircleIcon } from "@/components/Icons" +import { CheckIcon, InfoCircleIcon } from "@/components/Icons" import Caption from "@/components/TempDesignSystem/Text/Caption" import PricePopover from "./Popover" @@ -25,6 +25,7 @@ export default function FlexibilityOption({ }: FlexibilityOptionProps) { const [rootDiv, setRootDiv] = useState(undefined) const [isPopoverOpen, setIsPopoverOpen] = useState(false) + let triggerRef = useRef(null) function setRef(node: Element | null) { if (node) { @@ -36,7 +37,7 @@ export default function FlexibilityOption({ return (
- + {name} ({paymentTerm})
@@ -59,6 +60,13 @@ export default function FlexibilityOption({ handleSelectRate(rate) } + function togglePopover() { + console.log("Toggle Popover called") + setIsPopoverOpen((prevState) => !prevState) + } + + console.log(isPopoverOpen) + return ( ) diff --git a/components/HotelReservation/SelectRate/RoomSelection/RoomCard/index.tsx b/components/HotelReservation/SelectRate/RoomSelection/RoomCard/index.tsx index 5b0c65489..93dc20ab4 100644 --- a/components/HotelReservation/SelectRate/RoomSelection/RoomCard/index.tsx +++ b/components/HotelReservation/SelectRate/RoomSelection/RoomCard/index.tsx @@ -88,25 +88,30 @@ export default function RoomCard({ : `${roomSize?.min}-${roomSize?.max}`} m² - {roomConfiguration.roomTypeCode && ( - - )} +
+ {roomConfiguration.roomTypeCode && ( + + )} +
{roomConfiguration.roomType} + {/* Out of scope for now {descriptions?.short} + */} + + {intl.formatMessage({ + id: "Breakfast selection in next step.", + })} +
- - {intl.formatMessage({ - id: "Breakfast selection in next step.", - })} - +
{Object.entries(rates).map(([key, rate]) => ( diff --git a/components/Icons/icon.module.css b/components/Icons/icon.module.css index 68ace50b3..1782e9b77 100644 --- a/components/Icons/icon.module.css +++ b/components/Icons/icon.module.css @@ -62,6 +62,11 @@ fill: var(--UI-Text-Medium-contrast); } +.uiTextPlaceholder, +.uiTextPlaceholder * { + fill: var(--UI-Text-Placeholder); +} + .blue, .blue * { fill: var(--UI-Input-Controls-Fill-Selected); diff --git a/components/Icons/variants.ts b/components/Icons/variants.ts index 09d69364f..24c3531c3 100644 --- a/components/Icons/variants.ts +++ b/components/Icons/variants.ts @@ -20,6 +20,7 @@ const config = { white: styles.white, uiTextHighContrast: styles.uiTextHighContrast, uiTextMediumContrast: styles.uiTextMediumContrast, + uiTextPlaceholder: styles.uiTextPlaceholder, disabled: styles.disabled, }, },