feat: Allow pass-through script props in ScrollRestoration (#2879)

.changeset/late-files-trade.md

@@ -0,0 +1,5 @@
+---
+"@remix-run/react": patch
+---
+
+Allow pass-through props to be passed to the script rendered by `ScrollRestoration`

packages/remix-react/__tests__/scroll-restoration-test.tsx

@@ -0,0 +1,104 @@
+import * as React from "react";
+import { MemoryRouter, Outlet } from "react-router-dom";
+import { render, screen } from "@testing-library/react";
+
+import { LiveReload, RemixEntryContext, Scripts } from "../components";
+import type { RemixEntryContextType } from "../components";
+import { ScrollRestoration } from "../scroll-restoration";
+
+import "@testing-library/jest-dom/extend-expect";
+
+function AppShell({ children }: { children: React.ReactNode }) {
+  return (
+    <React.Fragment>
+      <Outlet />
+      {children}
+      <Scripts />
+      <LiveReload />
+    </React.Fragment>
+  );
+}
+
+describe("<ScrollRestoration />", () => {
+  function withContext(stuff: JSX.Element) {
+    let context: RemixEntryContextType = {
+      routeModules: { idk: { default: () => null } },
+      manifest: {
+        routes: {
+          idk: {
+            hasLoader: true,
+            hasAction: false,
+            hasCatchBoundary: false,
+            hasErrorBoundary: false,
+            id: "idk",
+            module: "idk",
+          },
+        },
+        entry: { imports: [], module: "" },
+        url: "",
+        version: "",
+      },
+      matches: [],
+      clientRoutes: [
+        {
+          id: "idk",
+          path: "idk",
+          hasLoader: true,
+          element: "",
+          module: "",
+          async action() {
+            return {};
+          },
+          async loader() {
+            return {};
+          },
+        },
+      ],
+      routeData: {},
+      appState: {} as any,
+      transitionManager: {
+        getState() {
+          return {
+            transition: {},
+          };
+        },
+      } as any,
+    };
+    return (
+      <RemixEntryContext.Provider value={context}>
+        <MemoryRouter>{stuff}</MemoryRouter>
+      </RemixEntryContext.Provider>
+    );
+  }
+
+  it("should render a <script> tag", () => {
+    render(
+      withContext(
+        <AppShell>
+          <ScrollRestoration data-testid="scroll-script" />
+        </AppShell>
+      )
+    );
+    let script = screen.getByTestId("scroll-script");
+    expect(script instanceof HTMLScriptElement).toBe(true);
+  });
+
+  it("should pass props to <script>", () => {
+    render(
+      withContext(
+        <AppShell>
+          <ScrollRestoration
+            data-testid="scroll-script"
+            nonce="hello"
+            crossOrigin="anonymous"
+          />
+        </AppShell>
+      )
+    );
+    let script = screen.getByTestId("scroll-script");
+    expect(script).toHaveAttribute("nonce", "hello");
+    expect(script).toHaveAttribute("crossorigin", "anonymous");
+  });
+
+  it.todo("should restore scroll position");
+});

packages/remix-react/components.tsx

@@ -65,7 +65,7 @@ import type {
 ////////////////////////////////////////////////////////////////////////////////
 // RemixEntry
 
-interface RemixEntryContextType {
+export interface RemixEntryContextType {
   manifest: AssetsManifest;
   matches: BaseRouteMatch<ClientRoute>[];
   routeData: RouteData;
@@ -890,7 +890,7 @@ export function Meta() {
  */
 let isHydrated = false;
 
-type ScriptProps = Omit<
+export type ScriptProps = Omit<
   React.HTMLProps<HTMLScriptElement>,
   | "children"
   | "async"

packages/remix-react/scroll-restoration.tsx

@@ -2,6 +2,7 @@ import * as React from "react";
 import { useLocation } from "react-router-dom";
 
 import { useBeforeUnload, useTransition } from "./components";
+import type { ScriptProps } from "./components";
 
 let STORAGE_KEY = "positions";
 
@@ -20,7 +21,7 @@ if (typeof document !== "undefined") {
  *
  * @see https://remix.run/api/remix#scrollrestoration
  */
-export function ScrollRestoration({ nonce = undefined }: { nonce?: string }) {
+export function ScrollRestoration(props: ScriptProps) {
   useScrollRestoration();
 
   // wait for the browser to restore it on its own
@@ -54,7 +55,7 @@ export function ScrollRestoration({ nonce = undefined }: { nonce?: string }) {
 
   return (
     <script
-      nonce={nonce}
+      {...props}
       suppressHydrationWarning
       dangerouslySetInnerHTML={{
         __html: `(${restoreScroll})(${JSON.stringify(STORAGE_KEY)})`,