Skip to content

fix: revert recursive remove -causing crashes #1819

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
vakrilov merged 2 commits into from
May 13, 2019
Merged

fix: revert recursive remove -causing crashes #1819

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a2653a
fix: revert recursie remove -causing crashes
May 13, 2019
fac8bf7
Merge branch 'master' into revert-recursive-remove
SvetoslavTsenov May 13, 2019
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 nativescript-angular/router/page-router-outlet.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ export class PageRouterOutlet implements OnDestroy { // tslint:disable-line:dire
// Component loaded. Find its root native view.
const componentView = componentRef.location.nativeElement;
// Remove it from original native parent.
this.viewUtil.removeChild(componentView.parent, componentView, false);
this.viewUtil.removeChild(componentView.parent, componentView);
// Add it to the new page
this.viewUtil.insertChild(page, componentView);

Expand Down
16 changes: 2 additions & 14 deletions nativescript-angular/view-util.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,10 +157,9 @@ export class ViewUtil {
return next;
}

public removeChild(parent: View, child: View, removeGrandchildren = true) {
public removeChild(parent: View, child: View) {
if (isLogEnabled()) {
traceLog(`ViewUtil.removeChild parent: ${parent} child: ${child} `
+ `remove grandchildren: ${removeGrandchildren}`);
traceLog(`ViewUtil.removeChild parent: ${parent} child: ${child}`);
}

if (!parent) {
Expand All @@ -170,17 +169,6 @@ export class ViewUtil {
const extendedParent = this.ensureNgViewExtensions(parent);
const extendedChild = this.ensureNgViewExtensions(child);

// Remove the child's children and their children
// Unless called from PageRouterOutlet when the child is moved from once parent to another.
while (extendedChild && extendedChild.firstChild && removeGrandchildren) {
const grandchild = extendedChild.firstChild;
if (isLogEnabled()) {
traceLog(`ViewUtil.removeChild parent: ${parent} child: ${extendedChild} grandchild: ${grandchild}`);
}

this.removeChild(extendedChild, grandchild);
}

this.removeFromQueue(extendedParent, extendedChild);
if (!isDetachedElement(extendedChild)) {
this.removeFromVisualTree(extendedParent, extendedChild);
Expand Down