Skip to content

Commit 7aceffb

Browse files
merging all conflicts
2 parents 5a888b0 + ca93140 commit 7aceffb

File tree

6 files changed

+20
-2
lines changed

6 files changed

+20
-2
lines changed

src/content/reference/react-dom/components/option.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,11 @@ title: "<option>"
2323

2424
### `<option>` {/*option*/}
2525

26+
<<<<<<< HEAD
2627
[Web Tarayıcısının `<option>` bileşeni](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/select) [`<select>`](/reference/react-dom/components/select) kutusunun içinde bir seçenek oluşturmanıza olanak tanır.
28+
=======
29+
The [built-in browser `<option>` component](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/option) lets you render an option inside a [`<select>`](/reference/react-dom/components/select) box.
30+
>>>>>>> ca93140eb98a7ff4364a719075fccea980c55b55
2731
2832
```js
2933
<select>

src/content/reference/react-dom/server/renderToPipeableStream.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ Streaming does not need to wait for React itself to load in the browser, or for
286286
287287
**Only Suspense-enabled data sources will activate the Suspense component.** They include:
288288
289-
- Data fetching with Suspense-enabled frameworks like [Relay](https://relay.dev/docs/guided-tour/rendering/loading-states/) and [Next.js](https://nextjs.org/docs/advanced-features/react-18)
289+
- Data fetching with Suspense-enabled frameworks like [Relay](https://relay.dev/docs/guided-tour/rendering/loading-states/) and [Next.js](https://nextjs.org/docs/getting-started/react-essentials)
290290
- Lazy-loading component code with [`lazy`](/reference/react/lazy)
291291
292292
Suspense **does not** detect when data is fetched inside an Effect or event handler.

src/content/reference/react-dom/server/renderToReadableStream.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ Streaming does not need to wait for React itself to load in the browser, or for
285285
286286
**Only Suspense-enabled data sources will activate the Suspense component.** They include:
287287
288-
- Data fetching with Suspense-enabled frameworks like [Relay](https://relay.dev/docs/guided-tour/rendering/loading-states/) and [Next.js](https://nextjs.org/docs/advanced-features/react-18)
288+
- Data fetching with Suspense-enabled frameworks like [Relay](https://relay.dev/docs/guided-tour/rendering/loading-states/) and [Next.js](https://nextjs.org/docs/getting-started/react-essentials)
289289
- Lazy-loading component code with [`lazy`](/reference/react/lazy)
290290
291291
Suspense **does not** detect when data is fetched inside an Effect or event handler.

src/content/reference/react/Suspense.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -253,8 +253,13 @@ async function getAlbums() {
253253

254254
**Sadece Suspense özellikli veri kaynakları Suspense bileşenini aktive edecektir.** Bunlara örnek olarak:
255255

256+
<<<<<<< HEAD
256257
- [Relay](https://relay.dev/docs/guided-tour/rendering/loading-states/) ve [Next.js](https://nextjs.org/docs/advanced-features/react-18) gibi Suspense özellikli framework'lerle veri fetch etme.
257258
- [`lazy`](/reference/react/lazy) ile bileşen kodunu tembel yükleme (lazy-loading).
259+
=======
260+
- Data fetching with Suspense-enabled frameworks like [Relay](https://relay.dev/docs/guided-tour/rendering/loading-states/) and [Next.js](https://nextjs.org/docs/getting-started/react-essentials)
261+
- Lazy-loading component code with [`lazy`](/reference/react/lazy)
262+
>>>>>>> ca93140eb98a7ff4364a719075fccea980c55b55
258263
259264
Suspense, veri bir effect ya da olay yöneticisi içinde fetch edildiğinde **tespit etmez**.
260265

src/content/reference/react/useDeferredValue.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,13 @@ Güncellemeler esnasında, <CodeStep step={2}>ertelenmiş değer</CodeStep> en s
8484

8585
Bu örnekte Suspense etkinleştirilmiş veri kaynaklarından birini kullandığınız varsayılmaktadır:
8686

87+
<<<<<<< HEAD
8788
- [Relay](https://relay.dev/docs/guided-tour/rendering/loading-states/) ve [Next.js](https://nextjs.org/docs/advanced-features/react-18) gibi Suspense etkinleştirilmiş çatılar vasıtasıyla veri çekilmesi
8889
- [`lazy`](/reference/react/lazy) ile bileşen kodunun lazy yüklenmesi
90+
=======
91+
- Data fetching with Suspense-enabled frameworks like [Relay](https://relay.dev/docs/guided-tour/rendering/loading-states/) and [Next.js](https://nextjs.org/docs/getting-started/react-essentials)
92+
- Lazy-loading component code with [`lazy`](/reference/react/lazy)
93+
>>>>>>> ca93140eb98a7ff4364a719075fccea980c55b55
8994
9095
[Suspense ve sınırlamaları hakkında daha fazla bilgi edinin.](/reference/react/Suspense)
9196

src/content/reference/react/useLayoutEffect.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,11 @@ useLayoutEffect(setup, dependencies?)
2626
2727
### `useLayoutEffect(setup, dependencies?)` {/*useinsertioneffect*/}
2828
29+
<<<<<<< HEAD
2930
`useLayoutEffect`, tarayıcının ekrana yeniden çizme işleminden (repainting) önce yerleşim (layout) ölçümlerini gerçekleştirmek için çağrılır:
31+
=======
32+
Call `useLayoutEffect` to perform the layout measurements before the browser repaints the screen:
33+
>>>>>>> ca93140eb98a7ff4364a719075fccea980c55b55
3034
3135
```js
3236
import { useState, useRef, useLayoutEffect } from 'react';

0 commit comments

Comments
 (0)