Skip to content

Commit da09463

Browse files
authored
Merge pull request #95 from reactjs/sync-55986965
Sync with react.dev @ 5598696
2 parents 56b8dcc + 63fd056 commit da09463

File tree

7 files changed

+29
-19
lines changed

7 files changed

+29
-19
lines changed

.github/workflows/label_core_team_prs.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ on:
55

66
permissions: {}
77

8-
permissions: {}
9-
108
env:
119
TZ: /usr/share/zoneinfo/America/Los_Angeles
1210
# https://github.com/actions/cache/blob/main/tips-and-workarounds.md#cache-segment-restore-timeout

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
April 23 - 25, 2025. In-person in London, UK
2515

@@ -50,6 +40,11 @@ September 2-4, 2025. Wrocław, Poland.
5040

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

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

@@ -58,6 +53,16 @@ October 31 - November 01, 2025. In-person in Goa, India (hybrid event) + Oct 15
5853

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

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

src/content/learn/tutorial-tic-tac-toe.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2247,11 +2247,7 @@ body {
22472247
22482248
</Sandpack>
22492249
2250-
<<<<<<< HEAD
22512250
Unapozunguka kupitia orodha ya `history` ndani ya function unayopitisha kwa `map`, hoja ya `squares` inapitia kila kipengele cha `history`, na hoja ya `move` inapitia kila kiashiria cha orodha: `0`, `1`, `2`, …. (Katika hali nyingi, ungehitaji vipengele halisi vya orodha, lakini ili kuonyesha orodha ya harakati utahitaji tu viashiria.)
2252-
=======
2253-
As you iterate through the `history` array inside the function you passed to `map`, the `squares` argument goes through each element of `history`, and the `move` argument goes through each array index: `0`, `1`, `2`, …. (In most cases, you'd need the actual array elements, but to render a list of moves you will only need indexes.)
2254-
>>>>>>> 5138e605225b24d25701a1a1f68daa90499122a4
22552251
22562252
Kwa kila harakati katika historia ya mchezo wa tic-tac-toe, unaunda kipengele cha orodha `<li>` kinachojumuisha kitufe `<button>`. Kitufe kinakuwa na kihariri cha `onClick` kinachoitwa function inayoitwa `jumpTo` (ambayo huja kuwa umeitekeleza bado).
22572253

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,15 @@ React will display `<App />` in the `root`, and take over managing the DOM insid
9090
9191
* If you call `render` on the same root more than once, React will update the DOM as necessary to reflect the latest JSX you passed. React will decide which parts of the DOM can be reused and which need to be recreated by ["matching it up"](/learn/preserving-and-resetting-state) with the previously rendered tree. Calling `render` on the same root again is similar to calling the [`set` function](/reference/react/useState#setstate) on the root component: React avoids unnecessary DOM updates.
9292
93+
* 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.
94+
95+
```js
96+
const root = createRoot(document.getElementById('root'));
97+
root.render(<App />);
98+
// 🚩 The HTML will not include the rendered <App /> yet:
99+
console.log(document.body.innerHTML);
100+
```
101+
93102
---
94103
95104
### `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` **should not be used to generate keys** in a list. [Keys should be generated from your data.](/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 {/*usage*/}

0 commit comments

Comments
 (0)