Skip to content

fix(CrudThemeProvider): Optimized theme loading logic #35155

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
mistercrunch merged 1 commit into from
Sep 18, 2025
Merged

fix(CrudThemeProvider): Optimized theme loading logic #35155

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
10 changes: 8 additions & 2 deletions superset-frontend/src/components/CrudThemeProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import { ReactNode, useEffect, useState } from 'react';
import { useThemeContext } from 'src/theme/ThemeProvider';
import { Theme } from '@superset-ui/core';
import { Loading } from '@superset-ui/core/components';

interface CrudThemeProviderProps {
children: ReactNode;
Expand Down Expand Up @@ -62,11 +63,16 @@ export default function CrudThemeProvider({
}
}, [themeId, globalThemeContext]);

// If no dashboard theme, just render children (they use global theme)
if (!themeId || !dashboardTheme) {
// If no themeId, just render children (they use global theme)
if (!themeId) {
return <>{children}</>;
}

// If themeId exists, but theme is not loaded yet, return null to prevent re-mounting children
if (!dashboardTheme) {
return <Loading />;
}

// Render children with the dashboard theme provider from controller
return (
<dashboardTheme.SupersetThemeProvider>
Expand Down
Loading