Merge pull request #1058 from NativeScript/tab-view-selectedIndex

Vladimir Enchev · Vladimir Enchev · commit b40ca820b65f · 2015-11-09T10:52:24.000+02:00
selectedIndex behavior when no tabs fixed
diff --git a/apps/tests/ui/tab-view/tab-view-tests.ts b/apps/tests/ui/tab-view/tab-view-tests.ts
@@ -10,6 +10,7 @@ import pageModule = require("ui/page");
 import listViewModule = require("ui/list-view");
 import buttonModule = require("ui/button");
 import observable = require("data/observable");
+import builder = require("ui/builder");
 
 // <snippet module="ui/tab-view" title="TabView">
 // # TabView
@@ -391,4 +392,41 @@ export class TabViewTest extends testModule.UITest<tabViewModule.TabView> {
 
 export function createTestCase(): TabViewTest {
     return new TabViewTest();
+}
+
+export function test__tabview_selectedindex_will_work_from_xml() {
+    var p = <pageModule.Page>builder.parse(
+        '<Page>' +
+          '<TabView selectedIndex= "1">' +
+            '<TabView.items>'+
+              '<TabViewItem title="First">' +
+                 '<TabViewItem.view>' +
+                    '<Label text="First View" />' +
+                 '</TabViewItem.view>' +
+              '</TabViewItem>' +
+              '<TabViewItem title= "Second">' +
+                '<TabViewItem.view>' +
+                  '<Label text="Second View" />' +
+                '</TabViewItem.view>' +
+              '</TabViewItem>' +
+            '</TabView.items>' +
+         '</TabView>' +
+        '</Page>');
+
+    function testAction(views: Array<viewModule.View>) {
+        var tab: tabViewModule.TabView = <tabViewModule.TabView>p.content;
+
+        TKUnit.wait(0.2);
+
+        TKUnit.assertEqual(tab.selectedIndex, 1);
+    };
+
+    helper.navigate(function () { return p; });
+
+    try {
+        testAction([p.content, p]);
+    }
+    finally {
+        helper.goBack();
+    }
 }
diff --git a/ui/tab-view/tab-view.ios.ts b/ui/tab-view/tab-view.ios.ts
@@ -227,6 +227,10 @@ export class TabView extends common.TabView {
 
         // When we set this._ios.viewControllers, someone is clearing the moreNavigationController.delegate, so we have to reassign it each time here.
         this._ios.moreNavigationController.delegate = this._moreNavigationControllerDelegate;
+
+        if (this._ios.selectedIndex !== this.selectedIndex) {
+            this._ios.selectedIndex = this.selectedIndex;
+        }
     }
 
     public _getIcon(iconSource: string): UIImage {

Original file line number	Diff line number	Diff line change
`@@ -227,6 +227,10 @@ export class TabView extends common.TabView {`
`227`	`227`
`228`	`228`	`// When we set this._ios.viewControllers, someone is clearing the moreNavigationController.delegate, so we have to reassign it each time here.`
`229`	`229`	`this._ios.moreNavigationController.delegate = this._moreNavigationControllerDelegate;`
	`230`	`+`
	`231`	`+ if (this._ios.selectedIndex !== this.selectedIndex) {`
	`232`	`+ this._ios.selectedIndex = this.selectedIndex;`
	`233`	`+ }`
`230`	`234`	`}`
`231`	`235`
`232`	`236`	`public _getIcon(iconSource: string): UIImage {`