Skip to content

Commit d691515

Browse files
Merge branch 'master' of https://github.com/reactjs/reactjs.org into sync-c8aef5dc
2 parents 32c3d86 + c8aef5d commit d691515

File tree

6 files changed

+18
-7
lines changed

6 files changed

+18
-7
lines changed

content/community/conferences.md

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@ February 27 & 28, 2020 in Sydney, Australia
2222

2323
[Website](https://reactconfau.com/) - [Twitter](https://twitter.com/reactconfau) - [Facebook](https://www.facebook.com/reactconfau) - [Instagram](https://www.instagram.com/reactconfau/)
2424

25+
### ReactConf Japan 2020 {#reactconfjp-2020}
26+
March 21, 2020 in Tokyo, Japan
27+
28+
[Website](https://reactconf.jp/) - [Twitter](https://twitter.com/reactjapanconf)
29+
2530
### Reactathon 2020 {#reactathon-2020}
2631
March 30 - 31, 2020 in San Francisco, CA
2732

@@ -40,7 +45,7 @@ April 23 - 24, 2020 in Kraków, Poland
4045
### React Day Bangalore 2020 {#react-day-bangalore-2020}
4146
April 25, 2020 in Bangalore, India
4247

43-
[Website](https://reactday.in) - [Twitter](https://twitter.com/ReactDayIn)
48+
[Website](https://reactday.in) - [Twitter](https://twitter.com/ReactDayIn) - [LinkedIn](https://www.linkedin.com/company/react-day/)
4449

4550
### render(ATL) 2020 {#render-atlanta-2020}
4651
May 4-6, 2020. Atlanta, GA, USA.
@@ -72,6 +77,11 @@ July 17, 2020. New York City, USA.
7277

7378
[Website](https://reactweek.nyc/) - [Twitter](https://twitter.com/reactweek) - [Facebook](https://www.facebook.com/reactweek)
7479

80+
### React La Conferencia 2020 {#react-la-conferencia-2020}
81+
July 18, 2020. Medellín, Colombia.
82+
83+
[Website](https://reactlaconf.co/) - [Twitter](https://twitter.com/reactlaconf)
84+
7585
### ComponentsConf 2020 {#components20}
7686
September 1, 2020 in Melbourne, Australia
7787

content/community/meetups.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
9595
* [Tel Aviv](https://www.meetup.com/ReactJS-Israel/)
9696

9797
## Malaysia {#malaysia}
98+
* [Kuala Lumpur](https://www.kl-react.com/)
9899
* [Penang](https://www.facebook.com/groups/reactpenang/)
99100

100101
## Netherlands {#netherlands}

content/docs/concurrent-mode-patterns.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -790,7 +790,7 @@ function ProfileTimeline({ isStale, resource }) {
790790

791791
The tradeoff we're making here is that `<ProfileTimeline>` will be inconsistent with other components and potentially show an older item. Click "Next" a few times, and you'll notice it. But thanks to that, we were able to cut down the transition time from 1000ms to 300ms.
792792

793-
Whether or not it's an appropriate tradeoff depends on the situation. But it's a handy tool, especially when the content doesn't change very visible between items, and the user might not even realize they were looking at a stale version for a second.
793+
Whether or not it's an appropriate tradeoff depends on the situation. But it's a handy tool, especially when the content doesn't change noticeably between items, and the user might not even realize they were looking at a stale version for a second.
794794

795795
It's worth noting that `useDeferredValue` is not *only* useful for data fetching. It also helps when an expensive component tree causes an interaction (e.g. typing in an input) to be sluggish. Just like we can "defer" a value that takes too long to fetch (and show its old value despite others components updating), we can do this with trees that take too long to render.
796796

content/docs/hooks-reference.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ Although `useEffect` is deferred until after the browser has painted, it's guara
143143

144144
The default behavior for effects is to fire the effect after every completed render. That way an effect is always recreated if one of its dependencies changes.
145145

146-
However, this may be overkill in some cases, like the subscription example from the previous section. We don't need to create a new subscription on every update, only if the `source` props has changed.
146+
However, this may be overkill in some cases, like the subscription example from the previous section. We don't need to create a new subscription on every update, only if the `source` prop has changed.
147147

148148
To implement this, pass a second argument to `useEffect` that is the array of values that the effect depends on. Our updated example now looks like this:
149149

content/docs/static-type-checking.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ Create React App supports TypeScript out of the box.
175175
To create a **new project** with TypeScript support, run:
176176

177177
```bash
178-
npx create-react-app my-app --typescript
178+
npx create-react-app my-app --template typescript
179179
```
180180

181181
You can also add it to an **existing Create React App project**, [as documented here](https://facebook.github.io/create-react-app/docs/adding-typescript).

content/docs/strict-mode.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,9 @@ The commit phase is usually very fast, but rendering can be slow. For this reaso
8787

8888
Render phase lifecycles include the following class component methods:
8989
* `constructor`
90-
* `componentWillMount`
91-
* `componentWillReceiveProps`
92-
* `componentWillUpdate`
90+
* `componentWillMount` (or `UNSAFE_componentWillMount`)
91+
* `componentWillReceiveProps` (or `UNSAFE_componentWillReceiveProps`)
92+
* `componentWillUpdate` (or `UNSAFE_componentWillUpdate`)
9393
* `getDerivedStateFromProps`
9494
* `shouldComponentUpdate`
9595
* `render`

0 commit comments

Comments
 (0)