Skip to content

fix: asynchronously destroy items evicted on clearHistory navigation #847

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 5 commits into from
Jul 12, 2017
Merged

fix: asynchronously destroy items evicted on clearHistory navigation #847

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b9f07ae
- queue items evicted to be destroyed on clearRefCache instead of des…
Jun 15, 2017
9e8cc7e
- fxied tslint errors
Jun 15, 2017
781e402
destroy the queued cache items on navigatedToEvent
Jul 1, 2017
b10578c
Merge remote-tracking branch 'upstream/master' into bugfix/nativescri…
Jul 1, 2017
2e7d27d
Merge remote-tracking branch 'upstream/master' into bugfix/nativescri…
Jul 12, 2017
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 nativescript-angular/router/page-router-outlet.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ export class PageRouterOutlet { // tslint:disable-line:directive-class-suffix
private refCache: RefCache = new RefCache();
private isInitialPage: boolean = true;
private detachedLoaderFactory: ComponentFactory<DetachedLoader>;
private itemsToDestroy: CacheItem[] = [];

private currentActivatedComp: ComponentRef<any>;
private currentActivatedRoute: ActivatedRoute;
Expand Down Expand Up @@ -132,7 +133,12 @@ export class PageRouterOutlet { // tslint:disable-line:directive-class-suffix

private clearRefCache() {
while (this.refCache.length > 0) {
this.destroyCacheItem(this.refCache.pop());
this.itemsToDestroy.push(this.refCache.pop());
}
}
private destroyQueuedCacheItems() {
while (this.itemsToDestroy.length > 0) {
this.destroyCacheItem(this.itemsToDestroy.pop());
}
}
private destroyCacheItem(poppedItem: CacheItem) {
Expand Down Expand Up @@ -242,7 +248,10 @@ export class PageRouterOutlet { // tslint:disable-line:directive-class-suffix
// Add it to the new page
page.content = componentView;

page.on("navigatedFrom", (<any>global).Zone.current.wrap((args: NavigatedData) => {
page.on(Page.navigatedToEvent, () => setTimeout(() => {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Heya, do we need the setTimeout here?

Copy link
Contributor Author

@buuhuu buuhuu Jul 12, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Technically we don't BUT what I want to achieve is to push the actual execution to the end of the event loop so when the view tree to destroy is huge the main thread has time to actually do other things before the clean up happens.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point.

this.destroyQueuedCacheItems();
}));
page.on(Page.navigatedFromEvent, (<any>global).Zone.current.wrap((args: NavigatedData) => {
if (args.isBackNavigation) {
this.locationStrategy._beginBackPageNavigation();
this.locationStrategy.back();
Expand Down