Fix unstable_useBlocker key issues in strict mode

.changeset/blocker-key-strict-mode.md

@@ -0,0 +1,6 @@
+---
+"react-router": patch
+"@remix-run/router": patch
+---
+
+Fix `unstable_useBlocker` key issues in `StrictMode`

.changeset/strip-blocker-basename.md

@@ -0,0 +1,5 @@
+---
+"react-router": patch
+---
+
+Strip `basename` from locations provided to `unstable_useBlocker` functions to match `useLocation`

examples/navigation-blocking/src/app.tsx

@@ -1,5 +1,9 @@
 import * as React from "react";
-import type { unstable_Blocker as Blocker } from "react-router-dom";
+import type {
+  unstable_Blocker as Blocker,
+  unstable_BlockerFunction as BlockerFunction,
+} from "react-router-dom";
+import { useActionData } from "react-router-dom";
 import {
   createBrowserRouter,
   createRoutesFromElements,
@@ -79,22 +83,35 @@ function Layout() {
 }
 
 function ImportantForm() {
+  let actionData = useActionData() as { ok: boolean } | undefined;
   let [value, setValue] = React.useState("");
-  let isBlocked = value !== "";
-  let blocker = useBlocker(isBlocked);
+  // Allow the submission navigation to the same route to go through
+  let shouldBlock = React.useCallback<BlockerFunction>(
+    ({ currentLocation, nextLocation }) =>
+      value !== "" && currentLocation.pathname !== nextLocation.pathname,
+    [value]
+  );
+  let blocker = useBlocker(shouldBlock);
+
+  // Clean the input after a successful submission
+  React.useEffect(() => {
+    if (actionData?.ok) {
+      setValue("");
+    }
+  }, [actionData]);
 
   // Reset the blocker if the user cleans the form
   React.useEffect(() => {
-    if (blocker.state === "blocked" && !isBlocked) {
+    if (blocker.state === "blocked" && value === "") {
       blocker.reset();
     }
-  }, [blocker, isBlocked]);
+  }, [blocker, value]);
 
   return (
     <>
       <p>
         Is the form dirty?{" "}
-        {isBlocked ? (
+        {value !== "" ? (
           <span style={{ color: "red" }}>Yes</span>
         ) : (
           <span style={{ color: "green" }}>No</span>

package.json

@@ -112,10 +112,10 @@
       "none": "45 kB"
     },
     "packages/react-router/dist/react-router.production.min.js": {
-      "none": "13.4 kB"
+      "none": "13.7 kB"
     },
     "packages/react-router/dist/umd/react-router.production.min.js": {
-      "none": "15.8 kB"
+      "none": "16.1 kB"
     },
     "packages/react-router-dom/dist/react-router-dom.production.min.js": {
       "none": "12.1 kB"

packages/react-router-dom/__tests__/use-blocker-test.tsx

@@ -5,6 +5,7 @@ import type { unstable_Blocker as Blocker, RouteObject } from "../index";
 import {
   createMemoryRouter,
   json,
+  Link,
   NavLink,
   Outlet,
   RouterProvider,
@@ -64,6 +65,55 @@ describe("navigation blocking with useBlocker", () => {
     });
   });
 
+  it("strips basename from location provided to blocker function", async () => {
+    let shouldBlock = jest.fn();
+    router = createMemoryRouter(
+      [
+        {
+          Component() {
+            useBlocker(shouldBlock);
+            return (
+              <div>
+                <Link to="/about">About</Link>
+                <Outlet />
+              </div>
+            );
+          },
+          children: [
+            {
+              path: "/",
+              element: <h1>Home</h1>,
+            },
+            {
+              path: "/about",
+              element: <h1>About</h1>,
+            },
+          ],
+        },
+      ],
+      {
+        basename: "/base",
+        initialEntries: ["/base"],
+      }
+    );
+
+    act(() => {
+      root = ReactDOM.createRoot(node);
+      root.render(<RouterProvider router={router} />);
+    });
+
+    act(() => click(node.querySelector("a[href='/base/about']")));
+
+    expect(router.state.location.pathname).toBe("/base/about");
+    expect(shouldBlock).toHaveBeenCalledWith({
+      currentLocation: expect.objectContaining({ pathname: "/" }),
+      nextLocation: expect.objectContaining({ pathname: "/about" }),
+      historyAction: "PUSH",
+    });
+
+    act(() => root.unmount());
+  });
+
   describe("on <Link> navigation", () => {
     describe("blocker returns false", () => {
       beforeEach(() => {

packages/react-router/lib/hooks.tsx

@@ -22,6 +22,8 @@ import {
   matchRoutes,
   parsePath,
   resolveTo,
+  stripBasename,
+  IDLE_BLOCKER,
   UNSAFE_getPathContributingMatches as getPathContributingMatches,
   UNSAFE_warning as warning,
 } from "@remix-run/router";
@@ -933,30 +935,55 @@ let blockerId = 0;
  * cross-origin navigations.
  */
 export function useBlocker(shouldBlock: boolean | BlockerFunction): Blocker {
-  let { router } = useDataRouterContext(DataRouterHook.UseBlocker);
+  let { router, basename } = useDataRouterContext(DataRouterHook.UseBlocker);
   let state = useDataRouterState(DataRouterStateHook.UseBlocker);
-  let [blockerKey] = React.useState(() => String(++blockerId));
 
+  let [blockerKey, setBlockerKey] = React.useState("");
+  let [blocker, setBlocker] = React.useState<Blocker>(IDLE_BLOCKER);
   let blockerFunction = React.useCallback<BlockerFunction>(
-    (args) => {
-      return typeof shouldBlock === "function"
-        ? !!shouldBlock(args)
-        : !!shouldBlock;
+    (arg) => {
+      if (typeof shouldBlock !== "function") {
+        return !!shouldBlock;
+      }
+      if (basename === "/") {
+        return shouldBlock(arg);
+      }
+
+      // If they provided us a function and we've got an active basename, strip
+      // it from the locations we expose to the user to match the behavior of
+      // useLocation
+      let { currentLocation, nextLocation, historyAction } = arg;
+      return shouldBlock({
+        currentLocation: {
+          ...currentLocation,
+          pathname:
+            stripBasename(currentLocation.pathname, basename) ||
+            currentLocation.pathname,
+        },
+        nextLocation: {
+          ...nextLocation,
+          pathname:
+            stripBasename(nextLocation.pathname, basename) ||
+            nextLocation.pathname,
+        },
+        historyAction,
+      });
     },
-    [shouldBlock]
+    [basename, shouldBlock]
   );
 
-  let blocker = router.getBlocker(blockerKey, blockerFunction);
-
-  // Cleanup on unmount
-  React.useEffect(
-    () => () => router.deleteBlocker(blockerKey),
-    [router, blockerKey]
-  );
+  React.useEffect(() => {
+    let key = String(++blockerId);
+    setBlocker(router.getBlocker(key, blockerFunction));
+    setBlockerKey(key);
+    return () => router.deleteBlocker(key);
+  }, [router, setBlocker, setBlockerKey, blockerFunction]);
 
   // Prefer the blocker from state since DataRouterContext is memoized so this
   // ensures we update on blocker state updates
-  return state.blockers.get(blockerKey) || blocker;
+  return blockerKey && state.blockers.has(blockerKey)
+    ? state.blockers.get(blockerKey)!
+    : blocker;
 }
 
 /**

packages/router/router.ts

@@ -893,8 +893,9 @@ export function createRouter(init: RouterInit): Router {
               init.history.go(delta);
             },
             reset() {
-              deleteBlocker(blockerKey!);
-              updateState({ blockers: new Map(router.state.blockers) });
+              let blockers = new Map(state.blockers);
+              blockers.set(blockerKey!, IDLE_BLOCKER);
+              updateState({ blockers });
             },
           });
           return;
@@ -991,9 +992,8 @@ export function createRouter(init: RouterInit): Router {
 
     // On a successful navigation we can assume we got through all blockers
     // so we can start fresh
-    for (let [key] of blockerFunctions) {
-      deleteBlocker(key);
-    }
+    let blockers = new Map();
+    blockerFunctions.clear();
 
     // Always respect the user flag.  Otherwise don't reset on mutation
     // submission navigations unless they redirect
@@ -1032,7 +1032,7 @@ export function createRouter(init: RouterInit): Router {
         newState.matches || state.matches
       ),
       preventScrollReset,
-      blockers: new Map(state.blockers),
+      blockers,
     });
 
     // Reset stateful navigation vars
@@ -1130,8 +1130,9 @@ export function createRouter(init: RouterInit): Router {
           navigate(to, opts);
         },
         reset() {
-          deleteBlocker(blockerKey!);
-          updateState({ blockers: new Map(state.blockers) });
+          let blockers = new Map(state.blockers);
+          blockers.set(blockerKey!, IDLE_BLOCKER);
+          updateState({ blockers });
         },
       });
       return;
@@ -2378,8 +2379,9 @@ export function createRouter(init: RouterInit): Router {
       `Invalid blocker state transition: ${blocker.state} -> ${newBlocker.state}`
     );
 
-    state.blockers.set(key, newBlocker);
-    updateState({ blockers: new Map(state.blockers) });
+    let blockers = new Map(state.blockers);
+    blockers.set(key, newBlocker);
+    updateState({ blockers });
   }
 
   function shouldBlockNavigation({