Skip to content

Commit d32ee9e

Browse files
merging all conflicts
2 parents d43d953 + ca93140 commit d32ee9e

File tree

9 files changed

+30
-3
lines changed

9 files changed

+30
-3
lines changed

src/content/learn/manipulating-the-dom-with-refs.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,11 @@ Kemudian, deklarasikan *ref* di dalam komponen Anda:
3131
const myRef = useRef(null);
3232
```
3333

34+
<<<<<<< HEAD
3435
Terakhir, oper ke simpul DOM sebagai atribut `ref`:
36+
=======
37+
Finally, pass your ref as the `ref` attribute to the JSX tag for which you want to get the DOM node:
38+
>>>>>>> ca93140eb98a7ff4364a719075fccea980c55b55
3539
3640
```js
3741
<div ref={myRef}>

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

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

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

27+
<<<<<<< HEAD
2728
[Komponen `<option>` bawaan peramban](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/select) memungkinkan Anda untuk me-*render* opsi di dalam kotak [`<select>`](/reference/react-dom/components/select).
29+
=======
30+
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.
31+
>>>>>>> ca93140eb98a7ff4364a719075fccea980c55b55
2832
2933
```js
3034
<select>

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,13 @@ Untuk menampilkan indikator progres, render komponen [`<progress>` bawaan peramb
3434

3535
Selain itu, `<progress>` juga mendukung *props*:
3636

37+
<<<<<<< HEAD
3738
* [`max`](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/progress#attr-max): Sebuah angka. Menentukan nilai maksimum `value`. *Default* ke `1`.
3839
* [`value`](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/progress#attr-value): Angka antara `0` and `max`, atau `null` untuk progres menengah. Menentukan berapa banyak yang telah dilakukan.
40+
=======
41+
* [`max`](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/progress#attr-max): A number. Specifies the maximum `value`. Defaults to `1`.
42+
* [`value`](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/progress#attr-value): A number between `0` and `max`, or `null` for indeterminate progress. Specifies how much was done.
43+
>>>>>>> ca93140eb98a7ff4364a719075fccea980c55b55
3944
4045
---
4146

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: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -285,8 +285,13 @@ Dalam contoh ini, React dapat memulai *streaming* halaman lebih awal. Hanya `Pro
285285
286286
**Hanya sumber data yang mengaktifkan *Suspense* yang akan mengaktifkan komponen Suspense.** Sumber tersebut meliputi:
287287
288+
<<<<<<< HEAD
288289
- Pengambilan data dengan *framework* yang mendukung *Suspense* seperti [Relay](https://relay.dev/docs/guided-tour/rendering/loading-states/) dan [Next.js](https://nextjs.org/docs/advanced-features/react-18)
289290
- Kode komponen pemuatan lambat dengan [`lazy`](/reference/react/lazy)
291+
=======
292+
- 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)
293+
- Lazy-loading component code with [`lazy`](/reference/react/lazy)
294+
>>>>>>> ca93140eb98a7ff4364a719075fccea980c55b55
290295
291296
*Suspense* **tidak** mendeteksi saat data diambil di dalam *Effect* atau *event handler*.
292297

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: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,13 @@ Selama pembaruan, <CodeStep step={2}>nilai yang ditangguhkan</CodeStep> akan "te
8484

8585
Contoh ini menganggap Anda menggunakan salah satu sumber data yang menggunakan Suspense:
8686

87+
<<<<<<< HEAD
8788
- Pengambilan data yang menggunakan Suspense dengan framework seperti [Relay](https://relay.dev/docs/guided-tour/rendering/loading-states/) dan [Next.js](https://nextjs.org/docs/advanced-features/react-18)
8889
- Kode komponen pemuatan lambat dengan [`lazy`](/reference/react/lazy)
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
[Pelajari lebih lanjut tentang Suspense dan batasannya.](/reference/react/Suspense)
9196

src/content/reference/react/useEffect.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1089,7 +1089,7 @@ function ChatRoom({ roomId }) {
10891089
}
10901090
```
10911091
1092-
**To remove a dependency, you need to ["prove" to the linter *doesn't need* to be a dependency.](/learn/removing-effect-dependencies#removing-unnecessary-dependencies)** For example, you can move `serverUrl` out of your component to prove that it's not reactive and won't change on re-renders:
1092+
**To remove a dependency, you need to ["prove" to the linter that it *doesn't need* to be a dependency.](/learn/removing-effect-dependencies#removing-unnecessary-dependencies)** For example, you can move `serverUrl` out of your component to prove that it's not reactive and won't change on re-renders:
10931093
10941094
```js {1,8}
10951095
const serverUrl = 'https://localhost:1234'; // Not a reactive value anymore

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
Panggil `useLayoutEffect` untuk mengukur tata letak sebelum peramban melukis ulang layar:
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)