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

Merge pull request #134 from NativeScript/feature/cuteness-tab-fix

Browse Source 
Fix tabs when pageCache is enabled
This commit is contained in:
Alexander Vakrilov
2015-05-14 16:57:10 +03:00
parent 5294b9b57d 55882500c8
commit 1da973d2e8
2 changed files with 75 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
apps/tests/ui/tab-view/tab-view-tests.ts
View File

@ -408,62 +408,89 @@ export function testBindingIsRefreshedWhenTabViewItemIsUnselectedAndThenSelected
});
}
export function testLoadedAndUnloadedAreFired_WhenNavigatingAwayAndBack() {
export function testLoadedAndUnloadedAreFired_WhenNavigatingAwayAndBack_NoPageCaching() {
testLoadedAndUnloadedAreFired_WhenNavigatingAwayAndBackg(false);
}
export function testLoadedAndUnloadedAreFired_WhenNavigatingAwayAndBack_WithPageCaching() {
testLoadedAndUnloadedAreFired_WhenNavigatingAwayAndBackg(true);
}
function testLoadedAndUnloadedAreFired_WhenNavigatingAwayAndBackg(enablePageCache: boolean) {
var i: number;
var itemCount = 3;
var loadedItems = [0, 0, 0];
var unloadedItems = [0, 0, 0];
var tabView = _createTabView();
var items = _createItems(itemCount);
tabView.items = items;
var topFrame = frameModule.topmost();
var oldChache;
function createLoadedFor(itemIndex: number) {
return function () {
loadedItems[itemIndex] = loadedItems[itemIndex] + 1;
}
if (topFrame.android) {
oldChache = topFrame.android.cachePagesOnNavigate;
topFrame.android.cachePagesOnNavigate = enablePageCache;
}
function createUnloadedFor(itemIndex: number) {
return function () {
unloadedItems[itemIndex] = unloadedItems[itemIndex] + 1;
}
}
try {
var tabView = _createTabView();
var items = _createItems(itemCount);
tabView.items = items;
helper.buildUIAndRunTest(tabView, function () {
try {
// Attach to loaded/unloaded events
for (i = 0; i < itemCount; i++) {
items[i].view.on("loaded", createLoadedFor(i));
items[i].view.on("unloaded", createUnloadedFor(i));
function createLoadedFor(itemIndex: number) {
return function () {
loadedItems[itemIndex] = loadedItems[itemIndex] + 1;
}
var detailsPageFactory = function (): pageModule.Page {
var detailsPage = new pageModule.Page();
detailsPage.content = new labelModule.Label();
return detailsPage;
};
helper.navigate(detailsPageFactory);
}
finally {
// Go back to the test page.
helper.goBack();
}
//console.log("loaded items: " + loadedItems.join(", "));
//console.log("unloadedItems items: " + unloadedItems.join(", "));
// Check that at least the first item is loaded and unloaded
TKUnit.assertEqual(loadedItems[0], 1, "loaded count for 1st item");
TKUnit.assertEqual(unloadedItems[0], 1, "unloaded count for 1st item");
// Check that loaded/unloaded coutns are equal for all tabs
for (i = 0; i < itemCount; i++) {
TKUnit.assert(loadedItems[i] === unloadedItems[i],
"Loaded and unloaded calls are not equal for item " + i + " loaded: " + loadedItems[i] + " unloaded: " + unloadedItems[i]);
function createUnloadedFor(itemIndex: number) {
return function () {
unloadedItems[itemIndex] = unloadedItems[itemIndex] + 1;
}
}
});
helper.buildUIAndRunTest(tabView, function () {
try {
TKUnit.waitUntilReady(() => { return items[0].view.isLoaded; }, ASYNC);
// Attach to loaded/unloaded events
for (i = 0; i < itemCount; i++) {
items[i].view.on("loaded", createLoadedFor(i));
items[i].view.on("unloaded", createUnloadedFor(i));
}
var detailsPageFactory = function (): pageModule.Page {
var detailsPage = new pageModule.Page();
detailsPage.content = new labelModule.Label();
return detailsPage;
};
helper.navigate(detailsPageFactory);
}
finally {
// Go back to the test page.
helper.goBack();
}
TKUnit.waitUntilReady(() => { return items[0].view.isLoaded; }, ASYNC);
//console.log("loaded items: " + loadedItems.join(", "));
//console.log("unloadedItems items: " + unloadedItems.join(", "));
// Check that at least the first item is loaded and unloaded
TKUnit.assert(items[0].view.isLoaded, "Thecontent of the first tab should be loaded.");
TKUnit.assertEqual(loadedItems[0], 1, "loaded count for 1st item");
TKUnit.assertEqual(unloadedItems[0], 1, "unloaded count for 1st item");
// Check that loaded/unloaded coutns are equal for all tabs
for (i = 0; i < itemCount; i++) {
TKUnit.assert(loadedItems[i] === unloadedItems[i],
"Loaded and unloaded calls are not equal for item " + i + " loaded: " + loadedItems[i] + " unloaded: " + unloadedItems[i]);
}
});
}
finally {
// Return original page cache value
if (topFrame.android) {
topFrame.android.cachePagesOnNavigate = oldChache;
}
}
}
function _clickTheFirstButtonInTheListViewNatively(tabView: tabViewModule.TabView) {

5
ui/tab-view/tab-view.android.ts
View File

@ -273,6 +273,11 @@ export class TabView extends common.TabView {
// If we are loading a TabView inside a hidden fragment this check will prevent it from polluting the action bar.
if (this.android && this.android.isShown()) {
// Cover the case when pageCacheOnNavigate is enabled - set adapter in loaded as the TabView is already
// attached and _onItemsPropertyChangedSetNativeValue will not be called
if (!this._pagerAdapter && this.items) {
this._setAdapter(this.items);
}
this._addTabsIfNeeded();
this._setNativeSelectedIndex(this.selectedIndex);
}