Merge remote-tracking branch 'origin/master' into merge-release-in-master

Author: Elena Hristova

e2e/nested-router-tab-view/e2e/home-tabs.e2e-spec.ts

@@ -58,15 +58,20 @@ describe("home-tabs:", async function () {
                 await screen.navigateToTabsPage();
                 await screen.loadedTabs();
                 await screen.loadedPlayersList();
-                await screen.navigateToAboutPage();
-                await screen.loadedAbout();
-                await screen.loadedNestedAbout();
+
+                // TO DO: This is related to the tns-core-modules animations overhaul intiative (removing Animators in favor of androidx Transitions)
+                // Angular test case: navigating from Page with 3 nested frames and back crashes with "IllegalArgumentException: parameter must be a descendant of this view" only from these commented appium tests (does not reproduce with manual testing). This is fixed in androidx.fragment:fragment:1.2.0 and tests must be uncommented when migrating to it.
+                // await screen.navigateToAboutPage();
+                // await screen.loadedAbout();
+                // await screen.loadedNestedAbout();
             });
 
             it("should go back to Tabs and then back to Home", async function () {
-                await backActivatedRoute(driver);
-                await screen.loadedTabs();
-                await screen.loadedPlayersList();
+                // TO DO: This is related to the tns-core-modules animations overhaul intiative (removing Animators in favor of androidx Transitions)
+                // Angular test case: navigating from Page with 3 nested frames and back crashes with "IllegalArgumentException: parameter must be a descendant of this view" only from these commented appium tests (does not reproduce with manual testing). This is fixed in androidx.fragment:fragment:1.2.0 and tests must be uncommented when migrating to it.
+                // await backActivatedRoute(driver);
+                // await screen.loadedTabs();
+                // await screen.loadedPlayersList();
                 await backActivatedRoute(driver);
                 await screen.loadedHome();
                 await screen.loadedPlayersList();

nativescript-angular/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nativescript-angular",
-  "version": "8.2.2",
+  "version": "8.3.0",
   "description": "An Angular renderer that lets you build mobile apps with NativeScript.",
   "homepage": "https://www.nativescript.org/",
   "bugs": "https://github.com/NativeScript/nativescript-angular/issues",

nativescript-angular/renderer.ts

@@ -356,7 +356,7 @@ class EmulatedRenderer extends NativeScriptRenderer {
     private addStyles(styles: (string | any[])[], componentId: string) {
         styles.map(s => s.toString())
             .map(s => replaceNgAttribute(s, componentId))
-            .forEach(addStyleToCss);
+            .forEach(addScopedStyleToCss);
     }
 }
 
@@ -365,6 +365,11 @@ const addStyleToCss = profile('"renderer".addStyleToCss', function addStyleToCss
     addCss(style);
 });
 
+// tslint:disable-next-line
+const addScopedStyleToCss = profile('"renderer".addScopedStyleToCss', function addScopedStyleToCss(style: string): void {
+    addCss(style, true);
+});
+
 function replaceNgAttribute(input: string, componentId: string): string {
     return input.replace(COMPONENT_REGEX, componentId);
 }