Skip to content

Fixing Nesting Issues with multiple layouts #741

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 26, 2023
Merged

Fixing Nesting Issues with multiple layouts #741

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions packages/router-cli/src/generator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,18 +367,27 @@ function replaceBackslash(s?: string) {
return s?.replace(/\\/gi, '/')
}

function hasParentRoute(routes: RouteNode[], routeToCheck: string | undefined): RouteNode | null {
export function hasParentRoute(routes: RouteNode[], routeToCheck: string | undefined): RouteNode | null {
if (!routeToCheck || routeToCheck === "/") {
return null;
}
for (const route of routes) {

const sortedNodes = multiSortBy(routes, [
(d) => d.routePath!.length * -1,
(d) => d.variableName,

]).filter((d) => d.routePath !== `/${rootPathId}`)

for (const route of sortedNodes) {
if (route.routePath === '/') continue;

if (routeToCheck.startsWith(`${route.routePath}/`) && route.routePath !== routeToCheck) {
return route;
}
}
const segments = routeToCheck.split("/");
segments.pop(); // Remove the last segment
const parentRoute = segments.join("/");

return hasParentRoute(routes, parentRoute);
}