Skip to content

Commit 7b3344b

Browse files
committed
Merge remote-tracking branch 'upstream/sync-5d2f7105' into review-sync
2 parents 7d3693b + afff8e8 commit 7b3344b

File tree

1 file changed

+25
-0
lines changed

1 file changed

+25
-0
lines changed

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

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,13 @@ title: تفکر به سبک ری‌اکت
105105

106106
<Sandpack>
107107

108+
<<<<<<< HEAD
109+
```jsx App.js
110+
function ProductCategoryRow({category}) {
111+
=======
108112
```jsx src/App.js
109113
function ProductCategoryRow({ category }) {
114+
>>>>>>> 5d2f7105bd6374e465b8bdce8efceaeb8f01c937
110115
return (
111116
<tr>
112117
<th colSpan="2">{category}</th>
@@ -337,8 +342,13 @@ function FilterableProductTable({ products }) {
337342
338343
<Sandpack>
339344
345+
<<<<<<< HEAD
346+
```jsx App.js
347+
import {useState} from 'react';
348+
=======
340349
```jsx src/App.js
341350
import { useState } from 'react';
351+
>>>>>>> 5d2f7105bd6374e465b8bdce8efceaeb8f01c937
342352
343353
function FilterableProductTable({products}) {
344354
const [filterText, setFilterText] = useState('');
@@ -513,6 +523,15 @@ function FilterableProductTable({ products }) {
513523
شما روی‌داد `onChange` را درون `SearchBar` اضافه خواهید کرد و استیت پدر را از آنجا تنظیم می‌کنید.
514524
</p>
515525
526+
<<<<<<< HEAD
527+
```js {5}
528+
<input
529+
type="text"
530+
value={filterText}
531+
placeholder="Search..."
532+
onChange={(e) => onFilterTextChange(e.target.value)}
533+
/>
534+
=======
516535
```js {4,5,13,19}
517536
function SearchBar({
518537
filterText,
@@ -533,15 +552,21 @@ function SearchBar({
533552
type="checkbox"
534553
checked={inStockOnly}
535554
onChange={(e) => onInStockOnlyChange(e.target.checked)}
555+
>>>>>>> 5d2f7105bd6374e465b8bdce8efceaeb8f01c937
536556
```
537557
<p dir="rtl">
538558
حالا اپلیکیشن کار میکند !
539559
</p>
540560
541561
<Sandpack>
542562
563+
<<<<<<< HEAD
564+
```jsx App.js
565+
import {useState} from 'react';
566+
=======
543567
```jsx src/App.js
544568
import { useState } from 'react';
569+
>>>>>>> 5d2f7105bd6374e465b8bdce8efceaeb8f01c937
545570
546571
function FilterableProductTable({products}) {
547572
const [filterText, setFilterText] = useState('');

0 commit comments

Comments
 (0)