Skip to content

Commit c0356ac

Browse files
Merge pull request #87 from reactjs/sync-bb3a0f5c
Sync with react.dev @ bb3a0f5
2 parents 20eb925 + f4b594e commit c0356ac

File tree

15 files changed

+34
-25
lines changed

15 files changed

+34
-25
lines changed

src/components/Layout/Page.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ export function Page({children, toc, routeTree, meta, section}: PageProps) {
129129
'grid grid-cols-only-content lg:grid-cols-sidebar-content 2xl:grid-cols-sidebar-content-toc'
130130
)}>
131131
{showSidebar && (
132-
<div className="lg:-mt-16">
132+
<div className="lg:-mt-16 z-10">
133133
<div className="fixed top-0 py-0 shadow lg:pt-16 lg:sticky start-0 end-0 lg:shadow-none">
134134
<SidebarNav
135135
key={section}

src/components/MDX/SandpackWithHTMLOutput.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export default function ShowRenderedHTML({children}) {
2020
{formatHTML(markup)}
2121
</pre>
2222
</>
23-
);
23+
);
2424
}`;
2525

2626
const formatHTML = `
@@ -77,8 +77,8 @@ export default memo(function SandpackWithHTMLOutput(
7777
) {
7878
const children = [
7979
...Children.toArray(props.children),
80-
createFile('ShowRenderedHTML.js', ShowRenderedHTML),
81-
createFile('formatHTML.js hidden', formatHTML),
80+
createFile('src/ShowRenderedHTML.js', ShowRenderedHTML),
81+
createFile('src/formatHTML.js hidden', formatHTML),
8282
createFile('package.json hidden', packageJSON),
8383
];
8484
return <Sandpack {...props}>{children}</Sandpack>;

src/components/SocialBanner.tsx

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import {useRef, useEffect} from 'react';
77
import cn from 'classnames';
88
import {ExternalLink} from './ExternalLink';
99

10-
const bannerText = 'Support Ukraine 🇺🇦';
11-
const bannerLink = 'https://opensource.fb.com/support-ukraine';
12-
const bannerLinkText = 'Help Provide Humanitarian Aid to Ukraine';
10+
const bannerText = 'Join us for React Conf on May 15-16.';
11+
const bannerLink = 'https://conf.react.dev/';
12+
const bannerLinkText = 'Learn more.';
1313

1414
export default function SocialBanner() {
1515
const ref = useRef<HTMLDivElement | null>(null);
@@ -39,9 +39,7 @@ export default function SocialBanner() {
3939
<ExternalLink
4040
className="ms-0 sm:ms-1 text-link dark:text-link-dark hover:underline"
4141
href={bannerLink}>
42-
<div className="inline sm:hidden">🇺🇦 </div>
4342
{bannerLinkText}
44-
<span className="hidden sm:inline">.</span>
4543
</ExternalLink>
4644
</div>
4745
);

src/content/community/conferences.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,16 @@ April 19 - 20, 2024. In-person in Miami, FL, USA
2525

2626
[Website](https://reactmiami.com/) - [Twitter](https://twitter.com/ReactMiamiConf)
2727

28+
### React Connection 2024 {/*react-connection-2024*/}
29+
April 22, 2024. In-person in Paris, France
30+
31+
[Website](https://reactconnection.io/) - [Twitter](https://twitter.com/ReactConn)
32+
33+
### React Native Connection 2024 {/*react-native-connection-2024*/}
34+
April 23, 2024. In-person in Paris, France
35+
36+
[Website](https://reactnativeconnection.io/) - [Twitter](https://twitter.com/ReactNativeConn)
37+
2838
### React Conf 2024 {/*react-conf-2024*/}
2939
May 15 - 16, 2024. In-person in Henderson, NV, USA + remote
3040

src/content/learn/reacting-to-input-with-state.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -545,6 +545,7 @@ body { margin: 0; padding: 0; height: 250px; }
545545
width: 200px;
546546
height: 200px;
547547
border-radius: 10px;
548+
border: 5px solid transparent;
548549
}
549550

550551
.picture--active {

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ In addition, if the `<link>` is to a stylesheet (namely, it has `rel="stylesheet
9696

9797
There are two exception to this special behavior:
9898

99-
* If the link doesn't have a `precedence` prop, there is no special behavior, because the order of stylesheets within the document is significant, so React needs to know how to order this stylesheet relative to others, which you specify using the `precedence` prop.
99+
* If the link doesn't have a `precedence` prop, there is no special behavior, because the order of stylesheets within the document is significant, so React needs to know how to order this stylesheet relative to others, which you specify using the `precedence` prop.
100100
* If you supply any of the `onLoad`, `onError`, or `disabled` props, there is no special behavior, because these props indicate that you are managing the loading of the stylesheet manually within your component.
101101

102102
This special treatment comes with two caveats:
@@ -114,7 +114,7 @@ You can annotate the document with links to related resources such as an icon, c
114114

115115
<SandpackWithHTMLOutput>
116116

117-
```js App.js active
117+
```js src/App.js active
118118
import ShowRenderedHTML from './ShowRenderedHTML.js';
119119

120120
export default function BlogPage() {
@@ -141,7 +141,7 @@ When you want to use a stylesheet, it can be beneficial to call the [preinit](/r
141141

142142
<SandpackWithHTMLOutput>
143143

144-
```js App.js active
144+
```js src/App.js active
145145
import ShowRenderedHTML from './ShowRenderedHTML.js';
146146

147147
export default function SiteMapPage() {
@@ -164,7 +164,7 @@ Stylesheets can conflict with each other, and when they do, the browser goes wit
164164

165165
<SandpackWithHTMLOutput>
166166

167-
```js App.js active
167+
```js src/App.js active
168168
import ShowRenderedHTML from './ShowRenderedHTML.js';
169169

170170
export default function HomePage() {
@@ -195,7 +195,7 @@ If you render the same stylesheet from multiple components, React will place onl
195195

196196
<SandpackWithHTMLOutput>
197197

198-
```js App.js active
198+
```js src/App.js active
199199
import ShowRenderedHTML from './ShowRenderedHTML.js';
200200

201201
export default function HomePage() {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ You can render the `<meta>` component from any component. React will put a `<met
7272

7373
<SandpackWithHTMLOutput>
7474

75-
```js App.js active
75+
```js src/App.js active
7676
import ShowRenderedHTML from './ShowRenderedHTML.js';
7777

7878
export default function SiteMapPage() {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ If you supply an `src` and `async` prop, your component will suspend while the s
9191

9292
<SandpackWithHTMLOutput>
9393

94-
```js App.js active
94+
```js src/App.js active
9595
import ShowRenderedHTML from './ShowRenderedHTML.js';
9696

9797
function Map({lat, long}) {
@@ -124,7 +124,7 @@ To include an inline script, render the `<script>` component with the script sou
124124

125125
<SandpackWithHTMLOutput>
126126

127-
```js App.js active
127+
```js src/App.js active
128128
import ShowRenderedHTML from './ShowRenderedHTML.js';
129129

130130
function Tracking() {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ If you supply an `href` and `precedence` prop, your component will suspend while
7373

7474
<SandpackWithHTMLOutput>
7575

76-
```js App.js active
76+
```js src/App.js active
7777
import ShowRenderedHTML from './ShowRenderedHTML.js';
7878
import { useId } from 'react';
7979

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ Render the `<title>` component from any component with text as its children. Rea
6666

6767
<SandpackWithHTMLOutput>
6868

69-
```js App.js active
69+
```js src/App.js active
7070
import ShowRenderedHTML from './ShowRenderedHTML.js';
7171

7272
export default function ContactUsPage() {

0 commit comments

Comments
 (0)