Fix #11629 (#11633)

Author: mspiess

.changeset/thirty-swans-fail.md

@@ -0,0 +1,5 @@
+---
+"react-router": patch
+---
+
+When using `v7_relativeSplatPath`, properly resolve relative paths in splat routes that are children of pathless routes

contributors.yml

@@ -184,6 +184,7 @@
 - modex98
 - morleytatro
 - ms10596
+- mspiess
 - mtliendo
 - ned-park
 - nilubisan

packages/react-router/__tests__/useResolvedPath-test.tsx

@@ -420,6 +420,38 @@ describe("useResolvedPath", () => {
         </div>"
       `);
     });
+
+    // gh-issue #11629
+    it("when enabled, '.' resolves to the current path including any splat paths nested in pathless routes", () => {
+      let { container } = render(
+        <MemoryRouter
+          initialEntries={["/foo/bar"]}
+          future={{ v7_relativeSplatPath: true }}
+        >
+          <Routes>
+            <Route path="foo">
+              <Route>
+                <Route path="*" element={<Component desc='<Route path="/foo"><Route><Route path="*" /></Route></Route>'/>}/>
+              </Route>
+            </Route>
+          </Routes>
+        </MemoryRouter>
+      );
+      let html = getHtml(container);
+      html = html ? html.replace(/&lt;/g, "<").replace(/&gt;/g, ">") : html;
+      expect(html).toMatchInlineSnapshot(`
+        "<div>
+          --- Routes: <Route path="/foo"><Route><Route path="*" /></Route></Route> ---
+          useLocation(): /foo/bar
+          useResolvedPath('.'): /foo/bar
+          useResolvedPath('..'): /foo
+          useResolvedPath('..', { relative: 'path' }): /foo
+          useResolvedPath('baz/qux'): /foo/bar/baz/qux
+          useResolvedPath('./baz/qux'): /foo/bar/baz/qux
+
+        </div>"
+      `);
+    });
   });
 });
 

packages/router/utils.ts

@@ -1221,7 +1221,7 @@ export function getResolveToMatches<
   // https://github.com/remix-run/react-router/issues/11052#issuecomment-1836589329
   if (v7_relativeSplatPath) {
     return pathMatches.map((match, idx) =>
-      idx === matches.length - 1 ? match.pathname : match.pathnameBase
+      idx === pathMatches.length - 1 ? match.pathname : match.pathnameBase
     );
   }