From 4511c76f49626e875ce5a80a932a0b3645f6b4d3 Mon Sep 17 00:00:00 2001
From: Alexander Djenkov <a.djenkov90@gmail.com>
Date: Mon, 22 Jul 2019 09:59:45 +0300
Subject: [PATCH 1/5] fix(tabs-ios): crash when setting tabStripItems through
 items property (#7548)

---
 tns-core-modules/ui/tabs/tabs.ios.ts | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/tns-core-modules/ui/tabs/tabs.ios.ts b/tns-core-modules/ui/tabs/tabs.ios.ts
index 979d93e41..9239454ac 100644
--- a/tns-core-modules/ui/tabs/tabs.ios.ts
+++ b/tns-core-modules/ui/tabs/tabs.ios.ts
@@ -590,6 +590,11 @@ export class Tabs extends TabsBase {
 
         this._ios.dataSource = this._dataSource;
         this._ios.delegate = this._delegate;
+
+        if (!this.tabBarItems) {
+            const tabStripItems = this.tabStrip ? this.tabStrip.items : null;
+            this.setTabStripItems(tabStripItems);
+        }
     }
 
     public onUnloaded() {
@@ -836,6 +841,10 @@ export class Tabs extends TabsBase {
     }
 
     public setTabStripItems(items: Array<TabStripItem>) {
+        if (!this.tabStrip || !items) {
+            return;
+        }
+
         const tabBarItems = [];
 
         items.forEach((item: TabStripItem, i) => {

From 490cab0df9df6b89d488890e81ab3b347887bb75 Mon Sep 17 00:00:00 2001
From: Alexander Djenkov <a.djenkov90@gmail.com>
Date: Thu, 25 Jul 2019 15:00:42 +0300
Subject: [PATCH 2/5] fix(tabs-ios): unable to return to tab after tab with
 nested frame visited (#7574)

---
 e2e/nested-frame-navigation/app/app.ts        |   2 -
 .../bottom-navigation-page.xml                |   8 +-
 .../bottom-navigation-root.xml                |   8 +-
 .../app/tab-page/tab-bottom-page.xml          |   2 +-
 .../app/tab-page/tab-top-page.xml             |   2 +-
 .../app/tabs-page/tabs-bottom-page.xml        |   8 +-
 .../app/tabs-page/tabs-top-page.xml           |   8 +-
 .../app/tabs-root/tabs-bottom-root.xml        |   8 +-
 .../app/tabs-root/tabs-top-root.xml           |   8 +-
 .../e2e/bottom-navigation-root.e2e-spec.ts    | 180 ++++++++++++
 .../frame-bottom-navigation-root.e2e-spec.ts  | 264 ++++++++++++++++++
 .../e2e/frame-tab-root.e2e-spec.ts            |   4 +-
 .../e2e/frame-tabs-root.e2e-spec.ts           | 264 ++++++++++++++++++
 e2e/nested-frame-navigation/e2e/screen.ts     | 126 +++++++--
 .../e2e/tab-root.e2e-spec.ts                  |   4 +-
 .../e2e/tabs-root.e2e-spec.ts                 | 180 ++++++++++++
 tests/app/ui/tabs/tabs-navigation-tests.ts    |   8 +-
 tns-core-modules/ui/tabs/tabs.ios.ts          |  24 +-
 18 files changed, 1043 insertions(+), 65 deletions(-)
 create mode 100644 e2e/nested-frame-navigation/e2e/bottom-navigation-root.e2e-spec.ts
 create mode 100644 e2e/nested-frame-navigation/e2e/frame-bottom-navigation-root.e2e-spec.ts
 create mode 100644 e2e/nested-frame-navigation/e2e/frame-tabs-root.e2e-spec.ts
 create mode 100644 e2e/nested-frame-navigation/e2e/tabs-root.e2e-spec.ts

diff --git a/e2e/nested-frame-navigation/app/app.ts b/e2e/nested-frame-navigation/app/app.ts
index e0ef2193e..0c5afc47e 100644
--- a/e2e/nested-frame-navigation/app/app.ts
+++ b/e2e/nested-frame-navigation/app/app.ts
@@ -1,5 +1,3 @@
 import * as application from "tns-core-modules/application";
 
 application.run({ moduleName: "app-root" });
-// application.run({ moduleName: "tab-root" });
-// application.run({ moduleName: "layout-root" });
diff --git a/e2e/nested-frame-navigation/app/bottom-navigation-page/bottom-navigation-page.xml b/e2e/nested-frame-navigation/app/bottom-navigation-page/bottom-navigation-page.xml
index 407ca4aee..b467699b8 100644
--- a/e2e/nested-frame-navigation/app/bottom-navigation-page/bottom-navigation-page.xml
+++ b/e2e/nested-frame-navigation/app/bottom-navigation-page/bottom-navigation-page.xml
@@ -1,7 +1,7 @@
 <Page xmlns="http://schemas.nativescript.org/tns.xsd" class="page">
 
     <ActionBar class="action-bar">
-        <NavigationButton text="tabBottomBack" tap="onBackButtonTap" android.systemIcon="ic_menu_back" />
+        <NavigationButton text="bottomNavigationBack" tap="onBackButtonTap" android.systemIcon="ic_menu_back" />
         <Label class="action-bar-title" text="bottom navigation page" horizontalAlignment="center" />
     </ActionBar>
     
@@ -16,9 +16,9 @@
         <GridLayout row="1">
             <BottomNavigation>
                 <TabStrip>
-                    <TabStripItem title="Players"></TabStripItem>
-                    <TabStripItem title="Dummy"></TabStripItem>
-                    <TabStripItem title="Teams"></TabStripItem>
+                    <TabStripItem title="Players" automationText="playersTabNavigation"></TabStripItem>
+                    <TabStripItem title="Dummy" automationText="dummyTabNavigation"></TabStripItem>
+                    <TabStripItem title="Teams" automationText="teamsTabNavigation"></TabStripItem>
                 </TabStrip>
 
                 <TabContentItem>
diff --git a/e2e/nested-frame-navigation/app/bottom-navigation-root/bottom-navigation-root.xml b/e2e/nested-frame-navigation/app/bottom-navigation-root/bottom-navigation-root.xml
index ecc8c8c2e..04920a131 100644
--- a/e2e/nested-frame-navigation/app/bottom-navigation-root/bottom-navigation-root.xml
+++ b/e2e/nested-frame-navigation/app/bottom-navigation-root/bottom-navigation-root.xml
@@ -1,14 +1,14 @@
 <BottomNavigation>
     <TabStrip>
-        <TabStripItem title="Players"></TabStripItem>
+        <TabStripItem title="Players" automationText="playersTabNavigation"></TabStripItem>
         <!-- this tab serves as dummy so the actual teams tab is not loaded by default  -->
-        <TabStripItem title="Dummy"></TabStripItem>
-        <TabStripItem title="Teams"></TabStripItem>
+        <TabStripItem title="Dummy" automationText="dummyTabNavigation"></TabStripItem>
+        <TabStripItem title="Teams" automationText="teamsTabNavigation"></TabStripItem>
     </TabStrip>
 
     <TabContentItem>
         <GridLayout rows="auto, auto, *">
-            <Label text="tabs root top home" />
+            <Label text="bottom navigation root home" />
             <Button row="1" text="reset app" tap="onReset" />
             <GridLayout row="2">
                 <Frame defaultPage="players/players-items-page" />
diff --git a/e2e/nested-frame-navigation/app/tab-page/tab-bottom-page.xml b/e2e/nested-frame-navigation/app/tab-page/tab-bottom-page.xml
index 6d1cbd174..fe95ecd11 100644
--- a/e2e/nested-frame-navigation/app/tab-page/tab-bottom-page.xml
+++ b/e2e/nested-frame-navigation/app/tab-page/tab-bottom-page.xml
@@ -1,7 +1,7 @@
 <Page xmlns="http://schemas.nativescript.org/tns.xsd" class="page">
 
     <ActionBar class="action-bar">
-        <NavigationButton text="tabBottomBack" tap="onBackButtonTap" android.systemIcon="ic_menu_back" />
+        <NavigationButton text="tabViewBottomBack" tap="onBackButtonTap" android.systemIcon="ic_menu_back" />
         <Label class="action-bar-title" text="tabview bottom page" horizontalAlignment="center" />
     </ActionBar>
     
diff --git a/e2e/nested-frame-navigation/app/tab-page/tab-top-page.xml b/e2e/nested-frame-navigation/app/tab-page/tab-top-page.xml
index 28b6a690d..479e24b8b 100644
--- a/e2e/nested-frame-navigation/app/tab-page/tab-top-page.xml
+++ b/e2e/nested-frame-navigation/app/tab-page/tab-top-page.xml
@@ -1,7 +1,7 @@
 <Page xmlns="http://schemas.nativescript.org/tns.xsd" class="page">
 
     <ActionBar class="action-bar">
-        <NavigationButton text="tabTopBack" tap="onBackButtonTap" android.systemIcon="ic_menu_back" />
+        <NavigationButton text="tabViewTopBack" tap="onBackButtonTap" android.systemIcon="ic_menu_back" />
         <Label class="action-bar-title" text="tabview top page" horizontalAlignment="center" />
     </ActionBar>
 
diff --git a/e2e/nested-frame-navigation/app/tabs-page/tabs-bottom-page.xml b/e2e/nested-frame-navigation/app/tabs-page/tabs-bottom-page.xml
index 8daf6eb26..5e49cedca 100644
--- a/e2e/nested-frame-navigation/app/tabs-page/tabs-bottom-page.xml
+++ b/e2e/nested-frame-navigation/app/tabs-page/tabs-bottom-page.xml
@@ -1,7 +1,7 @@
 <Page xmlns="http://schemas.nativescript.org/tns.xsd" class="page">
 
     <ActionBar class="action-bar">
-        <NavigationButton text="tabBottomBack" tap="onBackButtonTap" android.systemIcon="ic_menu_back" />
+        <NavigationButton text="tabsBottomBack" tap="onBackButtonTap" android.systemIcon="ic_menu_back" />
         <Label class="action-bar-title" text="tabs bottom page" horizontalAlignment="center" />
     </ActionBar>
     
@@ -16,9 +16,9 @@
         <GridLayout row="1">
             <Tabs tabsPosition="bottom">
                 <TabStrip>
-                    <TabStripItem title="Players"></TabStripItem>
-                    <TabStripItem title="Dummy"></TabStripItem>
-                    <TabStripItem title="Teams"></TabStripItem>
+                    <TabStripItem title="Players" automationText="playersTabNavigation"></TabStripItem>
+                    <TabStripItem title="Dummy" automationText="dummyTabNavigation"></TabStripItem>
+                    <TabStripItem title="Teams" automationText="teamsTabNavigation"></TabStripItem>
                 </TabStrip>
 
                 <TabContentItem>
diff --git a/e2e/nested-frame-navigation/app/tabs-page/tabs-top-page.xml b/e2e/nested-frame-navigation/app/tabs-page/tabs-top-page.xml
index e8b74511c..773558598 100644
--- a/e2e/nested-frame-navigation/app/tabs-page/tabs-top-page.xml
+++ b/e2e/nested-frame-navigation/app/tabs-page/tabs-top-page.xml
@@ -1,7 +1,7 @@
 <Page xmlns="http://schemas.nativescript.org/tns.xsd" class="page">
 
     <ActionBar class="action-bar">
-        <NavigationButton text="tabTopBack" tap="onBackButtonTap" android.systemIcon="ic_menu_back" />
+        <NavigationButton text="tabsTopBack" tap="onBackButtonTap" android.systemIcon="ic_menu_back" />
         <Label class="action-bar-title" text="tabs top page" horizontalAlignment="center" />
     </ActionBar>
 
@@ -16,9 +16,9 @@
         <GridLayout row="1">
             <Tabs tabsPosition="top">
                 <TabStrip>
-                    <TabStripItem title="Players"></TabStripItem>
-                    <TabStripItem title="Dummy"></TabStripItem>
-                    <TabStripItem title="Teams"></TabStripItem>
+                    <TabStripItem title="Players" automationText="playersTabNavigation"></TabStripItem>
+                    <TabStripItem title="Dummy" automationText="dummyTabNavigation"></TabStripItem>
+                    <TabStripItem title="Teams" automationText="teamsTabNavigation"></TabStripItem>
                 </TabStrip>
 
                 <TabContentItem>
diff --git a/e2e/nested-frame-navigation/app/tabs-root/tabs-bottom-root.xml b/e2e/nested-frame-navigation/app/tabs-root/tabs-bottom-root.xml
index a4ce50327..481c4b2be 100644
--- a/e2e/nested-frame-navigation/app/tabs-root/tabs-bottom-root.xml
+++ b/e2e/nested-frame-navigation/app/tabs-root/tabs-bottom-root.xml
@@ -1,14 +1,14 @@
 <Tabs tabsPosition="bottom">
     <TabStrip>
-        <TabStripItem title="Players"></TabStripItem>
+        <TabStripItem title="Players" automationText="playersTabNavigation"></TabStripItem>
         <!-- this tab serves as dummy so the actual teams tab is not loaded by default  -->
-        <TabStripItem title="Dummy"></TabStripItem>
-        <TabStripItem title="Teams"></TabStripItem>
+        <TabStripItem title="Dummy" automationText="dummyTabNavigation"></TabStripItem>
+        <TabStripItem title="Teams" automationText="teamsTabNavigation"></TabStripItem>
     </TabStrip>
 
     <TabContentItem>
         <GridLayout rows="auto, auto, *">
-            <Label text="tabs root top home" />
+            <Label text="tabs root bottom home" />
             <Button row="1" text="reset app" tap="onReset" />
             <GridLayout row="2">
                 <Frame defaultPage="players/players-items-page" />
diff --git a/e2e/nested-frame-navigation/app/tabs-root/tabs-top-root.xml b/e2e/nested-frame-navigation/app/tabs-root/tabs-top-root.xml
index e6e81603d..9a95cc512 100644
--- a/e2e/nested-frame-navigation/app/tabs-root/tabs-top-root.xml
+++ b/e2e/nested-frame-navigation/app/tabs-root/tabs-top-root.xml
@@ -1,9 +1,9 @@
-<Tabs tabsPosition="top">
+<Tabs tabsPosition="top" automationText="tabNavigation">
     <TabStrip>
-        <TabStripItem title="Players"></TabStripItem>
+        <TabStripItem title="Players" automationText="playersTabNavigation"></TabStripItem>
         <!-- this tab serves as dummy so the actual teams tab is not loaded by default  -->
-        <TabStripItem title="Dummy"></TabStripItem>
-        <TabStripItem title="Teams"></TabStripItem>
+        <TabStripItem title="Dummy" automationText="dummyTabNavigation"></TabStripItem>
+        <TabStripItem title="Teams" automationText="teamsTabNavigation"></TabStripItem>
     </TabStrip>
 
     <TabContentItem>
diff --git a/e2e/nested-frame-navigation/e2e/bottom-navigation-root.e2e-spec.ts b/e2e/nested-frame-navigation/e2e/bottom-navigation-root.e2e-spec.ts
new file mode 100644
index 000000000..c3aadbd93
--- /dev/null
+++ b/e2e/nested-frame-navigation/e2e/bottom-navigation-root.e2e-spec.ts
@@ -0,0 +1,180 @@
+import { AppiumDriver, createDriver, logWarn, nsCapabilities } from "nativescript-dev-appium";
+
+import { Screen, playersData, teamsData } from "./screen";
+import * as shared from "./shared.e2e-spec";
+import { suspendTime, appSuspendResume, dontKeepActivities, transitions } from "./config";
+
+const roots = ["BottomNavigation"];
+
+const rootType = "bottom-navigation-root";
+describe(rootType, async function () {
+    let driver: AppiumDriver;
+    let screen: Screen;
+
+    before(async function () {
+        nsCapabilities.testReporter.context = this;
+        logWarn(`====== ${rootType} ========`);
+        driver = await createDriver();
+        screen = new Screen(driver);
+        if (dontKeepActivities) {
+            await driver.setDontKeepActivities(true);
+        }
+
+        driver.defaultWaitTime = 8000;
+    });
+
+    after(async function () {
+        if (dontKeepActivities) {
+            await driver.setDontKeepActivities(false);
+        }
+        await driver.quit();
+        console.log("Quit driver!");
+    });
+
+    afterEach(async function () {
+        if (this.currentTest.state === "failed") {
+            await driver.logTestArtifacts(this.currentTest.title);
+        }
+    });
+
+    for (let index = 0; index < roots.length; index++) {
+        const root = roots[index];
+        describe(`${rootType}-${root}-scenarios:`, async function () {
+
+            before(async function () {
+                nsCapabilities.testReporter.context = this;
+            });
+
+            for (let index = 0; index < transitions.length; index++) {
+                const transition = transitions[index];
+
+                const playerOne = playersData[`playerOne${transition}`];
+                const playerTwo = playersData[`playerTwo${transition}`];
+                const teamOne = teamsData[`teamOne${transition}`];
+                const teamTwo = teamsData[`teamTwo${transition}`];
+
+                describe(`${rootType}-${root}-transition-${transition}-scenarios:`, async function () {
+
+                    before(async function () {
+                        nsCapabilities.testReporter.context = this;
+
+                        if (transition === "Flip" &&
+                            driver.isAndroid && parseInt(driver.platformVersion) === 19) {
+                            // TODO: known issue https://github.com/NativeScript/NativeScript/issues/6798
+                            console.log("skipping flip transition tests on api level 19");
+                            this.skip();
+                        }
+                    });
+
+                    it("loaded home page", async function () {
+                        await screen.loadedHome();
+                    });
+
+                    it(`loaded ${root} root with frames`, async function () {
+                        await screen[`navigateTo${root}RootWithFrames`]();
+                        await screen[`loaded${root}RootWithFrames`]();
+                    });
+
+                    it("loaded players list", async function () {
+                        await screen.loadedPlayersList();
+                    });
+
+                    it("loaded player details and go back twice", async function () {
+                        await shared.testPlayerNavigated(playerTwo, screen);
+
+                        if (appSuspendResume) {
+                            await driver.backgroundApp(suspendTime);
+                            await driver.waitForElement(playerTwo.name); // wait for player
+                        }
+
+                        await shared.testPlayerNavigatedBack(screen, driver);
+
+                        if (appSuspendResume) {
+                            await driver.backgroundApp(suspendTime);
+                            await driver.waitForElement(playerOne.name); // wait for players list
+                        }
+
+                        await shared.testPlayerNavigated(playerTwo, screen);
+                        await shared.testPlayerNavigatedBack(screen, driver);
+                    });
+
+                    it("toggle teams tab", async function () {
+                        await screen.toggleTeamsTab();
+
+                        if (appSuspendResume) {
+                            await driver.backgroundApp(suspendTime);
+                            await driver.waitForElement(teamOne.name); // wait for teams list
+                        }
+                    });
+
+                    it("loaded teams list", async function () {
+                        await screen.loadedTeamsList();
+                    });
+
+                    it("mix player and team list actions and go back", async function () {
+                        await screen.togglePlayersTab();
+
+                        if (appSuspendResume) {
+                            await driver.backgroundApp(suspendTime);
+                            await driver.waitForElement(playerOne.name); // wait for players list
+                        }
+
+                        await screen.loadedPlayersList();
+
+                        await shared.testPlayerNavigated(playerTwo, screen);
+
+                        if (driver.isIOS) {
+                            if (appSuspendResume) {
+                                await driver.backgroundApp(suspendTime);
+                                await driver.waitForElement(playerTwo.name); // wait for player
+                            }
+                        }
+
+                        await screen.toggleTeamsTab();
+
+                        if (driver.isIOS) {
+                            // TODO: run in background from appium breaks the test. Investigate the issue, once with the app and with appium
+                            if (appSuspendResume) {
+                                await driver.backgroundApp(suspendTime);
+                                await driver.waitForElement(teamOne.name); // wait for teams list
+                            }
+                        }
+
+                        await screen.loadedTeamsList();
+
+                        await shared.testTeamNavigated(teamTwo, screen);
+
+                        if (appSuspendResume) {
+                            await driver.backgroundApp(suspendTime);
+                            await driver.waitForElement(teamTwo.name); // wait for team
+                        }
+
+                        await screen.togglePlayersTab();
+
+                        if (appSuspendResume) {
+                            await driver.backgroundApp(suspendTime);
+                            await driver.waitForElement(playerTwo.name); // wait for player
+                        }
+
+                        await screen.loadedPlayerDetails(playerTwo);
+
+                        await screen.toggleTeamsTab();
+
+                        await screen.goBackToTeamsList();
+                        await screen.loadedTeamsList();
+
+                        await screen.togglePlayersTab();
+
+                        await screen.goBackToPlayersList();
+                        await screen.loadedPlayersList();
+                    });
+
+                    it("loaded home page again", async function () {
+                        await screen.resetToHome();
+                        await screen.loadedHome();
+                    });
+                });
+            }
+        });
+    }
+});
diff --git a/e2e/nested-frame-navigation/e2e/frame-bottom-navigation-root.e2e-spec.ts b/e2e/nested-frame-navigation/e2e/frame-bottom-navigation-root.e2e-spec.ts
new file mode 100644
index 000000000..2a832fae5
--- /dev/null
+++ b/e2e/nested-frame-navigation/e2e/frame-bottom-navigation-root.e2e-spec.ts
@@ -0,0 +1,264 @@
+import { AppiumDriver, createDriver, logWarn, nsCapabilities } from "nativescript-dev-appium";
+
+import { Screen, playersData, somePage, teamsData, driverDefaultWaitTime, Item } from "./screen";
+import * as shared from "./shared.e2e-spec";
+import { suspendTime, appSuspendResume, dontKeepActivities, transitions } from "./config";
+
+const roots = ["BottomNavigation"];
+
+const rootType = "frame-bottom-navigation-root";
+describe(rootType, async function () {
+    let driver: AppiumDriver;
+    let screen: Screen;
+
+    before(async () => {
+        nsCapabilities.testReporter.context = this;
+        logWarn(`====== ${rootType} ========`);
+        driver = await createDriver();
+        screen = new Screen(driver);
+        if (dontKeepActivities) {
+            await driver.setDontKeepActivities(true);
+        }
+
+        driver.defaultWaitTime = driverDefaultWaitTime;
+    });
+
+    after(async () => {
+        if (dontKeepActivities) {
+            await driver.setDontKeepActivities(false);
+        }
+        await driver.quit();
+        console.log("Quit driver!");
+    });
+
+    afterEach(async function () {
+        if (this.currentTest.state === "failed") {
+            await driver.logTestArtifacts(this.currentTest.title);
+        }
+    });
+
+    for (let index = 0; index < roots.length; index++) {
+        const root = roots[index];
+
+        describe(`${rootType}-${root} scenarios:`, async function () {
+            logWarn(`===== Root: ${root}`);
+            for (let trIndex = 0; trIndex < transitions.length; trIndex++) {
+                const transition = transitions[trIndex];
+                const playerOne: Item = playersData[`playerOne${transition}`];
+                const playerTwo: Item = playersData[`playerTwo${transition}`];
+                const teamOne: Item = teamsData[`teamOne${transition}`];
+                const teamTwo: Item = teamsData[`teamTwo${transition}`];
+
+                describe(`${rootType}-${root}-transition-${transition}-scenarios:`, async function () {
+
+                    before(async function () {
+                        nsCapabilities.testReporter.context = this;
+                        logWarn(`========= ${root}-${transition} =========`);
+
+                        if (transition === "Flip" &&
+                            driver.isAndroid && parseInt(driver.platformVersion) === 19) {
+                            // TODO: known issue https://github.com/NativeScript/NativeScript/issues/6798
+                            console.log("skipping flip transition tests on api level 19");
+                            this.skip();
+                        }
+                    });
+
+                    it("loaded home page", async () => {
+                        await screen.loadedHome();
+                    });
+
+                    it(`loaded frame ${root} root with nested frames`, async () => {
+                        await screen[`navigateToPage${root}WithFrames`]();
+                        await screen[`loadedPage${root}WithFrames`]();
+                    });
+
+                    it("loaded players list", async () => {
+                        await screen.loadedPlayersList();
+                    });
+
+                    it("loaded player details and go back twice", async () => {
+                        await shared.testPlayerNavigated(playerTwo, screen);
+
+                        if (appSuspendResume) {
+                            await driver.backgroundApp(suspendTime);
+                            await screen.loadedElement(playerTwo.name); // wait for player
+                        }
+
+                        await shared.testPlayerNavigatedBack(screen, driver);
+
+                        if (appSuspendResume) {
+                            await driver.backgroundApp(suspendTime);
+                            await driver.waitForElement(playerOne.name); // wait for players list
+                        }
+
+                        await shared.testPlayerNavigated(playerTwo, screen);
+                        await shared.testPlayerNavigatedBack(screen, driver);
+                    });
+
+                    it("navigate parent frame and go back", async () => {
+                        await shared[`testSomePageNavigated${transition}`](screen);
+
+                        if (appSuspendResume) {
+                            await driver.backgroundApp(suspendTime);
+                            await screen.loadedElement(somePage); // wait for some page
+                        }
+
+                        if (driver.isAndroid) {
+                            await driver.navBack();
+                        } else {
+                            await screen.goBackFromSomePage();
+                        }
+
+                        await screen.loadedPlayersList();
+                    });
+
+                    it("loaded player details and navigate parent frame and go back", async () => {
+                        await shared.testPlayerNavigated(playerTwo, screen);
+
+                        if (appSuspendResume) {
+                            await driver.backgroundApp(suspendTime);
+                            await screen.loadedElement(playerTwo.name); // wait for player
+                        }
+
+                        await shared[`testSomePageNavigated${transition}`](screen);
+
+                        if (appSuspendResume) {
+                            await driver.backgroundApp(suspendTime);
+                            await screen.loadedElement(somePage); // wait for some page
+                        }
+
+                        if (driver.isAndroid) {
+                            await driver.navBack();
+                        } else {
+                            await screen.goBackFromSomePage();
+                        }
+
+                        await screen.loadedPlayerDetails(playerTwo);
+
+                        await screen.goBackToPlayersList();
+                        await screen.loadedPlayersList();
+                    });
+
+                    it("toggle teams tab", async () => {
+                        await screen.toggleTeamsTab();
+
+                        if (appSuspendResume) {
+                            await driver.backgroundApp(suspendTime);
+                            await screen.loadedElement(teamOne.name); // wait for team
+                        }
+                    });
+
+                    it("loaded teams list", async () => {
+                        await screen.loadedTeamsList();
+                    });
+
+                    it("mix player and team list actions and go back", async () => {
+                        await screen.togglePlayersTab();
+
+                        if (appSuspendResume) {
+                            await driver.backgroundApp(suspendTime);
+                            await screen.loadedElement(playerOne.name); // wait for players list
+                        }
+
+                        await screen.loadedPlayersList();
+
+                        await shared.testPlayerNavigated(playerTwo, screen);
+
+                        if (appSuspendResume) {
+                            await driver.backgroundApp(suspendTime);
+                            await screen.loadedElement(playerTwo.name); // wait for player
+                        }
+
+                        await screen.loadedPlayerDetails(playerTwo);
+
+                        await shared[`testSomePageNavigated${transition}`](screen);
+
+                        if (appSuspendResume) {
+                            await driver.backgroundApp(suspendTime);
+                            await screen.loadedElement(somePage); // wait for some page
+                        }
+
+                        if (driver.isAndroid) {
+                            await driver.navBack();
+                        } else {
+                            await screen.goBackFromSomePage();
+                        }
+
+                        if (appSuspendResume) {
+                            // This sleeps prevent test to fail
+                            await driver.sleep(1000);
+                            await driver.backgroundApp(suspendTime);
+                            await screen.loadedElement(playerTwo.name); // wait for player
+                        }
+
+                        await screen.loadedPlayerDetails(playerTwo);
+
+                        await screen.toggleTeamsTab();
+
+                        if (appSuspendResume) {
+                            await driver.backgroundApp(suspendTime);
+                            await screen.loadedElement(teamOne.name); // wait for teams list
+                        }
+
+                        await screen.loadedTeamsList();
+
+                        await shared.testTeamNavigated(teamTwo, screen);
+
+                        if (appSuspendResume) {
+                            await screen.loadedElement(teamTwo.name); // wait for team
+                            await driver.backgroundApp(suspendTime);
+                            await screen.loadedElement(teamTwo.name); // wait for team
+                        }
+
+                        await screen.loadedTeamDetails(teamTwo);
+
+                        await shared[`testSomePageNavigated${transition}`](screen);
+
+                        if (appSuspendResume) {
+                            await driver.backgroundApp(suspendTime);
+                            await screen.loadedElement(somePage); // wait for some page
+                        }
+
+                        if (driver.isAndroid) {
+                            await driver.navBack();
+                        } else {
+                            await screen.goBackFromSomePage();
+                        }
+
+                        if (appSuspendResume) {
+                            await screen.loadedElement(teamTwo.name); // wait for team
+                            await driver.backgroundApp(suspendTime);
+                            await screen.loadedElement(teamTwo.name); // wait for team
+                        }
+
+                        await screen.loadedTeamDetails(teamTwo);
+
+                        await screen.togglePlayersTab();
+
+                        if (appSuspendResume) {
+                            await driver.backgroundApp(suspendTime);
+                            await screen.loadedElement(playerTwo.name); // wait for player
+                        }
+
+                        await screen.loadedPlayerDetails(playerTwo);
+
+                        await screen.toggleTeamsTab();
+
+                        await screen.goBackToTeamsList();
+                        await screen.loadedTeamsList();
+
+                        await screen.togglePlayersTab();
+
+                        await screen.goBackToPlayersList();
+                        await screen.loadedPlayersList();
+                    });
+
+                    it("loaded home page again", async () => {
+                        await screen[`goBackFrom${root}Page`]();
+                        await screen.loadedHome();
+                    });
+                });
+            }
+        });
+    }
+});
\ No newline at end of file
diff --git a/e2e/nested-frame-navigation/e2e/frame-tab-root.e2e-spec.ts b/e2e/nested-frame-navigation/e2e/frame-tab-root.e2e-spec.ts
index 00339c262..287567919 100644
--- a/e2e/nested-frame-navigation/e2e/frame-tab-root.e2e-spec.ts
+++ b/e2e/nested-frame-navigation/e2e/frame-tab-root.e2e-spec.ts
@@ -4,8 +4,8 @@ import { Screen, playersData, somePage, teamsData, driverDefaultWaitTime, Item }
 import * as shared from "./shared.e2e-spec";
 import { suspendTime, appSuspendResume, dontKeepActivities, transitions } from "./config";
 
-// NOTE: TabTop is Android only scenario (for iOS we will essentially execute 2x TabBottom)
-const roots = ["TabTop", "TabBottom"];
+// NOTE: TabViewTop is Android only scenario (for iOS we will essentially execute 2x TabViewBottom)
+const roots = ["TabViewTop", "TabViewBottom"];
 
 const rootType = "frame-tab-root";
 describe(rootType, async function () {
diff --git a/e2e/nested-frame-navigation/e2e/frame-tabs-root.e2e-spec.ts b/e2e/nested-frame-navigation/e2e/frame-tabs-root.e2e-spec.ts
new file mode 100644
index 000000000..c945ce48c
--- /dev/null
+++ b/e2e/nested-frame-navigation/e2e/frame-tabs-root.e2e-spec.ts
@@ -0,0 +1,264 @@
+import { AppiumDriver, createDriver, logWarn, nsCapabilities } from "nativescript-dev-appium";
+
+import { Screen, playersData, somePage, teamsData, driverDefaultWaitTime, Item } from "./screen";
+import * as shared from "./shared.e2e-spec";
+import { suspendTime, appSuspendResume, dontKeepActivities, transitions } from "./config";
+
+const roots = ["TabsTop", "TabsBottom"];
+
+const rootType = "frame-tabs-root";
+describe(rootType, async function () {
+    let driver: AppiumDriver;
+    let screen: Screen;
+
+    before(async () => {
+        nsCapabilities.testReporter.context = this;
+        logWarn(`====== ${rootType} ========`);
+        driver = await createDriver();
+        screen = new Screen(driver);
+        if (dontKeepActivities) {
+            await driver.setDontKeepActivities(true);
+        }
+
+        driver.defaultWaitTime = driverDefaultWaitTime;
+    });
+
+    after(async () => {
+        if (dontKeepActivities) {
+            await driver.setDontKeepActivities(false);
+        }
+        await driver.quit();
+        console.log("Quit driver!");
+    });
+
+    afterEach(async function () {
+        if (this.currentTest.state === "failed") {
+            await driver.logTestArtifacts(this.currentTest.title);
+        }
+    });
+
+    for (let index = 0; index < roots.length; index++) {
+        const root = roots[index];
+
+        describe(`${rootType}-${root} scenarios:`, async function () {
+            logWarn(`===== Root: ${root}`);
+            for (let trIndex = 0; trIndex < transitions.length; trIndex++) {
+                const transition = transitions[trIndex];
+                const playerOne: Item = playersData[`playerOne${transition}`];
+                const playerTwo: Item = playersData[`playerTwo${transition}`];
+                const teamOne: Item = teamsData[`teamOne${transition}`];
+                const teamTwo: Item = teamsData[`teamTwo${transition}`];
+
+                describe(`${rootType}-${root}-transition-${transition}-scenarios:`, async function () {
+
+                    before(async function () {
+                        nsCapabilities.testReporter.context = this;
+                        logWarn(`========= ${root}-${transition} =========`);
+
+                        if (transition === "Flip" &&
+                            driver.isAndroid && parseInt(driver.platformVersion) === 19) {
+                            // TODO: known issue https://github.com/NativeScript/NativeScript/issues/6798
+                            console.log("skipping flip transition tests on api level 19");
+                            this.skip();
+                        }
+                    });
+
+                    it("loaded home page", async () => {
+                        await screen.loadedHome();
+                    });
+
+                    it(`loaded frame ${root} root with nested frames`, async () => {
+                        await screen[`navigateToPage${root}WithFrames`]();
+                        await screen[`loadedPage${root}WithFrames`]();
+                    });
+
+                    it("loaded players list", async () => {
+                        await screen.loadedPlayersList();
+                    });
+
+                    it("loaded player details and go back twice", async () => {
+                        await shared.testPlayerNavigated(playerTwo, screen);
+
+                        if (appSuspendResume) {
+                            await driver.backgroundApp(suspendTime);
+                            await screen.loadedElement(playerTwo.name); // wait for player
+                        }
+
+                        await shared.testPlayerNavigatedBack(screen, driver);
+
+                        if (appSuspendResume) {
+                            await driver.backgroundApp(suspendTime);
+                            await driver.waitForElement(playerOne.name); // wait for players list
+                        }
+
+                        await shared.testPlayerNavigated(playerTwo, screen);
+                        await shared.testPlayerNavigatedBack(screen, driver);
+                    });
+
+                    it("navigate parent frame and go back", async () => {
+                        await shared[`testSomePageNavigated${transition}`](screen);
+
+                        if (appSuspendResume) {
+                            await driver.backgroundApp(suspendTime);
+                            await screen.loadedElement(somePage); // wait for some page
+                        }
+
+                        if (driver.isAndroid) {
+                            await driver.navBack();
+                        } else {
+                            await screen.goBackFromSomePage();
+                        }
+
+                        await screen.loadedPlayersList();
+                    });
+
+                    it("loaded player details and navigate parent frame and go back", async () => {
+                        await shared.testPlayerNavigated(playerTwo, screen);
+
+                        if (appSuspendResume) {
+                            await driver.backgroundApp(suspendTime);
+                            await screen.loadedElement(playerTwo.name); // wait for player
+                        }
+
+                        await shared[`testSomePageNavigated${transition}`](screen);
+
+                        if (appSuspendResume) {
+                            await driver.backgroundApp(suspendTime);
+                            await screen.loadedElement(somePage); // wait for some page
+                        }
+
+                        if (driver.isAndroid) {
+                            await driver.navBack();
+                        } else {
+                            await screen.goBackFromSomePage();
+                        }
+
+                        await screen.loadedPlayerDetails(playerTwo);
+
+                        await screen.goBackToPlayersList();
+                        await screen.loadedPlayersList();
+                    });
+
+                    it("toggle teams tab", async () => {
+                        await screen.toggleTeamsTab();
+
+                        if (appSuspendResume) {
+                            await driver.backgroundApp(suspendTime);
+                            await screen.loadedElement(teamOne.name); // wait for team
+                        }
+                    });
+
+                    it("loaded teams list", async () => {
+                        await screen.loadedTeamsList();
+                    });
+
+                    it("mix player and team list actions and go back", async () => {
+                        await screen.togglePlayersTab();
+
+                        if (appSuspendResume) {
+                            await driver.backgroundApp(suspendTime);
+                            await screen.loadedElement(playerOne.name); // wait for players list
+                        }
+
+                        await screen.loadedPlayersList();
+
+                        await shared.testPlayerNavigated(playerTwo, screen);
+
+                        if (appSuspendResume) {
+                            await driver.backgroundApp(suspendTime);
+                            await screen.loadedElement(playerTwo.name); // wait for player
+                        }
+
+                        await screen.loadedPlayerDetails(playerTwo);
+
+                        await shared[`testSomePageNavigated${transition}`](screen);
+
+                        if (appSuspendResume) {
+                            await driver.backgroundApp(suspendTime);
+                            await screen.loadedElement(somePage); // wait for some page
+                        }
+
+                        if (driver.isAndroid) {
+                            await driver.navBack();
+                        } else {
+                            await screen.goBackFromSomePage();
+                        }
+
+                        if (appSuspendResume) {
+                            // This sleeps prevent test to fail
+                            await driver.sleep(1000);
+                            await driver.backgroundApp(suspendTime);
+                            await screen.loadedElement(playerTwo.name); // wait for player
+                        }
+
+                        await screen.loadedPlayerDetails(playerTwo);
+
+                        await screen.toggleTeamsTab();
+
+                        if (appSuspendResume) {
+                            await driver.backgroundApp(suspendTime);
+                            await screen.loadedElement(teamOne.name); // wait for teams list
+                        }
+
+                        await screen.loadedTeamsList();
+
+                        await shared.testTeamNavigated(teamTwo, screen);
+
+                        if (appSuspendResume) {
+                            await screen.loadedElement(teamTwo.name); // wait for team
+                            await driver.backgroundApp(suspendTime);
+                            await screen.loadedElement(teamTwo.name); // wait for team
+                        }
+
+                        await screen.loadedTeamDetails(teamTwo);
+
+                        await shared[`testSomePageNavigated${transition}`](screen);
+
+                        if (appSuspendResume) {
+                            await driver.backgroundApp(suspendTime);
+                            await screen.loadedElement(somePage); // wait for some page
+                        }
+
+                        if (driver.isAndroid) {
+                            await driver.navBack();
+                        } else {
+                            await screen.goBackFromSomePage();
+                        }
+
+                        if (appSuspendResume) {
+                            await screen.loadedElement(teamTwo.name); // wait for team
+                            await driver.backgroundApp(suspendTime);
+                            await screen.loadedElement(teamTwo.name); // wait for team
+                        }
+
+                        await screen.loadedTeamDetails(teamTwo);
+
+                        await screen.togglePlayersTab();
+
+                        if (appSuspendResume) {
+                            await driver.backgroundApp(suspendTime);
+                            await screen.loadedElement(playerTwo.name); // wait for player
+                        }
+
+                        await screen.loadedPlayerDetails(playerTwo);
+
+                        await screen.toggleTeamsTab();
+
+                        await screen.goBackToTeamsList();
+                        await screen.loadedTeamsList();
+
+                        await screen.togglePlayersTab();
+
+                        await screen.goBackToPlayersList();
+                        await screen.loadedPlayersList();
+                    });
+
+                    it("loaded home page again", async () => {
+                        await screen[`goBackFrom${root}Page`]();
+                        await screen.loadedHome();
+                    });
+                });
+            }
+        });
+    }
+});
\ No newline at end of file
diff --git a/e2e/nested-frame-navigation/e2e/screen.ts b/e2e/nested-frame-navigation/e2e/screen.ts
index f847b3273..842d939f1 100644
--- a/e2e/nested-frame-navigation/e2e/screen.ts
+++ b/e2e/nested-frame-navigation/e2e/screen.ts
@@ -6,18 +6,30 @@ const layoutWithMultiFrame = "Layout w/ multi frame";
 const pageWithFrame = "Page w/ frame";
 const pageWithFrameNonDefaultTransition = "Frame to NestedFrame (non-default transition)";
 const pageWithMultiFrame = "Page w/ multi frame";
-const pageTabTopWithFrames = "Page w/ tabview (top)";
-const pageTabBottomWithFrames = "Page w/ tabview (bottom)";
+const pageTabViewTopWithFrames = "Page w/ tabview (top)";
+const pageTabViewBottomWithFrames = "Page w/ tabview (bottom)";
 const tabTopRootWithFrames = "Root tabview (top)";
 const tabBottomRootWithFrames = "Root tabview (bottom)";
+const pageTabsTopWithFrames = "Page w/ tabs (top)";
+const pageTabsBottomWithFrames = "Page w/ tabs (bottom)";
+const pageBottomNavigationWithFrames = "Page w/ bottom navigation";
+const tabsTopRootWithFrames = "Root tabs (top)";
+const tabsBottomRootWithFrames = "Root tabs (bottom)";
+const bottomNavigationRootWithFrames = "Root bottom navigation";
 const layoutHome = "layout home page";
 const layoutHomeSecondary = "layout home secondary page";
 const frameHome = "frame home page";
 const frameHomeSecondary = "multi frame home page";
 const tabViewTopHome = "tabview top page";
 const tabViewBottomHome = "tabview bottom page";
-const tabViewRootTopHome = "tabview root top home";
-const tabViewRootBottomHome = "tabview root bottom home";
+const tabViewTopRootHome = "tabview root top home";
+const tabViewBottomRootHome = "tabview root bottom home";
+const tabsTopHome = "tabs top page";
+const tabsBottomHome = "tabs bottom page";
+const tabsTopRootHome = "tabs root top home";
+const tabsBottomRootHome = "tabs root bottom home";
+const bottomNavigationHome = "bottom navigation page";
+const bottomNavigationRootHome = "bottom navigation root home";
 const navigateToStillOtherPageSlide = "navigate to still other page (slide transition)";
 const navigateToSomePageDefault = "navigate to some page (default transition)";
 const navigateToSomePageNone = "navigate to some page (no transition)";
@@ -29,14 +41,20 @@ const navigateToOtherPageSlide = "navigate to other page (slide transition)";
 const navigateToOtherPageFlip = "navigate to other page (flip transition)";
 const players = "Players";
 const teams = "Teams";
+const playersTab = "playersTabNavigation";
+const teamsTab = "teamsTabNavigation";
+const dummyTab = "dummyTabNavigation";
 const playerBack = "playerBack";
 const stillOtherPageBack = "stillOtherPageBack";
 const somePageBack = "somePageBack";
 const otherPageBack = "otherPageBack";
 const teamBack = "teamBack";
 const frameHomeBack = "frameHomeBack";
-const tabTopBack = "tabTopBack";
-const tabBottomBack = "tabBottomBack";
+const tabViewTopBack = "tabViewTopBack";
+const tabViewBottomBack = "tabViewBottomBack";
+const tabsTopBack = "tabsTopBack";
+const tabsBottomBack = "tabsBottomBack";
+const bottomNavigationBack = "bottomNavigationBack";
 const resetApp = "reset app";
 
 export const driverDefaultWaitTime = 10000;
@@ -165,22 +183,46 @@ export class Screen {
         await this.navigateToPage(pageWithMultiFrame);
     }
 
-    navigateToPageTabTopWithFrames = async () => {
-        await this.navigateToPage(pageTabTopWithFrames);
+    navigateToPageTabViewTopWithFrames = async () => {
+        await this.navigateToPage(pageTabViewTopWithFrames);
     }
 
-    navigateToPageTabBottomWithFrames = async () => {
-        await this.navigateToPage(pageTabBottomWithFrames);
+    navigateToPageTabViewBottomWithFrames = async () => {
+        await this.navigateToPage(pageTabViewBottomWithFrames);
     }
 
-    navigateToTabTopRootWithFrames = async () => {
+    navigateToTabViewTopRootWithFrames = async () => {
         await this.navigateToPage(tabTopRootWithFrames);
     }
 
-    navigateToTabBottomRootWithFrames = async () => {
+    navigateToTabViewBottomRootWithFrames = async () => {
         await this.navigateToPage(tabBottomRootWithFrames);
     }
 
+    navigateToPageTabsTopWithFrames = async () => {
+        await this.navigateToPage(pageTabsTopWithFrames);
+    }
+
+    navigateToPageTabsBottomWithFrames = async () => {
+        await this.navigateToPage(pageTabsBottomWithFrames);
+    }
+
+    navigateToPageBottomNavigationWithFrames = async () => {
+        await this.navigateToPage(pageBottomNavigationWithFrames);
+    }
+
+    navigateToTabsTopRootWithFrames = async () => {
+        await this.navigateToPage(tabsTopRootWithFrames);
+    }
+
+    navigateToTabsBottomRootWithFrames = async () => {
+        await this.navigateToPage(tabsBottomRootWithFrames);
+    }
+
+    navigateToBottomNavigationRootWithFrames = async () => {
+        await this.navigateToPage(bottomNavigationRootWithFrames);
+    }
+
     navigateToStillOtherPageSlide = async () => {
         await this.navigateToPage(navigateToStillOtherPageSlide);
     }
@@ -256,22 +298,34 @@ export class Screen {
         await this.goBack(frameHomeBack);
     }
 
-    goBackFromTabTopPage = async () => {
-        await this.goBack(tabTopBack);
+    goBackFromTabViewTopPage = async () => {
+        await this.goBack(tabViewTopBack);
     }
 
-    goBackFromTabBottomPage = async () => {
-        await this.goBack(tabBottomBack);
+    goBackFromTabViewBottomPage = async () => {
+        await this.goBack(tabViewBottomBack);
+    }
+
+    goBackFromTabsTopPage = async () => {
+        await this.goBack(tabsTopBack);
+    }
+
+    goBackFromTabsBottomPage = async () => {
+        await this.goBack(tabsBottomBack);
+    }
+
+    goBackFromBottomNavigationPage = async () => {
+        await this.goBack(bottomNavigationBack);
     }
 
     togglePlayersTab = async () => {
-        const lblPlayers = await this._driver.waitForElement(players);
+        const lblPlayers = await this._driver.waitForElement(playersTab);
         logInfo(`====== Navigate to "${players}"`);
         await lblPlayers.tap();
     }
 
     toggleTeamsTab = async () => {
-        const lblTeams = await this._driver.waitForElement(teams);
+        const lblTeams = await this._driver.waitForElement(teamsTab);
         logInfo(`====== Navigate to "${teams}"`);
         await lblTeams.tap();
     }
@@ -299,20 +353,44 @@ export class Screen {
         await this.loadedPage(frameHomeSecondary);
     }
 
-    loadedPageTabTopWithFrames = async () => {
+    loadedPageTabViewTopWithFrames = async () => {
         await this.loadedPage(tabViewTopHome);
     }
 
-    loadedPageTabBottomWithFrames = async () => {
+    loadedPageTabViewBottomWithFrames = async () => {
         await this.loadedPage(tabViewBottomHome);
     }
 
-    loadedTabTopRootWithFrames = async () => {
-        await this.loadedPage(tabViewRootTopHome);
+    loadedTabViewTopRootWithFrames = async () => {
+        await this.loadedPage(tabViewTopRootHome);
     }
 
-    loadedTabBottomRootWithFrames = async () => {
-        await this.loadedPage(tabViewRootBottomHome);
+    loadedTabViewBottomRootWithFrames = async () => {
+        await this.loadedPage(tabViewBottomRootHome);
+    }
+
+    loadedPageTabsTopWithFrames = async () => {
+        await this.loadedPage(tabsTopHome);
+    }
+
+    loadedPageTabsBottomWithFrames = async () => {
+        await this.loadedPage(tabsBottomHome);
+    }
+
+    loadedPageBottomNavigationWithFrames = async () => {
+        await this.loadedPage(bottomNavigationHome);
+    }
+
+    loadedTabsTopRootWithFrames = async () => {
+        await this.loadedPage(tabsTopRootHome);
+    }
+
+    loadedTabsBottomRootWithFrames = async () => {
+        await this.loadedPage(tabsBottomRootHome);
+    }
+
+    loadedBottomNavigationRootWithFrames = async () => {
+        await this.loadedPage(bottomNavigationRootHome);
     }
     
     loadedStillOtherPage = async () => {
diff --git a/e2e/nested-frame-navigation/e2e/tab-root.e2e-spec.ts b/e2e/nested-frame-navigation/e2e/tab-root.e2e-spec.ts
index e6b1af1ee..fe198bbde 100644
--- a/e2e/nested-frame-navigation/e2e/tab-root.e2e-spec.ts
+++ b/e2e/nested-frame-navigation/e2e/tab-root.e2e-spec.ts
@@ -4,8 +4,8 @@ import { Screen, playersData, teamsData } from "./screen";
 import * as shared from "./shared.e2e-spec";
 import { suspendTime, appSuspendResume, dontKeepActivities, transitions } from "./config";
 
-// NOTE: TabTop is Android only scenario (for iOS we will essentially execute 2x TabBottom)
-const roots = ["TabTop", "TabBottom"];
+// NOTE: TabViewTop is Android only scenario (for iOS we will essentially execute 2x TabViewBottom)
+const roots = ["TabViewTop", "TabViewBottom"];
 
 const rootType = "tab-root";
 describe(rootType, async function () {
diff --git a/e2e/nested-frame-navigation/e2e/tabs-root.e2e-spec.ts b/e2e/nested-frame-navigation/e2e/tabs-root.e2e-spec.ts
new file mode 100644
index 000000000..61982d38a
--- /dev/null
+++ b/e2e/nested-frame-navigation/e2e/tabs-root.e2e-spec.ts
@@ -0,0 +1,180 @@
+import { AppiumDriver, createDriver, logWarn, nsCapabilities } from "nativescript-dev-appium";
+
+import { Screen, playersData, teamsData } from "./screen";
+import * as shared from "./shared.e2e-spec";
+import { suspendTime, appSuspendResume, dontKeepActivities, transitions } from "./config";
+
+const roots = ["TabsTop", "TabsBottom"];
+
+const rootType = "tabs-root";
+describe(rootType, async function () {
+    let driver: AppiumDriver;
+    let screen: Screen;
+
+    before(async function () {
+        nsCapabilities.testReporter.context = this;
+        logWarn(`====== ${rootType} ========`);
+        driver = await createDriver();
+        screen = new Screen(driver);
+        if (dontKeepActivities) {
+            await driver.setDontKeepActivities(true);
+        }
+
+        driver.defaultWaitTime = 8000;
+    });
+
+    after(async function () {
+        if (dontKeepActivities) {
+            await driver.setDontKeepActivities(false);
+        }
+        await driver.quit();
+        console.log("Quit driver!");
+    });
+
+    afterEach(async function () {
+        if (this.currentTest.state === "failed") {
+            await driver.logTestArtifacts(this.currentTest.title);
+        }
+    });
+
+    for (let index = 0; index < roots.length; index++) {
+        const root = roots[index];
+        describe(`${rootType}-${root}-scenarios:`, async function () {
+
+            before(async function () {
+                nsCapabilities.testReporter.context = this;
+            });
+
+            for (let index = 0; index < transitions.length; index++) {
+                const transition = transitions[index];
+
+                const playerOne = playersData[`playerOne${transition}`];
+                const playerTwo = playersData[`playerTwo${transition}`];
+                const teamOne = teamsData[`teamOne${transition}`];
+                const teamTwo = teamsData[`teamTwo${transition}`];
+
+                describe(`${rootType}-${root}-transition-${transition}-scenarios:`, async function () {
+
+                    before(async function () {
+                        nsCapabilities.testReporter.context = this;
+
+                        if (transition === "Flip" &&
+                            driver.isAndroid && parseInt(driver.platformVersion) === 19) {
+                            // TODO: known issue https://github.com/NativeScript/NativeScript/issues/6798
+                            console.log("skipping flip transition tests on api level 19");
+                            this.skip();
+                        }
+                    });
+
+                    it("loaded home page", async function () {
+                        await screen.loadedHome();
+                    });
+
+                    it(`loaded ${root} root with frames`, async function () {
+                        await screen[`navigateTo${root}RootWithFrames`]();
+                        await screen[`loaded${root}RootWithFrames`]();
+                    });
+
+                    it("loaded players list", async function () {
+                        await screen.loadedPlayersList();
+                    });
+
+                    it("loaded player details and go back twice", async function () {
+                        await shared.testPlayerNavigated(playerTwo, screen);
+
+                        if (appSuspendResume) {
+                            await driver.backgroundApp(suspendTime);
+                            await driver.waitForElement(playerTwo.name); // wait for player
+                        }
+
+                        await shared.testPlayerNavigatedBack(screen, driver);
+
+                        if (appSuspendResume) {
+                            await driver.backgroundApp(suspendTime);
+                            await driver.waitForElement(playerOne.name); // wait for players list
+                        }
+
+                        await shared.testPlayerNavigated(playerTwo, screen);
+                        await shared.testPlayerNavigatedBack(screen, driver);
+                    });
+
+                    it("toggle teams tab", async function () {
+                        await screen.toggleTeamsTab();
+
+                        if (appSuspendResume) {
+                            await driver.backgroundApp(suspendTime);
+                            await driver.waitForElement(teamOne.name); // wait for teams list
+                        }
+                    });
+
+                    it("loaded teams list", async function () {
+                        await screen.loadedTeamsList();
+                    });
+
+                    it("mix player and team list actions and go back", async function () {
+                        await screen.togglePlayersTab();
+
+                        if (appSuspendResume) {
+                            await driver.backgroundApp(suspendTime);
+                            await driver.waitForElement(playerOne.name); // wait for players list
+                        }
+
+                        await screen.loadedPlayersList();
+
+                        await shared.testPlayerNavigated(playerTwo, screen);
+
+                        if (driver.isIOS) {
+                            if (appSuspendResume) {
+                                await driver.backgroundApp(suspendTime);
+                                await driver.waitForElement(playerTwo.name); // wait for player
+                            }
+                        }
+
+                        await screen.toggleTeamsTab();
+
+                        if (driver.isIOS) {
+                            // TODO: run in background from appium breaks the test. Investigate the issue, once with the app and with appium
+                            if (appSuspendResume) {
+                                await driver.backgroundApp(suspendTime);
+                                await driver.waitForElement(teamOne.name); // wait for teams list
+                            }
+                        }
+
+                        await screen.loadedTeamsList();
+
+                        await shared.testTeamNavigated(teamTwo, screen);
+
+                        if (appSuspendResume) {
+                            await driver.backgroundApp(suspendTime);
+                            await driver.waitForElement(teamTwo.name); // wait for team
+                        }
+
+                        await screen.togglePlayersTab();
+
+                        if (appSuspendResume) {
+                            await driver.backgroundApp(suspendTime);
+                            await driver.waitForElement(playerTwo.name); // wait for player
+                        }
+
+                        await screen.loadedPlayerDetails(playerTwo);
+
+                        await screen.toggleTeamsTab();
+
+                        await screen.goBackToTeamsList();
+                        await screen.loadedTeamsList();
+
+                        await screen.togglePlayersTab();
+
+                        await screen.goBackToPlayersList();
+                        await screen.loadedPlayersList();
+                    });
+
+                    it("loaded home page again", async function () {
+                        await screen.resetToHome();
+                        await screen.loadedHome();
+                    });
+                });
+            }
+        });
+    }
+});
diff --git a/tests/app/ui/tabs/tabs-navigation-tests.ts b/tests/app/ui/tabs/tabs-navigation-tests.ts
index d06b06331..8489663d1 100644
--- a/tests/app/ui/tabs/tabs-navigation-tests.ts
+++ b/tests/app/ui/tabs/tabs-navigation-tests.ts
@@ -10,7 +10,7 @@ import { Button } from "tns-core-modules/ui/button";
 
 var ASYNC = 2;
 
-function _createBottomNavigation(): Tabs {
+function _createTabsNavigation(): Tabs {
     var tabView = new Tabs();
     tabView.id = "BottomNavigation";
 
@@ -97,7 +97,7 @@ export function testBackNavigationToTabViewWithNestedFramesShouldWork() {
     let tabView: Tabs;
 
     const pageFactory = function (): Page {
-        tabView = _createBottomNavigation();
+        tabView = _createTabsNavigation();
         let items = Array<TabContentItem>();
         let tabViewitem = new TabContentItem();
         // tabViewitem.title = "Item1";
@@ -141,7 +141,7 @@ export function testWhenNavigatingBackToANonCachedPageContainingATabViewWithALis
     let tabView: Tabs;
 
     let pageFactory = function (): Page {
-        tabView = _createBottomNavigation();
+        tabView = _createTabsNavigation();
         let items = Array<TabContentItem>();
         let tabViewitem = new TabContentItem();
         // tabViewitem.title = "List";
@@ -215,7 +215,7 @@ export function testLoadedAndUnloadedAreFired_WhenNavigatingAwayAndBack() {
     let loadedEventsCount = [0, 0];
     let unloadedEventsCount = [0, 0];
 
-    const tabView = _createBottomNavigation();
+    const tabView = _createTabsNavigation();
     tabView.items = _createContentItems(itemCount);
     tabView.tabStrip = _createTabStrip(itemCount);
 
diff --git a/tns-core-modules/ui/tabs/tabs.ios.ts b/tns-core-modules/ui/tabs/tabs.ios.ts
index 9239454ac..c3202c310 100644
--- a/tns-core-modules/ui/tabs/tabs.ios.ts
+++ b/tns-core-modules/ui/tabs/tabs.ios.ts
@@ -269,7 +269,8 @@ class UIPageViewControllerDataSourceImpl extends NSObject implements UIPageViewC
         //     prevViewController = owner.getViewController(prevItem);
         // }
 
-        (<TabContentItem>prevItem).canBeLoaded = true;
+        owner._setCanBeLoaded(selectedIndex);
+        owner._loadUnloadTabItems(selectedIndex);
 
         return prevViewController;
     }
@@ -295,7 +296,8 @@ class UIPageViewControllerDataSourceImpl extends NSObject implements UIPageViewC
         //     nextViewController = owner.getViewController(nextItem);
         // }
 
-        (<TabContentItem>nextItem).canBeLoaded = true;
+        owner._setCanBeLoaded(selectedIndex);
+        owner._loadUnloadTabItems(selectedIndex);
         // nextItem.loadView(nextItem.view);
 
         return nextViewController;
@@ -675,7 +677,6 @@ export class Tabs extends TabsBase {
         toLoad.forEach(index => {
             const item = items[index];
             if (this.isLoaded && items[index]) {
-                (<any>item).canBeLoaded = true;
                 item.loadView(item.view);
             }
         });
@@ -775,6 +776,18 @@ export class Tabs extends TabsBase {
         return newController;
     }
 
+    public _setCanBeLoaded(index: number) {
+        const items = this.items;
+        const lastIndex = items.length - 1;
+        const offsideItems = this.offscreenTabLimit;
+
+        iterateIndexRange(index, offsideItems, lastIndex, (i) => {
+            if (items[i]) {
+                (<TabContentItem>items[i]).canBeLoaded = true;
+            }
+        });
+    }
+
     private setViewControllers(items: TabContentItem[]) {
         const length = items ? items.length : 0;
         if (length === 0) {
@@ -1033,7 +1046,6 @@ export class Tabs extends TabsBase {
         // if (traceEnabled()) {
         //     traceWrite("TabView._onSelectedIndexPropertyChangedSetNativeValue(" + value + ")", traceCategories.Debug);
         // }
-        const that = this;
 
         if (value > -1) {
             const item = this.items[value];
@@ -1056,7 +1068,9 @@ export class Tabs extends TabsBase {
             this._currentNativeSelectedIndex = value;
             this.viewController.setViewControllersDirectionAnimatedCompletion(controllers, navigationDirection, true, (finished: boolean) => {
                 if (finished) {
-                    that._canSelectItem = true;
+                    this._canSelectItem = true;
+                    this._setCanBeLoaded(value);
+                    this._loadUnloadTabItems(value);
                 }
             });
 

From 9fd5ddc9e30bc57932ff55d6f301477c01e919c9 Mon Sep 17 00:00:00 2001
From: Martin Yankov <m.i.yankov@gmail.com>
Date: Thu, 25 Jul 2019 21:56:01 +0300
Subject: [PATCH 3/5] fix(android): remove wait for doubletap if no gesture
 recognizer (#7584)

---
 tns-core-modules/ui/gestures/gestures.android.ts | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/tns-core-modules/ui/gestures/gestures.android.ts b/tns-core-modules/ui/gestures/gestures.android.ts
index 89330e4e2..019e3935e 100644
--- a/tns-core-modules/ui/gestures/gestures.android.ts
+++ b/tns-core-modules/ui/gestures/gestures.android.ts
@@ -68,13 +68,20 @@ function initializeTapAndDoubleTapGestureListener() {
         }
 
         private _handleSingleTap(motionEvent: android.view.MotionEvent): void {
-            this._tapTimeoutId = timer.setTimeout(() => {
+            if (this._target.getGestureObservers(GestureTypes.doubleTap)) {
+                this._tapTimeoutId = timer.setTimeout(() => {
+                    if (this._type & GestureTypes.tap) {
+                        const args = _getArgs(GestureTypes.tap, this._target, motionEvent);
+                        _executeCallback(this._observer, args);
+                    }
+                    timer.clearTimeout(this._tapTimeoutId);
+                }, TapAndDoubleTapGestureListenerImpl.DoubleTapTimeout);
+            } else {
                 if (this._type & GestureTypes.tap) {
                     const args = _getArgs(GestureTypes.tap, this._target, motionEvent);
                     _executeCallback(this._observer, args);
                 }
-                timer.clearTimeout(this._tapTimeoutId);
-            }, TapAndDoubleTapGestureListenerImpl.DoubleTapTimeout);
+            }
         }
 
         private _handleDoubleTap(motionEvent: android.view.MotionEvent): void {

From f00b370dbb1d67095df8e186c6e99b2b5603c000 Mon Sep 17 00:00:00 2001
From: Martin Yankov <m.i.yankov@gmail.com>
Date: Fri, 26 Jul 2019 13:53:55 +0300
Subject: [PATCH 4/5] fix(tabs): tab bar not visible when nested in layout
 (#7544)

---
 e2e/ui-tests-app/app/tabs/main-page.ts        |  2 +
 .../tabs/nested-bottom-navigation-page.xml    | 39 ++++++++
 .../app/tabs/nested-layout-page.xml           | 26 +++++
 e2e/ui-tests-app/app/tabs/tabs-page.xml       | 63 +------------
 tns-core-modules/ui/tabs/tabs.ios.ts          | 94 +++----------------
 5 files changed, 84 insertions(+), 140 deletions(-)
 create mode 100644 e2e/ui-tests-app/app/tabs/nested-bottom-navigation-page.xml
 create mode 100644 e2e/ui-tests-app/app/tabs/nested-layout-page.xml

diff --git a/e2e/ui-tests-app/app/tabs/main-page.ts b/e2e/ui-tests-app/app/tabs/main-page.ts
index 65d381991..17acc66e8 100644
--- a/e2e/ui-tests-app/app/tabs/main-page.ts
+++ b/e2e/ui-tests-app/app/tabs/main-page.ts
@@ -27,6 +27,8 @@ export function loadExamples() {
     examples.set("tabs-position", "tabs/tabs-position-page");
     examples.set("tabs-binding", "tabs/tabs-binding-page");
     examples.set("font-icons", "tabs/font-icons-page");
+    examples.set("nested-layout", "tabs/nested-layout-page");
+    examples.set("nested-bottom-navigation", "tabs/nested-bottom-navigation-page");
 
     return examples;
 }
diff --git a/e2e/ui-tests-app/app/tabs/nested-bottom-navigation-page.xml b/e2e/ui-tests-app/app/tabs/nested-bottom-navigation-page.xml
new file mode 100644
index 000000000..c2e750418
--- /dev/null
+++ b/e2e/ui-tests-app/app/tabs/nested-bottom-navigation-page.xml
@@ -0,0 +1,39 @@
+<Page class="page">
+
+    <ActionBar title="Tabs nested in Layout" icon="" class="action-bar">
+    </ActionBar>
+
+    <BottomNavigation>
+      <TabStrip>
+          <TabStripItem title="First"></TabStripItem>
+          <TabStripItem title="Second"></TabStripItem>
+      </TabStrip>
+  
+      <TabContentItem>
+          <Tabs>
+            <TabStrip backgroundColor="palevioletred">
+                <TabStripItem title="First"></TabStripItem>
+                <TabStripItem title="Second"></TabStripItem>
+            </TabStrip>
+        
+            <TabContentItem>
+                <GridLayout backgroundColor="skyblue">
+                  <Label text="First View"/>
+                </GridLayout>
+            </TabContentItem>
+        
+            <TabContentItem>
+                <GridLayout backgroundColor="gold">
+                  <Label text="Second View" />
+                </GridLayout>
+            </TabContentItem>
+          </Tabs>
+      </TabContentItem>
+  
+      <TabContentItem>
+          <GridLayout>
+            <Label text="Second View" />
+          </GridLayout>
+      </TabContentItem>
+    </BottomNavigation>
+  </Page>
\ No newline at end of file
diff --git a/e2e/ui-tests-app/app/tabs/nested-layout-page.xml b/e2e/ui-tests-app/app/tabs/nested-layout-page.xml
new file mode 100644
index 000000000..922365fe3
--- /dev/null
+++ b/e2e/ui-tests-app/app/tabs/nested-layout-page.xml
@@ -0,0 +1,26 @@
+<Page class="page">
+
+    <ActionBar title="Tabs nested in Layout" icon="" class="action-bar">
+    </ActionBar>
+  
+    <GridLayout>
+      <Tabs>
+        <TabStrip backgroundColor="palevioletred">
+            <TabStripItem title="First"></TabStripItem>
+            <TabStripItem title="Second"></TabStripItem>
+        </TabStrip>
+    
+        <TabContentItem>
+            <GridLayout backgroundColor="skyblue">
+              <Label text="First View" />
+            </GridLayout>
+        </TabContentItem>
+    
+        <TabContentItem>
+            <GridLayout backgroundColor="gold">
+              <Label text="Second View" />
+            </GridLayout>
+        </TabContentItem>
+      </Tabs>
+    </GridLayout>
+  </Page>
\ No newline at end of file
diff --git a/e2e/ui-tests-app/app/tabs/tabs-page.xml b/e2e/ui-tests-app/app/tabs/tabs-page.xml
index e16c9aa92..865a806fa 100644
--- a/e2e/ui-tests-app/app/tabs/tabs-page.xml
+++ b/e2e/ui-tests-app/app/tabs/tabs-page.xml
@@ -3,87 +3,34 @@
   <ActionBar title="Tabs" icon="" class="action-bar">
   </ActionBar>
 
-  <!-- w/o TabStrip -->
-  <!-- <BottomNavigation>
-      <TabContentItem>
-        <GridLayout>
-          <Label text="First View"/>
-        </GridLayout>
-      </TabContentItem>
-      <TabContentItem>
-        <GridLayout>
-          <Label text="Second View"/>
-        </GridLayout>
-      </TabContentItem>
-  </BottomNavigation> -->
-
-  <!-- w/ TabStrip -->
-  <Tabs id="tabsNav" automationText="tabNavigation"  >
-    <TabStrip>
+  <Tabs id="tabsNav" automationText="tabNavigation">
+    <TabStrip backgroundColor="palevioletred">
       <TabStripItem title="First Tab 11" iconSource="res://icon"></TabStripItem>
       <TabStripItem>
-        <!-- <Image src="res://icon" /> -->
         <Label text="News" />
       </TabStripItem>
-      <!-- <TabStripItem title="Favorites" iconSource="res://icon"></TabStripItem> -->
       <TabStripItem>
-        <!-- <Image src="res://icon" /> -->
         <Label text="Places" />
       </TabStripItem>
-      <!-- <TabStripItem title="Music" iconSource="res://icon"></TabStripItem> -->
     </TabStrip>
 
     <TabContentItem>
-      <StackLayout backgroundColor="blue">
+      <StackLayout backgroundColor="skyblue">
         <Label text="First View"/>
         <Button tap="goToSecond" text="go to second" />
       </StackLayout>
     </TabContentItem>
     <TabContentItem>
-      <StackLayout backgroundColor="red">
+      <StackLayout backgroundColor="gold">
         <Label text="Second View"/>
         <Button tap="goToFirst" text="go to first" />
       </StackLayout>
     </TabContentItem>
     <TabContentItem>
-      <StackLayout backgroundColor="green">
+      <StackLayout backgroundColor="olive">
         <Label text="First View"/>
         <Button tap="goToSecond" text="go to second" />
       </StackLayout>
     </TabContentItem>
-    <!-- <TabContentItem>
-      <StackLayout>
-        <Label text="Second View"/>
-        <Button tap="goToFirst" text="go to first" />
-      </StackLayout>
-    </TabContentItem>
-    <TabContentItem>
-      <StackLayout>
-        <Label text="First View"/>
-        <Button tap="goToSecond" text="go to second" />
-      </StackLayout>
-    </TabContentItem> -->
   </Tabs>
-
-  <!-- =============================================================================================== -->
-
-  <!-- Bottom Bar with TabStrip -->
-  <!-- <BottomNavigationBar>
-    <TabStrip>
-      <TabStripItem title="First Tab" iconSource="res://icon"></TabStripItem>
-      <TabStripItem>
-        <Image src="res://icon" />
-        <Label text="Second Tab" />
-      </TabStripItem>
-    </TabStrip>
-  </BottomNavigationBar> -->
-
-  <!-- Bottom Bar w/o TabStrip -->
-  <!-- <BottomNavigationBar>
-    <TabStripItem title="First Tab" iconSource="res://icon"></TabStripItem>
-    <TabStripItem>
-      <Image src="res://icon" />
-      <Label text="Second Tab" />
-    </TabStripItem>
-  </BottomNavigationBar> -->
 </Page>
\ No newline at end of file
diff --git a/tns-core-modules/ui/tabs/tabs.ios.ts b/tns-core-modules/ui/tabs/tabs.ios.ts
index c3202c310..f85baf621 100644
--- a/tns-core-modules/ui/tabs/tabs.ios.ts
+++ b/tns-core-modules/ui/tabs/tabs.ios.ts
@@ -111,14 +111,23 @@ class UIPageViewControllerImpl extends UIPageViewController {
 
     public viewDidLayoutSubviews(): void {
         super.viewDidLayoutSubviews();
-
         const owner = this._owner.get();
+        if (!owner) {
+            return;
+        }
+
         const tabsPosition = owner.tabsPosition;
+        const parent = owner.parent;
 
         let tabBarTop = this.view.safeAreaInsets.top;
         let tabBarHeight = this.tabBar.frame.size.height;
         let scrollViewTop = this.tabBar.frame.size.height;
-        let scrollViewHeight = this.view.bounds.size.height - this.tabBar.frame.size.height + this.view.safeAreaInsets.bottom;
+        let scrollViewHeight = this.view.bounds.size.height - this.tabBar.frame.size.height;
+
+        if (parent) {
+            // TODO: Figure out a better way to handle ViewController nesting/Safe Area nesting
+            tabBarTop = Math.max(this.view.safeAreaInsets.top, owner.parent.nativeView.safeAreaInsets.top);
+        }
 
         if (tabsPosition === "bottom") {
             tabBarTop = this.view.frame.size.height - this.tabBar.frame.size.height - this.view.safeAreaInsets.bottom;
@@ -126,45 +135,7 @@ class UIPageViewControllerImpl extends UIPageViewController {
             scrollViewHeight = this.view.frame.size.height - this.view.safeAreaInsets.bottom;
         }
 
-        this.tabBar.frame = CGRectMake(this.view.safeAreaInsets.left, tabBarTop, this.tabBar.frame.size.width, tabBarHeight); //this.view.safeAreaLayoutGuide.layoutFrame;
-        // this.additionalSafeAreaInsets = new UIEdgeInsets({ top: this.tabBar.frame.size.height, left: 0, bottom: 0, right: 0 });
-        // const tabBar = MDCTabBar.alloc().initWithFrame(this.view.safeAreaLayoutGuide.layoutFrame);
-
-        // tabBar.items = <NSArray<UITabBarItem>>NSArray.alloc().initWithArray([
-        //     UITabBarItem.alloc().initWithTitleImageTag("Test", null, 0),
-        //     UITabBarItem.alloc().initWithTitleImageTag("Test", null, 0),
-        //     UITabBarItem.alloc().initWithTitleImageTag("Test", null, 0),
-        //     UITabBarItem.alloc().initWithTitleImageTag("Test", null, 0),
-        //     UITabBarItem.alloc().initWithTitleImageTag("Test", null, 0),
-        //     UITabBarItem.alloc().initWithTitleImageTag("Test", null, 0),
-        //     UITabBarItem.alloc().initWithTitleImageTag("Test", null, 0),
-        //     UITabBarItem.alloc().initWithTitleImageTag("Test", null, 0),
-        //     UITabBarItem.alloc().initWithTitleImageTag("Test", null, 0),
-        //     UITabBarItem.alloc().initWithTitleImageTag("Test", null, 0),
-        //     UITabBarItem.alloc().initWithTitleImageTag("Test", null, 0),
-        //     UITabBarItem.alloc().initWithTitleImageTag("Test", null, 0),
-        // ]);
-
-        // tabBar.itemAppearance = MDCTabBarItemAppearance.Titles;
-        // tabBar.tintColor = UIColor.greenColor;
-        // tabBar.barTintColor = UIColor.yellowColor;
-        // tabBar.setTitleColorForState(UIColor.blackColor, MDCTabBarItemState.Normal);
-        // tabBar.autoresizingMask = UIViewAutoresizing.FlexibleWidth | UIViewAutoresizing.FlexibleBottomMargin;
-        // tabBar.sizeToFit();
-        // this.view.addSubview(tabBar);
-
-        // this.view.bringSubviewToFront(tabBar);
-
-        // const tabBar = MDCTabBar.alloc().initWithFrame(this.view.bounds);
-        // tabBar.items = <NSArray<UITabBarItem>>NSArray.alloc().initWithArray([
-        //     UITabBarItem.alloc().initWithTitleImageTag("Test", null, 0),
-        //     UITabBarItem.alloc().initWithTitleImageTag("Test", null, 0)
-        // ]);
-
-        // tabBar.itemAppearance = MDCTabBarItemAppearance.Titles;
-        // tabBar.autoresizingMask = UIViewAutoresizing.FlexibleWidth | UIViewAutoresizing.FlexibleBottomMargin;
-        // tabBar.sizeToFit();
-        // this.view.addSubview(tabBar);
+        this.tabBar.frame = CGRectMake(this.view.safeAreaInsets.left, tabBarTop, this.tabBar.frame.size.width, tabBarHeight);
 
         const subViews: NSArray<UIView> = this.view.subviews;
         let scrollView: UIScrollView = null;
@@ -192,47 +163,6 @@ class UIPageViewControllerImpl extends UIPageViewController {
 
             scrollView.frame = CGRectMake(this.view.safeAreaInsets.left, scrollViewTop, this.view.bounds.size.width, scrollViewHeight); //this.view.bounds;
         }
-
-        // if (mdcBar) {
-        //     mdcBar.frame = this.view.bounds;
-        // }
-
-        // const owner = this.owner.get();
-        // if (owner) {
-        //     if (majorVersion >= 11) {
-        //         // Handle nested UILayoutViewController safe area application.
-        //         // Currently, UILayoutViewController can be nested only in a TabView.
-        //         // The TabView itself is handled by the OS, so we check the TabView's parent (usually a Page, but can be a Layout).
-        //         const tabViewItem = owner.parent;
-        //         const tabView = tabViewItem && tabViewItem.parent;
-        //         let parent = tabView && tabView.parent;
-
-        //         // Handle Angular scenario where TabView is in a ProxyViewContainer
-        //         // It is possible to wrap components in ProxyViewContainers indefinitely
-        //         // Not using instanceof ProxyViewContainer to avoid circular dependency
-        //         // TODO: Try moving UILayoutViewController out of view module
-        //         while (parent && !parent.nativeViewProtected) {
-        //             parent = parent.parent;
-        //         }
-
-        //         if (parent) {
-        //             const parentPageInsetsTop = parent.nativeViewProtected.safeAreaInsets.top;
-        //             const currentInsetsTop = this.view.safeAreaInsets.top;
-        //             const additionalInsetsTop = Math.max(parentPageInsetsTop - currentInsetsTop, 0);
-
-        //             const parentPageInsetsBottom = parent.nativeViewProtected.safeAreaInsets.bottom;
-        //             const currentInsetsBottom = this.view.safeAreaInsets.bottom;
-        //             const additionalInsetsBottom = Math.max(parentPageInsetsBottom - currentInsetsBottom, 0);
-
-        //             if (additionalInsetsTop > 0 || additionalInsetsBottom > 0) {
-        //                 const additionalInsets = new UIEdgeInsets({ top: additionalInsetsTop, left: 0, bottom: additionalInsetsBottom, right: 0 });
-        //                 this.additionalSafeAreaInsets = additionalInsets;
-        //             }
-        //         }
-        //     }
-
-        //     layoutView(this, owner);
-        // }
     }
 }
 

From d3dee98116f887252cefa01ee8988b2eaa1febe9 Mon Sep 17 00:00:00 2001
From: Martin Yankov <m.i.yankov@gmail.com>
Date: Fri, 26 Jul 2019 14:40:10 +0300
Subject: [PATCH 5/5] chore: remove e2e resources and ignore (#7575)

---
 .gitignore                                       | 1 +
 e2e/ui-tests-app/e2e/resources/images/uitestsapp | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 120000 e2e/ui-tests-app/e2e/resources/images/uitestsapp

diff --git a/.gitignore b/.gitignore
index dbbd6a8a3..d912d0587 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,6 +32,7 @@ package-lock.json
 # Appium files
 e2e/**/*.trace/
 e2e/**/test-results.xml
+e2e/**/e2e/resources/
 
 # Webpack configuration files
 webpack.config.js
diff --git a/e2e/ui-tests-app/e2e/resources/images/uitestsapp b/e2e/ui-tests-app/e2e/resources/images/uitestsapp
deleted file mode 120000
index 2ae4132a5..000000000
--- a/e2e/ui-tests-app/e2e/resources/images/uitestsapp
+++ /dev/null
@@ -1 +0,0 @@
-/Users/tsenov/git/nativescript/e2e/ui-tests-app/../../../functional-tests-images/uitestsapp
\ No newline at end of file