diff --git a/e2e/safe-area/app/gridlayout/gridlayout-3x3-nested-grid-page.xml b/e2e/safe-area/app/gridlayout/action-bar/gridlayout-3x3-nested-grid-page.xml
similarity index 100%
rename from e2e/safe-area/app/gridlayout/gridlayout-3x3-nested-grid-page.xml
rename to e2e/safe-area/app/gridlayout/action-bar/gridlayout-3x3-nested-grid-page.xml
diff --git a/e2e/safe-area/app/gridlayout/gridlayout-3x3-nested-hstack-page.xml b/e2e/safe-area/app/gridlayout/action-bar/gridlayout-3x3-nested-hstack-page.xml
similarity index 100%
rename from e2e/safe-area/app/gridlayout/gridlayout-3x3-nested-hstack-page.xml
rename to e2e/safe-area/app/gridlayout/action-bar/gridlayout-3x3-nested-hstack-page.xml
diff --git a/e2e/safe-area/app/gridlayout/gridlayout-3x3-nested-vstack-page.xml b/e2e/safe-area/app/gridlayout/action-bar/gridlayout-3x3-nested-vstack-page.xml
similarity index 100%
rename from e2e/safe-area/app/gridlayout/gridlayout-3x3-nested-vstack-page.xml
rename to e2e/safe-area/app/gridlayout/action-bar/gridlayout-3x3-nested-vstack-page.xml
diff --git a/e2e/safe-area/app/gridlayout/gridlayout-3x3-page.xml b/e2e/safe-area/app/gridlayout/action-bar/gridlayout-3x3-page.xml
similarity index 100%
rename from e2e/safe-area/app/gridlayout/gridlayout-3x3-page.xml
rename to e2e/safe-area/app/gridlayout/action-bar/gridlayout-3x3-page.xml
diff --git a/e2e/safe-area/app/gridlayout/hstack-nested-hstack-page.xml b/e2e/safe-area/app/gridlayout/action-bar/hstack-nested-hstack-page.xml
similarity index 100%
rename from e2e/safe-area/app/gridlayout/hstack-nested-hstack-page.xml
rename to e2e/safe-area/app/gridlayout/action-bar/hstack-nested-hstack-page.xml
diff --git a/e2e/safe-area/app/gridlayout/hstack-nested-vstack-page.xml b/e2e/safe-area/app/gridlayout/action-bar/hstack-nested-vstack-page.xml
similarity index 100%
rename from e2e/safe-area/app/gridlayout/hstack-nested-vstack-page.xml
rename to e2e/safe-area/app/gridlayout/action-bar/hstack-nested-vstack-page.xml
diff --git a/e2e/safe-area/app/gridlayout/hstack-page.xml b/e2e/safe-area/app/gridlayout/action-bar/hstack-page.xml
similarity index 100%
rename from e2e/safe-area/app/gridlayout/hstack-page.xml
rename to e2e/safe-area/app/gridlayout/action-bar/hstack-page.xml
diff --git a/e2e/safe-area/app/gridlayout/vstack-nested-hstack-page.xml b/e2e/safe-area/app/gridlayout/action-bar/vstack-nested-hstack-page.xml
similarity index 100%
rename from e2e/safe-area/app/gridlayout/vstack-nested-hstack-page.xml
rename to e2e/safe-area/app/gridlayout/action-bar/vstack-nested-hstack-page.xml
diff --git a/e2e/safe-area/app/gridlayout/vstack-nested-vstack-page.xml b/e2e/safe-area/app/gridlayout/action-bar/vstack-nested-vstack-page.xml
similarity index 100%
rename from e2e/safe-area/app/gridlayout/vstack-nested-vstack-page.xml
rename to e2e/safe-area/app/gridlayout/action-bar/vstack-nested-vstack-page.xml
diff --git a/e2e/safe-area/app/gridlayout/vstack-page.xml b/e2e/safe-area/app/gridlayout/action-bar/vstack-page.xml
similarity index 100%
rename from e2e/safe-area/app/gridlayout/vstack-page.xml
rename to e2e/safe-area/app/gridlayout/action-bar/vstack-page.xml
diff --git a/e2e/safe-area/app/gridlayout/gridlayout-page.xml b/e2e/safe-area/app/gridlayout/gridlayout-page.xml
index cbee1b0f8..3aeca6fed 100644
--- a/e2e/safe-area/app/gridlayout/gridlayout-page.xml
+++ b/e2e/safe-area/app/gridlayout/gridlayout-page.xml
@@ -5,15 +5,31 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/e2e/safe-area/app/gridlayout/no-action-bar/gridlayout-3x3-nested-grid-page.xml b/e2e/safe-area/app/gridlayout/no-action-bar/gridlayout-3x3-nested-grid-page.xml
new file mode 100644
index 000000000..bdbf4f830
--- /dev/null
+++ b/e2e/safe-area/app/gridlayout/no-action-bar/gridlayout-3x3-nested-grid-page.xml
@@ -0,0 +1,7 @@
+
+
+
+
diff --git a/e2e/safe-area/app/gridlayout/no-action-bar/gridlayout-3x3-nested-hstack-page.xml b/e2e/safe-area/app/gridlayout/no-action-bar/gridlayout-3x3-nested-hstack-page.xml
new file mode 100644
index 000000000..aab3b6ab9
--- /dev/null
+++ b/e2e/safe-area/app/gridlayout/no-action-bar/gridlayout-3x3-nested-hstack-page.xml
@@ -0,0 +1,7 @@
+
+
+
+
diff --git a/e2e/safe-area/app/gridlayout/no-action-bar/gridlayout-3x3-nested-vstack-page.xml b/e2e/safe-area/app/gridlayout/no-action-bar/gridlayout-3x3-nested-vstack-page.xml
new file mode 100644
index 000000000..cfcd1cb64
--- /dev/null
+++ b/e2e/safe-area/app/gridlayout/no-action-bar/gridlayout-3x3-nested-vstack-page.xml
@@ -0,0 +1,7 @@
+
+
+
+
diff --git a/e2e/safe-area/app/gridlayout/no-action-bar/gridlayout-3x3-page.xml b/e2e/safe-area/app/gridlayout/no-action-bar/gridlayout-3x3-page.xml
new file mode 100644
index 000000000..b8ddaef72
--- /dev/null
+++ b/e2e/safe-area/app/gridlayout/no-action-bar/gridlayout-3x3-page.xml
@@ -0,0 +1,7 @@
+
+
+
+
diff --git a/e2e/safe-area/app/gridlayout/no-action-bar/hstack-nested-hstack-page.xml b/e2e/safe-area/app/gridlayout/no-action-bar/hstack-nested-hstack-page.xml
new file mode 100644
index 000000000..982dfeddd
--- /dev/null
+++ b/e2e/safe-area/app/gridlayout/no-action-bar/hstack-nested-hstack-page.xml
@@ -0,0 +1,7 @@
+
+
+
+
diff --git a/e2e/safe-area/app/gridlayout/no-action-bar/hstack-nested-vstack-page.xml b/e2e/safe-area/app/gridlayout/no-action-bar/hstack-nested-vstack-page.xml
new file mode 100644
index 000000000..828818223
--- /dev/null
+++ b/e2e/safe-area/app/gridlayout/no-action-bar/hstack-nested-vstack-page.xml
@@ -0,0 +1,7 @@
+
+
+
+
diff --git a/e2e/safe-area/app/gridlayout/no-action-bar/hstack-page.xml b/e2e/safe-area/app/gridlayout/no-action-bar/hstack-page.xml
new file mode 100644
index 000000000..e52177183
--- /dev/null
+++ b/e2e/safe-area/app/gridlayout/no-action-bar/hstack-page.xml
@@ -0,0 +1,7 @@
+
+
+
+
diff --git a/e2e/safe-area/app/gridlayout/no-action-bar/vstack-nested-hstack-page.xml b/e2e/safe-area/app/gridlayout/no-action-bar/vstack-nested-hstack-page.xml
new file mode 100644
index 000000000..f49915aef
--- /dev/null
+++ b/e2e/safe-area/app/gridlayout/no-action-bar/vstack-nested-hstack-page.xml
@@ -0,0 +1,7 @@
+
+
+
+
diff --git a/e2e/safe-area/app/gridlayout/no-action-bar/vstack-nested-vstack-page.xml b/e2e/safe-area/app/gridlayout/no-action-bar/vstack-nested-vstack-page.xml
new file mode 100644
index 000000000..02b31da6c
--- /dev/null
+++ b/e2e/safe-area/app/gridlayout/no-action-bar/vstack-nested-vstack-page.xml
@@ -0,0 +1,7 @@
+
+
+
+
diff --git a/e2e/safe-area/app/gridlayout/no-action-bar/vstack-page.xml b/e2e/safe-area/app/gridlayout/no-action-bar/vstack-page.xml
new file mode 100644
index 000000000..9c17db846
--- /dev/null
+++ b/e2e/safe-area/app/gridlayout/no-action-bar/vstack-page.xml
@@ -0,0 +1,7 @@
+
+
+
+
diff --git a/e2e/safe-area/app/home/home-page.xml b/e2e/safe-area/app/home/home-page.xml
index 259beafd3..84b2a551f 100644
--- a/e2e/safe-area/app/home/home-page.xml
+++ b/e2e/safe-area/app/home/home-page.xml
@@ -6,5 +6,6 @@
+
diff --git a/e2e/safe-area/app/scrollview/action-bar/grid-3x3-hscroll-hstack-page.xml b/e2e/safe-area/app/scrollview/action-bar/grid-3x3-hscroll-hstack-page.xml
new file mode 100644
index 000000000..a8aea4669
--- /dev/null
+++ b/e2e/safe-area/app/scrollview/action-bar/grid-3x3-hscroll-hstack-page.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
diff --git a/e2e/safe-area/app/scrollview/action-bar/grid-3x3-vscroll-vstack-page.xml b/e2e/safe-area/app/scrollview/action-bar/grid-3x3-vscroll-vstack-page.xml
new file mode 100644
index 000000000..269b5ed20
--- /dev/null
+++ b/e2e/safe-area/app/scrollview/action-bar/grid-3x3-vscroll-vstack-page.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
diff --git a/e2e/safe-area/app/scrollview/action-bar/hscroll-hstack-page.xml b/e2e/safe-area/app/scrollview/action-bar/hscroll-hstack-page.xml
new file mode 100644
index 000000000..a95b0f3f8
--- /dev/null
+++ b/e2e/safe-area/app/scrollview/action-bar/hscroll-hstack-page.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
diff --git a/e2e/safe-area/app/scrollview/action-bar/vscroll-vstack-page.xml b/e2e/safe-area/app/scrollview/action-bar/vscroll-vstack-page.xml
new file mode 100644
index 000000000..b10420c5d
--- /dev/null
+++ b/e2e/safe-area/app/scrollview/action-bar/vscroll-vstack-page.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
diff --git a/e2e/safe-area/app/scrollview/fragments/grid-3x3-hscroll-hstack-fragment.xml b/e2e/safe-area/app/scrollview/fragments/grid-3x3-hscroll-hstack-fragment.xml
new file mode 100644
index 000000000..14b8a72b4
--- /dev/null
+++ b/e2e/safe-area/app/scrollview/fragments/grid-3x3-hscroll-hstack-fragment.xml
@@ -0,0 +1,65 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/e2e/safe-area/app/scrollview/fragments/grid-3x3-vscroll-vstack-fragment.xml b/e2e/safe-area/app/scrollview/fragments/grid-3x3-vscroll-vstack-fragment.xml
new file mode 100644
index 000000000..c15e116f7
--- /dev/null
+++ b/e2e/safe-area/app/scrollview/fragments/grid-3x3-vscroll-vstack-fragment.xml
@@ -0,0 +1,173 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/e2e/safe-area/app/scrollview/fragments/hscroll-hstack-fragment.xml b/e2e/safe-area/app/scrollview/fragments/hscroll-hstack-fragment.xml
new file mode 100644
index 000000000..b5c8cb337
--- /dev/null
+++ b/e2e/safe-area/app/scrollview/fragments/hscroll-hstack-fragment.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/e2e/safe-area/app/scrollview/fragments/vscroll-vstack-fragment.xml b/e2e/safe-area/app/scrollview/fragments/vscroll-vstack-fragment.xml
new file mode 100644
index 000000000..7212dc70a
--- /dev/null
+++ b/e2e/safe-area/app/scrollview/fragments/vscroll-vstack-fragment.xml
@@ -0,0 +1,86 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/e2e/safe-area/app/scrollview/no-action-bar/grid-3x3-hscroll-hstack-page.xml b/e2e/safe-area/app/scrollview/no-action-bar/grid-3x3-hscroll-hstack-page.xml
new file mode 100644
index 000000000..3080ddb95
--- /dev/null
+++ b/e2e/safe-area/app/scrollview/no-action-bar/grid-3x3-hscroll-hstack-page.xml
@@ -0,0 +1,7 @@
+
+
+
+
diff --git a/e2e/safe-area/app/scrollview/no-action-bar/grid-3x3-vscroll-vstack-page.xml b/e2e/safe-area/app/scrollview/no-action-bar/grid-3x3-vscroll-vstack-page.xml
new file mode 100644
index 000000000..e30ce372f
--- /dev/null
+++ b/e2e/safe-area/app/scrollview/no-action-bar/grid-3x3-vscroll-vstack-page.xml
@@ -0,0 +1,7 @@
+
+
+
+
diff --git a/e2e/safe-area/app/scrollview/no-action-bar/hscroll-hstack-page.xml b/e2e/safe-area/app/scrollview/no-action-bar/hscroll-hstack-page.xml
new file mode 100644
index 000000000..1aa5916ce
--- /dev/null
+++ b/e2e/safe-area/app/scrollview/no-action-bar/hscroll-hstack-page.xml
@@ -0,0 +1,7 @@
+
+
+
+
diff --git a/e2e/safe-area/app/scrollview/no-action-bar/vscroll-vstack-page.xml b/e2e/safe-area/app/scrollview/no-action-bar/vscroll-vstack-page.xml
new file mode 100644
index 000000000..1982ccefc
--- /dev/null
+++ b/e2e/safe-area/app/scrollview/no-action-bar/vscroll-vstack-page.xml
@@ -0,0 +1,7 @@
+
+
+
+
diff --git a/e2e/safe-area/app/scrollview/scrollview-page.ts b/e2e/safe-area/app/scrollview/scrollview-page.ts
new file mode 100644
index 000000000..c0f982757
--- /dev/null
+++ b/e2e/safe-area/app/scrollview/scrollview-page.ts
@@ -0,0 +1,8 @@
+import { View, EventData } from "tns-core-modules/ui/core/view";
+
+export function onNavigate(args: EventData) {
+ const view = args.object as View;
+ const route = view["route"];
+
+ view.page.frame.navigate(route);
+}
\ No newline at end of file
diff --git a/e2e/safe-area/app/scrollview/scrollview-page.xml b/e2e/safe-area/app/scrollview/scrollview-page.xml
new file mode 100644
index 000000000..b8871e5d8
--- /dev/null
+++ b/e2e/safe-area/app/scrollview/scrollview-page.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/e2e/safe-area/package.json b/e2e/safe-area/package.json
index 90576ea09..be975b619 100644
--- a/e2e/safe-area/package.json
+++ b/e2e/safe-area/package.json
@@ -5,11 +5,11 @@
"repository": "",
"nativescript": {
"id": "org.nativescript.safearea",
- "tns-ios": {
- "version": "next"
- },
"tns-android": {
"version": "next"
+ },
+ "tns-ios": {
+ "version": "4.1.1"
}
},
"dependencies": {