Skip to content

fix(theme): align "Clear local theme" option with other theme menu items #35651

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
sadpandajoe merged 1 commit into from
Oct 16, 2025
Merged

fix(theme): align "Clear local theme" option with other theme menu items #35651

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
25 changes: 13 additions & 12 deletions superset-frontend/src/hooks/useThemeMenuItems.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,22 +104,14 @@ export const useThemeMenuItems = ({
: []),
];

const children: MenuItem[] = [
{
type: 'group' as const,
label: t('Theme'),
key: 'theme-group',
children: themeOptions,
},
];

// Add clear settings option only when there's a local theme active
// Add clear settings option to theme options if there's a local theme active
const themeGroupOptions = [...themeOptions];
if (onClearLocalSettings && hasLocalOverride) {
children.push({
themeGroupOptions.push({
type: 'divider' as const,
key: 'theme-divider',
});
children.push({
themeGroupOptions.push({
key: 'clear-local',
label: (
<>
Expand All @@ -130,6 +122,15 @@ export const useThemeMenuItems = ({
});
}

const children: MenuItem[] = [
{
type: 'group' as const,
label: t('Theme'),
key: 'theme-group',
children: themeGroupOptions,
},
];

return {
key: 'theme-sub-menu',
label: selectedThemeModeIcon,
Expand Down
Loading