Skip to content

Commit 92c7fcb

Browse files
authored
Merge branch 'main' into sync-a1ddcf51
2 parents 3804ca5 + 3b1010a commit 92c7fcb

File tree

7 files changed

+59
-39
lines changed

7 files changed

+59
-39
lines changed
168 KB
Loading

src/components/Layout/Page.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import {useRouter} from 'next/router';
1515
import {SidebarNav} from './SidebarNav';
1616
import {Footer} from './Footer';
1717
import {Toc} from './Toc';
18-
// import SocialBanner from '../SocialBanner';
18+
import SocialBanner from '../SocialBanner';
1919
import {DocsPageFooter} from 'components/DocsFooter';
2020
import {Seo} from 'components/Seo';
2121
import PageHeading from 'components/PageHeading';

src/components/PageHeading.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ function PageHeading({
3434
tags = [],
3535
breadcrumbs,
3636
}: PageHeadingProps) {
37+
console.log('version', version);
3738
return (
3839
<div className="px-5 sm:px-12 pt-3.5">
3940
<div className="max-w-4xl ms-0 2xl:mx-auto">

src/content/community/conferences.md

Lines changed: 35 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ February 12-13, 2026. In-person in New Delhi, India
5959
### React Paris 2026 {/*react-paris-2026*/}
6060
March 26 - 27, 2026. In-person in Paris, France (hybrid event)
6161

62-
[Website](https://react.paris/) - [Twitter](https://x.com/BeJS_)
62+
[Website](https://www.reactuniverseconf.com/) - [Twitter](https://twitter.com/react_native_eu) - [LinkedIn](https://www.linkedin.com/events/reactuniverseconf7163919537074118657/)
6363

6464

6565
### CityJS London 2026 {/*cityjs-london-2026*/}
@@ -76,10 +76,41 @@ July 03 - 05, 2025. In-person in Bangalore, India
7676

7777
[Website](https://reactnexus.com/) - [Twitter](https://x.com/ReactNexus) - [Bluesky](https://bsky.app/profile/reactnexus.com) - [Linkedin](https://www.linkedin.com/company/react-nexus) - [YouTube](https://www.youtube.com/reactify_in)
7878

79-
### React Summit 2025 {/*react-summit-2025*/}
80-
June 13 - 17, 2025. In-person in Amsterdam, Netherlands + remote (hybrid event)
79+
### React Summit US 2025 {/*react-summit-us-2025*/}
80+
November 18 - 21, 2025. In-person in New York, USA + remote (hybrid event)
81+
82+
[Website](https://reactsummit.us/) - [Twitter](https://x.com/reactsummit)
83+
84+
### React Advanced London 2025 {/*react-advanced-london-2025*/}
85+
November 28 & December 1, 2025. In-person in London, UK + online (hybrid event)
86+
87+
[Website](https://reactadvanced.com/) - [Twitter](https://x.com/reactadvanced)
88+
89+
### CityJS Singapore 2026 {/*cityjs-singapore-2026*/}
90+
February 4-6, 2026. In-person in Singapore
91+
92+
[Website](https://india.cityjsconf.org/) - [Twitter](https://x.com/cityjsconf) - [Bluesky](https://bsky.app/profile/cityjsconf.bsky.social)
93+
94+
### CityJS New Delhi 2026 {/*cityjs-newdelhi-2026*/}
95+
February 12-13, 2026. In-person in New Delhi, India
96+
97+
[Website](https://india.cityjsconf.org/) - [Twitter](https://x.com/cityjsconf) - [Bluesky](https://bsky.app/profile/cityjsconf.bsky.social)
98+
99+
100+
### React Paris 2026 {/*react-paris-2026*/}
101+
March 26 - 27, 2026. In-person in Paris, France (hybrid event)
102+
103+
[Website](https://react.paris/) - [Twitter](https://x.com/BeJS_) - [YouTube](https://www.youtube.com/playlist?list=PL53Z0yyYnpWitP8Zv01TSEQmKLvuRh_Dj)
104+
105+
106+
### CityJS London 2026 {/*cityjs-london-2026*/}
107+
April 14-17, 2026. In-person in London
108+
109+
[Website](https://india.cityjsconf.org/) - [Twitter](https://x.com/cityjsconf) - [Bluesky](https://bsky.app/profile/cityjsconf.bsky.social)
110+
111+
112+
## Past Conferences {/*past-conferences*/}
81113

82-
[Website](https://reactsummit.com/) - [Twitter](https://x.com/reactsummit)
83114

84115
### React Norway 2025 {/*react-norway-2025*/}
85116
June 13, 2025. In-person in Oslo, Norway + remote (virtual event)

src/content/learn/installation.md

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,57 @@
11
---
2-
title: Installation
2+
title: Ufungaji
33
---
44

55
<Intro>
66

7-
React has been designed from the start for gradual adoption. You can use as little or as much React as you need. Whether you want to get a taste of React, add some interactivity to an HTML page, or start a complex React-powered app, this section will help you get started.
7+
React imeundwa tangu mwanzo ili uweze kuitumia unapotaka. Unaweza kutumia React kidogo au nyingi kadri unavyohitaji. Iwe unataka kupata ladha ya React, ongeza mwingiliano fulani kwenye ukurasa wa HTML, au uanzishe programu changamano inayoendeshwa na React, sehemu hii itakusaidia kuanza.
88

99
</Intro>
1010

11-
## Try React {/*try-react*/}
11+
## Jaribu React {/*try-react*/}
1212

13-
You don't need to install anything to play with React. Try editing this sandbox!
13+
Huhitaji kusakinisha chochote ili kucheza na React. Jaribu kuhariri katika mazingira haya ya majaribio!
1414

1515
<Sandpack>
1616

1717
```js
1818
function Greeting({ name }) {
19-
return <h1>Hello, {name}</h1>;
19+
return <h1>Habari, {name}</h1>;
2020
}
2121

2222
export default function App() {
23-
return <Greeting name="world" />
23+
return <Greeting name="dunia" />
2424
}
2525
```
2626

2727
</Sandpack>
2828

29-
You can edit it directly or open it in a new tab by pressing the "Fork" button in the upper right corner.
29+
Unaweza kuihariri moja kwa moja au kuifungua kwenye kichupo kipya kwa kubonyeza kitufe cha "Fork" kwenye kona ya juu kilia.
3030

31-
Most pages in the React documentation contain sandboxes like this. Outside of the React documentation, there are many online sandboxes that support React: for example, [CodeSandbox](https://codesandbox.io/s/new), [StackBlitz](https://stackblitz.com/fork/react), or [CodePen.](https://codepen.io/pen?template=QWYVwWN)
31+
Kurasa nyingi katika hati za React zina mazingira ya majaribio kama hii. Nje ya hati za React, kuna mazingira ya majaribio mengi mtandaoni vinavyotumia React: kwa mfano, [CodeSandbox](https://codesandbox.io/s/new), [StackBlitz](https://stackblitz.com/fork/react), or [CodePen.](https://codepen.io/pen?template=QWYVwWN)
3232

33-
To try React locally on your computer, [download this HTML page.](https://gist.githubusercontent.com/gaearon/0275b1e1518599bbeafcde4722e79ed1/raw/db72dcbf3384ee1708c4a07d3be79860db04bff0/example.html) Open it in your editor and in your browser!
33+
Ili kujaribu React kwenye kompyuta yako [download this HTML page.](https://gist.githubusercontent.com/gaearon/0275b1e1518599bbeafcde4722e79ed1/raw/db72dcbf3384ee1708c4a07d3be79860db04bff0/example.html) Ifungue kwenye kihariri chako na kwenye kivinjari chako!
3434

35-
## Creating a React App {/*creating-a-react-app*/}
35+
## Kuunda Programu ya React {/*creating-a-react-app*/}
3636

37-
If you want to start a new React app, you can [create a React app](/learn/creating-a-react-app) using a recommended framework.
37+
Ikiwa ungependa kuanzisha programu mpya ya React, unaweza [kuunda programu ya React](/learn/creating-a-react-app) kwa kutumia mfumo uliopendekezwa.
3838

39-
## Build a React App from Scratch {/*build-a-react-app-from-scratch*/}
39+
## Unda Programu ya React kutoka Mwanzo {/*build-a-react-app-from-scratch*/}
4040

41-
If a framework is not a good fit for your project, you prefer to build your own framework, or you just want to learn the basics of a React app you can [build a React app from scratch](/learn/build-a-react-app-from-scratch).
41+
Ikiwa mfumo haufai mradi wako, unapendelea kuunda mfumo wako mwenyewe, au unataka tu kujifunza misingi ya programu ya React unayoweza [kuunda programu ya React kuanzia mwanzo](/learn/build-a-react-app-from-scratch).
4242

43-
## Add React to an existing project {/*add-react-to-an-existing-project*/}
44-
45-
If want to try using React in your existing app or a website, you can [add React to an existing project.](/learn/add-react-to-an-existing-project)
43+
## Ongeza React kwa mradi uliopo {/*add-react-to-an-existing-project*/}
4644

45+
Ikiwa ungependa kujaribu kutumia React katika programu yako iliyopo au tovuti, unaweza [kuongeza React kwa mradi uliopo.](/learn/add-react-to-an-existing-project)
4746

4847
<Note>
4948

50-
#### Should I use Create React App? {/*should-i-use-create-react-app*/}
49+
#### Nafaa kutumia Create React App {/*should-i-use-create-react-app*/}
5150

52-
No. Create React App has been deprecated. For more information, see [Sunsetting Create React App](/blog/2025/02/14/sunsetting-create-react-app).
51+
Hapana. Create React App imeacha kutumika. Kwa maelezo zaidi, angalia [Machweo Create React App](/blog/2025/02/14/sunsetting-create-react-app).
5352

5453
</Note>
5554

56-
## Next steps {/*next-steps*/}
57-
58-
Head to the [Quick Start](/learn) guide for a tour of the most important React concepts you will encounter every day.
55+
## Hatua zinazofuata {/*next-steps*/}
5956

57+
Nenda kwenye mwongozo wa [Kuanza Haraka](/learn) kwa ziara ya dhana muhimu zaidi za React utakazokutana nazo kila siku.

src/content/learn/thinking-in-react.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,9 @@ Anza kwa kuchora visanduku kuzunguka kila kijenzi na kijenzi kidogo kwenye kiigi
3737

3838
Kulingana na msingi wako, unaweza kufikiria kugawanya muundo katika vijenzi kwa njia tofauti:
3939

40-
<<<<<<< HEAD
4140
* **Programming**--tumia mbinu zile zile za kuamua ikiwa unapaswa kuunda kitendaji kipya au object. Mbinu moja kama hiyo ni [kanuni ya uwajibikaji mmoja (single responsibility principle)](https://en.wikipedia.org/wiki/Single_responsibility_principle), yaani, kijenzi kinapaswa kufanya jambo moja tu. Ikiwa kitaishia kukua, inapaswa kigawanywe kiwe vijenzi vidogo.
4241
* **CSS**--fikiria ni nini ungetengeneza viteule vya darasa. (Hatahivyo, vijenzi ni vidogo kwa kiasi fulani.)
4342
* **Design**--fikiria jinsi unavyoweza kupanga safu za muundo.
44-
=======
45-
* **Programming**--use the same techniques for deciding if you should create a new function or object. One such technique is the [separation of concerns](https://en.wikipedia.org/wiki/Separation_of_concerns), that is, a component should ideally only be concerned with one thing. If it ends up growing, it should be decomposed into smaller subcomponents.
46-
* **CSS**--consider what you would make class selectors for. (However, components are a bit less granular.)
47-
* **Design**--consider how you would organize the design's layers.
48-
>>>>>>> a1ddcf51a08cc161182b90a24b409ba11289f73e
4943

5044
Ikiwa JSON yako imeundwa vizuri, mara nyingi utapata kwamba inaelekeza kwa muundo wa vijenzi vya UI yako. Hiyo ni kwa sababu UI na miundo ya data mara nyingi huwa na usanifu sawa wa habari--yaani, umbo sawa. Tenganisha UI yako katika vijenzi, ambapo kila kijenzi kinalingana na kipande kimoja cha muundo yako wa data.
5145

src/sidebarReference.json

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,6 @@
177177
]
178178
},
179179
{
180-
<<<<<<< HEAD
181180
"title": "Directives",
182181
"path": "/reference/react/directives",
183182
"canary": true,
@@ -188,16 +187,13 @@
188187
"canary": true
189188
},
190189
{
191-
"title": "'use server'",
192-
"path": "/reference/react/use-server",
193-
"canary": true
194-
190+
"title": "unstable_addTransitionType",
191+
"path": "/reference/react/addTransitionType",
192+
"version": "experimental"
195193
}
196194
]
197195
},
198196
{
199-
=======
200-
>>>>>>> 9e1f5cd590fd066e72dda9022237bee30b499951
201197
"hasSectionHeader": true,
202198
"sectionHeader": "react-dom@{{version}}"
203199
},

0 commit comments

Comments
 (0)