Fix Page to be styleScope if frame is not

Hristo Hristov · Hristo Hristov · commit ef86addd6d4f · 2018-01-12T10:23:54.000+02:00
diff --git a/tns-core-modules/ui/core/view/view-common.ts b/tns-core-modules/ui/core/view/view-common.ts
@@ -80,18 +80,18 @@ export abstract class ViewCommon extends ViewBase implements ViewDefinition {
         return scope && scope.css;
     }
     set css(value: string) {
-        this.updateStyleScope(undefined, undefined, value);
+        this._updateStyleScope(undefined, undefined, value);
     }
 
     public addCss(cssString: string): void {
-        this.updateStyleScope(undefined, cssString);
+        this._updateStyleScope(undefined, cssString);
     }
 
     public addCssFile(cssFileName: string) {
-        this.updateStyleScope(cssFileName);
+        this._updateStyleScope(cssFileName);
     }
 
-    private updateStyleScope(cssFileName?: string, cssString?: string, css?: string): void {
+    public _updateStyleScope(cssFileName?: string, cssString?: string, css?: string): void {
         let scope = this._styleScope;
         if (!scope) {
             scope = new StyleScope();
@@ -117,7 +117,7 @@ export abstract class ViewCommon extends ViewBase implements ViewDefinition {
     _setupAsRootView(context: any): void {
         super._setupAsRootView(context);
         if (!this._styleScope) {
-            this.updateStyleScope();
+            this._updateStyleScope();
         }
     }
 
diff --git a/tns-core-modules/ui/core/view/view.d.ts b/tns-core-modules/ui/core/view/view.d.ts
@@ -658,6 +658,14 @@ export abstract class View extends ViewBase {
      * @param cssFileName - A valid file name (from the application root) which contains a valid css.
      */
     addCssFile(cssFileName: string): void;
+
+    /**
+     * Updates styleScope or create new styleScope.
+     * @param cssFileName 
+     * @param cssString 
+     * @param css 
+     */
+    _updateStyleScope(cssFileName?: string, cssString?: string, css?: string): void;
     //@endprivate
 
     /**
diff --git a/tns-core-modules/ui/frame/frame.android.ts b/tns-core-modules/ui/frame/frame.android.ts
@@ -657,6 +657,11 @@ class FragmentCallbacksImplementation implements AndroidFragmentCallbacks {
                 page._setupUI(context);
             }
         } else {
+            if (!this.frame._styleScope) {
+                // Make sure page will have styleScope even if parents don't.
+                page._updateStyleScope();
+            }
+            
             this.frame._addView(page);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -80,18 +80,18 @@ export abstract class ViewCommon extends ViewBase implements ViewDefinition {`
`80`	`80`	`return scope && scope.css;`
`81`	`81`	`}`
`82`	`82`	`set css(value: string) {`
`83`		`- this.updateStyleScope(undefined, undefined, value);`
	`83`	`+ this._updateStyleScope(undefined, undefined, value);`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`public addCss(cssString: string): void {`
`87`		`- this.updateStyleScope(undefined, cssString);`
	`87`	`+ this._updateStyleScope(undefined, cssString);`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`public addCssFile(cssFileName: string) {`
`91`		`- this.updateStyleScope(cssFileName);`
	`91`	`+ this._updateStyleScope(cssFileName);`
`92`	`92`	`}`
`93`	`93`
`94`		`- private updateStyleScope(cssFileName?: string, cssString?: string, css?: string): void {`
	`94`	`+ public _updateStyleScope(cssFileName?: string, cssString?: string, css?: string): void {`
`95`	`95`	`let scope = this._styleScope;`
`96`	`96`	`if (!scope) {`
`97`	`97`	`scope = new StyleScope();`
`@@ -117,7 +117,7 @@ export abstract class ViewCommon extends ViewBase implements ViewDefinition {`
`117`	`117`	`_setupAsRootView(context: any): void {`
`118`	`118`	`super._setupAsRootView(context);`
`119`	`119`	`if (!this._styleScope) {`
`120`		`- this.updateStyleScope();`
	`120`	`+ this._updateStyleScope();`
`121`	`121`	`}`
`122`	`122`	`}`
`123`	`123`
Original file line number	Diff line number	Diff line change
`@@ -657,6 +657,11 @@ class FragmentCallbacksImplementation implements AndroidFragmentCallbacks {`
`657`	`657`	`page._setupUI(context);`
`658`	`658`	`}`
`659`	`659`	`} else {`
	`660`	`+ if (!this.frame._styleScope) {`
	`661`	`+ // Make sure page will have styleScope even if parents don't.`
	`662`	`+ page._updateStyleScope();`
	`663`	`+ }`
	`664`	`+`
`660`	`665`	`this.frame._addView(page);`
`661`	`666`	`}`
`662`	`667`