Skip to content

Commit 1710038

Browse files
merging all conflicts
2 parents b8f70f0 + b4b5906 commit 1710038

7 files changed

Lines changed: 23 additions & 4 deletions

File tree

content/community/courses.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ permalink: community/courses.html
1818

1919
- [React Armory: Learn React by Itself](https://reactarmory.com/guides/learn-react-by-itself) - With React Armory, you can learn React without the buzzwords.
2020

21-
- [The Road to Learn React](https://www.robinwieruch.de/the-road-to-learn-react/) - Build a real world application in plain React without complicated tooling.
22-
2321
- [Egghead.io: The Beginner's Guide to ReactJS](https://egghead.io/courses/the-beginner-s-guide-to-reactjs) - Free course for React newbies and those looking to get a better understanding of React fundamentals.
2422

2523
- [Free React Bootcamp](https://tylermcginnis.com/free-react-bootcamp/) - Recordings from three days of a free online React bootcamp.
@@ -49,3 +47,5 @@ permalink: community/courses.html
4947
- [Tyler McGinnis](https://tylermcginnis.com/courses) - Tyler McGinnis provides access to his courses for a monthly fee. Courses include "React Fundamentals" and "Universal React".
5048

5149
- [Mastering React](https://codewithmosh.com/p/mastering-react/) - Build professional interactive apps with React.
50+
51+
- [Road to React](https://www.roadtoreact.com/) - Your journey to master React in JavaScript.

content/docs/concurrent-mode-patterns.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -792,7 +792,7 @@ The tradeoff we're making here is that `<ProfileTimeline>` will be inconsistent
792792

793793
Whether or not it's an appropriate tradeoff depends on the situation. But it's a handy tool, especially when the content doesn't change noticeably between items, and the user might not even realize they were looking at a stale version for a second.
794794

795-
It's worth noting that `useDeferredValue` is not *only* useful for data fetching. It also helps when an expensive component tree causes an interaction (e.g. typing in an input) to be sluggish. Just like we can "defer" a value that takes too long to fetch (and show its old value despite others components updating), we can do this with trees that take too long to render.
795+
It's worth noting that `useDeferredValue` is not *only* useful for data fetching. It also helps when an expensive component tree causes an interaction (e.g. typing in an input) to be sluggish. Just like we can "defer" a value that takes too long to fetch (and show its old value despite other components updating), we can do this with trees that take too long to render.
796796

797797
For example, consider a filterable list like this:
798798

@@ -926,7 +926,7 @@ function ProfilePage({ resource }) {
926926

927927
The `revealOrder="forwards"` option means that the closest `<Suspense>` nodes inside this list **will only "reveal" their content in the order they appear in the tree -- even if the data for them arrives in a different order**. `<SuspenseList>` has other interesting modes: try changing `"forwards"` to `"backwards"` or `"together"` and see what happens.
928928

929-
You can control how many loading states are visible at once with the `tail` prop. If we specify `tail="collapsed"`, we'll see *at most one* fallback at the time. You can play with it [here](https://codesandbox.io/s/adoring-almeida-1zzjh).
929+
You can control how many loading states are visible at once with the `tail` prop. If we specify `tail="collapsed"`, we'll see *at most one* fallback at a time. You can play with it [here](https://codesandbox.io/s/adoring-almeida-1zzjh).
930930

931931
Keep in mind that `<SuspenseList>` is composable, like anything in React. For example, you can create a grid by putting several `<SuspenseList>` rows inside a `<SuspenseList>` table.
932932

content/docs/create-a-new-react-app.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,13 @@ Create React App не опрацьовує бекенд логіку чи лог
7373

7474
- **[Neutrino](https://neutrinojs.org/)** поєднує у собі [webpack](https://webpack.js.org/) з простотою його пресетів та включає в себе пресети для [React-додатків](https://neutrinojs.org/packages/react/) й [React-компонентів](https://neutrinojs.org/packages/react-components/).
7575

76+
<<<<<<< HEAD
7677
- **[Parcel](https://parceljs.org/)** -- швидкий бандлер веб-додатків з нульовою конфігурацією, [який працює з React](https://parceljs.org/recipes.html#react).
78+
=======
79+
- **[Nx](https://nx.dev/react)** is a toolkit for full-stack monorepo development, with built-in support for React, Next.js, [Express](https://expressjs.com/), and more.
80+
81+
- **[Parcel](https://parceljs.org/)** is a fast, zero configuration web application bundler that [works with React](https://parceljs.org/recipes.html#react).
82+
>>>>>>> b4b59062e59d56da37274c6de1fa4a134d2d8f49
7783
7884
- **[Razzle](https://github.com/jaredpalmer/razzle)** -- це фреймворк для серверного рендерингу, що не потребує ніякої конфігурації, але більш гнучкий ніж Next.js.
7985

content/docs/lists-and-keys.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,9 +184,14 @@ function ListItem(props) {
184184
function NumberList(props) {
185185
const numbers = props.numbers;
186186
const listItems = numbers.map((number) =>
187+
<<<<<<< HEAD
187188
// Вірно! Ключ потрібно визначати всередині масиву:
188189
<ListItem key={number.toString()}
189190
value={number} />
191+
=======
192+
// Correct! Key should be specified inside the array.
193+
<ListItem key={number.toString()} value={number} />
194+
>>>>>>> b4b59062e59d56da37274c6de1fa4a134d2d8f49
190195
);
191196
return (
192197
<ul>

content/docs/state-and-lifecycle.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -418,12 +418,15 @@ this.setState(function(state, props) {
418418
Компонент може передати свій стан вниз у якості пропсів до своїх дочірніх компонентів:
419419

420420
```js
421+
<<<<<<< HEAD
421422
<h2>Зараз {this.state.date.toLocaleTimeString()}.</h2>
422423
```
423424

424425
Це також працює для визначених користувачем компонентів:
425426

426427
```js
428+
=======
429+
>>>>>>> b4b59062e59d56da37274c6de1fa4a134d2d8f49
427430
<FormattedDate date={this.state.date} />
428431
```
429432

content/tutorial/tutorial.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1195,7 +1195,11 @@ class Game extends React.Component {
11951195
* Зберігає історію гри,
11961196
* Дозволяє гравцеві проглянути історію і попередні модифікації ігрового поля.
11971197

1198+
<<<<<<< HEAD
11981199
Чудова робота! Ми сподіваємося, що тепер ви почуваєтеся впевненіше у роботі з React.
1200+
=======
1201+
Nice work! We hope you now feel like you have a decent grasp of how React works.
1202+
>>>>>>> b4b59062e59d56da37274c6de1fa4a134d2d8f49
11991203
12001204
Продивитися фінальний результат ви можете за наступним посиланням: **[Завершена гра](https://codepen.io/gaearon/pen/gWWZgR?editors=0010)**.
12011205

src/css/reset.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ html {
1313
body {
1414
overflow-x: hidden;
1515
position: relative;
16+
filter: grayscale(100%);
1617
}
1718

1819
* {

0 commit comments

Comments
 (0)