Unverified Commit bc9ed9de authored by Jimmy Lai's avatar Jimmy Lai Committed by GitHub

router: support layout/special files as direct children of parallel routes (#51604)

follow up on #51413 where I kinda forgot to support parsing layout files in sub routes in a parallel segment.

This should fix it by making sure that we check at all level of the app loader tree and by creating an implicit inner `children` for all parallel slot



link NEXT-1301
parent f6998e30
...@@ -52,6 +52,7 @@ const FILE_TYPES = { ...@@ -52,6 +52,7 @@ const FILE_TYPES = {
const GLOBAL_ERROR_FILE_TYPE = 'global-error' const GLOBAL_ERROR_FILE_TYPE = 'global-error'
const PAGE_SEGMENT = 'page$' const PAGE_SEGMENT = 'page$'
const PARALLEL_CHILDREN_SEGMENT = 'children$'
type DirResolver = (pathToResolve: string) => string type DirResolver = (pathToResolve: string) => string
type PathResolver = ( type PathResolver = (
...@@ -315,7 +316,8 @@ async function createTreeCodeFromPath( ...@@ -315,7 +316,8 @@ async function createTreeCodeFromPath(
subSegmentPath.push( subSegmentPath.push(
...normalizedParallelSegments.filter( ...normalizedParallelSegments.filter(
(segment) => segment !== PAGE_SEGMENT (segment) =>
segment !== PAGE_SEGMENT && segment !== PARALLEL_CHILDREN_SEGMENT
) )
) )
...@@ -359,10 +361,17 @@ async function createTreeCodeFromPath( ...@@ -359,10 +361,17 @@ async function createTreeCodeFromPath(
} }
} }
let parallelSegmentKey = Array.isArray(parallelSegment)
? parallelSegment[0]
: parallelSegment
parallelSegmentKey =
parallelSegmentKey === PARALLEL_CHILDREN_SEGMENT
? 'children'
: parallelSegmentKey
props[normalizeParallelKey(parallelKey)] = `[ props[normalizeParallelKey(parallelKey)] = `[
'${ '${parallelSegmentKey}',
Array.isArray(parallelSegment) ? parallelSegment[0] : parallelSegment
}',
${subtreeCode}, ${subtreeCode},
{ {
${definedFilePaths ${definedFilePaths
...@@ -483,7 +492,8 @@ const nextAppLoader: AppLoader = async function nextAppLoader() { ...@@ -483,7 +492,8 @@ const nextAppLoader: AppLoader = async function nextAppLoader() {
continue continue
} }
if (isParallelRoute) { if (isParallelRoute) {
matched[rest[0]] = rest.slice(1) // we insert a special marker in order to also process layout/etc files at the slot level
matched[rest[0]] = [PARALLEL_CHILDREN_SEGMENT, ...rest.slice(1)]
continue continue
} }
......
import Link from 'next/link'
export default function Page() { export default function Page() {
return 'slot children' return (
<>
<div>slot children</div>
<Link href="/parallel-layout/subroute">parallel subroute</Link>
</>
)
} }
export default ({ children }) => {
return (
<div>
<h1 id="parallel-subroute">parallel subroute layout</h1>
{children}
</div>
)
}
...@@ -248,6 +248,17 @@ createNextDescribe( ...@@ -248,6 +248,17 @@ createNextDescribe(
() => browser.waitForElementByCss('#parallel-layout').text(), () => browser.waitForElementByCss('#parallel-layout').text(),
'parallel layout' 'parallel layout'
) )
// navigate to /parallel-layout/subroute
await browser.elementByCss('[href="/parallel-layout/subroute"]').click()
await check(
() => browser.waitForElementByCss('#parallel-layout').text(),
'parallel layout'
)
await check(
() => browser.waitForElementByCss('#parallel-subroute').text(),
'parallel subroute layout'
)
}) })
it('should only scroll to the parallel route that was navigated to', async () => { it('should only scroll to the parallel route that was navigated to', async () => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment