Skip to content

Commit

Permalink
[joy-ui][GlobalStyles] Ensure compatibility with RSC (#38955)
Browse files Browse the repository at this point in the history
  • Loading branch information
mateuseap authored Sep 15, 2023
1 parent bf4d816 commit 163068d
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 12 deletions.
3 changes: 2 additions & 1 deletion packages/api-docs-builder/buildApi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -182,8 +182,9 @@ async function run(argv: yargs.ArgumentsCamelCase<CommandOptions>) {
(component.filename.includes('mui-joy') &&
// Box's demo isn't ready
// Container's demo isn't ready
// GlobalStyles's demo isn't ready
// Grid has problem with react-docgen
component.filename.match(/(Box|Container|ColorInversion|Grid)/)) ||
component.filename.match(/(Box|Container|ColorInversion|Grid|GlobalStyles)/)) ||
(component.filename.includes('mui-system') && component.filename.match(/GlobalStyles/))
) {
return false;
Expand Down
12 changes: 12 additions & 0 deletions packages/mui-joy/src/GlobalStyles/GlobalStyles.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
'use client';
import * as React from 'react';
import { GlobalStyles as SystemGlobalStyles, GlobalStylesProps } from '@mui/system';
import defaultTheme from '../styles/defaultTheme';
import THEME_ID from '../styles/identifier';
import { Theme } from '../styles/types';

function GlobalStyles(props: GlobalStylesProps<Theme>) {
return <SystemGlobalStyles {...props} defaultTheme={defaultTheme} themeId={THEME_ID} />;
}

export default GlobalStyles;
12 changes: 1 addition & 11 deletions packages/mui-joy/src/GlobalStyles/index.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1 @@
import * as React from 'react';
import { GlobalStyles as SystemGlobalStyles, GlobalStylesProps } from '@mui/system';
import defaultTheme from '../styles/defaultTheme';
import THEME_ID from '../styles/identifier';
import { Theme } from '../styles/types';

function GlobalStyles(props: GlobalStylesProps<Theme>) {
return <SystemGlobalStyles {...props} defaultTheme={defaultTheme} themeId={THEME_ID} />;
}

export default GlobalStyles;
export { default } from './GlobalStyles';

0 comments on commit 163068d

Please sign in to comment.