Skip to content

Commit ddfdd4e

Browse files
merging all conflicts
2 parents 29093d5 + 6326e7b commit ddfdd4e

File tree

3 files changed

+42
-13
lines changed

3 files changed

+42
-13
lines changed

.github/workflows/discord_notify.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@ name: Discord Notify
22

33
on:
44
pull_request_target:
5+
<<<<<<< HEAD
56
types: [ labeled ]
7+
=======
8+
types: [opened, ready_for_review]
9+
>>>>>>> 6326e7b1b9fa2a7e36a555792e2f1b97cfcf2669
610

711
jobs:
812
notify:

src/content/blog/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ title: React Blog
77

88
This blog is the official source for the updates from the React team. Anything important, including release notes or deprecation notices, will be posted here first.
99

10-
You can also follow the [@react.dev](https://bsky.app/profiles/react.js) account on Bluesky, or [@reactjs](https://twitter.com/reactjs) account on Twitter, but you won’t miss anything essential if you only read this blog.
10+
You can also follow the [@react.dev](https://bsky.app/profile/react.dev) account on Bluesky, or [@reactjs](https://twitter.com/reactjs) account on Twitter, but you won’t miss anything essential if you only read this blog.
1111

1212
</Intro>
1313

src/content/learn/passing-data-deeply-with-context.md

Lines changed: 37 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -468,15 +468,19 @@ import { LevelContext } from './LevelContext.js';
468468
export default function Section({ level, children }) {
469469
return (
470470
<section className="section">
471-
<LevelContext.Provider value={level}>
471+
<LevelContext value={level}>
472472
{children}
473-
</LevelContext.Provider>
473+
</LevelContext>
474474
</section>
475475
);
476476
}
477477
```
478478

479+
<<<<<<< HEAD
479480
Bu React'a şunu söyler: "`<Section>` içindeki herhangi bir eleman,`LevelContext`'i istediğinde, ona bu `level` değerini ver." Bileşen, üzerindeki UI ağacında bulunan en yakın `<LevelContext.Provider>` değerini kullanır.
481+
=======
482+
This tells React: "if any component inside this `<Section>` asks for `LevelContext`, give them this `level`." The component will use the value of the nearest `<LevelContext>` in the UI tree above it.
483+
>>>>>>> 6326e7b1b9fa2a7e36a555792e2f1b97cfcf2669
480484
481485
<Sandpack>
482486

@@ -514,9 +518,9 @@ import { LevelContext } from './LevelContext.js';
514518
export default function Section({ level, children }) {
515519
return (
516520
<section className="section">
517-
<LevelContext.Provider value={level}>
521+
<LevelContext value={level}>
518522
{children}
519-
</LevelContext.Provider>
523+
</LevelContext>
520524
</section>
521525
);
522526
}
@@ -566,9 +570,15 @@ export const LevelContext = createContext(1);
566570

567571
Orijinal kodla aynı sonucu elde edersiniz, ancak her `Heading` bileşenine `level` prop'unu aktarmanız gerekmez! Bunun yerine, üstündeki en yakın `Section` bileşenine sorarak başlık seviyesini "bulur":
568572

573+
<<<<<<< HEAD
569574
1. `level` prop'unu `<Section>`'a aktarırsınız.
570575
2. `Section` alt bileşenlerini `<LevelContext.Provider value={level}>` sarmalar.
571576
3. `Heading`, `useContext(LevelContext)` ile birlikte yukarıdaki en yakın `LevelContext`'e değerini sorar.
577+
=======
578+
1. You pass a `level` prop to the `<Section>`.
579+
2. `Section` wraps its children into `<LevelContext value={level}>`.
580+
3. `Heading` asks the closest value of `LevelContext` above with `useContext(LevelContext)`.
581+
>>>>>>> 6326e7b1b9fa2a7e36a555792e2f1b97cfcf2669
572582
573583
## Context değerini provider'ının tanımlandığı bileşende okuma {/*using-and-providing-context-from-the-same-component*/}
574584

@@ -595,9 +605,9 @@ export default function Section({ children }) {
595605
const level = useContext(LevelContext);
596606
return (
597607
<section className="section">
598-
<LevelContext.Provider value={level + 1}>
608+
<LevelContext value={level + 1}>
599609
{children}
600-
</LevelContext.Provider>
610+
</LevelContext>
601611
</section>
602612
);
603613
}
@@ -643,9 +653,9 @@ export default function Section({ children }) {
643653
const level = useContext(LevelContext);
644654
return (
645655
<section className="section">
646-
<LevelContext.Provider value={level + 1}>
656+
<LevelContext value={level + 1}>
647657
{children}
648-
</LevelContext.Provider>
658+
</LevelContext>
649659
</section>
650660
);
651661
}
@@ -777,9 +787,9 @@ export default function Section({ children, isFancy }) {
777787
'section ' +
778788
(isFancy ? 'fancy' : '')
779789
}>
780-
<LevelContext.Provider value={level + 1}>
790+
<LevelContext value={level + 1}>
781791
{children}
782-
</LevelContext.Provider>
792+
</LevelContext>
783793
</section>
784794
);
785795
}
@@ -868,6 +878,7 @@ Genellikle, bazı bilgilere ağacın farklı bölümlerindeki bileşenler taraf
868878
869879
<Recap>
870880
881+
<<<<<<< HEAD
871882
* Context, bir elemanın altındaki tüm ağaca bilgi aktarmasını sağlar.
872883
* Context'i aktarmak için:
873884
1. `export const MyContext = createContext(defaultValue)` ile oluşturun ve dışa aktarın.
@@ -876,6 +887,16 @@ Genellikle, bazı bilgilere ağacın farklı bölümlerindeki bileşenler taraf
876887
* Context ortada bulunan herhangi bir elamandan aktarılır.
877888
* Context, "çevresine adapte olan" bileşenler yazmanıza olanak sağlar.
878889
* Context kullanmadan önce, prop olarak aktarmayı veya JSX'i `children` olarak iletmeyi deneyin.
890+
=======
891+
* Context lets a component provide some information to the entire tree below it.
892+
* To pass context:
893+
1. Create and export it with `export const MyContext = createContext(defaultValue)`.
894+
2. Pass it to the `useContext(MyContext)` Hook to read it in any child component, no matter how deep.
895+
3. Wrap children into `<MyContext value={...}>` to provide it from a parent.
896+
* Context passes through any components in the middle.
897+
* Context lets you write components that "adapt to their surroundings".
898+
* Before you use context, try passing props or passing JSX as `children`.
899+
>>>>>>> 6326e7b1b9fa2a7e36a555792e2f1b97cfcf2669
879900
880901
</Recap>
881902
@@ -1026,7 +1047,11 @@ li {
10261047
10271048
`imageSize` prop'unu bütün bileşenlerden kaldırın.
10281049
1050+
<<<<<<< HEAD
10291051
`Context.js` dosyasında `ImageSizeContext`'i oluşturun ve dışa aktarın. Ardından değeri aşağı aktarmak için `List`'i `<ImageSizeContext.Provider value={imageSize}>` ile sarın ve `useContext(ImageSizeContext)` kullanarak `PlaceImage` bileşeninde değerini okuyun:
1052+
=======
1053+
Create and export `ImageSizeContext` from `Context.js`. Then wrap the List into `<ImageSizeContext value={imageSize}>` to pass the value down, and `useContext(ImageSizeContext)` to read it in the `PlaceImage`:
1054+
>>>>>>> 6326e7b1b9fa2a7e36a555792e2f1b97cfcf2669
10301055
10311056
<Sandpack>
10321057
@@ -1040,7 +1065,7 @@ export default function App() {
10401065
const [isLarge, setIsLarge] = useState(false);
10411066
const imageSize = isLarge ? 150 : 100;
10421067
return (
1043-
<ImageSizeContext.Provider
1068+
<ImageSizeContext
10441069
value={imageSize}
10451070
>
10461071
<label>
@@ -1055,7 +1080,7 @@ export default function App() {
10551080
</label>
10561081
<hr />
10571082
<List />
1058-
</ImageSizeContext.Provider>
1083+
</ImageSizeContext>
10591084
)
10601085
}
10611086

0 commit comments

Comments
 (0)