diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index de2bfc362..ab8a7d4fe 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -3,5 +3,5 @@ contact_links:
url: https://github.com/react/react/issues/new/choose
about: This issue tracker is not for bugs in React. Please file React issues here.
- name: ð€ Questions and Help
- url: https://reactjs.org/community/support.html
+ url: https://react.dev/community
about: This issue tracker is not for support questions. Please refer to the React community's help and discussion forums.
diff --git a/.github/workflows/analyze.yml b/.github/workflows/analyze.yml
index 83e7f2e8a..1620c50f6 100644
--- a/.github/workflows/analyze.yml
+++ b/.github/workflows/analyze.yml
@@ -18,7 +18,7 @@ jobs:
- name: Set up node
uses: actions/setup-node@v4
with:
- node-version: '20.x'
+ node-version: '24.x'
cache: yarn
cache-dependency-path: yarn.lock
@@ -26,7 +26,7 @@ jobs:
uses: actions/cache@v4
with:
path: '**/node_modules'
- key: node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
+ key: node_modules-24-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
- name: Install deps
run: yarn install --frozen-lockfile
diff --git a/.github/workflows/site_lint.yml b/.github/workflows/site_lint.yml
index 26d7ed583..02812d6fd 100644
--- a/.github/workflows/site_lint.yml
+++ b/.github/workflows/site_lint.yml
@@ -13,14 +13,14 @@ jobs:
lint:
runs-on: ubuntu-latest
- name: Lint on node 20.x and ubuntu-latest
+ name: Lint on node 24.x and ubuntu-latest
steps:
- uses: actions/checkout@v4
- - name: Use Node.js 20.x
+ - name: Use Node.js 24.x
uses: actions/setup-node@v4
with:
- node-version: 20.x
+ node-version: 24.x
cache: yarn
cache-dependency-path: yarn.lock
@@ -28,7 +28,7 @@ jobs:
uses: actions/cache@v4
with:
path: '**/node_modules'
- key: node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
+ key: node_modules-24-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
- name: Install deps
run: yarn install --frozen-lockfile
diff --git a/CLAUDE.md b/CLAUDE.md
index 3a081e6d5..3943097cc 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -4,7 +4,7 @@ This file provides guidance to Claude Code when working with this repository.
## Project Overview
-This is the React documentation website (react.dev), built with Next.js 15.1.11 and React 19. Documentation is written in MDX format.
+This is the React documentation website (react.dev), built with Next.js 15.1.12 and React 19. Documentation is written in MDX format.
## Development Commands
@@ -47,6 +47,6 @@ When editing files in `src/content/`, the appropriate skill will be auto-suggest
For MDX components (DeepDive, Pitfall, Note, etc.), invoke `/docs-components`.
For Sandpack code examples, invoke `/docs-sandpack`.
-See `.claude/docs/react-docs-patterns.md` for comprehensive style guidelines.
+See `.claude/skills/` for comprehensive style guidelines.
Prettier is used for formatting (config in `.prettierrc`).
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 4c7e5ec74..551bd4ba2 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -38,41 +38,9 @@ Ignore this if you're specifically describing `createElement`.
Ignore this if you're specifically writing about ES5.
-#### Don't use ES6 features when equivalent ES5 features have no downsides.
+#### Prefer readable syntax.
-Remember that ES6 is still new to a lot of people. While we use it in many places (`const` / `let`, classes, arrow functions), if the equivalent ES5 code is just as straightforward and readable, consider using it.
-
-In particular, you should prefer named `function` declarations over `const myFunction = () => ...` arrows for top-level functions. However, you *should* use arrow functions where they provide a tangible improvement (such as preserving `this` context inside a component). Consider both sides of the tradeoff when deciding whether to use a new feature.
-
-#### Don't use features that aren't standardized yet.
-
-For example, **don't** write this:
-
-```js
-class MyComponent extends React.Component {
- state = {value: ''};
- handleChange = (e) => {
- this.setState({value: e.target.value});
- };
-}
-```
-
-Instead, **do** write this:
-
-```js
-class MyComponent extends React.Component {
- constructor(props) {
- super(props);
- this.handleChange = this.handleChange.bind(this);
- this.state = {value: ''};
- }
- handleChange(e) {
- this.setState({value: e.target.value});
- }
-}
-```
-
-Ignore this rule if you're specifically describing an experimental proposal. Make sure to mention its experimental nature in the code and in the surrounding text.
+Choose syntax that makes each example easier to follow. Prefer named `function` declarations over `const myFunction = () => ...` arrows for top-level functions. Use arrow functions when they make callbacks easier to read. In class components, arrow functions can also preserve the component's `this` value.
### Style
diff --git a/README.md b/README.md
index fc38243c4..5e1edb490 100644
--- a/README.md
+++ b/README.md
@@ -9,14 +9,15 @@ This repo contains the source code and documentation powering [react.dev](https:
### Prerequisites
1. Git
-1. Node: any version starting with v16.8.0 or greater
-1. Yarn: See [Yarn website for installation instructions](https://yarnpkg.com/lang/en/docs/install/)
+1. Node: v24 or greater
+1. Yarn Classic: See [Yarn website for installation instructions](https://classic.yarnpkg.com/en/docs/install/)
1. A fork of the repo (for any contributions)
1. A clone of the [react.dev repo](https://github.com/reactjs/react.dev) on your local machine
### Installation
1. `cd react.dev` to go into the project root
+2. `git remote add my-fork-name https://github.com/YOUR_USERNAME/react.dev.git` to add your fork as a remote. Replace `YOUR_USERNAME` with your GitHub username. You only need to do this once.
3. `yarn` to install the website's npm dependencies
### Running locally
@@ -41,8 +42,8 @@ The documentation is divided into several sections with a different tone and pur
1. Follow the ["Running locally"](#running-locally) instructions
1. Save the files and check in the browser
1. Changes to React components in `src` will hot-reload
- 1. Changes to markdown files in `content` will hot-reload
- 1. If working with plugins, you may need to remove the `.cache` directory and restart the server
+ 1. Changes to markdown files in `src/content` will hot-reload
+ 1. If working with plugins, you may need to remove the `node_modules/.cache/react-docs-mdx` directory and restart the server
### Test the change
@@ -59,7 +60,7 @@ The documentation is divided into several sections with a different tone and pur
## Translation
-If you are interested in translating `react.dev`, please see the current translation efforts [here](https://github.com/reactjs/react.dev/issues/4135).
+If you are interested in translating `react.dev`, please see the current translation efforts [here](https://react.dev/community/translations).
## License
Content submitted to [react.dev](https://react.dev/) is CC-BY-4.0 licensed, as found in the [LICENSE-DOCS.md](https://github.com/reactjs/react.dev/blob/main/LICENSE-DOCS.md) file.
\ No newline at end of file
diff --git a/package.json b/package.json
index 39d2119ff..e8bfaebb6 100644
--- a/package.json
+++ b/package.json
@@ -113,7 +113,7 @@
"webpack-bundle-analyzer": "^4.5.0"
},
"engines": {
- "node": ">=16.8.0"
+ "node": ">=24"
},
"nextBundleAnalysis": {
"budget": null,
diff --git a/src/components/MDX/TeamMember.tsx b/src/components/MDX/TeamMember.tsx
index 2716fa2d1..3be1fa7a7 100644
--- a/src/components/MDX/TeamMember.tsx
+++ b/src/components/MDX/TeamMember.tsx
@@ -68,7 +68,7 @@ function GroupBadges({group}: {group: string}) {
);
}
-// TODO: good alt text for images/links
+// TODO: good alt text for images
export function TeamMember({
name,
title,
@@ -113,7 +113,7 @@ export function TeamMember({
aria-label={`${name} on Twitter`}
href={`https://twitter.com/${twitter}`}
className="hover:text-primary hover:underline dark:text-primary-dark flex flex-row items-center">
-
+
{twitter}
@@ -124,7 +124,7 @@ export function TeamMember({
aria-label={`${name} on Threads`}
href={`https://threads.net/${threads}`}
className="hover:text-primary hover:underline dark:text-primary-dark flex flex-row items-center">
-
+
{threads}
@@ -135,7 +135,7 @@ export function TeamMember({
aria-label={`${name} on Bluesky`}
href={`https://bsky.app/profile/${bsky}`}
className="hover:text-primary hover:underline dark:text-primary-dark flex flex-row items-center">
-
+
{bsky}
@@ -143,19 +143,19 @@ export function TeamMember({
{github && (
- {github}
+ {github}
)}
{personal && (
- {personal}
+ {personal}
)}
diff --git a/src/content/blog/2023/03/16/introducing-react-dev.md b/src/content/blog/2023/03/16/introducing-react-dev.md
index 37ada4468..f4cd713fa 100644
--- a/src/content/blog/2023/03/16/introducing-react-dev.md
+++ b/src/content/blog/2023/03/16/introducing-react-dev.md
@@ -41,8 +41,13 @@ March 16, 2023 by [Dan Abramov](https://bsky.app/profile/danabra.mov) and [Rache
**æ°ããããã¥ã¡ã³ãã§ã¯ãæåããããã¯ãçšã㊠React ãåŠã³ãŸã**ãããã¥ã¡ã³ãã¯äž»ã« 2 ã€ã®ã»ã¯ã·ã§ã³ã«åãããŠããŸãã
+<<<<<<< HEAD
* **[React ãåŠã¶](/learn)** ã¯ããŒããã React ãåŠã¶èªå·±åŠç¿åã®ã³ãŒã¹ã§ãã
* **[API ãªãã¡ã¬ã³ã¹](/reference)** ã§ã¯ããã¹ãŠã® React API ã®è©³çްãšäœ¿ãæ¹ã®ãµã³ãã«ãæäŸãããŠããŸãã
+=======
+* **[Learn React](/learn)** is a self-paced course that teaches React from scratch.
+* **[API Reference](/reference/react)** provides the details and usage examples for every React API.
+>>>>>>> 46a54e0592729712b7640308b53268e84fdc7c9f
ããããã®ã»ã¯ã·ã§ã³ã§èŠãããšãã§ããå
容ã詳ããèŠãŠãããŸãããã
@@ -459,11 +464,19 @@ export default function PackingList() {
[API ãªãã¡ã¬ã³ã¹](/reference/react) ã§ã¯ããã¹ãŠã® React API ã«å°çšã®ããŒãžãçšæãããŠããŸããããã«ã¯ããããçš®é¡ã® API ãå«ãŸããŸãïŒ
+<<<<<<< HEAD
- çµã¿èŸŒã¿ããã¯ã§ãã [`useState`](/reference/react/useState) ãªã©ã
- çµã¿èŸŒã¿ã³ã³ããŒãã³ãã§ãã [``](/reference/react/Suspense) ãªã©ã
- çµã¿èŸŒã¿ãã©ãŠã¶ã³ã³ããŒãã³ãã§ãã [` `](/reference/react-dom/components/input) ãªã©ã
- ãã¬ãŒã ã¯ãŒã¯åãã® API ã§ãã [`renderToPipeableStream`](/reference/react-dom/server/renderToReadableStream) ãªã©ã
- ãã®ä»ã® React API ã§ãã [`memo`](/reference/react/memo) ãªã©ã
+=======
+- Built-in Hooks like [`useState`](/reference/react/useState).
+- Built-in components like [``](/reference/react/Suspense).
+- Built-in browser components like [` `](/reference/react-dom/components/input).
+- Framework-oriented APIs like [`renderToPipeableStream`](/reference/react-dom/server/renderToPipeableStream).
+- Other React APIs like [`memo`](/reference/react/memo).
+>>>>>>> 46a54e0592729712b7640308b53268e84fdc7c9f
å API ããŒãžã¯å°ãªããšã*ãªãã¡ã¬ã³ã¹*ãš*äœ¿çšæ³*ã® 2 ã€ã®ã»ã°ã¡ã³ãã«åãããŠããããšã«æ°ä»ãã§ãããã
@@ -607,7 +620,11 @@ button { display: block; margin-top: 10px; }
+<<<<<<< HEAD
äžéšã® API ããŒãžã«ã¯ãïŒããããåé¡ã«å¯ŸããïŒ[ãã©ãã«ã·ã¥ãŒãã£ã³ã°](/reference/react/useEffect#troubleshooting)ããïŒéæšå¥šã® API ã«å¯ŸããïŒ[ä»£æ¿ææ®µ](/reference/react-dom/findDOMNode#alternatives)ã®ã»ã¯ã·ã§ã³ãå«ãŸããŠããŸãã
+=======
+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).
+>>>>>>> 46a54e0592729712b7640308b53268e84fdc7c9f
ãã®ã¢ãããŒãã«ãããAPI ãªãã¡ã¬ã³ã¹ãåŒæ°ã調ã¹ãææ®µãšããŠã ãã§ãªãããã® API ã䜿çšããŠã©ãã ãè²ã
ãªããšãã§ããã®ããä»ã® API ãšã©ã®ããã«ç¹ãã£ãŠããã®ããç€ºãææ®µãšããŠåœ¹ç«ã€ããšãé¡ã£ãŠããŸãã
diff --git a/src/content/blog/2024/04/25/react-19-upgrade-guide.md b/src/content/blog/2024/04/25/react-19-upgrade-guide.md
index 924af33d6..88790fc55 100644
--- a/src/content/blog/2024/04/25/react-19-upgrade-guide.md
+++ b/src/content/blog/2024/04/25/react-19-upgrade-guide.md
@@ -639,7 +639,11 @@ const ref = useRef(null);
ref.current = 1;
```
+<<<<<<< HEAD
`MutableRef` ã¯å»æ¢ããã`useRef` ã¯åžžã«åäžã® `RefObject` åãè¿ãããã«ãªããŸããã
+=======
+`MutableRefObject` is now deprecated in favor of a single `RefObject` type which `useRef` will always return:
+>>>>>>> 46a54e0592729712b7640308b53268e84fdc7c9f
```ts
interface RefObject {
diff --git a/src/content/blog/2024/12/05/react-19.md b/src/content/blog/2024/12/05/react-19.md
index 4c9538f26..17fa4bba1 100644
--- a/src/content/blog/2024/12/05/react-19.md
+++ b/src/content/blog/2024/12/05/react-19.md
@@ -389,7 +389,11 @@ React Server Components ããã³ãã©ããã¬ãŒã ã¯ãŒã¯ã§ãµããŒã
ãµãŒãã¢ã¯ã·ã§ã³ããµãŒãã³ã³ããŒãã³ãå
ã§äœæã props ãšããŠã¯ã©ã€ã¢ã³ãã³ã³ããŒãã³ãã«æž¡ãããšããã¯ã©ã€ã¢ã³ãã³ã³ããŒãã³ãã§ã€ã³ããŒãããŠäœ¿çšããããšãã§ããŸãã
+<<<<<<< HEAD
詳现ã«ã€ããŠã¯ã[React ãµãŒãã¢ã¯ã·ã§ã³](/reference/rsc/server-actions)ã®ããã¥ã¡ã³ããã芧ãã ããã
+=======
+For more, see the docs for [React Server Actions](/reference/rsc/server-functions).
+>>>>>>> 46a54e0592729712b7640308b53268e84fdc7c9f
## React 19 ã®æ¹åç¹ {/*improvements-in-react-19*/}
diff --git a/src/content/blog/2025/04/23/react-labs-view-transitions-activity-and-more.md b/src/content/blog/2025/04/23/react-labs-view-transitions-activity-and-more.md
index 116a28943..ce80dedf3 100644
--- a/src/content/blog/2025/04/23/react-labs-view-transitions-activity-and-more.md
+++ b/src/content/blog/2025/04/23/react-labs-view-transitions-activity-and-more.md
@@ -14266,7 +14266,11 @@ Activity ã®å¥ã®ã¢ãŒããšããŠæã
ãèæ
®ããŠããã®ã¯ãã¡ã¢
å€ãã®å Žåã«æ··ä¹±ã®åå ã¯ãå¿
èŠããªããšãã§ã¯ãã䜿ãããŠããããšã«ãããšããããŸããã[ãã®ãšãã§ã¯ãã¯äžèŠãã](/learn/you-might-not-need-an-effect)ã®ã¬ã€ãã¯ããšãã§ã¯ãããœãªã¥ãŒã·ã§ã³ãšããŠé©åã§ã¯ãªããã¿ãŒã³ã®å€ããã«ããŒããŠããŸããããããããåé¡ã«å¯ŸããŠãšãã§ã¯ããé©åã§ãããšããå Žåã§ããããšãã§ã¯ãã¯ã¯ã©ã¹ã³ã³ããŒãã³ãã®ã©ã€ããµã€ã¯ã«ãããçè§£ãã«ããå ŽåããããŸãã
+<<<<<<< HEAD
æ··ä¹±ã®äžå ã¯ãéçºè
ããšãã§ã¯ãããšãã§ã¯ãèªäœã®èŠç¹ïŒãšãã§ã¯ããäœããããïŒã§ã¯ãªããã©ã€ããµã€ã¯ã«ã®ãããª*ã³ã³ããŒãã³ã*ã®èŠç¹ããèããŠããŸã£ãŠããããšã«ãããšèããŠããŸãã
+=======
+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).
+>>>>>>> 46a54e0592729712b7640308b53268e84fdc7c9f
[ããã¥ã¡ã³ãã«ãããã¡ãã®äŸ](/learn/lifecycle-of-reactive-effects#thinking-from-the-effects-perspective)ãèŠãŠã¿ãŸãããã
diff --git a/src/content/blog/2025/12/11/denial-of-service-and-source-code-exposure-in-react-server-components.md b/src/content/blog/2025/12/11/denial-of-service-and-source-code-exposure-in-react-server-components.md
index aeed7cae9..74b50f3ff 100644
--- a/src/content/blog/2025/12/11/denial-of-service-and-source-code-exposure-in-react-server-components.md
+++ b/src/content/blog/2025/12/11/denial-of-service-and-source-code-exposure-in-react-server-components.md
@@ -76,7 +76,11 @@ _Updated January 26, 2026._
### 圱é¿ãåãããã¬ãŒã ã¯ãŒã¯ãšãã³ãã© {/*affected-frameworks-and-bundlers*/}
+<<<<<<< HEAD
äžéšã® React ãã¬ãŒã ã¯ãŒã¯ããã³ãã©ããè匱æ§ã®ãã React ããã±ãŒãžã«äŸåããŠããããpeer dependency ãšããŠäŸåããŠãããããããã¯ããããå«ãã§ããŸããã圱é¿ãåãã React ãã¬ãŒã ã¯ãŒã¯ããã³ãã©ã¯ä»¥äžã®éãã§ãïŒ[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)ã[rwsdk](https://www.npmjs.com/package/rwsdk)
+=======
+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).
+>>>>>>> 46a54e0592729712b7640308b53268e84fdc7c9f
ã¢ããã°ã¬ãŒãæ¹æ³ã«ã€ããŠã[ååã®èšäºã®æé ](/blog/2025/12/03/critical-security-vulnerability-in-react-server-components#update-instructions)ãåç
§ããŠãã ããã
diff --git a/src/content/community/conferences.md b/src/content/community/conferences.md
index e5a82ba4c..f65375d28 100644
--- a/src/content/community/conferences.md
+++ b/src/content/community/conferences.md
@@ -10,26 +10,6 @@ title: React ã«ã³ãã¡ã¬ã³ã¹
## Upcoming Conferences {/*upcoming-conferences*/}
-### ZurichJS Conf 2026 {/*zurichjs-conf-2026*/}
-September 10-11, 2026. In-person in Zurich, Switzerland
-
-[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/)
-
-### React Alicante 2026 {/*react-alicante-2026*/}
-Sep 24 - 26, 2026. In-person in Alicante
-
-[Website](https://reactalicante.es//) - [Twitter](https://x.com/ReactAlicante)
-
-### CityJS Athens 2026 {/*cityjs-athens-2026*/}
-October 21-23, 2026. In-person in Athens
-
-[Website](https://athens.cityjsconf.org/) - [Twitter](https://x.com/cityjsconf) - [Bluesky](https://bsky.app/profile/cityjsconf.bsky.social)
-
-### React Advanced London 2026 {/*react-advanced-london-2026*/}
-October 23 & 26, 2026. In-person in London, UK + online (hybrid event)
-
-[Website](https://reactadvanced.com/) - [Twitter](https://x.com/reactadvanced) - [LinkedIn](https://www.linkedin.com/showcase/react-advanced-london/)
-
### React Summit US 2026 {/*react-summit-us-2026*/}
November 17 & 20, 2026. In-person in New York, USA + online (hybrid event)
@@ -45,6 +25,11 @@ April 15 & 19, 2027. In-person in Singapore + online (hybrid event)
[Website](https://reactsummit.asia/) - [Twitter](https://x.com/reactsummit) - [LinkedIn](https://www.linkedin.com/showcase/reactsummit)
+### React Conf Japan 2027 {/*react-conf-japan-2027*/}
+April 24, 2027. In-person in Tokyo, Japan
+
+[Website](https://reactconf.jp/) - [Twitter](https://x.com/reactconfjp)
+
### React Summit 2027 {/*react-summit-2027*/}
May 21 & 25, 2027. In-person in Amsterdam, Netherlands + online (hybrid event)
@@ -53,16 +38,60 @@ May 21 & 25, 2027. In-person in Amsterdam, Netherlands + online (hybrid event)
## Past Conferences {/*past-conferences*/}
+### React India 2026 {/*react-india-2026*/}
+October 29-31, 2026. In-person in Goa, India
-### React Conf Japan 2027 {/*react-conf-japan-2027*/}
-April 24, 2027. In-person in Tokyo, Japan
+[Website](https://www.reactindia.io/) - [Twitter](https://x.com/react_india)
-[Website](https://reactconf.jp/) - [Twitter](https://x.com/reactconfjp)
+### React Advanced London 2026 {/*react-advanced-london-2026*/}
+October 23 & 26, 2026. In-person in London, UK + online (hybrid event)
+
+[Website](https://reactadvanced.com/) - [Twitter](https://x.com/reactadvanced) - [LinkedIn](https://www.linkedin.com/showcase/react-advanced-london/)
+
+### CityJS Athens 2026 {/*cityjs-athens-2026*/}
+October 21-23, 2026. In-person in Athens
+
+[Website](https://athens.cityjsconf.org/) - [Twitter](https://x.com/cityjsconf) - [Bluesky](https://bsky.app/profile/cityjsconf.bsky.social)
+
+### React Alicante 2026 {/*react-alicante-2026*/}
+Sep 24 - 26, 2026. In-person in Alicante
+
+[Website](https://reactalicante.es//) - [Twitter](https://x.com/ReactAlicante)
+
+### React Native Connection 2026 {/*react-native-connection-2026*/}
+September 24, 2026. In-person in Paris, France
+
+[Website](https://reactnativeconnection.io/) - [Twitter](https://x.com/ReactNativeConn) - [Bluesky](https://bsky.app/profile/reactnativeconnect.bsky.social)
+
+### ZurichJS Conf 2026 {/*zurichjs-conf-2026*/}
+September 10-11, 2026. In-person in Zurich, Switzerland
+
+[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/)
+
+### Render(ATL) 2026 ð {/*renderatl-2026-*/}
+August 12-13, 2026. In-person in Atlanta, GA, USA
+
+[Website](https://renderatl.com/) - [Twitter](https://x.com/renderATL) - [LinkedIn](https://www.linkedin.com/company/renderatl)
+
+### React Summit 2026 {/*react-summit-2026*/}
+June 12 & 16, 2026. In-person in Amsterdam, Netherlands + online (hybrid event)
+
+[Website](https://reactsummit.com/) - [Twitter](https://x.com/reactsummit) - [LinkedIn](https://www.linkedin.com/showcase/reactsummit)
+
+### React Norway 2026 {/*react-norway-2026*/}
+June 5, 2026. In-person in Oslo, Norway
+
+[Website](https://reactnorway.com/) - [Twitter](https://x.com/ReactNorway)
+
+### React Miami 2026 {/*react-miami-2026*/}
+April 23-24, 2026. In-person in Miami, FL, USA
+
+[Website](https://reactmiami.com/) - [Twitter](https://x.com/ReactMiamiConf)
### CityJS London 2026 {/*cityjs-london-2026*/}
April 14-17, 2026. In-person in London
-[Website](https://india.cityjsconf.org/) - [Twitter](https://x.com/cityjsconf) - [Bluesky](https://bsky.app/profile/cityjsconf.bsky.social)
+[Website](https://london.cityjsconf.org/) - [Twitter](https://x.com/cityjsconf) - [Bluesky](https://bsky.app/profile/cityjsconf.bsky.social)
### React Paris 2026 {/*react-paris-2026*/}
@@ -79,7 +108,7 @@ February 12-13, 2026. In-person in New Delhi, India
### CityJS Singapore 2026 {/*cityjs-singapore-2026*/}
February 4-6, 2026. In-person in Singapore
-[Website](https://india.cityjsconf.org/) - [Twitter](https://x.com/cityjsconf) - [Bluesky](https://bsky.app/profile/cityjsconf.bsky.social)
+[Website](https://singapore.cityjsconf.org/) - [Twitter](https://x.com/cityjsconf) - [Bluesky](https://bsky.app/profile/cityjsconf.bsky.social)
### React Advanced London 2025 {/*react-advanced-london-2025*/}
November 28 & December 1, 2025. In-person in London, UK + online (hybrid event)
diff --git a/src/content/learn/describing-the-ui.md b/src/content/learn/describing-the-ui.md
index c294c65f0..c9079900e 100644
--- a/src/content/learn/describing-the-ui.md
+++ b/src/content/learn/describing-the-ui.md
@@ -530,7 +530,11 @@ React ã¯ã³ã³ããŒãã³ãéãããã¯ã¢ãžã¥ãŒã«éã®é¢ä¿æ§ã
React ã¬ã³ããŒããªãŒãšã¯ã³ã³ããŒãã³ãã®èŠªåé¢ä¿ã衚çŸãããã®ã§ãã
+<<<<<<< HEAD
+=======
+
+>>>>>>> 46a54e0592729712b7640308b53268e84fdc7c9f
React ã®ã¬ã³ããŒããªãŒã®äŸ
diff --git a/src/content/learn/extracting-state-logic-into-a-reducer.md b/src/content/learn/extracting-state-logic-into-a-reducer.md
index ce9413455..42e59947c 100644
--- a/src/content/learn/extracting-state-logic-into-a-reducer.md
+++ b/src/content/learn/extracting-state-logic-into-a-reducer.md
@@ -874,7 +874,11 @@ li {
- **ãã¹ã**ïŒãªãã¥ãŒãµã¯ã³ã³ããŒãã³ãã«äŸåããªãçŽé¢æ°ã§ããããã¯ããªãã¥ãŒãµããšã¯ã¹ããŒãããä»ã®ãã®ãšã¯å¥ã«åäœã§ãã¹ãã§ããããšãæå³ããŸããäžè¬çã«ã¯ãããçŸå®çãªç°å¢ã§ã³ã³ããŒãã³ãããã¹ãããã®ããã¹ãã§ãããè€é㪠state æŽæ°ããžãã¯ãããå Žåã¯ãç¹å®ã®åæ state ãšã¢ã¯ã·ã§ã³ã«å¯ŸããŠãªãã¥ãŒãµãç¹å®ã® state ãè¿ãããšããã¹ãããããšã圹ç«ã¡ãŸãã
- **å人ã®å¥œã¿**ïŒäººã«ãã£ãŠãªãã¥ãŒãµã奜ãã ã£ããã奜ãã§ã¯ãªãã£ããããŸããããã§æ§ããŸããã奜ã¿ã®åé¡ã§ãã`useState` ãš `useReducer` ã®éãè¡ã£ããæ¥ããããããšã¯ãã€ã§ãå¯èœã§ããã©ã¡ããåçã®ãã®ã§ãïŒ
+<<<<<<< HEAD
ãã°ãé »ç¹ã«çºçããŠããã³ã³ããŒãã³ãã®ã³ãŒãã«æ§é ãå°å
¥ãããå Žåã«ããªãã¥ãŒãµãå©çšããããšããå§ãããŸããããããã³ã³ããŒãã³ãã«ãªãã¥ãŒãµã䜿çšããå¿
èŠã¯ãããŸãããèªç±ã«çµã¿åãããŠãã ããïŒ åãã³ã³ããŒãã³ãã§ `useState` ãš `useReducer` ãäž¡æ¹äœ¿ãããšãå¯èœã§ãã
+=======
+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.
+>>>>>>> 46a54e0592729712b7640308b53268e84fdc7c9f
## è¯ããªãã¥ãŒãµã®æžãæ¹ {/*writing-reducers-well*/}
diff --git a/src/content/learn/index.md b/src/content/learn/index.md
index 58dfee8b9..bfc01b741 100644
--- a/src/content/learn/index.md
+++ b/src/content/learn/index.md
@@ -336,7 +336,11 @@ function MyButton() {
}
```
+<<<<<<< HEAD
React ã¯ãå床ã³ã³ããŒãã³ãã®é¢æ°ãåŒã³åºããŸããä»åºŠã¯ `count` ã `1` ã«ãªã£ãŠããŸããæ¬¡ã®åŒã³åºãã§ã¯ `2` ã«ãªã£ãŠããŸããæ¬¡ã
ãšå¢ããŠãããŸãã
+=======
+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.
+>>>>>>> 46a54e0592729712b7640308b53268e84fdc7c9f
åãã³ã³ããŒãã³ããè€æ°ã®å Žæã§ã¬ã³ããŒããå Žåããããããç¬èªã® state ãæã¡ãŸããããããã®ãã¿ã³ãåå¥ã«ã¯ãªãã¯ããŠã¿ãŠãã ããïŒ
diff --git a/src/content/learn/lifecycle-of-reactive-effects.md b/src/content/learn/lifecycle-of-reactive-effects.md
index cafd8b387..7b8b54e12 100644
--- a/src/content/learn/lifecycle-of-reactive-effects.md
+++ b/src/content/learn/lifecycle-of-reactive-effects.md
@@ -1375,7 +1375,7 @@ export default function App() {
```
```js {expectedErrors: {'react-compiler': [8]}} src/ChatRoom.js active
-import { useState, useEffect } from 'react';
+import { useEffect } from 'react';
export default function ChatRoom({ roomId, createConnection }) {
useEffect(() => {
@@ -1473,7 +1473,7 @@ export default function App() {
```
```js src/ChatRoom.js active
-import { useState, useEffect } from 'react';
+import { useEffect } from 'react';
export default function ChatRoom({ roomId, createConnection }) {
useEffect(() => {
@@ -1561,7 +1561,7 @@ export default function App() {
```
```js src/ChatRoom.js active
-import { useState, useEffect } from 'react';
+import { useEffect } from 'react';
import {
createEncryptedConnection,
createUnencryptedConnection,
diff --git a/src/content/learn/preserving-and-resetting-state.md b/src/content/learn/preserving-and-resetting-state.md
index 3e6903acd..d38a0c94e 100644
--- a/src/content/learn/preserving-and-resetting-state.md
+++ b/src/content/learn/preserving-and-resetting-state.md
@@ -18,7 +18,11 @@ state ã¯è€æ°ã®ã³ã³ããŒãã³ãéã§ç¬ç«ããŠããŸããReact 㯠U
## state ã¯ã¬ã³ããŒããªãŒå
ã®äœçœ®ã«çµã³ã€ããŠãã {/*state-is-tied-to-a-position-in-the-tree*/}
+<<<<<<< HEAD
React ã¯ããªãã® UI ã®ã³ã³ããŒãã³ãæ§é ã[ã¬ã³ããŒããªãŒ](learn/understanding-your-ui-as-a-tree#the-render-tree)ãšããŠãã«ãããŸãã
+=======
+React builds [render trees](/learn/understanding-your-ui-as-a-tree#the-render-tree) for the component structure in your UI.
+>>>>>>> 46a54e0592729712b7640308b53268e84fdc7c9f
ã³ã³ããŒãã³ãã« state ãäžãããšããã® state ã¯ãã®ã³ã³ããŒãã³ãã®å
éšã§ãçåãããŠããããã«æãããããããŸãããããããå®éã«ã¯ state 㯠React ã®äžã«ä¿æãããŠããŸããReact ã¯ããã¬ã³ããŒããªãŒå
ã§ãã®ã³ã³ããŒãã³ããã©ã®äœçœ®ã«ããããã«åºã¥ããŠãä¿æããŠããå state ãæ£ããã³ã³ããŒãã³ãã«é¢é£ä»ããŸãã
diff --git a/src/content/learn/react-compiler/introduction.md b/src/content/learn/react-compiler/introduction.md
index 0527c4730..b02cfb3f7 100644
--- a/src/content/learn/react-compiler/introduction.md
+++ b/src/content/learn/react-compiler/introduction.md
@@ -144,7 +144,11 @@ function TableContainer({ items }) {
- React Compiler 㯠React ã³ã³ããŒãã³ããšããã¯ã®ã¿ãã¡ã¢åãããã¹ãŠã®é¢æ°ãã¡ã¢åããããã§ã¯ãªã
- React Compiler ã®ã¡ã¢åã¯è€æ°ã®ã³ã³ããŒãã³ããããã¯éã§å
±æãããªã
+<<<<<<< HEAD
ãã®ããã`expensivelyProcessAReallyLargeArrayOfObjects` ãå€ãã®ç°ãªãã³ã³ããŒãã³ãã§äœ¿çšãããå ŽåããŸã£ããåãå
¥åãæž¡ããããšããŠãããã®é«ã³ã¹ããªèšç®ãç¹°ãè¿ãå®è¡ãããŠããŸããŸããã³ãŒããããè€éã«ããåã«ã[ãããã¡ã€ãªã³ã°](reference/react/useMemo#how-to-tell-if-a-calculation-is-expensive)ãè¡ã£ãŠãæ¬åœã«ããã»ã©é«ã³ã¹ããã©ããã確èªããããšããå§ãããŸãã
+=======
+So if `expensivelyProcessAReallyLargeArrayOfObjects` was used in many different components, even if the same exact items were passed down, that expensive calculation would be run repeatedly. We recommend [profiling](/reference/react/useMemo#how-to-tell-if-a-calculation-is-expensive) first to see if it really is that expensive before making code more complicated.
+>>>>>>> 46a54e0592729712b7640308b53268e84fdc7c9f
## ã³ã³ãã€ã©ã詊ãã¹ããïŒ {/*should-i-try-out-the-compiler*/}
diff --git a/src/content/learn/setup.md b/src/content/learn/setup.md
index 70e91dd8a..b525e89b9 100644
--- a/src/content/learn/setup.md
+++ b/src/content/learn/setup.md
@@ -17,7 +17,11 @@ TypeScript 㯠JavaScript ã®ã³ãŒãããŒã¹ã«åå®çŸ©ã远å ããäžè¬
## React Developer Tools {/*react-developer-tools*/}
+<<<<<<< HEAD
React Developer Tools 㯠React ã³ã³ããŒãã³ãã®èª¿æ»ãè¡ããprops ã state ãç·šéããããã©ãŒãã³ã¹ã®åé¡ãç¹å®ã§ãããã©ãŠã¶æ¡åŒµæ©èœã§ããã€ã³ã¹ããŒã«æ¹æ³ã¯[ãã¡ã](learn/react-developer-tools)ã§ç¢ºèªã§ããŸãã
+=======
+React Developer Tools is a browser extension that can inspect React components, edit props and state, and identify performance problems. Learn how to install it [here](/learn/react-developer-tools).
+>>>>>>> 46a54e0592729712b7640308b53268e84fdc7c9f
## React Compiler {/*react-compiler*/}
diff --git a/src/content/learn/synchronizing-with-effects.md b/src/content/learn/synchronizing-with-effects.md
index 5801fc9fb..73376761e 100644
--- a/src/content/learn/synchronizing-with-effects.md
+++ b/src/content/learn/synchronizing-with-effects.md
@@ -732,8 +732,13 @@ function TodoList() {
äžèšã®æ¬ ç¹ã¯ãããŠã³ãæã«ããŒã¿ããã§ããããã®ã§ããã°ãReact ã«éããã©ã®ã©ã€ãã©ãªã䜿ãå Žåã§ãåœãŠã¯ãŸãå
容ã§ããã«ãŒãã£ã³ã°ãšåæ§ãããŒã¿ãã§ããã®å®è£
ãäžæã«ããããšãããšäžççžã§ã¯ãããŸãããç§ãã¡ã¯ä»¥äžã®ã¢ãããŒãããå§ãããŸãã
+<<<<<<< HEAD
- **[ãã¬ãŒã ã¯ãŒã¯](/learn/creating-a-react-app#full-stack-frameworks)ã䜿çšããŠããå Žåãçµã¿èŸŒã¿ã®ããŒã¿ãã§ããæ©æ§ã䜿çšããŠãã ãã**ãã¢ãã³ãª React ãã¬ãŒã ã¯ãŒã¯ã«ã¯ãå¹ççã§äžèšã®æ¬ ç¹ããªãããŒã¿ãã§ããæ©æ§ãçµ±åãããŠããŸãã
- **ãã以å€ã®å Žåã¯ãã¯ã©ã€ã¢ã³ããµã€ããã£ãã·ã¥ã®äœ¿çšãæ§ç¯ãæ€èšããŠãã ãã**ãäžè¬çãªãªãŒãã³ãœãŒã¹ã®ãœãªã¥ãŒã·ã§ã³ã«ã¯ã[TanStack Query](https://tanstack.com/query/latest)ã[useSWR](https://swr.vercel.app/)ãããã³ [React Router 6.4+](https://beta.reactrouter.com/en/main/start/overview) ãå«ãŸããŸããèªåã§ãœãªã¥ãŒã·ã§ã³ãæ§ç¯ããããšãã§ããŸãããã®å Žåããšãã§ã¯ããå
éšã§äœ¿çšãã€ã€ããªã¯ãšã¹ãã®éè€æé€ãã¬ã¹ãã³ã¹ã®ãã£ãã·ã¥ããããã¯ãŒã¯ã®ãŠã©ãŒã¿ãŒãã©ãŒã«ãåé¿ããããã®ããžãã¯ïŒããŒã¿ã®ããªããŒããã«ãŒãã£ã³ã°éšãžã®ããŒã¿èŠæ±ã®å·»ãäžãïŒã远å ããããšã«ãªããŸãã
+=======
+- **If you use a [framework](/learn/creating-a-react-app#full-stack-frameworks), use its built-in data fetching mechanism.** Modern React frameworks have integrated data fetching mechanisms that are efficient and don't suffer from the above pitfalls.
+- **Otherwise, consider using or building a client-side cache.** Popular open source solutions include [TanStack Query](https://tanstack.com/query/latest), [useSWR](https://swr.vercel.app/), and [React Router](https://reactrouter.com/). You can build your own solution too, in which case you would use Effects under the hood, but add logic for deduplicating requests, caching responses, and avoiding network waterfalls (by preloading data or hoisting data requirements to routes).
+>>>>>>> 46a54e0592729712b7640308b53268e84fdc7c9f
ãããã®ã¢ãããŒããã©ã¡ããé©åããªãå Žåã¯ãåŒãç¶ããšãã§ã¯ãå
ã§çŽæ¥ããŒã¿ããã§ããããããšãã§ããŸãã
diff --git a/src/content/learn/tutorial-tic-tac-toe.md b/src/content/learn/tutorial-tic-tac-toe.md
index 52238c980..cdadea82e 100644
--- a/src/content/learn/tutorial-tic-tac-toe.md
+++ b/src/content/learn/tutorial-tic-tac-toe.md
@@ -1138,7 +1138,11 @@ JavaScript ã¯[ã¯ããŒãžã£](https://developer.mozilla.org/en-US/docs/Web/Jav
+<<<<<<< HEAD
ããã§ãç€ã« X ã眮ããããã«ãªããŸããâŠãããŸã å·Šäžé
ã®ãã¹ç®ã«ãã眮ããŸãããä»ã® `handleClick` 颿°ã¯ãå·Šäžã®ãã¹ç®ã«å¯Ÿå¿ããã€ã³ããã¯ã¹ (`0`) ã§æŽæ°ããããããŒãã³ãŒããããŠããããã§ãã`handleClick` ãæžãæããŠãä»»æã®ãã¹ç®ã®å
å®¹ãæŽæ°ã§ããããã«ããŸãããã`handleClick` 颿°ã«ãæŽæ°ãããã¹ç®ã®ã€ã³ããã¯ã¹ãæå®ããåŒæ° `i` ã远å ããŸãïŒ
+=======
+Now you can add X's to the board... but only to the upper left square. Your `handleClick` function is hardcoded to update the index for the upper left square (`0`). Let's update `handleClick` to be able to update any square. Add a parameter `i` to the `handleClick` function that takes the index of the square to update:
+>>>>>>> 46a54e0592729712b7640308b53268e84fdc7c9f
```js {4,6}
export default function Board() {
diff --git a/src/content/learn/typescript.md b/src/content/learn/typescript.md
index 9b04a4a33..18f7e8406 100644
--- a/src/content/learn/typescript.md
+++ b/src/content/learn/typescript.md
@@ -335,7 +335,11 @@ function MyComponent() {
+<<<<<<< HEAD
[`useMemo`](/reference/react/useMemo) ããã¯ã¯ã颿°åŒã³åºãããã®å€ã®äœæ/åã¢ã¯ã»ã¹ãè¡ãã2 çªç®ã®åŒæ°ãšããŠæž¡ãããäŸåé
åã倿Žããããšãã«ã®ã¿é¢æ°ãåå®è¡ããŸããããã¯ã®åŒã³åºãçµæã®åã¯ã1 çªç®ã®åŒæ°ãšããŠæå®ãã颿°ã®è¿ãå€ã®åããæšè«ãããŸããããã¯ã«ååŒæ°ãæå®ããããšã§æç€ºçã«ããããšãã§ããŸãã
+=======
+The [`useMemo`](/reference/react/useMemo) Hooks will create/re-access a memoized value from a function call, re-running the function only when dependencies passed as the 2nd parameter are changed. The result of calling the Hook is inferred from the return value from the function in the first parameter. You can be more explicit by providing a type argument to the Hook.
+>>>>>>> 46a54e0592729712b7640308b53268e84fdc7c9f
```ts
// The type of visibleTodos is inferred from the return value of filterTodos
diff --git a/src/content/learn/understanding-your-ui-as-a-tree.md b/src/content/learn/understanding-your-ui-as-a-tree.md
index d2c442cd4..285306165 100644
--- a/src/content/learn/understanding-your-ui-as-a-tree.md
+++ b/src/content/learn/understanding-your-ui-as-a-tree.md
@@ -135,7 +135,11 @@ React ã¬ã³ããŒããªãŒã®ã«ãŒãããŒãã¯ãã¢ããªã®[ã«ãŒãã³
#### ã¬ã³ããŒããªãŒå
ã® HTML ã¿ã°ã¯ã©ãã«ïŒ {/*where-are-the-html-elements-in-the-render-tree*/}
+<<<<<<< HEAD
äžèšã®ã¬ã³ããŒããªãŒã®å³ã«ã¯ãåã³ã³ããŒãã³ããã¬ã³ããŒãã HTML ã¿ã°ã«ã€ããŠã¯èŒã£ãŠããŸãããããã¯ãã¬ã³ããŒããªãŒãšã¯ React ã®[ã³ã³ããŒãã³ã](learn/your-first-component#components-ui-building-blocks)ã ãã§æ§æããããã®ã ããã§ãã
+=======
+You'll notice in the above render tree, there is no mention of the HTML tags that each component renders. This is because the render tree is only composed of React [components](/learn/your-first-component#components-ui-building-blocks).
+>>>>>>> 46a54e0592729712b7640308b53268e84fdc7c9f
UI ãã¬ãŒã ã¯ãŒã¯ãšããŠã® React ã¯ç¹å®ã®ãã©ãããã©ãŒã ã«äŸåããŸãããreact.dev ã§ã¯ãŠã§ããžã¬ã³ããŒããäŸã玹ä»ãããŠãããããã§ã¯ UI ã®ããªããã£ããšã㊠HTML ããŒã¯ã¢ããã䜿çšãããŸããããããReact ã¢ããªã¯åæ§ã«ã¢ãã€ã«ããã¹ã¯ããããã©ãããã©ãŒã ã«ã¬ã³ããŒããããšãå¯èœã§ãããããã§ã¯ [UIView](https://developer.apple.com/documentation/uikit/uiview) ã [FrameworkElement](https://learn.microsoft.com/en-us/dotnet/api/system.windows.frameworkelement?view=windowsdesktop-7.0) ã®ãããªå¥ã® UI ããªããã£ãã䜿çšãããã§ãããã
diff --git a/src/content/reference/dev-tools/react-devtools-cdt-mcp.md b/src/content/reference/dev-tools/react-devtools-cdt-mcp.md
new file mode 100644
index 000000000..9c966a0ff
--- /dev/null
+++ b/src/content/reference/dev-tools/react-devtools-cdt-mcp.md
@@ -0,0 +1,407 @@
+---
+title: React DevTools for agents
+version: experimental
+---
+
+
+
+**`react-devtools-cdt-mcp` is experimental.** It is built on the [experimental third-party developer tools API](https://developer.chrome.com/blog/devtools-for-agents-3p-tools) in [Chrome DevTools MCP](https://github.com/ChromeDevTools/chrome-devtools-mcp), and both its tools and their output may change between releases.
+
+
+
+
+
+`react-devtools-cdt-mcp` gives AI coding agents the same view of your app that React DevTools gives you: the component tree, props, hooks, owners, source locations, and render timing.
+
+```js
+import 'react-devtools-cdt-mcp/register';
+```
+
+
+
+
+
+---
+
+## Overview {/*overview*/}
+
+Coding agents that drive a browser through [Chrome DevTools MCP](https://github.com/ChromeDevTools/chrome-devtools-mcp) can click, take snapshots, and read the DOM, but the DOM doesn't tell them which component rendered a button, what state it holds, or why an interaction was slow.
+
+`react-devtools-cdt-mcp` is a small browser library that you import into the page you're debugging. It registers a group of React tools with the page. When Chrome DevTools MCP connects to that page, it discovers the tools automatically, and your agent can call them like any other MCP tool.
+
+
+
+`react-devtools-cdt-mcp` is **not** an MCP server, and it doesn't go in your MCP client config. It runs inside your page. The only MCP server you configure is Chrome DevTools MCP.
+
+
+
+---
+
+## Setup {/*setup*/}
+
+#### Install the package {/*install-the-package*/}
+
+
+
+npm install --save-dev react-devtools-cdt-mcp
+
+
+
+#### Import it before React {/*import-it-before-react*/}
+
+Import the `register` entry point at the very top of your app's entry file, **before** anything imports `react-dom`:
+
+```js {1}
+import 'react-devtools-cdt-mcp/register';
+
+import { createRoot } from 'react-dom/client';
+import App from './App';
+
+createRoot(document.getElementById('root')).render( );
+```
+
+`react-devtools-cdt-mcp` has to load before React does. If you import it after React, the tools won't see your components.
+
+
+
+`react-devtools-cdt-mcp` connects to React the same way the React DevTools extension does, and makes React report every commit to it. This slows down your app, so only include it in development builds.
+
+
+
+#### Set up Chrome DevTools MCP {/*set-up-chrome-devtools-mcp*/}
+
+Your agent needs [Chrome DevTools MCP](https://github.com/ChromeDevTools/chrome-devtools-mcp) with [third-party developer tools](https://developer.chrome.com/blog/devtools-for-agents-3p-tools) enabled. Follow the [Chrome DevTools MCP docs](https://github.com/ChromeDevTools/chrome-devtools-mcp#getting-started) to set it up. Once your agent opens a page that imports `react-devtools-cdt-mcp/register`, it can list and call the React tools.
+
+---
+
+## Try it {/*try-it*/}
+
+You don't need an agent to see what the tools return. The sandbox below imports `react-devtools-cdt-mcp/register` exactly as you would in your app, and adds a small **tool console** under the app. The console discovers the React tools the same way Chrome DevTools MCP does, by dispatching the `devtoolstooldiscovery` event, and lets you call them by hand.
+
+Pick a tool, edit the JSON parameters, and press **Run tool**. Here's a debugging session to follow, playing the agent's part:
+
+1. **Find a component.** Run `react_find_components` with `{"name": "Row"}`. Each result has a `uid`, like `"r12"`, that the other tools accept.
+2. **Inspect it.** Run `react_get_component_by_uid` with one of those uids and `"includeHooks": true` to see its props and hooks.
+3. **Start from the screen.** Choose `react_get_component_by_dom_element`, press **Pick element**, and click a product in the list to get the host component that rendered it.
+4. **Profile an interaction.** Run `react_start_profiling`, click **Add to cart** in the app, then run `react_stop_profiling`.
+5. **See what rendered.** Run `react_get_trace_overview`, then `react_get_commit_report` for commit `0` to see which components rendered in that commit and how long each one took.
+
+
+
+```js src/App.js active
+import { useState } from 'react';
+
+const PRODUCTS = Array.from({ length: 20 }, (_, i) => ({
+ id: i,
+ name: 'Product ' + (i + 1),
+ price: 10 + i,
+}));
+
+export default function App() {
+ const [query, setQuery] = useState('');
+ const visibleProducts = PRODUCTS.filter((product) =>
+ product.name.toLowerCase().includes(query.toLowerCase())
+ );
+ return (
+
+
+ setQuery(e.target.value)}
+ placeholder="Filter products"
+ />
+
+
+ );
+}
+
+function Cart() {
+ const [count, setCount] = useState(0);
+ return (
+
+
+ setCount((c) => c + 1)}>Add to cart
+
+ );
+}
+
+function CartBadge({ count }) {
+ return Cart: {count} ;
+}
+
+function ProductList({ products }) {
+ return (
+
+ {products.map((product) => (
+
+ ))}
+
+ );
+}
+
+function ProductRow({ product }) {
+ return (
+
+ {product.name} ${product.price}
+
+ );
+}
+```
+
+```js src/index.js
+import 'react-devtools-cdt-mcp/register';
+
+import { createRoot } from 'react-dom/client';
+import './styles.css';
+import App from './App';
+import { mountToolConsole } from './ToolConsole';
+
+createRoot(document.getElementById('root')).render( );
+mountToolConsole();
+```
+
+```js src/ToolConsole.js hidden
+// A tiny stand-in for chrome-devtools-mcp. It discovers the React tool group
+// the same way chrome-devtools-mcp does (the `devtoolstooldiscovery` event)
+// and lets you call the tools by hand.
+function discoverToolGroup() {
+ let toolGroup = null;
+ const event = new Event('devtoolstooldiscovery');
+ event.respondWith = group => {
+ toolGroup = group;
+ };
+ window.dispatchEvent(event);
+ return toolGroup;
+}
+
+function firstUid(tools, name) {
+ const find = tools.find(t => t.name === 'react_find_components');
+ const result = find.execute({name});
+ return result.results && result.results[0] ? result.results[0].uid : 'r0';
+}
+
+function exampleParams(tools, toolName) {
+ switch (toolName) {
+ case 'react_get_component_tree':
+ return {depth: 4};
+ case 'react_find_components':
+ return {name: 'Row'};
+ case 'react_get_component_by_uid':
+ return {uid: firstUid(tools, 'App'), includeHooks: true};
+ case 'react_get_component_by_dom_element':
+ return {element: '(click "Pick element", then click the page)'};
+ case 'react_get_component_source':
+ case 'react_get_owner_stack_trace':
+ case 'react_get_parent_stack':
+ case 'react_get_owner_stack':
+ return {uid: firstUid(tools, 'CartBadge')};
+ case 'react_start_profiling':
+ return {traceName: 'add-to-cart'};
+ case 'react_stop_profiling':
+ return {};
+ case 'react_get_trace_overview':
+ return {traceName: 'add-to-cart'};
+ case 'react_get_commit_report':
+ return {traceName: 'add-to-cart', commitIndex: 0};
+ default:
+ return {};
+ }
+}
+
+export function mountToolConsole() {
+ const toolGroup = discoverToolGroup();
+ const container = document.createElement('section');
+ container.className = 'tool-console';
+ document.body.appendChild(container);
+ if (toolGroup === null) {
+ container.textContent =
+ 'No tools found. Import react-devtools-cdt-mcp/register before React.';
+ return;
+ }
+ const {tools} = toolGroup;
+ container.innerHTML = `
+ Tool console
+
+
+
+
+ Run tool
+ Pick element
+
+
+ `;
+ const select = container.querySelector('select');
+ const description = container.querySelector('.description');
+ const textarea = container.querySelector('textarea');
+ const runButton = container.querySelector('.run');
+ const pickButton = container.querySelector('.pick');
+ const output = container.querySelector('pre');
+ let pickedElement = null;
+
+ for (const tool of tools) {
+ const option = document.createElement('option');
+ option.value = tool.name;
+ option.textContent = tool.name;
+ select.appendChild(option);
+ }
+
+ function selectTool() {
+ const tool = tools.find(t => t.name === select.value);
+ description.textContent = tool.description;
+ textarea.value = JSON.stringify(exampleParams(tools, tool.name));
+ pickButton.hidden = tool.name !== 'react_get_component_by_dom_element';
+ pickedElement = null;
+ }
+
+ function run() {
+ const tool = tools.find(t => t.name === select.value);
+ let params;
+ try {
+ params = JSON.parse(textarea.value || '{}');
+ } catch (error) {
+ output.textContent = 'Invalid JSON: ' + error.message;
+ return;
+ }
+ if (tool.name === 'react_get_component_by_dom_element') {
+ params.element = pickedElement;
+ }
+ const result = tool.execute(params);
+ output.textContent = JSON.stringify(result, null, 2);
+ }
+
+ pickButton.addEventListener('click', () => {
+ output.textContent = 'Click any element in the app above...';
+ document.addEventListener(
+ 'click',
+ event => {
+ if (container.contains(event.target)) {
+ return;
+ }
+ event.preventDefault();
+ event.stopPropagation();
+ pickedElement = event.target;
+ textarea.value = JSON.stringify({
+ element: '<' + event.target.tagName.toLowerCase() + '>',
+ });
+ run();
+ },
+ {capture: true, once: true},
+ );
+ });
+ select.addEventListener('change', selectTool);
+ runButton.addEventListener('click', run);
+ selectTool();
+}
+```
+
+```css src/styles.css hidden
+header { display: flex; gap: 8px; align-items: center; margin-bottom: 8px; }
+.badge { padding: 2px 8px; border-radius: 10px; background: #087ea4; color: white; }
+ul { padding-left: 20px; max-height: 160px; overflow: auto; }
+.tool-console { margin-top: 20px; padding-top: 12px; border-top: 1px solid #ddd; }
+.tool-console select, .tool-console textarea { width: 100%; font-family: monospace; }
+.tool-console .actions { display: flex; gap: 8px; margin: 8px 0; }
+.tool-console pre { background: #f6f7f9; padding: 8px; max-height: 300px; overflow: auto; }
+```
+
+```json package.json hidden
+{
+ "dependencies": {
+ "react": "latest",
+ "react-dom": "latest",
+ "react-scripts": "latest",
+ "react-devtools-cdt-mcp": "0.0.1"
+ },
+ "scripts": {
+ "start": "react-scripts start",
+ "build": "react-scripts build",
+ "test": "react-scripts test --env=jsdom",
+ "eject": "react-scripts eject"
+ }
+}
+```
+
+
+
+
+
+The tool console in this sandbox stands in for Chrome DevTools MCP so you can try the tools on this page. In your own app, you don't write any of this code: Chrome DevTools MCP discovers the tools and your agent decides which ones to call.
+
+
+
+---
+
+## Reference {/*reference*/}
+
+### Tools {/*tools*/}
+
+`react-devtools-cdt-mcp` registers a tool group called `react`. Your agent calls these tools through Chrome DevTools MCP.
+
+* `react_get_component_tree`: Returns a snapshot of the component tree.
+* `react_find_components`: Finds components by name.
+* `react_get_component_by_uid`: Returns a component's props and Hooks.
+* `react_get_component_by_dom_element`: Returns the React host component for a DOM element.
+* `react_get_parent_stack`: Returns where a component is mounted in the tree.
+* `react_get_owner_stack`: Returns the components that created a component in their JSX.
+* `react_get_owner_stack_trace`: Returns the owner stack of a component as a stack trace.
+* `react_get_component_source`: Returns where a component is defined.
+* `react_start_profiling`: Starts recording render timing.
+* `react_stop_profiling`: Stops recording render timing.
+* `react_get_trace_overview`: Returns a summary of every commit in a recording.
+* `react_get_commit_report`: Returns which components rendered in a commit and how long each took.
+
+Components are identified by short, stable uids like `"r5"`. A uid stays the same across every tool and across re-renders, but not across page reloads.
+
+Every tool returns a plain, serializable object. If a tool fails, it returns an object with an `error` message instead.
+
+---
+
+### `register(target?)` {/*register*/}
+
+Call `register` to install the React DevTools hook and register the React tools with Chrome DevTools MCP yourself, instead of importing `react-devtools-cdt-mcp/register`.
+
+```js
+import { register } from 'react-devtools-cdt-mcp';
+
+register();
+```
+
+#### Parameters {/*register-parameters*/}
+
+* **optional** `target`: The global object to install the hook on. Defaults to `globalThis`.
+
+#### Returns {/*register-returns*/}
+
+`register` returns an object with two properties:
+
+* `facade`: The installed React DevTools hook and the state the tools read from.
+* `unregister`: A function that stops registering the React tools with Chrome DevTools MCP.
+
+#### Caveats {/*register-caveats*/}
+
+* Call `register` before React initializes, or React won't connect to the hook.
+* Calling `register` again for the same `target` returns the existing registration.
+
+---
+
+## Troubleshooting {/*troubleshooting*/}
+
+#### My agent doesn't see any React tools {/*my-agent-doesnt-see-any-react-tools*/}
+
+Check that [third-party developer tools](https://developer.chrome.com/blog/devtools-for-agents-3p-tools) are enabled in your Chrome DevTools MCP setup. Then check that the page selected in Chrome DevTools MCP imports `react-devtools-cdt-mcp/register`. The tools are discovered per page, when the page loads or is selected.
+
+#### The component tree is empty {/*the-component-tree-is-empty*/}
+
+`react-devtools-cdt-mcp/register` was imported after React initialized. Move the import to the very first line of your entry file, before any import that loads `react-dom`.
+
+#### I'm getting an error about a browser-like environment {/*im-getting-an-error-about-a-browser-like-environment*/}
+
+`react-devtools-cdt-mcp/register` throws if it's imported outside a browser, for example during server rendering or in tests. Import it only from client-side code, or call `register()` from the package root yourself where it's safe.
+
+#### Source locations and owner stacks are empty {/*source-locations-and-owner-stacks-are-empty*/}
+
+This data only exists in development builds of React. Make sure you're running your app's development server rather than a production build.
+
+#### A uid stopped working {/*a-uid-stopped-working*/}
+
+Uids don't survive page reloads. After a reload, get fresh uids with `react_get_component_tree` or `react_find_components`.
diff --git a/src/content/reference/dev-tools/react-performance-tracks.md b/src/content/reference/dev-tools/react-performance-tracks.md
index d1b7bfce9..123cec978 100644
--- a/src/content/reference/dev-tools/react-performance-tracks.md
+++ b/src/content/reference/dev-tools/react-performance-tracks.md
@@ -140,8 +140,13 @@ Scheduler ã¯ãç°ãªãåªå
床ãæã€ã¿ã¹ã¯ã管çããããã«äœ¿
ãµãŒããªã¯ãšã¹ããã©ãã¯ã¯ãæçµçã« React Server Component å
ã§äœ¿ããããã¹ãŠã®ãããã¹ (Promise) ãå¯èŠåããŸããããã«ã¯ã`fetch` ã®åŒã³åºããéåæ Node.js ãã¡ã€ã«æäœãªã©ã® `async` æäœãå«ãŸããŸãã
+<<<<<<< HEAD
React ã¯ããµãŒãããŒãã£ã®ã³ãŒãããéå§ããããããã¹ãããã¡ãŒã¹ãããŒãã£ã³ãŒãããããã¯ããæäœå
šäœã®ç¶ç¶æéã衚ãåäžã®ã¹ãã³ã«çµåããããšããŸãã
äŸãã°ãå
éšçã«è€æ°å `fetch` ãåŒã³åºã `getUser` ãšãããµãŒãããŒãã£ã©ã€ãã©ãªã®ã¡ãœããã¯ãè€æ°ã® `fetch` ã¹ãã³ã衚瀺ããã®ã§ã¯ãªãã`getUser` ãšããåäžã®ã¹ãã³ãšããŠè¡šãããŸãã
+=======
+React will try to combine Promises that are started from inside third-party code into a single span representing the duration of the entire operation blocking 1st party code.
+For example, a third party library method called `getUser` that calls `fetch` internally multiple times will be represented as a single span called `getUser`, instead of showing multiple `fetch` spans.
+>>>>>>> 46a54e0592729712b7640308b53268e84fdc7c9f
ã¹ãã³ãã¯ãªãã¯ãããšããããã¹ãäœæãããå Žæã®ã¹ã¿ãã¯ãã¬ãŒã¹ãšãå©çšå¯èœãªå Žåã¯ãããã¹ã解決ããå€ã®ãã¥ãŒã衚瀺ãããŸãã
@@ -155,5 +160,10 @@ React ã¯ããµãŒãããŒãã£ã®ã³ãŒãããéå§ããããããã¹
ã³ã³ããŒãã³ãã®ã¬ã³ããŒã®ç¶ç¶æéã瀺ãããã«ç°ãªãè²ã䜿çšãããŸããè²ãæ¿ãã»ã©ãç¶ç¶æéãé·ãããšã瀺ããŸãã
+<<<<<<< HEAD
ãµãŒãã³ã³ããŒãã³ããã©ãã¯ã°ã«ãŒãã«ã¯ãåžžã« "Primary" ãã©ãã¯ãå«ãŸããŸããReact ããµãŒãã³ã³ããŒãã³ãã䞊è¡ããŠã¬ã³ããŒã§ããå Žåã远å ã® "Parallel" ãã©ãã¯ã衚瀺ãããŸãã
8 ã€ãè¶
ãããµãŒãã³ã³ããŒãã³ãã䞊è¡ããŠã¬ã³ããŒãããå ŽåãReact ã¯ããã«ãã©ãã¯ã远å ããã®ã§ã¯ãªããæåŸã® "Parallel" ãã©ãã¯ã«é¢é£ä»ããŸãã
+=======
+The Server Components track group will always contain a "Primary" track. If React is able to render Server Components concurrently, it will display additional "Parallel" tracks.
+If more than 8 Server Components are rendered concurrently, React will associate them with the last "Parallel" track instead of adding more tracks.
+>>>>>>> 46a54e0592729712b7640308b53268e84fdc7c9f
diff --git a/src/content/reference/eslint-plugin-react-hooks/lints/set-state-in-render.md b/src/content/reference/eslint-plugin-react-hooks/lints/set-state-in-render.md
index bffa87a2d..773c8639d 100644
--- a/src/content/reference/eslint-plugin-react-hooks/lints/set-state-in-render.md
+++ b/src/content/reference/eslint-plugin-react-hooks/lints/set-state-in-render.md
@@ -107,4 +107,8 @@ function Counter({max}) {
ããã§ãã»ãã¿ã¯ã¯ãªãã¯ã«å¿ããŠã®ã¿å®è¡ãããReact ã¯ã¬ã³ããŒãæ£åžžã«å®äºãã`count` ã `max` ãè¶
ããããšã¯ãªããªããŸãã
+<<<<<<< HEAD
ãŸãã«ã以åã®ã¬ã³ããŒã®æ
å ±ã«åºã¥ã㊠state ã調æŽããå¿
èŠããããããããŸããããã®å Žåã¯ãæ¡ä»¶ä»ãã§ state ãèšå®ãã[ãã¡ãã®ãã¿ãŒã³](https://react.dev/reference/react/useState#storing-information-from-previous-renders)ã«åŸã£ãŠãã ããã
+=======
+In rare cases, you may need to adjust state based on information from previous renders. For those, follow [this pattern](/reference/react/useState#storing-information-from-previous-renders) of setting state conditionally.
+>>>>>>> 46a54e0592729712b7640308b53268e84fdc7c9f
diff --git a/src/content/reference/eslint-plugin-react-hooks/lints/use-memo.md b/src/content/reference/eslint-plugin-react-hooks/lints/use-memo.md
index 5e29c0c39..96d9d00aa 100644
--- a/src/content/reference/eslint-plugin-react-hooks/lints/use-memo.md
+++ b/src/content/reference/eslint-plugin-react-hooks/lints/use-memo.md
@@ -79,7 +79,11 @@ function Component({user}) {
}
```
+<<<<<<< HEAD
å¯äœçšã«ãã£ãŠ React ã® state ãå€éšã®ç¶æ
ãšåæããïŒãŸãã¯ãã®éãè¡ãïŒå Žåã¯ã`useEffect` ã䜿ã£ãŠãã ããã
+=======
+If the side effect synchronizes React state with some external state (or vice versa), use `useEffect`:
+>>>>>>> 46a54e0592729712b7640308b53268e84fdc7c9f
```js
// â
Good: Synchronization in useEffect
diff --git a/src/content/reference/react-dom/client/createRoot.md b/src/content/reference/react-dom/client/createRoot.md
index 424ac2faa..340513bec 100644
--- a/src/content/reference/react-dom/client/createRoot.md
+++ b/src/content/reference/react-dom/client/createRoot.md
@@ -90,7 +90,11 @@ React 㯠`root` ã« ` ` ã衚瀺ãããã®å
éšã® DOM ã®ç®¡çã
* åãã«ãŒãã«å¯Ÿã㊠`render` ãè€æ°ååŒã³åºããšãReact ã¯ææ°ã® JSX ãåæ ããããã«å¿
èŠãªã ãã® DOM ã®æŽæ°ãè¡ããŸããReact ã¯ãæž¡ããã JSX ã以åã«ã¬ã³ããŒããããªãŒãš[ããããã³ã°ã](/learn/preserving-and-resetting-state)ããŠãDOM ã®ã©ã®éšåãåå©çšã§ããã©ã®éšåãåäœæããå¿
èŠãããã®ããæ±ºå®ããŸããåãã«ãŒãã«å¯ŸããŠè€æ°å `render` ãåŒã³åºãããšã¯ãã«ãŒãã³ã³ããŒãã³ãã§ [`set` 颿°](/reference/react/useState#setstate)ãåŒã³åºãããšã«äŒŒãŠãããReact ã¯äžå¿
èŠãª DOM æŽæ°ãåé¿ããŸãã
+<<<<<<< HEAD
* ã¬ã³ããŒã¯äžåºŠå§ãŸããšåæçã«å®è¡ãããŸããã`root.render(...)` èªäœã¯åæçã§ã¯ãããŸãããã€ãŸãã`root.render()` ã®åŸã«æžãããã³ãŒããããã®ã¬ã³ããŒã§çºçãããšãã§ã¯ãïŒ`useLayoutEffect` ã `useEffect`ïŒãããå
ã«å®è¡ãããå ŽåããããŸããããã¯éåžžåé¡ãªãã調æŽãå¿
èŠãšãªãããšã¯æ»
å€ã«ãããŸããããšãã§ã¯ãã®ã¿ã€ãã³ã°ãéèŠãšãªãçšãªã±ãŒã¹ã§ã¯ã[`flushSync`](https://react.dev/reference/react-dom/flushSync) ã§ `root.render(...)` ãã©ããããããšã§ãååã¬ã³ããŒãå®å
šã«åæçã«å®è¡ã§ããŸãã
+=======
+* 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`](/reference/react-dom/flushSync) to ensure the initial render runs fully synchronously.
+>>>>>>> 46a54e0592729712b7640308b53268e84fdc7c9f
```js
const root = createRoot(document.getElementById('root'));
@@ -379,7 +383,11 @@ const root = createRoot(container, {
1. ã¹ããŒããã error ã
2. errorInfo ãªããžã§ã¯ãããšã©ãŒã® componentStack ãå«ãã§ããã
+<<<<<<< HEAD
`onUncaughtError` ãš `onRecoverableError` ãçµã¿åãããŠãç¬èªã®ãšã©ãŒã¬ããŒãã£ã³ã°ã®ã·ã¹ãã ãå®è£
ã§ããŸãã
+=======
+Together with `onUncaughtError` and `onRecoverableError`, you can implement your own error reporting system:
+>>>>>>> 46a54e0592729712b7640308b53268e84fdc7c9f
@@ -419,7 +427,7 @@ const container = document.getElementById("root");
const root = createRoot(container, {
// Keep in mind to remove these options in development to leverage
// React's default handlers or implement your own overlay for development.
- // The handlers are only specfied unconditionally here for demonstration purposes.
+ // The handlers are only specified unconditionally here for demonstration purposes.
onCaughtError: onCaughtErrorProd,
onRecoverableError: onRecoverableErrorProd,
onUncaughtError: onUncaughtErrorProd,
diff --git a/src/content/reference/react-dom/client/hydrateRoot.md b/src/content/reference/react-dom/client/hydrateRoot.md
index 3dd8efb63..6eb7884e9 100644
--- a/src/content/reference/react-dom/client/hydrateRoot.md
+++ b/src/content/reference/react-dom/client/hydrateRoot.md
@@ -124,7 +124,11 @@ React ã§å®å
šã«æ§ç¯ãããã¢ããªã«ã¯ãéåžžã`root.unmount` ã®
### ãµãŒãã§ã¬ã³ããŒããã HTML ã®ãã€ãã¬ãŒã·ã§ã³ {/*hydrating-server-rendered-html*/}
+<<<<<<< HEAD
ããªãã®ã¢ããªã® HTML ã [`react-dom/server`](/reference/react-dom/client/createRoot) ã«ãã£ãŠçæãããŠããå Žåãã¯ã©ã€ã¢ã³ãäžããã«å¯Ÿãã*ãã€ãã¬ãŒã·ã§ã³*ãè¡ãå¿
èŠããããŸãã
+=======
+If your app's HTML was generated by [`react-dom/server`](/reference/react-dom/server), you need to *hydrate* it on the client.
+>>>>>>> 46a54e0592729712b7640308b53268e84fdc7c9f
```js [[1, 3, "document.getElementById('root')"], [2, 3, " "]]
import { hydrateRoot } from 'react-dom/client';
@@ -449,7 +453,7 @@ const container = document.getElementById("root");
hydrateRoot(container, , {
// Keep in mind to remove these options in development to leverage
// React's default handlers or implement your own overlay for development.
- // The handlers are only specfied unconditionally here for demonstration purposes.
+ // The handlers are only specified unconditionally here for demonstration purposes.
onCaughtError: onCaughtErrorProd,
onRecoverableError: onRecoverableErrorProd,
onUncaughtError: onUncaughtErrorProd,
diff --git a/src/content/reference/react-dom/components/common.md b/src/content/reference/react-dom/components/common.md
index 7ade0b9eb..7beca510a 100644
--- a/src/content/reference/react-dom/components/common.md
+++ b/src/content/reference/react-dom/components/common.md
@@ -257,9 +257,15 @@ title: " ãªã©ã®äžè¬çãªã³ã³ããŒãã³ã"
[`ref` ã³ãŒã«ããã¯ã䜿çšããäŸãèŠã](/learn/manipulating-the-dom-with-refs#how-to-manage-a-list-of-refs-using-a-ref-callback)
+<<<<<<< HEAD
`
` DOM ããŒããç»é¢ã«è¿œå ããããšãReact ã¯ãã® DOM `node` ãåŒæ°ãšã㊠`ref` ã³ãŒã«ããã¯ãåŒã³åºããŸãã`
` DOM ããŒããåé€ããããšãReact ã¯ã³ãŒã«ããã¯ãè¿ããã¯ãªãŒã³ã¢ãã颿°ãåŒã³åºããŸãã
React ã¯ã*ç°ãªã* `ref` ã³ãŒã«ããã¯ãæž¡ãããå Žåã `ref` ã³ãŒã«ããã¯ãåŒã³åºããŸããäžèšã®äŸã§ã¯ã`(node) => { ... }` ã¯æ¯åã®ã¬ã³ããŒã§ç°ãªã颿°ã§ããã³ã³ããŒãã³ããåã¬ã³ããŒããããšã*å*ã®é¢æ°ã `null` ãåŒæ°ãšããŠåŒã³åºããã*次*ã®é¢æ°ã DOM ããŒããåŒæ°ãšããŠåŒã³åºãããŸãã
+=======
+When the `
` DOM node is added to the screen, React will call your `ref` callback with the DOM `node` as the argument. When that `
` DOM node is removed, React will call the cleanup function returned from the callback.
+
+React will also call your `ref` callback whenever you pass a *different* `ref` callback. In the above example, `(node) => { ... }` is a different function on every render. When your component re-renders, the cleanup function returned by the *previous* function will be called, and the *next* function will be called with the DOM node. If no cleanup function is returned, the *previous* function will be called with `null` as the argument instead.
+>>>>>>> 46a54e0592729712b7640308b53268e84fdc7c9f
#### åŒæ° {/*ref-callback-parameters*/}
diff --git a/src/content/reference/react-dom/components/form.md b/src/content/reference/react-dom/components/form.md
index 163267b64..689c69b1f 100644
--- a/src/content/reference/react-dom/components/form.md
+++ b/src/content/reference/react-dom/components/form.md
@@ -38,21 +38,43 @@ title: "