From b0cff2045015b0e8d951bdd87d7bfc69e6bdcccf Mon Sep 17 00:00:00 2001
From: Hristo Hristov <hristo.hristov@telerik.com>
Date: Wed, 25 May 2016 14:03:45 +0300
Subject: [PATCH] Manually applying CSS in removed and now it is done once per
 cell. (#2174)

* Manually applying CSS in removed and now it is done once per cell.
Clearing bindingContext is now done in refresh method instead of preparing cell.
Obsolete isScrolling property on ListView.
Removed android scroll listener.
Added test for nulling cells bindingContext.
Uncommented few tests and made them work.
Fixed android ListView eachChildView to return the wrapping StackLayout so that Unloading now works as expected.
onUnload method in view-common now raise unloaded only if item isLoaded=true.

* Fix navigation path
---
 apps/tests/ui/list-view/list-view-tests.ts | 231 ++++++++++++---------
 ui/core/view-common.ts                     |  11 +-
 ui/list-view/list-view-common.ts           |  15 +-
 ui/list-view/list-view.android.ts          | 143 +++++--------
 ui/list-view/list-view.d.ts                |   2 +
 ui/list-view/list-view.ios.ts              |  43 ++--
 6 files changed, 220 insertions(+), 225 deletions(-)

diff --git a/apps/tests/ui/list-view/list-view-tests.ts b/apps/tests/ui/list-view/list-view-tests.ts
index 01cc0f642..30de210a6 100644
--- a/apps/tests/ui/list-view/list-view-tests.ts
+++ b/apps/tests/ui/list-view/list-view-tests.ts
@@ -6,6 +6,7 @@ import types = require("utils/types");
 import platform = require("platform");
 import utils = require("utils/utils");
 import { Label } from "ui/label";
+import {topmost} from "ui/frame";
 
 // >> article-require-listview-module
 import listViewModule = require("ui/list-view");
@@ -18,17 +19,17 @@ import labelModule = require("ui/label");
 
 // >> article-item-tap
 function listViewItemTap(args) {
-  var itemIndex = args.index;
-  // >> (hide)
-  console.dump(itemIndex);
-  // << (hide)
+    var itemIndex = args.index;
+    // >> (hide)
+    console.dump(itemIndex);
+    // << (hide)
 }
 exports.listViewItemTap = listViewItemTap;
 // << article-item-tap
 
 // >> article-load-items
 function listViewLoadMoreItems(args) {
-  // Expand your collection bound to the ListView with more items here!
+    // Expand your collection bound to the ListView with more items here!
 }
 // << article-load-items
 listViewLoadMoreItems("test");
@@ -37,7 +38,6 @@ listViewLoadMoreItems("test");
 // }
 // exports.loaded = loaded;
 
-var ASYNC = 0.2;
 var FEW_ITEMS = [0, 1, 2];
 var MANY_ITEMS = new Array<number>(100);
 for (var i = 0; i < 100; i++) {
@@ -111,8 +111,7 @@ export class ListViewTest extends testModule.UITest<listViewModule.ListView> {
                 indexes[args.index] = args.android;
             }
         });
-
-        TKUnit.waitUntilReady(() => { return this.getNativeViewCount(listView) === listView.items.length; }, ASYNC);
+        this.waitUntilListViewReady();
 
         for (var item in indexes) {
             if (platform.device.os === platform.platformNames.ios) {
@@ -129,8 +128,7 @@ export class ListViewTest extends testModule.UITest<listViewModule.ListView> {
 
             let colors = ["red", "green", "blue"];
             listView.items = colors;
-
-            TKUnit.waitUntilReady(() => { return this.getNativeViewCount(listView) === listView.items.length; }, ASYNC);
+            this.waitUntilListViewReady();
 
             var index = 1;
             this.performNativeItemTap(listView, index);
@@ -147,8 +145,7 @@ export class ListViewTest extends testModule.UITest<listViewModule.ListView> {
         var listView = this.testView;
         listView.on(listViewModule.ListView.itemLoadingEvent, this.loadViewWithItemNumber);
         listView.items = FEW_ITEMS;
-
-        TKUnit.waitUntilReady(() => { return this.getNativeViewCount(listView) === listView.items.length; }, ASYNC);
+        this.waitUntilListViewReady();
         TKUnit.assertEqual(this.getNativeViewCount(listView), FEW_ITEMS.length, "Native views count.");
     }
 
@@ -159,7 +156,7 @@ export class ListViewTest extends testModule.UITest<listViewModule.ListView> {
 
         var colors = ["red", "green", "blue"];
         listView.items = colors;
-        TKUnit.waitUntilReady(() => { return this.getNativeViewCount(listView) === listView.items.length; }, ASYNC);
+        this.waitUntilListViewReady();
         TKUnit.assertEqual(this.getNativeViewCount(listView), colors.length, "Native views count.");
 
         // >> article-change-refresh-listview
@@ -167,7 +164,7 @@ export class ListViewTest extends testModule.UITest<listViewModule.ListView> {
         // Manually trigger the update so that the new color is shown.
         listView.refresh();
         // << article-change-refresh-listview
-        TKUnit.waitUntilReady(() => { return this.getNativeViewCount(listView) === listView.items.length; }, ASYNC);
+        this.waitUntilListViewReady();
         TKUnit.assertEqual(this.getNativeViewCount(listView), colors.length, "Native views count.");
     }
 
@@ -189,7 +186,7 @@ export class ListViewTest extends testModule.UITest<listViewModule.ListView> {
         // iOS7 needs to know the size of the cell before it is generated so we first measure them using fake cell
         // then we generate the real cells. This cause itemLoading to be called twice per index.
         let expected = (platform.device.os === platform.platformNames.ios && utils.ios.MajorVersion === 7) ? 2 : 1;
-        TKUnit.waitUntilReady(() => { return completed; }, ASYNC);
+        TKUnit.waitUntilReady(() => completed);
         TKUnit.assertEqual(indexes[0], expected, "itemLoading called more than once");
         TKUnit.assertEqual(indexes[1], expected, "itemLoading called more than once");
         TKUnit.assertEqual(indexes[2], expected, "itemLoading called more than once");
@@ -199,7 +196,7 @@ export class ListViewTest extends testModule.UITest<listViewModule.ListView> {
 
         // again calling refresh will generate itemLoading twice per item.
         expected += expected;
-        TKUnit.waitUntilReady(() => { return completed; }, ASYNC);
+        TKUnit.waitUntilReady(() => completed);
         TKUnit.assertEqual(indexes[0], expected, "itemLoading not called for index 0");
         TKUnit.assertEqual(indexes[1], expected, "itemLoading not called for index 1");
         TKUnit.assertEqual(indexes[2], expected, "itemLoading not called for index 2");
@@ -210,11 +207,11 @@ export class ListViewTest extends testModule.UITest<listViewModule.ListView> {
         listView.on(listViewModule.ListView.itemLoadingEvent, this.loadViewWithItemNumber);
 
         listView.items = FEW_ITEMS;
-        TKUnit.waitUntilReady(() => { return this.getNativeViewCount(listView) === listView.items.length; }, ASYNC);
+        this.waitUntilListViewReady();
         TKUnit.assertEqual(this.getNativeViewCount(listView), FEW_ITEMS.length, "Native views count.");
 
         listView.items = null;
-        TKUnit.waitUntilReady(() => { return this.getNativeViewCount(listView) === 0; }, ASYNC);
+        TKUnit.waitUntilReady(() => this.getNativeViewCount(listView) === 0);
         TKUnit.assertEqual(this.getNativeViewCount(listView), 0, "Native views count.");
     }
 
@@ -223,11 +220,11 @@ export class ListViewTest extends testModule.UITest<listViewModule.ListView> {
         listView.on(listViewModule.ListView.itemLoadingEvent, this.loadViewWithItemNumber);
 
         listView.items = FEW_ITEMS;
-        TKUnit.waitUntilReady(() => { return this.getNativeViewCount(listView) === listView.items.length; }, ASYNC);
+        this.waitUntilListViewReady();
         TKUnit.assertEqual(this.getNativeViewCount(listView), FEW_ITEMS.length, "Native views count.");
 
         listView.items = undefined;
-        TKUnit.waitUntilReady(() => { return this.getNativeViewCount(listView) === 0; }, ASYNC);
+        TKUnit.waitUntilReady(() => this.getNativeViewCount(listView) === 0);
         TKUnit.assertEqual(this.getNativeViewCount(listView), 0, "Native views count.");
     }
 
@@ -236,11 +233,11 @@ export class ListViewTest extends testModule.UITest<listViewModule.ListView> {
         listView.on(listViewModule.ListView.itemLoadingEvent, this.loadViewWithItemNumber);
 
         listView.items = [1, 2, 3];
-        TKUnit.waitUntilReady(() => { return this.getNativeViewCount(listView) === listView.items.length; }, ASYNC);
+        this.waitUntilListViewReady();
         TKUnit.assertEqual(this.getNativeViewCount(listView), 3, "Native views count.");
 
         listView.items = ["a", "b", "c", "d"];
-        TKUnit.waitUntilReady(() => { return this.getNativeViewCount(listView) === listView.items.length; }, ASYNC);
+        this.waitUntilListViewReady();
         TKUnit.assertEqual(this.getNativeViewCount(listView), 4, "Native views count.");
     }
 
@@ -262,7 +259,7 @@ export class ListViewTest extends testModule.UITest<listViewModule.ListView> {
         });
         // << article-listview-observablearray
 
-        TKUnit.waitUntilReady(() => { return this.getNativeViewCount(listView) === listView.items.length; }, ASYNC);
+        this.waitUntilListViewReady();
         TKUnit.assert(indexes[0], "itemLoading not called for index 0");
         TKUnit.assert(indexes[1], "itemLoading not called for index 1");
         TKUnit.assert(indexes[2], "itemLoading not called for index 2");
@@ -275,14 +272,14 @@ export class ListViewTest extends testModule.UITest<listViewModule.ListView> {
         var colors = new observableArray.ObservableArray(["red", "green", "blue"]);
         listView.items = colors;
 
-        TKUnit.waitUntilReady(() => { return this.getNativeViewCount(listView) === listView.items.length; }, ASYNC);
+        this.waitUntilListViewReady();
         TKUnit.assertEqual(this.getNativeViewCount(listView), 3, "getNativeViewCount");
 
         // >> article-push-in-observablearray
         colors.push("yellow");
         // The ListView will be updated automatically.
         // << article-push-in-observablearray
-        TKUnit.waitUntilReady(() => { return this.getNativeViewCount(listView) === listView.items.length; }, ASYNC);
+        this.waitUntilListViewReady();
         TKUnit.assertEqual(this.getNativeViewCount(listView), 4, "getNativeViewCount");
     }
 
@@ -293,11 +290,11 @@ export class ListViewTest extends testModule.UITest<listViewModule.ListView> {
         listView.items = data;
         listView.on(listViewModule.ListView.itemLoadingEvent, this.loadViewWithItemNumber);
 
-        TKUnit.waitUntilReady(() => { return this.getNativeViewCount(listView) === listView.items.length; }, ASYNC);
+        this.waitUntilListViewReady();
         TKUnit.assertEqual(this.getNativeViewCount(listView), 3, "getNativeViewCount");
 
         data.pop();
-        TKUnit.waitUntilReady(() => { return this.getNativeViewCount(listView) === listView.items.length; }, ASYNC);
+        this.waitUntilListViewReady();
         TKUnit.assertEqual(this.getNativeViewCount(listView), 2, "getNativeViewCount");
     }
 
@@ -308,12 +305,12 @@ export class ListViewTest extends testModule.UITest<listViewModule.ListView> {
         listView.items = data;
         listView.on(listViewModule.ListView.itemLoadingEvent, this.loadViewWithItemNumber);
 
-        TKUnit.waitUntilReady(() => { return this.getNativeViewCount(listView) === listView.items.length; }, ASYNC);
+        this.waitUntilListViewReady();
         TKUnit.assertEqual(this.getNativeViewCount(listView), 3, "getNativeViewCount");
 
         // Remove the first 2 elements and add 
         data.splice(0, 2, "d", "e", "f");
-        TKUnit.waitUntilReady(() => { return this.getNativeViewCount(listView) === listView.items.length; }, ASYNC);
+        this.waitUntilListViewReady();
         TKUnit.assertEqual(this.getNativeViewCount(listView), 4, "getNativeViewCount");
     }
 
@@ -337,7 +334,7 @@ export class ListViewTest extends testModule.UITest<listViewModule.ListView> {
         });
         // << article-itemtap-event
         /* tslint:enable:no-unused-variable */
-        TKUnit.waitUntilReady(() => { return this.getNativeViewCount(listView) === listView.items.length; }, ASYNC);
+        this.waitUntilListViewReady();
         this.performNativeItemTap(listView, 1);
 
         TKUnit.assert(nativeTapRaised, "itemTap not raised.");
@@ -359,7 +356,7 @@ export class ListViewTest extends testModule.UITest<listViewModule.ListView> {
         });
         // ```
         // << article-loadmoreitems-event
-        TKUnit.waitUntilReady(() => { return this.getNativeViewCount(listView) === listView.items.length; }, ASYNC);
+        this.waitUntilListViewReady();
         TKUnit.assertEqual(loadMoreItemsCount, 1, "loadMoreItemsCount");
     }
 
@@ -378,7 +375,7 @@ export class ListViewTest extends testModule.UITest<listViewModule.ListView> {
             this.waitUntilTestElementLayoutIsValid();
         }
         else {
-            TKUnit.wait(ASYNC);
+            TKUnit.wait(0.2);
         }
 
         TKUnit.assertEqual(loadMoreItemsCount, 0, "loadMoreItemsCount");
@@ -401,7 +398,7 @@ export class ListViewTest extends testModule.UITest<listViewModule.ListView> {
             this.waitUntilTestElementLayoutIsValid();
         }
         else {
-            TKUnit.wait(ASYNC);
+            TKUnit.wait(0.2);
         }
 
         TKUnit.assert(loadMoreItemsCount > 0, "loadMoreItemsCount");
@@ -428,7 +425,7 @@ export class ListViewTest extends testModule.UITest<listViewModule.ListView> {
         listView.itemTemplate = "<Label id=\"testLabel\" text=\"{{ date, date | dateConverter('DD.MM.YYYY') }}\" />";
         listView.items = data;
 
-        TKUnit.waitUntilReady(() => { return this.getNativeViewCount(listView) === listView.items.length; }, ASYNC);
+        this.waitUntilListViewReady();
         var nativeElementText = this.getTextFromNativeElementAt(listView, 0);
 
         TKUnit.assertEqual(nativeElementText, "07.03.2020", "native element text");
@@ -440,8 +437,7 @@ export class ListViewTest extends testModule.UITest<listViewModule.ListView> {
         listView.itemTemplate = "<Label id=\"testLabel\" text=\"{{ $value }}\" />";
         listView.items = [1, 2, 3];
 
-        TKUnit.waitUntilReady(() => { return this.getNativeViewCount(listView) === listView.items.length; }, ASYNC);
-
+        this.waitUntilListViewReady();
         var firstNativeElementText = this.getTextFromNativeElementAt(listView, 0);
         var secondNativeElementText = this.getTextFromNativeElementAt(listView, 1);
         var thirdNativeElementText = this.getTextFromNativeElementAt(listView, 2);
@@ -462,7 +458,7 @@ export class ListViewTest extends testModule.UITest<listViewModule.ListView> {
         }
         listView.items = [1, 2, 3];
 
-        TKUnit.waitUntilReady(() => { return this.getNativeViewCount(listView) === listView.items.length; }, ASYNC);
+        this.waitUntilListViewReady();
 
         var firstNativeElementText = this.getTextFromNativeElementAt(listView, 0);
         var secondNativeElementText = this.getTextFromNativeElementAt(listView, 1);
@@ -479,7 +475,7 @@ export class ListViewTest extends testModule.UITest<listViewModule.ListView> {
         listView.itemTemplate = "<Label id=\"testLabel\" text=\"{{ $value, $value + ' some static text' }}\" />";
         listView.items = [1, 2, 3];
 
-        TKUnit.waitUntilReady(() => { return this.getNativeViewCount(listView) === listView.items.length; }, ASYNC);
+        this.waitUntilListViewReady();
 
         var firstNativeElementText = this.getTextFromNativeElementAt(listView, 0);
         var secondNativeElementText = this.getTextFromNativeElementAt(listView, 1);
@@ -501,7 +497,7 @@ export class ListViewTest extends testModule.UITest<listViewModule.ListView> {
         listView.bind({ sourceProperty: "items", targetProperty: "items" });
         listView.itemTemplate = "<Label id=\"testLabel\" text=\"{{ $parents[ListView].parentTestProp }}\" />";
 
-        TKUnit.waitUntilReady(() => { return this.getNativeViewCount(listView) === listView.items.length; }, ASYNC);
+        this.waitUntilListViewReady();
 
         var firstNativeElementText = this.getTextFromNativeElementAt(listView, 0);
         var secondNativeElementText = this.getTextFromNativeElementAt(listView, 1);
@@ -523,7 +519,7 @@ export class ListViewTest extends testModule.UITest<listViewModule.ListView> {
         listView.bind({ sourceProperty: "items", targetProperty: "items" });
         listView.itemTemplate = "<Label id=\"testLabel\" text=\"{{ $parents[ ListView ].parentTestProp }}\" />";
 
-        TKUnit.waitUntilReady(() => { return this.getNativeViewCount(listView) === listView.items.length; }, ASYNC);
+        this.waitUntilListViewReady();
         var firstNativeElementText = this.getTextFromNativeElementAt(listView, 0);
         var secondNativeElementText = this.getTextFromNativeElementAt(listView, 1);
         var thirdNativeElementText = this.getTextFromNativeElementAt(listView, 2);
@@ -551,7 +547,7 @@ export class ListViewTest extends testModule.UITest<listViewModule.ListView> {
         listView.bind({ sourceProperty: "items", targetProperty: "items" });
         listView.itemTemplate = "<Label id=\"testLabel\" text=\"{{ $value, $value | testConverter }}\" />";
 
-        TKUnit.waitUntilReady(() => { return this.getNativeViewCount(listView) === listView.items.length; }, ASYNC);
+        this.waitUntilListViewReady();
 
         if (utils.ios && utils.ios.MajorVersion < 8) {
             TKUnit.assertEqual(converterCalledCounter, listViewModel.get("items").length * 2, "Converter should be called once for every item.");
@@ -580,31 +576,93 @@ export class ListViewTest extends testModule.UITest<listViewModule.ListView> {
         this.assertNoMemoryLeak(weakRef);
     }
 
-    //private test_view_in_itemLoading_is_not_collected_prematurely() {
-        //let weakRef: WeakRef<labelModule.Label>;
+    public test_call_refresh_when_items_is_simple_array_is_respcted_in_the_UI() {
+        let source = [{ text: "0" }, { text: "1" }, { text: "2" }];
+        let listView = this.testView;
+        listView.itemTemplate = "<Label text='{{ text }}' />";
+        listView.items = source;
+        this.waitUntilListViewReady();
 
-        //let handler = function (args: listViewModule.ItemEventData) {
-            //let lbl = new labelModule.Label();
-            //lbl.text = args.index.toString();
-            //weakRef = new WeakRef(lbl);
-            //args.view = lbl;
-            //let listView: listViewModule.ListView = <listViewModule.ListView>args.object;
-            //listView.off("itemLoading", handler);
-        //};
+        TKUnit.assertEqual(this.getTextFromNativeElementAt(listView, 0), "0", "first text");
+        TKUnit.assertEqual(this.getTextFromNativeElementAt(listView, 1), "1", "second text");
+        TKUnit.assertEqual(this.getTextFromNativeElementAt(listView, 2), "2", "third text");
 
-        //this.testView.on("itemLoading", handler);
-        //this.testView.items = [1];
-        //TKUnit.waitUntilReady(() => { return this.getNativeViewCount(this.testView) === this.testView.items.length; }, ASYNC);
+        source[0].text = "4";
+        source[1] = { text: "5" };
+        listView.refresh();
 
-        //if (platform.device.os === platform.platformNames.ios) {
-            // Could cause GC on the next call.
-            // NOTE: Don't replace this with forceGC();
-            //new ArrayBuffer(4 * 1024 * 1024);
-        //}
-        //utils.GC();
+        TKUnit.waitUntilReady(() => this.getTextFromNativeElementAt(listView, 1) === "5");
 
-        //TKUnit.assert(weakRef.get(), weakRef.get() + " died prematurely!");
-    //}
+        TKUnit.assertEqual(this.getTextFromNativeElementAt(listView, 0), "4", "first text after refresh");
+        TKUnit.assertEqual(this.getTextFromNativeElementAt(listView, 1), "5", "second text after refresh");
+        TKUnit.assertEqual(this.getTextFromNativeElementAt(listView, 2), "2", "third text after refresh");
+    }
+
+    public test_LoadedUnloaded() {
+        let listView = this.testView;
+        let count = 10;
+        let modifier = listView.ios ? 1 : 0; // iOS has one fake measure cell that raises loaded.
+
+        let items = new observableArray.ObservableArray<Item>();
+        for (let i = 0; i < count; i++) {
+            items.push({
+                text: "Item " + i,
+                loadedCount: 0,
+                unloadedCount: 0,
+                onViewLoaded: function onViewLoaded(args) {
+                    this.loadedCount++;
+                },
+                onViewUnloaded: function onViewUnloaded(args) {
+                    this.unloadedCount++;
+                }
+            });
+        }
+
+        listView.itemTemplate = "<Label text='{{ text }}' loaded='{{ onViewLoaded }}' unloaded='{{ onViewUnloaded }}'/>";
+        listView.items = items;
+        this.waitUntilListViewReady();
+
+        let currentPage = listView.page;
+        let frame = topmost();
+        frame.navigate("pages/navigation/pageB");
+        TKUnit.waitUntilReady(() => frame.currentPage !== null && frame.currentPage !== currentPage);
+        frame.goBack();
+        TKUnit.waitUntilReady(() => frame.currentPage !== null && frame.currentPage === currentPage);
+
+        for (let i = 0; i < count; i++) {
+            TKUnit.assertEqual(items.getItem(i).loadedCount, 1 + modifier, "Loaded Count");
+            TKUnit.assertEqual(items.getItem(i).unloadedCount, 1, "Unloaded Count");
+        }
+    }
+
+    public test_view_in_itemLoading_is_not_collected_prematurely() {
+        let weakRef: WeakRef<Label>;
+
+        let handler = function (args: listViewModule.ItemEventData) {
+            let lbl = new Label();
+            lbl.text = args.index.toString();
+            weakRef = new WeakRef(lbl);
+            args.view = lbl;
+            let listView: listViewModule.ListView = <listViewModule.ListView>args.object;
+            listView.off("itemLoading", handler);
+        };
+
+        this.testView.on("itemLoading", handler);
+        this.testView.items = [1];
+        this.waitUntilListViewReady();
+
+        if (platform.device.os === platform.platformNames.ios) {
+            //Could cause GC on the next call.
+            //    NOTE: Don't replace this with forceGC();
+            let array = new ArrayBuffer(4 * 1024 * 1024);
+            if (!array) {
+                ///
+            };
+        }
+
+        utils.GC();
+        TKUnit.assert(weakRef.get(), weakRef.get() + " died prematurely!");
+    }
 
     private assertNoMemoryLeak(weakRef: WeakRef<listViewModule.ListView>) {
         this.tearDown();
@@ -677,46 +735,17 @@ export class ListViewTest extends testModule.UITest<listViewModule.ListView> {
         }
     }
 
-    //public test_LoadedUnloaded() {
-    //    var listView = this.testView;
-    //    var vm = {
-    //        loadedCount: 0,
-    //        unloadedCount: 0,
-    //        onViewLoaded: function onViewLoaded(args) {
-    //            this.loadedCount++;
-    //            console.log(args.object._domId + " LOADED");
-    //        },
-    //        onViewUnloaded: function onViewUnloaded(args) {
-    //            this.unloadedCount++;
-    //            console.log(args.object._domId + " UNLOADED");
-    //        }
-    //    };
-    //    listView.itemTemplate = "<Label text=\"{{ $value }}\" loaded=\"{{ onViewLoaded }}\" unloaded=\"{{ onViewUnloaded }}\"/>";
-    //    listView.bindingContext = vm;
-
-    //    var count = 10;
-    //    var modifier = listView.ios ? 1 : 0; // iOS has one fake measure cell that raises loaded.
-    //    var generate = function (count: number): observableArray.ObservableArray<string>  {
-    //        var items = new observableArray.ObservableArray<string>();
-    //        for (var i = 0; i < count; i++) {
-    //            items.push("Item " + i);
-    //        }
-    //        return items;
-    //    }
-
-    //    function testAction(views: Array<viewModule.View>) {
-    //        listView.items = generate(count);
-    //        TKUnit.wait(ASYNC);
-    //        frame.topmost().navigate("pages/navigation/pageB");
-    //        TKUnit.wait(ASYNC);
-    //        frame.topmost().goBack();
-    //        TKUnit.assertEqual(vm.loadedCount, count + modifier, "Loaded Count");
-    //        TKUnit.assertEqual(vm.unloadedCount, count, "Unloaded Count");
-    //    }
-
-    //    helper.buildUIAndRunTest(listView, testAction);
-    //}
+    private waitUntilListViewReady(): void {
+        TKUnit.waitUntilReady(() => this.getNativeViewCount(this.testView) === this.testView.items.length);
+    }
+}
 
+interface Item {
+    text: string;
+    loadedCount: number;
+    unloadedCount: number;
+    onViewLoaded: (args) => void;
+    onViewUnloaded: (args) => void;
 }
 
 export function createTestCase(): ListViewTest {
diff --git a/ui/core/view-common.ts b/ui/core/view-common.ts
index c76a1a6cb..73a253269 100644
--- a/ui/core/view-common.ts
+++ b/ui/core/view-common.ts
@@ -571,12 +571,13 @@ export class View extends ProxyObject implements definition.View {
 
     public _unloadEachChildView() {
         if (this._childrenCount > 0) {
-            // iterate all children and call onLoaded on them first
-            var eachChild = function (child: View): boolean {
-                child.onUnloaded();
+            this._eachChildView((child) => {
+                if (child.isLoaded) {
+                    child.onUnloaded();
+                }
+
                 return true;
-            }
-            this._eachChildView(eachChild);
+            });
         }
     }
 
diff --git a/ui/list-view/list-view-common.ts b/ui/list-view/list-view-common.ts
index 8a370473e..7bc7473c8 100644
--- a/ui/list-view/list-view-common.ts
+++ b/ui/list-view/list-view-common.ts
@@ -127,10 +127,10 @@ export class ListView extends view.View implements definition.ListView {
     }
 
     get isScrolling(): boolean {
-        return this._getValue(ListView.isScrollingProperty);
+        return false;
     }
     set isScrolling(value: boolean) {
-        this._setValue(ListView.isScrollingProperty, value);
+        // Do nothing.
     }
 
     get separatorColor(): color.Color {
@@ -169,12 +169,7 @@ export class ListView extends view.View implements definition.ListView {
 
     public _prepareItem(item: view.View, index: number) {
         if (item) {
-            var dataItem = this._getDataItem(index);
-            if (!(dataItem instanceof observable.Observable)) {
-                item.bindingContext = null;
-            }
-            item.bindingContext = dataItem;
-            item._inheritProperties(this);
+            item.bindingContext = this._getDataItem(index);
         }
     }
 
@@ -215,8 +210,4 @@ export class ListView extends view.View implements definition.ListView {
     public _onRowHeightPropertyChanged(data: dependencyObservable.PropertyChangeData) {
         this.refresh();
     }
-
-    public _propagateInheritableProperties(view: view.View) {
-        // do not get binding context from parent when adding items, since the binding context of the items will be different.
-    }
 }
\ No newline at end of file
diff --git a/ui/list-view/list-view.android.ts b/ui/list-view/list-view.android.ts
index 7c9d85e55..1fba3d273 100644
--- a/ui/list-view/list-view.android.ts
+++ b/ui/list-view/list-view.android.ts
@@ -5,27 +5,25 @@ import stackLayout = require("ui/layouts/stack-layout");
 import proxy = require("ui/core/proxy");
 import dependencyObservable = require("ui/core/dependency-observable");
 import definition = require("ui/list-view");
-import utils = require("utils/utils")
 import {ProxyViewContainer} from "ui/proxy-view-container";
 import * as layoutBase from "ui/layouts/layout-base";
 import * as colorModule from "color";
 
-var color: typeof colorModule;
+let color: typeof colorModule;
 function ensureColor() {
     if (!color) {
         color = require("color");
     }
 }
 
-var ITEMLOADING = common.ListView.itemLoadingEvent;
-var LOADMOREITEMS = common.ListView.loadMoreItemsEvent;
-var ITEMTAP = common.ListView.itemTapEvent;
-var REALIZED_INDEX = "realizedIndex";
+let ITEMLOADING = common.ListView.itemLoadingEvent;
+let LOADMOREITEMS = common.ListView.loadMoreItemsEvent;
+let ITEMTAP = common.ListView.itemTapEvent;
 
 global.moduleMerge(common, exports);
 
 function onSeparatorColorPropertyChanged(data: dependencyObservable.PropertyChangeData) {
-    var bar = <ListView>data.object;
+    let bar = <ListView>data.object;
     if (!bar.android) {
         return;
     }
@@ -42,9 +40,9 @@ function onSeparatorColorPropertyChanged(data: dependencyObservable.PropertyChan
 (<proxy.PropertyMetadata>common.ListView.separatorColorProperty.metadata).onSetNativeValue = onSeparatorColorPropertyChanged;
 
 export class ListView extends common.ListView {
-    private _android: android.widget.ListView;
-    public _realizedItems = {};
     private _androidViewId: number = -1;
+    private _android: android.widget.ListView;
+    public _realizedItems = new Map<android.view.View, viewModule.View>();
 
     public _createUI() {
         this._android = new android.widget.ListView(this._context);
@@ -59,42 +57,10 @@ export class ListView extends common.ListView {
         ensureListViewAdapterClass();
         this.android.setAdapter(new ListViewAdapterClass(this));
 
-        var that = new WeakRef(this);
-
-        // TODO: This causes many marshalling calls, rewrite in Java and generate bindings
-        this.android.setOnScrollListener(new android.widget.AbsListView.OnScrollListener(<utils.Owned & android.widget.AbsListView.IOnScrollListener>{
-            onScrollStateChanged: function (view: android.widget.AbsListView, scrollState: number) {
-                var owner: ListView = this.owner;
-                if (!owner) {
-                    return;
-                }
-
-                if (scrollState === android.widget.AbsListView.OnScrollListener.SCROLL_STATE_IDLE) {
-                    owner._setValue(common.ListView.isScrollingProperty, false);
-                    owner._notifyScrollIdle();
-                } else {
-                    owner._setValue(common.ListView.isScrollingProperty, true);
-                }
-            },
-            onScroll: function (view: android.widget.AbsListView, firstVisibleItem: number, visibleItemCount: number, totalItemCount: number) {
-                var owner: ListView = this.owner;
-                if (!owner) {
-                    return;
-                }
-
-                if (totalItemCount > 0 && firstVisibleItem + visibleItemCount === totalItemCount) {
-                    owner.notify(<observable.EventData>{ eventName: LOADMOREITEMS, object: owner });
-                }
-            },
-
-            get owner() {
-                return that.get();
-            }
-        }));
-
+        let that = new WeakRef(this);
         this.android.setOnItemClickListener(new android.widget.AdapterView.OnItemClickListener({
             onItemClick: function (parent: any, convertView: android.view.View, index: number, id: number) {
-                var owner = that.get();
+                let owner = that.get();
                 if (owner) {
                     owner.notify({ eventName: ITEMTAP, object: owner, index: index, view: owner._getRealizedView(convertView, index) });
                 }
@@ -111,6 +77,13 @@ export class ListView extends common.ListView {
             return;
         }
 
+        // clear bindingContext when it is not observable because otherwise bindings to items won't reevaluate
+        this._realizedItems.forEach((view, nativeView, map) => {            
+            if (!(view.bindingContext instanceof observable.Observable)) {
+                view.bindingContext = null;
+            }
+        });
+
         (<android.widget.BaseAdapter>this.android.getAdapter()).notifyDataSetChanged();
     }
 
@@ -122,35 +95,22 @@ export class ListView extends common.ListView {
 
     public _onDetached(force?: boolean) {
         super._onDetached(force);
-
-        // clear the cache
-        var keys = Object.keys(this._realizedItems);
-        var i;
-        var length = keys.length;
-        var view: viewModule.View;
-        var key;
-
-        for (i = 0; i < length; i++) {
-            key = keys[i];
-            view = this._realizedItems[key];
-            view.parent._removeView(view);
-            delete this._realizedItems[key];
-        }
+        this.clearRealizedCells();
     }
 
     get _childrenCount(): number {
-        let keys = Object.keys(this._realizedItems);
-        return keys.length;
+        return this._realizedItems.size;
     }
 
     public _eachChildView(callback: (child: viewModule.View) => boolean): void {
-        let keys = Object.keys(this._realizedItems);
-        let length = keys.length;
-        for (let i = 0; i < length; i++) {
-            let key = keys[i];
-            let view: viewModule.View = this._realizedItems[key];
-            callback(view);
-        }
+        this._realizedItems.forEach((view, nativeView, map) => {
+            if (view.parent instanceof ListView) {
+                callback(view);
+            }
+            else {
+                callback(view.parent);
+            }
+        });
     }
 
     public _getRealizedView(convertView: android.view.View, index: number) {
@@ -158,31 +118,25 @@ export class ListView extends common.ListView {
             return this._getItemTemplateContent(index);
         }
 
-        return this._realizedItems[convertView.hashCode()];
+        return this._realizedItems.get(convertView);
     }
 
-    public _notifyScrollIdle() {
-        var keys = Object.keys(this._realizedItems);
-        var i;
-        var length = keys.length;
-        var view: viewModule.View;
-        var key;
-        for (i = 0; i < length; i++) {
-            key = keys[i];
-            view = this._realizedItems[key];
-            if (view[REALIZED_INDEX] < this.items.length) {
-                this.notify({
-                    eventName: ITEMLOADING,
-                    object: this,
-                    index: view[REALIZED_INDEX],
-                    view: view
-                });
+    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);
             }
-        }
+
+            view.parent._removeView(view);
+        });
+
+        this._realizedItems.clear();
     }
 }
 
-var ListViewAdapterClass;
+let ListViewAdapterClass;
 function ensureListViewAdapterClass() {
     if (ListViewAdapterClass) {
         return;
@@ -224,12 +178,18 @@ function ensureListViewAdapterClass() {
                 return null;
             }
 
-            var view = this._listView._getRealizedView(convertView, index);
-            var args = <definition.ItemEventData>{
+            let totalItemCount = this._listView.items ? this._listView.items.length : 0;
+            if (index === (totalItemCount - 1)) {
+                this._listView.notify({ eventName: LOADMOREITEMS, object: this._listView });
+            }
+
+            let view = this._listView._getRealizedView(convertView, index);
+            let args: definition.ItemEventData = {
                 eventName: ITEMLOADING, object: this._listView, index: index, view: view,
                 android: parent,
                 ios: undefined
             };
+
             this._listView.notify(args);
 
             if (!args.view) {
@@ -243,6 +203,7 @@ function ensureListViewAdapterClass() {
                 else {
                     args.view.height = Number.NaN;
                 }
+
                 this._listView._prepareItem(args.view, index);
                 if (!args.view.parent) {
                     // Proxy containers should not get treated as layouts.
@@ -252,7 +213,7 @@ function ensureListViewAdapterClass() {
                         this._listView._addView(args.view);
                         convertView = args.view.android;
                     } else {
-                        var sp = new stackLayout.StackLayout();
+                        let sp = new stackLayout.StackLayout();
                         sp.addChild(args.view);
                         this._listView._addView(sp);
 
@@ -260,9 +221,7 @@ function ensureListViewAdapterClass() {
                     }
                 }
 
-                this._listView._realizedItems[convertView.hashCode()] = args.view;
-                // cache the realized index (used to raise the ItemLoading event upon scroll stop)
-                args.view[REALIZED_INDEX] = index;
+                this._listView._realizedItems.set(convertView, args.view);
             }
 
             return convertView;
@@ -270,4 +229,4 @@ function ensureListViewAdapterClass() {
     }
 
     ListViewAdapterClass = ListViewAdapter;
-}
+}
\ No newline at end of file
diff --git a/ui/list-view/list-view.d.ts b/ui/list-view/list-view.d.ts
index 7cc59c293..9292c6f85 100644
--- a/ui/list-view/list-view.d.ts
+++ b/ui/list-view/list-view.d.ts
@@ -47,6 +47,7 @@ declare module "ui/list-view" {
         /**
          * Represents the observable property backing the isScrolling property of each ListView instance.
          */
+        @Deprecated // in 2.1
         public static isScrollingProperty: dependencyObservable.Property;
 
         /**
@@ -67,6 +68,7 @@ declare module "ui/list-view" {
         /**
          * Gets a value indicating whether the ListView is currently scrolling.
          */
+        @Deprecated // in 2.1
         isScrolling: boolean;
 
         /**
diff --git a/ui/list-view/list-view.ios.ts b/ui/list-view/list-view.ios.ts
index 26c336191..ea5841231 100644
--- a/ui/list-view/list-view.ios.ts
+++ b/ui/list-view/list-view.ios.ts
@@ -28,7 +28,7 @@ var infinity = utils.layout.makeMeasureSpec(0, utils.layout.UNSPECIFIED);
 
 class ListViewCell extends UITableViewCell {
     public willMoveToSuperview(newSuperview: UIView): void {
-        let parent: ListView = <ListView>(this.view ? this.view.parent : null);
+        let parent = <ListView>(this.view ? this.view.parent : null);
 
         // When inside ListView and there is no newSuperview this cell is 
         // removed from native visual tree so we remove it from our tree too.
@@ -117,14 +117,14 @@ class UITableViewDelegateImpl extends NSObject implements UITableViewDelegate {
 
     public tableViewDidSelectRowAtIndexPath(tableView: UITableView, indexPath: NSIndexPath): NSIndexPath {
         tableView.deselectRowAtIndexPathAnimated(indexPath, true);
-   
+
         return indexPath;
     }
 
     public tableViewHeightForRowAtIndexPath(tableView: UITableView, indexPath: NSIndexPath): number {
         let owner = this._owner.get();
         if (!owner) {
-            return 44;
+            return DEFAULT_HEIGHT;
         }
 
         let height = undefined;
@@ -171,7 +171,7 @@ class UITableViewRowHeightDelegateImpl extends NSObject implements UITableViewDe
         if (owner) {
             notifyForItemAtIndex(owner, cell, cell.view, ITEMTAP, indexPath);
         }
-        return indexPath; 
+        return indexPath;
     }
 
     public tableViewHeightForRowAtIndexPath(tableView: UITableView, indexPath: NSIndexPath): number {
@@ -246,9 +246,9 @@ export class ListView extends common.ListView {
     }
 
     public _eachChildView(callback: (child: view.View) => boolean): void {
-        this._map.forEach(function(view, key) {
+        this._map.forEach((view, key) => {
             callback(view);
-        }, this._map);
+        });
     }
 
     public scrollToIndex(index: number) {
@@ -259,6 +259,13 @@ export class ListView extends common.ListView {
     }
 
     public refresh() {
+        // clear bindingContext when it is not observable because otherwise bindings to items won't reevaluate
+        this._map.forEach((view, nativeView, map) => {
+            if (!(view.bindingContext instanceof observable.Observable)) {
+                view.bindingContext = null;
+            }
+        });
+
         if (this.isLoaded) {
             this._ios.reloadData();
             this.requestLayout();
@@ -287,9 +294,11 @@ export class ListView extends common.ListView {
             this._nativeView.estimatedRowHeight = data.newValue;
             this._delegate = UITableViewRowHeightDelegateImpl.initWithOwner(new WeakRef(this));
         }
+
         if (this.isLoaded) {
             this._nativeView.delegate = this._delegate;
         }
+
         super._onRowHeightPropertyChanged(data);
     }
 
@@ -310,20 +319,18 @@ export class ListView extends common.ListView {
     }
 
     private _layoutCell(cellView: view.View, indexPath: NSIndexPath): number {
-
         if (cellView) {
-            var measuredSize = view.View.measureChild(this, cellView, this.widthMeasureSpec, infinity);
-            var height = measuredSize.measuredHeight;
+            let measuredSize = view.View.measureChild(this, cellView, this.widthMeasureSpec, infinity);
+            let height = measuredSize.measuredHeight;
             this.setHeight(indexPath.row, height);
             return height;
         }
 
-        return 0;
+        return DEFAULT_HEIGHT;
     }
 
     public _prepareCell(cell: ListViewCell, indexPath: NSIndexPath): number {
         let cellHeight: number;
-
         try {
             this._preparingCell = true;
             let view = cell.view;
@@ -337,12 +344,12 @@ export class ListView extends common.ListView {
             // Proxy containers should not get treated as layouts.
             // Wrap them in a real layout as well.
             if (view instanceof ProxyViewContainer) {
-                var sp = new StackLayout();
+                let sp = new StackLayout();
                 sp.addChild(view);
                 view = sp;
             }
 
-            // If cell is reused be have old content - remove it first.
+            // If cell is reused it have old content - remove it first.
             if (!cell.view) {
                 cell.owner = new WeakRef(view);
             } else if (cell.view !== view) {
@@ -367,7 +374,13 @@ export class ListView extends common.ListView {
     }
 
     public _removeContainer(cell: ListViewCell): void {
-        this._removeView(cell.view)
+        let view = cell.view;
+        // This is to clear the StackLayout that is used to wrap ProxyViewContainer instances.
+        if (!(view.parent instanceof ListView)) {
+            this._removeView(view.parent);
+        }
+
+        view.parent._removeView(view);
         this._map.delete(cell);
     }
-}
+}
\ No newline at end of file