Skip to content

Commit 6574877

Browse files
authored
Merge pull request #61 from reactjs/sync-315cb7a3
Sync with react.dev @ 315cb7a
2 parents da49563 + f0e1369 commit 6574877

File tree

6 files changed

+42
-15
lines changed

6 files changed

+42
-15
lines changed

src/content/community/conferences.md

Lines changed: 37 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,17 @@ October 27th 2023. In-person in Verona, Italy and online (hybrid event)
4646

4747
[Website](https://appjs.co) - [Twitter](https://twitter.com/appjsconf)
4848

49+
50+
### React Brussels 2023 {/*react-brussels-2023*/}
51+
October 13th 2023. In-person in Brussels, Belgium + Remote (hybrid)
52+
53+
[Website](https://www.react.brussels/) - [Twitter](https://twitter.com/BrusselsReact)
54+
55+
### React India 2023 {/*react-india-2023*/}
56+
October 5 - 7, 2023. In-person in Goa, India (hybrid event) + Oct 3 2023 - remote day
57+
58+
[Website](https://www.reactindia.io) - [Twitter](https://x.com/react_india) - [Facebook](https://www.facebook.com/ReactJSIndia) - [Youtube](https://www.youtube.com/channel/UCaFbHCBkPvVv1bWs_jwYt3w)
59+
4960
### Render(ATL) 2024 🍑 {/*renderatl-2024-*/}
5061
June 12 - June 14, 2024. Atlanta, GA, USA
5162

@@ -58,10 +69,17 @@ October 17 - 19, 2024. In-person in Goa, India (hybrid event) + Oct 15 2024 - re
5869

5970
## Past Conferences {/*past-conferences*/}
6071

61-
### React Day Berlin 2023 {/*react-day-berlin-2023*/}
62-
December 8 & 12, 2023. In-person in Berlin, Germany + remote first interactivity (hybrid event)
6372

64-
[Website](https://reactday.berlin) - [Twitter](https://twitter.com/reactdayberlin) - [Facebook](https://www.facebook.com/reactdayberlin/) - [Videos](https://portal.gitnation.org/events/react-day-berlin-2023)
73+
### RenderCon Kenya 2023 {/*rendercon-kenya-2023*/}
74+
September 29 - 30, 2023. Nairobi, Kenya
75+
76+
[Website](https://rendercon.org/) - [Twitter](https://twitter.com/renderconke) - [LinkedIn](https://www.linkedin.com/company/renderconke/) - [YouTube](https://www.youtube.com/channel/UC0bCcG8gHUL4njDOpQGcMIA)
77+
78+
79+
### React Live 2023 {/*react-live-2023*/}
80+
September 29, 2023. Amsterdam, Netherlands
81+
82+
[Website](https://reactlive.nl/)
6583

6684
### React Summit US 2023 {/*react-summit-us-2023*/}
6785
November 13 & 15, 2023. In-person in New York, US + remote first interactivity (hybrid event)
@@ -82,10 +100,22 @@ May 22 - 24, 2024. In-person in Kraków, Poland + remote
82100

83101
[Website](https://appjs.co) - [Twitter](https://twitter.com/appjsconf)
84102

85-
### Render(ATL) 2024 🍑 {/*renderatl-2024-*/}
86-
June 12 - June 14, 2024. Atlanta, GA, USA
87103

88-
[Website](https://renderatl.com) - [Discord](https://www.renderatl.com/discord) - [Twitter](https://twitter.com/renderATL) - [Instagram](https://www.instagram.com/renderatl/) - [Facebook](https://www.facebook.com/renderatl/) - [LinkedIn](https://www.linkedin.com/company/renderatl) - [Podcast](https://www.renderatl.com/culture-and-code#/)
104+
### React Alicante 2023 {/*react-alicante-2023*/}
105+
September 28 - 30, 2023. Alicante, Spain
106+
107+
[Website](https://reactalicante.es/) - [Twitter](https://twitter.com/reactalicante)
108+
109+
110+
### RedwoodJS Conference 2023 {/*redwoodjs-conference-2023*/}
111+
September 26 - 29, 2023. Grants Pass, Oregon + remote (hybrid event)
112+
113+
[Website](https://www.redwoodjsconf.com/) - [Twitter](https://twitter.com/redwoodjs)
114+
115+
### React Native EU 2023 {/*react-native-eu-2023*/}
116+
September 7 & 8, 2023. Wrocław, Poland
117+
118+
[Website](https://react-native.eu) - [Twitter](https://twitter.com/react_native_eu) - [Facebook](https://www.facebook.com/reactnativeeu)
89119

90120
### React Nexus 2024 {/*react-nexus-2024*/}
91121
July 04 & 05, 2024. Bangalore, India (In-person event)
@@ -109,6 +139,7 @@ October 5 - 7, 2023. In-person in Goa, India (hybrid event) + Oct 3 2023 - remot
109139

110140
## Past Conferences {/*past-conferences*/}
111141

142+
112143
### React Day Berlin 2023 {/*react-day-berlin-2023*/}
113144
December 8 & 12, 2023. In-person in Berlin, Germany + remote first interactivity (hybrid event)
114145

src/content/learn/conditional-rendering.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -626,11 +626,8 @@ export default function PackingList() {
626626
627627
ສັງເກດທ່ານຕ້ອງຂຽນ `importance > 0 && ...` ແທນທີ່ຈະເປັນ `importance && ...` ສະນັ້ນຫາກ `importance` ເປັນ `0`, ຜົນລັບຈະບໍ່ສະແດງ `0`!
628628
629-
<<<<<<< HEAD
629+
630630
ໃນວິທີການນີ້, ຈະໃຊ້ເງື່ອນໄຂສອງເງື່ອນໄຂແຍກກັນເພື່ອໃສ່ຊ່ອງວ່າງລະຫວ່າງຊື່ ແລະ label. ອີກວິທີໜຶ່ງ, ທ່ານສາມາດໃຊ້ fragment ທີ່ມີຊ່ອງວ່າງນຳໜ້າ: `importance > 0 && <> <i>...</i></>` ຫຼື ເພີ່ມຊ່ອງວ່າງພາຍໃນ `importance > 0 && <> <i>...</i></>`.
631-
=======
632-
In this solution, two separate conditions are used to insert a space between the name and the importance label. Alternatively, you could use a Fragment with a leading space: `importance > 0 && <> <i>...</i></>` or add a space immediately inside the `<i>`: `importance > 0 && <i> ...</i>`.
633-
>>>>>>> bbb08a5a04b0221137e5d60472fc979747af2954
634631
635632
636633
</Solution>

src/content/learn/importing-and-exporting-components.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,6 @@ img { margin: 0 10px 10px 0; height: 90px; }
6868

6969
<Sandpack>
7070

71-
72-
7371
```js App.js
7472

7573
import Gallery from './Gallery.js';

src/content/learn/rendering-lists.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1146,7 +1146,6 @@ hr {
11461146

11471147
<Hint>
11481148

1149-
11501149
ທ່ານຈະຕ້ອງແປງ `map` ເປັນ loop ດ້ວຍໂຕເອງ, ຫຼື ໃຊ້ fragment.
11511150

11521151

@@ -1215,11 +1214,11 @@ hr {
12151214

12161215
ການໃຊ້ index ແຖວເກົ່າເປັນ `key` ບໍ່ເຮັດວຽກອີກຕໍ່ໄປເພາະວ່າແຕ່ລະໂຕຂັ້ນ ແລະ ຫຍໍ້ໜ້າແຕ່ລະໂຕຢູ່ໃນ array ດຽວກັນ. ເຖິງຢ່າງໃດກໍຕາມ, ທ່ານສາມາດກຳນົດ key ທີ່ແຕກຕ່າງກັນໃຫ້ແຕ່ລະລາຍການໄດ້ໂດຍໃຊ້ຄຳຕໍ່ທ້າຍເຊັ່ນ `key={i + '-text'}`.
12171216

1218-
12191217
ອີກວິທີໜຶ່ງ, ທ່ານສາມາດສະແດງຜົນ collection ຂອງ fragment ທີ່ປະກອບມີ `<hr />` and `<p>...</p>`. ເຖິງຢ່າງໃດກໍຕາມ, syntax `<>...</>` ບໍ່ຮອງຮັບການສົ່ງຜ່ານ key, ດັ່ງນັ້ນທ່ານຕ້ອງໄດ້ຂຽນ `<Fragment>` ຢ່າງຊັດເຈນ:
12201218

12211219

12221220

1221+
12231222
<Sandpack>
12241223

12251224
```js
@@ -1264,13 +1263,13 @@ hr {
12641263

12651264
</Sandpack>
12661265

1267-
12681266
ຈື່ໄວ້ວ່າ, fragment (ມັກຂຽນເປັນ `<> </>`) ໃຫ້ທ່ານ group JSX node ໂດຍບໍ່ຕ້ອງເພີ່ມ `<div>`!
12691267

12701268

12711269

12721270

12731271

1272+
12741273
</Solution>
12751274

12761275
</Challenges>

src/content/learn/start-a-new-react-project.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ npx create-next-app@latest
2828
ຖ້າທ່ານຍັງໃໝ່ສຳລັບ Next.js, ເບິ່ງ [ຄູ່ມື Next.js .](https://nextjs.org/learn/foundations/about-nextjs)
2929

3030

31+
3132
Next.js ດູແລໂດຍ [Vercel](https://vercel.com/). ທ່ານສາມາດ [deploy Next.js app](https://nextjs.org/docs/deployment) ໃສ່ໃນ Node.js ຫຼື serverless hosting, ຫຼື server ຂອງທ່ານເອງ. [Fully static Next.js apps](https://nextjs.org/docs/advanced-features/static-html-export) ສາມາດ deploy ໃສ່ໃນ static hosting ໃດກໍ່ໄດ້.
3233

3334
### Remix {/*remix*/}

src/content/learn/tutorial-tic-tac-toe.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -371,6 +371,7 @@ export default function Square() {
371371
Component React ຕ້ອງການ return ໜຶ່ງ JSX element ແລະ ບໍ່ສາມາດສົ່ງ JSX ທີ່ຕິດພັນຫຼາຍອັນເຊັ່ນ ສອງປຸ່ມກົດ. ເພື່ອແກ້ໄຂບັນຫານີ້ທ່ານສາມາດໃຊ້ *fragments* (`<>` ແລະ `</>`) ເພື່ອລວມ JSX ທີ່ຕິດພັນຫຼາຍອັນດັ່ງນີ້:
372372

373373

374+
374375
```js {3-6}
375376
export default function Square() {
376377
return (

0 commit comments

Comments
 (0)