Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/routing/Router.ts
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ export class Router extends QueuingEvented<{ nav: NavEvent; outlet: OutletEvent
}
}
if (queryParamString) {
queryParams = queryParamString.split('$').map((queryParam) => {
queryParams = queryParamString.split('&').map((queryParam) => {
return queryParam.replace('{', '').replace('}', '');
});
}
Expand Down
28 changes: 28 additions & 0 deletions tests/routing/unit/Router.ts
Original file line number Diff line number Diff line change
Expand Up @@ -416,6 +416,34 @@ describe('Router', () => {
assert.strictEqual(link, 'foo/foo/bar/bar/baz/baz');
});

it('Should generate link with multiple params and query params', () => {
const router = new Router(
[
{
path: 'foo/{foo}/{bar}?{baz}&{qux}',
outlet: 'foo',
defaultParams: {
foo: 'defaultFoo',
bar: 'defaultBar',
baz: 'defaultBaz',
qux: 'defaultQux'
}
}
],
{ HistoryManager }
);
assert.strictEqual(
router.link('foo', {
foo: 'foo',
bar: 'bar',
baz: 'baz',
qux: 'qux'
}),
'foo/foo/bar?baz=baz&qux=qux'
);
assert.strictEqual(router.link('foo'), 'foo/defaultFoo/defaultBar?baz=defaultBaz&qux=defaultQux');
});

it('Will not generate a link if params are not available', () => {
const router = new Router(routeWithChildrenAndMultipleParams, { HistoryManager });
const link = router.link('baz');
Expand Down