javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-22 13:32:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(virtualScroll): detect changes in individual nodes

Browse Source 
Closes #6137
This commit is contained in:
Adam Bradley
2016-06-08 21:52:45 -05:00
parent b5107cdaf1
commit f049521095
3 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/components/virtual-scroll/test/basic/index.ts
View File

@ -6,13 +6,18 @@ import {ionicBootstrap} from '../../../../../src';
templateUrl: 'main.html'
})
class E2EPage {
items = [];
items: any[] = [];
@ViewChild('content') content: ElementRef;
constructor() {
for (var i = 0; i < 200; i++) {
this.items.push(i);
this.items.push({
value: i,
someMethod: function() {
return `!!`
}
});
}
}

2
src/components/virtual-scroll/test/basic/main.html
View File

@ -18,7 +18,7 @@
</ion-item-divider>
<ion-item *virtualItem="let item">
Item: {{item}}
Item: {{item.value}} {{item.someMethod()}}
</ion-item>
</ion-list>

27
src/components/virtual-scroll/virtual-scroll.ts
View File

@ -436,7 +436,7 @@ export class VirtualScroll implements DoCheck, AfterContentInit, OnDestroy {
this._ftrTmp && this._ftrTmp.templateRef, true);
// ******** DOM WRITE ****************
this._cd.detectChanges();
this.detectChanges();
// wait a frame before trying to read and calculate the dimensions
nativeRaf(this.postRenderVirtual.bind(this));
@ -470,6 +470,20 @@ export class VirtualScroll implements DoCheck, AfterContentInit, OnDestroy {
);
}
/**
* @private
*/
detectChanges() {
let node: VirtualNode;
for (var i = 0; i < this._nodes.length; i++) {
node = this._nodes[i];
if (node.hasChanges) {
node.view['detectChanges']();
node.hasChanges = false;
}
}
}
/**
* @private
*/
@ -481,14 +495,7 @@ export class VirtualScroll implements DoCheck, AfterContentInit, OnDestroy {
if (this._queue === QUEUE_CHANGE_DETECTION) {
// ******** DOM WRITE ****************
let node: VirtualNode;
for (var i = 0; i < this._nodes.length; i++) {
node = this._nodes[i];
if (node.hasChanges) {
node.view['detectChanges']();
node.hasChanges = false;
}
}
this.detectChanges();
if (this._eventAssist) {
// queue updating node positions in the next frame
@ -573,7 +580,7 @@ export class VirtualScroll implements DoCheck, AfterContentInit, OnDestroy {
adjustRendered(this._cells, this._data);
// ******** DOM WRITE ****************
this._cd.detectChanges();
this.detectChanges();
// ******** DOM WRITE ****************
this.setVirtualHeight(