Skip to content

Commit 63dfc06

Browse files
Merge pull request #131 from reactjs/sync-e60bca04
Sync with reactjs.org @ e60bca0
2 parents 478212b + b4d4fa1 commit 63dfc06

File tree

5 files changed

+24
-18
lines changed

5 files changed

+24
-18
lines changed

content/blog/2017-09-08-dom-attributes-in-react-16.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ React has always provided a JavaScript-centric API to the DOM. Since React compo
3232
<div tabIndex={-1} />
3333
```
3434

35-
This has not changed. However, the way we enforced it in the past forced us to maintain a allowlist of all valid React DOM attributes in the bundle:
35+
This has not changed. However, the way we enforced it in the past forced us to maintain an allowlist of all valid React DOM attributes in the bundle:
3636

3737
```js
3838
// ...

content/community/conferences.md

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,32 +12,37 @@ 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 fwdays’21 {#react-fwdays-2021}
16-
March 27, 2021 - remote event
15+
### render(ATL) 2021 {#render-atlanta-2021}
16+
September 13-15, 2021. Atlanta, GA, USA
1717

18-
[Website](https://fwdays.com/en/event/react-fwdays-2021) - [Twitter](https://twitter.com/fwdays) - [Facebook](https://www.facebook.com/events/1133828147054286) - [LinkedIn](https://www.linkedin.com/events/reactfwdays-21onlineconference6758046347334582273) - [Meetup](https://www.meetup.com/ru-RU/Fwdays/events/275764431/)
18+
[Website](https://renderatl.com) - [Twitter](https://twitter.com/renderATL) - [Instagram](https://www.instagram.com/renderatl/) - [Facebook](https://www.facebook.com/renderatl/) - [LinkedIn](https://www.linkedin.com/company/renderatl)
1919

20-
### React Summit - Remote Edition 2021 {#react-summit-remote-2021}
21-
April 14-16, 2021, 7am PST / 10am EST / 4pm CEST - remote event
20+
### React Advanced 2021 {#react-advanced-2021}
21+
October 22-23, 2021. In-person in London, UK + remote (hybrid event)
2222

23-
[Website](https://remote.reactsummit.com) - [Twitter](https://twitter.com/reactsummit) - [Facebook](https://www.facebook.com/reactamsterdam) - [Videos](https://youtube.com/c/ReactConferences)
23+
[Website](https://reactadvanced.com) - [Twitter](http://twitter.com/reactadvanced) - [Facebook](https://www.facebook.com/ReactAdvanced) - [Videos](https://youtube.com/c/ReactConferences)
24+
25+
### React India 2021 {#react-india-2021}
26+
November 12-13, 2021 in Mumbai, India
27+
28+
[Website](https://www.reactindia.io) - [Twitter](https://twitter.com/react_india) - [Facebook](https://www.facebook.com/ReactJSIndia/) - [LinkedIn](https://www.linkedin.com/showcase/14545585) - [YouTube](https://www.youtube.com/channel/UCaFbHCBkPvVv1bWs_jwYt3w/videos)
29+
30+
## Past Conferences {#past-conferences}
2431

2532
### React Case Study Festival 2021 {#react-case-study-festival-2021}
2633
April 27-28, 2021 - remote event
2734

2835
[Website](https://link.geekle.us/react/offsite) - [LinkedIn](https://www.linkedin.com/events/reactcasestudyfestival6721300943411015680/) - [Facebook](https://www.facebook.com/events/255715435820203)
2936

30-
### render(ATL) 2021 {#render-atlanta-2021}
31-
September 13-15, 2021. Atlanta, GA, USA
32-
33-
[Website](https://renderatl.com) - [Twitter](https://twitter.com/renderATL) - [Instagram](https://www.instagram.com/renderatl/) - [Facebook](https://www.facebook.com/renderatl/) - [LinkedIn](https://www.linkedin.com/company/renderatl)
37+
### React Summit - Remote Edition 2021 {#react-summit-remote-2021}
38+
April 14-16, 2021, 7am PST / 10am EST / 4pm CEST - remote event
3439

35-
### React India 2021 {#react-india-2021}
36-
November 12-13, 2021 in Mumbai, India
40+
[Website](https://remote.reactsummit.com) - [Twitter](https://twitter.com/reactsummit) - [Facebook](https://www.facebook.com/reactamsterdam) - [Videos](https://youtube.com/c/ReactConferences)
3741

38-
[Website](https://www.reactindia.io) - [Twitter](https://twitter.com/react_india) - [Facebook](https://www.facebook.com/ReactJSIndia/) - [LinkedIn](https://www.linkedin.com/showcase/14545585) - [YouTube](https://www.youtube.com/channel/UCaFbHCBkPvVv1bWs_jwYt3w/videos)
42+
### React fwdays’21 {#react-fwdays-2021}
43+
March 27, 2021 - remote event
3944

40-
## Past Conferences {#past-conferences}
45+
[Website](https://fwdays.com/en/event/react-fwdays-2021) - [Twitter](https://twitter.com/fwdays) - [Facebook](https://www.facebook.com/events/1133828147054286) - [LinkedIn](https://www.linkedin.com/events/reactfwdays-21onlineconference6758046347334582273) - [Meetup](https://www.meetup.com/ru-RU/Fwdays/events/275764431/)
4146

4247
### React Next 2020 {#react-next-2020}
4348
December 1-2, 2020 - remote event

content/docs/addons-test-utils.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,10 @@ A `ReactTestUtils` egyszerűvé teszi a React komponensek tesztelését az álta
1919

2020
> Megjegyzés:
2121
>
22-
> Mi a [React Testing Library](https://testing-library.com/react) használatát ajánljuk, ami úgy lett tervezve, hogy olyan komponenstesztek írására bátorítson, amik a végfelhasználó cselekedeit tükrözi.
22+
> Mi a [React Testing Library](https://testing-library.com/react) használatát ajánljuk, ami úgy lett tervezve, hogy olyan komponenstesztek írására bátorítson, amik a végfelhasználó cselekedeit tükrözik.
2323
>
24-
> Alternatívaként, az Airbnb is kiadott egy tesztelői segédeszközt [Enzyme](https://airbnb.io/enzyme/) néven, ami egyszerűbbé teszi a React komponenseid kimenetéhez állításokat írni, azt manipulálni és bejárni.
24+
> React 16, vagy korábbi verziók teszteléséhez az [Enzyme](https://airbnb.io/enzyme/) könyvtár segít a React Komponensek kimentéhez állításokat írni, valamit azokat manupulálni, vagy bejárni.
25+
2526

2627
- [`act()`](#act)
2728
- [`mockComponent()`](#mockcomponent)

content/docs/testing-recipes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ it("changes value when clicked", () => {
393393
render(<Toggle onChange={onChange} />, container);
394394
});
395395
396-
// get ahold of the button element, and trigger some clicks on it
396+
// get a hold of the button element, and trigger some clicks on it
397397
const button = document.querySelector("[data-testid=toggle]");
398398
expect(button.innerHTML).toBe("Turn on");
399399

content/images/tutorial/devtools.png

10.7 KB
Loading

0 commit comments

Comments
 (0)