Skip to content

Commit f5a9c48

Browse files
committed
Merge branch 'master' into translate/react-dom-server
2 parents 91c5a95 + e790335 commit f5a9c48

File tree

4 files changed

+14
-4
lines changed

4 files changed

+14
-4
lines changed

content/blog/2018-09-10-introducing-the-react-profiler.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ It also shows that each time it rendered, it was the most "expensive" component
140140

141141
To view this chart, either double-click on a component _or_ select a component and click on the blue bar chart icon in the right detail pane.
142142
You can return to the previous chart by clicking the "x" button in the right detail pane.
143-
You can aso double click on a particular bar to view more information about that commit.
143+
You can also double click on a particular bar to view more information about that commit.
144144

145145
![How to view all renders for a specific component](../images/blog/introducing-the-react-profiler/see-all-commits-for-a-fiber.gif)
146146

content/community/conferences.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,21 @@ May 23-24, 2019 in Paris, France
3636

3737
[Website](https://www.react-europe.org) - [Twitter](https://twitter.com/ReactEurope) - [Facebook](https://www.facebook.com/ReactEurope) - [Videos](https://www.youtube.com/c/ReacteuropeOrgConf)
3838

39+
### React Conf Armenia 2019 {#react-conf-am-19}
40+
May 25, 2019 in Yerevan, Armenia
41+
42+
[Website](https://reactconf.am/) - [Twitter](https://twitter.com/ReactConfAM) - [Facebook](https://www.facebook.com/reactconf.am/) - [YouTube](https://www.youtube.com/c/JavaScriptConferenceArmenia) - [CFP](http://bit.ly/speakReact)
43+
3944
### React Norway 2019 {#react-norway-2019}
4045
June 12, 2019. Larvik, Norway
4146

4247
[Website](https://reactnorway.com) - [Twitter](https://twitter.com/ReactNorway)
4348

49+
### React Loop 2019 {#react-loop-2019}
50+
June 21, 2019 Chicago, Illinois USA
51+
52+
[Website](https://reactloop.com) - [Twitter](https://twitter.com/ReactLoop)
53+
4454
### ComponentsConf 2019 {#componentsconf-2019}
4555
September 6, 2019 in Melbourne, Australia
4656
[Website](https://www.componentsconf.com.au/) - [Twitter](https://twitter.com/componentsconf)

content/docs/hooks-faq.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,7 @@ Note that this approach won't work in a loop because Hook calls [can't](/docs/ho
466466

467467
### How to create expensive objects lazily? {#how-to-create-expensive-objects-lazily}
468468

469-
`useMemo` lets you [memoize an expensive calculation](#how-to-memoize-calculations) if the inputs are the same. However, it only serves as a hint, and doesn't *guarantee* the computation won't re-run. But sometimes need to be sure an object is only created once.
469+
`useMemo` lets you [memoize an expensive calculation](#how-to-memoize-calculations) if the inputs are the same. However, it only serves as a hint, and doesn't *guarantee* the computation won't re-run. But sometimes you need to be sure an object is only created once.
470470

471471
**The first common use case is when creating the initial state is expensive:**
472472

@@ -560,7 +560,7 @@ In large component trees, an alternative we recommend is to pass down a `dispatc
560560
const TodosDispatch = React.createContext(null);
561561
562562
function TodosApp() {
563-
// Tip: `dispatch` won't change between re-renders
563+
// Note: `dispatch` won't change between re-renders
564564
const [todos, dispatch] = useReducer(todosReducer);
565565
566566
return (

content/docs/strict-mode.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ React used to support `findDOMNode` to search the tree for a DOM node given a cl
5757

5858
`findDOMNode` can also be used on class components but this was breaking abstraction levels by allowing a parent to demand that certain children was rendered. It creates a refactoring hazard where you can't change the implementation details of a component because a parent might be reaching into its DOM node. `findDOMNode` only returns the first child, but with the use of Fragments, it is possible for a component to render multiple DOM nodes. `findDOMNode` is a one time read API. It only gave you an answer when you asked for it. If a child component renders a different node, there is no way to handle this change. Therefore `findDOMNode` only worked if components always return a single DOM node that never changes.
5959

60-
You can instead make this explicit by pass a ref to your custom component and pass that along to the DOM using [ref forwarding](/docs/forwarding-refs.html#forwarding-refs-to-dom-components).
60+
You can instead make this explicit by passing a ref to your custom component and pass that along to the DOM using [ref forwarding](/docs/forwarding-refs.html#forwarding-refs-to-dom-components).
6161

6262
You can also add a wrapper DOM node in your component and attach a ref directly to it.
6363

0 commit comments

Comments
 (0)