move provider into client

reidbarber · reidbarber · commit 4a9467607017 · 2025-08-14T10:48:36.000-05:00
diff --git a/examples/s2-next-macros/src/app/layout.tsx b/examples/s2-next-macros/src/app/layout.tsx
@@ -10,11 +10,8 @@
  * governing permissions and limitations under the License.
  */
 
-'use client';
-
 import {ClientProviders} from './provider';
 import type { Metadata } from "next";
-import { Provider } from '@react-spectrum/s2';
 
 export const metadata: Metadata = {
   title: "Spectrum 2 + Next.js",
@@ -27,12 +24,8 @@ export default function RootLayout({
   children: React.ReactNode;
 }>) {
   return (
-    <Provider elementType="html" locale="en-US">
-      <body>
-        <ClientProviders>
-          {children}
-        </ClientProviders>
-      </body>
-    </Provider>
+    <ClientProviders>
+      {children}
+    </ClientProviders>
   );
 }
diff --git a/examples/s2-next-macros/src/app/provider.tsx b/examples/s2-next-macros/src/app/provider.tsx
@@ -2,7 +2,8 @@
 
 import {useRouter} from 'next/navigation';
 import {RouterProvider} from 'react-aria-components';
-
+import { ReactNode } from 'react';
+import { Provider } from '@react-spectrum/s2';
 declare module 'react-aria-components' {
   interface RouterConfig {
     routerOptions: NonNullable<
@@ -11,14 +12,16 @@ declare module 'react-aria-components' {
   }
 }
 
-import { ReactNode } from 'react';
-
 export function ClientProviders({ children }: { children: ReactNode }) {
   let router = useRouter();
 
   return (
-    <RouterProvider navigate={router.push}>
-      {children}
-    </RouterProvider>
+    <Provider elementType="html" locale="en-US">
+      <body>
+        <RouterProvider navigate={router.push}>
+          {children}
+        </RouterProvider>
+      </body>
+    </Provider>
   );
 }
