Skip to content

fix(theme): mobile drawer sidebar should use native modal dialog and backdrop #10706

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.

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

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
* LICENSE file in the root directory of this source tree.
*/

import React, {type ComponentProps, type ReactNode} from 'react';
import React, {type ReactNode} from 'react';
import clsx from 'clsx';
import {ThemeClassNames, useThemeConfig} from '@docusaurus/theme-common';
import {
@@ -18,16 +18,6 @@ import type {Props} from '@theme/Navbar/Layout';

import styles from './styles.module.css';

function NavbarBackdrop(props: ComponentProps<'div'>) {
return (
<div
role="presentation"
{...props}
className={clsx('navbar-sidebar__backdrop', props.className)}
/>
);
}

export default function NavbarLayout({children}: Props): ReactNode {
const {
navbar: {hideOnScroll, style},
@@ -57,7 +47,6 @@ export default function NavbarLayout({children}: Props): ReactNode {
},
)}>
{children}
<NavbarBackdrop onClick={mobileSidebar.toggle} />
<NavbarMobileSidebar />
</nav>
);
Original file line number Diff line number Diff line change
@@ -5,10 +5,16 @@
* LICENSE file in the root directory of this source tree.
*/

.navbarHideable {
transition: transform var(--ifm-transition-fast) ease;
.navbar-sidebar {
inset: 0;
margin: 0;
padding: 0;
bottom: 0;
border: 0;
height: 100%;
max-height: 100%;
}

.navbarHidden {
transform: translate3d(0, calc(-100% - 2px), 0);
.navbar-sidebar::backdrop {
background-color: #0009;
}
Original file line number Diff line number Diff line change
@@ -5,9 +5,12 @@
* LICENSE file in the root directory of this source tree.
*/

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

@@ -47,12 +50,47 @@ export default function NavbarMobileSidebarLayout({
secondaryMenu,
}: Props): ReactNode {
const {shown: secondaryMenuShown} = useNavbarSecondaryMenu();
const navbarModalDialog = useRef<HTMLDialogElement | null>(null);
const {shown, toggle} = useNavbarMobileSidebar();

useEffect(() => {
const {current: dialogEl} = navbarModalDialog;

if (!dialogEl) {
return;
}
if (shown) {
dialogEl.showModal();
} else {
dialogEl.close();
}
});

useEffect(() => {
const {current: dialogEl} = navbarModalDialog;

function toggleOnEscape(e: {key: string}) {
if (e.key === 'Escape') {
if (shown) {
toggle();
}
}
}

dialogEl?.addEventListener('keydown', toggleOnEscape);

return () => {
dialogEl?.removeEventListener('keydown', toggleOnEscape);
};
}, [shown, toggle]);

return (
<div
<dialog
className={clsx(
ThemeClassNames.layout.navbar.mobileSidebar.container,
'navbar-sidebar',
)}>
)}
ref={navbarModalDialog}>
{header}
<div
className={clsx('navbar-sidebar__items', {
@@ -65,6 +103,6 @@ export default function NavbarMobileSidebarLayout({
{secondaryMenu}
</NavbarMobileSidebarPanel>
</div>
</div>
</dialog>
);
}