fix-next(css-classes): increase application CSS selector version at runtime (#7992)

vchimev · manoldonev · commit bfea96fbc069 · 2019-10-22T13:54:02.000+03:00
diff --git a/nativescript-core/application/application-common.ts b/nativescript-core/application/application-common.ts
@@ -142,6 +142,14 @@ function removeCssClass(rootView: View, cssClass: string) {
     rootView.cssClasses.delete(cssClass);
 }
 
+function increaseStyleScopeApplicationCssSelectorVersion(rootView: View) {
+    const styleScope = rootView._styleScope || ((<any>rootView).currentPage && (<any>rootView).currentPage._styleScope);
+
+    if (styleScope) {
+        styleScope._increaseApplicationCssSelectorVersion();
+    }
+}
+
 export function orientationChanged(rootView: View, newOrientation: "portrait" | "landscape" | "unknown"): void {
     if (!rootView) {
         return;
@@ -151,6 +159,7 @@ export function orientationChanged(rootView: View, newOrientation: "portrait" |
     if (!rootView.cssClasses.has(newOrientationCssClass)) {
         ORIENTATION_CSS_CLASSES.forEach(cssClass => removeCssClass(rootView, cssClass));
         applyCssClass(rootView, newOrientationCssClass);
+        increaseStyleScopeApplicationCssSelectorVersion(rootView);
         rootView._onCssStateChange();
     }
 }
@@ -164,6 +173,7 @@ export function systemAppearanceChanged(rootView: View, newSystemAppearance: "da
     if (!rootView.cssClasses.has(newSystemAppearanceCssClass)) {
         SYSTEM_APPEARANCE_CSS_CLASSES.forEach(cssClass => removeCssClass(rootView, cssClass));
         applyCssClass(rootView, newSystemAppearanceCssClass);
+        increaseStyleScopeApplicationCssSelectorVersion(rootView);
         rootView._onCssStateChange();
     }
 }
diff --git a/nativescript-core/ui/styling/style-scope.d.ts b/nativescript-core/ui/styling/style-scope.d.ts
@@ -36,6 +36,10 @@ export class StyleScope {
     public static createSelectorsFromImports(tree: SyntaxTree, keyframes: Object): RuleSet[];
     public ensureSelectors(): number;
 
+    /**
+     * Increase the application CSS selector version.
+     */
+    public _increaseApplicationCssSelectorVersion(): void;
     public isApplicationCssSelectorsLatestVersionApplied(): boolean;
     public isLocalCssSelectorsLatestVersionApplied(): boolean;
 
diff --git a/nativescript-core/ui/styling/style-scope.ts b/nativescript-core/ui/styling/style-scope.ts
@@ -760,6 +760,10 @@ export class StyleScope {
         return this._getSelectorsVersion();
     }
 
+    public _increaseApplicationCssSelectorVersion(): void {
+        applicationCssSelectorVersion++;
+    }
+
     public isApplicationCssSelectorsLatestVersionApplied(): boolean {
         return this._applicationCssSelectorsAppliedVersion === applicationCssSelectorVersion;
     }

Original file line number	Diff line number	Diff line change
`@@ -142,6 +142,14 @@ function removeCssClass(rootView: View, cssClass: string) {`
`142`	`142`	`rootView.cssClasses.delete(cssClass);`
`143`	`143`	`}`
`144`	`144`
	`145`	`+function increaseStyleScopeApplicationCssSelectorVersion(rootView: View) {`
	`146`	`+ const styleScope = rootView._styleScope \|\| ((<any>rootView).currentPage && (<any>rootView).currentPage._styleScope);`
	`147`	`+`
	`148`	`+ if (styleScope) {`
	`149`	`+ styleScope._increaseApplicationCssSelectorVersion();`
	`150`	`+ }`
	`151`	`+}`
	`152`	`+`
`145`	`153`	`export function orientationChanged(rootView: View, newOrientation: "portrait" \| "landscape" \| "unknown"): void {`
`146`	`154`	`if (!rootView) {`
`147`	`155`	`return;`
`@@ -151,6 +159,7 @@ export function orientationChanged(rootView: View, newOrientation: "portrait" \|`
`151`	`159`	`if (!rootView.cssClasses.has(newOrientationCssClass)) {`
`152`	`160`	`ORIENTATION_CSS_CLASSES.forEach(cssClass => removeCssClass(rootView, cssClass));`
`153`	`161`	`applyCssClass(rootView, newOrientationCssClass);`
	`162`	`+ increaseStyleScopeApplicationCssSelectorVersion(rootView);`
`154`	`163`	`rootView._onCssStateChange();`
`155`	`164`	`}`
`156`	`165`	`}`
`@@ -164,6 +173,7 @@ export function systemAppearanceChanged(rootView: View, newSystemAppearance: "da`
`164`	`173`	`if (!rootView.cssClasses.has(newSystemAppearanceCssClass)) {`
`165`	`174`	`SYSTEM_APPEARANCE_CSS_CLASSES.forEach(cssClass => removeCssClass(rootView, cssClass));`
`166`	`175`	`applyCssClass(rootView, newSystemAppearanceCssClass);`
	`176`	`+ increaseStyleScopeApplicationCssSelectorVersion(rootView);`
`167`	`177`	`rootView._onCssStateChange();`
`168`	`178`	`}`
`169`	`179`	`}`
Original file line number	Diff line number	Diff line change
`@@ -760,6 +760,10 @@ export class StyleScope {`
`760`	`760`	`return this._getSelectorsVersion();`
`761`	`761`	`}`
`762`	`762`
	`763`	`+ public _increaseApplicationCssSelectorVersion(): void {`
	`764`	`+ applicationCssSelectorVersion++;`
	`765`	`+ }`
	`766`	`+`
`763`	`767`	`public isApplicationCssSelectorsLatestVersionApplied(): boolean {`
`764`	`768`	`return this._applicationCssSelectorsAppliedVersion === applicationCssSelectorVersion;`
`765`	`769`	`}`