Skip to content

Commit

Permalink
Merge pull request #153 from reactjs/sync-a11c2534
Browse files Browse the repository at this point in the history
Sync with reactjs.org @ a11c253
  • Loading branch information
Ryan-LT authored Sep 14, 2021
2 parents c079bb3 + 5ef0217 commit fc52d95
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 6 deletions.
1 change: 1 addition & 0 deletions content/community/conferences.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ October 7-8, 2021. In-person in Amsterdam, Netherlands + remote (hybrid event)

[Website](https://www.reactlive.nl/) - [Twitter](https://twitter.com/reactlivenl) - [LinkedIn](https://www.linkedin.com/company/frontendlove/)


### React Brussels 2021 {#react-brussels-2021}
October 15, 2021 - remote event

Expand Down
1 change: 1 addition & 0 deletions content/docs/handling-events.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ sẽ có đôi chút khác biệt trong React:
```

Một điểm khác biệt nữa trong React là bạn không thể trả về `false` để chặn những hành vi mặc định mà phải gọi `preventDefault` trực tiếp. Lấy ví dụ với đoạn HTML sau, để chặn hành vi mặc định của đường dẫn là mở trang mới, bạn có thể viết:

```html
<form onsubmit="console.log('You clicked submit.'); return false">
<button type="submit">Submit</button>
Expand Down
1 change: 0 additions & 1 deletion content/docs/thinking-in-react.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ Vì mô hình dữ liệu thường hiển thị dưới dạng chuỗi JSON, n
![Sơ đồ Component](../images/blog/thinking-in-react-components.png)

Trong ứng dụng dưới đây, bạn sẽ thấy chúng ta có 5 component, dữ liệu mà mỗi component hiển thị sẽ được in nghiêng

1. **`FilterableProductTable` (orange):** chứa toàn bộ cả ứng dụng
2. **`SearchBar` (blue):** nơi *người dùng nhập từ khoá tìm kiếm*
3. **`ProductTable` (green):** lọc và hiển thị *kết quả* dựa trên *từ khoá tìm kiếm*
Expand Down
Binary file modified content/images/blog/thinking-in-react-components.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions src/components/Banner/Banner.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {colors, fonts, media} from 'theme';
import ExternalLinkSvg from 'templates/components/ExternalLinkSvg';

const linkProps = {
href: 'https://www.surveymonkey.co.uk/r/673TZ7T',
href: 'https://surveys.savanta.com/survey/selfserve/21e3/210643?list=2',
target: '_blank',
rel: 'noopener',
};
Expand Down Expand Up @@ -135,7 +135,7 @@ export default function Banner() {
target="_blank"
rel="noopener">
<span css={{color: colors.brand}}>
Take our 2020 Community Survey!
Take our 2021 Community Survey!
</span>
<ExternalLinkSvg
cssProps={{
Expand Down
6 changes: 3 additions & 3 deletions src/html.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,11 @@ export default class HTML extends React.Component<Props> {
}
activeBanner = {
storageId: 'reactjs_banner_2020survey',
storageId: 'reactjs_banner_2021survey',
normalHeight: 50,
smallHeight: 75,
campaignStartDate: '2020-10-05T00:00:00Z', // the Z is for UTC
campaignEndDate: '2020-10-19T00:00:00Z', // the Z is for UTC
campaignStartDate: '2021-08-16T00:00:00Z', // the Z is for UTC
campaignEndDate: '2021-08-31T00:00:00Z', // the Z is for UTC
snoozeForDays: 7,
};
Expand Down

0 comments on commit fc52d95

Please sign in to comment.