From 69268d88fb3280d1c770bed68a51afa5e9f6d0aa Mon Sep 17 00:00:00 2001
From: Anton Gunnarsson <anton.gunnarsson@scandichotels.com>
Date: Tue, 9 Sep 2025 08:20:17 +0000
Subject: [PATCH] Merged in feat/sw-3418-add-routerprovider-to-partner-sas
 (pull request #2777)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

feat(SW-3418): Add RouterProvider to partner-sas

* Add RouterProvider


Approved-by: Joakim Jäderberg
---
 apps/partner-sas/app/[lang]/layout.tsx        | 39 ++++++++++---------
 .../components/RACRouterProvider.tsx          | 22 +++++++++++
 2 files changed, 43 insertions(+), 18 deletions(-)
 create mode 100644 apps/partner-sas/components/RACRouterProvider.tsx

diff --git a/apps/partner-sas/app/[lang]/layout.tsx b/apps/partner-sas/app/[lang]/layout.tsx
index 4665bde81..516270aa7 100644
--- a/apps/partner-sas/app/[lang]/layout.tsx
+++ b/apps/partner-sas/app/[lang]/layout.tsx
@@ -10,6 +10,7 @@ import { NuqsAdapter } from "@scandic-hotels/booking-flow/utils/nuqs"
 import { Lang } from "@scandic-hotels/common/constants/language"
 import { TrpcProvider } from "@scandic-hotels/trpc/Provider"
 
+import { RACRouterProvider } from "@/components/RACRouterProvider"
 import { getMessages } from "@/i18n"
 import ClientIntlProvider from "@/i18n/Provider"
 import { setLang } from "@/i18n/serverContext"
@@ -62,26 +63,28 @@ export default async function RootLayout(props: RootLayoutProps) {
             <NuqsAdapter>
               {/* TODO handle onError */}
               <TrpcProvider>
-                <BookingFlowContextProvider
-                  data={{
-                    // TODO
-                    isLoggedIn: false,
-                  }}
-                >
-                  <BookingFlowTrackingProvider
-                    trackingFunctions={{
-                      trackBookingSearchClick,
-                      trackAccordionItemOpen,
-                      trackOpenSidePeek,
-                      trackGenericEvent,
+                <RACRouterProvider>
+                  <BookingFlowContextProvider
+                    data={{
+                      // TODO
+                      isLoggedIn: false,
                     }}
                   >
-                    <Header />
-                    {props.bookingwidget}
-                    <main>{children}</main>
-                    <Footer />
-                  </BookingFlowTrackingProvider>
-                </BookingFlowContextProvider>
+                    <BookingFlowTrackingProvider
+                      trackingFunctions={{
+                        trackBookingSearchClick,
+                        trackAccordionItemOpen,
+                        trackOpenSidePeek,
+                        trackGenericEvent,
+                      }}
+                    >
+                      <Header />
+                      {props.bookingwidget}
+                      <main>{children}</main>
+                      <Footer />
+                    </BookingFlowTrackingProvider>
+                  </BookingFlowContextProvider>
+                </RACRouterProvider>
               </TrpcProvider>
             </NuqsAdapter>
           </ClientIntlProvider>
diff --git a/apps/partner-sas/components/RACRouterProvider.tsx b/apps/partner-sas/components/RACRouterProvider.tsx
new file mode 100644
index 000000000..02d8945d4
--- /dev/null
+++ b/apps/partner-sas/components/RACRouterProvider.tsx
@@ -0,0 +1,22 @@
+// https://react-spectrum.adobe.com/react-aria/routing.html#app-router
+
+"use client"
+
+import { useRouter } from "next/navigation"
+import { RouterProvider } from "react-aria-components"
+
+import type { PropsWithChildren } from "react"
+
+declare module "react-aria-components" {
+  interface RouterConfig {
+    routerOptions: NonNullable<
+      Parameters<ReturnType<typeof useRouter>["push"]>[1]
+    >
+  }
+}
+
+export function RACRouterProvider({ children }: PropsWithChildren) {
+  const router = useRouter()
+
+  return <RouterProvider navigate={router.push}>{children}</RouterProvider>
+}