Merged master into feat/SW-888-skeleton-loaders

components/BookingWidget/Client.tsx

@@ -42,11 +42,11 @@ export default function BookingWidgetClient({
 
   const bookingWidgetSearchData: BookingWidgetSearchParams | undefined =
     searchParams
-      ? (getFormattedUrlQueryParams(new URLSearchParams(searchParams), {
+      ? getFormattedUrlQueryParams(new URLSearchParams(searchParams), {
           adults: "number",
           age: "number",
           bed: "number",
-        }) as BookingWidgetSearchParams)
+        })
       : undefined
 
   const getLocationObj = (destination: string): Location | undefined => {
@@ -79,6 +79,16 @@ export default function BookingWidgetClient({
       )
     : undefined
 
+  const defaultRoomsData = bookingWidgetSearchData?.room?.map((room) => ({
+    adults: room.adults,
+    child: room.child ?? [],
+  })) ?? [
+    {
+      adults: 1,
+      child: [],
+    },
+  ]
+
   const methods = useForm<BookingWidgetSchema>({
     defaultValues: {
       search: selectedLocation?.name ?? "",
@@ -96,12 +106,7 @@ export default function BookingWidgetClient({
       bookingCode: "",
       redemption: false,
       voucher: false,
-      rooms: bookingWidgetSearchData?.room ?? [
-        {
-          adults: 1,
-          child: [],
-        },
-      ],
+      rooms: defaultRoomsData,
     },
     shouldFocusError: false,
     mode: "all",
@@ -158,21 +163,24 @@ export default function BookingWidgetClient({
 
   return (
     <FormProvider {...methods}>
-      <section ref={bookingWidgetRef} className={styles.containerDesktop}>
-        <Form locations={locations} type={type} />
-      </section>
-      <section className={styles.containerMobile} data-open={isOpen}>
-        <button
-          className={styles.close}
-          onClick={closeMobileSearch}
-          type="button"
-        >
-          <CloseLargeIcon />
-        </button>
-        <Form locations={locations} type={type} />
+      <section
+        ref={bookingWidgetRef}
+        className={styles.wrapper}
+        data-open={isOpen}
+      >
+        <MobileToggleButton openMobileSearch={openMobileSearch} />
+        <div className={styles.formContainer}>
+          <button
+            className={styles.close}
+            onClick={closeMobileSearch}
+            type="button"
+          >
+            <CloseLargeIcon />
+          </button>
+          <Form locations={locations} type={type} />
+        </div>
       </section>
       <div className={styles.backdrop} onClick={closeMobileSearch} />
-      <MobileToggleButton openMobileSearch={openMobileSearch} />
     </FormProvider>
   )
 }