Skip to content

fix(router): ensure named outlets with empty path parents are matched #40029

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

Closed
atscott wants to merge 9 commits into from
Closed

fix(router): ensure named outlets with empty path parents are matched #40029

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6c47ec0
refactor(router): Use for...of rather than `mapChildrenIntoArray` helper
atscott Nov 26, 2020
9c09674
refactor(router): Update `recognize` to return `null` when there is n…
atscott Nov 26, 2020
ecff149
refactor(router): make `recognize` synchronous
atscott Nov 26, 2020
8827f8d
fix(router): Ensure named outlets with empty path parents are recognized
atscott Nov 26, 2020
afbe67f
refactor(router): Extract common functions for config matching
atscott Dec 3, 2020
2eb49c3
fix(router): apply redirects should match named outlets with empty pa…
atscott Nov 30, 2020
36191b3
fixup! fix(router): apply redirects should match named outlets with e…
atscott Dec 14, 2020
35d3aae
fixup! fix(router): apply redirects should match named outlets with e…
atscott Dec 15, 2020
cace462
fixup! fix(router): apply redirects should match named outlets with e…
atscott Dec 15, 2020
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
Next Next commit
refactor(router): Use for...of rather than mapChildrenIntoArray helper 
When stepping through the `recognize` algorithm, it is much easier to
follow when using a simple `for...of` rather than the helper
`mapChildrenIntoArray` with the passed closure. The only special thing that
`mapChildrenIntoArray` does is ensure the primary route appears first.
This change will have no affect on the result because `processChildren` later calls
`sortActivatedRouteSnapshots`, which does the same thing.
  • Loading branch information
@atscott
atscott committed Dec 11, 2020
commit 6c47ec0f5d320dab02b4d54660a91090e9ab4c44
7 changes: 5 additions & 2 deletions packages/router/src/recognize.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,11 @@ class Recognizer {

processChildren(config: Route[], segmentGroup: UrlSegmentGroup):
TreeNode<ActivatedRouteSnapshot>[] {
const children = mapChildrenIntoArray(
segmentGroup, (child, childOutlet) => this.processSegmentGroup(config, child, childOutlet));
const children: Array<TreeNode<ActivatedRouteSnapshot>> = [];
for (const childOutlet of Object.keys(segmentGroup.children)) {
const child = segmentGroup.children[childOutlet];
children.push(...this.processSegmentGroup(config, child, childOutlet));
}
checkOutletNameUniqueness(children);
sortActivatedRouteSnapshots(children);
return children;
Expand Down