From 6788f6bade9bd11c3c7f0cdad620501e2063c4e5 Mon Sep 17 00:00:00 2001 From: Alberto Velandia Date: Mon, 24 Mar 2025 15:47:47 -0700 Subject: [PATCH 1/3] Fixes typo (#7688) --- src/content/reference/react-dom/hooks/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/content/reference/react-dom/hooks/index.md b/src/content/reference/react-dom/hooks/index.md index 73eefae751..5dfb07d824 100644 --- a/src/content/reference/react-dom/hooks/index.md +++ b/src/content/reference/react-dom/hooks/index.md @@ -14,7 +14,7 @@ The `react-dom` package contains Hooks that are only supported for web applicati *Forms* let you create interactive controls for submitting information. To manage forms in your components, use one of these Hooks: -* [`useFormStatus`](/reference/react-dom/hooks/useFormStatus) allows you to make updates to the UI based on the status of the a form. +* [`useFormStatus`](/reference/react-dom/hooks/useFormStatus) allows you to make updates to the UI based on the status of a form. ```js function Form({ action }) { From 2859efa07357dfc2927517ce9765515acf903c7c Mon Sep 17 00:00:00 2001 From: Petr Chalupa Date: Tue, 25 Mar 2025 22:28:39 +0100 Subject: [PATCH 2/3] Add React Prague community (#7279) * Add React Prague community * Update link --- src/content/community/meetups.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/content/community/meetups.md b/src/content/community/meetups.md index 906c170ded..b3290a0040 100644 --- a/src/content/community/meetups.md +++ b/src/content/community/meetups.md @@ -47,6 +47,9 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet ## Colombia {/*colombia*/} * [Medellin](https://www.meetup.com/React-Medellin/) +## Czechia {/*czechia*/} +* [Prague](https://guild.host/react-prague/) + ## Denmark {/*denmark*/} * [Aalborg](https://www.meetup.com/Aalborg-React-React-Native-Meetup/) * [Aarhus](https://www.meetup.com/Aarhus-ReactJS-Meetup/) From 90031f11488a8878aa86a4dd5565cbaf89532672 Mon Sep 17 00:00:00 2001 From: Xavi Lee Date: Thu, 27 Mar 2025 14:51:08 +0800 Subject: [PATCH 3/3] fix conflict --- src/content/reference/react-dom/hooks/index.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/content/reference/react-dom/hooks/index.md b/src/content/reference/react-dom/hooks/index.md index dd3ce298f4..a1736b71c5 100644 --- a/src/content/reference/react-dom/hooks/index.md +++ b/src/content/reference/react-dom/hooks/index.md @@ -14,11 +14,7 @@ title: "Built-in React DOM Hooks" **Form** 允许创建用于提交信息的交互式控件。要在组件中管理表单，请使用以下其中一个 Hook： -<<<<<<< HEAD * [`useFormStatus`](/reference/react-dom/hooks/useFormStatus) 允许根据表单的状态更新用户界面。 -======= -* [`useFormStatus`](/reference/react-dom/hooks/useFormStatus) allows you to make updates to the UI based on the status of a form. ->>>>>>> 2859efa07357dfc2927517ce9765515acf903c7c ```js function Form({ action }) {