Skip to content

Commit 7b68d74

Browse files
authored
Merge pull request #110 from reactjs/sync-b1691780
Sync with reactjs.org @ b169178
2 parents 88a3353 + 08db893 commit 7b68d74

File tree

9 files changed

+146
-18
lines changed

9 files changed

+146
-18
lines changed

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

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

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

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';

content/languages.yml

+9-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@
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
@@ -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

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',

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",

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

yarn.lock

+80-1
Original file line numberDiff line numberDiff line change
@@ -5844,6 +5844,15 @@ gatsby-remark-embed-snippet@^3.0.0:
58445844
parse-numeric-range "^0.0.2"
58455845
unist-util-map "^1.0.3"
58465846

5847+
gatsby-remark-external-links@^0.0.4:
5848+
version "0.0.4"
5849+
resolved "https://registry.yarnpkg.com/gatsby-remark-external-links/-/gatsby-remark-external-links-0.0.4.tgz#85b98c1e9dacfaa58085319648c904ff3cab42f0"
5850+
dependencies:
5851+
babel-runtime "^6.26.0"
5852+
is-relative-url "^2.0.0"
5853+
unist-util-find "^1.0.1"
5854+
unist-util-visit "^1.1.3"
5855+
58475856
gatsby-remark-images@^2.0.0:
58485857
version "2.0.4"
58495858
resolved "https://registry.yarnpkg.com/gatsby-remark-images/-/gatsby-remark-images-2.0.4.tgz#29894b85b4181527fa34514fb73218c8e7f89129"
@@ -8409,6 +8418,10 @@ lodash.isstring@^4.0.1:
84098418
resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"
84108419
integrity sha1-1SfftUVuynzJu5XV2ur4i6VKVFE=
84118420

8421+
lodash.iteratee@^4.5.0:
8422+
version "4.7.0"
8423+
resolved "https://registry.yarnpkg.com/lodash.iteratee/-/lodash.iteratee-4.7.0.tgz#be4177db289a8ccc3c0990f1db26b5b22fc1554c"
8424+
84128425
lodash.kebabcase@^4.1.1:
84138426
version "4.1.1"
84148427
resolved "https://registry.yarnpkg.com/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz#8489b1cb0d29ff88195cceca448ff6d6cc295c36"
@@ -8527,6 +8540,10 @@ loglevel@^1.4.1:
85278540
resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.1.tgz#e0fc95133b6ef276cdc8887cdaf24aa6f156f8fa"
85288541
integrity sha1-4PyVEztu8nbNyIh82vJKpvFW+Po=
85298542

8543+
longest-streak@^1.0.0:
8544+
version "1.0.0"
8545+
resolved "https://registry.yarnpkg.com/longest-streak/-/longest-streak-1.0.0.tgz#d06597c4d4c31b52ccb1f5d8f8fe7148eafd6965"
8546+
85308547
longest-streak@^2.0.1:
85318548
version "2.0.2"
85328549
resolved "https://registry.yarnpkg.com/longest-streak/-/longest-streak-2.0.2.tgz#2421b6ba939a443bb9ffebf596585a50b4c38e2e"
@@ -8653,6 +8670,10 @@ markdown-escapes@^1.0.0:
86538670
resolved "https://registry.yarnpkg.com/markdown-escapes/-/markdown-escapes-1.0.2.tgz#e639cbde7b99c841c0bacc8a07982873b46d2122"
86548671
integrity sha512-lbRZ2mE3Q9RtLjxZBZ9+IMl68DKIXaVAhwvwn9pmjnPLS0h/6kyBMgNhqi1xFJ/2yv6cSyv0jbiZavZv93JkkA==
86558672

8673+
markdown-table@^0.4.0:
8674+
version "0.4.0"
8675+
resolved "https://registry.yarnpkg.com/markdown-table/-/markdown-table-0.4.0.tgz#890c2c1b3bfe83fb00e4129b8e4cfe645270f9d1"
8676+
86568677
markdown-table@^1.1.0:
86578678
version "1.1.2"
86588679
resolved "https://registry.yarnpkg.com/markdown-table/-/markdown-table-1.1.2.tgz#c78db948fa879903a41bce522e3b96f801c63786"
@@ -9589,7 +9610,7 @@ on-headers@~1.0.1:
95899610
resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.1.tgz#928f5d0f470d49342651ea6794b0857c100693f7"
95909611
integrity sha1-ko9dD0cNSTQmUepnlLCFfBAGk/c=
95919612

9592-
once@^1.3.0, once@^1.3.1, once@^1.4.0:
9613+
once@^1.3.0, once@^1.3.1, once@^1.3.3, once@^1.4.0:
95939614
version "1.4.0"
95949615
resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
95959616
integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
@@ -11275,6 +11296,20 @@ remark-frontmatter@^1.2.0:
1127511296
fault "^1.0.1"
1127611297
xtend "^4.0.1"
1127711298

11299+
remark-parse@^1.1.0:
11300+
version "1.1.0"
11301+
resolved "http://registry.npmjs.org/remark-parse/-/remark-parse-1.1.0.tgz#c3ca10f9a8da04615c28f09aa4e304510526ec21"
11302+
dependencies:
11303+
collapse-white-space "^1.0.0"
11304+
extend "^3.0.0"
11305+
parse-entities "^1.0.2"
11306+
repeat-string "^1.5.4"
11307+
trim "0.0.1"
11308+
trim-trailing-lines "^1.0.0"
11309+
unherit "^1.0.4"
11310+
unist-util-remove-position "^1.0.0"
11311+
vfile-location "^2.0.0"
11312+
1127811313
remark-parse@^5.0.0:
1127911314
version "5.0.0"
1128011315
resolved "https://registry.yarnpkg.com/remark-parse/-/remark-parse-5.0.0.tgz#4c077f9e499044d1d5c13f80d7a98cf7b9285d95"
@@ -11303,6 +11338,19 @@ remark-retext@^3.1.0:
1130311338
dependencies:
1130411339
mdast-util-to-nlcst "^3.2.0"
1130511340

11341+
remark-stringify@^1.1.0:
11342+
version "1.1.0"
11343+
resolved "http://registry.npmjs.org/remark-stringify/-/remark-stringify-1.1.0.tgz#a7105e25b9ee2bf9a49b75d2c423f11b06ae2092"
11344+
dependencies:
11345+
ccount "^1.0.0"
11346+
extend "^3.0.0"
11347+
longest-streak "^1.0.0"
11348+
markdown-table "^0.4.0"
11349+
parse-entities "^1.0.2"
11350+
repeat-string "^1.5.4"
11351+
stringify-entities "^1.0.1"
11352+
unherit "^1.0.4"
11353+
1130611354
remark-stringify@^5.0.0:
1130711355
version "5.0.0"
1130811356
resolved "https://registry.yarnpkg.com/remark-stringify/-/remark-stringify-5.0.0.tgz#336d3a4d4a6a3390d933eeba62e8de4bd280afba"
@@ -11323,6 +11371,14 @@ remark-stringify@^5.0.0:
1132311371
unherit "^1.0.4"
1132411372
xtend "^4.0.1"
1132511373

11374+
remark@^5.0.1:
11375+
version "5.1.0"
11376+
resolved "http://registry.npmjs.org/remark/-/remark-5.1.0.tgz#cb463bd3dbcb4b99794935eee1cf71d7a8e3068c"
11377+
dependencies:
11378+
remark-parse "^1.1.0"
11379+
remark-stringify "^1.1.0"
11380+
unified "^4.1.1"
11381+
1132611382
remark@^9.0.0:
1132711383
version "9.0.0"
1132811384
resolved "https://registry.yarnpkg.com/remark/-/remark-9.0.0.tgz#c5cfa8ec535c73a67c4b0f12bfdbd3a67d8b2f60"
@@ -13173,6 +13229,17 @@ unicode-property-aliases-ecmascript@^1.0.4:
1317313229
resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.4.tgz#5a533f31b4317ea76f17d807fa0d116546111dd0"
1317413230
integrity sha512-2WSLa6OdYd2ng8oqiGIWnJqyFArvhn+5vgx5GTxMbUYjCYKUcuKS62YLFF0R/BDGlB1yzXjQOLtPAfHsgirEpg==
1317513231

13232+
unified@^4.1.1:
13233+
version "4.2.1"
13234+
resolved "http://registry.npmjs.org/unified/-/unified-4.2.1.tgz#76ff43aa8da430f6e7e4a55c84ebac2ad2cfcd2e"
13235+
dependencies:
13236+
bail "^1.0.0"
13237+
extend "^3.0.0"
13238+
has "^1.0.1"
13239+
once "^1.3.3"
13240+
trough "^1.0.0"
13241+
vfile "^1.0.0"
13242+
1317613243
unified@^6.0.0, unified@^6.1.5, unified@^6.1.6:
1317713244
version "6.2.0"
1317813245
resolved "https://registry.yarnpkg.com/unified/-/unified-6.2.0.tgz#7fbd630f719126d67d40c644b7e3f617035f6dba"
@@ -13246,6 +13313,14 @@ unist-builder@^1.0.1:
1324613313
dependencies:
1324713314
object-assign "^4.1.0"
1324813315

13316+
unist-util-find@^1.0.1:
13317+
version "1.0.1"
13318+
resolved "https://registry.yarnpkg.com/unist-util-find/-/unist-util-find-1.0.1.tgz#1062bbb6928c7a97c6adc89b53745d4c46c222a2"
13319+
dependencies:
13320+
lodash.iteratee "^4.5.0"
13321+
remark "^5.0.1"
13322+
unist-util-visit "^1.1.0"
13323+
1324913324
unist-util-generated@^1.1.0:
1325013325
version "1.1.2"
1325113326
resolved "https://registry.yarnpkg.com/unist-util-generated/-/unist-util-generated-1.1.2.tgz#8b993f9239d8e560be6ee6e91c3f7b7208e5ce25"
@@ -13536,6 +13611,10 @@ vfile-message@^1.0.0:
1353613611
dependencies:
1353713612
unist-util-stringify-position "^1.1.1"
1353813613

13614+
vfile@^1.0.0:
13615+
version "1.4.0"
13616+
resolved "http://registry.npmjs.org/vfile/-/vfile-1.4.0.tgz#c0fd6fa484f8debdb771f68c31ed75d88da97fe7"
13617+
1353913618
vfile@^2.0.0:
1354013619
version "2.3.0"
1354113620
resolved "https://registry.yarnpkg.com/vfile/-/vfile-2.3.0.tgz#e62d8e72b20e83c324bc6c67278ee272488bf84a"

0 commit comments

Comments
 (0)