Add media option to ReactDOM.preload()

damnsamn · damnsamn · commit 11a175f2bb61 · 2023-07-20T00:30:19.000+08:00
diff --git a/packages/react-dom-bindings/src/client/ReactFiberConfigDOM.js b/packages/react-dom-bindings/src/client/ReactFiberConfigDOM.js
@@ -2285,6 +2285,7 @@ function preloadPropsFromPreloadOptions(
     imageSrcSet: options.imageSrcSet,
     imageSizes: options.imageSizes,
     referrerPolicy: options.referrerPolicy,
+    media: options.media,
   };
 }
 
diff --git a/packages/react-dom-bindings/src/server/ReactFizzConfigDOM.js b/packages/react-dom-bindings/src/server/ReactFizzConfigDOM.js
@@ -5565,6 +5565,7 @@ function preloadPropsFromPreloadOptions(
     imageSrcSet: options.imageSrcSet,
     imageSizes: options.imageSizes,
     referrerPolicy: options.referrerPolicy,
+    media: options.media,
   };
 }
 
diff --git a/packages/react-dom/src/__tests__/ReactDOMFloat-test.js b/packages/react-dom/src/__tests__/ReactDOMFloat-test.js
@@ -3771,6 +3771,91 @@ body {
     );
   });
 
+  it('should handle media on image preload', async () => {
+    function App({isClient}) {
+      ReactDOM.preload('/server', {
+        as: 'image',
+        imageSrcSet: '/server',
+        imageSizes: '100vw',
+        media: 'print and (min-width: 768px)',
+      });
+
+      if (isClient) {
+        ReactDOM.preload('/client', {
+          as: 'image',
+          imageSrcSet: '/client',
+          imageSizes: '100vw',
+          media: 'screen and (max-width: 480px)',
+        });
+      }
+
+      return (
+        <html>
+          <body>hello</body>
+        </html>
+      );
+    }
+
+    await act(() => {
+      renderToPipeableStream(<App />).pipe(writable);
+    });
+    expect(getMeaningfulChildren(document)).toEqual(
+      <html>
+        <head>
+          <link
+            rel="preload"
+            as="image"
+            imagesrcset="/server"
+            imagesizes="100vw"
+            media="print and (min-width: 768px)"
+          />
+        </head>
+        <body>hello</body>
+      </html>,
+    );
+
+    const root = ReactDOMClient.hydrateRoot(document, <App />);
+    await waitForAll([]);
+    expect(getMeaningfulChildren(document)).toEqual(
+      <html>
+        <head>
+          <link
+            rel="preload"
+            as="image"
+            imagesrcset="/server"
+            imagesizes="100vw"
+            media="print and (min-width: 768px)"
+          />
+        </head>
+        <body>hello</body>
+      </html>,
+    );
+
+    root.render(<App isClient={true} />);
+    await waitForAll([]);
+    expect(getMeaningfulChildren(document)).toEqual(
+      <html>
+        <head>
+          <link
+            rel="preload"
+            as="image"
+            imagesrcset="/server"
+            imagesizes="100vw"
+            media="print and (min-width: 768px)"
+          />
+          <link
+            rel="preload"
+            as="image"
+            imagesrcset="/client"
+            imagesizes="100vw"
+            media="screen and (max-width: 480px)"
+          />
+        </head>
+        <body>hello</body>
+      </html>,
+    );
+  });
+
   describe('ReactDOM.prefetchDNS(href)', () => {
     it('creates a dns-prefetch resource when called', async () => {
       function App({url}) {
diff --git a/packages/react-dom/src/shared/ReactDOMTypes.js b/packages/react-dom/src/shared/ReactDOMTypes.js
@@ -19,6 +19,7 @@ export type PreloadOptions = {
   imageSrcSet?: string,
   imageSizes?: string,
   referrerPolicy?: string,
+  media?: string,
 };
 export type PreinitOptions = {
   as: string,

Original file line number	Diff line number	Diff line change
`@@ -2285,6 +2285,7 @@ function preloadPropsFromPreloadOptions(`
`2285`	`2285`	`imageSrcSet: options.imageSrcSet,`
`2286`	`2286`	`imageSizes: options.imageSizes,`
`2287`	`2287`	`referrerPolicy: options.referrerPolicy,`
	`2288`	`+ media: options.media,`
`2288`	`2289`	`};`
`2289`	`2290`	`}`
`2290`	`2291`
Original file line number	Diff line number	Diff line change
`@@ -5565,6 +5565,7 @@ function preloadPropsFromPreloadOptions(`
`5565`	`5565`	`imageSrcSet: options.imageSrcSet,`
`5566`	`5566`	`imageSizes: options.imageSizes,`
`5567`	`5567`	`referrerPolicy: options.referrerPolicy,`
	`5568`	`+ media: options.media,`
`5568`	`5569`	`};`
`5569`	`5570`	`}`
`5570`	`5571`