fix: make sure subThemes are taken into account when generating style…

… cache (#534) * fix: make sure subThemes are taken into account when generating style cache * fix: make sure style chain gets updated on subThemes * fix: cleanup comments and test file * fix: cleanup comments and test file * fix: revert theme manager changes
rdkcentral · Sep 27, 2024 · fbcad55 · fbcad55
1 parent 59873c1
commit fbcad55
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/packages/@lightningjs/ui-components/package.json b/packages/@lightningjs/ui-components/package.json
@@ -58,4 +58,4 @@
   "publishConfig": {
     "access": "public"
   }
-}
+}
diff --git a/packages/@lightningjs/ui-components/src/mixins/withThemeStyles/StyleManager.js b/packages/@lightningjs/ui-components/src/mixins/withThemeStyles/StyleManager.js
@@ -100,6 +100,13 @@ export default class StyleManager extends lng.EventEmitter {
     this.update();
   }
 
+  /**
+   * Clears the style chain cache.
+   */
+  clearStyleChainCache() {
+    clearStyleChainCache();
+  }
+
   /**
    * Clears the source cache.
    */
@@ -127,6 +134,7 @@ export default class StyleManager extends lng.EventEmitter {
   _generateCacheKey(name) {
     const cacheKey = [
       name,
+      this.component._targetSubTheme,
       this.component.constructor.__componentName,
       this._customStyleHash
     ]
@@ -204,7 +212,6 @@ export default class StyleManager extends lng.EventEmitter {
         // Style source does not exist so it will need to be generated. We attempt to run this function only when necessary for optimal performance
         styleSource = generateComponentStyleSource({
           alias: this.component.constructor.aliasStyles,
-          componentConfig: this.component._componentConfig,
           inlineStyle: this.component._componentLevelStyle,
           styleChain: getStyleChainMemoized(this.component),
           theme: this.component.theme

diff --git a/packages/@lightningjs/ui-components/src/mixins/withThemeStyles/index.js b/packages/@lightningjs/ui-components/src/mixins/withThemeStyles/index.js
@@ -120,6 +120,7 @@ export default function withThemeStyles(Base, mixinStyle = {}) {
       if (this._targetSubTheme) {
         this._styleManager.clearListeners();
         this._styleManager.setupListeners();
+        this._styleManager.clearStyleChainCache();
         this._styleManager.clearStyleCache();
         this._styleManager.clearSourceCache();
         this._styleManager.update();
-Original file line number
+Diff line change
@@ Expand Up / @@ -58,4 +58,4 @@ @@
       "publishConfig": {
         "access": "public"
       }
-    }
+    }