Skip to content

docs(en): merge reactjs.org/main into zh-hans.reactjs.org/main @ 3ee3a60a #1722

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
docschina-bot wants to merge 2 commits into from
Closed

docs(en): merge reactjs.org/main into zh-hans.reactjs.org/main @ 3ee3a60a #1722

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ee3a60
Fix wrong explanation in preserving-and-resetting-state (#6043)
smikitky May 26, 2025
9422f9d
merging all conflicts
react-translations-bot Jun 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/content/learn/preserving-and-resetting-state.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -676,7 +676,11 @@ label {

</Sandpack>

<<<<<<< HEAD
当你勾选复选框后计数器的 state 被重置了。虽然你渲染了一个 `Counter`，但是 `div` 的第一个子组件从 `div` 变成了 `section`。当子组件 `div` 从 DOM 中被移除的时候，它底下的整棵树（包含 `Counter` 以及它的 state）也都被销毁了。
=======
The counter state gets reset when you click the checkbox. Although you render a `Counter`, the first child of the `div` changes from a `section` to a `div`. When the child `section` was removed from the DOM, the whole tree below it (including the `Counter` and its state) was destroyed as well.
>>>>>>> 3ee3a60a1bcc687c0b87039a3a6582e3b1d6887c

<DiagramGroup>

Expand Down