Skip to content

Commit

Permalink
Merge pull request #1 from reactjs/master
Browse files Browse the repository at this point in the history
Update Repo
  • Loading branch information
Ryan-LT authored Apr 9, 2019
2 parents a390235 + fbeaa30 commit 115ff84
Show file tree
Hide file tree
Showing 12 changed files with 159 additions and 146 deletions.
2 changes: 1 addition & 1 deletion content/blog/2019-02-06-react-v16.8.0.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Hooks let you use state and other React features without writing a class. You ca

If you've never heard of Hooks before, you might find these resources interesting:

* [Introducing Hooks](/docs/hooks-intro.html) explains why we're adding Hooks to React.
* [Giới thiệu Hooks](/docs/hooks-intro.html) explains why we're adding Hooks to React.
* [Hooks at a Glance](/docs/hooks-overview.html) is a fast-paced overview of the built-in Hooks.
* [Building Your Own Hooks](/docs/hooks-custom.html) demonstrates code reuse with custom Hooks.
* [Making Sense of React Hooks](https://medium.com/@dan_abramov/making-sense-of-react-hooks-fdbde8803889) explores the new possibilities unlocked by Hooks.
Expand Down
6 changes: 6 additions & 0 deletions content/community/conferences.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,19 @@ June 21, 2019 Chicago, Illinois USA

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

### Chain React 2019
July 11-12, 2019. Portland, OR, USA.

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

### 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/)

### ComponentsConf 2019 {#componentsconf-2019}
September 6, 2019 in Melbourne, Australia

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

### React Native EU 2019 {#react-native-eu-2019}
Expand Down
92 changes: 46 additions & 46 deletions content/docs/hooks-intro.md

Large diffs are not rendered by default.

137 changes: 69 additions & 68 deletions content/docs/hooks-overview.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion content/docs/hooks-reference.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ function Counter({initialCount}) {
}
```

The "+" and "-" buttons use the functional form, because the updated value is based on the previous value. But the "Reset" button uses the normal form, because it always sets the count back to 0.
The "+" and "-" buttons use the functional form, because the updated value is based on the previous value. But the "Reset" button uses the normal form, because it always sets the count back to the initial value.

> Note
>
Expand Down
16 changes: 8 additions & 8 deletions content/docs/nav.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,23 +104,23 @@
title: JS Environment Requirements
- id: glossary
title: Glossary
- title: Hooks (New)
- title: Hooks (mới)
isOrdered: true
items:
- id: hooks-intro
title: Introducing Hooks
title: Giới thiệu Hooks
- id: hooks-overview
title: Hooks at a Glance
title: Cái nhìn đầu tiên về Hooks
- id: hooks-state
title: Using the State Hook
title: Sử dụng State Hook
- id: hooks-effect
title: Using the Effect Hook
title: Sử dụng Effect Hook
- id: hooks-rules
title: Rules of Hooks
title: Quy tắc của Hooks
- id: hooks-custom
title: Building Your Own Hooks
title: Xây dựng Hooks của bạn
- id: hooks-reference
title: Hooks API Reference
title: Tham chiếu Hooks API
- id: hooks-faq
title: Hooks FAQ
- title: Contributing
Expand Down
2 changes: 0 additions & 2 deletions content/docs/state-and-lifecycle.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,6 @@ To implement this, we need to add "state" to the `Clock` component.

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

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.

## Converting a Function to a Class {#converting-a-function-to-a-class}

You can convert a function component like `Clock` to a class in five steps:
Expand Down
10 changes: 7 additions & 3 deletions content/languages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
- name: Italian
translated_name: Italiano
code: it
status: 1
status: 2
- name: Japanese
translated_name: 日本語
code: ja
Expand All @@ -79,6 +79,10 @@
translated_name: ភាសាខ្មែរ
code: km
status: 0
- name: Kannada
translated_name: ಕನ್ನಡ
code: kn
status: 0
- name: Korean
translated_name: 한국어
code: ko
Expand Down Expand Up @@ -146,7 +150,7 @@
- name: Turkish
translated_name: Türkçe
code: tr
status: 1
status: 2
- name: Ukrainian
translated_name: Українська
code: uk
Expand All @@ -170,4 +174,4 @@
- name: Traditional Chinese
translated_name: 繁體中文
code: zh-hant
status: 0
status: 1
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@
"normalize.css": "^8.0.0",
"prettier": "^1.7.4",
"prismjs": "^1.15.0",
"react": "16.8.3",
"react-dom": "16.8.3",
"react": "16.8.6",
"react-dom": "16.8.6",
"react-helmet": "^5.2.0",
"react-live": "1.8.0-0",
"remarkable": "^1.7.1",
Expand Down
2 changes: 1 addition & 1 deletion src/site-constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
// NOTE: We can't just use `location.toString()` because when we are rendering
// the SSR part in node.js we won't have a proper location.
const urlRoot = 'https://reactjs.org';
const version = '16.8.4';
const version = '16.8.6';
const babelURL = 'https://unpkg.com/[email protected]/babel.min.js';

export {babelURL, urlRoot, version};
4 changes: 4 additions & 0 deletions src/theme.js
Original file line number Diff line number Diff line change
Expand Up @@ -405,6 +405,10 @@ const sharedStyles = {
marginTop: 0,
},
},

'& .gatsby-highlight': {
marginLeft: 0,
},
},

'& .gatsby-highlight + blockquote': {
Expand Down
28 changes: 14 additions & 14 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -10220,15 +10220,15 @@ react-dev-utils@^4.2.1:
strip-ansi "3.0.1"
text-table "0.2.0"

[email protected].3:
version "16.8.3"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.8.3.tgz#ae236029e66210783ac81999d3015dfc475b9c32"
integrity sha512-ttMem9yJL4/lpItZAQ2NTFAbV7frotHk5DZEHXUOws2rMmrsvh1Na7ThGT0dTzUIl6pqTOi5tYREfL8AEna3lA==
[email protected].6:
version "16.8.6"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.8.6.tgz#71d6303f631e8b0097f56165ef608f051ff6e10f"
integrity sha512-1nL7PIq9LTL3fthPqwkvr2zY7phIPjYrT0jp4HjyEQrEROnw4dG41VVwi/wfoCneoleqrNX7iAD+pXebJZwrwA==
dependencies:
loose-envify "^1.1.0"
object-assign "^4.1.1"
prop-types "^15.6.2"
scheduler "^0.13.3"
scheduler "^0.13.6"

react-error-overlay@^3.0.0:
version "3.0.0"
Expand Down Expand Up @@ -10282,15 +10282,15 @@ react-side-effect@^1.1.0:
exenv "^1.2.1"
shallowequal "^1.0.1"

[email protected].3:
version "16.8.3"
resolved "https://registry.yarnpkg.com/react/-/react-16.8.3.tgz#c6f988a2ce895375de216edcfaedd6b9a76451d9"
integrity sha512-3UoSIsEq8yTJuSu0luO1QQWYbgGEILm+eJl2QN/VLDi7hL+EN18M3q3oVZwmVzzBJ3DkM7RMdRwBmZZ+b4IzSA==
[email protected].6:
version "16.8.6"
resolved "https://registry.yarnpkg.com/react/-/react-16.8.6.tgz#ad6c3a9614fd3a4e9ef51117f54d888da01f2bbe"
integrity sha512-pC0uMkhLaHm11ZSJULfOBqV4tIZkx87ZLvbbQYunNixAAvjnC+snJCg0XQXn9VIsttVsbZP/H/ewzgsd5fxKXw==
dependencies:
loose-envify "^1.1.0"
object-assign "^4.1.1"
prop-types "^15.6.2"
scheduler "^0.13.3"
scheduler "^0.13.6"

read-all-stream@^3.0.0:
version "3.1.0"
Expand Down Expand Up @@ -10964,10 +10964,10 @@ sax@>=0.6.0, sax@^1.2.4, sax@~1.2.1, sax@~1.2.4:
resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==

scheduler@^0.13.3:
version "0.13.3"
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.13.3.tgz#bed3c5850f62ea9c716a4d781f9daeb9b2a58896"
integrity sha512-UxN5QRYWtpR1egNWzJcVLk8jlegxAugswQc984lD3kU7NuobsO37/sRfbpTdBjtnD5TBNFA2Q2oLV5+UmPSmEQ==
scheduler@^0.13.6:
version "0.13.6"
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.13.6.tgz#466a4ec332467b31a91b9bf74e5347072e4cd889"
integrity sha512-IWnObHt413ucAYKsD9J1QShUKkbKLQQHdxRyw73sw4FN26iWr3DY/H34xGPe4nmL1DwXyWmSWmMrA9TfQbE/XQ==
dependencies:
loose-envify "^1.1.0"
object-assign "^4.1.1"
Expand Down

0 comments on commit 115ff84

Please sign in to comment.