Skip to content

fix(#193): reduce layout nesting and lazy load providers for faster i… #214

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RUKAYAT-CODER merged 1 commit into from
Apr 26, 2026
Merged

fix(#193): reduce layout nesting and lazy load providers for faster i… #214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 8 additions & 45 deletions src/app/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,9 @@ import type { Metadata } from 'next';
import { cookies } from 'next/headers';
import { Geist, Geist_Mono } from 'next/font/google';
import './globals.css';
import { Suspense } from 'react';
import { ThemeProvider } from '@/lib/theme-provider';
import DynamicTheming from '@/components/theme/DynamicTheming';
import { OfflineModeProvider } from './context/OfflineModeContext';
import { I18nProvider } from '@/hooks/useInternationalization';
import { InternationalizationEngine } from '@/components/i18n/InternationalizationEngine';
import { CulturalAdaptationManager } from '@/components/i18n/CulturalAdaptationManager';
import PerformanceMonitor from '@/components/performance/PerformanceMonitor';
import { PerformanceMonitoringProvider } from '@/hooks/usePerformanceMonitoring';
import PrefetchingEngine from '@/components/performance/PrefetchingEngine';
import StateManagerIntegration from '@/components/state/StateManagerIntegration';
import { PWAManager } from '@/components/pwa/PWAManager';
import { AccessibilityProvider } from '@/components/accessibility/AccessibilityProvider';
import { ErrorBoundary } from '@/components/errors/ErrorBoundarySystem';
import { EnvGuard } from '@/components/shared/EnvGuard';
import { Loading } from '@/components/ui/Loading';
import { ToastProvider } from '@/context/ToastContext';
import { RootProviders } from '@/providers/RootProviders';

const geistSans = Geist({
// ...
variable: '--font-geist-sans',
subsets: ['latin'],
});
Expand Down Expand Up @@ -69,34 +52,14 @@ export default async function RootLayout({
<head>
<script dangerouslySetInnerHTML={{ __html: themeScript }} />
</head>
<body className="antialiased bg-white text-gray-900 transition-colors duration-200 dark:bg-gray-950 dark:text-gray-50">
<I18nProvider>
<InternationalizationEngine>
<CulturalAdaptationManager>
<ThemeProvider defaultTheme={defaultTheme}>
<DynamicTheming />
<EnvGuard>
<AccessibilityProvider pageLabel="TeachLink - main application">
<PerformanceMonitoringProvider>
<OfflineModeProvider>
<ToastProvider>
<PWAManager />
<StateManagerIntegration />
<PerformanceMonitor />
<PrefetchingEngine />
<ErrorBoundary>
<Suspense fallback={<Loading />}>{children}</Suspense>
</ErrorBoundary>
</ToastProvider>
</OfflineModeProvider>
</PerformanceMonitoringProvider>
</AccessibilityProvider>
</EnvGuard>
</ThemeProvider>
</CulturalAdaptationManager>
</InternationalizationEngine>
</I18nProvider>
<body
className={`${geistSans.variable} ${geistMono.variable} antialiased bg-white text-gray-900 transition-colors duration-200 dark:bg-gray-950 dark:text-gray-50`}
>
<RootProviders defaultTheme={defaultTheme}>
{children}
</RootProviders>
</body>
</html>
);
}

95 changes: 95 additions & 0 deletions src/providers/RootProviders.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
'use client';

import { Suspense } from 'react';
import dynamic from 'next/dynamic';
import { ThemeProvider } from '@/lib/theme-provider';
import { I18nProvider } from '@/hooks/useInternationalization';
import { InternationalizationEngine } from '@/components/i18n/InternationalizationEngine';
import { CulturalAdaptationManager } from '@/components/i18n/CulturalAdaptationManager';
import { AccessibilityProvider } from '@/components/accessibility/AccessibilityProvider';
import { ErrorBoundary } from '@/components/errors/ErrorBoundarySystem';
import { EnvGuard } from '@/components/shared/EnvGuard';
import { ToastProvider } from '@/context/ToastContext';
import { Loading } from '@/components/ui/Loading';

// Lazy load heavy/non-critical providers/components to improve initial render time
const OfflineModeProvider = dynamic(
() => import('@/context/OfflineModeContext').then((mod) => mod.OfflineModeProvider),
{ ssr: false }
);

const PerformanceMonitoringProvider = dynamic(
() => import('@/hooks/usePerformanceMonitoring').then((mod) => mod.PerformanceMonitoringProvider),
{ ssr: false }
);

const PWAManager = dynamic(
() => import('@/components/pwa/PWAManager').then((mod) => mod.PWAManager),
{ ssr: false }
);

const StateManagerIntegration = dynamic(
() => import('@/components/state/StateManagerIntegration'),
{ ssr: false }
);

const PerformanceMonitor = dynamic(
() => import('@/components/performance/PerformanceMonitor'),
{ ssr: false }
);

const PrefetchingEngine = dynamic(
() => import('@/components/performance/PrefetchingEngine'),
{ ssr: false }
);

const DynamicTheming = dynamic(
() => import('@/components/theme/DynamicTheming'),
{ ssr: false }
);

interface RootProvidersProps {
children: React.ReactNode;
defaultTheme: string;
}

/**
* Consolidates all client-side providers and components to reduce layout complexity
* and enables lazy loading of non-critical systems.
*/
export function RootProviders({ children, defaultTheme }: RootProvidersProps) {
return (
<I18nProvider>
<InternationalizationEngine>
<CulturalAdaptationManager>
<ThemeProvider defaultTheme={defaultTheme}>
<Suspense fallback={null}>
<DynamicTheming />
</Suspense>
<EnvGuard>
<AccessibilityProvider pageLabel="TeachLink - main application">
<Suspense fallback={null}>
<PerformanceMonitoringProvider>
<OfflineModeProvider>
<ToastProvider>
<Suspense fallback={null}>
<PWAManager />
<StateManagerIntegration />
<PerformanceMonitor />
<PrefetchingEngine />
</Suspense>
<ErrorBoundary>
<Suspense fallback={<Loading />}>{children}</Suspense>
</ErrorBoundary>
</ToastProvider>
</OfflineModeProvider>
</PerformanceMonitoringProvider>
</Suspense>
</AccessibilityProvider>
</EnvGuard>
</ThemeProvider>
</CulturalAdaptationManager>
</InternationalizationEngine>
</I18nProvider>
);
}
Loading