Skip to content

Commit

Permalink
fix async behaviour
Browse files Browse the repository at this point in the history
  • Loading branch information
Krutsch committed May 22, 2021
1 parent c2855c6 commit 2b3e532
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 8 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
node_modules
coverage
coverage
src/bundle.js
4 changes: 2 additions & 2 deletions dist/router.js
Original file line number Diff line number Diff line change
Expand Up @@ -108,15 +108,15 @@ export default class Router {
setReuseElements(false);
const parent = route.isChildOf;
if (parent.templateUrl) {
handleTemplate(parent, outletSelector);
await handleTemplate(parent, outletSelector);
}
else if (parent.element) {
render(html `<div data-outlet>${parent.element}</div>`, outletSelector, false);
}
setReuseElements(true);
}
if (route?.templateUrl) {
handleTemplate(route, $(outletSelector).querySelector(outletSelector) ?? outletSelector);
await handleTemplate(route, $(outletSelector).querySelector(outletSelector) ?? outletSelector);
}
else if (route?.element) {
render(html `<div data-outlet>${route?.element}</div>`, $(outletSelector).querySelector(outletSelector) ?? outletSelector, false);
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "router-dom",
"version": "2.1.0",
"version": "2.1.1",
"description": "A lightweight router for everyone",
"type": "module",
"main": "dist/router.js",
Expand Down
4 changes: 2 additions & 2 deletions src/router.ts
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ export default class Router {
setReuseElements(false);
const parent = route.isChildOf!;
if (parent.templateUrl) {
handleTemplate(parent, outletSelector);
await handleTemplate(parent, outletSelector);
} else if (parent.element) {
render(
html`<div data-outlet>${parent.element}</div>`,
Expand All @@ -146,7 +146,7 @@ export default class Router {
}

if (route?.templateUrl) {
handleTemplate(
await handleTemplate(
route,
$(outletSelector)!.querySelector(outletSelector) ?? outletSelector
);
Expand Down

0 comments on commit 2b3e532

Please sign in to comment.