javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-16 03:31:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2263 from NativeScript/nnikoilov/ListViewUsedInAModalDialogCrash

Browse Source 
Fixed crash when ListView is used in a modal dialog (Android).
This commit is contained in:
Nedyalko Nikolov
2016-06-08 18:43:08 +03:00
parent 22608011f2 98a9680bce
commit e46f30ac26
2 changed files with 42 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
tests/app/ui/list-view/list-view-tests.ts
View File

@ -558,6 +558,38 @@ export class ListViewTest extends testModule.UITest<listViewModule.ListView> {
}
}
public test_RemovingChildViewsBeforeListView() {
var listView = this.testView;
var converterCalledCounter = 0;
var testConverter = function (value) {
converterCalledCounter++;
return value;
}
app.resources["testConverter"] = testConverter;
var listViewModel = new observable.Observable();
listViewModel.set("items", [1, 2, 3]);
listView.bindingContext = listViewModel;
listView.bind({ sourceProperty: "items", targetProperty: "items" });
listView.itemTemplate = "<StackLayout><Label id=\"testLabel\" text=\"{{ $value, $value | testConverter }}\" /></StackLayout>";
this.waitUntilListViewReady();
if (platform.isAndroid) {
// simulates Angular way of removing views
(<any>listView)._realizedItems.forEach((view, nativeView, map) => {
console.log("view: " + view);
listView._removeView(view);
});
this.tearDown();
// should not crash
TKUnit.assertTrue(true);
}
}
public test_no_memory_leak_when_items_is_regular_array() {
let weakRef = new WeakRef<listViewModule.ListView>(this.testView);
weakRef.get().items = FEW_ITEMS;

16
tns-core-modules/ui/list-view/list-view.android.ts
View File

@ -108,7 +108,10 @@ export class ListView extends common.ListView {
callback(view);
}
else {
callback(view.parent);
// in some cases (like item is unloaded from another place (like angular) view.parent becomes undefined)
if (view.parent) {
callback(view.parent);
}
}
});
}
@ -124,12 +127,13 @@ export class ListView extends common.ListView {
private clearRealizedCells(): void {
// clear the cache
this._realizedItems.forEach((view, nativeView, map) => {
// This is to clear the StackLayout that is used to wrap non LayoutBase & ProxyViewContainer instances.
if (!(view.parent instanceof ListView)) {
this._removeView(view.parent);
if (view.parent) {
// This is to clear the StackLayout that is used to wrap non LayoutBase & ProxyViewContainer instances.
if (!(view.parent instanceof ListView)) {
this._removeView(view.parent);
}
view.parent._removeView(view);
}
view.parent._removeView(view);
});
this._realizedItems.clear();