Skip to content

Commit 8fac208

Browse files
Merge branch 'main' of https://github.com/reactjs/react.dev into sync-55986965
2 parents c217cfb + 5598696 commit 8fac208

File tree

5 files changed

+29
-13
lines changed

5 files changed

+29
-13
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-
// import SocialBanner from '../SocialBanner';
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/SocialBanner.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {useRef, useEffect} from 'react';
77
import cn from 'classnames';
88
import {ExternalLink} from './ExternalLink';
99

10-
const bannerText = 'Stream React Conf on May 15-16.';
10+
const bannerText = 'Join us for React Conf on Oct 7-8.';
1111
const bannerLink = 'https://conf.react.dev/';
1212
const bannerLinkText = 'Learn more.';
1313

src/content/community/conferences.md

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,6 @@ Do you know of a local React.js conference? Add it here! (Please keep the list c
1010

1111
## Upcoming Conferences {/*upcoming-conferences*/}
1212

13-
### React Paris 2025 {/*react-paris-2025*/}
14-
March 20 - 21, 2025. In-person in Paris, France (hybrid event)
15-
16-
[Website](https://react.paris/) - [Twitter](https://x.com/BeJS_)
17-
18-
### React Native Connection 2025 {/*react-native-connection-2025*/}
19-
April 3 (Reanimated Training) + April 4 (Conference), 2025. Paris, France.
20-
21-
[Website](https://reactnativeconnection.io/) - [X](https://x.com/reactnativeconn) - [Bluesky](https://bsky.app/profile/reactnativeconnect.bsky.social)
22-
2313
### CityJS London 2025 {/*cityjs-london*/}
2414

2515
April 23 - 25, 2025. In-person in London, UK
@@ -51,6 +41,11 @@ September 2-4, 2025. Wrocław, Poland.
5141

5242
[Website](https://www.reactuniverseconf.com/) - [Twitter](https://twitter.com/react_native_eu) - [LinkedIn](https://www.linkedin.com/events/reactuniverseconf7163919537074118657/)
5343

44+
### React Conf 2025 {/*react-conf-2025*/}
45+
October 7-8, 2025. Henderson, Nevada, USA and free livestream
46+
47+
[Website](https://conf.react.dev/) - [Twitter](https://x.com/reactjs) - [Bluesky](https://bsky.app/profile/react.dev)
48+
5449
### React India 2025 {/*react-india-2025*/}
5550
October 31 - November 01, 2025. In-person in Goa, India (hybrid event) + Oct 15 2025 - remote day
5651

@@ -59,6 +54,16 @@ October 31 - November 01, 2025. In-person in Goa, India (hybrid event) + Oct 15
5954

6055
## Past Conferences {/*past-conferences*/}
6156

57+
### React Paris 2025 {/*react-paris-2025*/}
58+
March 20 - 21, 2025. In-person in Paris, France (hybrid event)
59+
60+
[Website](https://react.paris/) - [Twitter](https://x.com/BeJS_)
61+
62+
### React Native Connection 2025 {/*react-native-connection-2025*/}
63+
April 3 (Reanimated Training) + April 4 (Conference), 2025. Paris, France.
64+
65+
[Website](https://reactnativeconnection.io/) - [X](https://x.com/reactnativeconn) - [Bluesky](https://bsky.app/profile/reactnativeconnect.bsky.social)
66+
6267
### React Day Berlin 2024 {/*react-day-berlin-2024*/}
6368
December 13 & 16, 2024. In-person in Berlin, Germany + remote (hybrid event)
6469

src/content/reference/react-dom/client/createRoot.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,15 @@ React는 `root`에 `<App />`을 표시하고 그 안에 있는 DOM을 관리합
8888
8989
* 동일한 루트에서 `render`를 두 번 이상 호출하면, React는 필요에 따라 DOM을 업데이트하여 사용자가 전달한 최신 JSX를 반영합니다. React는 이전에 렌더링 된 트리와 ["비교"](/learn/preserving-and-resetting-state)해서 재사용할 수 있는 부분과 다시 만들어야 하는 부분을 결정합니다. 동일한 루트에서 `render`를 다시 호출하는 것은 루트 컴포넌트에서 [`set` 함수](/reference/react/useState#setstate)를 호출하는 것과 비슷합니다. React는 불필요한 DOM 업데이트를 피합니다.
9090
91+
* Although rendering is synchronous once it starts, `root.render(...)` is not. This means code after `root.render()` may run before any effects (`useLayoutEffect`, `useEffect`) of that specific render are fired. This is usually fine and rarely needs adjustment. In rare cases where effect timing matters, you can wrap `root.render(...)` in [`flushSync`](https://react.dev/reference/react-dom/client/flushSync) to ensure the initial render runs fully synchronously.
92+
93+
```js
94+
const root = createRoot(document.getElementById('root'));
95+
root.render(<App />);
96+
// 🚩 The HTML will not include the rendered <App /> yet:
97+
console.log(document.body.innerHTML);
98+
```
99+
91100
---
92101
93102
### `root.unmount()` {/*root-unmount*/}

src/content/reference/react/useId.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ function PasswordField() {
4646
4747
* `useId`를 리스트의 **key를 생성하기 위해 사용하면 안 됩니다**. [Key는 데이터로부터 생성해야 합니다.](/learn/rendering-lists#where-to-get-your-key)
4848
49+
* `useId` currently cannot be used in [async Server Components](/reference/rsc/server-components#async-components-with-server-components).
50+
4951
---
5052
5153
## 사용법 {/*usage*/}

0 commit comments

Comments
 (0)