Commit b40ca82
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -10,6 +10,7 @@ import pageModule = require("ui/page"); | |||
| 10 | 10 | import listViewModule = require("ui/list-view"); | |
| 11 | 11 | import buttonModule = require("ui/button"); | |
| 12 | 12 | import observable = require("data/observable"); | |
| 13 | + import builder = require("ui/builder"); | ||
| 13 | 14 | ||
| 14 | 15 | // <snippet module="ui/tab-view" title="TabView"> | |
| 15 | 16 | // # TabView | |
@@ -391,4 +392,41 @@ export class TabViewTest extends testModule.UITest<tabViewModule.TabView> { | |||
| 391 | 392 | ||
| 392 | 393 | export function createTestCase(): TabViewTest { | |
| 393 | 394 | return new TabViewTest(); | |
| 395 | + } | ||
| 396 | + | ||
| 397 | + export function test__tabview_selectedindex_will_work_from_xml() { | ||
| 398 | + var p = <pageModule.Page>builder.parse( | ||
| 399 | + '<Page>' + | ||
| 400 | + '<TabView selectedIndex= "1">' + | ||
| 401 | + '<TabView.items>'+ | ||
| 402 | + '<TabViewItem title="First">' + | ||
| 403 | + '<TabViewItem.view>' + | ||
| 404 | + '<Label text="First View" />' + | ||
| 405 | + '</TabViewItem.view>' + | ||
| 406 | + '</TabViewItem>' + | ||
| 407 | + '<TabViewItem title= "Second">' + | ||
| 408 | + '<TabViewItem.view>' + | ||
| 409 | + '<Label text="Second View" />' + | ||
| 410 | + '</TabViewItem.view>' + | ||
| 411 | + '</TabViewItem>' + | ||
| 412 | + '</TabView.items>' + | ||
| 413 | + '</TabView>' + | ||
| 414 | + '</Page>'); | ||
| 415 | + | ||
| 416 | + function testAction(views: Array<viewModule.View>) { | ||
| 417 | + var tab: tabViewModule.TabView = <tabViewModule.TabView>p.content; | ||
| 418 | + | ||
| 419 | + TKUnit.wait(0.2); | ||
| 420 | + | ||
| 421 | + TKUnit.assertEqual(tab.selectedIndex, 1); | ||
| 422 | + }; | ||
| 423 | + | ||
| 424 | + helper.navigate(function () { return p; }); | ||
| 425 | + | ||
| 426 | + try { | ||
| 427 | + testAction([p.content, p]); | ||
| 428 | + } | ||
| 429 | + finally { | ||
| 430 | + helper.goBack(); | ||
| 431 | + } | ||
| 394 | 432 | } | |
| 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 { | |
0 commit comments