Skip to content

Commit bc64d98

Browse files
authored
Merge branch 'master' into master
2 parents 5125c2f + 1ca5e92 commit bc64d98

19 files changed

+156
-10
lines changed

content/community/conferences.md

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,11 @@ February 27 & 28, 2020 in Sydney, Australia
3232

3333
[Website](https://reactconfau.com/) - [Twitter](https://twitter.com/reactconfau) - [Facebook](https://www.facebook.com/reactconfau) - [Instagram](https://www.instagram.com/reactconfau/)
3434

35+
### Reactathon 2020 {#reactathon-2020}
36+
March 30 - 31, 2020 in San Francisco, CA
37+
38+
[Website](https://www.reactathon.com) - [Twitter](https://twitter.com/reactathon) - [Facebook](https://www.facebook.com/events/575942819854160/)
39+
3540
### React Summit Amsterdam 2020 {#react-summit-2020}
3641
April 15-17, 2020 in Amsterdam, The Netherlands
3742

@@ -50,7 +55,7 @@ April 25, 2020 in Bangalore, India
5055
### render(ATL) 2020 {#render-atlanta-2020}
5156
May 4-6, 2020. Atlanta, GA, USA.
5257

53-
[Website](https://renderatl.com) - [Twitter](https://twitter.com/renderATL) - [Instagram](https://www.instagram.com/renderatl/) - [Facebook](https://www.facebook.com/renderatl/)
58+
[Website](https://renderatl.com) - [Twitter](https://twitter.com/renderATL) - [Instagram](https://www.instagram.com/renderatl/) - [Facebook](https://www.facebook.com/renderatl/)
5459

5560
### ReactEurope 2020 {#reacteurope-2020}
5661
May 14-15, 2020 in Paris, France
@@ -65,7 +70,7 @@ May 26-29 in Helsinki, Finland
6570
### React Next 2020 {#react-next-2020}
6671
June 15, 2020. Tel Aviv, Israel.
6772

68-
[Website](https://react-next.com/) - [Twitter](https://twitter.com/reactnext) - [Facebook](https://www.facebook.com/ReactNext2016/)
73+
[Website](https://react-next.com/) - [Twitter](https://twitter.com/reactnext) - [Facebook](https://www.facebook.com/ReactNext2016/)
6974

7075
### React Loop 2020 {#react-loop-2020}
7176
June 19, 2020. Chicago, Illinois, USA.
@@ -75,7 +80,7 @@ June 19, 2020. Chicago, Illinois, USA.
7580
### React Week NY 2020 {#react-week-ny-2020}
7681
July 17, 2020. New York City, USA.
7782

78-
[Website](https://reactweek.nyc/) - [Twitter](https://twitter.com/reactweek) - [Facebook](https://www.facebook.com/reactweek)
83+
[Website](https://reactweek.nyc/) - [Twitter](https://twitter.com/reactweek) - [Facebook](https://www.facebook.com/reactweek)
7984

8085

8186
## Past Conferences {#past-conferences}
@@ -417,8 +422,8 @@ August 22-23, 2019. Salt Lake City, USA.
417422

418423
[Website](https://www.reactrally.com/) - [Twitter](https://twitter.com/ReactRally) - [Instagram](https://www.instagram.com/reactrally/)
419424

420-
### React Conf Iran 2019 {#react-conf-iran-2019}
421-
August 29, 2019. Tehran, Iran.
425+
### React Conf Iran 2019 {#react-conf-iran-2019}
426+
August 29, 2019. Tehran, Iran.
422427

423428
[Website](https://reactconf.ir/) - [Videos](https://www.youtube.com/playlist?list=PL-VNqZFI5Nf-Nsj0rD3CWXGPkH-DI_0VY) - [Highlights](https://github.com/ReactConf/react-conf-highlights)
424429

@@ -471,4 +476,3 @@ October 25, 2019 in London, UK
471476
October 19, 2019 in São Paulo, BR
472477

473478
[Website](https://reactconf.com.br/) - [Twitter](https://twitter.com/reactconfbr) - [Facebook](https://www.facebook.com/ReactAdvanced) - [Slack](https://react.now.sh/)
474-

content/community/examples.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ permalink: community/examples.html
99
There are many example projects created by the React community. Feel free to add your own project. If you add a project, please commit to keeping it up to date with the latest versions of React.
1010

1111

12+
* **[Zeldog](https://yannsainty.github.io/Zeldog/)** A Zelda like game with a dog fighting ducks and more to eat pizza !
1213
* **[Calculator](https://github.com/ahfarmer/calculator)** Implementation of the iOS calculator built in React
1314
* **[Emoji Search](https://github.com/ahfarmer/emoji-search)** Simple React app for searching emoji
1415
* **[GitHub Battle App](https://tm.dev/react-course-project/)** Battle two GitHub users and see the most popular Github projects for any language.

content/community/meetups.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ permalink: community/meetups.html
88

99
Do you have a local React.js meetup? Add it here! (Please keep the list alphabetical)
1010

11+
## Argentina {#argentina}
12+
* [Rosario](https://www.meetup.com/es/reactrosario)
13+
1114
## Australia {#australia}
1215
* [Brisbane](https://www.meetup.com/reactbris/)
1316
* [Melbourne](https://www.meetup.com/React-Melbourne/)
@@ -134,6 +137,9 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
134137
## Sweden {#sweden}
135138
* [Goteborg](https://www.meetup.com/ReactJS-Goteborg/)
136139

140+
## Switzerland {#switzerland}
141+
* [Zurich](https://www.meetup.com/Zurich-ReactJS-Meetup/)
142+
137143
## Ukraine {#ukraine}
138144
* [Kyiv](https://www.meetup.com/Kyiv-ReactJS-Meetup)
139145

content/community/nav.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
items:
33
- id: support
44
title: Support
5+
- id: team
6+
title: Team
57
- id: courses
68
title: Courses
79
- id: examples

content/community/team.md

Lines changed: 133 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,133 @@
1+
---
2+
id: team
3+
title: Team
4+
layout: community
5+
sectionid: community
6+
permalink: community/team.html
7+
---
8+
9+
React development is led by a small dedicated team working full time at Facebook. It also receives contributions from people all over the world.
10+
11+
## Meet the React Team {#meet-the-react-team}
12+
13+
The React team members work full time on the core component APIs, the engine that powers React DOM and React Native, React DevTools, and the React documentation website.
14+
15+
Current members of the React team are listed in alphabetical order below.
16+
17+
### Andrew Clark {#andrew-clark}
18+
19+
![Andrew Clark](../images/team/acdlite.jpg)
20+
21+
[@acdlite on GitHub](https://github.com/acdlite) · [@acdlite on Twitter](https://twitter.com/acdlite)
22+
23+
Andrew got started with web development by making sites with WordPress, and eventually tricked himself into doing JavaScript. His favorite pastime is karaoke. Andrew is either a Disney villain or a Disney princess, depending on the day.
24+
25+
### Brian Vaughn {#brian-vaughn}
26+
27+
![Brian Vaughn](../images/team/bvaughn.jpg)
28+
29+
[@bvaughn on GitHub](https://github.com/bvaughn) · [@brian\_d\_vaughn on Twitter](https://twitter.com/brian_d_vaughn)
30+
31+
Brian studied art in college and did programming on the side to pay for his education. Eventually, he realized that he enjoys working on open source. Brian has one [one-person band](https://soundcloud.com/brianvaughn/) and two [two-person](https://soundcloud.com/pilotlessdrone) [bands](https://soundcloud.com/pinwurm). He also takes care of the cutest cat in the world.
32+
33+
### Dan Abramov {#dan-abramov}
34+
35+
![Dan Abramov](../images/team/gaearon.jpg)
36+
37+
[@gaearon on GitHub](https://github.com/gaearon) · [@dan_abramov on Twitter](https://twitter.com/dan_abramov)
38+
39+
Dan got into programming after he accidentally discovered Visual Basic inside Microsoft PowerPoint. He has found his true calling in turning [Sebastian](#sebastian-markbage)'s tweets into long-form blog posts. Dan occasionally wins at Fortnite by hiding in a bush until the game ends.
40+
41+
### Dominic Gannaway {#dominic-gannaway}
42+
43+
![Dominic](../images/team/trueadm.jpg)
44+
45+
[@trueadm on GitHub](https://github.com/trueadm) · [@trueadm on Twitter](https://twitter.com/trueadm)
46+
47+
Dominic is interested in travelling, drum and bass, stand-up comedy and spending time with the family. He most enjoys hacking on new unexplored ideas around UIs and accessibility and has a passion for tweaking and optimizing code to get the most performance out of things.
48+
49+
### Luna Ruan {#luna-ruan}
50+
51+
![Luna](../images/team/lunaruan.jpg)
52+
53+
[@lunaruan on GitHub](https://github.com/lunaruan) · [@lunaruan on Twitter](https://twitter.com/lunaruan)
54+
55+
Luna learned programming because she thought it meant creating video games. Instead, she ended up working on the Pinterest web app, and now on React itself. Luna doesn't want to make video games anymore, but she plans to do creative writing if she ever gets bored.
56+
57+
### Nicolas Gallagher {#nicolas-gallagher}
58+
59+
![Nicolas](../images/team/necolas.jpg)
60+
61+
[@necolas on GitHub](https://github.com/necolas) · [@necolas on Twitter](https://twitter.com/necolas)
62+
63+
Nicolas has majored in anthropology. He started in web development by building a website for a friend, and eventually found himself rebuilding the Twitter website with React. Nicolas describes himself as boring on paper, not much better in real life.
64+
65+
### Rachel Nabors {#rachel-nabors}
66+
67+
![Rachel](../images/team/rnabors.jpg)
68+
69+
[@rachelnabors on GitHub](https://github.com/rachelnabors) · [@rachelnabors on Twitter](https://twitter.com/rachelnabors)
70+
71+
Rachel wrote a [book about UI animation](https://abookapart.com/products/animation-at-work) once and worked with MDN and the W3C on the web animations API. Now she is busy with education materials and community engineering on the React team. Secretly, she is an award-winning cartoonist for teenage girls. Catch her making fancy tea with lukewarm water in the microkitchen.
72+
73+
### Sebastian Markbåge {#sebastian-markbage}
74+
75+
![Sebastian](../images/team/sebmarkbage.jpg)
76+
77+
[@sebmarkbage on GitHub](https://github.com/sebmarkbage) · [@sebmarkbage on Twitter](https://twitter.com/sebmarkbage)
78+
79+
Sebastian majored in psychology. He's usually quiet. Even when he says something, it often doesn't make sense to the rest of us until a few months later. The correct way to pronounce his surname is "mark-boa-geh" but he settled for "mark-beige" out of pragmatism -- and that's how he approaches React.
80+
81+
### Sunil Pai {#sunil-pai}
82+
83+
![Sunil](../images/team/threepointone.jpg)
84+
85+
[@threepointone on GitHub](https://github.com/threepointone) · [@threepointone on Twitter](https://twitter.com/threepointone)
86+
87+
Sunil started writing JavaScript for IE6 and still has some regrets about it. He worked in consulting, design, and product firms, before joining the React team to help others do the same. Sunil plays a blue Les Paul guitar, loves London, and would appreciate a response to his last ping, please and thank you!
88+
89+
### Yuzhi Zheng {#yuzhi-zheng}
90+
91+
![Yuzhi](../images/team/yuzhi.jpg)
92+
93+
[@yuzhi on GitHub](https://github.com/yuzhi) · [@yuzhiz on Twitter](https://twitter.com/yuzhiz)
94+
95+
Yuzhi studied Computer Science in school. She liked the instant gratification of seeing code come to life without having to physically be in a laboratory. Now she manages the React team. Before management, she used to work on the Relay data fetching framework. In her spare time, Yuzhi enjoys optimizing her life via gardening and home improvement projects.
96+
97+
## Acknowledgements {#acknowledgements}
98+
99+
React was originally created by [Jordan Walke](https://github.com/jordwalke). Today, React has over a thousand open source contributors. We'd like to recognize a few people who have made significant contributions to React and its documentation in the past and have helped maintain them over the years:
100+
101+
* [Almero Steyn](https://github.com/AlmeroSteyn)
102+
* [Andreas Svensson](https://github.com/syranide)
103+
* [Alex Krolick](https://github.com/alexkrolick)
104+
* [Alexey Pyltsyn](https://github.com/lex111)
105+
* [Brandon Dail](https://github.com/aweary)
106+
* [Chang Yan](https://github.com/cyan33)
107+
* [Cheng Lou](https://github.com/chenglou)
108+
* [Christoph Nakazawa](https://github.com/cpojer)
109+
* [Christopher Chedeau](https://github.com/vjeux)
110+
* [Clement Hoang](https://github.com/clemmy)
111+
* [Flarnie Marchan](https://github.com/flarnie)
112+
* [Jason Quense](https://github.com/jquense)
113+
* [Jesse Beach](https://github.com/jessebeach)
114+
* [Jessica Franco](https://github.com/Jessidhia)
115+
* [Jim Sproch](https://github.com/jimfb)
116+
* [Josh Duck](https://github.com/joshduck)
117+
* [Joe Critchley](https://github.com/joecritch)
118+
* [Jeff Morrison](https://github.com/jeffmo)
119+
* [Keyan Zhang](https://github.com/keyz)
120+
* [Nat Alison](https://github.com/tesseralis)
121+
* [Nathan Hunzaker](https://github.com/nhunzaker)
122+
* [Paul O'Shannessy](https://github.com/zpao)
123+
* [Pete Hunt](https://github.com/petehunt)
124+
* [Philipp Spiess](https://github.com/philipp-spiess)
125+
* [Sander Spies](https://github.com/sanderspies)
126+
* [Sophia Shoemaker](https://github.com/mrscobbler)
127+
* [Sophie Alpert](https://github.com/sophiebits)
128+
* [Sasha Aickin](https://github.com/aickin)
129+
* [Tim Yung](https://github.com/yungsters)
130+
131+
This list is not exhaustive.
132+
133+
We'd like to give special thanks to [Tom Occhino](https://github.com/tomocchino) and [Adam Wolff](https://github.com/wolffiex) for their guidance and support over the years. We'd also like to thank all the volunteers who [translated React into other languages](https://isreacttranslatedyet.com/).

content/docs/codebase-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ React 파이버 구조에 대해 [여기](https://github.com/acdlite/react-fiber
217217

218218
### 이벤트 시스템 {#event-system}
219219

220-
React는 렌더러와 무관하며 React DOM 및 React Native와 함께 작동하는 합성 이벤트 시스템을 구현합니다. 해당 코드는 [`packages/react-events`](https://github.com/facebook/react/tree/master/packages/react-events)에서 확인할 수 있습니다.
220+
React는 렌더러와 무관하며 React DOM 및 React Native와 함께 작동하는 합성 이벤트 시스템을 구현합니다. 해당 코드는 [`packages/legacy-events`](https://github.com/facebook/react/tree/master/packages/legacy-events)에서 확인할 수 있습니다.
221221

222222
해당 코드에 대한 상세한 설명은 다음의 [영상](https://www.youtube.com/watch?v=dRo_egw7tBc) (66분)을 참고하세요.
223223

content/docs/implementation-notes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Both this document and his talk are simplifications of the real codebase so you
2525

2626
### Overview {#overview}
2727

28-
The reconciler itself doesn't have a public API. [Renderers](/docs/codebase-overview.html#stack-renderers) like React DOM and React Native use it to efficiently update the user interface according to the React components written by the user.
28+
The reconciler itself doesn't have a public API. [Renderers](/docs/codebase-overview.html#renderers) like React DOM and React Native use it to efficiently update the user interface according to the React components written by the user.
2929

3030
### Mounting as a Recursive Process {#mounting-as-a-recursive-process}
3131

content/docs/reference-react-dom.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ React는 Internet Explorer 9과 상위 버전을 포함한 모든 주요 브라
3636
ReactDOM.render(element, container[, callback])
3737
```
3838

39-
React 엘리먼트를 제공된 `container` DOM에 렌더링하고 컴포넌트에 대한 [참조](/docs/more-about-refs.html)를 반환합니다([무상태 컴포넌트](/docs/components-and-props.html#functional-and-class-components)`null`을 반환합니다).
39+
React 엘리먼트를 `container` DOM에 렌더링하고 컴포넌트에 대한 [참조](/docs/more-about-refs.html)를 반환합니다([무상태 컴포넌트](/docs/components-and-props.html#function-and-class-components)`null`을 반환합니다).
4040

4141
React 엘리먼트가 이전에 `container` 내부에 렌더링 되었다면 해당 엘리먼트는 업데이트하고 최신의 React 엘리먼트를 반영하는 데 필요한 DOM만 변경합니다.
4242

content/docs/testing-recipes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -529,7 +529,7 @@ it("should accept selections", () => {
529529
530530
act(() => {
531531
container
532-
.querySelector("[data-testid=2]")
532+
.querySelector("[data-testid='2']")
533533
.dispatchEvent(new MouseEvent("click", { bubbles: true }));
534534
});
535535

content/images/team/acdlite.jpg

459 KB
Loading

0 commit comments

Comments
 (0)