another step

2026-06-18 01:42:14 +03:30
parent e135b0b919
commit 6294cb4248
14 changed files with 70 additions and 101 deletions
@@ -1,11 +1,10 @@
 import type { ReactNode } from 'react';
 import { setRequestLocale, getMessages } from 'next-intl/server';
 import { NextIntlClientProvider } from 'next-intl';
-import { SnackbarProvider } from 'notistack';
 import { getThemeMode } from '@/lib/cookies/server';
 import { AppStoreProvider } from '@/store';
 import { ThemeProvider, getDirection } from '@/theme';
-import { ToastBridge } from '@/lib/toast';
+import { NotistackProvider } from '@/lib/toast';
 import { QueryProvider } from '@/lib/query/QueryProvider';
 import { routing } from '@/i18n/routing';

@@ -46,10 +45,9 @@ export default async function LocaleLayout({
      <AppStoreProvider>
        <ThemeProvider dir={dir} defaultMode={defaultMode}>
          <QueryProvider>
-            <SnackbarProvider maxSnack={3} anchorOrigin={{ vertical: 'bottom', horizontal: 'center' }}>
-              <ToastBridge />
+            <NotistackProvider>
              {children}
-            </SnackbarProvider>
+            </NotistackProvider>
          </QueryProvider>
        </ThemeProvider>
      </AppStoreProvider>
@@ -8,7 +8,6 @@ html,
 body {
  max-width: 100vw;
  overflow-x: hidden;
-  /* required for sticky elements: HeaderMobile, and so on */
  max-height: 100vh;
 }

@@ -1,23 +1,15 @@
 import type { ReactNode } from 'react';
 import { Metadata, Viewport } from 'next';
-import { Space_Grotesk } from 'next/font/google';
 import localFont from 'next/font/local';
 import { headers } from 'next/headers';
 import { getThemeMode } from '@/lib/cookies/server';
-import { ColorSchemeScript, getDirection } from '@/theme';
+import { getDirection } from '@/theme';
 import { BRAND } from '@/theme/colors';
 import { routing } from '@/i18n/routing';
+import { HEADER_NAMES } from '@/constants';
 import './globals.css';
 import '@/theme/tokens.css';

-// EN brand font — loaded for all locales so the CSS variable is always defined
-const spaceGrotesk = Space_Grotesk({
-  subsets: ['latin'],
-  weight: ['400', '500', '600', '700'],
-  display: 'swap',
-  variable: '--font-space-grotesk',
-});
-
 // FA brand font — Mikhak, a free Persian typeface
 const mikhak = localFont({
  src: [
@@ -40,23 +32,11 @@ export const metadata: Metadata = {
 };

 export default async function RootLayout({ children }: { children: ReactNode }) {
-  /*
-   * The root layout is intentionally kept as a lean HTML shell.
-   * NextIntlClientProvider, ThemeProvider, and AppStoreProvider live in
-   * [locale]/layout.tsx so they always receive the correct locale from URL
-   * params — independent of whether this root layout is rendered statically
-   * or dynamically.
-   *
-   * We still read x-next-intl-locale here for lang/dir on <html> so that
-   * screen readers and CSS direction are correct on real requests.
-   * During build-time pre-rendering (no request context) we fall back to
-   * defaultLocale — this only affects the static HTML shell; the live
-   * request always re-renders with the correct locale header.
-   */
+
  let locale: string = routing.defaultLocale;
  try {
    const hdrs = await headers();
-    const headerLocale = hdrs.get('x-next-intl-locale');
+    const headerLocale = hdrs.get(HEADER_NAMES.LOCALE);
    if (headerLocale && routing.locales.includes(headerLocale as (typeof routing.locales)[number])) {
      locale = headerLocale;
    }
@@ -71,13 +51,9 @@ export default async function RootLayout({ children }: { children: ReactNode })
    <html
      lang={locale}
      dir={dir}
-      className={`${spaceGrotesk.variable} ${mikhak.variable}`}
+      className={`${mikhak.variable}`}
      data-mui-color-scheme={colorScheme}
-      suppressHydrationWarning
    >
-      <head>
-        <ColorSchemeScript />
-      </head>
      <body>{children}</body>
    </html>
  );