FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

fix(list-view): fix crash when used with ngFor by edusperoni · Pull Request #2121 · NativeScript/nativescript-angular · GitHub

/ nativescript-angular Public

fix(list-view): fix crash when used with ngFor #2121

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
NathanWalker merged 10 commits into from
Sep 4, 2020
Conversation 4 Commits 10 Checks 0 Files changed
Merged

fix(list-view): fix crash when used with ngFor #2121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
496c46d
fix(list-view): wrap ChangeDetection in ng zone
edusperoni Feb 12, 2020
a1caad5
fix(zone): patch AnimationFrame
edusperoni Feb 12, 2020
29c3e8c
fix(dialogs): wrap angular calls in ng zone
edusperoni Feb 12, 2020
308dd97
fix missing zone injection
edusperoni Feb 12, 2020
040d93d
Merge branch 'master' into zone-fixes
NathanWalker Jun 3, 2020
7d49a4d
chore: bump
NathanWalker Sep 3, 2020
9feea4b
chore: ng 10.1 and ns 7
NathanWalker Sep 3, 2020
7595d30
Merge branch 'feat/angular-10-1' of https://github.com/NativeScript/n…
edusperoni Sep 3, 2020
e7d3faf
chore: fix linting
edusperoni Sep 3, 2020
79ce7ce
Merge branch 'master' into zone-fixes
NathanWalker Sep 4, 2020
File filter

Filter by extension

Filter by extension .ts  (3) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
34 changes: 19 additions & 15 deletions nativescript-angular/directives/dialogs.ts
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ComponentFactoryResolver, ComponentRef, Injectable, Injector, NgModuleRef, Type, ViewContainerRef } from '@angular/core';
import { ComponentFactoryResolver, ComponentRef, Injectable, Injector, NgModuleRef, NgZone, Type, ViewContainerRef } from '@angular/core';
import { Frame, View, ViewBase, ProxyViewContainer, ShowModalOptions } from '@nativescript/core';

import { NSLocationStrategy } from '../router/ns-location-strategy';
Expand Down Expand Up @@ -32,7 +32,7 @@ export class ModalDialogParams {

@Injectable()
export class ModalDialogService {
constructor(private location: NSLocationStrategy) {}
constructor(private location: NSLocationStrategy, private zone: NgZone) {}

public showModal(type: Type<any>, options: ModalDialogOptions): Promise<any> {
if (!options.viewContainerRef) {
Expand Down Expand Up @@ -98,8 +98,10 @@ export class ModalDialogService {
if (componentView) {
componentView.closeModal();
this.location._closeModalNavigation();
detachedLoaderRef.instance.detectChanges();
detachedLoaderRef.destroy();
this.zone.run(() => {
detachedLoaderRef.instance.detectChanges();
detachedLoaderRef.destroy();
});
}
});

Expand All @@ -111,20 +113,22 @@ export class ModalDialogService {
});
const detachedFactory = options.resolver.resolveComponentFactory(DetachedLoader);
detachedLoaderRef = options.containerRef.createComponent(detachedFactory, 0, childInjector, null);
detachedLoaderRef.instance.loadComponent(options.type).then((compRef) => {
const detachedProxy = <ProxyViewContainer>compRef.location.nativeElement;
this.zone.run(() => {
detachedLoaderRef.instance.loadComponent(options.type).then((compRef) => {
const detachedProxy = <ProxyViewContainer>compRef.location.nativeElement;

if (detachedProxy.getChildrenCount() > 1) {
throw new Error('Modal content has more than one root view.');
}
componentView = detachedProxy.getChildAt(0);
if (detachedProxy.getChildrenCount() > 1) {
throw new Error('Modal content has more than one root view.');
}
componentView = detachedProxy.getChildAt(0);

if (componentView.parent) {
(<any>componentView.parent)._ngDialogRoot = componentView;
(<any>componentView.parent).removeChild(componentView);
}
if (componentView.parent) {
(<any>componentView.parent)._ngDialogRoot = componentView;
(<any>componentView.parent).removeChild(componentView);
}

options.parentView.showModal(componentView, { ...options, closeCallback });
options.parentView.showModal(componentView, { ...options, closeCallback });
});
});
}
}
6 changes: 3 additions & 3 deletions nativescript-angular/directives/list-view-comp.ts
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ChangeDetectionStrategy, Component, ElementRef, IterableDiffers, forwardRef } from '@angular/core';
import { ChangeDetectionStrategy, Component, ElementRef, IterableDiffers, forwardRef, NgZone } from '@angular/core';
import { ListView } from '@nativescript/core';
import { TEMPLATED_ITEMS_COMPONENT, TemplatedItemsComponent } from './templated-items-comp';

Expand All @@ -17,7 +17,7 @@ export class ListViewComponent extends TemplatedItemsComponent {

protected templatedItemsView: ListView;

constructor(_elementRef: ElementRef, _iterableDiffers: IterableDiffers) {
super(_elementRef, _iterableDiffers);
constructor(_elementRef: ElementRef, _iterableDiffers: IterableDiffers, zone: NgZone) {
super(_elementRef, _iterableDiffers, zone);
}
}
10 changes: 6 additions & 4 deletions nativescript-angular/directives/templated-items-comp.ts
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { AfterContentInit, ContentChild, Directive, DoCheck, ElementRef, EmbeddedViewRef, EventEmitter, Host, Inject, InjectionToken, Input, IterableDiffer, IterableDiffers, OnDestroy, Output, TemplateRef, ViewChild, ViewContainerRef, ɵisListLikeIterable as isListLikeIterable, Injectable } from '@angular/core';
import { AfterContentInit, ContentChild, Directive, DoCheck, ElementRef, EmbeddedViewRef, EventEmitter, Host, Inject, InjectionToken, Input, IterableDiffer, IterableDiffers, OnDestroy, Output, TemplateRef, ViewChild, ViewContainerRef, ɵisListLikeIterable as isListLikeIterable, Injectable, NgZone } from '@angular/core';
import { ObservableArray, View, KeyedTemplate, LayoutBase, ItemEventData, TemplatedItemsView, profile } from '@nativescript/core';

import { getSingleViewRecursive } from '../element-registry';
Expand Down Expand Up @@ -54,7 +54,7 @@ export abstract class TemplatedItemsComponent implements DoCheck, OnDestroy, Aft
this.templatedItemsView.items = this._items;
}

constructor(_elementRef: ElementRef, private _iterableDiffers: IterableDiffers) {
constructor(_elementRef: ElementRef, private _iterableDiffers: IterableDiffers, private zone: NgZone) {
this.templatedItemsView = _elementRef.nativeElement;

this.templatedItemsView.on('itemLoading', this.onItemLoading, this);
Expand Down Expand Up @@ -188,8 +188,10 @@ export abstract class TemplatedItemsComponent implements DoCheck, OnDestroy, Aft
NativeScriptDebug.listViewLog(`Manually detect changes in child: ${index}`);
}

viewRef.markForCheck();
viewRef.detectChanges();
this.zone.run(() => {
viewRef.markForCheck();
viewRef.detectChanges();
});
}

ngDoCheck() {
Expand Down
Back | FazBrowse Home | New Git URL