Skip to content

Commit 35f9e34

Browse files
committed
chore: rebase and use section-header
1 parent a3a06e0 commit 35f9e34

File tree

10 files changed

+37
-18
lines changed

10 files changed

+37
-18
lines changed

packages/theme-default/src/components/Search/SearchPanel.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
import { createPortal, useLocaleSiteData, usePageData } from '@rspress/runtime';
1+
import { useLocaleSiteData, usePageData } from '@rspress/runtime';
22
import type { AnyFunction } from '@rspress/shared';
33
import CloseSvg from '@theme-assets/close';
44
import LoadingSvg from '@theme-assets/loading';
55
import SearchSvg from '@theme-assets/search';
66
import { debounce } from 'lodash-es';
77
import { useCallback, useEffect, useRef, useState } from 'react';
8+
import { createPortal } from 'react-dom';
89
import * as userSearchHooks from 'virtual-search-hooks';
910
import { useNavigate } from '../Link/useNavigate';
1011
import { SvgWrapper } from '../SvgWrapper';
Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,24 @@
11
.rp-sidebar-section-header {
22
display: flex;
33
align-items: center;
4+
justify-content: space-between;
45
padding: 4px 12px;
6+
margin-top: 16px;
57

6-
> span {
8+
&:first-of-type {
9+
margin-top: 0;
10+
}
11+
12+
&__left {
713
display: flex;
814
align-items: center;
915
font-size: 14px;
1016
color: var(--rp-c-text-1);
11-
font-weight: bold;
17+
font-weight: 600;
18+
}
19+
20+
&__right {
21+
display: flex;
22+
align-items: center;
1223
}
1324
}

packages/theme-default/src/components/Sidebar/SidebarSectionHeader.tsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,12 @@ export function SidebarSectionHeader({
1111
}) {
1212
return (
1313
<div className="rp-sidebar-section-header">
14-
<span {...renderInlineMarkdown(sectionHeaderText)}></span>
15-
<Tag tag={tag} />
14+
<div className="rp-sidebar-section-header__left">
15+
<span {...renderInlineMarkdown(sectionHeaderText)}></span>
16+
</div>
17+
<div className="rp-sidebar-section-header__right">
18+
<Tag tag={tag} />
19+
</div>
1620
</div>
1721
);
1822
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
import { flushSync, ThemeContext, useSite } from '@rspress/runtime';
1+
import { ThemeContext, useSite } from '@rspress/runtime';
22
import MoonSvg from '@theme-assets/moon';
33
import SunSvg from '@theme-assets/sun';
44
import { type MouseEvent, useContext } from 'react';
55
import { SvgWrapper } from '../SvgWrapper';
66
import './global.scss';
77
import './index.scss';
8+
import { flushSync } from 'react-dom';
89

910
const supportAppearanceTransition = () => {
1011
return (

website/docs/en/guide/_meta.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,27 @@
11
[
22
{
3-
"type": "dir",
3+
"type": "dir-section-header",
44
"name": "start",
55
"label": "gettingStarted"
66
},
77
{
8-
"type": "dir",
8+
"type": "dir-section-header",
99
"name": "basic",
1010
"label": "features"
1111
},
1212
{
13-
"type": "dir",
13+
"type": "dir-section-header",
14+
"label": "Markdown & MDX",
1415
"name": "use-mdx",
1516
"tag": "new"
1617
},
1718
{
18-
"type": "dir",
19+
"type": "dir-section-header",
1920
"name": "default-theme",
2021
"label": "defaultTheme"
2122
},
2223
{
23-
"type": "dir",
24+
"type": "dir-section-header",
2425
"name": "advanced",
2526
"label": "advanced"
2627
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
["code-blocks", "link", "components", "container"]
1+
["mdx", "code-blocks", "link", "components", "container"]
File renamed without changes.

website/docs/zh/guide/_meta.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,27 @@
11
[
22
{
3-
"type": "dir",
3+
"type": "dir-section-header",
44
"name": "start",
55
"label": "gettingStarted"
66
},
77
{
8-
"type": "dir",
8+
"type": "dir-section-header",
99
"name": "basic",
1010
"label": "features"
1111
},
1212
{
13-
"type": "dir",
13+
"type": "dir-section-header",
14+
"label": "Markdown & MDX",
1415
"name": "use-mdx",
1516
"tag": "new"
1617
},
1718
{
18-
"type": "dir",
19+
"type": "dir-section-header",
1920
"name": "default-theme",
2021
"label": "defaultTheme"
2122
},
2223
{
23-
"type": "dir",
24+
"type": "dir-section-header",
2425
"name": "advanced",
2526
"label": "advanced"
2627
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
["code-blocks", "link", "components", "container"]
1+
["mdx", "code-blocks", "link", "components", "container"]
File renamed without changes.

0 commit comments

Comments
 (0)