Skip to content

Commit 9810399

Browse files
authored
Merge pull request #250 from reactjs/sync-f5fa1e82
Sync with react.dev @ f5fa1e8
2 parents 67c119d + edcd815 commit 9810399

48 files changed

Lines changed: 747 additions & 250 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/components/MDX/TeamMember.tsx‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ function GroupBadges({group}: {group: string}) {
6868
);
6969
}
7070

71-
// TODO: good alt text for images/links
71+
// TODO: good alt text for images
7272
export function TeamMember({
7373
name,
7474
title,
@@ -113,7 +113,7 @@ export function TeamMember({
113113
aria-label={`${name} on Twitter`}
114114
href={`https://twitter.com/${twitter}`}
115115
className="hover:text-primary hover:underline dark:text-primary-dark flex flex-row items-center">
116-
<IconTwitter className="pe-1" />
116+
<IconTwitter className="pe-1" aria-hidden="true" />
117117
{twitter}
118118
</ExternalLink>
119119
</div>
@@ -124,7 +124,7 @@ export function TeamMember({
124124
aria-label={`${name} on Threads`}
125125
href={`https://threads.net/${threads}`}
126126
className="hover:text-primary hover:underline dark:text-primary-dark flex flex-row items-center">
127-
<IconThreads className="pe-1" />
127+
<IconThreads className="pe-1" aria-hidden="true" />
128128
{threads}
129129
</ExternalLink>
130130
</div>
@@ -135,27 +135,27 @@ export function TeamMember({
135135
aria-label={`${name} on Bluesky`}
136136
href={`https://bsky.app/profile/${bsky}`}
137137
className="hover:text-primary hover:underline dark:text-primary-dark flex flex-row items-center">
138-
<IconBsky className="pe-1" />
138+
<IconBsky className="pe-1" aria-hidden="true" />
139139
{bsky}
140140
</ExternalLink>
141141
</div>
142142
)}
143143
{github && (
144144
<div className="me-4">
145145
<ExternalLink
146-
aria-label="GitHub Profile"
146+
aria-label={`${name} on GitHub`}
147147
href={`https://github.com/${github}`}
148148
className="hover:text-primary hover:underline dark:text-primary-dark flex flex-row items-center">
149-
<IconGitHub className="pe-1" /> {github}
149+
<IconGitHub className="pe-1" aria-hidden="true" /> {github}
150150
</ExternalLink>
151151
</div>
152152
)}
153153
{personal && (
154154
<ExternalLink
155-
aria-label="Personal Site"
155+
aria-label={`${name}'s personal website`}
156156
href={`https://${personal}`}
157157
className="hover:text-primary hover:underline dark:text-primary-dark flex flex-row items-center">
158-
<IconLink className="pe-1" /> {personal}
158+
<IconLink className="pe-1" aria-hidden="true" /> {personal}
159159
</ExternalLink>
160160
)}
161161
</div>

‎src/content/blog/2023/03/16/introducing-react-dev.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ When we released React Hooks in 2018, the Hooks docs assumed the reader is famil
4242
**The new docs teach React with Hooks from the beginning.** The docs are divided in two main sections:
4343

4444
* **[Learn React](/learn)** is a self-paced course that teaches React from scratch.
45-
* **[API Reference](/reference)** provides the details and usage examples for every React API.
45+
* **[API Reference](/reference/react)** provides the details and usage examples for every React API.
4646

4747
Let's have a closer look at what you can find in each section.
4848

@@ -462,7 +462,7 @@ In the [API Reference](/reference/react), every React API now has a dedicated pa
462462
- Built-in Hooks like [`useState`](/reference/react/useState).
463463
- Built-in components like [`<Suspense>`](/reference/react/Suspense).
464464
- Built-in browser components like [`<input>`](/reference/react-dom/components/input).
465-
- Framework-oriented APIs like [`renderToPipeableStream`](/reference/react-dom/server/renderToReadableStream).
465+
- Framework-oriented APIs like [`renderToPipeableStream`](/reference/react-dom/server/renderToPipeableStream).
466466
- Other React APIs like [`memo`](/reference/react/memo).
467467

468468
You'll notice that every API page is split into at least two segments: *Reference* and *Usage*.
@@ -607,7 +607,7 @@ button { display: block; margin-top: 10px; }
607607

608608
</Recipes>
609609

610-
Some API pages also include [Troubleshooting](/reference/react/useEffect#troubleshooting) (for common problems) and [Alternatives](/reference/react-dom/findDOMNode#alternatives) (for deprecated APIs).
610+
Some API pages also include [Troubleshooting](/reference/react/useEffect#troubleshooting) (for common problems) and [Alternatives](https://18.react.dev/reference/react-dom/findDOMNode#alternatives) (for deprecated APIs).
611611

612612
We hope that this approach will make the API reference useful not only as a way to look up an argument, but as a way to see all the different things you can do with any given API—and how it connects to the other ones.
613613

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -639,7 +639,7 @@ const ref = useRef<number>(null);
639639
ref.current = 1;
640640
```
641641

642-
`MutableRef` is now deprecated in favor of a single `RefObject` type which `useRef` will always return:
642+
`MutableRefObject` is now deprecated in favor of a single `RefObject` type which `useRef` will always return:
643643

644644
```ts
645645
interface RefObject<T> {

‎src/content/blog/2024/12/05/react-19.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ For more info, see the docs for [Directives](/reference/rsc/directives).
389389

390390
Server Actions can be created in Server Components and passed as props to Client Components, or they can be imported and used in Client Components.
391391

392-
For more, see the docs for [React Server Actions](/reference/rsc/server-actions).
392+
For more, see the docs for [React Server Actions](/reference/rsc/server-functions).
393393

394394
## Improvements in React 19 {/*improvements-in-react-19*/}
395395

‎src/content/blog/2025/04/23/react-labs-view-transitions-activity-and-more.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14266,7 +14266,7 @@ Unfortunately, some hooks are still hard to think in terms of function instead o
1426614266

1426714267
We found that often, the confusion is from using an Effect when you don't need to. The [You Might Not Need an Effect](/learn/you-might-not-need-an-effect) guide covers many cases for when Effects are not the right solution. However, even when an Effect is the right fit for a problem, Effects can still be harder to understand than class component lifecycles.
1426814268

14269-
We believe one of the reasons for confusion is that developers to think of Effects from the _component's_ perspective (like a lifecycle), instead of the _Effects_ point of view (what the Effect does).
14269+
We believe one of the reasons for confusion is that developers tend to think of Effects from the _component's_ perspective (like a lifecycle), instead of the _Effects_ point of view (what the Effect does).
1427014270

1427114271
Let's look at an example [from the docs](/learn/lifecycle-of-reactive-effects#thinking-from-the-effects-perspective):
1427214272

‎src/content/blog/2025/12/11/denial-of-service-and-source-code-exposure-in-react-server-components.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ Additional disclosures can be frustrating, but they are generally a sign of a he
7676

7777
### Affected frameworks and bundlers {/*affected-frameworks-and-bundlers*/}
7878

79-
Some React frameworks and bundlers depended on, had peer dependencies for, or included the vulnerable React packages. The following React frameworks & bundlers are affected: [next](https://www.npmjs.com/package/next), [react-router](https://www.npmjs.com/package/react-router), [waku](https://www.npmjs.com/package/waku), [@parcel/rsc](https://www.npmjs.com/package/@parcel/rsc), [@vite/rsc-plugin](https://www.npmjs.com/package/@vitejs/plugin-rsc), and [rwsdk](https://www.npmjs.com/package/rwsdk).
79+
Some React frameworks and bundlers depended on, had peer dependencies for, or included the vulnerable React packages. The following React frameworks & bundlers are affected: [next](https://www.npmjs.com/package/next), [react-router](https://www.npmjs.com/package/react-router), [waku](https://www.npmjs.com/package/waku), [@parcel/rsc](https://www.npmjs.com/package/@parcel/rsc), [@vitejs/plugin-rsc](https://www.npmjs.com/package/@vitejs/plugin-rsc), and [rwsdk](https://www.npmjs.com/package/rwsdk).
8080

8181
Please see [the instructions in the previous post](/blog/2025/12/03/critical-security-vulnerability-in-react-server-components#update-instructions) for upgrade steps.
8282

‎src/content/community/conferences.md‎

Lines changed: 54 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -10,26 +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-
### ZurichJS Conf 2026 {/*zurichjs-conf-2026*/}
14-
September 10-11, 2026. In-person in Zurich, Switzerland
15-
16-
[Website](https://conf.zurichjs.com?utm_campaign=ZurichJS_Conf&utm_source=referral&utm_content=reactjs_community_conferences) - [Twitter](https://x.com/zurichjs) - [LinkedIn](https://www.linkedin.com/company/zurichjs/)
17-
18-
### React Alicante 2026 {/*react-alicante-2026*/}
19-
Sep 24 - 26, 2026. In-person in Alicante
20-
21-
[Website](https://reactalicante.es//) - [Twitter](https://x.com/ReactAlicante)
22-
23-
### CityJS Athens 2026 {/*cityjs-athens-2026*/}
24-
October 21-23, 2026. In-person in Athens
25-
26-
[Website](https://athens.cityjsconf.org/) - [Twitter](https://x.com/cityjsconf) - [Bluesky](https://bsky.app/profile/cityjsconf.bsky.social)
27-
28-
### React Advanced London 2026 {/*react-advanced-london-2026*/}
29-
October 23 & 26, 2026. In-person in London, UK + online (hybrid event)
30-
31-
[Website](https://reactadvanced.com/) - [Twitter](https://x.com/reactadvanced) - [LinkedIn](https://www.linkedin.com/showcase/react-advanced-london/)
32-
3313
### React Summit US 2026 {/*react-summit-us-2026*/}
3414
November 17 & 20, 2026. In-person in New York, USA + online (hybrid event)
3515

@@ -45,6 +25,11 @@ April 15 & 19, 2027. In-person in Singapore + online (hybrid event)
4525

4626
[Website](https://reactsummit.asia/) - [Twitter](https://x.com/reactsummit) - [LinkedIn](https://www.linkedin.com/showcase/reactsummit)
4727

28+
### React Conf Japan 2027 {/*react-conf-japan-2027*/}
29+
April 24, 2027. In-person in Tokyo, Japan
30+
31+
[Website](https://reactconf.jp/) - [Twitter](https://x.com/reactconfjp)
32+
4833
### React Summit 2027 {/*react-summit-2027*/}
4934
May 21 & 25, 2027. In-person in Amsterdam, Netherlands + online (hybrid event)
5035

@@ -53,16 +38,60 @@ May 21 & 25, 2027. In-person in Amsterdam, Netherlands + online (hybrid event)
5338

5439
## Past Conferences {/*past-conferences*/}
5540

41+
### React India 2026 {/*react-india-2026*/}
42+
October 29-31, 2026. In-person in Goa, India
5643

57-
### React Conf Japan 2027 {/*react-conf-japan-2027*/}
58-
April 24, 2027. In-person in Tokyo, Japan
44+
[Website](https://www.reactindia.io/) - [Twitter](https://x.com/react_india)
5945

60-
[Website](https://reactconf.jp/) - [Twitter](https://x.com/reactconfjp)
46+
### React Advanced London 2026 {/*react-advanced-london-2026*/}
47+
October 23 & 26, 2026. In-person in London, UK + online (hybrid event)
48+
49+
[Website](https://reactadvanced.com/) - [Twitter](https://x.com/reactadvanced) - [LinkedIn](https://www.linkedin.com/showcase/react-advanced-london/)
50+
51+
### CityJS Athens 2026 {/*cityjs-athens-2026*/}
52+
October 21-23, 2026. In-person in Athens
53+
54+
[Website](https://athens.cityjsconf.org/) - [Twitter](https://x.com/cityjsconf) - [Bluesky](https://bsky.app/profile/cityjsconf.bsky.social)
55+
56+
### React Alicante 2026 {/*react-alicante-2026*/}
57+
Sep 24 - 26, 2026. In-person in Alicante
58+
59+
[Website](https://reactalicante.es//) - [Twitter](https://x.com/ReactAlicante)
60+
61+
### React Native Connection 2026 {/*react-native-connection-2026*/}
62+
September 24, 2026. In-person in Paris, France
63+
64+
[Website](https://reactnativeconnection.io/) - [Twitter](https://x.com/ReactNativeConn) - [Bluesky](https://bsky.app/profile/reactnativeconnect.bsky.social)
65+
66+
### ZurichJS Conf 2026 {/*zurichjs-conf-2026*/}
67+
September 10-11, 2026. In-person in Zurich, Switzerland
68+
69+
[Website](https://conf.zurichjs.com?utm_campaign=ZurichJS_Conf&utm_source=referral&utm_content=reactjs_community_conferences) - [Twitter](https://x.com/zurichjs) - [LinkedIn](https://www.linkedin.com/company/zurichjs/)
70+
71+
### Render(ATL) 2026 🍑 {/*renderatl-2026-*/}
72+
August 12-13, 2026. In-person in Atlanta, GA, USA
73+
74+
[Website](https://renderatl.com/) - [Twitter](https://x.com/renderATL) - [LinkedIn](https://www.linkedin.com/company/renderatl)
75+
76+
### React Summit 2026 {/*react-summit-2026*/}
77+
June 12 & 16, 2026. In-person in Amsterdam, Netherlands + online (hybrid event)
78+
79+
[Website](https://reactsummit.com/) - [Twitter](https://x.com/reactsummit) - [LinkedIn](https://www.linkedin.com/showcase/reactsummit)
80+
81+
### React Norway 2026 {/*react-norway-2026*/}
82+
June 5, 2026. In-person in Oslo, Norway
83+
84+
[Website](https://reactnorway.com/) - [Twitter](https://x.com/ReactNorway)
85+
86+
### React Miami 2026 {/*react-miami-2026*/}
87+
April 23-24, 2026. In-person in Miami, FL, USA
88+
89+
[Website](https://reactmiami.com/) - [Twitter](https://x.com/ReactMiamiConf)
6190

6291
### CityJS London 2026 {/*cityjs-london-2026*/}
6392
April 14-17, 2026. In-person in London
6493

65-
[Website](https://india.cityjsconf.org/) - [Twitter](https://x.com/cityjsconf) - [Bluesky](https://bsky.app/profile/cityjsconf.bsky.social)
94+
[Website](https://london.cityjsconf.org/) - [Twitter](https://x.com/cityjsconf) - [Bluesky](https://bsky.app/profile/cityjsconf.bsky.social)
6695

6796

6897
### React Paris 2026 {/*react-paris-2026*/}
@@ -79,7 +108,7 @@ February 12-13, 2026. In-person in New Delhi, India
79108
### CityJS Singapore 2026 {/*cityjs-singapore-2026*/}
80109
February 4-6, 2026. In-person in Singapore
81110

82-
[Website](https://india.cityjsconf.org/) - [Twitter](https://x.com/cityjsconf) - [Bluesky](https://bsky.app/profile/cityjsconf.bsky.social)
111+
[Website](https://singapore.cityjsconf.org/) - [Twitter](https://x.com/cityjsconf) - [Bluesky](https://bsky.app/profile/cityjsconf.bsky.social)
83112

84113
### React Advanced London 2025 {/*react-advanced-london-2025*/}
85114
November 28 & December 1, 2025. In-person in London, UK + online (hybrid event)

‎src/content/learn/describing-the-ui.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,7 @@ React koristi stabla da modeluje odnose između komponenata i modula.
531531

532532
React stablo renderovanja je reprezentacija odnosa roditelj-dete između komponenata.
533533

534-
<Diagram name="generic_render_tree" height={250} width={500} alt="A tree graph with five nodes, with each node representing a component. The root node is located at the top the tree graph and is labelled 'Root Component'. It has two arrows extending down to two nodes labelled 'Component A' and 'Component C'. Each of the arrows is labelled with 'renders'. 'Component A' has a single 'renders' arrow to a node labelled 'Component B'. 'Component C' has a single 'renders' arrow to a node labelled 'Component D'.">
534+
<Diagram name="generic_render_tree" height={250} width={500} alt="A tree graph with five nodes, with each node representing a component. The root node is located at the top of the tree graph and is labelled 'Root Component'. It has two arrows extending down to two nodes labelled 'Component A' and 'Component C'. Each of the arrows is labelled with 'renders'. 'Component A' has a single 'renders' arrow to a node labelled 'Component B'. 'Component C' has a single 'renders' arrow to a node labelled 'Component D'.">
535535

536536
Primer stabla renderovanja.
537537

‎src/content/learn/extracting-state-logic-into-a-reducer.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -874,7 +874,11 @@ Reducer-i imaju i mane! Evo par načina da ih poredite:
874874
- **Testiranje:** Reducer je čista funkcija koja ne zavisi od vaše komponente. To znači da je možete export-ovati i testirati izolovano. Iako je obično najbolje testirati komponente u realističnijem okruženju, za kompleksniju logiku ažuriranja state-a može biti korisno da se uverite da vaš reducer vraća određeni state za određeni inicijalni state i akciju.
875875
- **Lična preferenca:** Neki ljudi vole reducer-e, ostali ne vole. To je u redu. Stvar je preferenci. Uvek možete menjati između `useState` i `useReducer`: jednaki su!
876876

877+
<<<<<<< HEAD
877878
Preporučujemo da koristite reducer ako često nailazite na bug-ove zbog neispravnog ažuriranja state-a u nekoj komponenti i želite da uvedete veću strukturu u njen kod. Ne morate koristiti reducer-e za sve: slobodno kombinujte! Možete čak koristiti `useState` i `useReducer` u istoj komponenti.
879+
=======
880+
We recommend using a reducer if you often encounter bugs due to incorrect state updates in some component, and want to introduce more structure to its code. You don't have to use reducers for everything: feel free to mix and match! You can even use `useState` and `useReducer` in the same component.
881+
>>>>>>> f5fa1e82edacdf8c6bfc4dfd9cf52029a96d5fd3
878882
879883
## Pravilno pisanje reducer-a {/*writing-reducers-well*/}
880884

‎src/content/learn/index.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,11 @@ function MyButton() {
336336
}
337337
```
338338
339+
<<<<<<< HEAD
339340
React će ponovo pozvati funkciju vaše komponente. Ovaj put, `count` će biti `1`. Zatim će biti `2`. I tako dalje.
341+
=======
342+
Calling `setCount` tells React to call your component function again. This is called a *re-render*. This time, `count` will be `1`. Then it will be `2`. And so on.
343+
>>>>>>> f5fa1e82edacdf8c6bfc4dfd9cf52029a96d5fd3
340344
341345
Ako renderujete istu komponentu više puta, svaka će dobiti svoje sopstveni state. Kliknite svako dugme posebno:
342346

0 commit comments

Comments
 (0)