Skip to content

Sync with reactjs.org @ b1691780 #110

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
May 7, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions content/community/conferences.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ April 24-26 in Helsinki, Finland

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

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

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

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

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

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

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

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

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

### React Boston 2019 {#react-boston-2019}
September 21-22, 2019 in Boston, Massachusetts USA

[Website](https://www.reactboston.com/) - [Twitter](https://twitter.com/reactboston)

### React India 2019 {#react-india-2019}
September 26-28, 2019 in Goa, India

Expand Down
2 changes: 1 addition & 1 deletion content/docs/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ React 문서는 Javascript 프로그래밍에 익숙한 사람을 대상으로

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

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

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

Expand Down
4 changes: 2 additions & 2 deletions content/docs/hooks-faq.md
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ There are a few more heuristics, and they might change over time as we fine-tune

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

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

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.

Expand Down Expand Up @@ -654,7 +654,7 @@ function ProductDetails({ fetchProduct })

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.

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

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:

Expand Down
2 changes: 1 addition & 1 deletion content/docs/hooks-state.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ prev: hooks-overview.html

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

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

```js{4-5}
import React, { useState } from 'react';
Expand Down
10 changes: 9 additions & 1 deletion content/languages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@
translated_name: বাংলা
code: bn
status: 0
- name: Catalan
translated_name: Català
code: ca
status: 0
- name: German
translated_name: Deutsch
code: de
Expand Down Expand Up @@ -99,6 +103,10 @@
translated_name: മലയാളം
code: ml
status: 0
- name: Mongolian
translated_name: Монгол хэл
code: mn
status: 0
- name: Nepali
translated_name: नेपाली
code: ne
Expand All @@ -110,7 +118,7 @@
- name: Polish
translated_name: Polski
code: pl
status: 1
status: 2
- name: Portuguese (Brazil)
translated_name: Português do Brasil
code: pt-br
Expand Down
1 change: 1 addition & 0 deletions gatsby-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ module.exports = {
maxWidth: 840,
},
},
'gatsby-remark-external-links',
'gatsby-remark-header-custom-ids',
{
resolve: 'gatsby-remark-code-repls',
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
"gatsby-remark-code-repls": "^2.0.0",
"gatsby-remark-copy-linked-files": "^2.0.0",
"gatsby-remark-embed-snippet": "^3.0.0",
"gatsby-remark-external-links": "^0.0.4",
"gatsby-remark-images": "^2.0.0",
"gatsby-remark-prismjs": "^3.0.2",
"gatsby-remark-responsive-iframe": "^2.0.0",
Expand Down
52 changes: 43 additions & 9 deletions src/theme.js
Original file line number Diff line number Diff line change
Expand Up @@ -285,15 +285,24 @@ const sharedStyles = {
},

'& h2': {
borderTop: `1px solid ${colors.divider}`,
marginTop: 44,
paddingTop: 40,
'::before': {
content: ' ',
display: 'block',
borderBottom: `1px solid ${colors.divider}`,
paddingTop: 44,
marginBottom: 40,
},

lineHeight: 1.2,

':first-child': {
borderTop: 0,
marginTop: 0,
paddingTop: 0,
'::before': {
content: ' ',
display: 'block',
borderBottom: 0,
paddingTop: 40,
marginTop: -80,
},
},

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

'& h3': {
paddingTop: 45,
'::before': {
content: ' ',
display: 'block',
paddingTop: 90,
marginTop: -45,
},

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

'& h2 + h3, & h2 + h3:first-of-type': {
paddingTop: 30,
'::before': {
content: ' ',
display: 'block',
paddingTop: 60,
marginTop: -30,
},
},

'& h4': {
'::before': {
content: ' ',
display: 'block',
paddingTop: 100,
marginTop: -50,
},

fontSize: 20,
color: colors.subtle,
lineHeight: 1.3,
marginTop: 50,
fontWeight: 400,
},

Expand Down Expand Up @@ -414,6 +439,15 @@ const sharedStyles = {
'& .gatsby-highlight + blockquote': {
marginTop: 40,
},

'& .gatsby-highlight + h4': {
'::before': {
content: ' ',
display: 'block',
paddingTop: 85,
marginTop: -60,
},
},
},
};

Expand Down
81 changes: 80 additions & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5844,6 +5844,15 @@ gatsby-remark-embed-snippet@^3.0.0:
parse-numeric-range "^0.0.2"
unist-util-map "^1.0.3"

gatsby-remark-external-links@^0.0.4:
version "0.0.4"
resolved "https://registry.yarnpkg.com/gatsby-remark-external-links/-/gatsby-remark-external-links-0.0.4.tgz#85b98c1e9dacfaa58085319648c904ff3cab42f0"
dependencies:
babel-runtime "^6.26.0"
is-relative-url "^2.0.0"
unist-util-find "^1.0.1"
unist-util-visit "^1.1.3"

gatsby-remark-images@^2.0.0:
version "2.0.4"
resolved "https://registry.yarnpkg.com/gatsby-remark-images/-/gatsby-remark-images-2.0.4.tgz#29894b85b4181527fa34514fb73218c8e7f89129"
Expand Down Expand Up @@ -8409,6 +8418,10 @@ lodash.isstring@^4.0.1:
resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"
integrity sha1-1SfftUVuynzJu5XV2ur4i6VKVFE=

lodash.iteratee@^4.5.0:
version "4.7.0"
resolved "https://registry.yarnpkg.com/lodash.iteratee/-/lodash.iteratee-4.7.0.tgz#be4177db289a8ccc3c0990f1db26b5b22fc1554c"

lodash.kebabcase@^4.1.1:
version "4.1.1"
resolved "https://registry.yarnpkg.com/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz#8489b1cb0d29ff88195cceca448ff6d6cc295c36"
Expand Down Expand Up @@ -8527,6 +8540,10 @@ loglevel@^1.4.1:
resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.1.tgz#e0fc95133b6ef276cdc8887cdaf24aa6f156f8fa"
integrity sha1-4PyVEztu8nbNyIh82vJKpvFW+Po=

longest-streak@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/longest-streak/-/longest-streak-1.0.0.tgz#d06597c4d4c31b52ccb1f5d8f8fe7148eafd6965"

longest-streak@^2.0.1:
version "2.0.2"
resolved "https://registry.yarnpkg.com/longest-streak/-/longest-streak-2.0.2.tgz#2421b6ba939a443bb9ffebf596585a50b4c38e2e"
Expand Down Expand Up @@ -8653,6 +8670,10 @@ markdown-escapes@^1.0.0:
resolved "https://registry.yarnpkg.com/markdown-escapes/-/markdown-escapes-1.0.2.tgz#e639cbde7b99c841c0bacc8a07982873b46d2122"
integrity sha512-lbRZ2mE3Q9RtLjxZBZ9+IMl68DKIXaVAhwvwn9pmjnPLS0h/6kyBMgNhqi1xFJ/2yv6cSyv0jbiZavZv93JkkA==

markdown-table@^0.4.0:
version "0.4.0"
resolved "https://registry.yarnpkg.com/markdown-table/-/markdown-table-0.4.0.tgz#890c2c1b3bfe83fb00e4129b8e4cfe645270f9d1"

markdown-table@^1.1.0:
version "1.1.2"
resolved "https://registry.yarnpkg.com/markdown-table/-/markdown-table-1.1.2.tgz#c78db948fa879903a41bce522e3b96f801c63786"
Expand Down Expand Up @@ -9589,7 +9610,7 @@ on-headers@~1.0.1:
resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.1.tgz#928f5d0f470d49342651ea6794b0857c100693f7"
integrity sha1-ko9dD0cNSTQmUepnlLCFfBAGk/c=

once@^1.3.0, once@^1.3.1, once@^1.4.0:
once@^1.3.0, once@^1.3.1, once@^1.3.3, once@^1.4.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
Expand Down Expand Up @@ -11275,6 +11296,20 @@ remark-frontmatter@^1.2.0:
fault "^1.0.1"
xtend "^4.0.1"

remark-parse@^1.1.0:
version "1.1.0"
resolved "http://registry.npmjs.org/remark-parse/-/remark-parse-1.1.0.tgz#c3ca10f9a8da04615c28f09aa4e304510526ec21"
dependencies:
collapse-white-space "^1.0.0"
extend "^3.0.0"
parse-entities "^1.0.2"
repeat-string "^1.5.4"
trim "0.0.1"
trim-trailing-lines "^1.0.0"
unherit "^1.0.4"
unist-util-remove-position "^1.0.0"
vfile-location "^2.0.0"

remark-parse@^5.0.0:
version "5.0.0"
resolved "https://registry.yarnpkg.com/remark-parse/-/remark-parse-5.0.0.tgz#4c077f9e499044d1d5c13f80d7a98cf7b9285d95"
Expand Down Expand Up @@ -11303,6 +11338,19 @@ remark-retext@^3.1.0:
dependencies:
mdast-util-to-nlcst "^3.2.0"

remark-stringify@^1.1.0:
version "1.1.0"
resolved "http://registry.npmjs.org/remark-stringify/-/remark-stringify-1.1.0.tgz#a7105e25b9ee2bf9a49b75d2c423f11b06ae2092"
dependencies:
ccount "^1.0.0"
extend "^3.0.0"
longest-streak "^1.0.0"
markdown-table "^0.4.0"
parse-entities "^1.0.2"
repeat-string "^1.5.4"
stringify-entities "^1.0.1"
unherit "^1.0.4"

remark-stringify@^5.0.0:
version "5.0.0"
resolved "https://registry.yarnpkg.com/remark-stringify/-/remark-stringify-5.0.0.tgz#336d3a4d4a6a3390d933eeba62e8de4bd280afba"
Expand All @@ -11323,6 +11371,14 @@ remark-stringify@^5.0.0:
unherit "^1.0.4"
xtend "^4.0.1"

remark@^5.0.1:
version "5.1.0"
resolved "http://registry.npmjs.org/remark/-/remark-5.1.0.tgz#cb463bd3dbcb4b99794935eee1cf71d7a8e3068c"
dependencies:
remark-parse "^1.1.0"
remark-stringify "^1.1.0"
unified "^4.1.1"

remark@^9.0.0:
version "9.0.0"
resolved "https://registry.yarnpkg.com/remark/-/remark-9.0.0.tgz#c5cfa8ec535c73a67c4b0f12bfdbd3a67d8b2f60"
Expand Down Expand Up @@ -13173,6 +13229,17 @@ unicode-property-aliases-ecmascript@^1.0.4:
resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.4.tgz#5a533f31b4317ea76f17d807fa0d116546111dd0"
integrity sha512-2WSLa6OdYd2ng8oqiGIWnJqyFArvhn+5vgx5GTxMbUYjCYKUcuKS62YLFF0R/BDGlB1yzXjQOLtPAfHsgirEpg==

unified@^4.1.1:
version "4.2.1"
resolved "http://registry.npmjs.org/unified/-/unified-4.2.1.tgz#76ff43aa8da430f6e7e4a55c84ebac2ad2cfcd2e"
dependencies:
bail "^1.0.0"
extend "^3.0.0"
has "^1.0.1"
once "^1.3.3"
trough "^1.0.0"
vfile "^1.0.0"

unified@^6.0.0, unified@^6.1.5, unified@^6.1.6:
version "6.2.0"
resolved "https://registry.yarnpkg.com/unified/-/unified-6.2.0.tgz#7fbd630f719126d67d40c644b7e3f617035f6dba"
Expand Down Expand Up @@ -13246,6 +13313,14 @@ unist-builder@^1.0.1:
dependencies:
object-assign "^4.1.0"

unist-util-find@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/unist-util-find/-/unist-util-find-1.0.1.tgz#1062bbb6928c7a97c6adc89b53745d4c46c222a2"
dependencies:
lodash.iteratee "^4.5.0"
remark "^5.0.1"
unist-util-visit "^1.1.0"

unist-util-generated@^1.1.0:
version "1.1.2"
resolved "https://registry.yarnpkg.com/unist-util-generated/-/unist-util-generated-1.1.2.tgz#8b993f9239d8e560be6ee6e91c3f7b7208e5ce25"
Expand Down Expand Up @@ -13536,6 +13611,10 @@ vfile-message@^1.0.0:
dependencies:
unist-util-stringify-position "^1.1.1"

vfile@^1.0.0:
version "1.4.0"
resolved "http://registry.npmjs.org/vfile/-/vfile-1.4.0.tgz#c0fd6fa484f8debdb771f68c31ed75d88da97fe7"

vfile@^2.0.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/vfile/-/vfile-2.3.0.tgz#e62d8e72b20e83c324bc6c67278ee272488bf84a"
Expand Down