Skip to content

Commit fa7ffc5

Browse files
Merge pull request #55 from reactjs/sync-fb382ccb
Sync with reactjs.org @ fb382cc
2 parents afd7eb6 + f6b8495 commit fa7ffc5

36 files changed

+105
-85
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ The documentation is divided into several sections with a different tone and pur
3636

3737
### Make the change
3838

39-
1. Follow the "Running locally" instructions
39+
1. Follow the ["Running locally"](#running-locally) instructions
4040
1. Save the files and check in the browser
4141
1. Changes to React components in `src` will hot-reload
4242
1. Changes to markdown files in `content` will hot-reload

content/blog/2015-12-18-react-components-elements-and-instances.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ React will ask the `Form` component what element tree it returns, given those `p
350350
}
351351
```
352352
353-
This is a part of the process that React calls [reconciliation](/docs/reconciliation.html) which starts when you call [`ReactDOM.render()`](/docs/top-level-api.html#reactdom.render) or [`setState()`](/docs/component-api.html#setstate). By the end of the reconciliation, React knows the result DOM tree, and a renderer like `react-dom` or `react-native` applies the minimal set of changes necessary to update the DOM nodes (or the platform-specific views in case of React Native).
353+
This is a part of the process that React calls [reconciliation](/docs/reconciliation.html) which starts when you call [`ReactDOM.render()`](/docs/top-level-api.html#reactdom.render) or [`setState()`](/docs/component-api.html#setstate). By the end of the reconciliation, React knows the resulting DOM tree, and a renderer like `react-dom` or `react-native` applies the minimal set of changes necessary to update the DOM nodes (or the platform-specific views in case of React Native).
354354
355355
This gradual refining process is also the reason React apps are easy to optimize. If some parts of your component tree become too large for React to visit efficiently, you can tell it to [skip this “refining” and diffing certain parts of the tree if the relevant props have not changed](/docs/advanced-performance.html). It is very fast to calculate whether the props have changed if they are immutable, so React and immutability work great together, and can provide great optimizations with the minimal effort.
356356

content/blog/2018-11-27-react-16-roadmap.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ Hooks represent our vision for the future of React. They solve both problems tha
108108

109109
### React 16.x (~Q2 2019): The One with Concurrent Mode {#react-16x-q2-2019-the-one-with-concurrent-mode}
110110

111-
*Concurrent Mode* lets React apps be more responsive by rendering component trees without blocking the main thread. It is opt-in and allows React to interrupt a long-running render (for example, rendering a new feed story) to handle a high-priority event (for example, text input or hover). Concurrent Mode also improves the user experience of Suspense by skipping unnecessary loading states on fast connections.
111+
*Concurrent Mode* lets React apps be more responsive by rendering component trees without blocking the main thread. It is opt-in and allows React to interrupt a long-running render (for example, rendering a news feed story) to handle a high-priority event (for example, text input or hover). Concurrent Mode also improves the user experience of Suspense by skipping unnecessary loading states on fast connections.
112112

113113
>Note
114114
>

content/blog/2019-10-22-react-release-channels.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ Releases in Next are published with the `next` tag on npm. Versions are generate
5151

5252
The Next channel is designed to support integration testing between React and other projects.
5353

54-
All changes to React go through extensive internal testing before they are released to the public. However, there are a myriad of environments and configurations used throughout the React ecosystem, and it's not possible for us to test against every single one.
54+
All changes to React go through extensive internal testing before they are released to the public. However, there are myriad environments and configurations used throughout the React ecosystem, and it's not possible for us to test against every single one.
5555

5656
If you're the author of a third party React framework, library, developer tool, or similar infrastructure-type project, you can help us keep React stable for your users and the entire React community by periodically running your test suite against the most recent changes. If you're interested, follow these steps:
5757

content/community/conferences.md

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +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 Barcamp Cologne 2020 {#react-barcamp-cologne-2020}
16-
February 1-2, 2020 in Cologne, Germany
17-
18-
[Website](https://react-barcamp.de/) - [Twitter](https://twitter.com/ReactBarcamp) - [Facebook](https://www.facebook.com/reactbarcamp)
19-
20-
### ReactConf AU 2020 {#reactconfau}
21-
February 27 & 28, 2020 in Sydney, Australia
22-
23-
[Website](https://reactconfau.com/) - [Twitter](https://twitter.com/reactconfau) - [Facebook](https://www.facebook.com/reactconfau) - [Instagram](https://www.instagram.com/reactconfau/)
24-
2515
### ReactConf Japan 2020 {#reactconfjp-2020}
2616
March 21, 2020 in Tokyo, Japan
2717

@@ -511,3 +501,12 @@ December 6, 2019 in Berlin, Germany
511501

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

504+
### React Barcamp Cologne 2020 {#react-barcamp-cologne-2020}
505+
February 1-2, 2020 in Cologne, Germany
506+
507+
[Website](https://react-barcamp.de/) - [Twitter](https://twitter.com/ReactBarcamp) - [Facebook](https://www.facebook.com/reactbarcamp)
508+
509+
### ReactConf AU 2020 {#reactconfau}
510+
February 27 & 28, 2020 in Sydney, Australia
511+
512+
[Website](https://reactconfau.com/) - [Twitter](https://twitter.com/reactconfau) - [Facebook](https://www.facebook.com/reactconfau) - [Instagram](https://www.instagram.com/reactconfau/)

content/community/meetups.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
8484
* [Chennai](https://www.meetup.com/React-Chennai/)
8585
* [Delhi NCR](https://www.meetup.com/React-Delhi-NCR/)
8686
* [Jaipur](https://www.meetup.com/JaipurJS-Developer-Meetup/)
87+
* [Pune](https://www.meetup.com/ReactJS-and-Friends/)
8788

8889
## Indonesia {#indonesia}
8990
* [Indonesia](https://www.meetup.com/reactindonesia/)

content/docs/addons-animation.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ The [`ReactTransitionGroup`](#low-level-api-reacttransitiongroup) add-on compone
2323
**Importing**
2424

2525
```javascript
26-
import ReactCSSTransitionGroup from 'react-addons-css-transition-group'; // ES6
27-
var ReactCSSTransitionGroup = require('react-addons-css-transition-group'); // ES5 with npm
26+
import ReactCSSTransitionGroup from 'react-transition-group'; // ES6
27+
var ReactCSSTransitionGroup = require('react-transition-group'); // ES5 with npm
2828
```
2929

3030
```javascript{31-36}
@@ -199,7 +199,7 @@ render() {
199199
In the example above, we rendered a list of items into `ReactCSSTransitionGroup`. However, the children of `ReactCSSTransitionGroup` can also be one or zero items. This makes it possible to animate a single element entering or leaving. Similarly, you can animate a new element replacing the current element. For example, we can implement a simple image carousel like this:
200200

201201
```javascript{10}
202-
import ReactCSSTransitionGroup from 'react-addons-css-transition-group';
202+
import ReactCSSTransitionGroup from 'react-transition-group';
203203
204204
function ImageCarousel(props) {
205205
return (

content/docs/code-splitting.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,8 @@ This will automatically load the bundle containing the `OtherComponent` when thi
132132
The lazy component should then be rendered inside a `Suspense` component, which allows us to show some fallback content (such as a loading indicator) while we're waiting for the lazy component to load.
133133

134134
```js
135+
import React, { Suspense } from 'react';
136+
135137
const OtherComponent = React.lazy(() => import('./OtherComponent'));
136138

137139
function MyComponent() {
@@ -148,6 +150,8 @@ function MyComponent() {
148150
The `fallback` prop accepts any React elements that you want to render while waiting for the component to load. You can place the `Suspense` component anywhere above the lazy component. You can even wrap multiple lazy components with a single `Suspense` component.
149151

150152
```js
153+
import React, { Suspense } from 'react';
154+
151155
const OtherComponent = React.lazy(() => import('./OtherComponent'));
152156
const AnotherComponent = React.lazy(() => import('./AnotherComponent'));
153157

@@ -170,7 +174,9 @@ function MyComponent() {
170174
If the other module fails to load (for example, due to network failure), it will trigger an error. You can handle these errors to show a nice user experience and manage recovery with [Error Boundaries](/docs/error-boundaries.html). Once you've created your Error Boundary, you can use it anywhere above your lazy components to display an error state when there's a network error.
171175

172176
```js
177+
import React, { Suspense } from 'react';
173178
import MyErrorBoundary from './MyErrorBoundary';
179+
174180
const OtherComponent = React.lazy(() => import('./OtherComponent'));
175181
const AnotherComponent = React.lazy(() => import('./AnotherComponent'));
176182

@@ -203,8 +209,8 @@ Here's an example of how to setup route-based code splitting into your app using
203209
libraries like [React Router](https://reacttraining.com/react-router/) with `React.lazy`.
204210

205211
```js
206-
import { BrowserRouter as Router, Route, Switch } from 'react-router-dom';
207212
import React, { Suspense, lazy } from 'react';
213+
import { BrowserRouter as Router, Route, Switch } from 'react-router-dom';
208214

209215
const Home = lazy(() => import('./routes/Home'));
210216
const About = lazy(() => import('./routes/About'));

content/docs/components-and-props.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class Welcome extends React.Component {
4444

4545
A React szemszögéből a fenti két komponens egymással megegyező.
4646

47-
Az osztályok rendelkeznek pár extra funkcióval, amit a [következő fejezetekben](/docs/state-and-lifecycle.html) beszélünk ki. Addig is a függvény komponenseket használjuk tömörségük miatt.
47+
Mind a függvény-, és osztálykomponensek rendelkeznek néhány extra funkcióval, amit a [következő fejezetekben](/docs/state-and-lifecycle.html) beszélünk ki.
4848

4949
## Egy komponens renderelése {#rendering-a-component}
5050

@@ -60,7 +60,7 @@ Azonban az elemek képviselhetnek a felhasználó által definiált komponenseke
6060
const element = <Welcome name="Sára" />;
6161
```
6262

63-
Ha a React egy olyan elemet lát ami egy felhasználó által definiált komponenst képvisel, akkor leküldi a JSX attribútumokat a komponensnek egy sima objektumként. Ezt az objektumot hívjuk "props"-nak.
63+
Ha a React egy olyan elemet lát, ami egy felhasználó által definiált komponenst képvisel, akkor a JSX attribútumokat és a gyermekeket egy sima objektumként küldi le a komponensnek. Ezt az objektumot hívjuk "props"-nak.
6464

6565
Például ez a kód a "Helló, Sára" szöveget rendereli az oldalon:
6666

@@ -120,7 +120,7 @@ ReactDOM.render(
120120

121121
[](codepen://components-and-props/composing-components)
122122

123-
Tipikusan az új React alkalmazásoknak van egy `App` komponensük a legfelsőbb szinten. Azonban ha egy meglévő alkalmazásba integrálod a React-et, dolgozhatsz lentről felfelé fokozatosan haladva, kezdve kis komponensekkel, mint egy `Button` amíg el nem éred a nézet hierarchia csúcsát.
123+
Tipikusan az új React alkalmazásoknak van egy `App` komponensük a legfelsőbb szinten. Azonban ha egy meglévő alkalmazásba integrálod a Reactet, dolgozhatsz lentről felfelé fokozatosan haladva, kezdve kis komponensekkel, mint egy `Button` amíg el nem éred a nézet hierarchia csúcsát.
124124

125125
## Komponensek kivonása {#extracting-components}
126126

content/docs/concurrent-mode-adoption.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ We're using this code in production (and it works for us) but there are still so
5454

5555
### Enabling Concurrent Mode {#enabling-concurrent-mode}
5656

57-
Normally, when we add features to React, you can start using them immediately. Fragments, Context, and even Hooks are examples of such features. You can use in new code without making any changes to the existing code.
57+
Normally, when we add features to React, you can start using them immediately. Fragments, Context, and even Hooks are examples of such features. You can use them in new code without making any changes to the existing code.
5858

5959
Concurrent Mode is different. It introduces semantic changes to how React works. Otherwise, the [new features](/docs/concurrent-mode-patterns.html) enabled by it *wouldn't be possible*. This is why they're grouped into a new "mode" rather than released one by one in isolation.
6060

0 commit comments

Comments
 (0)