From 61814698ee176fdb8d96cfc2aaa790ff91f0722a Mon Sep 17 00:00:00 2001
From: Erik Tiekstra <erik.tiekstra@scandichotels.com>
Date: Fri, 16 May 2025 11:23:58 +0000
Subject: [PATCH] feat(SW-2262): Added functionality to support browsers back
 functionality to close SidePeek

Approved-by: Linus Flood
---
 .../HotelReservation/SidePeek/index.tsx       | 34 ++++++++++++++++---
 1 file changed, 30 insertions(+), 4 deletions(-)

diff --git a/apps/scandic-web/components/HotelReservation/SidePeek/index.tsx b/apps/scandic-web/components/HotelReservation/SidePeek/index.tsx
index de9166049..6c6011ec6 100644
--- a/apps/scandic-web/components/HotelReservation/SidePeek/index.tsx
+++ b/apps/scandic-web/components/HotelReservation/SidePeek/index.tsx
@@ -1,5 +1,7 @@
 "use client"
 
+import { useEffect } from "react"
+
 import { trpc } from "@/lib/trpc/client"
 import useSidePeekStore from "@/stores/sidepeek"
 
@@ -17,7 +19,7 @@ export default function HotelReservationSidePeek() {
       showCTA: state.showCTA,
     })
   )
-  const close = useSidePeekStore((state) => state.closeSidePeek)
+  const closeFn = useSidePeekStore((state) => state.closeSidePeek)
   const lang = useLang()
 
   const { data: hotelData } = trpc.hotel.get.useQuery(
@@ -35,6 +37,30 @@ export default function HotelReservationSidePeek() {
     room.roomTypes.some((type) => type.code === roomTypeCode)
   )
 
+  function handleCloseClick() {
+    window.history.back()
+  }
+
+  useEffect(() => {
+    if (activeSidePeek) {
+      window.history.pushState(null, "", window.location.href)
+    }
+  }, [activeSidePeek])
+
+  useEffect(() => {
+    function handlePopState() {
+      if (activeSidePeek) {
+        closeFn()
+      }
+    }
+
+    window.addEventListener("popstate", handlePopState)
+
+    return () => {
+      window.removeEventListener("popstate", handlePopState)
+    }
+  }, [activeSidePeek, closeFn])
+
   if (activeSidePeek) {
     return (
       <>
@@ -45,7 +71,7 @@ export default function HotelReservationSidePeek() {
               hotel={hotelData.hotel}
               restaurants={hotelData.restaurants}
               activeSidePeek={activeSidePeek}
-              close={close}
+              close={handleCloseClick}
               showCTA={showCTA}
             />
             <AmenitiesSidePeek
@@ -53,7 +79,7 @@ export default function HotelReservationSidePeek() {
               restaurants={hotelData.restaurants}
               additionalHotelData={hotelData.additionalData}
               activeSidePeek={activeSidePeek}
-              close={close}
+              close={handleCloseClick}
             />
           </>
         )}
@@ -61,7 +87,7 @@ export default function HotelReservationSidePeek() {
           <RoomSidePeek
             room={selectedRoom}
             activeSidePeek={activeSidePeek}
-            close={close}
+            close={handleCloseClick}
           />
         )}
       </>