Skip to content

Commit 85a7950

Browse files
authored
Merge pull request #85 from reactjs/sync-a5aad0d5
Sync with react.dev @ a5aad0d
2 parents 4fb187c + c0d12e4 commit 85a7950

File tree

5 files changed

+62
-8
lines changed

5 files changed

+62
-8
lines changed

.github/workflows/discord_notify.yml

+10-3
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,18 @@ name: Discord Notify
22

33
on:
44
pull_request_target:
5-
types: [ labeled ]
5+
types: [labeled]
66

77
jobs:
8+
check_maintainer:
9+
uses: facebook/react/.github/workflows/shared_check_maintainer.yml@main
10+
with:
11+
actor: ${{ github.event.pull_request.user.login }}
12+
is_remote: true
13+
814
notify:
9-
if: ${{ github.event.label.name == 'React Core Team' }}
15+
if: ${{ needs.check_maintainer.outputs.is_core_team == 'true' }}
16+
needs: check_maintainer
1017
runs-on: ubuntu-latest
1118
steps:
1219
- name: Discord Webhook Action
@@ -18,4 +25,4 @@ jobs:
1825
embed-author-icon-url: ${{ github.event.pull_request.user.avatar_url }}
1926
embed-title: '#${{ github.event.number }} (+${{github.event.pull_request.additions}} -${{github.event.pull_request.deletions}}): ${{ github.event.pull_request.title }}'
2027
embed-description: ${{ github.event.pull_request.body }}
21-
embed-url: ${{ github.event.pull_request.html_url }}
28+
embed-url: ${{ github.event.pull_request.html_url }}
+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: Label Core Team PRs
2+
3+
on:
4+
pull_request_target:
5+
6+
env:
7+
TZ: /usr/share/zoneinfo/America/Los_Angeles
8+
# https://github.com/actions/cache/blob/main/tips-and-workarounds.md#cache-segment-restore-timeout
9+
SEGMENT_DOWNLOAD_TIMEOUT_MINS: 1
10+
11+
jobs:
12+
check_maintainer:
13+
uses: facebook/react/.github/workflows/shared_check_maintainer.yml@main
14+
with:
15+
actor: ${{ github.event.pull_request.user.login }}
16+
is_remote: true
17+
18+
label:
19+
if: ${{ needs.check_maintainer.outputs.is_core_team == 'true' }}
20+
runs-on: ubuntu-latest
21+
needs: check_maintainer
22+
steps:
23+
- name: Label PR as React Core Team
24+
uses: actions/github-script@v7
25+
with:
26+
script: |
27+
github.rest.issues.addLabels({
28+
owner: context.repo.owner,
29+
repo: context.repo.repo,
30+
issue_number: ${{ github.event.number }},
31+
labels: ['React Core Team']
32+
});

src/content/community/conferences.md

+16-1
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,30 @@ Do you know of a local React.js conference? Add it here! (Please keep the list c
1111
## Upcoming Conferences {/*upcoming-conferences*/}
1212

1313
### React Paris 2025 {/*react-paris-2025*/}
14-
March 20 - 21, 2024. In-person in Paris, France (hybrid event)
14+
March 20 - 21, 2025. In-person in Paris, France (hybrid event)
1515

1616
[Website](https://react.paris/) - [Twitter](https://x.com/BeJS_)
1717

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+
23+
### CityJS London 2025 {/*cityjs-london*/}
24+
April 23 - 25, 2025. In-person in London, UK
25+
26+
[Website](https://london.cityjsconf.org/) - [Twitter](https://x.com/cityjsconf) - [Bluesky](https://bsky.app/profile/cityjsconf.bsky.social)
27+
1828
### App.js Conf 2025 {/*appjs-conf-2025*/}
1929
May 28 - 30, 2025. In-person in Kraków, Poland + remote
2030

2131
[Website](https://appjs.co) - [Twitter](https://twitter.com/appjsconf)
2232

33+
### CityJS Athens 2025 {/*cityjs-athens*/}
34+
May 27 - 31, 2025. In-person in Athens, Greece
35+
36+
[Website](https://athens.cityjsconf.org/) - [Twitter](https://x.com/cityjsconf) - [Bluesky](https://bsky.app/profile/cityjsconf.bsky.social)
37+
2338
### React Summit 2025 {/*react-summit-2025*/}
2439
June 13 - 17, 2025. In-person in Amsterdam, Netherlands + remote (hybrid event)
2540

src/content/reference/react/useActionState.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ If used with a Server Function, `useActionState` allows the server's response fr
6868
`useActionState` returns an array with the following values:
6969
7070
1. The current state. During the first render, it will match the `initialState` you have passed. After the action is invoked, it will match the value returned by the action.
71-
2. A new action that you can pass as the `action` prop to your `form` component or `formAction` prop to any `button` component within the form.
71+
2. A new action that you can pass as the `action` prop to your `form` component or `formAction` prop to any `button` component within the form. The action can also be called manually within [`startTransition`](/reference/react/startTransition).
7272
3. The `isPending` flag that tells you whether there is a pending Transition.
7373
7474
#### Caveats {/*caveats*/}
@@ -102,8 +102,8 @@ function MyComponent() {
102102
`useActionState` returns an array with the following items:
103103
104104
1. The <CodeStep step={1}>current state</CodeStep> of the form, which is initially set to the <CodeStep step={4}>initial state</CodeStep> you provided, and after the form is submitted is set to the return value of the <CodeStep step={3}>action</CodeStep> you provided.
105-
2. A <CodeStep step={2}>new action</CodeStep> that you pass to `<form>` as its `action` prop.
106-
3. A <CodeStep step={1}>pending state</CodeStep> that you can utilise whilst your action is processing.
105+
2. A <CodeStep step={2}>new action</CodeStep> that you pass to `<form>` as its `action` prop or call manually within `startTransition`.
106+
3. A <CodeStep step={1}>pending state</CodeStep> that you can utilise while your action is processing.
107107
108108
When the form is submitted, the <CodeStep step={3}>action</CodeStep> function that you provided will be called. Its return value will become the new <CodeStep step={1}>current state</CodeStep> of the form.
109109

src/content/reference/react/useImperativeHandle.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ function MyInput({ ref }) {
4646
4747
<Note>
4848
49-
Starting with React 19, [`ref` is available a prop.](/blog/2024/12/05/react-19#ref-as-a-prop) In React 18 and earlier, it was necessary to get the `ref` from [`forwardRef`.](/reference/react/forwardRef)
49+
Starting with React 19, [`ref` is available as a prop.](/blog/2024/12/05/react-19#ref-as-a-prop) In React 18 and earlier, it was necessary to get the `ref` from [`forwardRef`.](/reference/react/forwardRef)
5050
5151
</Note>
5252

0 commit comments

Comments
 (0)