Skip to content

Commit 385c7cb

Browse files
authored
Merge branch 'master' into translate-refs-must-have-owner
2 parents a7484b5 + b7c01cd commit 385c7cb

File tree

12 files changed

+272
-144
lines changed

12 files changed

+272
-144
lines changed

Diff for: content/community/conferences.md

+8-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ April 24-26 in Helsinki, Finland
1717

1818
[Website](https://react-finland.fi/) - [Twitter](https://twitter.com/ReactFinland)
1919

20-
### ReactJS Girls Conference
20+
### ReactJS Girls Conference {#reactjs-girls-conference}
2121
May 3, 2019 in London, UK
2222

2323
[Website](https://reactjsgirls.com/) - [Twitter](https://twitter.com/reactjsgirls)
@@ -47,12 +47,12 @@ June 21, 2019 Chicago, Illinois USA
4747

4848
[Website](https://reactloop.com) - [Twitter](https://twitter.com/ReactLoop)
4949

50-
### Chain React 2019
50+
### Chain React 2019 {#chain-react-2019}
5151
July 11-12, 2019. Portland, OR, USA.
5252

5353
[Website](https://infinite.red/ChainReactConf)
5454

55-
### React Rally 2019
55+
### React Rally 2019 {#react-rally-2019}
5656
August 22-23, 2019. Salt Lake City, USA.
5757

5858
[Website](https://www.reactrally.com/) - [Twitter](https://twitter.com/ReactRally) - [Instagram](https://www.instagram.com/reactrally/)
@@ -72,6 +72,11 @@ September 13th, 2019. New York, USA
7272

7373
[Website](https://reactnewyork.com/) - [Twitter](https://twitter.com/reactnewyork)
7474

75+
### React Boston 2019 {#react-boston-2019}
76+
September 21-22, 2019 in Boston, Massachusetts USA
77+
78+
[Website](https://www.reactboston.com/) - [Twitter](https://twitter.com/reactboston)
79+
7580
### React India 2019 {#react-india-2019}
7681
September 26-28, 2019 in Goa, India
7782

Diff for: content/docs/getting-started.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ React 문서는 Javascript 프로그래밍에 익숙한 사람을 대상으로
9999

100100
### 고급 개념 {#advanced-concepts}
101101

102-
[주요 개념](#main-concepts)에 익숙해지고 React를 더 많이 다루게 되면 보다 고급 주제에 관심을 가지게 될 것입니다. 이 섹션에서는 [context](/docs/context.html)[refs](/docs/refs-and-dom.html)와 같이 강력하지만 일반적으로 사용되지는 않는 React 기능을 소개합니다.
102+
[주요 개념](/docs/hello-world.html)에 익숙해지고 React를 더 많이 다루게 되면 보다 고급 주제에 관심을 가지게 될 것입니다. 이 섹션에서는 [context](/docs/context.html)[refs](/docs/refs-and-dom.html)와 같이 강력하지만 일반적으로 사용되지는 않는 React 기능을 소개합니다.
103103

104104
### API 참조 {#api-reference}
105105

Diff for: content/docs/hooks-faq.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ There are a few more heuristics, and they might change over time as we fine-tune
209209

210210
* `componentDidCatch` and `getDerivedStateFromError`: There are no Hook equivalents for these methods yet, but they will be added soon.
211211

212-
### How can I do data fetching with Hooks?
212+
### How can I do data fetching with Hooks? {#how-can-i-do-data-fetching-with-hooks}
213213

214214
Here is a [small demo](https://codesandbox.io/s/jvvkoo8pq3) to get you started. To learn more, check out [this article](https://www.robinwieruch.de/react-hooks-fetch-data/) about data fetching with Hooks.
215215

@@ -654,7 +654,7 @@ function ProductDetails({ fetchProduct })
654654

655655
Note that in the above example we **need** to keep the function in the dependencies list. This ensures that a change in the `productId` prop of `ProductPage` automatically triggers a refetch in the `ProductDetails` component.
656656

657-
### What can I do if my effect dependencies change too often?
657+
### What can I do if my effect dependencies change too often? {#what-can-i-do-if-my-effect-dependencies-change-too-often}
658658

659659
Sometimes, your effect may be using reading state that changes too often. You might be tempted to omit that state from a list of dependencies, but that usually leads to bugs:
660660

Diff for: content/docs/hooks-reference.md

+111-111
Large diffs are not rendered by default.

Diff for: content/docs/hooks-state.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ prev: hooks-overview.html
88

99
*Hook*은 React 16.8버전에 새로 추가되었습니다. Hook은 클래스 컴포넌트를 작성하지 않아도 state와 같은 특징들을 사용할 수 있습니다.
1010

11-
[이전 페이지](/docs/hooks-intro.html)에서 아래의 예시를 통해 Hook을 소개했습니다.
11+
[Hook 소개](/docs/hooks-intro.html)에서 아래 예시를 통해 Hook과 친해졌습니다.
1212

1313
```js{4-5}
1414
import React, { useState } from 'react';

Diff for: content/languages.yml

+11-3
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,18 @@
2323
translated_name: বাংলা
2424
code: bn
2525
status: 0
26+
- name: Catalan
27+
translated_name: Català
28+
code: ca
29+
status: 0
2630
- name: German
2731
translated_name: Deutsch
2832
code: de
2933
status: 1
3034
- name: Greek
3135
translated_name: Ελληνικά
3236
code: el
33-
status: 0
37+
status: 1
3438
- name: Spanish
3539
translated_name: Español
3640
code: es
@@ -99,6 +103,10 @@
99103
translated_name: മലയാളം
100104
code: ml
101105
status: 0
106+
- name: Mongolian
107+
translated_name: Монгол хэл
108+
code: mn
109+
status: 0
102110
- name: Nepali
103111
translated_name: नेपाली
104112
code: ne
@@ -110,7 +118,7 @@
110118
- name: Polish
111119
translated_name: Polski
112120
code: pl
113-
status: 1
121+
status: 2
114122
- name: Portuguese (Brazil)
115123
translated_name: Português do Brasil
116124
code: pt-br
@@ -154,7 +162,7 @@
154162
- name: Ukrainian
155163
translated_name: Українська
156164
code: uk
157-
status: 1
165+
status: 2
158166
- name: Urdu
159167
translated_name: اردو
160168
code: ur

Diff for: content/warnings/unknown-prop.md

+12-12
Original file line numberDiff line numberDiff line change
@@ -3,37 +3,37 @@ title: Unknown Prop Warning
33
layout: single
44
permalink: warnings/unknown-prop.html
55
---
6-
The unknown-prop warning will fire if you attempt to render a DOM element with a prop that is not recognized by React as a legal DOM attribute/property. You should ensure that your DOM elements do not have spurious props floating around.
6+
올바른 DOM 어트리뷰트/프로퍼티로 인식되지 않는 DOM 엘리먼트를 렌더링하려고 하면 unknown-prop 경고가 발생합니다. DOM 엘리먼트에 잘못된 props가 추가되지 않도록 해야 합니다.
77

8-
There are a couple of likely reasons this warning could be appearing:
8+
이 경고가 표시되는 몇 가지 이유가 있습니다.
99

10-
1. Are you using `{...this.props}` or `cloneElement(element, this.props)`? Your component is transferring its own props directly to a child element (eg. [transferring props](/docs/transferring-props.html)). When transferring props to a child component, you should ensure that you are not accidentally forwarding props that were intended to be interpreted by the parent component.
10+
1. `{...this.props}` 또는 `cloneElement(element, this.props)`를 사용하고 있습니까? 그렇다면 컴포넌트가 자기 자신의 props를 자식 엘리먼트로 직접 전달하는 경우입니다. (예시. [props 전달](/docs/transferring-props.html)) 자식 컴포넌트로 props를 전달할 때 부모 컴포넌트에서 사용되는 props를 실수로 전달하지 않도록 해야 합니다.
1111

12-
2. You are using a non-standard DOM attribute on a native DOM node, perhaps to represent custom data. If you are trying to attach custom data to a standard DOM element, consider using a custom data attribute as described [on MDN](https://developer.mozilla.org/en-US/docs/Web/Guide/HTML/Using_data_attributes).
12+
2. 사용자 정의 데이터를 나타내기 위해 네이티브 DOM 노드에서 비표준 DOM 어트리뷰트를 사용하고 있는 경우입니다. 표준 DOM 엘리먼트에 사용자 정의 데이터를 추가하려는 경우 [MDN](https://developer.mozilla.org/en-US/docs/Web/Guide/HTML/Using_data_attributes)에 설명된 사용자 정의 data 어트리뷰트를 사용해보세요.
1313

14-
3. React does not yet recognize the attribute you specified. This will likely be fixed in a future version of React. However, React currently strips all unknown attributes, so specifying them in your React app will not cause them to be rendered.
14+
3. React가 아직 지정된 어트리뷰트를 인식하지 못하는 경우입니다. 이것은 다음 React 버전에서 수정될 수 있습니다. 그러나 React는 현재 알 수 없는 모든 어트리뷰트를 제거하므로 React 앱에서 렌더링되지 않습니다.
1515

16-
4. You are using a React component without an upper case. React interprets it as a DOM tag because [React JSX transform uses the upper vs. lower case convention to distinguish between user-defined components and DOM tags](/docs/jsx-in-depth.html#user-defined-components-must-be-capitalized).
16+
4. React 컴포넌트 이름에 대문자가 포함되어 있지 않은 경우입니다. [React JSX에서는 대소문자 규칙을 사용하여 사용자 정의 컴포넌트와 DOM 태그를 구별](/docs/jsx-in-depth.html#user-defined-components-must-be-capitalized)하기 때문에 React 컴포넌트에 대문자가 없다면 이것을 DOM 태그로 해석합니다.
1717

1818
---
1919

20-
To fix this, composite components should "consume" any prop that is intended for the composite component and not intended for the child component. Example:
20+
이 문제를 해결하려면, 합성 컴포넌트는 자식 컴포넌트를 위해 만들어진 것이 아닌 합성 컴포넌트를 위해 만들어진 모든 props를 "소비해야 합니다". 예를 들어,
2121

22-
**Bad:** Unexpected `layout` prop is forwarded to the `div` tag.
22+
**금지** 예기치 않은 `layout` prop이 `div` 태그에 전달됩니다.
2323

2424
```js
2525
function MyDiv(props) {
2626
if (props.layout === 'horizontal') {
27-
// BAD! Because you know for sure "layout" is not a prop that <div> understands.
27+
// 금지! "layout"은 <div> 가 이해하는 prop이 아니기 때문입니다.
2828
return <div {...props} style={getHorizontalStyle()} />
2929
} else {
30-
// BAD! Because you know for sure "layout" is not a prop that <div> understands.
30+
// 금지! "layout"은 <div> 가 이해하는 prop이 아니기 때문입니다.
3131
return <div {...props} style={getVerticalStyle()} />
3232
}
3333
}
3434
```
3535

36-
**Good:** The spread operator can be used to pull variables off props, and put the remaining props into a variable.
36+
**권장** 전개 연산자(spread operator)를 사용하여 변수를 props에서 빼내고 나머지 props를 변수에 넣을 수 있습니다.
3737

3838
```js
3939
function MyDiv(props) {
@@ -46,7 +46,7 @@ function MyDiv(props) {
4646
}
4747
```
4848

49-
**Good:** You can also assign the props to a new object and delete the keys that you're using from the new object. Be sure not to delete the props from the original `this.props` object, since that object should be considered immutable.
49+
**권장** 새 객체에 props를 복사하고 새 객체에서 사용 중인 key를 삭제할 수도 있습니다. 원래 `this.props` 객체에서 그 객체를 삭제하면 안됩니다. 왜냐하면 그 객체는 불변이어야 하기 때문입니다.
5050

5151
```js
5252
function MyDiv(props) {

Diff for: gatsby-config.js

+1
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ module.exports = {
5555
maxWidth: 840,
5656
},
5757
},
58+
'gatsby-remark-external-links',
5859
'gatsby-remark-header-custom-ids',
5960
{
6061
resolve: 'gatsby-remark-code-repls',

Diff for: package.json

+1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
"gatsby-remark-code-repls": "^2.0.0",
3333
"gatsby-remark-copy-linked-files": "^2.0.0",
3434
"gatsby-remark-embed-snippet": "^3.0.0",
35+
"gatsby-remark-external-links": "^0.0.4",
3536
"gatsby-remark-images": "^2.0.0",
3637
"gatsby-remark-prismjs": "^3.0.2",
3738
"gatsby-remark-responsive-iframe": "^2.0.0",

Diff for: src/components/LayoutHeader/DocSearch.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class DocSearch extends Component<{}, State> {
2222
// eslint-disable-next-line no-undef
2323
if (window.docsearch) {
2424
window.docsearch({
25-
apiKey: '36221914cce388c46d0420343e0bb32e',
25+
apiKey: '61afa0daa482db2154b69c27d642f815',
2626
indexName: 'react',
2727
inputSelector: '#algolia-doc-search',
2828
});

Diff for: src/theme.js

+43-9
Original file line numberDiff line numberDiff line change
@@ -285,15 +285,24 @@ const sharedStyles = {
285285
},
286286

287287
'& h2': {
288-
borderTop: `1px solid ${colors.divider}`,
289-
marginTop: 44,
290-
paddingTop: 40,
288+
'::before': {
289+
content: ' ',
290+
display: 'block',
291+
borderBottom: `1px solid ${colors.divider}`,
292+
paddingTop: 44,
293+
marginBottom: 40,
294+
},
295+
291296
lineHeight: 1.2,
292297

293298
':first-child': {
294-
borderTop: 0,
295-
marginTop: 0,
296-
paddingTop: 0,
299+
'::before': {
300+
content: ' ',
301+
display: 'block',
302+
borderBottom: 0,
303+
paddingTop: 40,
304+
marginTop: -80,
305+
},
297306
},
298307

299308
[media.lessThan('large')]: {
@@ -310,7 +319,12 @@ const sharedStyles = {
310319
},
311320

312321
'& h3': {
313-
paddingTop: 45,
322+
'::before': {
323+
content: ' ',
324+
display: 'block',
325+
paddingTop: 90,
326+
marginTop: -45,
327+
},
314328

315329
[media.lessThan('small')]: {
316330
overflowWrap: 'break-word',
@@ -324,14 +338,25 @@ const sharedStyles = {
324338
},
325339

326340
'& h2 + h3, & h2 + h3:first-of-type': {
327-
paddingTop: 30,
341+
'::before': {
342+
content: ' ',
343+
display: 'block',
344+
paddingTop: 60,
345+
marginTop: -30,
346+
},
328347
},
329348

330349
'& h4': {
350+
'::before': {
351+
content: ' ',
352+
display: 'block',
353+
paddingTop: 100,
354+
marginTop: -50,
355+
},
356+
331357
fontSize: 20,
332358
color: colors.subtle,
333359
lineHeight: 1.3,
334-
marginTop: 50,
335360
fontWeight: 400,
336361
},
337362

@@ -414,6 +439,15 @@ const sharedStyles = {
414439
'& .gatsby-highlight + blockquote': {
415440
marginTop: 40,
416441
},
442+
443+
'& .gatsby-highlight + h4': {
444+
'::before': {
445+
content: ' ',
446+
display: 'block',
447+
paddingTop: 85,
448+
marginTop: -60,
449+
},
450+
},
417451
},
418452
};
419453

0 commit comments

Comments
 (0)