Skip to content

`fix(ui): Storybook's <DocsContainer /> overwriting theme object #29770

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
vuluongj20 merged 1 commit into from
Nov 5, 2021
Merged

`fix(ui): Storybook's <DocsContainer /> overwriting theme object #29770

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
17 changes: 11 additions & 6 deletions .storybook/preview.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import 'focus-visible';
import 'docs-ui/index.js';

import {Fragment} from 'react';
import {DocsContainer, Meta} from '@storybook/addon-docs';
import {addDecorator, addParameters, DecoratorFn, Parameters} from '@storybook/react';
import Code from 'docs-ui/components/code';
Expand Down Expand Up @@ -47,12 +48,16 @@ const withThemeDocs: DecoratorFn = ({children, context}) => {
}

return (
<ThemeProvider theme={currentTheme}>
<GlobalStyles isDark={isDark} theme={currentTheme} />
<PreviewGlobalStyles theme={currentTheme} />
<DocsContainer context={context}>{children}</DocsContainer>
<TableOfContents />
</ThemeProvider>
<Fragment>
<DocsContainer context={context}>
<GlobalStyles isDark={isDark} theme={currentTheme} />
<PreviewGlobalStyles theme={currentTheme} />
<ThemeProvider theme={currentTheme}>{children}</ThemeProvider>
</DocsContainer>
<ThemeProvider theme={currentTheme}>
<TableOfContents />
Copy link
Member

@billyvg billyvg Nov 4, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it ok that this is not part of DocsContainer? This is a bit awk, but not a big deal

Copy link
Contributor Author

@vuluongj20 vuluongj20 Nov 5, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be okay. DocsContainer is just a wrapper around the main content. There's another wrapper (#docs-root) surrounding both it and <TableOfContents />.

</ThemeProvider>
</Fragment>
);
};

Expand Down