Skip to content

Commit bd9f71e

Browse files
merging all conflicts
2 parents 74e664c + ca93140 commit bd9f71e

6 files changed

Lines changed: 9 additions & 5 deletions

File tree

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
يتيح لك [مكون الـ `<option>` المدمج في المتصفح](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/select) عرض خيارات داخل عنصر [`<select>`](/reference/react-dom/components/select).
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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ async function getAlbums() {
252252

253253
**Only Suspense-enabled data sources will activate the Suspense component.** They include:
254254

255-
- 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)
255+
- 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)
256256
- Lazy-loading component code with [`lazy`](/reference/react/lazy)
257257

258258
Suspense **does not** detect when data is fetched inside an Effect or event handler.

src/content/reference/react/useDeferredValue.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ During updates, the <CodeStep step={2}>deferred value</CodeStep> will "lag behin
8484

8585
This example assumes you use one of Suspense-enabled data sources:
8686

87-
- 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)
87+
- 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)
8888
- Lazy-loading component code with [`lazy`](/reference/react/lazy)
8989

9090
[Learn more about Suspense and its limitations.](/reference/react/Suspense)

src/content/reference/react/useLayoutEffect.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ useLayoutEffect(setup, dependencies?)
2626
2727
### `useLayoutEffect(setup, dependencies?)` {/*useinsertioneffect*/}
2828
29-
Call `useLayoutEffect` perform the layout measurements before the browser repaints the screen:
29+
Call `useLayoutEffect` to perform the layout measurements before the browser repaints the screen:
3030
3131
```js
3232
import { useState, useRef, useLayoutEffect } from 'react';

0 commit comments

Comments
 (0)