From 4133943e718a77f11627888db2f59f6cb7a73403 Mon Sep 17 00:00:00 2001 From: Erol Aliyev Date: Wed, 13 Oct 2021 14:21:59 +0200 Subject: [PATCH 1/2] Fix broken link (#3953) --- content/docs/thinking-in-react.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/docs/thinking-in-react.md b/content/docs/thinking-in-react.md index 1527650d558..33a85b7ee55 100644 --- a/content/docs/thinking-in-react.md +++ b/content/docs/thinking-in-react.md @@ -72,7 +72,7 @@ You can build top-down or bottom-up. That is, you can either start with building At the end of this step, you'll have a library of reusable components that render your data model. The components will only have `render()` methods since this is a static version of your app. The component at the top of the hierarchy (`FilterableProductTable`) will take your data model as a prop. If you make a change to your underlying data model and call `ReactDOM.render()` again, the UI will be updated. You can see how your UI is updated and where to make changes. React's **one-way data flow** (also called *one-way binding*) keeps everything modular and fast. -Refer to the [React docs](/docs/) if you need help executing this step. +Refer to the [React docs](/docs/getting-started.html) if you need help executing this step. ### A Brief Interlude: Props vs State {#a-brief-interlude-props-vs-state} From c7461de2aaae791f1ae1724a801030f651d563ac Mon Sep 17 00:00:00 2001 From: Yuqing Chen Date: Mon, 18 Oct 2021 11:15:06 +0800 Subject: [PATCH 2/2] Update thinking-in-react.md --- content/docs/thinking-in-react.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/content/docs/thinking-in-react.md b/content/docs/thinking-in-react.md index c2a6e02947f..1122ce65129 100644 --- a/content/docs/thinking-in-react.md +++ b/content/docs/thinking-in-react.md @@ -72,11 +72,7 @@ React 最棒的部分之一是引导我们思考如何构建一个应用。在 到此为止，你应该已经有了一个可重用的组件库来渲染你的数据模型。由于我们构建的是静态版本，所以这些组件目前只需提供 `render()` 方法用于渲染。最顶层的组件 `FilterableProductTable` 通过 props 接受你的数据模型。如果你的数据模型发生了改变，再次调用 `ReactDOM.render()`，UI 就会相应地被更新。数据模型变化、调用 `render()` 方法、UI 相应变化，这个过程并不复杂，因此很容易看清楚 UI 是如何被更新的，以及是在哪里被更新的。React **单向数据流**（也叫*单向绑定*）的思想使得组件模块化，易于快速开发。 -<<<<<<< HEAD -如果你在完成这一步骤时遇到了困难，可以参阅 [React 文档](/docs/)。 -======= -Refer to the [React docs](/docs/getting-started.html) if you need help executing this step. ->>>>>>> 4133943e718a77f11627888db2f59f6cb7a73403 +如果你在完成这一步骤时遇到了困难，可以参阅 [React 文档](/docs/getting-started.html)。 ### 补充说明: 有关 props 和 state {#a-brief-interlude-props-vs-state}