Skip to content

Commit b492a5d

Browse files
docs(en): merge reactjs.org/main into zh-hans.reactjs.org/main @ adb3bed (#1545)
2 parents a602428 + 3b34db0 commit b492a5d

File tree

4 files changed

+149
-59
lines changed

4 files changed

+149
-59
lines changed

src/components/Layout/Page.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {useRouter} from 'next/router';
88
import {SidebarNav} from './SidebarNav';
99
import {Footer} from './Footer';
1010
import {Toc} from './Toc';
11-
11+
// import SocialBanner from '../SocialBanner';
1212
import {DocsPageFooter} from 'components/DocsFooter';
1313
import {Seo} from 'components/Seo';
1414
import PageHeading from 'components/PageHeading';
@@ -137,7 +137,7 @@ export function Page({
137137
/>
138138
</Head>
139139
)}
140-
{/* <SocialBanner /> */}
140+
{/*<SocialBanner />*/}
141141
<TopNav
142142
section={section}
143143
routeTree={routeTree}

src/components/Layout/TopNav/TopNav.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ function NavItem({url, isActive, children}: any) {
125125
<Link
126126
href={url}
127127
className={cn(
128-
'active:scale-95 transition-transform w-full text-center outline-link py-1.5 px-1.5 xs:px-3 sm:px-4 rounded-full capitalize',
128+
'active:scale-95 transition-transform w-full text-center outline-link py-1.5 px-1.5 xs:px-3 sm:px-4 rounded-full capitalize whitespace-nowrap',
129129
!isActive && 'hover:bg-primary/5 hover:dark:bg-primary-dark/5',
130130
isActive &&
131131
'bg-highlight dark:bg-highlight-dark text-link dark:text-link-dark'

src/content/blog/2024/04/25/react-19.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -510,8 +510,7 @@ Due to the introduction of ref cleanup functions, returning anything else from a
510510

511511
The original code returned the instance of the `HTMLDivElement` and TypeScript wouldn't know if this was _supposed_ to be a cleanup function or if you didn't want to return a cleanup function.
512512

513-
You can codemod this pattern with [`no-implicit-ref-callback-return
514-
`](https://github.com/eps1lon/types-react-codemod/#no-implicit-ref-callback-return).
513+
You can codemod this pattern with [`no-implicit-ref-callback-return`](https://github.com/eps1lon/types-react-codemod/#no-implicit-ref-callback-return).
515514

516515
### `useDeferredValue` initial value {/*use-deferred-value-initial-value*/}
517516

0 commit comments

Comments
 (0)