react-native-unistyles 3.0.0-nightly-20250616 → 3.0.0-nightly-20250619

package/src/web/listener.ts

@@ -1,16 +1,18 @@
 import { UnistyleDependency } from '../specs/NativePlatform'
 import type { UnistylesServices } from './types'
 
+type Listener = (dependency: UnistyleDependency) => void
+
 export class UnistylesListener {
     private isInitialized = false
-    private listeners = Array.from({ length: Object.keys(UnistyleDependency).length / 2 }, () => new Set<VoidFunction>())
-    private stylesheetListeners = Array.from({ length: Object.keys(UnistyleDependency).length / 2 }, () => new Set<VoidFunction>())
+    private listeners = Array.from({ length: Object.keys(UnistyleDependency).length / 2 }, () => new Set<Listener>())
+    private stylesheetListeners = Array.from({ length: Object.keys(UnistyleDependency).length / 2 }, () => new Set<Listener>())
 
     constructor(private services: UnistylesServices) {}
 
     emitChange = (dependency: UnistyleDependency) => {
-        this.stylesheetListeners[dependency]?.forEach(listener => listener())
-        this.listeners[dependency]?.forEach(listener => listener())
+        this.stylesheetListeners[dependency]?.forEach(listener => listener(dependency))
+        this.listeners[dependency]?.forEach(listener => listener(dependency))
     }
 
     initListeners = () => {
@@ -49,7 +51,7 @@ export class UnistylesListener {
         window.addEventListener('resize', () => this.emitChange(UnistyleDependency.Dimensions))
     }
 
-    addListeners = (dependencies: Array<UnistyleDependency>, listener: VoidFunction) => {
+    addListeners = (dependencies: Array<UnistyleDependency>, listener: Listener) => {
         dependencies.forEach(dependency => this.listeners[dependency]?.add(listener))
 
         return () => {
@@ -57,7 +59,7 @@ export class UnistylesListener {
         }
     }
 
-    addStylesheetListeners = (dependencies: Array<UnistyleDependency>, listener: VoidFunction) => {
+    addStylesheetListeners = (dependencies: Array<UnistyleDependency>, listener: Listener) => {
         dependencies.forEach(dependency => this.stylesheetListeners[dependency]?.add(listener))
 
         return () => {

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
         }
@@ -215,6 +221,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(