fix: language html attribute issue

varianter · Dec 11, 2024 · c2715c0 · c2715c0
1 parent 56c8b8a
commit c2715c0
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 37 deletions.
diff --git a/src/app/(main)/[locale]/layout.tsx b/src/app/(main)/[locale]/layout.tsx
@@ -1,3 +1,4 @@
+import localFont from "next/font/local";
 import { draftMode } from "next/headers";
 import { notFound } from "next/navigation";
 import { NextIntlClientProvider } from "next-intl";
@@ -26,6 +27,11 @@ import {
 import { loadStudioQuery } from "studio/lib/store";
 import "src/styles/global.css";
 
+const fontBrittiSans = localFont({
+  src: "../../../../public/_assets/britti-sans-variable.woff2",
+  variable: "--font-britti-sans",
+});
+
 const hasValidData = (data: unknown) => data && Object.keys(data).length > 0;
 
 export default async function Layout({
@@ -76,30 +82,32 @@ export default async function Layout({
   const hasFooterData = hasNavData && initialNav.data.footer;
 
   return (
-    <div>
-      <NextIntlClientProvider messages={messages}>
-        <SkipToMain />
-        {children}
-        {hasFooterData && isDraftMode ? (
-          <FooterPreview
-            initialNav={initialNav}
-            initialCompanyInfo={initialCompanyInfo}
-            initialBrandAssets={initialBrandAssets}
-            initialSoMe={initialSoMe}
-            initialLegal={initialLegal}
-            language={params.locale}
-          />
-        ) : (
-          <Footer
-            navigationData={initialNav.data}
-            legalData={initialLegal.data}
-            companyInfo={initialCompanyInfo.data}
-            brandAssets={initialBrandAssets.data}
-            soMeData={initialSoMe.data}
-          />
-        )}
-        {draftMode().isEnabled && <LiveVisualEditing />}
-      </NextIntlClientProvider>
-    </div>
+    <html lang={params.locale}>
+      <body className={fontBrittiSans.variable}>
+        <NextIntlClientProvider messages={messages}>
+          <SkipToMain />
+          {children}
+          {hasFooterData && isDraftMode ? (
+            <FooterPreview
+              initialNav={initialNav}
+              initialCompanyInfo={initialCompanyInfo}
+              initialBrandAssets={initialBrandAssets}
+              initialSoMe={initialSoMe}
+              initialLegal={initialLegal}
+              language={params.locale}
+            />
+          ) : (
+            <Footer
+              navigationData={initialNav.data}
+              legalData={initialLegal.data}
+              companyInfo={initialCompanyInfo.data}
+              brandAssets={initialBrandAssets.data}
+              soMeData={initialSoMe.data}
+            />
+          )}
+          {draftMode().isEnabled && <LiveVisualEditing />}
+        </NextIntlClientProvider>
+      </body>
+    </html>
   );
 }
diff --git a/src/app/layout.tsx → src/app/shared/layout.tsx b/src/app/layout.tsx → src/app/shared/layout.tsx
@@ -1,27 +1,17 @@
-import localFont from "next/font/local";
 import { draftMode } from "next/headers";
 
 import LiveVisualEditing from "studio/lib/loaders/AutomaticVisualEditing";
 
 import "src/styles/global.css";
 
-const fontBrittiSans = localFont({
-  src: "../../public/_assets/britti-sans-variable.woff2",
-  variable: "--font-britti-sans",
-});
-
 export default async function RootLayout({
   children,
-  params,
 }: Readonly<{
   children: React.ReactNode;
-  params: {
-    locale: string;
-  };
 }>) {
   return (
-    <html lang={params.locale}>
-      <body className={fontBrittiSans.variable}>
+    <html>
+      <body>
         {children}
         {draftMode().isEnabled && <LiveVisualEditing />}
       </body>

diff --git a/src/app/studio/layout.tsx b/src/app/studio/layout.tsx
@@ -0,0 +1,20 @@
+import { draftMode } from "next/headers";
+
+import LiveVisualEditing from "studio/lib/loaders/AutomaticVisualEditing";
+
+import "src/styles/global.css";
+
+export default async function RootLayout({
+  children,
+}: Readonly<{
+  children: React.ReactNode;
+}>) {
+  return (
+    <html>
+      <body>
+        {children}
+        {draftMode().isEnabled && <LiveVisualEditing />}
+      </body>
+    </html>
+  );
+}