Skip to content

Commit 02159f1

Browse files
authored
Merge branch 'master' into optimizing-performance
2 parents d5728ca + eb4c3cf commit 02159f1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+951
-877
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949

5050
### Push 하기
5151

52-
1. `git add -A && git commit -m "My message"` (`My message` 부분을 `Fixed header logo on Android` 같은 커밋 메시지로 교체)를 실행하여 변경한 파일들을 commit 해주세요.
52+
1. `git add -A && git commit -m "My message"` (`My message` 부분을 `Fix header logo on Android` 같은 커밋 메시지로 교체)를 실행하여 변경한 파일들을 commit 해주세요.
5353
1. `git push my-fork-name the-name-of-my-branch`
5454
1. [reactjs.org repo](https://github.com/reactjs/reactjs.org)에서 최근에 푸시된 브랜치를 볼 수 있습니다.
5555
1. Github 지침을 따라주세요.

content/blog/2018-03-27-update-on-async-rendering.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ Here is an example of a component that uses the legacy `componentWillReceiveProp
134134

135135
Although the above code is not problematic in itself, the `componentWillReceiveProps` lifecycle is often mis-used in ways that _do_ present problems. Because of this, the method will be deprecated.
136136

137-
As of version 16.3, the recommended way to update `state` in response to `props` changes is with the new `static getDerivedStateFromProps` lifecycle. (That lifecycle is called when a component is created and each time it receives new props):
137+
As of version 16.3, the recommended way to update `state` in response to `props` changes is with the new `static getDerivedStateFromProps` lifecycle. It is called when a component is created and each time it re-renders due to changes to props or state:
138138
`embed:update-on-async-rendering/updating-state-from-props-after.js`
139139

140140
You may notice in the example above that `props.currentRow` is mirrored in state (as `state.lastRow`). This enables `getDerivedStateFromProps` to access the previous props value in the same way as is done in `componentWillReceiveProps`.

content/blog/2019-02-23-is-react-translated-yet.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ In the past, React community members have created unofficial translations for [C
2323

2424
If you would like to help out on a current translation, check out the [Languages](/languages) page and click on the "Contribute" link for your language.
2525

26-
Can't find your language? If you'd like to maintain your langauge's translation fork, follow the instructions in the [translation repo](https://github.com/reactjs/reactjs.org-translation#starting-a-new-translation)!
26+
Can't find your language? If you'd like to maintain your language's translation fork, follow the instructions in the [translation repo](https://github.com/reactjs/reactjs.org-translation#starting-a-new-translation)!
2727

2828
## Backstory {#backstory}
2929

@@ -39,7 +39,7 @@ This approach appealed to us for several reasons:
3939
* It encouraged active maintainers for each repo to ensure quality.
4040
* Contributors already understand GitHub as a platform and are motivated to contribute directly to the React organization.
4141

42-
We started of with an initial trial period of three languages: Spanish, Japanese, and Simplified Chinese. This allowed us to work out any kinks in our process and make sure future translations are set up for success. I wanted to give the translation teams freedom to choose whatever tools they felt comfortable with. The only requirement is a [checklist](https://github.com/reactjs/reactjs.org-translation/blob/master/PROGRESS.template.md) that outlines the order of importance for translating pages.
42+
We started off with an initial trial period of three languages: Spanish, Japanese, and Simplified Chinese. This allowed us to work out any kinks in our process and make sure future translations are set up for success. I wanted to give the translation teams freedom to choose whatever tools they felt comfortable with. The only requirement is a [checklist](https://github.com/reactjs/reactjs.org-translation/blob/master/PROGRESS.template.md) that outlines the order of importance for translating pages.
4343

4444
After the trial period, we were ready to accept more languages. I created [a script](https://github.com/reactjs/reactjs.org-translation/blob/master/scripts/create.js) to automate the creation of the new language repo, and a site, [Is React Translated Yet?](https://isreacttranslatedyet.com), to track progress on the different translations. We started *10* new translations on our first day alone!
4545

content/community/articles.md

-1
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,4 @@ permalink: community/articles.html
1212
- [You're missing the point of React](https://medium.com/@dan_abramov/youre-missing-the-point-of-react-a20e34a51e1a) - Dan Abramov's article about the best parts of React.
1313
- [Timeline for Learning React](https://daveceddia.com/timeline-for-learning-react/) - Dave Ceddia's recommended timeline for learning React and the React ecosystem.
1414
- [Simple React Development in 2017](https://hackernoon.com/simple-react-development-in-2017-113bd563691f) - Joshua Comeau's guide to showcase how easy it can be to start modern React development.
15-
- [React FAQ](https://reactfaq.site/) - An external site with articles that try to answer frequently asked questions about React.
1615
- [Visual Guide to State in React](https://daveceddia.com/visual-guide-to-state-in-react/) - Dave Ceddia's visual guide to React state.

content/community/conferences.md

+46-30
Original file line numberDiff line numberDiff line change
@@ -12,36 +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-
### ReactEurope 2019 {#reacteurope-2019}
16-
May 23-24, 2019 in Paris, France
17-
18-
[Website](https://www.react-europe.org) - [Twitter](https://twitter.com/ReactEurope) - [Facebook](https://www.facebook.com/ReactEurope) - [Videos](https://www.youtube.com/c/ReacteuropeOrgConf)
19-
20-
### React Conf Armenia 2019 {#react-conf-am-19}
21-
May 25, 2019 in Yerevan, Armenia
22-
23-
[Website](https://reactconf.am/) - [Twitter](https://twitter.com/ReactConfAM) - [Facebook](https://www.facebook.com/reactconf.am/) - [YouTube](https://www.youtube.com/c/JavaScriptConferenceArmenia) - [CFP](http://bit.ly/speakReact)
24-
25-
### ReactNext 2019 {#react-next-2019}
26-
June 11, 2019. Tel Aviv, Israel
27-
28-
[Website](https://react-next.com) - [Twitter](https://twitter.com/ReactNext) - [Videos](https://www.youtube.com/channel/UC3BT8hh3yTTYxbLQy_wbk2w)
29-
30-
### React Norway 2019 {#react-norway-2019}
31-
June 12, 2019. Larvik, Norway
32-
33-
[Website](https://reactnorway.com) - [Twitter](https://twitter.com/ReactNorway)
34-
35-
### React Loop 2019 {#react-loop-2019}
36-
June 21, 2019 Chicago, Illinois USA
37-
38-
[Website](https://reactloop.com) - [Twitter](https://twitter.com/ReactLoop)
39-
40-
### Chain React 2019 {#chain-react-2019}
41-
July 11-12, 2019. Portland, OR, USA.
42-
43-
[Website](https://infinite.red/ChainReactConf)
44-
4515
### React Rally 2019 {#react-rally-2019}
4616
August 22-23, 2019. Salt Lake City, USA.
4717

@@ -82,6 +52,11 @@ September 26-28, 2019 in Alicante, Spain
8252

8353
[Website](http://reactalicante.es/) - [Twitter](https://twitter.com/reactalicante) - [Facebook](https://www.facebook.com/ReactAlicante)
8454

55+
### React Conf 2019 {#react-conf-2019}
56+
October 24-25, 2019 in Henderson, Nevada USA
57+
58+
[Website](https://conf.reactjs.org/) - [Twitter](https://twitter.com/reactjs)
59+
8560
### React Advanced 2019 {#react-advanced-2019}
8661
October 25, 2019 in London, UK
8762

@@ -92,6 +67,16 @@ December 6, 2019 in Berlin, Germany
9267

9368
[Website](https://reactday.berlin) - [Twitter](https://twitter.com/reactdayberlin) - [Facebook](https://www.facebook.com/reactdayberlin/) - [Videos](https://www.youtube.com/reactdayberlin)
9469

70+
### ReactConf AU 2020 {#reactconfau}
71+
February 27 & 28, 2020 in Sydney, Australia
72+
73+
[Website](https://reactconfau.com/) - [Twitter](https://twitter.com/reactconfau) - [Facebook](https://www.facebook.com/reactconfau) - [Instagram](https://www.instagram.com/reactconfau/)
74+
75+
### Render-Atlanta 2020 {#render-atlanta-2020}
76+
May 4-6, 2020. Atlanta, GA, USA.
77+
78+
[Website](https://renderatl.com)
79+
9580
## Past Conferences {#past-conferences}
9681

9782
### React.js Conf 2015 {#reactjs-conf-2015}
@@ -395,3 +380,34 @@ May 3, 2019 in London, UK
395380
May 11 in Sofia, Bulgaria
396381

397382
[Website](http://react-not-a-conf.com/) - [Twitter](https://twitter.com/reactnotaconf) - [Facebook](https://www.facebook.com/events/780891358936156)
383+
384+
### ReactEurope 2019 {#reacteurope-2019}
385+
May 23-24, 2019 in Paris, France
386+
387+
[Website](https://www.react-europe.org) - [Twitter](https://twitter.com/ReactEurope) - [Facebook](https://www.facebook.com/ReactEurope) - [Videos](https://www.youtube.com/c/ReacteuropeOrgConf)
388+
389+
### React Conf Armenia 2019 {#react-conf-am-19}
390+
May 25, 2019 in Yerevan, Armenia
391+
392+
[Website](https://reactconf.am/) - [Twitter](https://twitter.com/ReactConfAM) - [Facebook](https://www.facebook.com/reactconf.am/) - [YouTube](https://www.youtube.com/c/JavaScriptConferenceArmenia) - [CFP](http://bit.ly/speakReact)
393+
394+
### ReactNext 2019 {#react-next-2019}
395+
June 11, 2019. Tel Aviv, Israel
396+
397+
[Website](https://react-next.com) - [Twitter](https://twitter.com/ReactNext) - [Videos](https://www.youtube.com/channel/UC3BT8hh3yTTYxbLQy_wbk2w)
398+
399+
### React Norway 2019 {#react-norway-2019}
400+
June 12, 2019. Larvik, Norway
401+
402+
[Website](https://reactnorway.com) - [Twitter](https://twitter.com/ReactNorway)
403+
404+
### React Loop 2019 {#react-loop-2019}
405+
June 21, 2019 Chicago, Illinois USA
406+
407+
[Website](https://reactloop.com) - [Twitter](https://twitter.com/ReactLoop)
408+
409+
### Chain React 2019 {#chain-react-2019}
410+
July 11-12, 2019. Portland, OR, USA.
411+
412+
[Website](https://infinite.red/ChainReactConf)
413+

content/community/courses.md

+2
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ permalink: community/courses.html
2222

2323
- [Free React Bootcamp](https://tylermcginnis.com/free-react-bootcamp/) - Recordings from three days of a free online React bootcamp.
2424

25+
- [Scrimba: Learn React for free](https://scrimba.com/g/glearnreact) - 48 hands-on video tutorials building react apps.
26+
2527
## Paid Courses {#paid-courses}
2628

2729
- [Egghead.io](https://egghead.io/browse/frameworks/react) - Short instructional videos on React and many other topics.

content/community/meetups.md

+3
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
5555
* [Düsseldorf](https://www.meetup.com/de-DE/ReactJS-Meetup-Dusseldorf/)
5656
* [Hamburg](https://www.meetup.com/Hamburg-React-js-Meetup/)
5757
* [Karlsruhe](https://www.meetup.com/react_ka/)
58+
* [Kiel](https://www.meetup.com/Kiel-React-Native-Meetup/)
5859
* [Munich](https://www.meetup.com/ReactJS-Meetup-Munich/)
5960
* [React Berlin](https://www.meetup.com/React-Berlin/)
6061
* [React.JS Girls Berlin](https://www.meetup.com/ReactJS-Girls-Berlin/)
@@ -69,6 +70,7 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
6970
* [Bangalore](https://www.meetup.com/ReactJS-Bangalore/)
7071
* [Chennai](https://www.meetup.com/React-Chennai/)
7172
* [Delhi NCR](https://www.meetup.com/React-Delhi-NCR/)
73+
* [Jaipur](https://www.meetup.com/JaipurJS-Developer-Meetup/)
7274

7375
## Ireland {#ireland}
7476
* [Dublin](https://www.meetup.com/ReactJS-Dublin/)
@@ -123,6 +125,7 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
123125
* [Columbus, OH - ReactJS](https://www.meetup.com/ReactJS-Columbus-meetup/)
124126
* [Dallas, TX - ReactJS](https://www.meetup.com/ReactDallas/)
125127
* [Irvine, CA - ReactJS](https://www.meetup.com/ReactJS-OC/)
128+
* [Kansas City, MO - ReactJS](https://www.meetup.com/Kansas-City-React-Meetup/)
126129
* [Las Vegas, NV - ReactJS](https://www.meetup.com/ReactVegas/)
127130
* [Leesburg, VA - ReactJS](https://www.meetup.com/React-NOVA/)
128131
* [Los Angeles, CA - ReactJS](https://www.meetup.com/socal-react/)

content/community/tools-misc.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ permalink: community/misc.html
99

1010
* **[react-inspector](https://github.com/xyc/react-inspector):** Use DevTools-like object inspectors inside your React app.
1111
* **[jreact](https://github.com/KnisterPeter/jreact):** Rendering react server-side within a JVM (Java 7 or Java 8)
12-
* **[react-jss](https://github.com/jsstyles/react-jss):** Inject and mount jss styles in React components.
12+
* **[react-jss](https://github.com/cssinjs/jss/tree/master/packages/react-jss):** Inject and mount jss styles in React components.
1313
* **[django-react](https://github.com/markfinger/django-react):** Server-side rendering of React components for django apps.
1414
* **[react-engine](https://github.com/paypal/react-engine):** Composite render engine for isomorphic express apps to render both plain react views and react-router views.
1515
* **[react-render-visualizer](https://github.com/redsunsoft/react-render-visualizer):** A visual way to see what is (re)rendering and why.

content/community/tools-starter-kits.md

+1
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,4 @@ Ready to grow boilerplate with react-router, redux, saga, webpack 3, jest w/ cov
3636
* **[EDGE Platform](https://github.com/sebastian-software/edge)** Universal React/SSR + Apollo GraphQL + JS/CSS Code Splitting + Fine-Tuned Webpack + Localization/Internationalization. Most things are external dependencies. Boilerplate available.
3737
* **[bae](https://github.com/siddharthkp/bae)** Zero config toolkit. SSR (with data fetching) + routing + streaming + styling (with styled-components) + HMR out of the box.
3838
* **[breko-hub](https://github.com/tomatau/breko-hub)** A production ready boilerplate for universal react applications. Complete with code splitting, server render (using koa), redux, sagas, debugging, hot-reloading (live updates on the server), css-modules, scss, super fast integration tests and unit tests. There's also a big focus on clean code and smaller files.
39+
* **[appseed](https://github.com/rosoftdeveloper/appseed)** A production ready boilerplate for UI-Ready react applications. The frontend can be bundled with various backends: Flask, Laravel, Express.

content/community/tools-ui-components.md

+4-3
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ permalink: community/ui-components.html
2020
* **[Onsen UI React Components](https://onsen.io/v2/react.html):** UI components for hybrid mobile apps with both Material Design for Android and flat design for iOS.
2121
* **[PrimeReact](https://www.primefaces.org/primereact/):** A rich UI component suite for React featuring 70+ open source components.
2222
* **[React Amazing Grid](https://github.com/Amazing-Space-Invader/react-amazing-grid)** Flex grid with inline styles.
23-
* **[React Mdl](https://github.com/tleunen/react-mdl)** React Components for Material Design Lite.
24-
* **[React Web](https://github.com/taobaofed/react-web)** A framework for building web apps with React.
23+
* **[Material Components for React](https://github.com/material-components/material-components-web-react)** MDC React is the official implementation of Google's Material Design Components.
24+
* **[React Native for Web](https://github.com/necolas/react-native-web)** Makes it possible to run React Native components and APIs on the web using React DOM.
2525
* **[react-amiga-guru-meditation](https://github.com/gfazioli/react-amiga-guru-meditation):** React JS Class to display a Amiga Guru Meditation Tribute
2626
* **[react-autosuggest](https://github.com/moroshko/react-autosuggest)** WAI-ARIA compliant React autosuggest component
2727
* **[react-beautiful-dnd](https://github.com/atlassian/react-beautiful-dnd):** Beautiful, accessible drag and drop for lists with React.js
@@ -50,7 +50,7 @@ permalink: community/ui-components.html
5050
* **[react-slick](https://github.com/akiran/react-slick):** Carousel component built with React
5151
* **[react-sparklines](https://borisyankov.github.io/react-sparklines/):** Beautiful and expressive sparklines component
5252
* **[react-spreadsheet](https://github.com/felixrieseberg/React-Spreadsheet-Component):** React Spreadsheets / Editable tables with Excel-Style keyboard input and navigation
53-
* **[react-switch-button](https://github.com/gfazioli/react-switch-button):** Beautiful React Switch button component
53+
* **[react-toggle](https://github.com/gfazioli/react-toggle):** A React UI component to display a toggle button control
5454
* **[react-tappable](https://github.com/JedWatson/react-tappable)** A Tappable React Component that provides native-feeling onTap events for mobile React apps
5555
* **[react-textarea-autosize](https://github.com/andreypopp/react-textarea-autosize):** Like `<textarea />` but resizes automatically to fit all its content.
5656
* **[react-toastify](https://github.com/fkhadra/react-toastify):** React notification made easy
@@ -72,6 +72,7 @@ permalink: community/ui-components.html
7272
## Fee Based Components {#fee-based-components}
7373

7474
* **[ag-Grid](https://www.ag-grid.com)** Advanced data grid / data table for React.
75+
* **[DevExtreme Reactive](https://devexpress.github.io/devextreme-reactive/react/)** High-performance plugin-based Data Grid, Scheduler and Chart components for Bootstrap and Material Design.
7576
* **[ExtReact components](https://www.sencha.com/products/extreact//)**: 115+ Ready-to-Use UI Components.
7677
* **[Grapecity Wijmo UI Components for React](https://www.grapecity.com/en/react/)**: Expand your React UI options with Wijmo’s complete collection of JavaScript components.
7778
* **[jQWidgets React components](https://www.jqwidgets.com/react/)**: Enterprise Ready 70+ UI Components.

content/docs/accessibility.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ this.inputElement.current.focus();
244244

245245
```javascript{12-14,26-30}
246246
class OuterClickExample extends React.Component {
247-
constructor(props) {
247+
constructor(props) {
248248
super(props);
249249
250250
this.state = { isOpen: false };
@@ -278,13 +278,13 @@ constructor(props) {
278278
return (
279279
<div ref={this.toggleContainer}>
280280
<button onClick={this.onClickHandler}>Select an option</button>
281-
{this.state.isOpen ? (
281+
{this.state.isOpen && (
282282
<ul>
283283
<li>Option 1</li>
284284
<li>Option 2</li>
285285
<li>Option 3</li>
286286
</ul>
287-
) : null}
287+
)}
288288
</div>
289289
);
290290
}
@@ -343,13 +343,13 @@ class BlurExample extends React.Component {
343343
aria-expanded={this.state.isOpen}>
344344
Select an option
345345
</button>
346-
{this.state.isOpen ? (
346+
{this.state.isOpen && (
347347
<ul>
348348
<li>Option 1</li>
349349
<li>Option 2</li>
350350
<li>Option 3</li>
351351
</ul>
352-
) : null}
352+
)}
353353
</div>
354354
);
355355
}
@@ -460,7 +460,7 @@ Deque Systems에서는 자동으로 애플리케이션의 종단 간(end-to-end)
460460
일부 브라우저에서는 접근성 트리 안의 각 엘리먼트의 접근성 정보를 손쉽게 확인할 수 있습니다.
461461

462462
- [Firefox에서 접근성 검사기를 사용하는 방법](https://developer.mozilla.org/en-US/docs/Tools/Accessibility_inspector)
463-
- [Chrome에서 접근성 검사기를 활성화하는 방법](https://gist.github.com/marcysutton/0a42f815878c159517a55e6652e3b23a)
463+
- [Chrome에서 접근성 검사기를 사용하는 방법](https://developers.google.com/web/tools/chrome-devtools/accessibility/reference#pane)
464464
- [OS X Safari에서 접근성 검사기를 사용하는 방법](https://developer.apple.com/library/content/documentation/Accessibility/Conceptual/AccessibilityMacOSX/OSXAXTestingApps.html)
465465

466466
### 스크린 리더 {#screen-readers}

content/docs/addons-test-utils.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ var ReactTestUtils = require('react-dom/test-utils'); // npm과 ES5
1919

2020
> 주의
2121
>
22-
> Facebook에서는 [`react-testing-library`](https://git.io/react-testing-library) 사용을 권장합니다. 이 라이브러리는 사용자가 컴포넌트를 사용하는 것처럼 테스트를 작성할 수 있도록 설계되었습니다.
22+
> Facebook에서는 [React Testing Library](https://testing-library.com/react) 사용을 권장합니다. 이 라이브러리는 사용자가 컴포넌트를 사용하는 것처럼 테스트를 작성할 수 있도록 설계되었습니다.
2323
>
2424
> 대안으로는 Airbnb에서 출시한 테스팅 도구인 [Enzyme](https://airbnb.io/enzyme/)이 있습니다. Enzyme은 React 컴포넌트의 출력을 쉽게 검증하고 조작하고 탐색할 수 있게 해줍니다.
2525

0 commit comments

Comments
 (0)