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

package/README.md

@@ -15,7 +15,7 @@
 ## Installation
 
 ```shell
-yarn add react-native-unistyles@next
+yarn add react-native-unistyles
 ```
 
 Install dependencies:
@@ -28,7 +28,7 @@ yarn add react-native-edge-to-edge react-native-nitro-modules@0.26.2
 
 | react-native-unistyles | react-native-nitro-modules |
 |------------------------|----------------------------|
-| 3.0.0-rc.5             | 0.26.2                     |
+| 3.0.0                  | 0.26.2                     |
 
 Then follow [installation guides](https://unistyl.es/v3/start/getting-started) for your platform.
 
@@ -77,8 +77,8 @@ Then follow [installation guides](https://unistyl.es/v3/start/getting-started) f
 <a href="https://github.com/ryanlanciaux">
      <img src="https://avatars.githubusercontent.com/u/85041?v=4" height="70px" width="70px" alt="ryanlanciaux" />
 </a>
-<a href="https://github.com/avega99">
-     <img src="https://avatars.githubusercontent.com/u/177598670?v=4" height="70px" width="70px" alt="avega99" />
+<a href="https://github.com/loopsware">
+     <img src="https://avatars.githubusercontent.com/u/161434039?s=200&v=4" height="70px" width="70px" alt="loopsware" />
 </a>
 
 ## Past sponsors
@@ -122,12 +122,12 @@ Then follow [installation guides](https://unistyl.es/v3/start/getting-started) f
 <a href="https://github.com/guillaumehcht">
      <img src="https://avatars.githubusercontent.com/u/80776475?v=4" height="60px" width="60px" alt="guillaumehcht" />
 </a>
-<a href="https://github.com/loopsware">
-     <img src="https://avatars.githubusercontent.com/u/161434039?s=200&v=4" height="60px" width="60px" alt="loopsware" />
-</a>
 <a href="https://github.com/FTCHD">
      <img src="https://avatars.githubusercontent.com/u/144691102?v=4" height="60px" width="60px" alt="FTCHD" />
 </a>
+<a href="https://github.com/avega99">
+     <img src="https://avatars.githubusercontent.com/u/177598670?v=4" height="60px" width="60px" alt="avega99" />
+</a>
 
 ## Sponsor my work
 

package/Unistyles.podspec

@@ -1,4 +1,5 @@
 require "json"
+require_relative './unistyles_get_rn_version.rb'
 
 package = JSON.parse(File.read(File.join(__dir__, "package.json")))
 
@@ -27,9 +28,19 @@ Pod::Spec.new do |s|
   ]
 
   if ENV["USE_FRAMEWORKS"]
+    RN_VERSION = unistyles_get_rn_version(ENV['REACT_NATIVE_PATH']) || 999
+
     s.dependency "React-Core"
     add_dependency(s, "React-jsinspector", :framework_name => "jsinspector_modern")
-    add_dependency(s, "React-jsinspectortracing", :framework_name => 'jsinspector_moderntracing')
+
+    if RN_VERSION >= 79
+      add_dependency(s, "React-jsinspectortracing", :framework_name => 'jsinspector_moderntracing')
+    end
+
+    if RN_VERSION >= 80
+      add_dependency(s, "React-jsinspectorcdp", :framework_name => 'jsinspector_moderncdp')
+    end
+
     add_dependency(s, "React-rendererconsistency", :framework_name => "React_rendererconsistency")
   end
 

package/android/build.gradle

@@ -45,7 +45,7 @@ android {
         minSdkVersion safeExtGet('minSdkVersion', 24)
         externalNativeBuild {
             cmake {
-                arguments "-DANDROID_STL=c++_shared"
+                arguments "-DANDROID_STL=c++_shared", "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON"
                 abiFilters (*reactNativeArchitectures())
             }
         }

package/android/src/main/cxx/NativeUnistylesModule.cpp

@@ -25,7 +25,8 @@ jni::local_ref<UnistylesModule::jhybriddata> UnistylesModule::initHybrid(
 void UnistylesModule::registerNatives() {
     javaClassStatic()->registerNatives({
         makeNativeMethod("getBindingsInstaller", UnistylesModule::getBindingsInstaller),
-        makeNativeMethod("initHybrid", UnistylesModule::initHybrid)
+        makeNativeMethod("initHybrid", UnistylesModule::initHybrid),
+        makeNativeMethod("invalidateNative", invalidateNative),
     });
 }
 

package/android/src/main/cxx/NativeUnistylesModule.h

@@ -3,6 +3,7 @@
 #include <ReactCommon/BindingsInstallerHolder.h>
 #include <react/jni/JRuntimeExecutor.h>
 #include <react/renderer/scheduler/Scheduler.h>
+#include "UnistylesRegistry.h"
 #include <fbjni/fbjni.h>
 #include <react/fabric/Binding.h>
 #include "NativePlatform.h"
@@ -27,6 +28,9 @@ struct UnistylesModule : public jni::HybridClass<UnistylesModule> {
         jni::alias_ref<JRuntimeExecutor::javaobject> runtimeExecutorHolder,
         jni::alias_ref<JHybridNativePlatformSpec::javaobject> nativePlatform
     );
+    static void invalidateNative(jni::alias_ref<jhybridobject> jThis) {
+        core::UnistylesRegistry::get().destroy();
+    }
 
     static jni::local_ref<BindingsInstallerHolder::javaobject> getBindingsInstaller(jni::alias_ref<UnistylesModule::javaobject> jThis);
 

package/android/src/main/java/com/unistyles/NativePlatform+android.kt

@@ -41,6 +41,7 @@ class NativePlatformAndroid(private val reactContext: ReactApplicationContext):
     }
 
     override fun onHostResume() {
+        _insets.getInitialInsets(false)
         _insets.startInsetsListener()
     }
 

package/android/src/main/java/com/unistyles/NativePlatform+insets.kt

@@ -23,19 +23,14 @@ class NativePlatformInsets(
     private val getMiniRuntime: () -> UnistylesNativeMiniRuntime,
     private val onConfigChange: () -> Unit
 ) {
+    private var _didGetInsets = false
     private var _shouldListenToImeEvents = false
     private val _imeListeners: MutableList<CxxImeListener> = mutableListOf()
     private var _insets: Insets = Insets(0.0, 0.0, 0.0, 0.0, 0.0)
 
     init {
-        // get initial insets
-        reactContext.currentActivity?.let { activity ->
-            val insets = ViewCompat.getRootWindowInsets(activity.window.decorView)
-
-            insets?.let { windowInsets ->
-                setInsets(windowInsets, activity.window, null, true)
-            }
-        }
+        // for SDK below 35, it's possible to get it synchronously
+        this.getInitialInsets(true)
     }
 
     fun onDestroy() {
@@ -54,6 +49,23 @@ class NativePlatformInsets(
         )
     }
 
+    fun getInitialInsets(skipUpdate: Boolean = false) {
+        if (_didGetInsets) {
+            return
+        }
+
+        reactContext.currentActivity?.let { activity ->
+            activity.findViewById<View>(android.R.id.content)?.let { mainView ->
+                val insets = ViewCompat.getRootWindowInsets(mainView)
+
+                insets?.let { windowInsets ->
+                    setInsets(windowInsets, activity.window, null, skipUpdate)
+                    _didGetInsets = true
+                }
+            }
+        }
+    }
+
     fun setInsets(insetsCompat: WindowInsetsCompat, window: Window, animatedBottomInsets: Double?, skipUpdate: Boolean = false) {
         // below Android 11, we need to use window flags to detect status bar visibility
         val isStatusBarVisible = when(Build.VERSION.SDK_INT) {
@@ -164,7 +176,7 @@ class NativePlatformInsets(
 
     fun stopInsetsListener() {
         reactContext.currentActivity?.let { activity ->
-            activity.window?.decorView?.let { view ->
+            activity.findViewById<View>(android.R.id.content)?.let { view ->
                 ViewCompat.setOnApplyWindowInsetsListener(view, null)
             }
         }

package/android/src/main/java/com/unistyles/UnistylesModule.kt

@@ -24,6 +24,10 @@ class UnistylesModule(reactContext: ReactApplicationContext): NativeTurboUnistyl
         }
     }
 
+    override fun invalidate() {
+        invalidateNative()
+    }
+
     init {
         mHybridData = initializeHybridData(reactContext)
     }
@@ -43,4 +47,7 @@ class UnistylesModule(reactContext: ReactApplicationContext): NativeTurboUnistyl
         runtimeExecutor: RuntimeExecutor,
         nativePlatform: HybridNativePlatformSpec
     ): HybridData
+
+    @DoNotStrip
+    private external fun invalidateNative()
 }

package/cxx/core/UnistylesRegistry.cpp

@@ -244,3 +244,10 @@ const std::optional<std::string> core::UnistylesRegistry::getScopedTheme() {
 void core::UnistylesRegistry::setScopedTheme(std::optional<std::string> themeName) {
     this->_scopedTheme = std::move(themeName);
 }
+
+void core::UnistylesRegistry::destroy() {
+    this->_states.clear();
+    this->_styleSheetRegistry.clear();
+    this->_shadowRegistry.clear();
+    this->_scopedTheme = std::nullopt;
+}

package/cxx/core/UnistylesRegistry.h

@@ -27,7 +27,7 @@ struct UnistylesRegistry: public StyleSheetRegistry {
 
     UnistylesRegistry(const UnistylesRegistry&) = delete;
     UnistylesRegistry(const UnistylesRegistry&&) = delete;
-    
+
     bool shouldUsePointsForBreakpoints = false;
 
     void registerTheme(jsi::Runtime& rt, std::string name, jsi::Value& theme);
@@ -49,6 +49,7 @@ struct UnistylesRegistry: public StyleSheetRegistry {
     void removeDuplicatedUnistyles(jsi::Runtime& rt, const ShadowNodeFamily* shadowNodeFamily, std::vector<core::Unistyle::Shared>& unistyles);
     void setScopedTheme(std::optional<std::string> themeName);
     core::Unistyle::Shared getUnistyleById(jsi::Runtime& rt, std::string unistyleID);
+    void destroy();
 
 private:
     UnistylesRegistry() = default;

package/cxx/hybridObjects/HybridUnistylesRuntime.cpp

@@ -20,8 +20,15 @@ Dimensions HybridUnistylesRuntime::getScreen() {
 };
 
 std::optional<std::string> HybridUnistylesRuntime::getThemeName() {
-    auto& state = core::UnistylesRegistry::get().getState(*_rt);
-
+    auto& registry = core::UnistylesRegistry::get();
+    auto maybeScopedTheme = registry.getScopedTheme();
+    
+    if (maybeScopedTheme.has_value()) {
+        return maybeScopedTheme.value();
+    }
+    
+    auto& state = registry.getState(*_rt);
+    
     return state.getCurrentThemeName();
 };
 

package/ios/UnistylesModuleOnLoad.mm

@@ -52,4 +52,9 @@ RCT_EXPORT_MODULE(Unistyles)
     return std::make_shared<facebook::react::NativeTurboUnistylesSpecJSI>(params);
 }
 
+- (void)invalidate {
+    core::UnistylesRegistry::get().destroy();
+    [super invalidate];
+}
+
 @end

package/lib/commonjs/components/AdaptiveTheme.js

@@ -17,7 +17,7 @@ const AdaptiveTheme = ({
   const {
     rt
   } = (0, _core.useUnistyles)();
-  const name = rt.themeName === 'dark' ? 'light' : 'dark';
+  const name = rt.colorScheme === 'dark' ? 'light' : 'dark';
   const mappedChildren = [/*#__PURE__*/(0, _jsxRuntime.jsx)(_ApplyScopedTheme.ApplyScopedTheme, {
     name: name
   }, name), children, /*#__PURE__*/(0, _jsxRuntime.jsx)(_ApplyScopedTheme.ApplyScopedTheme, {

package/lib/commonjs/components/AdaptiveTheme.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","_interopRequireWildcard","require","_core","_specs","_ApplyScopedTheme","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","AdaptiveTheme","children","previousScopedTheme","rt","useUnistyles","name","themeName","mappedChildren","jsx","ApplyScopedTheme","useLayoutEffect","UnistylesShadowRegistry","flush","Fragment","exports"],"sourceRoot":"../../../src","sources":["components/AdaptiveTheme.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,uBAAA,CAAAC,OAAA;AAEA,IAAAC,KAAA,GAAAD,OAAA;AAEA,IAAAE,MAAA,GAAAF,OAAA;AACA,IAAAG,iBAAA,GAAAH,OAAA;AAAqD,IAAAI,WAAA,GAAAJ,OAAA;AAAA,SAAAD,wBAAAM,CAAA,EAAAC,CAAA,6BAAAC,OAAA,MAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAR,uBAAA,YAAAA,CAAAM,CAAA,EAAAC,CAAA,SAAAA,CAAA,IAAAD,CAAA,IAAAA,CAAA,CAAAK,UAAA,SAAAL,CAAA,MAAAM,CAAA,EAAAC,CAAA,EAAAC,CAAA,KAAAC,SAAA,QAAAC,OAAA,EAAAV,CAAA,iBAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,SAAAQ,CAAA,MAAAF,CAAA,GAAAL,CAAA,GAAAG,CAAA,GAAAD,CAAA,QAAAG,CAAA,CAAAK,GAAA,CAAAX,CAAA,UAAAM,CAAA,CAAAM,GAAA,CAAAZ,CAAA,GAAAM,CAAA,CAAAO,GAAA,CAAAb,CAAA,EAAAQ,CAAA,gBAAAP,CAAA,IAAAD,CAAA,gBAAAC,CAAA,OAAAa,cAAA,CAAAC,IAAA,CAAAf,CAAA,EAAAC,CAAA,OAAAM,CAAA,IAAAD,CAAA,GAAAU,MAAA,CAAAC,cAAA,KAAAD,MAAA,CAAAE,wBAAA,CAAAlB,CAAA,EAAAC,CAAA,OAAAM,CAAA,CAAAK,GAAA,IAAAL,CAAA,CAAAM,GAAA,IAAAP,CAAA,CAAAE,CAAA,EAAAP,CAAA,EAAAM,CAAA,IAAAC,CAAA,CAAAP,CAAA,IAAAD,CAAA,CAAAC,CAAA,WAAAO,CAAA,KAAAR,CAAA,EAAAC,CAAA;AAM9C,MAAMkB,aAA0D,GAAGA,CAAC;EACvEC,QAAQ;EACRC;AACJ,CAAC,KAAK;EACF,MAAM;IAAEC;EAAG,CAAC,GAAG,IAAAC,kBAAY,EAAC,CAAC;EAC7B,MAAMC,IAAI,GAAIF,EAAE,CAACG,SAAS,KAAK,MAAM,GAAG,OAAO,GAAG,MAAgC;EAClF,MAAMC,cAAc,GAAG,cACnB,IAAA3B,WAAA,CAAA4B,GAAA,EAAC7B,iBAAA,CAAA8B,gBAAgB;IAAYJ,IAAI,EAAEA;EAAK,GAAjBA,IAAmB,CAAC,EAC3CJ,QAAQ,eACR,IAAArB,WAAA,CAAA4B,GAAA,EAAC7B,iBAAA,CAAA8B,gBAAgB;IAAeJ,IAAI,EAAEH;EAAyD,GAAzE,SAA2E,CAAC,CACrG;EAED,IAAAQ,sBAAe,EAAC,MAAM;IAClB;IACAC,8BAAuB,CAACC,KAAK,CAAC,CAAC;EACnC,CAAC,CAAC;EAEF,oBACI,IAAAhC,WAAA,CAAA4B,GAAA,EAAClC,MAAA,CAAAiB,OAAK,CAACsB,QAAQ;IAAAZ,QAAA,EACVM;EAAc,GADEF,IAEL,CAAC;AAEzB,CAAC;AAAAS,OAAA,CAAAd,aAAA,GAAAA,aAAA","ignoreList":[]}
+{"version":3,"names":["_react","_interopRequireWildcard","require","_core","_specs","_ApplyScopedTheme","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","AdaptiveTheme","children","previousScopedTheme","rt","useUnistyles","name","colorScheme","mappedChildren","jsx","ApplyScopedTheme","useLayoutEffect","UnistylesShadowRegistry","flush","Fragment","exports"],"sourceRoot":"../../../src","sources":["components/AdaptiveTheme.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,uBAAA,CAAAC,OAAA;AAEA,IAAAC,KAAA,GAAAD,OAAA;AAEA,IAAAE,MAAA,GAAAF,OAAA;AACA,IAAAG,iBAAA,GAAAH,OAAA;AAAqD,IAAAI,WAAA,GAAAJ,OAAA;AAAA,SAAAD,wBAAAM,CAAA,EAAAC,CAAA,6BAAAC,OAAA,MAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAR,uBAAA,YAAAA,CAAAM,CAAA,EAAAC,CAAA,SAAAA,CAAA,IAAAD,CAAA,IAAAA,CAAA,CAAAK,UAAA,SAAAL,CAAA,MAAAM,CAAA,EAAAC,CAAA,EAAAC,CAAA,KAAAC,SAAA,QAAAC,OAAA,EAAAV,CAAA,iBAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,SAAAQ,CAAA,MAAAF,CAAA,GAAAL,CAAA,GAAAG,CAAA,GAAAD,CAAA,QAAAG,CAAA,CAAAK,GAAA,CAAAX,CAAA,UAAAM,CAAA,CAAAM,GAAA,CAAAZ,CAAA,GAAAM,CAAA,CAAAO,GAAA,CAAAb,CAAA,EAAAQ,CAAA,gBAAAP,CAAA,IAAAD,CAAA,gBAAAC,CAAA,OAAAa,cAAA,CAAAC,IAAA,CAAAf,CAAA,EAAAC,CAAA,OAAAM,CAAA,IAAAD,CAAA,GAAAU,MAAA,CAAAC,cAAA,KAAAD,MAAA,CAAAE,wBAAA,CAAAlB,CAAA,EAAAC,CAAA,OAAAM,CAAA,CAAAK,GAAA,IAAAL,CAAA,CAAAM,GAAA,IAAAP,CAAA,CAAAE,CAAA,EAAAP,CAAA,EAAAM,CAAA,IAAAC,CAAA,CAAAP,CAAA,IAAAD,CAAA,CAAAC,CAAA,WAAAO,CAAA,KAAAR,CAAA,EAAAC,CAAA;AAM9C,MAAMkB,aAA0D,GAAGA,CAAC;EACvEC,QAAQ;EACRC;AACJ,CAAC,KAAK;EACF,MAAM;IAAEC;EAAG,CAAC,GAAG,IAAAC,kBAAY,EAAC,CAAC;EAC7B,MAAMC,IAAI,GAAIF,EAAE,CAACG,WAAW,KAAK,MAAM,GAAG,OAAO,GAAG,MAAgC;EACpF,MAAMC,cAAc,GAAG,cACnB,IAAA3B,WAAA,CAAA4B,GAAA,EAAC7B,iBAAA,CAAA8B,gBAAgB;IAAYJ,IAAI,EAAEA;EAAK,GAAjBA,IAAmB,CAAC,EAC3CJ,QAAQ,eACR,IAAArB,WAAA,CAAA4B,GAAA,EAAC7B,iBAAA,CAAA8B,gBAAgB;IAAeJ,IAAI,EAAEH;EAAyD,GAAzE,SAA2E,CAAC,CACrG;EAED,IAAAQ,sBAAe,EAAC,MAAM;IAClB;IACAC,8BAAuB,CAACC,KAAK,CAAC,CAAC;EACnC,CAAC,CAAC;EAEF,oBACI,IAAAhC,WAAA,CAAA4B,GAAA,EAAClC,MAAA,CAAAiB,OAAK,CAACsB,QAAQ;IAAAZ,QAAA,EACVM;EAAc,GADEF,IAEL,CAAC;AAEzB,CAAC;AAAAS,OAAA,CAAAd,aAAA,GAAAA,aAAA","ignoreList":[]}

package/lib/commonjs/components/NamedTheme.js

@@ -16,7 +16,7 @@ const NamedTheme = ({
 }) => {
   const mappedChildren = [/*#__PURE__*/(0, _jsxRuntime.jsx)(_ApplyScopedTheme.ApplyScopedTheme, {
     name: name
-  }, name), children, /*#__PURE__*/(0, _jsxRuntime.jsx)(_ApplyScopedTheme.ApplyScopedTheme, {
+  }, 'apply'), children, /*#__PURE__*/(0, _jsxRuntime.jsx)(_ApplyScopedTheme.ApplyScopedTheme, {
     name: previousScopedTheme
   }, 'dispose')];
   (0, _react.useLayoutEffect)(() => {

package/lib/commonjs/components/NamedTheme.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","_interopRequireWildcard","require","_specs","_ApplyScopedTheme","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","NamedTheme","name","children","previousScopedTheme","mappedChildren","jsx","ApplyScopedTheme","useLayoutEffect","UnistylesShadowRegistry","flush","Fragment","exports"],"sourceRoot":"../../../src","sources":["components/NamedTheme.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,uBAAA,CAAAC,OAAA;AAGA,IAAAC,MAAA,GAAAD,OAAA;AACA,IAAAE,iBAAA,GAAAF,OAAA;AAAqD,IAAAG,WAAA,GAAAH,OAAA;AAAA,SAAAD,wBAAAK,CAAA,EAAAC,CAAA,6BAAAC,OAAA,MAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAP,uBAAA,YAAAA,CAAAK,CAAA,EAAAC,CAAA,SAAAA,CAAA,IAAAD,CAAA,IAAAA,CAAA,CAAAK,UAAA,SAAAL,CAAA,MAAAM,CAAA,EAAAC,CAAA,EAAAC,CAAA,KAAAC,SAAA,QAAAC,OAAA,EAAAV,CAAA,iBAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,SAAAQ,CAAA,MAAAF,CAAA,GAAAL,CAAA,GAAAG,CAAA,GAAAD,CAAA,QAAAG,CAAA,CAAAK,GAAA,CAAAX,CAAA,UAAAM,CAAA,CAAAM,GAAA,CAAAZ,CAAA,GAAAM,CAAA,CAAAO,GAAA,CAAAb,CAAA,EAAAQ,CAAA,gBAAAP,CAAA,IAAAD,CAAA,gBAAAC,CAAA,OAAAa,cAAA,CAAAC,IAAA,CAAAf,CAAA,EAAAC,CAAA,OAAAM,CAAA,IAAAD,CAAA,GAAAU,MAAA,CAAAC,cAAA,KAAAD,MAAA,CAAAE,wBAAA,CAAAlB,CAAA,EAAAC,CAAA,OAAAM,CAAA,CAAAK,GAAA,IAAAL,CAAA,CAAAM,GAAA,IAAAP,CAAA,CAAAE,CAAA,EAAAP,CAAA,EAAAM,CAAA,IAAAC,CAAA,CAAAP,CAAA,IAAAD,CAAA,CAAAC,CAAA,WAAAO,CAAA,KAAAR,CAAA,EAAAC,CAAA;AAO9C,MAAMkB,UAAoD,GAAGA,CAAC;EACjEC,IAAI;EACJC,QAAQ;EACRC;AACJ,CAAC,KAAK;EACF,MAAMC,cAAc,GAAG,cACnB,IAAAxB,WAAA,CAAAyB,GAAA,EAAC1B,iBAAA,CAAA2B,gBAAgB;IAAYL,IAAI,EAAEA;EAAK,GAAjBA,IAAmB,CAAC,EAC3CC,QAAQ,eACR,IAAAtB,WAAA,CAAAyB,GAAA,EAAC1B,iBAAA,CAAA2B,gBAAgB;IAAeL,IAAI,EAAEE;EAAyD,GAAzE,SAA2E,CAAC,CACrG;EAED,IAAAI,sBAAe,EAAC,MAAM;IAClB;IACAC,8BAAuB,CAACC,KAAK,CAAC,CAAC;EACnC,CAAC,CAAC;EAEF,oBACI,IAAA7B,WAAA,CAAAyB,GAAA,EAAC9B,MAAA,CAAAgB,OAAK,CAACmB,QAAQ;IAAAR,QAAA,EACVE;EAAc,CACH,CAAC;AAEzB,CAAC;AAAAO,OAAA,CAAAX,UAAA,GAAAA,UAAA","ignoreList":[]}
+{"version":3,"names":["_react","_interopRequireWildcard","require","_specs","_ApplyScopedTheme","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","NamedTheme","name","children","previousScopedTheme","mappedChildren","jsx","ApplyScopedTheme","useLayoutEffect","UnistylesShadowRegistry","flush","Fragment","exports"],"sourceRoot":"../../../src","sources":["components/NamedTheme.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,uBAAA,CAAAC,OAAA;AAGA,IAAAC,MAAA,GAAAD,OAAA;AACA,IAAAE,iBAAA,GAAAF,OAAA;AAAqD,IAAAG,WAAA,GAAAH,OAAA;AAAA,SAAAD,wBAAAK,CAAA,EAAAC,CAAA,6BAAAC,OAAA,MAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAP,uBAAA,YAAAA,CAAAK,CAAA,EAAAC,CAAA,SAAAA,CAAA,IAAAD,CAAA,IAAAA,CAAA,CAAAK,UAAA,SAAAL,CAAA,MAAAM,CAAA,EAAAC,CAAA,EAAAC,CAAA,KAAAC,SAAA,QAAAC,OAAA,EAAAV,CAAA,iBAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,SAAAQ,CAAA,MAAAF,CAAA,GAAAL,CAAA,GAAAG,CAAA,GAAAD,CAAA,QAAAG,CAAA,CAAAK,GAAA,CAAAX,CAAA,UAAAM,CAAA,CAAAM,GAAA,CAAAZ,CAAA,GAAAM,CAAA,CAAAO,GAAA,CAAAb,CAAA,EAAAQ,CAAA,gBAAAP,CAAA,IAAAD,CAAA,gBAAAC,CAAA,OAAAa,cAAA,CAAAC,IAAA,CAAAf,CAAA,EAAAC,CAAA,OAAAM,CAAA,IAAAD,CAAA,GAAAU,MAAA,CAAAC,cAAA,KAAAD,MAAA,CAAAE,wBAAA,CAAAlB,CAAA,EAAAC,CAAA,OAAAM,CAAA,CAAAK,GAAA,IAAAL,CAAA,CAAAM,GAAA,IAAAP,CAAA,CAAAE,CAAA,EAAAP,CAAA,EAAAM,CAAA,IAAAC,CAAA,CAAAP,CAAA,IAAAD,CAAA,CAAAC,CAAA,WAAAO,CAAA,KAAAR,CAAA,EAAAC,CAAA;AAO9C,MAAMkB,UAAoD,GAAGA,CAAC;EACjEC,IAAI;EACJC,QAAQ;EACRC;AACJ,CAAC,KAAK;EACF,MAAMC,cAAc,GAAG,cACnB,IAAAxB,WAAA,CAAAyB,GAAA,EAAC1B,iBAAA,CAAA2B,gBAAgB;IAAaL,IAAI,EAAEA;EAAK,GAAnB,OAAqB,CAAC,EAC5CC,QAAQ,eACR,IAAAtB,WAAA,CAAAyB,GAAA,EAAC1B,iBAAA,CAAA2B,gBAAgB;IAAeL,IAAI,EAAEE;EAAyD,GAAzE,SAA2E,CAAC,CACrG;EAED,IAAAI,sBAAe,EAAC,MAAM;IAClB;IACAC,8BAAuB,CAACC,KAAK,CAAC,CAAC;EACnC,CAAC,CAAC;EAEF,oBACI,IAAA7B,WAAA,CAAAyB,GAAA,EAAC9B,MAAA,CAAAgB,OAAK,CAACmB,QAAQ;IAAAR,QAAA,EACVE;EAAc,CACH,CAAC;AAEzB,CAAC;AAAAO,OAAA,CAAAX,UAAA,GAAAA,UAAA","ignoreList":[]}

package/lib/commonjs/components/ScopedTheme.js

@@ -13,28 +13,33 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
 const ScopedTheme = ({
   name,
   children,
-  invertedAdaptive
+  invertedAdaptive,
+  reset
 }) => {
   const hasAdaptiveThemes = _specs.UnistylesRuntime.hasAdaptiveThemes;
   const isAdaptiveTheme = invertedAdaptive && hasAdaptiveThemes;
-  if (invertedAdaptive && !hasAdaptiveThemes) {
-    return children;
-  }
-  if (!invertedAdaptive && !name) {
-    if (__DEV__) {
-      console.error('ScopedTheme: name or invertedAdaptive must be provided');
-    }
-    return null;
-  }
   const previousScopedTheme = _specs.UnistylesShadowRegistry.getScopedTheme();
-  return isAdaptiveTheme ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_AdaptiveTheme.AdaptiveTheme, {
-    previousScopedTheme: previousScopedTheme,
-    children: children
-  }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_NamedTheme.NamedTheme, {
-    name: name,
-    previousScopedTheme: previousScopedTheme,
-    children: children
-  });
+  switch (true) {
+    case name !== undefined:
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_NamedTheme.NamedTheme, {
+        name: name,
+        previousScopedTheme: previousScopedTheme,
+        children: children
+      });
+    case isAdaptiveTheme:
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_AdaptiveTheme.AdaptiveTheme, {
+        previousScopedTheme: previousScopedTheme,
+        children: children
+      });
+    case reset:
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_NamedTheme.NamedTheme, {
+        name: undefined,
+        previousScopedTheme: previousScopedTheme,
+        children: children
+      });
+    default:
+      return children;
+  }
 };
 exports.ScopedTheme = ScopedTheme;
 //# sourceMappingURL=ScopedTheme.js.map

package/lib/commonjs/components/ScopedTheme.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","_interopRequireDefault","require","_specs","_AdaptiveTheme","_NamedTheme","_jsxRuntime","e","__esModule","default","ScopedTheme","name","children","invertedAdaptive","hasAdaptiveThemes","UnistylesRuntime","isAdaptiveTheme","__DEV__","console","error","previousScopedTheme","UnistylesShadowRegistry","getScopedTheme","jsx","AdaptiveTheme","NamedTheme","exports"],"sourceRoot":"../../../src","sources":["components/ScopedTheme.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AAEA,IAAAC,MAAA,GAAAD,OAAA;AACA,IAAAE,cAAA,GAAAF,OAAA;AACA,IAAAG,WAAA,GAAAH,OAAA;AAAyC,IAAAI,WAAA,GAAAJ,OAAA;AAAA,SAAAD,uBAAAM,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAUlC,MAAMG,WAAyE,GAAGA,CAAC;EACtFC,IAAI;EACJC,QAAQ;EACRC;AACJ,CAAC,KAAK;EACF,MAAMC,iBAAiB,GAAGC,uBAAgB,CAACD,iBAAiB;EAC5D,MAAME,eAAe,GAAGH,gBAAgB,IAAIC,iBAAiB;EAE7D,IAAID,gBAAgB,IAAI,CAACC,iBAAiB,EAAE;IACxC,OAAOF,QAAQ;EACnB;EAEA,IAAI,CAACC,gBAAgB,IAAI,CAACF,IAAI,EAAE;IAC5B,IAAIM,OAAO,EAAE;MACTC,OAAO,CAACC,KAAK,CAAC,wDAAwD,CAAC;IAC3E;IAEA,OAAO,IAAI;EACf;EAEA,MAAMC,mBAAmB,GAAGC,8BAAuB,CAACC,cAAc,CAAC,CAAC;EAEpE,OAAON,eAAe,gBAEd,IAAAV,WAAA,CAAAiB,GAAA,EAACnB,cAAA,CAAAoB,aAAa;IAACJ,mBAAmB,EAAEA,mBAAoB;IAAAR,QAAA,EACnDA;EAAQ,CACE,CAAC,gBAGhB,IAAAN,WAAA,CAAAiB,GAAA,EAAClB,WAAA,CAAAoB,UAAU;IACPd,IAAI,EAAEA,IAA8B;IACpCS,mBAAmB,EAAEA,mBAAoB;IAAAR,QAAA,EAExCA;EAAQ,CACD,CACf;AAET,CAAC;AAAAc,OAAA,CAAAhB,WAAA,GAAAA,WAAA","ignoreList":[]}
+{"version":3,"names":["_react","_interopRequireDefault","require","_specs","_AdaptiveTheme","_NamedTheme","_jsxRuntime","e","__esModule","default","ScopedTheme","name","children","invertedAdaptive","reset","hasAdaptiveThemes","UnistylesRuntime","isAdaptiveTheme","previousScopedTheme","UnistylesShadowRegistry","getScopedTheme","undefined","jsx","NamedTheme","AdaptiveTheme","exports"],"sourceRoot":"../../../src","sources":["components/ScopedTheme.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AAEA,IAAAC,MAAA,GAAAD,OAAA;AACA,IAAAE,cAAA,GAAAF,OAAA;AACA,IAAAG,WAAA,GAAAH,OAAA;AAAyC,IAAAI,WAAA,GAAAJ,OAAA;AAAA,SAAAD,uBAAAM,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAgBlC,MAAMG,WAAyE,GAAGA,CAAC;EACtFC,IAAI;EACJC,QAAQ;EACRC,gBAAgB;EAChBC;AACJ,CAAC,KAAK;EACF,MAAMC,iBAAiB,GAAGC,uBAAgB,CAACD,iBAAiB;EAC5D,MAAME,eAAe,GAAGJ,gBAAgB,IAAIE,iBAAiB;EAC7D,MAAMG,mBAAmB,GAAGC,8BAAuB,CAACC,cAAc,CAAC,CAAC;EAEpE,QAAQ,IAAI;IACR,KAAKT,IAAI,KAAKU,SAAS;MACnB,oBACI,IAAAf,WAAA,CAAAgB,GAAA,EAACjB,WAAA,CAAAkB,UAAU;QACPZ,IAAI,EAAEA,IAA8B;QACpCO,mBAAmB,EAAEA,mBAAoB;QAAAN,QAAA,EAExCA;MAAQ,CACD,CAAC;IAErB,KAAKK,eAAe;MAChB,oBACI,IAAAX,WAAA,CAAAgB,GAAA,EAAClB,cAAA,CAAAoB,aAAa;QAACN,mBAAmB,EAAEA,mBAAoB;QAAAN,QAAA,EACnDA;MAAQ,CACE,CAAC;IAExB,KAAKE,KAAK;MACN,oBACI,IAAAR,WAAA,CAAAgB,GAAA,EAACjB,WAAA,CAAAkB,UAAU;QACPZ,IAAI,EAAEU,SAAU;QAChBH,mBAAmB,EAAEA,mBAAoB;QAAAN,QAAA,EAExCA;MAAQ,CACD,CAAC;IAErB;MACI,OAAOA,QAAQ;EACvB;AACJ,CAAC;AAAAa,OAAA,CAAAf,WAAA,GAAAA,WAAA","ignoreList":[]}

package/lib/commonjs/core/createUnistylesElement.js

@@ -12,9 +12,9 @@ var _getClassname = require("./getClassname");
 var _warn = require("./warn");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const STYLE_PROPS = ['style', 'contentContainerStyle', 'columnWrapperStyle'];
+const STYLE_PROPS = ['contentContainerStyle', 'columnWrapperStyle'];
 const buildUnistylesProps = (Component, props, forwardedRef) => {
-  const componentStyleProps = STYLE_PROPS.filter(styleProp => styleProp in props);
+  const componentStyleProps = ['style', ...STYLE_PROPS.filter(styleProp => styleProp in props)];
   const classNames = Object.fromEntries(componentStyleProps.map(styleProp => [styleProp, (0, _getClassname.getClassName)(props[styleProp])]));
   const refs = componentStyleProps.map(styleProp => {
     return (0, _createUnistylesRef.createUnistylesRef)(classNames[styleProp], styleProp === 'style' ? forwardedRef : undefined);

package/lib/commonjs/core/createUnistylesElement.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","_interopRequireDefault","require","_utils","_utils2","_createUnistylesRef","_getClassname","_warn","_jsxRuntime","e","__esModule","default","STYLE_PROPS","buildUnistylesProps","Component","props","forwardedRef","componentStyleProps","filter","styleProp","classNames","Object","fromEntries","map","getClassName","refs","createUnistylesRef","undefined","forEach","maybeWarnAboutMultipleUnistyles","displayName","ref","isServer","componentRef","createUnistylesElement","UnistylesComponent","jsx","copyComponentProperties","exports"],"sourceRoot":"../../../src","sources":["core/createUnistylesElement.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AAGA,IAAAC,MAAA,GAAAD,OAAA;AACA,IAAAE,OAAA,GAAAF,OAAA;AACA,IAAAG,mBAAA,GAAAH,OAAA;AACA,IAAAI,aAAA,GAAAJ,OAAA;AACA,IAAAK,KAAA,GAAAL,OAAA;AAAwD,IAAAM,WAAA,GAAAN,OAAA;AAAA,SAAAD,uBAAAQ,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAExD,MAAMG,WAAW,GAAG,CAAC,OAAO,EAAE,uBAAuB,EAAE,oBAAoB,CAAU;AAMrF,MAAMC,mBAAmB,GAAGA,CAACC,SAAc,EAAEC,KAAqB,EAAEC,YAAyC,KAAK;EAC9G,MAAMC,mBAAmB,GAAGL,WAAW,CAACM,MAAM,CAACC,SAAS,IAAIA,SAAS,IAAIJ,KAAK,CAAC;EAC/E,MAAMK,UAAU,GAAGC,MAAM,CAACC,WAAW,CAACL,mBAAmB,CAACM,GAAG,CAACJ,SAAS,IAAI,CAACA,SAAS,EAAE,IAAAK,0BAAY,EAACT,KAAK,CAACI,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;EACxH,MAAMM,IAAI,GAAGR,mBAAmB,CAACM,GAAG,CAACJ,SAAS,IAAI;IAC9C,OAAO,IAAAO,sCAAkB,EACrBN,UAAU,CAACD,SAAS,CAAC,EACrBA,SAAS,KAAK,OAAO,GAAGH,YAAY,GAAGW,SAC3C,CAAC;EACL,CAAC,CAAC;EAEFV,mBAAmB,CAACW,OAAO,CAACT,SAAS,IAAI;IACrC,IAAAU,qCAA+B,EAACd,KAAK,CAACI,SAAS,CAAC,EAAeL,SAAS,CAACgB,WAAW,CAAC;EACzF,CAAC,CAAC;EAEF,OAAO;IACH,GAAGV,UAAU;IACbW,GAAG,EAAE,IAAAC,gBAAQ,EAAC,CAAC,GAAGL,SAAS,GAAIM,YAAiB,IAAKR,IAAI,CAACG,OAAO,CAACG,GAAG,IAAIA,GAAG,GAAGE,YAAY,CAAC;EAChG,CAAC;AACL,CAAC;AAEM,MAAMC,sBAAsB,GAAIpB,SAAc,IAAK;EACtD,MAAMqB,kBAAkB,GAAIpB,KAAU,IAAK;IACvC,oBACI,IAAAP,WAAA,CAAA4B,GAAA,EAACtB,SAAS;MAAA,GACFC,KAAK;MAAA,GACLF,mBAAmB,CAACC,SAAS,EAAEC,KAAK,EAAEA,KAAK,CAACgB,GAAG;IAAC,CACvD,CAAC;EAEV,CAAC;EAED,OAAO,IAAAM,8BAAuB,EAACvB,SAAS,EAAEqB,kBAAkB,CAAC;AACjE,CAAC;AAAAG,OAAA,CAAAJ,sBAAA,GAAAA,sBAAA","ignoreList":[]}
+{"version":3,"names":["_react","_interopRequireDefault","require","_utils","_utils2","_createUnistylesRef","_getClassname","_warn","_jsxRuntime","e","__esModule","default","STYLE_PROPS","buildUnistylesProps","Component","props","forwardedRef","componentStyleProps","filter","styleProp","classNames","Object","fromEntries","map","getClassName","refs","createUnistylesRef","undefined","forEach","maybeWarnAboutMultipleUnistyles","displayName","ref","isServer","componentRef","createUnistylesElement","UnistylesComponent","jsx","copyComponentProperties","exports"],"sourceRoot":"../../../src","sources":["core/createUnistylesElement.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AAGA,IAAAC,MAAA,GAAAD,OAAA;AACA,IAAAE,OAAA,GAAAF,OAAA;AACA,IAAAG,mBAAA,GAAAH,OAAA;AACA,IAAAI,aAAA,GAAAJ,OAAA;AACA,IAAAK,KAAA,GAAAL,OAAA;AAAwD,IAAAM,WAAA,GAAAN,OAAA;AAAA,SAAAD,uBAAAQ,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAExD,MAAMG,WAAW,GAAG,CAAC,uBAAuB,EAAE,oBAAoB,CAAU;AAQ5E,MAAMC,mBAAmB,GAAGA,CAACC,SAAc,EAAEC,KAAqB,EAAEC,YAAyC,KAAK;EAC9G,MAAMC,mBAAmB,GAAG,CAAC,OAAO,EAAW,GAAGL,WAAW,CAACM,MAAM,CAACC,SAAS,IAAIA,SAAS,IAAIJ,KAAK,CAAC,CAAC;EACtG,MAAMK,UAAU,GAAGC,MAAM,CAACC,WAAW,CAACL,mBAAmB,CAACM,GAAG,CAACJ,SAAS,IAAI,CAACA,SAAS,EAAE,IAAAK,0BAAY,EAACT,KAAK,CAACI,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;EACxH,MAAMM,IAAI,GAAGR,mBAAmB,CAACM,GAAG,CAACJ,SAAS,IAAI;IAC9C,OAAO,IAAAO,sCAAkB,EACrBN,UAAU,CAACD,SAAS,CAAC,EACrBA,SAAS,KAAK,OAAO,GAAGH,YAAY,GAAGW,SAC3C,CAAC;EACL,CAAC,CAAC;EAEFV,mBAAmB,CAACW,OAAO,CAACT,SAAS,IAAI;IACrC,IAAAU,qCAA+B,EAACd,KAAK,CAACI,SAAS,CAAC,EAAeL,SAAS,CAACgB,WAAW,CAAC;EACzF,CAAC,CAAC;EAEF,OAAO;IACH,GAAGV,UAAU;IACbW,GAAG,EAAE,IAAAC,gBAAQ,EAAC,CAAC,GAAGL,SAAS,GAAIM,YAAiB,IAAKR,IAAI,CAACG,OAAO,CAACG,GAAG,IAAIA,GAAG,GAAGE,YAAY,CAAC;EAChG,CAAC;AACL,CAAC;AAEM,MAAMC,sBAAsB,GAAIpB,SAAc,IAAK;EACtD,MAAMqB,kBAAkB,GAAIpB,KAAU,IAAK;IACvC,oBACI,IAAAP,WAAA,CAAA4B,GAAA,EAACtB,SAAS;MAAA,GACFC,KAAK;MAAA,GACLF,mBAAmB,CAACC,SAAS,EAAEC,KAAK,EAAEA,KAAK,CAACgB,GAAG;IAAC,CACvD,CAAC;EAEV,CAAC;EAED,OAAO,IAAAM,8BAAuB,EAACvB,SAAS,EAAEqB,kBAAkB,CAAC;AACjE,CAAC;AAAAG,OAAA,CAAAJ,sBAAA,GAAAA,sBAAA","ignoreList":[]}

package/lib/commonjs/core/useProxifiedUnistyles/listener.js

@@ -13,7 +13,7 @@ const listener = ({
   updateRuntime
 }) => {
   const disposeTheme = unistyles.services.listener.addListeners(dependencies.filter(dependency => dependency === _specs.UnistyleDependency.Theme), updateTheme);
-  const disposeRuntime = unistyles.services.listener.addListeners(dependencies.filter(dependency => dependency !== _specs.UnistyleDependency.Theme), updateRuntime);
+  const disposeRuntime = unistyles.services.listener.addListeners(dependencies.filter(dependency => dependency !== _specs.UnistyleDependency.Theme), dependency => updateRuntime(dependency === _specs.UnistyleDependency.ThemeName));
   return () => {
     disposeTheme();
     disposeRuntime();

package/lib/commonjs/core/useProxifiedUnistyles/listener.js.map

@@ -1 +1 @@
-{"version":3,"names":["_specs","require","unistyles","_interopRequireWildcard","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","listener","dependencies","updateTheme","updateRuntime","disposeTheme","services","addListeners","filter","dependency","UnistyleDependency","Theme","disposeRuntime","exports"],"sourceRoot":"../../../../src","sources":["core/useProxifiedUnistyles/listener.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,SAAA,GAAAC,uBAAA,CAAAF,OAAA;AAA+C,SAAAE,wBAAAC,CAAA,EAAAC,CAAA,6BAAAC,OAAA,MAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAH,uBAAA,YAAAA,CAAAC,CAAA,EAAAC,CAAA,SAAAA,CAAA,IAAAD,CAAA,IAAAA,CAAA,CAAAK,UAAA,SAAAL,CAAA,MAAAM,CAAA,EAAAC,CAAA,EAAAC,CAAA,KAAAC,SAAA,QAAAC,OAAA,EAAAV,CAAA,iBAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,SAAAQ,CAAA,MAAAF,CAAA,GAAAL,CAAA,GAAAG,CAAA,GAAAD,CAAA,QAAAG,CAAA,CAAAK,GAAA,CAAAX,CAAA,UAAAM,CAAA,CAAAM,GAAA,CAAAZ,CAAA,GAAAM,CAAA,CAAAO,GAAA,CAAAb,CAAA,EAAAQ,CAAA,gBAAAP,CAAA,IAAAD,CAAA,gBAAAC,CAAA,OAAAa,cAAA,CAAAC,IAAA,CAAAf,CAAA,EAAAC,CAAA,OAAAM,CAAA,IAAAD,CAAA,GAAAU,MAAA,CAAAC,cAAA,KAAAD,MAAA,CAAAE,wBAAA,CAAAlB,CAAA,EAAAC,CAAA,OAAAM,CAAA,CAAAK,GAAA,IAAAL,CAAA,CAAAM,GAAA,IAAAP,CAAA,CAAAE,CAAA,EAAAP,CAAA,EAAAM,CAAA,IAAAC,CAAA,CAAAP,CAAA,IAAAD,CAAA,CAAAC,CAAA,WAAAO,CAAA,KAAAR,CAAA,EAAAC,CAAA;AAGxC,MAAMkB,QAAQ,GAAGA,CAAC;EAAEC,YAAY;EAAEC,WAAW;EAAEC;AAA6B,CAAC,KAAK;EACrF,MAAMC,YAAY,GAAGzB,SAAS,CAAC0B,QAAQ,CAACL,QAAQ,CAACM,YAAY,CAACL,YAAY,CAACM,MAAM,CAACC,UAAU,IAAIA,UAAU,KAAKC,yBAAkB,CAACC,KAAK,CAAC,EAAER,WAAW,CAAC;EACtJ,MAAMS,cAAc,GAAGhC,SAAS,CAAC0B,QAAQ,CAACL,QAAQ,CAACM,YAAY,CAACL,YAAY,CAACM,MAAM,CAACC,UAAU,IAAIA,UAAU,KAAKC,yBAAkB,CAACC,KAAK,CAAC,EAAEP,aAAa,CAAC;EAE1J,OAAO,MAAM;IACTC,YAAY,CAAC,CAAC;IACdO,cAAc,CAAC,CAAC;EACpB,CAAC;AACL,CAAC;AAAAC,OAAA,CAAAZ,QAAA,GAAAA,QAAA","ignoreList":[]}
+{"version":3,"names":["_specs","require","unistyles","_interopRequireWildcard","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","listener","dependencies","updateTheme","updateRuntime","disposeTheme","services","addListeners","filter","dependency","UnistyleDependency","Theme","disposeRuntime","ThemeName","exports"],"sourceRoot":"../../../../src","sources":["core/useProxifiedUnistyles/listener.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,SAAA,GAAAC,uBAAA,CAAAF,OAAA;AAA+C,SAAAE,wBAAAC,CAAA,EAAAC,CAAA,6BAAAC,OAAA,MAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAH,uBAAA,YAAAA,CAAAC,CAAA,EAAAC,CAAA,SAAAA,CAAA,IAAAD,CAAA,IAAAA,CAAA,CAAAK,UAAA,SAAAL,CAAA,MAAAM,CAAA,EAAAC,CAAA,EAAAC,CAAA,KAAAC,SAAA,QAAAC,OAAA,EAAAV,CAAA,iBAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,SAAAQ,CAAA,MAAAF,CAAA,GAAAL,CAAA,GAAAG,CAAA,GAAAD,CAAA,QAAAG,CAAA,CAAAK,GAAA,CAAAX,CAAA,UAAAM,CAAA,CAAAM,GAAA,CAAAZ,CAAA,GAAAM,CAAA,CAAAO,GAAA,CAAAb,CAAA,EAAAQ,CAAA,gBAAAP,CAAA,IAAAD,CAAA,gBAAAC,CAAA,OAAAa,cAAA,CAAAC,IAAA,CAAAf,CAAA,EAAAC,CAAA,OAAAM,CAAA,IAAAD,CAAA,GAAAU,MAAA,CAAAC,cAAA,KAAAD,MAAA,CAAAE,wBAAA,CAAAlB,CAAA,EAAAC,CAAA,OAAAM,CAAA,CAAAK,GAAA,IAAAL,CAAA,CAAAM,GAAA,IAAAP,CAAA,CAAAE,CAAA,EAAAP,CAAA,EAAAM,CAAA,IAAAC,CAAA,CAAAP,CAAA,IAAAD,CAAA,CAAAC,CAAA,WAAAO,CAAA,KAAAR,CAAA,EAAAC,CAAA;AAGxC,MAAMkB,QAAQ,GAAGA,CAAC;EAAEC,YAAY;EAAEC,WAAW;EAAEC;AAA6B,CAAC,KAAK;EACrF,MAAMC,YAAY,GAAGzB,SAAS,CAAC0B,QAAQ,CAACL,QAAQ,CAACM,YAAY,CAACL,YAAY,CAACM,MAAM,CAACC,UAAU,IAAIA,UAAU,KAAKC,yBAAkB,CAACC,KAAK,CAAC,EAAER,WAAW,CAAC;EACtJ,MAAMS,cAAc,GAAGhC,SAAS,CAAC0B,QAAQ,CAACL,QAAQ,CAACM,YAAY,CAACL,YAAY,CAACM,MAAM,CAACC,UAAU,IAAIA,UAAU,KAAKC,yBAAkB,CAACC,KAAK,CAAC,EAAEF,UAAU,IAAIL,aAAa,CAACK,UAAU,KAAKC,yBAAkB,CAACG,SAAS,CAAC,CAAC;EAErN,OAAO,MAAM;IACTR,YAAY,CAAC,CAAC;IACdO,cAAc,CAAC,CAAC;EACpB,CAAC;AACL,CAAC;AAAAE,OAAA,CAAAb,QAAA,GAAAA,QAAA","ignoreList":[]}

package/lib/commonjs/core/useProxifiedUnistyles/listener.native.js

@@ -17,7 +17,8 @@ const listener = ({
       updateTheme();
     }
     if (changedDependencies.some(dependency => dependencies.includes(dependency))) {
-      updateRuntime();
+      const hasThemeNameChange = changedDependencies.includes(_specs.UnistyleDependency.ThemeName);
+      updateRuntime(hasThemeNameChange);
     }
   });
   return () => dispose();

package/lib/commonjs/core/useProxifiedUnistyles/listener.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["_specs","require","listener","dependencies","updateTheme","updateRuntime","listensToTheme","includes","UnistyleDependency","Theme","dispose","StyleSheet","addChangeListener","changedDependencies","some","dependency","exports"],"sourceRoot":"../../../../src","sources":["core/useProxifiedUnistyles/listener.native.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AAGO,MAAMC,QAAQ,GAAGA,CAAC;EAAEC,YAAY;EAAEC,WAAW;EAAEC;AAA6B,CAAC,KAAK;EACrF,MAAMC,cAAc,GAAGH,YAAY,CAACI,QAAQ,CAACC,yBAAkB,CAACC,KAAK,CAAC;EACtE;EACA,MAAMC,OAAO,GAAGC,iBAAU,CAACC,iBAAiB,CAACC,mBAAmB,IAAI;IAChE,IAAIP,cAAc,IAAIO,mBAAmB,CAACN,QAAQ,CAACC,yBAAkB,CAACC,KAAK,CAAC,EAAE;MAC1EL,WAAW,CAAC,CAAC;IACjB;IAEA,IAAIS,mBAAmB,CAACC,IAAI,CAAEC,UAA8B,IAAKZ,YAAY,CAACI,QAAQ,CAACQ,UAAU,CAAC,CAAC,EAAE;MACjGV,aAAa,CAAC,CAAC;IACnB;EACJ,CAAC,CAAC;EAEF,OAAO,MAAMK,OAAO,CAAC,CAAC;AAC1B,CAAC;AAAAM,OAAA,CAAAd,QAAA,GAAAA,QAAA","ignoreList":[]}
+{"version":3,"names":["_specs","require","listener","dependencies","updateTheme","updateRuntime","listensToTheme","includes","UnistyleDependency","Theme","dispose","StyleSheet","addChangeListener","changedDependencies","some","dependency","hasThemeNameChange","ThemeName","exports"],"sourceRoot":"../../../../src","sources":["core/useProxifiedUnistyles/listener.native.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AAGO,MAAMC,QAAQ,GAAGA,CAAC;EAAEC,YAAY;EAAEC,WAAW;EAAEC;AAA6B,CAAC,KAAK;EACrF,MAAMC,cAAc,GAAGH,YAAY,CAACI,QAAQ,CAACC,yBAAkB,CAACC,KAAK,CAAC;EACtE;EACA,MAAMC,OAAO,GAAGC,iBAAU,CAACC,iBAAiB,CAACC,mBAAmB,IAAI;IAChE,IAAIP,cAAc,IAAIO,mBAAmB,CAACN,QAAQ,CAACC,yBAAkB,CAACC,KAAK,CAAC,EAAE;MAC1EL,WAAW,CAAC,CAAC;IACjB;IAEA,IAAIS,mBAAmB,CAACC,IAAI,CAAEC,UAA8B,IAAKZ,YAAY,CAACI,QAAQ,CAACQ,UAAU,CAAC,CAAC,EAAE;MACjG,MAAMC,kBAAkB,GAAGH,mBAAmB,CAACN,QAAQ,CAACC,yBAAkB,CAACS,SAAS,CAAC;MAErFZ,aAAa,CAACW,kBAAkB,CAAC;IACrC;EACJ,CAAC,CAAC;EAEF,OAAO,MAAMN,OAAO,CAAC,CAAC;AAC1B,CAAC;AAAAQ,OAAA,CAAAhB,QAAA,GAAAA,QAAA","ignoreList":[]}

package/lib/commonjs/core/useProxifiedUnistyles/useProxifiedUnistyles.js

@@ -31,7 +31,7 @@ const RTDependencyMap = {
   rtl: _NativePlatform.UnistyleDependency.Rtl
 };
 const useProxifiedUnistyles = forcedTheme => {
-  const scopedTheme = forcedTheme ?? _specs.UnistylesShadowRegistry.getScopedTheme();
+  const [scopedTheme, setScopedTheme] = (0, _react.useState)(forcedTheme ?? _specs.UnistylesShadowRegistry.getScopedTheme());
   const [dependencies] = (0, _react.useState)(() => new Set());
   const [theme, setTheme] = (0, _react.useState)(_specs.UnistylesRuntime.getTheme(scopedTheme));
   const [_, runtimeChanged] = (0, _react.useReducer)(() => ({}), {});
@@ -46,13 +46,22 @@ const useProxifiedUnistyles = forcedTheme => {
         }
         setTheme(_specs.UnistylesRuntime.getTheme(scopedTheme));
       },
-      updateRuntime: () => runtimeChanged()
+      updateRuntime: hasThemeNameChange => {
+        if (hasThemeNameChange && scopedTheme) {
+          return;
+        }
+        runtimeChanged();
+      }
     });
   };
   (0, _react.useEffect)(() => {
     reinitListener();
     return () => disposeRef.current?.();
   }, [dependencies.size]);
+  const maybeNewScopedTheme = _specs.UnistylesShadowRegistry.getScopedTheme();
+  if (scopedTheme && maybeNewScopedTheme && scopedTheme !== maybeNewScopedTheme) {
+    setScopedTheme(maybeNewScopedTheme);
+  }
   const proxifiedTheme = new Proxy(theme, {
     get: (target, prop) => {
       dependencies.add(_NativePlatform.UnistyleDependency.Theme);
@@ -76,6 +85,9 @@ const useProxifiedUnistyles = forcedTheme => {
       if (prop in RTDependencyMap) {
         dependencies.add(RTDependencyMap[prop]);
       }
+      if (prop === 'themeName' && scopedTheme) {
+        return scopedTheme;
+      }
       return target[prop];
     }
   });

package/lib/commonjs/core/useProxifiedUnistyles/useProxifiedUnistyles.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_specs","_NativePlatform","_listener","getMiniRuntime","UnistylesRuntime","miniRuntime","RTDependencyMap","breakpoint","UnistyleDependency","Breakpoints","colorScheme","ColorScheme","contentSizeCategory","ContentSizeCategory","hasAdaptiveThemes","AdaptiveThemes","insets","Insets","fontScale","FontScale","isLandscape","Orientation","isPortrait","navigationBar","NavigationBar","screen","Dimensions","statusBar","StatusBar","pixelRatio","PixelRatio","themeName","ThemeName","rtl","Rtl","useProxifiedUnistyles","forcedTheme","scopedTheme","UnistylesShadowRegistry","getScopedTheme","dependencies","useState","Set","theme","setTheme","getTheme","_","runtimeChanged","useReducer","disposeRef","useRef","undefined","reinitListener","current","listener","Array","from","updateTheme","updateRuntime","useEffect","size","proxifiedTheme","Proxy","get","target","prop","add","Theme","proxifiedRuntime","Ime","addDependencies","newDependencies","dependenciesSize","forEach","dependency","exports"],"sourceRoot":"../../../../src","sources":["core/useProxifiedUnistyles/useProxifiedUnistyles.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","require","_specs","_NativePlatform","_listener","getMiniRuntime","UnistylesRuntime","miniRuntime","RTDependencyMap","breakpoint","UnistyleDependency","Breakpoints","colorScheme","ColorScheme","contentSizeCategory","ContentSizeCategory","hasAdaptiveThemes","AdaptiveThemes","insets","Insets","fontScale","FontScale","isLandscape","Orientation","isPortrait","navigationBar","NavigationBar","screen","Dimensions","statusBar","StatusBar","pixelRatio","PixelRatio","themeName","ThemeName","rtl","Rtl","useProxifiedUnistyles","forcedTheme","scopedTheme","setScopedTheme","useState","UnistylesShadowRegistry","getScopedTheme","dependencies","Set","theme","setTheme","getTheme","_","runtimeChanged","useReducer","disposeRef","useRef","undefined","reinitListener","current","listener","Array","from","updateTheme","updateRuntime","hasThemeNameChange","useEffect","size","maybeNewScopedTheme","proxifiedTheme","Proxy","get","target","prop","add","Theme","proxifiedRuntime","Ime","addDependencies","newDependencies","dependenciesSize","forEach","dependency","exports"],"sourceRoot":"../../../../src","sources":["core/useProxifiedUnistyles/useProxifiedUnistyles.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/core/withUnistyles/withUnistyles.js

@@ -24,8 +24,14 @@ const withUnistyles = (Component, mappings) => {
       proxifiedRuntime,
       proxifiedTheme
     } = (0, _useProxifiedUnistyles.useProxifiedUnistyles)();
-    const mappingsProps = mappings ? mappings(proxifiedTheme, proxifiedRuntime) : {};
-    const unistyleProps = narrowedProps.uniProps ? narrowedProps.uniProps(proxifiedTheme, proxifiedRuntime) : {};
+    const {
+      key: mappingsKey,
+      ...mappingsProps
+    } = mappings ? mappings(proxifiedTheme, proxifiedRuntime) : {};
+    const {
+      key: uniPropsKey,
+      ...unistyleProps
+    } = narrowedProps.uniProps ? narrowedProps.uniProps(proxifiedTheme, proxifiedRuntime) : {};
     const emptyStyles = narrowedProps.style ? Object.fromEntries(Object.entries(Object.getOwnPropertyDescriptors(narrowedProps.style)).filter(([key]) => !key.startsWith("unistyles") && !key.startsWith("_")).map(([key]) => [key, undefined])) : undefined;
     const combinedProps = {
       ...(0, _utils.deepMergeObjects)(mappingsProps, unistyleProps, props),
@@ -52,7 +58,7 @@ const withUnistyles = (Component, mappings) => {
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(NativeComponent, {
         ...combinedProps,
         ref: ref
-      })
+      }, uniPropsKey || mappingsKey)
     });
   });
 };

package/lib/commonjs/core/withUnistyles/withUnistyles.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","_interopRequireWildcard","require","_utils","_getClassname","_useProxifiedUnistyles","_warn","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","withUnistyles","Component","mappings","forwardRef","props","ref","narrowedProps","styleClassNames","getClassName","style","contentContainerStyleClassNames","contentContainerStyle","proxifiedRuntime","proxifiedTheme","useProxifiedUnistyles","mappingsProps","unistyleProps","uniProps","emptyStyles","fromEntries","entries","getOwnPropertyDescriptors","filter","key","startsWith","map","undefined","combinedProps","deepMergeObjects","maybeWarnAboutMultipleUnistyles","displayName","name","NativeComponent","classNames","jsx","className","hash","display","children","exports"],"sourceRoot":"../../../../src","sources":["core/withUnistyles/withUnistyles.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","_interopRequireWildcard","require","_utils","_getClassname","_useProxifiedUnistyles","_warn","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","withUnistyles","Component","mappings","forwardRef","props","ref","narrowedProps","styleClassNames","getClassName","style","contentContainerStyleClassNames","contentContainerStyle","proxifiedRuntime","proxifiedTheme","useProxifiedUnistyles","key","mappingsKey","mappingsProps","uniPropsKey","unistyleProps","uniProps","emptyStyles","fromEntries","entries","getOwnPropertyDescriptors","filter","startsWith","map","undefined","combinedProps","deepMergeObjects","maybeWarnAboutMultipleUnistyles","displayName","name","NativeComponent","classNames","jsx","className","hash","display","children","exports"],"sourceRoot":"../../../../src","sources":["core/withUnistyles/withUnistyles.tsx"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/core/withUnistyles/withUnistyles.native.js

@@ -49,8 +49,14 @@ const withUnistyles = (Component, mappings) => {
       const contentContainerStyleSecrets = getSecrets(narrowedProps.contentContainerStyle);
       addDependencies(Array.from(new Set([...styleSecrets.dependencies, ...contentContainerStyleSecrets.dependencies])));
     }, [narrowedProps.style, narrowedProps.contentContainerStyle]);
-    const mappingsProps = mappings ? mappings(proxifiedTheme, proxifiedRuntime) : {};
-    const unistyleProps = narrowedProps.uniProps ? narrowedProps.uniProps(proxifiedTheme, proxifiedRuntime) : {};
+    const {
+      key: mappingsKey,
+      ...mappingsProps
+    } = mappings ? mappings(proxifiedTheme, proxifiedRuntime) : {};
+    const {
+      key: uniPropsKey,
+      ...unistyleProps
+    } = narrowedProps.uniProps ? narrowedProps.uniProps(proxifiedTheme, proxifiedRuntime) : {};
     const styleSecrets = getSecrets(narrowedProps.style);
     const contentContainerStyleSecrets = getSecrets(narrowedProps.contentContainerStyle);
     const finalProps = {
@@ -65,7 +71,7 @@ const withUnistyles = (Component, mappings) => {
     return /*#__PURE__*/(0, _jsxRuntime.jsx)(NativeComponent, {
       ...finalProps,
       ref: ref
-    });
+    }, uniPropsKey || mappingsKey);
   });
 };
 exports.withUnistyles = withUnistyles;