Skip to content

Commit 6b7d384

Browse files
react-translations-botmrbadrikosh-jpgbhardwaj00mehmetmalli
authored
Sync with react.dev @ 84a5696 (#478)
* fix: correct overlay highlighting in code examples (#7669) * fix: the value property of checkbox to the checked property (#7804) * No need for useState here — useCounter handles the state internally (#7803) * docs: fix misplaced prepositional phrase error (#7799) * Fix wrong documentation for effect events (#7800) * Fix wrong documentation for effect events * Update src/content/learn/separating-events-from-effects.md --------- Co-authored-by: Ricky <rickhanlonii@gmail.com> * Remove stray console.log and image (#7814) * fix(template): remove unnecessary import of React in template code (#7750) * fix(reference): correct singular form of 'Server Functions' to 'Server Function' (#7749) * Add bold mono font (#7815) --------- Co-authored-by: Nicolas Ettlin <nicolas.ettlin@me.com> * Remove TODO comments and convert them to issues (#7743) * Remove TODO comment and convert to an issue for react-test-renderer * Remove TODO comment and convert to an issue for react-dom/test-utils * Add example of `useActionState` handling execution order (#7733) * docs: update vite link (#7784) * docs: add bsky link (#7781) * docs: add bsky link rename twitter to x * Update src/content/community/index.md --------- Co-authored-by: Ricky <rickhanlonii@gmail.com> * React Montreal Meetings have a new link (#7809) * fix: remove useless content (#6615) * fix: wrong verb tense in doc (#7818) * fix: typo in challenge solution (#7816) * Use experiemental in all uEE doc sandboxes (#7820) * Author: Josh Story <story@hey.com> Date: 2025-05-21 11:01:46 -0700 clarify the nonce and signal options for prerender docs clarifies why nonce is not an option for prerender APIs. clarifies how you would use signal to abort a prerender with in page documentation * Fix wrong explanation in preserving-and-resetting-state (#6043) * fix: correct broken WAI-ARIA modal dialog link in createPortal reference (#7833) * fix link from ARIA dialog-modal * chore: trigger CLA recheck * Update meetups.md adding React Rajasthan Community (#7831) Adding the React Community for Rajasthan India * Update components-and-hooks-must-be-pure.md (#7830) Some grammar fixes, and language clarifications * Update referencing-values-with-refs.md (#7829) Fixed invalid URL * Add uwu click animation (#7822) * Fix typo and clarily that a server function reference is created only when that function is used by a Client Component (#7746) * Add React Alicante 2025 to Conferences page (#7674) * fix: use const where applicable in examples for keeping components pure (#7819) * Remove `forwardRef` reference from API listing (#7837) This API is now under "Legacy APIs" and should probably no longer be listed as a "modern API". * docs: Refactor context provider usage (#7793) * delete provider * Fix NavContext usage in Talks component * Fix TocContext and LanguagesContext usage in Page component * Fix IllustrationContext usage in IllustrationBlock component * Fix LevelContext and TasksContext usage in managing-state.md * Fix ThemeContext and Context usage in MyApp component * Fix HighlightContext usage in List component * Fix ThemeContext usage in MyApp component * Fix ErrorDecoderContext usage in ErrorDecoderPage component * Fix ThemeContext usage in MyPage and MyApp components * Fix ThemeContext usage in MyApp component * Fix useContext documentation to correct context provider references * Fix context provider references in createContext documentation * prettier * Update src/content/reference/react/createContext.md --------- Co-authored-by: Ricky <rickhanlonii@gmail.com> * fix: typo in docs on prerendering (#7823) * Replace Context.Provider with Context (#7838) Update to be in line with the recommended way from React 19. Docs https://react.dev/blog/2024/12/05/react-19#context-as-a-provider --------- Co-authored-by: Ricky <rickhanlonii@gmail.com> * fix(blog): resolve typo in React 19 blog post (`refs` → `ref`s) (#7828) This PR corrects a small typo in the React documentation, changing "`refs`" to "`ref`s" for accuracy and consistency. * Update analyze_comment.yml (#7840) * Fix #6915: typo fix (#6917) * fix: update ids to point to right part of the docs (#7854) * chore: remove unused date-fns (#7856) * chore: fix typo in resource and metadata components documentation (#7006) * fix: correct typo in scaling-up-with-reducer-and-context.md (#7390) Fix typo in the 'Step 3: Use context anywhere in the tree' section by changing TaskContext to TasksContext for accuracy. * fix flushSync link (#7862) * docs(react): fix grammar in forward ref deprecation message (#7864) --------- Co-authored-by: Mohammad Reza Badri <85818966+mrbadri@users.noreply.github.com> Co-authored-by: kosh <sipuofare631@gmail.com> Co-authored-by: Gourav Bhardwaj <98509451+gbhardwaj00@users.noreply.github.com> Co-authored-by: Mehmet Mallı <mallimehmet@gmail.com> Co-authored-by: Ricky <rickhanlonii@gmail.com> Co-authored-by: Ryosuke Hoda <h.ryosuke820@gmail.com> Co-authored-by: Nicolas Ettlin <nicolas.ettlin@me.com> Co-authored-by: Bartosz Klonowski <70535775+BartoszKlonowski@users.noreply.github.com> Co-authored-by: Ajit <47279189+ajits01@users.noreply.github.com> Co-authored-by: bornkiss <101384056+bornkiss@users.noreply.github.com> Co-authored-by: Eric Cote <eric@coteexpert.com> Co-authored-by: Xleine <xleine@qq.com> Co-authored-by: Ayman Alhourani <139303034+aalhoura@users.noreply.github.com> Co-authored-by: Josh Story <story@hey.com> Co-authored-by: Soichiro Miki <smiki-tky@umin.ac.jp> Co-authored-by: Dmitry Titov <61434098+dimatitov@users.noreply.github.com> Co-authored-by: Shubham Gupta <50445450+shubhamui@users.noreply.github.com> Co-authored-by: G. van Dorland <giodor13@gmail.com> Co-authored-by: Julius Lundang <cHaLkdusT@users.noreply.github.com> Co-authored-by: jinsoo <89149734+Jinsoo1004@users.noreply.github.com> Co-authored-by: John Kapantzakis <kapantzak@gmail.com> Co-authored-by: Mike DiDomizio <mikedidomizio@gmail.com> Co-authored-by: Aakansha Doshi <aakansha1216@gmail.com> Co-authored-by: Jan Kassens <jkassens@meta.com> Co-authored-by: minami yoshihiko <ymym1990ymym@gmail.com> Co-authored-by: Kunall Banerjee <14703164+yeskunall@users.noreply.github.com> Co-authored-by: Amirhossein Alibakhshi <amir78729@gmail.com> Co-authored-by: Jatin Singh <jadenrizz31@gmail.com> Co-authored-by: Batuhan Tomo <91488737+Rekl0w@users.noreply.github.com> Co-authored-by: Noritaka Kobayashi <arukimedesu1166777@gmail.com> Co-authored-by: Dipesh B C <50456672+bcdipesh@users.noreply.github.com> Co-authored-by: Simon Schick <demwizzy@gmail.com>
1 parent 1a87558 commit 6b7d384

File tree

6 files changed

+15
-3
lines changed

6 files changed

+15
-3
lines changed

src/content/learn/scaling-up-with-reducer-and-context.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -685,7 +685,7 @@ Now you don't need to pass the list of tasks or the event handlers down the tree
685685
</TasksContext>
686686
```
687687

688-
Instead, any component that needs the task list can read it from the `TaskContext`:
688+
Instead, any component that needs the task list can read it from the `TasksContext`:
689689

690690
```js {2}
691691
export default function TaskList() {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ 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.
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/flushSync) to ensure the initial render runs fully synchronously.
9494
9595
```js
9696
const root = createRoot(document.getElementById('root'));

src/content/reference/react-dom/static/prerender.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ On the client, call [`hydrateRoot`](/reference/react-dom/client/hydrateRoot) to
7272
<<<<<<< HEAD
7373
<<<<<<< HEAD
7474
<<<<<<< HEAD
75+
<<<<<<< HEAD
7576
`nonce` is not an available option when prerendering. Nonces must be unique per request and if you use nonces to secure your application with [CSP](https://developer.mozilla.org/en-US/docs/Web/HTTP/Guides/CSP) it would be inappropriate and insecure to include the a nonce value in the prerender itself.
7677
=======
7778
`nonce` is not an available option when prerendering. Nonces must be unique per request and if you use nonces to secure your application with [CSP](https://developer.mozilla.org/en-US/docs/Web/HTTP/Guides/CSP) it would be inappropriate and insecure to include the nonce value in the prerender itself.
@@ -85,6 +86,9 @@ On the client, call [`hydrateRoot`](/reference/react-dom/client/hydrateRoot) to
8586
=======
8687
`nonce` is not an available option when prerendering. Nonces must be unique per request and if you use nonces to secure your application with [CSP](https://developer.mozilla.org/en-US/docs/Web/HTTP/Guides/CSP) it would be inappropriate and insecure to include the nonce value in the prerender itself.
8788
>>>>>>> c0c955ed1d1c4fe3bf3e18c06a8d121902a01619
89+
=======
90+
`nonce` is not an available option when prerendering. Nonces must be unique per request and if you use nonces to secure your application with [CSP](https://developer.mozilla.org/en-US/docs/Web/HTTP/Guides/CSP) it would be inappropriate and insecure to include the nonce value in the prerender itself.
91+
>>>>>>> 84a56968d92b9a9e9bbac1ca13011e159e815dc1
8892
8993
9094
<Note>

src/content/reference/react-dom/static/prerenderToNodeStream.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ On the client, call [`hydrateRoot`](/reference/react-dom/client/hydrateRoot) to
7373
<<<<<<< HEAD
7474
<<<<<<< HEAD
7575
<<<<<<< HEAD
76+
<<<<<<< HEAD
7677
`nonce` is not an available option when prerendering. Nonces must be unique per request and if you use nonces to secure your application with [CSP](https://developer.mozilla.org/en-US/docs/Web/HTTP/Guides/CSP) it would be inappropriate and insecure to include the a nonce value in the prerender itself.
7778
=======
7879
`nonce` is not an available option when prerendering. Nonces must be unique per request and if you use nonces to secure your application with [CSP](https://developer.mozilla.org/en-US/docs/Web/HTTP/Guides/CSP) it would be inappropriate and insecure to include the nonce value in the prerender itself.
@@ -86,6 +87,9 @@ On the client, call [`hydrateRoot`](/reference/react-dom/client/hydrateRoot) to
8687
=======
8788
`nonce` is not an available option when prerendering. Nonces must be unique per request and if you use nonces to secure your application with [CSP](https://developer.mozilla.org/en-US/docs/Web/HTTP/Guides/CSP) it would be inappropriate and insecure to include the nonce value in the prerender itself.
8889
>>>>>>> c0c955ed1d1c4fe3bf3e18c06a8d121902a01619
90+
=======
91+
`nonce` is not an available option when prerendering. Nonces must be unique per request and if you use nonces to secure your application with [CSP](https://developer.mozilla.org/en-US/docs/Web/HTTP/Guides/CSP) it would be inappropriate and insecure to include the nonce value in the prerender itself.
92+
>>>>>>> 84a56968d92b9a9e9bbac1ca13011e159e815dc1
8993
9094
<Note>
9195

src/content/reference/react/forwardRef.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ title: forwardRef
66

77
In React 19, `forwardRef` is no longer necessary. Pass `ref` as a prop instead.
88

9-
`forwardRef` will deprecated in a future release. Learn more [here](/blog/2024/04/25/react-19#ref-as-a-prop).
9+
`forwardRef` will be deprecated in a future release. Learn more [here](/blog/2024/04/25/react-19#ref-as-a-prop).
1010

1111
</Deprecated>
1212

src/content/reference/rsc/server-functions.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ To support Server Functions as a bundler or framework, we recommend pinning to a
3232
<<<<<<< HEAD
3333
<<<<<<< HEAD
3434
<<<<<<< HEAD
35+
<<<<<<< HEAD
3536
When a Server Function is defined with the [`"use server"`](/reference/rsc/use-server) directive, your framework will automatically create a reference to the server function, and pass that reference to the Client Component. When that function is called on the client, React will send a request to the server to execute the function, and return the result.
3637
=======
3738
When a Server Function is defined with the [`"use server"`](/reference/rsc/use-server) directive, your framework will automatically create a reference to the Server Function, and pass that reference to the Client Component. When that function is called on the client, React will send a request to the server to execute the function, and return the result.
@@ -45,6 +46,9 @@ When a Server Function is defined with the [`"use server"`](/reference/rsc/use-s
4546
=======
4647
When a Server Function is defined with the [`"use server"`](/reference/rsc/use-server) directive, your framework will automatically create a reference to the Server Function, and pass that reference to the Client Component. When that function is called on the client, React will send a request to the server to execute the function, and return the result.
4748
>>>>>>> c0c955ed1d1c4fe3bf3e18c06a8d121902a01619
49+
=======
50+
When a Server Function is defined with the [`"use server"`](/reference/rsc/use-server) directive, your framework will automatically create a reference to the Server Function, and pass that reference to the Client Component. When that function is called on the client, React will send a request to the server to execute the function, and return the result.
51+
>>>>>>> 84a56968d92b9a9e9bbac1ca13011e159e815dc1
4852
4953
Server Functions can be created in Server Components and passed as props to Client Components, or they can be imported and used in Client Components.
5054

0 commit comments

Comments
 (0)