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.

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

fix: add ThemeProvider for navigation #28

Merged
merged 1 commit into from
Feb 29, 2024
Merged

fix: add ThemeProvider for navigation #28

Show file tree
Hide file tree
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
14 changes: 7 additions & 7 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@
"webpack-manifest-plugin": "^5.0.0"
},
"overrides": {
"@gravity-ui/uikit": "6.0.0"
"@gravity-ui/uikit": "6.0.0",
"@gravity-ui/components": "3.0.0"
}
}
96 changes: 50 additions & 46 deletions src/components/App/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,19 +67,15 @@ function Runtime(props: RuntimeProps) {

function Page(props: DocInnerProps) {
const {data, ...pageProps} = props;
const {lang, theme} = pageProps;

const Page = data.leading ? DocLeadingPage : DocPage;

return (
<ThemeProvider theme={theme} direction={getDirection(lang)}>
<Layout>
<Layout.Content>
{/*@ts-ignore*/}
<Page {...data} {...pageProps} />
</Layout.Content>
</Layout>
</ThemeProvider>
<Layout>
<Layout.Content>
{/*@ts-ignore*/}
<Page {...data} {...pageProps} />
</Layout.Content>
</Layout>
);
}

Expand Down Expand Up @@ -127,6 +123,7 @@ export function App(props: DocInnerProps): ReactElement {
fullScreen,
onChangeFullScreen,
};
const direction = getDirection(lang);

useEffect(() => {
updateRootClassName({
Expand All @@ -140,8 +137,10 @@ export function App(props: DocInnerProps): ReactElement {
if (!navigation) {
return (
<div className="App">
<Page {...pageProps} {...settings} />
<Runtime theme={theme} />
<ThemeProvider theme={theme} direction={direction}>
<Page {...pageProps} {...settings} />
<Runtime theme={theme} />
</ThemeProvider>
</div>
);
}
Expand All @@ -152,41 +151,46 @@ export function App(props: DocInnerProps): ReactElement {

return (
<div className="App">
<PageConstructorProvider theme={theme}>
<PageConstructor
custom={{
navigation: {
controls: () => (
<HeaderControls {...settings} mobileView={mobileView} />
),
},
blocks: {
page: () => (
<Page {...pageProps} {...(headerWithControls ? {} : settings)} />
),
},
}}
content={{
blocks: [
{
type: 'page',
<ThemeProvider theme={theme} direction={direction}>
<PageConstructorProvider theme={theme}>
<PageConstructor
custom={{
navigation: {
controls: () => (
<HeaderControls {...settings} mobileView={mobileView} />
),
},
blocks: {
page: () => (
<Page
{...pageProps}
{...(headerWithControls ? {} : settings)}
/>
),
},
],
}}
navigation={
fullHeader
? {
header: {
withBorder: true,
leftItems: leftItems.map(rebaseNavItem),
rightItems: rightItems.map(rebaseNavItem),
},
logo,
}
: undefined
}
/>
</PageConstructorProvider>
}}
content={{
blocks: [
{
type: 'page',
},
],
}}
navigation={
fullHeader
? {
header: {
withBorder: true,
leftItems: leftItems.map(rebaseNavItem),
rightItems: rightItems.map(rebaseNavItem),
},
logo,
}
: undefined
}
/>
</PageConstructorProvider>
</ThemeProvider>
<Runtime theme={theme} />
</div>
);
Expand Down
Loading