Skip to content

Commit cd809d6

Browse files
authored
Merge pull request #138 from reactjs/sync-5c371e5e
Sync with reactjs.org @ 5c371e5
2 parents 46a130b + b8f7151 commit cd809d6

13 files changed

+86
-73
lines changed

content/community/articles.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,4 @@ permalink: community/articles.html
1515
- [Visual Guide to State in React](https://daveceddia.com/visual-guide-to-state-in-react/) - Dave Ceddia's visual guide to React state.
1616
- [The Hands-On Guide to Learning React Hooks](https://www.telerik.com/kendo-react-ui/react-hooks-guide/) - Eric Bishard's step-by-step guide to learning React Hooks.
1717
- [How to Use the React Profiler Component to Measure Render Performance](https://medium.com/@adamhenson/how-to-use-the-react-profiler-component-to-measure-performance-improvements-from-hooks-d43b7092d7a8) - Adam Henson's article exemplifying a use case for `<React.Profiler />`.
18+
- [Thinking in React Hooks](https://wattenberger.com/blog/react-hooks) - Amelia Wattenberger's provides visualizations and highlighting the mindset change needed switching from classes to functional components + hooks.

content/community/conferences.md

Lines changed: 50 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,6 @@ Do you know of a local React.js conference? Add it here! (Please keep the list c
1212

1313
## Upcoming Conferences {#upcoming-conferences}
1414

15-
### React Boston 2019 {#react-boston-2019}
16-
September 21-22, 2019 in Boston, Massachusetts USA
17-
18-
[Website](https://www.reactboston.com/) - [Twitter](https://twitter.com/reactboston)
19-
20-
### React India 2019 {#react-india-2019}
21-
September 26-28, 2019 in Goa, India
22-
23-
[Website](https://www.reactindia.io/) - [Twitter](https://twitter.com/react_india) - [Facebook](https://www.facebook.com/ReactJSIndia)
24-
25-
### React Alicante 2019 {#react-alicante-2019}
26-
September 26-28, 2019 in Alicante, Spain
27-
28-
[Website](http://reactalicante.es/) - [Twitter](https://twitter.com/reactalicante) - [Facebook](https://www.facebook.com/ReactAlicante)
29-
3015
### React Conf 2019 {#react-conf-2019}
3116
October 24-25, 2019 in Henderson, Nevada USA
3217

@@ -57,6 +42,11 @@ May 4-6, 2020. Atlanta, GA, USA.
5742

5843
[Website](https://renderatl.com) - [Twitter](https://twitter.com/renderATL) - [Instagram](https://www.instagram.com/renderatl/) - [Facebook](https://www.facebook.com/renderatl/)
5944

45+
### ReactEurope 2020 {#reacteurope-2020}
46+
May 14-15, 2020 in Paris, France
47+
48+
[Website](https://www.react-europe.org) - [Twitter](https://twitter.com/ReactEurope) - [Facebook](https://www.facebook.com/ReactEurope) - [Videos](https://www.youtube.com/c/ReacteuropeOrgConf)
49+
6050
### React Finland 2020 {#react-finland-2020}
6151
May 26-29 in Helsinki, Finland
6252

@@ -75,36 +65,6 @@ July 17, 2020. New York City, USA.
7565

7666
## Past Conferences {#past-conferences}
7767

78-
### React Rally 2019 {#react-rally-2019}
79-
August 22-23, 2019. Salt Lake City, USA.
80-
81-
[Website](https://www.reactrally.com/) - [Twitter](https://twitter.com/ReactRally) - [Instagram](https://www.instagram.com/reactrally/)
82-
83-
### ComponentsConf 2019 {#componentsconf-2019}
84-
September 6, 2019 in Melbourne, Australia
85-
86-
[Website](https://www.componentsconf.com.au/) - [Twitter](https://twitter.com/componentsconf)
87-
88-
### React Native EU 2019 {#react-native-eu-2019}
89-
September 5-6 in Wrocław, Poland
90-
91-
[Website](https://react-native.eu) - [Twitter](https://twitter.com/react_native_eu) - [Facebook](https://www.facebook.com/reactnativeeu)
92-
93-
### React New York 2019 {#react-new-york-2019}
94-
September 13th, 2019. New York, USA
95-
96-
[Website](https://reactnewyork.com/) - [Twitter](https://twitter.com/reactnewyork)
97-
98-
### React Live 2019 {#react-live-2019}
99-
September 13th, 2019. Amsterdam, The Netherlands
100-
101-
[Website](https://www.reactlive.nl/) - [Twitter](https://twitter.com/reactlivenl)
102-
103-
### React Conf Iran 2019 {#react-conf-iran-2019}
104-
August 29, 2019. Tehran, Iran.
105-
106-
[Website](https://reactconf.ir/) - [Videos](https://www.youtube.com/playlist?list=PL-VNqZFI5Nf-Nsj0rD3CWXGPkH-DI_0VY) - [Highlights](https://github.com/ReactConf/react-conf-highlights)
107-
10868
### React.js Conf 2015 {#reactjs-conf-2015}
10969
January 28 & 29 in Facebook HQ, CA
11070

@@ -437,3 +397,48 @@ July 11-12, 2019. Portland, OR, USA.
437397

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

400+
### React Rally 2019 {#react-rally-2019}
401+
August 22-23, 2019. Salt Lake City, USA.
402+
403+
[Website](https://www.reactrally.com/) - [Twitter](https://twitter.com/ReactRally) - [Instagram](https://www.instagram.com/reactrally/)
404+
405+
### React Conf Iran 2019 {#react-conf-iran-2019}
406+
August 29, 2019. Tehran, Iran.
407+
408+
[Website](https://reactconf.ir/) - [Videos](https://www.youtube.com/playlist?list=PL-VNqZFI5Nf-Nsj0rD3CWXGPkH-DI_0VY) - [Highlights](https://github.com/ReactConf/react-conf-highlights)
409+
410+
### React Native EU 2019 {#react-native-eu-2019}
411+
September 5-6 in Wrocław, Poland
412+
413+
[Website](https://react-native.eu) - [Twitter](https://twitter.com/react_native_eu) - [Facebook](https://www.facebook.com/reactnativeeu)
414+
415+
### ComponentsConf 2019 {#componentsconf-2019}
416+
September 6, 2019 in Melbourne, Australia
417+
418+
[Website](https://www.componentsconf.com.au/) - [Twitter](https://twitter.com/componentsconf)
419+
420+
### React New York 2019 {#react-new-york-2019}
421+
September 13th, 2019. New York, USA
422+
423+
[Website](https://reactnewyork.com/) - [Twitter](https://twitter.com/reactnewyork)
424+
425+
### React Live 2019 {#react-live-2019}
426+
September 13th, 2019. Amsterdam, The Netherlands
427+
428+
[Website](https://www.reactlive.nl/) - [Twitter](https://twitter.com/reactlivenl)
429+
430+
### React Boston 2019 {#react-boston-2019}
431+
September 21-22, 2019 in Boston, Massachusetts USA
432+
433+
[Website](https://www.reactboston.com/) - [Twitter](https://twitter.com/reactboston)
434+
435+
### React India 2019 {#react-india-2019}
436+
September 26-28, 2019 in Goa, India
437+
438+
[Website](https://www.reactindia.io/) - [Twitter](https://twitter.com/react_india) - [Facebook](https://www.facebook.com/ReactJSIndia)
439+
440+
### React Alicante 2019 {#react-alicante-2019}
441+
September 26-28, 2019 in Alicante, Spain
442+
443+
[Website](http://reactalicante.es/) - [Twitter](https://twitter.com/reactalicante) - [Facebook](https://www.facebook.com/ReactAlicante)
444+

content/community/examples.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,6 @@ There are many example projects created by the React community. Feel free to add
2222
* **[Builder Book](https://github.com/builderbook/builderbook)** Open source web app to write and host documentation or sell books. Built with React, Material-UI, Next, Express, Mongoose, MongoDB.
2323
* **[GFonts Space](https://github.com/pankajladhar/GFontsSpace)** A space which allows user to play with Google fonts. Built with React, Redux and React-Router.
2424
* **[Course Learn Page](https://github.com/ulearnpro/ulearn)** Open Source LMS script in Laravel 5.8 and ReactJS 16.9
25-
* **[Speedy math](https://github.com/pankajladhar/speedy-math)** An application which allows kids to practice basic Mathematics i.e Addition, Subtraction, Multiply, Comparison. It is a PWA (Progressive web app) with offline support and install as App features.
25+
* **[Speedy math](https://github.com/pankajladhar/speedy-math)** An application which allows kids to practice basic Mathematics i.e Addition, Subtraction, Multiply, Comparison. It is a PWA (Progressive web app) with offline support and install as App features.
26+
* **[Unit Converter](https://github.com/KarthikeyanRanasthala/react-unit-converter)** Minimal Yet Responsive Unit Converter Built With React, Material-UI & Convert-Units.
27+
* **[BMI Calculator](https://github.com/GermaVinsmoke/bmi-calculator)** A React Hooks app for calculating BMI

content/community/meetups.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
3131
* [Bolivia](https://www.meetup.com/ReactBolivia/)
3232

3333
## Canada {#canada}
34-
* [Montreal, QC - ReactJS](https://www.meetup.com/fr-FR/ReactMontreal/)
3534
* [Montreal, QC - React Native](https://www.meetup.com/fr-FR/React-Native-MTL/)
3635
* [Vancouver, BC](https://www.meetup.com/ReactJS-Vancouver-Meetup/)
3736
* [Ottawa, ON](https://www.meetup.com/Ottawa-ReactJS-Meetup/)
@@ -51,6 +50,7 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
5150
* [React.JS Girls London](https://www.meetup.com/ReactJS-Girls-London/)
5251

5352
## France {#france}
53+
* [Lille](https://www.meetup.com/ReactBeerLille/)
5454
* [Paris](https://www.meetup.com/ReactJS-Paris/)
5555

5656
## Germany {#germany}
@@ -60,7 +60,6 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
6060
* [Kiel](https://www.meetup.com/Kiel-React-Native-Meetup/)
6161
* [Munich](https://www.meetup.com/ReactJS-Meetup-Munich/)
6262
* [React Berlin](https://www.meetup.com/React-Open-Source/)
63-
* [React.JS Girls Berlin](https://www.meetup.com/ReactJS-Girls-Berlin/)
6463

6564
## Greece {#greece}
6665
* [Thessaloniki](https://www.meetup.com/Thessaloniki-ReactJS-Meetup/)
@@ -147,7 +146,7 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
147146
* [New York, NY - React Native](https://www.meetup.com/React-Native-NYC/)
148147
* [New York, NY - useReactNYC](https://www.meetup.com/useReactNYC/)
149148
* [Palo Alto, CA - React Native](https://www.meetup.com/React-Native-Silicon-Valley/)
150-
* [Philadelphia, PA - ReactJS](https://www.meetup.com/RQ-React/)
149+
* [Philadelphia, PA - ReactJS](https://www.meetup.com/Reactadelphia/)
151150
* [Phoenix, AZ - ReactJS](https://www.meetup.com/ReactJS-Phoenix/)
152151
* [Pittsburgh, PA - ReactJS/React Native](https://www.meetup.com/ReactPgh/)
153152
* [Portland, OR - ReactJS](https://www.meetup.com/Portland-ReactJS/)

content/community/tools-ui-components.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ permalink: community/ui-components.html
88
## Free Components {#free-components}
99
* **[Amaze UI React](https://github.com/amazeui/amazeui-react) (in Chinese):** [Amaze UI](https://github.com/allmobilize/amazeui) components built with React.
1010
* **[Ant Design of React](https://github.com/ant-design/ant-design)** An enterprise-class UI design language and React-based implementation.
11+
* **[Base Web](http://baseweb.design):** A foundation for initiating, evolving, and unifying web products.
1112
* **[Belle](https://github.com/nikgraf/belle/):** Configurable React Components with great UX.
13+
* **[Chakra UI](https://chakra-ui.com/)**: Simple, modular and accessible component library.
1214
* **[chartify](https://github.com/kirillstepkin/chartify)**: Ultra lightweight and customizable React.js chart component.
1315
* **[Elemental UI](http://elemental-ui.com):** A UI toolkit for React websites and apps, themeable and composed of individually packaged components
1416
* **[Grommet](https://grommet.io/)** The most advanced open source UX framework for enterprise applications.

content/docs/add-react-to-a-website.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,13 @@ Pierwsze dwa znaczniki wczytają Reacta. Trzeci załaduje kod twojego komponentu
7070

7171
Stwórz plik `like_button.js` w folderze, obok pliku HTML ze stroną.
7272

73-
Otwórz **[szablon startowy](https://cdn.rawgit.com/gaearon/0b180827c190fe4fd98b4c7f570ea4a8/raw/b9157ce933c79a4559d2aa9ff3372668cce48de7/LikeButton.js)** i wklej jego zawartość do utworzonego pliku.
73+
Otwórz **[szablon startowy](https://gist.github/gaearon/0b180827c190fe4fd98b4c7f570ea4a8/raw/b9157ce933c79a4559d2aa9ff3372668cce48de7/LikeButton.js)** i wklej jego zawartość do utworzonego pliku.
7474

7575
>Wskazówka
7676
>
7777
>Kod ten definiuje komponent reactowy o nazwie `LikeButton`. Nie przejmuj się, jeśli jeszcze czegoś nie rozumiesz na tym etapie -- podstawy Reacta wyjaśnimy później w naszym [praktycznym samouczku](/tutorial/tutorial.html) i [w rozdziale pt. "Główne idee"](/docs/hello-world.html). Na razie jednak skupmy się na wyświetleniu tego na ekranie!
7878
79-
Pod kodem z **[szablonu startowego](https://cdn.rawgit.com/gaearon/0b180827c190fe4fd98b4c7f570ea4a8/raw/b9157ce933c79a4559d2aa9ff3372668cce48de7/LikeButton.js)** w pliku `like_button.js` dodaj dwie linijki:
79+
Pod kodem z **[szablonu startowego](https://gist.github/gaearon/0b180827c190fe4fd98b4c7f570ea4a8/raw/b9157ce933c79a4559d2aa9ff3372668cce48de7/LikeButton.js)** w pliku `like_button.js` dodaj dwie linijki:
8080

8181
```js{3,4}
8282
// ... wklejony kod startowy ...
@@ -196,7 +196,7 @@ npx babel --watch src --out-dir . --presets react-app/prod
196196
197197
Nie czekaj na jego zakończenie -- to polecenie uruchamia skrypt automatycznie śledzący zmiany w kodzie ze składnią JSX.
198198

199-
Jeśli utworzysz teraz plik o nazwie `src/like_button.jsx` przy użyciu **[tego przykładowego kodu JSX](https://cdn.rawgit.com/gaearon/c8e112dc74ac44aac4f673f2c39d19d1/raw/09b951c86c1bf1116af741fa4664511f2f179f0a/like_button.jsx)**, obserwator (ang. *watcher*) utworzy przetworzony plik o nazwie `like_button.js` zawierający kod javascriptowy zrozumiały dla przeglądarki. Gdy wyedytujesz plik źródłowy z kodem JSX, transformacja zostanie ponownie uruchomiona automatycznie.
199+
Jeśli utworzysz teraz plik o nazwie `src/like_button.jsx` przy użyciu **[tego przykładowego kodu JSX](https://gist.github/gaearon/c8e112dc74ac44aac4f673f2c39d19d1/raw/09b951c86c1bf1116af741fa4664511f2f179f0a/like_button.jsx)**, obserwator (ang. *watcher*) utworzy przetworzony plik o nazwie `like_button.js` zawierający kod javascriptowy zrozumiały dla przeglądarki. Gdy wyedytujesz plik źródłowy z kodem JSX, transformacja zostanie ponownie uruchomiona automatycznie.
200200

201201
Dodatkowo umożliwi to również korzystanie z nowych składni JavaScript, takich jak klasy, bez obawy o brak kompatybilności ze starszymi przeglądarkami. Narzędzie, którego właśnie użyliśmy, nazywa się Babel. Więcej na jego temat możesz dowiedzieć się z [dokumentacji](http://babeljs.io/docs/en/babel-cli/).
202202

content/docs/code-splitting.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ będzie się długo ładowała.
6363
Aby uniknąć problemu zbyt dużego pakietu, warto już na początku o tym pomyśleć
6464
i rozpocząć "dzielenie" swojej paczki.
6565
[Dzielenie kodu](https://webpack.js.org/guides/code-splitting/) to funkcja
66-
wspierana przez narzędzia takie jak Webpack oraz Browserify (przez
66+
wspierana przez narzędzia takie jak [Webpack](https://webpack.js.org/guides/code-splitting/), [Rollup](https://rollupjs.org/guide/en/#code-splitting) oraz Browserify (przez
6767
[factor-bundle](https://github.com/browserify/factor-bundle)), które mogą tworzyć
6868
wiele pakietów doładowywanych dynamicznie w czasie wykonania kodu aplikacji.
6969

content/docs/hooks-faq.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ Note how this would work for props, state, or any other calculated value.
373373
function Counter() {
374374
const [count, setCount] = useState(0);
375375
376-
const calculation = count * 100;
376+
const calculation = count + 100;
377377
const prevCalculation = usePrevious(calculation);
378378
// ...
379379
```

content/docs/hooks-reference.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ function Counter({initialCount}) {
6060
<>
6161
Licznik: {count}
6262
<button onClick={() => setCount(initialCount)}>Zresetuj</button>
63-
<button onClick={() => setCount(prevCount => prevCount + 1)}>+</button>
6463
<button onClick={() => setCount(prevCount => prevCount - 1)}>-</button>
64+
<button onClick={() => setCount(prevCount => prevCount + 1)}>+</button>
6565
</>
6666
);
6767
}
@@ -230,8 +230,8 @@ function Counter() {
230230
return (
231231
<>
232232
Licznik: {state.count}
233-
<button onClick={() => dispatch({type: 'increment'})}>+</button>
234233
<button onClick={() => dispatch({type: 'decrement'})}>-</button>
234+
<button onClick={() => dispatch({type: 'increment'})}>+</button>
235235
</>
236236
);
237237
}
@@ -289,8 +289,8 @@ function Counter({initialCount}) {
289289
onClick={() => dispatch({type: 'reset', payload: initialCount})}>
290290
Zresetuj
291291
</button>
292-
<button onClick={() => dispatch({type: 'increment'})}>+</button>
293292
<button onClick={() => dispatch({type: 'decrement'})}>-</button>
293+
<button onClick={() => dispatch({type: 'increment'})}>+</button>
294294
</>
295295
);
296296
}

content/versions.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
- title: '16.10.2'
2+
changelog: https://github.com/facebook/react/blob/master/CHANGELOG.md#16102-october-3-2019
3+
- title: '16.10.1'
4+
changelog: https://github.com/facebook/react/blob/master/CHANGELOG.md#16101-september-28-2019
15
- title: '16.10'
26
changelog: https://github.com/facebook/react/blob/master/CHANGELOG.md#16100-september-27-2019
37
- title: '16.9'

0 commit comments

Comments
 (0)