Fix disappearing list item styles when navigating back to a page.

hdeshev · hdeshev · commit 308fa55e02aa · 2017-03-16T15:54:59.000+02:00
Do not clear style scope on unload event. Do it when removing child
views instead.
diff --git a/tns-core-modules/ui/core/view-base/view-base.ts b/tns-core-modules/ui/core/view-base/view-base.ts
@@ -240,8 +240,6 @@ export class ViewBase extends Observable implements ViewBaseDefinition {
     }
 
     public onUnloaded() {
-        this._styleScope = null;
-        this._setCssState(null);
         this._unloadEachChild();
         this._isLoaded = false;
         this._emit("unloaded");
@@ -261,6 +259,8 @@ export class ViewBase extends Observable implements ViewBaseDefinition {
         const scope = this._styleScope;
         if (scope) {
             scope.applySelectors(this);
+        } else {
+            this._setCssState(null);
         }
     }
 
@@ -540,6 +540,9 @@ export class ViewBase extends Observable implements ViewBaseDefinition {
      */
     public _removeViewCore(view: ViewBase) {
         // TODO: Discuss this.
+        if (this._styleScope === view._styleScope) {
+            view._setStyleScope(null);
+        }
         if (view.isLoaded) {
             view.onUnloaded();
         }

Original file line number	Diff line number	Diff line change
`@@ -240,8 +240,6 @@ export class ViewBase extends Observable implements ViewBaseDefinition {`
`240`	`240`	`}`
`241`	`241`
`242`	`242`	`public onUnloaded() {`
`243`		`- this._styleScope = null;`
`244`		`- this._setCssState(null);`
`245`	`243`	`this._unloadEachChild();`
`246`	`244`	`this._isLoaded = false;`
`247`	`245`	`this._emit("unloaded");`
`@@ -261,6 +259,8 @@ export class ViewBase extends Observable implements ViewBaseDefinition {`
`261`	`259`	`const scope = this._styleScope;`
`262`	`260`	`if (scope) {`
`263`	`261`	`scope.applySelectors(this);`
	`262`	`+ } else {`
	`263`	`+ this._setCssState(null);`
`264`	`264`	`}`
`265`	`265`	`}`
`266`	`266`
`@@ -540,6 +540,9 @@ export class ViewBase extends Observable implements ViewBaseDefinition {`
`540`	`540`	`*/`
`541`	`541`	`public _removeViewCore(view: ViewBase) {`
`542`	`542`	`// TODO: Discuss this.`
	`543`	`+ if (this._styleScope === view._styleScope) {`
	`544`	`+ view._setStyleScope(null);`
	`545`	`+ }`
`543`	`546`	`if (view.isLoaded) {`
`544`	`547`	`view.onUnloaded();`
`545`	`548`	`}`