Skip to content
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.

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

fix(theme): added a workaround so that defaultProps are also picked up from MUI v5 components (like Button disabledRipple or Grid spacing) #204

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions workspaces/theme/.changeset/warm-grapes-matter.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@red-hat-developer-hub/backstage-plugin-theme': patch
---

added a workaround so that `defaultProps` are also picked up from MUI v5 components (like Button disabledRipple or Grid spacing)
77 changes: 77 additions & 0 deletions workspaces/theme/plugins/theme/src/components/ThemeProvider.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
/*
* Copyright 2024 The Backstage Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import React from 'react';
import { AppTheme } from '@backstage/core-plugin-api';
import { UnifiedTheme, UnifiedThemeProvider } from '@backstage/theme';

import {
StyledEngineProvider,
ThemeProvider as Mui5Provider,
Theme as Mui5Theme,
} from '@mui/material/styles';

import { useTheme } from '../hooks/useTheme';
import { useThemeConfig } from '../hooks/useThemeConfig';
import { ThemeConfig } from '../types';

/**
* Uses the UnifiedThemeProvider to style MUI v4 and v5 components.
*
* This component duplicated the StyledEngineProvider and MUI v5 ThemeProvider
* to solve an issue that the defaultProps from the component configurations
* (see `utils/createComponents.ts`) wasn't picked up.
*
* https://github.com/backstage/backstage/blob/master/packages/theme/src/unified/UnifiedThemeProvider.tsx#L94-L100
*/
const ThemeProvider = ({
theme,
children,
}: {
theme: UnifiedTheme;
children: React.ReactNode;
}) => (
<UnifiedThemeProvider theme={theme}>
<StyledEngineProvider injectFirst>
<Mui5Provider theme={theme.getTheme('v5') as Mui5Theme}>
{children}
</Mui5Provider>
</StyledEngineProvider>
</UnifiedThemeProvider>
);

export const createThemeProvider = (
theme: UnifiedTheme,
): AppTheme['Provider'] =>
function RHDHThemeProvider({ children }) {
return <ThemeProvider theme={theme}>{children}</ThemeProvider>;
};

export const createThemeProviderForThemeConfig = (
themeConfig: ThemeConfig,
): AppTheme['Provider'] =>
function RHDHThemeProviderForThemeConfig({ children }) {
const theme = useTheme(themeConfig);
return <ThemeProvider theme={theme}>{children}</ThemeProvider>;
};

export const createThemeProviderForThemeName = (
themeName: string,
): AppTheme['Provider'] =>
function RHDHThemeProviderForThemeName({ children }) {
const themeConfig = useThemeConfig(themeName);
const theme = useTheme(themeConfig);
return <ThemeProvider theme={theme}>{children}</ThemeProvider>;
};
39 changes: 7 additions & 32 deletions workspaces/theme/plugins/theme/src/themes.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,44 +15,19 @@
*/
import React from 'react';
import { AppTheme } from '@backstage/core-plugin-api';
import { UnifiedTheme, UnifiedThemeProvider, themes } from '@backstage/theme';
import { themes } from '@backstage/theme';

import LightIcon from '@material-ui/icons/WbSunny';
import DarkIcon from '@material-ui/icons/Brightness2';
import { createTheme } from '@mui/material/styles';

import {
createThemeProvider,
createThemeProviderForThemeName,
createThemeProviderForThemeConfig,
} from './components/ThemeProvider';
import * as backstage from './backstage';
import * as rhdh from './rhdh';
import { ThemeConfig } from './types';
import { useTheme } from './hooks/useTheme';
import { useThemeConfig } from './hooks/useThemeConfig';

const createThemeProvider = (theme: UnifiedTheme): AppTheme['Provider'] =>
function RHDHThemeProvider({ children }) {
return (
<UnifiedThemeProvider theme={theme}>{children}</UnifiedThemeProvider>
);
};

const createThemeProviderForThemeConfig = (
themeConfig: ThemeConfig,
): AppTheme['Provider'] =>
function RHDHThemeProviderForThemeConfig({ children }) {
const theme = useTheme(themeConfig);
return (
<UnifiedThemeProvider theme={theme}>{children}</UnifiedThemeProvider>
);
};

const createThemeProviderForThemeName = (
themeName: string,
): AppTheme['Provider'] =>
function RHDHThemeProviderForThemeName({ children }) {
const themeConfig = useThemeConfig(themeName);
const theme = useTheme(themeConfig);
return (
<UnifiedThemeProvider theme={theme}>{children}</UnifiedThemeProvider>
);
};

export const getAllThemes = (): AppTheme[] => {
return [
Expand Down
Loading