Skip to content

Commit 3abd433

Browse files
committed
chore: polish the local nav
1 parent cd50b31 commit 3abd433

File tree

4 files changed

+19
-11
lines changed

4 files changed

+19
-11
lines changed

packages/runtime/src/index.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
export { Head } from '@unhead/react';
2-
export { createPortal, flushSync } from 'react-dom';
32
export * from 'react-router-dom';
43
export { Content } from './Content';
54
export { useActiveMatcher } from './hooks/useActiveMatcher';

packages/theme-default/src/components/SidebarMenu/index.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,9 @@
3737
z-index: var(--rp-z-index-mask);
3838
backdrop-filter: blur(3px);
3939
background-color: color-mix(in srgb, var(--rp-c-bg) 60%, transparent);
40+
display: none;
41+
@media (max-width: 767px) {
42+
display: block;
43+
}
4044
}
4145
}

packages/theme-default/src/components/SidebarMenu/index.tsx

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { useLocaleSiteData, useLocation, useSite } from '@rspress/runtime';
22
import MenuIcon from '@theme-assets/menu';
33
import { forwardRef, useEffect, useRef } from 'react';
4+
import { createPortal } from 'react-dom';
45
import { useUISwitch } from '../../layout/Layout/useUISwitch';
56
import { ReadPercent } from '../ReadPercent';
67
import { SvgWrapper } from '../SvgWrapper';
@@ -112,9 +113,11 @@ export const SidebarMenu = forwardRef(
112113
</button>
113114
)}
114115
</div>
115-
{(isSidebarOpen || isAsideOpen) && (
116-
<div onClick={closeSidebar} className="rp-sidebar-menu__mask" />
117-
)}
116+
{(isSidebarOpen || isAsideOpen) &&
117+
createPortal(
118+
<div onClick={closeSidebar} className="rp-sidebar-menu__mask" />,
119+
document.getElementById('__rspress_modal_container')!,
120+
)}
118121
</>
119122
);
120123
},

packages/theme-default/src/layout/DocLayout/index.scss

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
:root {
22
// z-index
3-
--rp-z-index-nav-screen: 80;
4-
--rp-z-index-nav-menu: 30;
5-
--rp-z-index-nav: 50;
6-
--rp-z-index-mask: 70;
7-
--rp-z-index-sidebar: 60;
3+
--rp-z-index-nav-screen: 70;
4+
--rp-z-index-nav: 60;
5+
--rp-z-index-mask: 20;
6+
--rp-z-index-sidebar: 50;
7+
--rp-z-index-sidebar-menu: 30;
88
--rp-z-index-aside: 40;
99
}
1010

@@ -90,20 +90,22 @@
9090

9191
position: sticky;
9292
top: var(--rp-nav-height);
93+
margin-top: var(--rp-sidebar-menu-height);
9394
right: 0;
9495
z-index: var(--rp-z-index-aside);
95-
9696
padding-top: var(--rp-content-padding-y);
9797

9898
overflow: hidden scroll;
9999
scrollbar-width: none;
100100
max-height: calc(100vh - var(--rp-nav-height));
101+
102+
box-shadow: var(--rp-shadow-1);
101103
}
102104
&__menu {
103105
position: sticky;
104106
top: var(--rp-nav-height);
105107
left: 0;
106-
z-index: var(--rp-z-index-nav-menu);
108+
z-index: var(--rp-z-index-sidebar-menu);
107109

108110
height: var(--rp-sidebar-menu-height);
109111
&__placeholder {

0 commit comments

Comments
 (0)