Skip to content

Commit a555f4b

Browse files
authored
Merge pull request #643 from reactjs/sync-19aa5b48
Sync with reactjs.org @ 19aa5b4
2 parents 5023a36 + f88a86f commit a555f4b

File tree

6 files changed

+12
-8
lines changed

6 files changed

+12
-8
lines changed
106 KB
Loading

beta/src/components/MDX/ConsoleBlock.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ function ConsoleBlock({level = 'error', children}: ConsoleBlockProps) {
4444
<Box className="bg-gray-300 dark:bg-gray-90" width="15px" />
4545
</div>
4646
<div className="flex text-sm px-4">
47-
<div className="border-b-2 border-gray-300 dark:border-gray-90">
47+
<div className="border-b-2 border-gray-300 dark:border-gray-90 dark:text-gray-30 text-gray-50">
4848
Console
4949
</div>
5050
<div className="px-4 py-2 flex">

beta/src/content/community/team.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ The React Core team members work full time on the core component APIs, the engin
1414

1515
Current members of the React team are listed in alphabetical order below.
1616

17-
<TeamMember name="Andrew Clark" permalink="andrew-clark" photo="/images/team/acdlite.jpg" github="acdlite" twitter="acdlite" title="Engineer at Meta">
17+
<TeamMember name="Andrew Clark" permalink="andrew-clark" photo="/images/team/acdlite.jpg" github="acdlite" twitter="acdlite" title="Engineer at Vercel">
1818
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.
1919
</TeamMember>
2020

@@ -38,10 +38,14 @@ Current members of the React team are listed in alphabetical order below.
3838
Lauren’s programming career peaked when she first discovered the `<marquee>` tag. She’s been chasing that high ever since. When she’s not adding bugs into React, she enjoys dropping cheeky memes in chat, and playing all too many video games with her partner, and her dog Zelda.
3939
</TeamMember>
4040

41-
<TeamMember name="Luna Ruan" permalink="luna-ruan" photo="/images/team/lunaruan.jpg" github="lunaruan" twitter="lunaruan" title="Engineer at Meta">
41+
<TeamMember name="Luna Ruan" permalink="luna-ruan" photo="/images/team/lunaruan.jpg" github="lunaruan" twitter="lunaruan" title="Independent Engineer">
4242
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.
4343
</TeamMember>
4444

45+
<TeamMember name="Mengdi Chen" permalink="mengdi-chen" photo="/images/team/mengdi-chen.jpg" github="mondaychen" twitter="mengdi_en" title="Engineer at Meta">
46+
While working on his Digital Arts degree Mengdi was conceited about his front-end skills because his CSS worked perfectly even on IE6. But soon React opened a new door of programming for him, and he has been dreaming of joining the React team ever since. Outside of work, he is usually busy chasing his two kids around or collecting strange recipes.
47+
</TeamMember>
48+
4549
<TeamMember name="Mofei Zhang" permalink="mofei-zhang" photo="/images/team/mofei-zhang.png" github="mofeiZ" title="Engineer at Meta">
4650
Mofei started programming when she realized it can help her cheat in video games. She focused on operating systems in undergrad / grad school, but now finds herself happily tinkering on React. Outside of work, she enjoys debugging bouldering problems and planning her next backpacking trip(s).
4751
</TeamMember>

beta/src/content/learn/javascript-in-jsx-with-curly-braces.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@ export default function TodoList() {
469469
```css
470470
body { padding: 0; margin: 0 }
471471
body > div > div { padding: 20px; }
472-
.avatar { border-radius: 50%; height: 90px; }
472+
.avatar { border-radius: 50%; }
473473
```
474474

475475
</Sandpack>
@@ -520,7 +520,7 @@ export default function TodoList() {
520520
```css
521521
body { padding: 0; margin: 0 }
522522
body > div > div { padding: 20px; }
523-
.avatar { border-radius: 50%; height: 90px; }
523+
.avatar { border-radius: 50%; }
524524
```
525525

526526
</Sandpack>
@@ -575,7 +575,7 @@ export function getImageUrl(person) {
575575
```css
576576
body { padding: 0; margin: 0 }
577577
body > div > div { padding: 20px; }
578-
.avatar { border-radius: 50%; height: 90px; }
578+
.avatar { border-radius: 50%; }
579579
```
580580

581581
</Sandpack>

beta/src/content/reference/react/useLayoutEffect.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ function Tooltip() {
6565
6666
* Effects **only run on the client.** They don't run during server rendering.
6767
68-
* The code inside `useLayoutEffect` and all state updates scheduled from it **block the browser from repainting the screen.** When used excessively, this can make your app very slow. When possible, prefer [`useEffect`.](/reference/reac/useEffect)
68+
* The code inside `useLayoutEffect` and all state updates scheduled from it **block the browser from repainting the screen.** When used excessively, this can make your app very slow. When possible, prefer [`useEffect`.](/reference/react/useEffect)
6969
7070
---
7171

content/docs/higher-order-components.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const EnhancedComponent = higherOrderComponent(WrappedComponent);
1414

1515
Mientras que un componente transforma _props_ en interfaz de usuario, un componente de orden superior transforma un componente en otro.
1616

17-
Los *HOCs* son comunes en bibliotecas de terceros usadas en React, tales como [`connect`](https://github.com/reduxjs/react-redux/blob/master/docs/api/connect.md#connect) en *Redux* y [`createFragmentContainer`](https://relay.dev/docs/v10.1.3/fragment-container/#createfragmentcontainer) en *Relay*.
17+
Los *HOCs* son comunes en bibliotecas de terceros usadas en React, tales como [`connect`](https://react-redux.js.org/api/connect) en *Redux* y [`createFragmentContainer`](https://relay.dev/docs/v10.1.3/fragment-container/#createfragmentcontainer) en *Relay*.
1818

1919
En este documento discutiremos por qué los componentes de orden superior son útiles y como escribir tus propios *HOCs*.
2020

0 commit comments

Comments
 (0)