Skip to content

fix(theme): only render secondaryMenu if it should be shown #10705

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
slorber merged 3 commits into from
Feb 27, 2025
Merged

fix(theme): only render secondaryMenu if it should be shown #10705

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b7ca6db
fix: only render secondaryMenu if it should be shown
hidde Nov 21, 2024
b4b1252
Merge branch 'main' into patch-1
slorber Feb 27, 2025
38ea9ae
use HTML inert on invisible mobile drawer pane
slorber Feb 27, 2025
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
32 changes: 27 additions & 5 deletions packages/docusaurus-theme-classic/src/theme/Navbar/MobileSidebar/Layout/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,37 @@
* LICENSE file in the root directory of this source tree.
*/

import React, {type ReactNode} from 'react';
import React, {version, type ReactNode} from 'react';
import clsx from 'clsx';
import {useNavbarSecondaryMenu} from '@docusaurus/theme-common/internal';
import {ThemeClassNames} from '@docusaurus/theme-common';
import type {Props} from '@theme/Navbar/MobileSidebar/Layout';

function NavbarMobileSidebarPanel({children}: {children: ReactNode}) {
// TODO Docusaurus v4: remove temporary inert workaround
// See https://github.com/facebook/react/issues/17157
// See https://github.com/radix-ui/themes/pull/509
function inertProps(inert: boolean) {
const isBeforeReact19 = parseInt(version!.split('.')[0]!, 10) < 19;
if (isBeforeReact19) {
return {inert: inert ? '' : undefined};
}
return {inert};
}

function NavbarMobileSidebarPanel({
children,
inert,
}: {
children: ReactNode;
inert: boolean;
}) {
return (
<div
className={clsx(
ThemeClassNames.layout.navbar.mobileSidebar.panel,
'navbar-sidebar__item menu',
)}>
)}
{...inertProps(inert)}>
{children}
</div>
);
Expand All @@ -40,8 +58,12 @@ export default function NavbarMobileSidebarLayout({
className={clsx('navbar-sidebar__items', {
'navbar-sidebar__items--show-secondary': secondaryMenuShown,
})}>
<NavbarMobileSidebarPanel>{primaryMenu}</NavbarMobileSidebarPanel>
<NavbarMobileSidebarPanel>{secondaryMenu}</NavbarMobileSidebarPanel>
<NavbarMobileSidebarPanel inert={secondaryMenuShown}>
{primaryMenu}
</NavbarMobileSidebarPanel>
<NavbarMobileSidebarPanel inert={!secondaryMenuShown}>
{secondaryMenu}
</NavbarMobileSidebarPanel>
</div>
</div>
);
Expand Down