Merged in feat/sw-1493-revised-comparison-block (pull request #1236)

feat(SW-1493): Revised SAS comparison block

* Base of new TierDetails for SAS tier comparison

* Add backgrounds and content to TierDetails

* Implement new cms schema for SasTierComparison

* Override gap in jsontohtml styling to 0

* Add animations to comparison details

* Redesign again

* Update content model to new design

* Add border to bottom item in tier match list

* Wrap interpolate-size in @supports to be safe

* Merge branch 'master' into feat/sw-1493-revised-comparison-block


Approved-by: Joakim Jäderberg

types/components/hotelPage/meetingRooms.ts

@@ -1,6 +1,6 @@
-import { meetingRoomsSchema } from "@/server/routers/hotels/schemas/meetingRoom"
-
 import type { z } from "zod"
 
+import type { meetingRoomsSchema } from "@/server/routers/hotels/schemas/meetingRoom"
+
 export type MeetingRoomData = z.output<typeof meetingRoomsSchema>
 export type MeetingRooms = MeetingRoomData["data"]

types/components/hotelPage/sidepeek/amenities.ts

@@ -1,5 +1,5 @@
-import type { ParkingAmenityProps } from "./parking"
 import type { Hotel, Restaurant, RestaurantOpeningHours } from "@/types/hotel"
+import type { ParkingAmenityProps } from "./parking"
 
 export type AmenitiesSidePeekProps = {
   amenitiesList: Hotel["detailedFacilities"]

types/components/hotelPage/sidepeek/parking.ts

@@ -20,10 +20,10 @@ export interface ParkingListProps
     | "distanceToHotel"
     | "numberOfChargingSpaces"
     | "numberOfParkingSpots"
-  > { }
+  > {}
 
 export interface ParkingPricesProps
   extends Pick<Parking["pricing"], "freeParking">,
-  Pick<NonNullable<Parking["pricing"]["localCurrency"]>, "currency"> {
+    Pick<NonNullable<Parking["pricing"]["localCurrency"]>, "currency"> {
   pricing: NonNullable<Parking["pricing"]["localCurrency"]>["ordinary"]
 }

types/components/hotelReservation/bookingConfirmation/bookingConfirmation.ts

@@ -4,4 +4,4 @@ export interface BookingConfirmationProps {
   confirmationNumber: string
 }
 
-export interface ConfirmationProps extends BookingConfirmation { }
+export interface ConfirmationProps extends BookingConfirmation {}

types/components/hotelReservation/enterDetails/breakfast.ts

@@ -5,13 +5,13 @@ import type { breakfastPackagesSchema } from "@/server/routers/hotels/output"
 import type { breakfastPackageSchema } from "@/server/routers/hotels/schemas/packages"
 
 export interface BreakfastFormSchema
-  extends z.output<typeof breakfastFormSchema> { }
+  extends z.output<typeof breakfastFormSchema> {}
 
 export interface BreakfastPackages
-  extends z.output<typeof breakfastPackagesSchema> { }
+  extends z.output<typeof breakfastPackagesSchema> {}
 
 export interface BreakfastPackage
-  extends z.output<typeof breakfastPackageSchema> { }
+  extends z.output<typeof breakfastPackageSchema> {}
 
 export interface BreakfastProps {
   packages: BreakfastPackages

types/components/hotelReservation/selectHotel/selectHotel.ts

@@ -1,9 +1,9 @@
+import type { CheckInData, Hotel, Parking } from "@/types/hotel"
+import type { Lang } from "@/constants/languages"
 import type {
   AlternativeHotelsSearchParams,
   SelectHotelSearchParams,
 } from "./selectHotelSearchParams"
-import type { CheckInData, Hotel, Parking } from "@/types/hotel"
-import type { Lang } from "@/constants/languages"
 
 export enum AvailabilityEnum {
   Available = "Available",

types/components/hotelReservation/sidePeek.ts

@@ -1,4 +1,4 @@
-import { HotelData } from "@/types/hotel"
+import type { HotelData } from "@/types/hotel"
 
 export enum SidePeekEnum {
   hotelDetails = "hotel-detail-side-peek",

types/components/hotelReservation/summary.ts

@@ -5,11 +5,11 @@ import type {
   Price,
   RoomPrice,
 } from "@/types/stores/enter-details"
+import type { RoomAvailability } from "@/types/trpc/routers/hotel/roomAvailability"
 import type { BedTypeSchema } from "./enterDetails/bedType"
 import type { BreakfastPackage } from "./enterDetails/breakfast"
 import type { DetailsSchema } from "./enterDetails/details"
 import type { Child, SelectRateSearchParams } from "./selectRate/selectRate"
-import type { RoomAvailability } from "@/types/trpc/routers/hotel/roomAvailability"
 
 export type RoomsData = Pick<DetailsState, "roomPrice"> &
   Pick<RoomAvailability, "cancellationText" | "rateDetails"> &
@@ -21,7 +21,7 @@ export type RoomsData = Pick<DetailsState, "roomPrice"> &
 
 export interface SummaryProps
   extends Pick<RoomAvailability, "cancellationText" | "rateDetails">,
-  Pick<RoomAvailability["selectedRoom"], "roomType"> {
+    Pick<RoomAvailability["selectedRoom"], "roomType"> {
   isMember: boolean
   breakfastIncluded: boolean
 }

types/transitionTypes/jsontohtml.ts

@@ -7,6 +7,7 @@ export type JsonToHtmlProps = {
   embeds: Node<Embeds>[]
   nodes: RTENode[]
   renderOptions?: RenderOptions
+  className?: string
 }
 
 export type EmbedByUid = Record<string, Node<Embeds>>

types/trpc/routers/booking/confirmation.ts

@@ -4,14 +4,14 @@ import type { Hotel, Room } from "@/types/hotel"
 import type { bookingConfirmationSchema } from "@/server/routers/booking/output"
 
 export interface BookingConfirmationSchema
-  extends z.output<typeof bookingConfirmationSchema> { }
+  extends z.output<typeof bookingConfirmationSchema> {}
 
 export interface BookingConfirmation {
   booking: BookingConfirmationSchema
   hotel: Hotel
   room:
-  | (Room & {
-    bedType: Room["roomTypes"][number]
-  })
-  | null
+    | (Room & {
+        bedType: Room["roomTypes"][number]
+      })
+    | null
 }

types/trpc/routers/hotel/locations.ts

@@ -6,7 +6,7 @@ import type {
   locationsSchema,
 } from "@/server/routers/hotels/output"
 
-export interface LocationSchema extends z.output<typeof locationsSchema> { }
+export interface LocationSchema extends z.output<typeof locationsSchema> {}
 
 export type Locations = LocationSchema["data"]
 export type Location = Locations[number]
@@ -20,7 +20,7 @@ export function isHotelLocation(
   return location?.type === "hotels"
 }
 export interface CitiesByCountry
-  extends z.output<typeof citiesByCountrySchema> { }
+  extends z.output<typeof citiesByCountrySchema> {}
 export type CitiesGroupedByCountry = Record<string, CitiesByCountry["data"]>
 
-export interface Countries extends z.output<typeof countriesSchema> { }
+export interface Countries extends z.output<typeof countriesSchema> {}