Skip to content

Commit 78dbdd6

Browse files
authored
fix(theme): hydration error in NavHamburger and fix Search color (#2697)
1 parent 30d8ab6 commit 78dbdd6

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

e2e/fixtures/nav-link-item-with-hash/index.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,6 @@ test.describe('basic test', async () => {
3838
await expect(navScreen).toHaveClass(/rp-nav-screen--open/);
3939

4040
await page.getByRole('link', { name: 'PageC' }).click();
41-
await expect(navScreen).not.toHaveClass(/rp-nav-screen--open/);
41+
expect(await navScreen.isVisible()).toBe(false);
4242
});
4343
});

packages/core/src/theme/components/NavHamburger/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export function NavHamburger() {
3030

3131
return (
3232
<>
33-
{typeof window !== 'undefined' &&
33+
{isScreenOpen &&
3434
createPortal(
3535
<NavScreen isScreenOpen={isScreenOpen} toggleScreen={toggleScreen} />,
3636
document.getElementById('__rspress_modal_container')!,

packages/core/src/theme/components/Search/SuggestItem.scss

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,29 @@
44
margin: 5px 2px;
55

66
.dark &,
7-
.dark & > a {
7+
.dark & .rp-suggest-item__link {
88
box-shadow: none;
99
}
1010

11-
& > a {
11+
& .rp-suggest-item__link {
12+
color: var(--rp-c-text-1);
1213
background-color: var(--rp-c-bg);
1314
border-radius: var(--rp-radius-small);
1415
padding-left: 12px;
15-
color: var(--rp-c-black-soft);
1616
display: flex;
1717
width: 100%;
1818
box-shadow: 0 1px 3px 0 #d4d9e1;
1919
}
2020

2121
&--current {
22-
> a {
22+
.rp-suggest-item__link {
2323
background-color: var(--rp-c-brand);
2424
cursor: pointer;
2525
color: #ffffff;
2626
}
2727

2828
.rp-suggest-item__container {
29-
svg {
29+
.rp-suggest-item__icon {
3030
color: #ffffff;
3131
}
3232

@@ -57,10 +57,10 @@
5757
align-items: center;
5858
font-weight: 500;
5959
padding-right: 12px;
60+
}
6061

61-
svg {
62-
color: var(--rp-c-gray-light-1);
63-
}
62+
&__icon {
63+
color: var(--rp-c-gray-light-1);
6464
}
6565

6666
&__content {
@@ -76,7 +76,6 @@
7676

7777
&__statement {
7878
font-size: 0.875rem;
79-
color: var(--rp-c-text-2);
8079
width: 100%;
8180
}
8281

packages/core/src/theme/components/Search/SuggestItem.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,13 +122,14 @@ export function SuggestItem({
122122
>
123123
<Link
124124
href={suggestion.link}
125+
className="rp-suggest-item__link"
125126
onClick={e => {
126127
closeSearch();
127128
e.stopPropagation();
128129
}}
129130
>
130131
<div className="rp-suggest-item__container">
131-
<div>
132+
<div className="rp-suggest-item__icon">
132133
<SvgWrapper icon={HitIcon} />
133134
</div>
134135
<div className="rp-suggest-item__content">

0 commit comments

Comments
 (0)