Skip to content

Commit 1d8d507

Browse files
authored
Merge branch 'master' into hooks-state
2 parents bfdb529 + 90f06da commit 1d8d507

File tree

11 files changed

+46
-48
lines changed

11 files changed

+46
-48
lines changed

content/community/conferences.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,6 @@ June 21, 2019 Chicago, Illinois USA
5252

5353
[Website](https://reactloop.com) - [Twitter](https://twitter.com/ReactLoop)
5454

55-
### React Week '19 {#RWNY19}
56-
July 15-21, 2019. New York City, USA
57-
58-
[Website](https://reactweek.nyc) - [Twitter](https://twitter.com/ReactWeek)
59-
6055
### React Rally 2019
6156
August 22-23, 2019. Salt Lake City, USA.
6257

content/community/meetups.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
8888

8989
## Pakistan {#pakistan}
9090
* [Karachi](https://www.facebook.com/groups/902678696597634/)
91+
* [Lahore](https://www.facebook.com/groups/ReactjsLahore/)
9192

9293
## Peru {#peru}
9394
* [Lima](https://www.meetup.com/ReactJS-Peru/)
@@ -130,8 +131,8 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
130131
* [New York, NY - ReactJS](https://www.meetup.com/NYC-Javascript-React-Group/)
131132
* [New York, NY - React Ladies](https://www.meetup.com/React-Ladies/)
132133
* [New York, NY - React Native](https://www.meetup.com/React-Native-NYC/)
133-
* [New York, NY - ReactNYC](https://www.meetup.com/ReactNYC/)
134134
* [Palo Alto, CA - React Native](https://www.meetup.com/React-Native-Silicon-Valley/)
135+
* [Philadelphia, PA - ReactJS](https://www.meetup.com/RQ-React/)
135136
* [Phoenix, AZ - ReactJS](https://www.meetup.com/ReactJS-Phoenix/)
136137
* [Pittsburgh, PA - ReactJS/React Native](https://www.meetup.com/ReactPgh/)
137138
* [Portland, OR - ReactJS](https://www.meetup.com/Portland-ReactJS/)

content/docs/faq-ajax.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
---
22
id: faq-ajax
3-
title: AJAX and APIs
3+
title: AJAX APIs
44
permalink: docs/faq-ajax.html
55
layout: docs
66
category: FAQ
77
---
88

9-
### How can I make an AJAX call? {#how-can-i-make-an-ajax-call}
9+
### 어떻게 AJAX 호출을 할 수 있을까요? {#how-can-i-make-an-ajax-call}
1010

11-
You can use any AJAX library you like with React. Some popular ones are [Axios](https://github.com/axios/axios), [jQuery AJAX](https://api.jquery.com/jQuery.ajax/), and the browser built-in [window.fetch](https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API).
11+
당신이 선호하는 AJAX 라이브러리를 React와 함께 사용할 수 있습니다. 유명한 라이브러리로는 [Axios](https://github.com/axios/axios), [jQuery AJAX](https://api.jquery.com/jQuery.ajax/), 그리고 브라우저에 내장된 [window.fetch](https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API) 등이 있습니다.
1212

13-
### Where in the component lifecycle should I make an AJAX call? {#where-in-the-component-lifecycle-should-i-make-an-ajax-call}
13+
### 컴포넌트의 생명주기 중 어디에서 AJAX 호출을 할 수 있나요? {#where-in-the-component-lifecycle-should-i-make-an-ajax-call}
1414

15-
You should populate data with AJAX calls in the [`componentDidMount`](/docs/react-component.html#mounting) lifecycle method. This is so you can use `setState` to update your component when the data is retrieved.
15+
AJAX 호출을 통한 데이터는 생명주기 메서드 중 [`componentDidMount`](/docs/react-component.html#mounting) 안에 추가되어야 합니다. 이는 데이터를 받아 올 때 `setState`를 통하여 컴포넌트를 업데이트하기 위함입니다.
1616

17-
### Example: Using AJAX results to set local state {#example-using-ajax-results-to-set-local-state}
17+
### 예시: 로컬 state를 설정하기 위해 AJAX 결과 사용하기 {#example-using-ajax-results-to-set-local-state}
1818

19-
The component below demonstrates how to make an AJAX call in `componentDidMount` to populate local component state.
19+
아래 컴포넌트는 로컬 컴포넌트의 state를 채우기 위하여 `componentDidMount` 안에서 어떻게 AJAX 호출을 만드는지 보여 줍니다.
2020

21-
The example API returns a JSON object like this:
21+
API 예시는 다음과 같은 JSON 객체를 반환합니다.
2222

2323
```
2424
{
@@ -50,9 +50,9 @@ class MyComponent extends React.Component {
5050
items: result.items
5151
});
5252
},
53-
// Note: it's important to handle errors here
54-
// instead of a catch() block so that we don't swallow
55-
// exceptions from actual bugs in components.
53+
// 주의: 컴포넌트의 실제 버그에서 발생하는 예외사항들을 넘기지 않도록
54+
// 에러를 catch() 블록(block)에서 처리하기보다는
55+
// 이 부분에서 처리하는 것이 중요합니다.
5656
(error) => {
5757
this.setState({
5858
isLoaded: true,

content/docs/faq-build.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
---
22
id: faq-build
3-
title: Babel, JSX, and Build Steps
3+
title: Babel, JSX, 그리고 빌드 과정들
44
permalink: docs/faq-build.html
55
layout: docs
66
category: FAQ
77
---
88

9-
### Do I need to use JSX with React? {#do-i-need-to-use-jsx-with-react}
9+
### React에 JSX를 꼭 사용해야 하나요? {#do-i-need-to-use-jsx-with-react}
1010

11-
No! Check out ["React Without JSX"](/docs/react-without-jsx.html) to learn more.
11+
아니요! 더 자세한 내용을 위해 ["JSX 없이 React 사용하기"](/docs/react-without-jsx.html) 를 확인해 주세요.
1212

13-
### Do I need to use ES6 (+) with React? {#do-i-need-to-use-es6--with-react}
13+
### React에 ES6 (+)를 꼭 사용해야 하나요? {#do-i-need-to-use-es6--with-react}
1414

15-
No! Check out ["React Without ES6"](/docs/react-without-es6.html) to learn more.
15+
아니요! 더 자세한 내용을 위해 ["ES6 없이 React 사용하기"](/docs/react-without-es6.html) 를 확인해 주세요.
1616

17-
### How can I write comments in JSX? {#how-can-i-write-comments-in-jsx}
17+
### JSX에서 어떻게 주석을 달 수 있나요? {#how-can-i-write-comments-in-jsx}
1818

1919
```jsx
2020
<div>
21-
{/* Comment goes here */}
21+
{/* 주석은 여기에 */}
2222
Hello, {name}!
2323
</div>
2424
```
2525

2626
```jsx
2727
<div>
28-
{/* It also works
29-
for multi-line comments. */}
28+
{/* 여러 줄의
29+
주석도 가능합니다. */}
3030
Hello, {name}!
3131
</div>
3232
```

content/docs/optimizing-performance.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -430,6 +430,6 @@ x === z; // true
430430

431431
In this case, since a new reference is returned when mutating `x`, we can use a reference equality check `(x === y)` to verify that the new value stored in `y` is different than the original value stored in `x`.
432432

433-
Two other libraries that can help use immutable data are [seamless-immutable](https://github.com/rtfeldman/seamless-immutable) and [immutability-helper](https://github.com/kolodny/immutability-helper).
433+
Other libraries that can help use immutable data include [Immer](https://github.com/mweststrate/immer), [immutability-helper](https://github.com/kolodny/immutability-helper), and [seamless-immutable](https://github.com/rtfeldman/seamless-immutable).
434434

435435
Immutable data structures provide you with a cheap way to track changes on objects, which is all we need to implement `shouldComponentUpdate`. This can often provide you with a nice performance boost.

content/docs/reference-glossary.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ class Welcome extends React.Component {
122122

123123
컴포넌트와 관련된 일부 데이터가 시간에 따라 변경될 경우 `state`가 필요합니다. 예를 들어, `Checkbox` 컴포넌트는 `isChecked` state가 필요할 수 있으며, `NewsFeed` 컴포넌트는 `fetchedPosts`를 컴포넌트의 state를 통해 계속 주시하려고 할 수 있습니다.
124124

125-
`state``props`의 가장 중요한 차이점은 `props`는 부모 컴포넌트로부터 전달받지만, `state`는 컴포넌트에서 관리된다는 것입니다. 컴포넌트는 `props`를 변경할 수 없지만, `state`는 변경할 수 있습니다. `this.setState()`를 호출하면 컴포넌트에서 `state`를 변경할 수 있습니다. 또한, class로 정의된 컴포넌트만 `state`를 가질 수 있습니다.
125+
`state``props`의 가장 중요한 차이점은 `props`는 부모 컴포넌트로부터 전달받지만, `state`는 컴포넌트에서 관리된다는 것입니다. 컴포넌트는 `props`를 변경할 수 없지만, `state`는 변경할 수 있습니다.
126126

127127
데이터가 변경되는 각 특정한 부분에 대해, 해당 상태(state)를 "소유"하는 컴포넌트는 하나만 존재해야 합니다. 서로 다른 두 컴포넌트의 상태를 동기화하려고 하지 마십시오. 대신, 공통 상태를 두 컴포넌트의 공통 조상으로 [끌어올리고](/docs/lifting-state-up.html) 해당 데이터를 두 컴포넌트에 props로 전달하세요.
128128

content/docs/state-and-lifecycle.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,6 @@ To implement this, we need to add "state" to the `Clock` component.
7272

7373
State is similar to props, but it is private and fully controlled by the component.
7474

75-
We [mentioned before](/docs/components-and-props.html#functional-and-class-components) that components defined as classes have some additional features. Local state is exactly that: a feature available only to classes.
76-
7775
## Converting a Function to a Class {#converting-a-function-to-a-class}
7876

7977
You can convert a function component like `Clock` to a class in five steps:

content/languages.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,10 @@
7979
translated_name: ភាសាខ្មែរ
8080
code: km
8181
status: 0
82+
- name: Kannada
83+
translated_name: ಕನ್ನಡ
84+
code: kn
85+
status: 0
8286
- name: Korean
8387
translated_name: 한국어
8488
code: ko
@@ -146,7 +150,7 @@
146150
- name: Turkish
147151
translated_name: Türkçe
148152
code: tr
149-
status: 1
153+
status: 2
150154
- name: Ukrainian
151155
translated_name: Українська
152156
code: uk

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@
4646
"normalize.css": "^8.0.0",
4747
"prettier": "^1.7.4",
4848
"prismjs": "^1.15.0",
49-
"react": "16.8.3",
50-
"react-dom": "16.8.3",
49+
"react": "16.8.6",
50+
"react-dom": "16.8.6",
5151
"react-helmet": "^5.2.0",
5252
"react-live": "1.8.0-0",
5353
"remarkable": "^1.7.1",

src/site-constants.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// NOTE: We can't just use `location.toString()` because when we are rendering
99
// the SSR part in node.js we won't have a proper location.
1010
const urlRoot = 'https://reactjs.org';
11-
const version = '16.8.4';
11+
const version = '16.8.6';
1212
const babelURL = 'https://unpkg.com/[email protected]/babel.min.js';
1313

1414
export {babelURL, urlRoot, version};

0 commit comments

Comments
 (0)