Skip to content

Commit 5a598bd

Browse files
authored
Merge pull request #249 from reactjs/sync-8f7ffa47
Sync with reactjs.org @ 8f7ffa4
2 parents 43b1ccd + 8f5a9a9 commit 5a598bd

23 files changed

+351
-195
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
1+
Note to Hacktoberfest 🎃 participants:
12

3+
While we appreciate the enthusiasm, we are experiencing a high volume of drive-by pull requests (one-line changes, README tweaks, etc.). Please remember that hundreds of people are subscribed to this repo and will receive notifications for these PRs. Spam submissions will be closed and won't count towards your Hacktoberfest goals.
24

5+
Please search for issues tagged [`good first issue`][gfi] or [`hacktoberfest`][hacktoberfest] to find things to work on.
6+
7+
You can also search [all of GitHub][all].
8+
9+
[gfi]: https://github.com/reactjs/reactjs.org/issues?q=is%3Aissue+is%3Aopen+label%3A"good+first+issue"
10+
[hacktoberfest]: https://github.com/reactjs/reactjs.org/issues?q=is%3Aissue+is%3Aopen+label%3A"good+first+issue"
11+
[all]: https://github.com/search?q=is%3Aissue+hacktoberfest
312
<!--
413
514
Thank you for the PR! Contributors like you keep React awesome!

content/community/conferences.md

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,31 +12,31 @@ Do you know of a local React.js conference? Add it here! (Please keep the list c
1212

1313
## Upcoming Conferences {#upcoming-conferences}
1414

15-
### React Native EU 2020 {#react-native-eu-2020}
16-
September 3-4, 2020 - remote event
17-
18-
[Website](https://www.react-native.eu/) - [Twitter](https://twitter.com/react_native_eu) - [Facebook](https://www.facebook.com/reactnativeeu/) - [YouTube](https://www.youtube.com/watch?v=m0GfmlGFh3E&list=PLZ3MwD-soTTHy9_88QPLF8DEJkvoB5Tl-) - [Instagram](https://www.instagram.com/reactnative_eu/)
19-
20-
### render(ATL) 2020 {#render-atlanta-2020}
21-
September 13-15, 2020. Atlanta, GA, USA.
22-
23-
[Website](https://renderatl.com) - [Twitter](https://twitter.com/renderATL) - [Instagram](https://www.instagram.com/renderatl/) - [Facebook](https://www.facebook.com/renderatl/) - [LinkedIn](https://www.linkedin.com/company/renderatl)
24-
2515
### React Summit 2020 {#react-summit-2020}
26-
7am PST / 1pm EST / 4pm CEST October 15-16, 2020 - remote event
16+
October 15-16, 2020, 7am PST / 10am EST / 4pm CEST - remote event
2717

2818
[Website](https://reactsummit.com) - [Twitter](https://twitter.com/reactsummit) - [Facebook](https://www.facebook.com/reactamsterdam) - [Videos](https://youtube.com/c/ReactConferences)
2919

30-
### React Day Berlin 2020 {#react-day-berlin-2020}
31-
November 25-27, 2020 in Berlin, Germany
20+
### React Conf Brasil 2020 {#react-conf-brasil-2020}
21+
November 21, 2020 - remote event
3222

33-
[Website](https://reactday.berlin) - [Twitter](https://twitter.com/reactdayberlin) - [Facebook](https://www.facebook.com/reactdayberlin/) - [Videos](https://www.youtube.com/reactdayberlin)
23+
[Website](https://reactconf.com.br/) - [Twitter](https://twitter.com/reactconfbr) - [Slack](https://react.now.sh/)
3424

3525
### React Next 2020 {#react-next-2020}
36-
December 1, 2020. Tel Aviv, Israel.
26+
December 1-2, 2020 - remote event
3727

3828
[Website](https://react-next.com/) - [Twitter](https://twitter.com/reactnext) - [Facebook](https://www.facebook.com/ReactNext2016/)
3929

30+
### render(ATL) 2021 {#render-atlanta-2021}
31+
September 13-15, 2021. Atlanta, GA, USA
32+
33+
[Website](https://renderatl.com) - [Twitter](https://twitter.com/renderATL) - [Instagram](https://www.instagram.com/renderatl/) - [Facebook](https://www.facebook.com/renderatl/) - [LinkedIn](https://www.linkedin.com/company/renderatl)
34+
35+
### React India 2021 {#react-india-2021}
36+
November 12-13, 2021 in Mumbai, India
37+
38+
[Website](https://www.reactindia.io) - [Twitter](https://twitter.com/react_india) - [Facebook](https://www.facebook.com/ReactJSIndia/) - [LinkedIn](https://www.linkedin.com/showcase/14545585) - [YouTube](https://www.youtube.com/channel/UCaFbHCBkPvVv1bWs_jwYt3w/videos) [Website](https://www.reactindia.io) - [Twitter](https://twitter.com/react_india) - [Facebook](https://www.facebook.com/ReactJSIndia/) - [LinkedIn](https://www.linkedin.com/showcase/14545585) - [YouTube](https://www.youtube.com/channel/UCaFbHCBkPvVv1bWs_jwYt3w/videos)
39+
4040
## Past Conferences {#past-conferences}
4141

4242
### React.js Conf 2015 {#reactjs-conf-2015}
@@ -470,3 +470,8 @@ May 1, 2020. Streamed online on YouTube.
470470
May 14-15, 2020 in Paris, France
471471

472472
[Website](https://www.react-europe.org) - [Twitter](https://twitter.com/ReactEurope) - [Facebook](https://www.facebook.com/ReactEurope) - [Videos](https://www.youtube.com/c/ReacteuropeOrgConf)
473+
474+
### React Native EU 2020 {#react-native-eu-2020}
475+
September 3-4, 2020 - remote event
476+
477+
[Website](https://www.react-native.eu/) - [Twitter](https://twitter.com/react_native_eu) - [Facebook](https://www.facebook.com/reactnativeeu/) - [YouTube](https://www.youtube.com/watch?v=m0GfmlGFh3E&list=PLZ3MwD-soTTHy9_88QPLF8DEJkvoB5Tl-) - [Instagram](https://www.instagram.com/reactnative_eu/)

content/community/meetups.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,9 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
4848
* [Beijing](https://www.meetup.com/Beijing-ReactJS-Meetup/)
4949

5050
## Colombia {#colombia}
51+
* [Bogotá](https://www.meetup.com/meetup-group-iHIeHykY/)
5152
* [Medellin](https://www.meetup.com/React-Medellin/)
53+
* [Cali](https://www.meetup.com/reactcali/)
5254

5355
## Denmark {#denmark}
5456
* [Aalborg](https://www.meetup.com/Aalborg-React-React-Native-Meetup/)
@@ -147,7 +149,7 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
147149
* [Zurich](https://www.meetup.com/Zurich-ReactJS-Meetup/)
148150

149151
## Turkey {#turkey}
150-
* [Istanbul](https://www.meetup.com/ReactJS-Istanbul/)
152+
* [Istanbul](https://kommunity.com/reactjs-istanbul)
151153

152154
## Ukraine {#ukraine}
153155
* [Kyiv](https://www.meetup.com/Kyiv-ReactJS-Meetup)
@@ -164,6 +166,7 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
164166
* [Cleveland, OH - ReactJS](https://www.meetup.com/Cleveland-React/)
165167
* [Columbus, OH - ReactJS](https://www.meetup.com/ReactJS-Columbus-meetup/)
166168
* [Dallas, TX - ReactJS](https://www.meetup.com/ReactDallas/)
169+
* [Dallas, TX - [Remote] React JS](https://www.meetup.com/React-JS-Group/)
167170
* [Detroit, MI - Detroit React User Group](https://www.meetup.com/Detroit-React-User-Group/)
168171
* [Irvine, CA - ReactJS](https://www.meetup.com/ReactJS-OC/)
169172
* [Kansas City, MO - ReactJS](https://www.meetup.com/Kansas-City-React-Meetup/)

content/community/podcasts.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ Podcasts dedicated to React and individual podcast episodes with React discussio
1818

1919
- [React Native Radio](https://devchat.tv/react-native-radio)
2020

21+
- [React Wednesdays](https://www.telerik.com/react-wednesdays) - Weekly live streams with the best and brightest in the React world
22+
2123
## Episodes {#episodes}
2224

2325
- [CodeWinds Episode 4](https://codewinds.com/podcast/004.html) - Pete Hunt talks with Jeff Barczewski about React.

content/docs/addons-animation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class TodoList extends React.Component {
5050
5151
render() {
5252
const items = this.state.items.map((item, i) => (
53-
<div key={item} onClick={() => this.handleRemove(i)}>
53+
<div key={i} onClick={() => this.handleRemove(i)}>
5454
{item}
5555
</div>
5656
));

content/docs/code-splitting.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ import("./math").then(math => {
7878
```
7979

8080
Webpack이 이 구문을 만나게 되면 앱의 코드를 분할합니다.
81-
Create React App을 사용하고 있다면 이미 Webpack이 구성이 되어 있기 때문에 즉시 [사용](https://facebook.github.io/create-react-app/docs/code-splitting)할 수 있습니다.
81+
Create React App을 사용하고 있다면 이미 Webpack이 구성이 되어 있기 때문에 즉시 [사용](https://create-react-app.dev/docs/code-splitting/)할 수 있습니다.
8282
[Next.js](https://nextjs.org/docs/advanced-features/dynamic-import) 역시 지원합니다.
8383
[코드 분할 가이드](https://webpack.js.org/guides/code-splitting/)를 참조하세요. Webpack 설정은 [가이드](https://gist.github.com/gaearon/ca6e803f5c604d37468b0091d9959269)에 있습니다.
8484

content/docs/conditional-rendering.md

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,20 @@ JavaScript에서 `true && expression`은 항상 `expression`으로 평가되고
152152

153153
따라서 `&&` 뒤의 엘리먼트는 조건이 `true`일때 출력이 됩니다. 조건이 `false`라면 React는 무시합니다.
154154

155-
### 조건부 연산자로 If-Else구문 인라인으로 표현하기{#inline-if-else-with-conditional-operator}
155+
false로 평가될 수 있는 표현식을 반환하면 `&&` 뒤에 있는 표현식은 건너뛰지만 false로 평가될 수 있는 표현식이 반환된다는 것에 주의해주세요. 아래 예시에서, `<div>0</div>`이 render 메서드에서 반환됩니다.
156+
157+
```javascript{2,5}
158+
render() {
159+
const count = 0;
160+
return (
161+
<div>
162+
{ count && <h1>Messages: {count}</h1>}
163+
</div>
164+
);
165+
}
166+
```
167+
168+
### 조건부 연산자로 If-Else구문 인라인으로 표현하기 {#inline-if-else-with-conditional-operator}
156169

157170
엘리먼트를 조건부로 렌더링하는 다른 방법은 조건부 연산자인 [`condition ? true: false`](https://developer.mozilla.org/ko/docs/Web/JavaScript/Reference/Operators/Conditional_Operator)를 사용하는 것입니다.
158171

content/docs/faq-functions.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,6 @@ const A = 65 // ASCII character code
152152
class Alphabet extends React.Component {
153153
constructor(props) {
154154
super(props);
155-
this.handleClick = this.handleClick.bind(this);
156155
this.state = {
157156
justClicked: null,
158157
letters: Array.from({length: 26}, (_, i) => String.fromCharCode(A + i))

content/docs/reference-profiler.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ render(
4949
```
5050

5151
`Profiler` components can also be nested to measure different components within the same subtree:
52-
```js{2,6,8}
52+
```js{3,5,8}
5353
render(
5454
<App>
5555
<Profiler id="Panel" onRender={callback}>

content/docs/reference-react-component.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class Welcome extends React.Component {
3939
4040
### 컴포넌트 생명주기 {#the-component-lifecycle}
4141

42-
모든 컴포넌트는 여러 종류의 "생명주기 메서드"를 가지며, 이 메서드를 오버라이딩하여 특정 시점에 코드가 실행되도록 설정할 수 있습니다. [이 생명주기 도표](http://projects.wojtekmaj.pl/react-lifecycle-methods-diagram/)를 필요할 때마다 활용하면 좋습니다. 아래 목록에서 자주 사용되는 생명주기 메서드를 **진하게** 표시했습니다. 나머지 것들은 상대적으로 자주 사용되지 않습니다.
42+
모든 컴포넌트는 여러 종류의 "생명주기 메서드"를 가지며, 이 메서드를 오버라이딩하여 특정 시점에 코드가 실행되도록 설정할 수 있습니다. [이 생명주기 도표](https://projects.wojtekmaj.pl/react-lifecycle-methods-diagram/)를 필요할 때마다 활용하면 좋습니다. 아래 목록에서 자주 사용되는 생명주기 메서드를 **진하게** 표시했습니다. 나머지 것들은 상대적으로 자주 사용되지 않습니다.
4343

4444
#### 마운트 {#mounting}
4545

@@ -109,7 +109,7 @@ props 또는 state가 변경되면 갱신이 발생합니다. 아래 메서드
109109

110110
### 자주 사용되는 생명주기 메서드 {#commonly-used-lifecycle-methods}
111111

112-
이 섹션에서 다루는 메서드들을 사용하면 React 컴포넌트를 만들 때에 마주치는 대부분의 경우를 해결할 수 있습니다. [이 생명주기 도표](http://projects.wojtekmaj.pl/react-lifecycle-methods-diagram/)를 시각 자료로 활용하면 좋습니다.
112+
이 섹션에서 다루는 메서드들을 사용하면 React 컴포넌트를 만들 때에 마주치는 대부분의 경우를 해결할 수 있습니다. [이 생명주기 도표](https://projects.wojtekmaj.pl/react-lifecycle-methods-diagram/)를 시각 자료로 활용하면 좋습니다.
113113

114114
### `render()` {#render}
115115

@@ -244,7 +244,7 @@ componentWillUnmount()
244244

245245
### 잘 사용하지 않는 생명주기 메서드 {#rarely-used-lifecycle-methods}
246246

247-
이 섹션에서 다루는 메서드들은 잘 사용되지 않습니다. 유용하게 사용되는 경우가 아주 가끔 있지만, 대부분의 컴포넌트에서는 필요하지 않습니다. 대부분의 메서드들은 [이 생명주기 도표](http://projects.wojtekmaj.pl/react-lifecycle-methods-diagram/)의 최상단에 위치하는 "덜 일반적인 라이프 사이클 표시" 체크박스를 클릭하면 확인할 수 있습니다.
247+
이 섹션에서 다루는 메서드들은 잘 사용되지 않습니다. 유용하게 사용되는 경우가 아주 가끔 있지만, 대부분의 컴포넌트에서는 필요하지 않습니다. 대부분의 메서드들은 [이 생명주기 도표](https://projects.wojtekmaj.pl/react-lifecycle-methods-diagram/)의 최상단에 위치하는 "덜 일반적인 라이프 사이클 표시" 체크박스를 클릭하면 확인할 수 있습니다.
248248

249249
### `shouldComponentUpdate()` {#shouldcomponentupdate}
250250

0 commit comments

Comments
 (0)