[docs] Fix small regressions API pages #36972
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -50,15 +50,15 @@ const StyledAppContainer = styled(AppContainer, { | |
| marginBottom: 198, | ||
| }, | ||
| '&& .description.ad': { | ||
| marginBottom: 0, | ||
| }, | ||
| }), | ||
| ...(hasTabs && { | ||
| '&& .component-tabs .MuiTabs-root': { | ||
| marginBottom: 198, | ||
|
There was a problem hiding this comment. Fix #35938 (comment) There is still a layout shift with Joy UI, but it's because the theme are not correctly isolated, the Ad renders with Joy UI theme, not with MUI's branding theme, a problem for another day. |
||
| }, | ||
| '&& .component-tabs.ad .MuiTabs-root': { | ||
| marginBottom: 0, | ||
| }, | ||
| }), | ||
| }), | ||
|
|
@@ -86,10 +86,10 @@ function AppLayoutDocs(props) { | |
| description, | ||
| disableAd = false, | ||
| disableToc = false, | ||
| hasTabs = false, | ||
| location, | ||
| title, | ||
| toc, | ||
| } = props; | ||
|
|
||
| if (description === undefined) { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,7 +4,6 @@ import { useRouter } from 'next/router'; | |
| import kebabCase from 'lodash/kebabCase'; | ||
| import { useTheme } from '@mui/system'; | ||
| import { exactProp } from '@mui/utils'; | ||
| import { CssVarsProvider, useColorScheme } from '@mui/joy/styles'; | ||
| import ComponentsApiContent from 'docs/src/modules/components/ComponentsApiContent'; | ||
| import HooksApiContent from 'docs/src/modules/components/HooksApiContent'; | ||
|
|
@@ -15,6 +14,8 @@ import AppLayoutDocs from 'docs/src/modules/components/AppLayoutDocsWithoutAppFr | |
| import { useTranslate, useUserLanguage } from 'docs/src/modules/utils/i18n'; | ||
| import BrandingProvider from 'docs/src/BrandingProvider'; | ||
| import Ad from 'docs/src/modules/components/Ad'; | ||
| import { HEIGHT as AppFrameHeight } from 'docs/src/modules/components/AppFrame'; | ||
| import { HEIGHT as TabsHeight } from 'docs/src/modules/components/ComponentPageTabs'; | ||
| import AdGuest from 'docs/src/modules/components/AdGuest'; | ||
|
|
||
| function JoyModeObserver({ mode }) { | ||
|
|
@@ -219,54 +220,55 @@ export default function MarkdownDocsV2(props) { | |
| toc={activeToc} | ||
| hasTabs | ||
| > | ||
| <div | ||
| style={{ | ||
| '--MuiDocs-header-height': `${AppFrameHeight + TabsHeight}px`, | ||
|
There was a problem hiding this comment. Fix #35938 (comment) |
||
| }} | ||
| > | ||
| <Provider> | ||
| {isJoy && <JoyModeObserver key="joy-provider" mode={theme.palette.mode} />} | ||
| {disableAd ? null : ( | ||
| <Wrapper key="add"> | ||
| <AdGuest classSelector=".component-tabs"> | ||
| <Ad /> | ||
| </AdGuest> | ||
| </Wrapper> | ||
| )} | ||
| {commonElements} | ||
| {activeTab === '' && | ||
| rendered | ||
| .slice(i, rendered.length - 1) | ||
| .map((renderedMarkdownOrDemo, index) => ( | ||
| <MarkdownElement | ||
| key={`demos-section-${index}`} | ||
| renderedMarkdownOrDemo={renderedMarkdownOrDemo} | ||
| WrapperComponent={Wrapper} | ||
| wrapperProps={wrapperProps} | ||
| srcComponents={srcComponents} | ||
| activeTab={activeTab} | ||
| setActiveTab={setActiveTab} | ||
| localizedDoc={localizedDoc} | ||
| demos={demos} | ||
| location={location} | ||
| theme={theme} | ||
| demoComponents={demoComponents} | ||
| disableAd={disableAd} | ||
| /> | ||
| ))} | ||
| {activeTab === 'components-api' && ( | ||
| <ComponentsApiContent | ||
| descriptions={componentsApiDescriptions} | ||
| pageContents={componentsApiPageContents} | ||
| /> | ||
| )} | ||
| {activeTab === 'hooks-api' && ( | ||
| <HooksApiContent | ||
| descriptions={hooksApiDescriptions} | ||
| pagesContents={hooksApiPageContents} | ||
| /> | ||
| )} | ||
| </Provider> | ||
| </div> | ||
| </AppLayoutDocs> | ||
| ); | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -111,6 +111,8 @@ const Root = styled('div')( | |
| }, | ||
| '& h1, & h2, & h3, & h4': { | ||
| position: 'relative', | ||
| // Reserve space for the end of the line action button | ||
| paddingRight: 26 * 2 + 10, | ||
|
There was a problem hiding this comment. Fix #35938 (comment) |
||
| '& code': { | ||
| fontSize: 'inherit', | ||
| lineHeight: 'inherit', | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Copied from #35938 (comment)