fix(ios): set current tab as topmost frame on load (NativeScript#5908)

MartoYankov · web-flow · commit b122bd4a37b0 · 2018-06-06T14:47:42.000+03:00
diff --git a/tests/app/ui/tab-view/tab-view-root-tests.ts b/tests/app/ui/tab-view/tab-view-root-tests.ts
@@ -2,7 +2,7 @@ import * as helper from "../helper";
 import TKUnit = require("../../TKUnit");
 import { isIOS, isAndroid } from "tns-core-modules/platform";
 import { _resetRootView } from "tns-core-modules/application/";
-import { Frame, NavigationEntry } from "tns-core-modules/ui/frame";
+import { Frame, NavigationEntry, topmost } from "tns-core-modules/ui/frame";
 import { Page } from "tns-core-modules/ui/page";
 import { TabView, TabViewItem } from "tns-core-modules/ui/tab-view";
 
@@ -56,7 +56,26 @@ function createTabItemsWithFrames(count: number) {
     return items;
 }
 
-export function test_ios_and_android_offset_zero_should_raise_same_events() {
+export function test_frame_topmost_matches_selectedIndex() {
+    const items = createTabItemsWithFrames(3);
+    const tabView = new TabView();
+    tabView.items = items.map(item => item.tabItem);
+    tabView.selectedIndex = 0;
+
+    const entry: NavigationEntry = {
+        create: () => tabView
+    };
+
+    helper.waitUntilNavigatedTo(items[0].page, () => _resetRootView(entry));
+
+    TKUnit.assertEqual(topmost().id, "Tab0 Frame0");
+
+    helper.waitUntilNavigatedTo(items[1].page, () => tabView.selectedIndex = 1);
+
+    TKUnit.assertEqual(topmost().id, "Tab1 Frame1");
+}
+
+export function test_offset_zero_should_raise_same_events() {
     let actualEventsRaised = [];
 
     function resetActualEventsRaised() {
diff --git a/tests/package.json b/tests/package.json
@@ -6,10 +6,10 @@
   "nativescript": {
     "id": "org.nativescript.UnitTestApp",
     "tns-ios": {
-      "version": "3.4.1"
+      "version": "4.1.0"
     },
     "tns-android": {
-      "version": "3.4.1"
+      "version": "4.1.1"
     }
   },
   "dependencies": {
diff --git a/tns-core-modules/ui/tab-view/tab-view.ios.ts b/tns-core-modules/ui/tab-view/tab-view.ios.ts
@@ -213,6 +213,13 @@ export class TabView extends TabViewBase {
     @profile
     public onLoaded() {
         super.onLoaded();
+
+        const selectedIndex = this.selectedIndex;
+        const selectedView = this.items && this.items[selectedIndex] && this.items[selectedIndex].view;
+        if (selectedView instanceof Frame) {
+            selectedView._pushInFrameStack();
+        }
+
         this._ios.delegate = this._delegate;
     }
 
