Commit 15034e8

author

Nedyalko Nikolov

committed

Fixed problem with ListView in ios when CustomTemplate is used.

1 parent 70767bb commit 15034e8Copy full SHA for 15034e8

File tree

2 files changed

+31

-20

lines changed

nativescript-angular/directives
- list-view-comp.ts
ng-sample/app/examples/list
- list-test.ts

2 files changed

+31

-20

lines changed

`‎nativescript-angular/directives/list-view-comp.ts‎`

Lines changed: 12 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,9 @@ import {`
`12`	`12`	`ChangeDetectorRef,`
`13`	`13`	`EventEmitter,`
`14`	`14`	`ViewChild,`
`15`		`- Output} from '@angular/core';`
	`15`	`+ Output,`
	`16`	`+ ChangeDetectionStrategy} from '@angular/core';`
	`17`	`+import {isBlank} from '@angular/core/src/facade/lang';`
`16`	`18`	`import {isListLikeIterable} from '@angular/core/src/facade/collection';`
`17`	`19`	`import {Observable as RxObservable} from 'rxjs'`
`18`	`20`	`import {ListView} from 'ui/list-view';`
`@@ -45,7 +47,8 @@ export interface SetupItemViewArgs {`
`45`	`47`	`<DetachedContainer>`
`46`	`48`	`<Placeholder #loader></Placeholder>`
`47`	`49`	</DetachedContainer>`,
`48`		`- inputs: ['items']`
	`50`	`+ inputs: ['items'],`
	`51`	`+ changeDetection: ChangeDetectionStrategy.OnPush`
`49`	`52`	`})`
`50`	`53`	`export class ListViewComponent {`
`51`	`54`	`public get nativeElement(): ListView {`
`@@ -97,6 +100,10 @@ export class ListViewComponent {`
`97`	`100`	`if (args.view) {`
`98`	`101`	`console.log("ListView.onItemLoading: " + index + " - Reusing existing view");`
`99`	`102`	`viewRef = args.view[NG_VIEW];`
	`103`	`+ // getting angular view from original element (in cases when ProxyViewContainer is used NativeScript internally wraps it in a StackLayout)`
	`104`	`+ if (!viewRef) {`
	`105`	`+ viewRef = (args.view._subViews && args.view._subViews.length > 0) ? args.view._subViews[0][NG_VIEW] : undefined;`
	`106`	`+ }`
`100`	`107`	`}`
`101`	`108`	`else {`
`102`	`109`	`console.log("ListView.onItemLoading: " + index + " - Creating view from template");`
`@@ -108,6 +115,9 @@ export class ListViewComponent {`
`108`	`115`	`}`
`109`	`116`
`110`	`117`	`public setupViewRef(viewRef: EmbeddedViewRef<ListItemContext>, data: any, index: number): void {`
	`118`	`+ if (isBlank(viewRef)) {`
	`119`	`+ return;`
	`120`	`+ }`
`111`	`121`	`const context = viewRef.context;`
`112`	`122`	`context.$implicit = data;`
`113`	`123`	`context.item = data;`

`‎ng-sample/app/examples/list/list-test.ts‎`

Lines changed: 19 additions & 18 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,35 +6,36 @@ class DataItem {`
`6`	`6`	`constructor(public id: number, public name: string) { }`
`7`	`7`	`}`
`8`	`8`
`9`		`-// @Component({`
`10`		`-// selector: 'item-component',`
`11`		-// template: `
`12`		`-// <StackLayout [class.odd]="odd" [class.even]="even">`
`13`		`-// <Label [text]='"id: " + data.id'></Label>`
`14`		`-// <Label [text]='"name: " + data.name'></Label>`
`15`		`-// </StackLayout>`
`16`		-// `
`17`		`-// })`
`18`		`-// export class ItemComponent {`
`19`		`-// @Input() data: DataItem;`
`20`		`-// @Input() odd: boolean;`
`21`		`-// @Input() even: boolean;`
`22`		`-// constructor() { }`
`23`		`-// }`
	`9`	`+@Component({`
	`10`	`+ selector: 'item-component',`
	`11`	+ template: `
	`12`	`+ <StackLayout [class.odd]="odd" [class.even]="even">`
	`13`	`+ <Label [text]='"id: " + data.id'></Label>`
	`14`	`+ <Label [text]='"name: " + data.name'></Label>`
	`15`	`+ </StackLayout>`
	`16`	+ `
	`17`	`+})`
	`18`	`+export class ItemComponent {`
	`19`	`+ @Input() data: DataItem;`
	`20`	`+ @Input() odd: boolean;`
	`21`	`+ @Input() even: boolean;`
	`22`	`+ constructor() { }`
	`23`	`+}`
`24`	`24`
`25`	`25`	`@Component({`
`26`	`26`	`selector: 'list-test',`
`27`		`- //directives: [ItemComponent],`
	`27`	`+ directives: [ItemComponent],`
`28`	`28`	template: `
`29`	`29`	`<GridLayout rows="auto, *, auto, auto">`
`30`	`30`	`<Label row="0" text="-==START==-" fontSize="20"></Label>`
`31`	`31`	`<GridLayout row="1">`
`32`	`32`	`<ListView [items]="myItems" (itemTap)="onItemTap($event)">`
`33`	`33`	`<template let-item="item" let-i="index" let-odd="odd" let-even="even">`
`34`		`- <StackLayout [class.odd]="odd" [class.even]="even">`
	`34`	`+ <!--<StackLayout [class.odd]="odd" [class.even]="even">`
`35`	`35`	`<Label [text]='"index: " + i'></Label>`
`36`	`36`	`<Label [text]='"[" + item.id +"] " + item.name'></Label>`
`37`		`- </StackLayout>`
	`37`	`+ </StackLayout>-->`
	`38`	`+ <item-component [data]="item" [odd]="odd" [even]="even"></item-component>`
`38`	`39`	`</template>`
`39`	`40`	`</ListView>`
`40`	`41`	`</GridLayout>`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit 15034e8

File tree

2 files changed

2 files changed

`‎nativescript-angular/directives/list-view-comp.ts‎`

`‎ng-sample/app/examples/list/list-test.ts‎`

0 commit comments