Skip to content

Commit ad11cff

Browse files
author
Abolfazl Rezvani Naraqi
authored
Merge pull request #401 from Abolfazl2647/review-sync
Review sync
2 parents 8537993 + fc2dddd commit ad11cff

File tree

1 file changed

+0
-25
lines changed

1 file changed

+0
-25
lines changed

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

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

106106
<Sandpack>
107107

108-
<<<<<<< HEAD
109-
```jsx App.js
110-
function ProductCategoryRow({category}) {
111-
=======
112108
```jsx src/App.js
113109
function ProductCategoryRow({ category }) {
114-
>>>>>>> bb3a0f5c10aaeba6e6fb35f31f36b47812ece158
115110
return (
116111
<tr>
117112
<th colSpan="2">{category}</th>
@@ -342,13 +337,8 @@ function FilterableProductTable({ products }) {
342337
343338
<Sandpack>
344339
345-
<<<<<<< HEAD
346-
```jsx App.js
347-
import {useState} from 'react';
348-
=======
349340
```jsx src/App.js
350341
import { useState } from 'react';
351-
>>>>>>> bb3a0f5c10aaeba6e6fb35f31f36b47812ece158
352342

353343
function FilterableProductTable({products}) {
354344
const [filterText, setFilterText] = useState('');
@@ -523,15 +513,6 @@ function FilterableProductTable({ products }) {
523513
شما روی‌داد `onChange` را درون `SearchBar` اضافه خواهید کرد و استیت پدر را از آنجا تنظیم می‌کنید.
524514
</p>
525515
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-
=======
535516
```js {4,5,13,19}
536517
function SearchBar({
537518
filterText,
@@ -552,21 +533,15 @@ function SearchBar({
552533
type="checkbox"
553534
checked={inStockOnly}
554535
onChange={(e) => onInStockOnlyChange(e.target.checked)}
555-
>>>>>>> bb3a0f5c10aaeba6e6fb35f31f36b47812ece158
556536
```
557537
<p dir="rtl">
558538
حالا اپلیکیشن کار میکند !
559539
</p>
560540
561541
<Sandpack>
562542
563-
<<<<<<< HEAD
564-
```jsx App.js
565-
import {useState} from 'react';
566-
=======
567543
```jsx src/App.js
568544
import { useState } from 'react';
569-
>>>>>>> bb3a0f5c10aaeba6e6fb35f31f36b47812ece158
570545

571546
function FilterableProductTable({products}) {
572547
const [filterText, setFilterText] = useState('');

0 commit comments

Comments
 (0)