react-native-unistyles 3.0.0-rc.5 → 3.0.0

package/src/web/runtime.ts

@@ -49,6 +49,12 @@ export class UnistylesRuntime {
     }
 
     get themeName() {
+        const scopedTheme = this.services.shadowRegistry.getScopedTheme()
+
+        if (scopedTheme) {
+            return scopedTheme
+        }
+
         if (this.services.state.hasAdaptiveThemes) {
             return schemeToTheme(this.colorScheme) as AppThemeName
         }
@@ -183,9 +189,14 @@ export class UnistylesRuntime {
     }
 
     setAdaptiveThemes = (isEnabled: boolean) => {
-        this.services.state.hasAdaptiveThemes = isEnabled
+        if (this.services.state.hasAdaptiveThemes === isEnabled) {
+            return
+        }
+
+        this.services.listener.emitChange(UnistyleDependency.AdaptiveThemes)
 
         if (!isEnabled) {
+            this.services.state.hasAdaptiveThemes = isEnabled
             this.rootElement?.classList.add(this.themeName ?? '')
 
             return
@@ -193,6 +204,7 @@ export class UnistylesRuntime {
 
         this.rootElement?.classList.remove(this.themeName ?? '')
         this.setTheme(schemeToTheme(this.colorScheme) as AppThemeName)
+        this.services.state.hasAdaptiveThemes = isEnabled
     }
 
     setRootViewBackgroundColor = (color: string) => {
@@ -215,6 +227,7 @@ export class UnistylesRuntime {
         const newTheme = updater(oldTheme)
 
         this.services.state.themes.set(themeName, newTheme)
+        this.services.listener.emitChange(UnistyleDependency.Theme)
 
         if (this.services.state.CSSVars) {
             this.services.state.cssThemes.set(