react-native-unistyles 3.1.0 → 3.2.0

package/README.md

@@ -0,0 +1,180 @@
+[<img alt="react-native-unistyles" src="assets/banner3.png">](https://unistyl.es/)
+
+[![npm version](https://img.shields.io/npm/v/react-native-unistyles?style=for-the-badge)](https://www.npmjs.com/package/react-native-unistyles)
+[![npm downloads](https://img.shields.io/npm/dm/react-native-unistyles?style=for-the-badge)](https://www.npmjs.com/package/react-native-unistyles)
+[![npm downloads](https://img.shields.io/npm/dt/react-native-unistyles?style=for-the-badge)](https://www.npmjs.com/package/react-native-unistyles)
+[![License: MIT](https://img.shields.io/badge/License-MIT-44CD11.svg?style=for-the-badge)](https://opensource.org/licenses/MIT)
+<br />
+[![platform - expo](https://img.shields.io/badge/Expo-fff?style=for-the-badge&logo=expo&logoColor=black)](https://docs.expo.dev/)
+[![platform - web](https://img.shields.io/badge/Web-white?logo=react&logoColor=57BDDA&style=for-the-badge)](https://www.w3.org/)
+[![platform - ios](https://img.shields.io/badge/iOS-000?logo=apple&style=for-the-badge)](https://developer.apple.com/ios/)
+[![platform - android](https://img.shields.io/badge/Android-44CD11?style=for-the-badge&logo=android&logoColor=white)](https://developer.android.com/)
+[![platform - ssr](https://img.shields.io/badge/SSR-black?style=for-the-badge&logo=next.js&logoColor=white)](https://nextjs.org/)
+
+
+## Installation
+
+```shell
+yarn add react-native-unistyles
+```
+
+Install dependencies:
+
+```shell
+yarn add react-native-nitro-modules
+```
+
+| react-native-unistyles | Minimum react-native-nitro-modules     |
+|------------------------|----------------------------------------|
+| >= 3.0.0               | >= 0.33.9                              |
+| >= 3.1.0               | >= 0.35.0                              |
+| >= 3.2.0               | >= 0.35.2                              |
+
+> **Note:** Since v3.1.0, `react-native-edge-to-edge` is an **optional** dependency. We strongly recommend setting `edgeToEdgeEnabled=true` in your `android/gradle.properties` — it enforces translucent system bars on modals, disables legacy StatusBar hacks, and enables additional React Native core fixes. **Expo SDK 54+** enables this automatically. You can still install `react-native-edge-to-edge` for ecosystem compatibility with libraries like `react-native-bootsplash` or `react-native-permissions`.
+
+Then follow [installation guides](https://unistyl.es/v3/start/getting-started) for your platform.
+
+## [Documentation](https://unistyl.es/)
+- [Start here](https://unistyl.es/v3/start/introduction)
+- [Migration from Unistyles 2.0](https://unistyl.es/v3/start/migration-guide)
+- [Learn how Unistyles 3.0 works](https://unistyl.es/v3/start/how-unistyles-works)
+- [API](https://unistyl.es/v3/references/stylesheet)
+- [Examples](https://unistyl.es/v3/examples/examples)
+
+## Features
+- 🚀 Shared core with C++ and JSI bindings
+- 🏎️ Powered by Nitro Modules
+- 🦸🏼‍♂️ No re-renders
+- 🦄 Custom web parser, classes and pseudo classes
+- ⚛️ Tightly integrated with Fabric and Shadow Tree
+- 🔥 Crazy performance, adds under 0.1 ms to your StyleSheet
+- 🎳 Share up to 100% of your styles across platforms in monorepo
+- 🎯 Doesn't introduce new components, your view hierarchy is always clean
+- 🎨 Register multiple themes and change them with single function call
+- and [much much more](https://unistyl.es/v3/start/new-features)!
+
+## Sponsors
+
+<a href="https://codemask.com">
+    <img src="https://avatars.githubusercontent.com/u/51229884?s=200&v=4" height="70px" width="70px" alt="codemask" />
+</a>
+<a href="https://galaxies.dev">
+     <img src="https://avatars.githubusercontent.com/u/118431096?s=200&v=4" height="70px" width="70px" alt="galaxies-dev" />
+</a>
+<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/jordmccord">
+     <img src="https://avatars.githubusercontent.com/u/7591840?v=4" height="70px" width="70px" alt="jordmccord" />
+</a>
+<a href="https://github.com/kerwanp">
+     <img src="https://avatars.githubusercontent.com/u/36955373?v=4" height="70px" width="70px" alt="kerwanp" />
+</a>
+<a href="https://github.com/andkindness">
+     <img src="https://avatars.githubusercontent.com/u/143941782?v=4" height="70px" width="70px" alt="andkindness" />
+</a>
+<a href="https://github.com/AdiRishi">
+     <img src="https://avatars.githubusercontent.com/u/8351234?v=4" height="70px" width="70px" alt="AdiRishi" />
+</a>
+<a href="https://github.com/cybercarrot">
+     <img src="https://avatars.githubusercontent.com/u/6837094?v=4" height="70px" width="70px" alt="cybercarrot" />
+</a>
+
+
+## Past sponsors
+
+<a href="https://github.com/kmartinezmedia">
+     <img src="https://avatars.githubusercontent.com/u/6308123?s=200&v=4" height="60px" width="60px" alt="kmartinezmedia" />
+</a>
+<a href="https://github.com/levibuzolic">
+     <img src="https://avatars.githubusercontent.com/u/721323?v=4" height="60px" width="60px" alt="levibuzolic" />
+</a>
+<a href="https://github.com/claudesortwell">
+     <img src="https://avatars.githubusercontent.com/u/41422239?v=4" height="60px" width="60px" alt="claudesortwell" />
+</a>
+<a href="https://github.com/luoxuhai">
+     <img src="https://avatars.githubusercontent.com/u/37284154?v=4" height="60px" width="60px" alt="luoxuhai" />
+</a>
+<a href="https://github.com">
+     <img src="https://avatars.githubusercontent.com/u/113348625?v=4" height="60px" width="60px" alt="anonymous" />
+</a>
+<a href="https://github.com/abanobboles">
+     <img src="https://avatars.githubusercontent.com/u/9078953?v=4" height="60px" width="60px" alt="abanobboles" />
+</a>
+<a href="https://github.com/hyoban">
+     <img src="https://avatars.githubusercontent.com/u/38493346?v=4" height="60px" width="60px" alt="hyoban" />
+</a>
+<a href="https://github.com/giovannilondero">
+     <img src="https://avatars.githubusercontent.com/u/10998991?v=4" height="60px" width="60px" alt="giovannilondero" />
+</a>
+<a href="https://github.com/4cc3ssX">
+     <img src="https://avatars.githubusercontent.com/u/57473799?v=4" height="60px" width="60px" alt="4cc3ssX" />
+</a>
+<a href="https://github.com/FilipiRafael">
+     <img src="https://avatars.githubusercontent.com/u/61629642?v=4" height="60px" width="60px" alt="FilipiRafael" />
+</a>
+<a href="https://github.com/dacoto97">
+     <img src="https://avatars.githubusercontent.com/u/16915053?v=4" height="60px" width="60px" alt="dacoto97" />
+</a>
+<a href="https://github.com/chinamcafee">
+     <img src="https://avatars.githubusercontent.com/u/3439961?v=4" height="60px" width="60px" alt="chinamcafee" />
+</a>
+<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/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>
+<a href="https://github.com/oscklm">
+     <img src="https://avatars.githubusercontent.com/u/22825865?v=4" height="60px" width="60px" alt="oscklm" />
+</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/mobily">
+     <img src="https://avatars.githubusercontent.com/u/1467712?v=4" height="60px" width="60px" alt="mobily" />
+</a>
+<a href="https://github.com/mwarger">
+     <img src="https://avatars.githubusercontent.com/u/686823?v=4" height="60px" width="60px" alt="mwarger" />
+</a>
+<a href="https://github.com/happyfloat">
+     <img src="https://avatars.githubusercontent.com/u/186333704?s=200&v=4" height="60px" width="60px" alt="happyfloat" />
+</a>
+<a href="https://github.com/cargurus-oss-fund">
+     <img src="https://avatars.githubusercontent.com/u/108300759?v=4" height="60px" width="60px" alt="cargurus-oss-fund" />
+</a>
+<a href="https://github.com/rauchg">
+     <img src="https://avatars.githubusercontent.com/u/13041?v=4" height="60px" width="60px" alt="rauchg" />
+</a>
+<a href="https://github.com/oliverloops">
+     <img src="https://avatars.githubusercontent.com/u/33361399?v=4" height="60px" width="60px" alt="oliverloops" />
+</a>
+<a href="https://github.com/biw">
+     <img src="https://avatars.githubusercontent.com/u/6139501?v=4" height="60px" width="60px" alt="biw" />
+</a>
+
+## Sponsor my work
+
+[How to become a sponsor?](https://unistyl.es/v3/other/for-sponsors)
+
+If you found the `react-native-unistyles` time-saving and valuable, please consider sponsoring my work. Your support enables me to continue creating libraries with a fresh approach.
+
+Github: https://github.com/sponsors/jpudysz
+
+Ko-fi: https://ko-fi.com/jpudysz
+
+Your support is greatly appreciated and helps me dedicate more time and resources to creating quality libraries. Thank you for all the support!
+
+
+## Discord
+Looking for help or you want to chat with me?
+
+[Join Discord](https://discord.gg/akGHf27P4C)
+
+
+## License
+
+MIT

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

@@ -33,11 +33,8 @@ void UnistylesModule::registerNatives() {
 jni::local_ref<BindingsInstallerHolder::javaobject> UnistylesModule::getBindingsInstaller(jni::alias_ref<UnistylesModule::javaobject> jobj) {
     auto& runtimeExecutor = jobj->cthis()->_runtimeExecutor;
     auto& nativePlatform = jobj->cthis()->_nativePlatform;
-    auto* self = jobj->cthis();
-
-    return BindingsInstallerHolder::newObjectCxxArgs([&runtimeExecutor, &nativePlatform, self](jsi::Runtime& rt) {
-        self->_runtime = &rt;
 
+    return BindingsInstallerHolder::newObjectCxxArgs([&runtimeExecutor, &nativePlatform](jsi::Runtime& rt) {
         // function is called on: first init and every live reload
         // check if this is live reload, if so let's replace UnistylesRuntime with new runtime
         auto hasUnistylesRuntime = HybridObjectRegistry::hasHybridObject("UnistylesRuntime");
@@ -55,7 +52,7 @@ jni::local_ref<BindingsInstallerHolder::javaobject> UnistylesModule::getBindings
         };
 
         // init hybrids
-        auto unistylesRuntime = std::make_shared<HybridUnistylesRuntime>(nativePlatform, rt, runOnJSThread);
+        auto unistylesRuntime = std::make_shared<HybridUnistylesRuntime>(nativePlatform, runOnJSThread);
         auto styleSheet = std::make_shared<HybridStyleSheet>(unistylesRuntime);
 
         HybridObjectRegistry::registerHybridObjectConstructor("UnistylesRuntime", [unistylesRuntime]() -> std::shared_ptr<HybridObject>{

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

@@ -29,12 +29,7 @@ struct UnistylesModule : public jni::HybridClass<UnistylesModule> {
         jni::alias_ref<JHybridNativePlatformSpec::JavaPart> nativePlatform
     );
     static void invalidateNative(jni::alias_ref<jhybridobject> jThis) {
-        auto* self = jThis->cthis();
-
-        if (self->_runtime) {
-            core::UnistylesRegistry::get().destroyState(self->_runtime);
-            self->_runtime = nullptr;
-        }
+        core::UnistylesRegistry::get().destroy();
     }
 
     static jni::local_ref<BindingsInstallerHolder::javaobject> getBindingsInstaller(jni::alias_ref<UnistylesModule::javaobject> jThis);
@@ -42,7 +37,6 @@ struct UnistylesModule : public jni::HybridClass<UnistylesModule> {
 private:
     RuntimeExecutor _runtimeExecutor;
     std::shared_ptr<HybridNativePlatformSpec> _nativePlatform;
-    jsi::Runtime* _runtime = nullptr;
 };
 
 }

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

@@ -54,7 +54,11 @@ fun NativePlatformAndroid.diffMiniRuntimes(lhs: UnistylesNativeMiniRuntime, rhs:
         dependencies.add(UnistyleDependency.NAVIGATIONBAR)
     }
 
-    // rtl and pixel ratio are not dynamic
+    if (lhs.rtl != rhs.rtl) {
+        dependencies.add(UnistyleDependency.RTL)
+    }
+
+    // pixel ratio is not dynamic
 
     return dependencies.toTypedArray()
 }

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

@@ -37,6 +37,8 @@ class NativePlatformAndroid(private val reactContext: ReactApplicationContext):
     }
 
     fun onDestroy() {
+        _listener.onDestroy()
+        _insets.onDestroy()
         reactContext.removeLifecycleEventListener(this)
     }
 
@@ -155,11 +157,14 @@ class NativePlatformAndroid(private val reactContext: ReactApplicationContext):
             "com.facebook.react.modules.i18nmanager.I18nUtil",
             Context.MODE_PRIVATE
         )
+        val resourcesLocale = reactContext.resources.configuration.locales[0]
         val hasForcedRtl = sharedPrefs.getBoolean("RCTI18nUtil_forceRTL", false)
         // user preferences
         val isRtl = TextUtilsCompat.getLayoutDirectionFromLocale(Locale.getDefault()) == ViewCompat.LAYOUT_DIRECTION_RTL
+        val isResourcesRtl = TextUtilsCompat.getLayoutDirectionFromLocale(resourcesLocale) == ViewCompat.LAYOUT_DIRECTION_RTL
 
-        return hasForcedRtl || isRtl
+
+        return hasForcedRtl || isRtl || isResourcesRtl
     }
 
     override fun setRootViewBackgroundColor(color: Double) {

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

@@ -4,6 +4,7 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
+import android.content.SharedPreferences
 import android.os.Handler
 import android.os.Looper
 import androidx.annotation.Keep
@@ -23,21 +24,38 @@ class NativePlatformListener(
 ) {
     private val _dependencyListeners: MutableList<CxxDependencyListener> = mutableListOf()
 
+    private fun notifyConfigChangedWithDelay() {
+        Handler(Looper.getMainLooper()).postDelayed({
+            this@NativePlatformListener.onConfigChange()
+        }, 25)
+    }
+
     private val configurationChangeReceiver = object : BroadcastReceiver() {
         override fun onReceive(context: Context, intent: Intent) {
-            Handler(Looper.getMainLooper()).postDelayed({
-                this@NativePlatformListener.onConfigChange()
-            }, 25)
+            notifyConfigChangedWithDelay()
+        }
+    }
+
+    private val rtlPreferenceListener = SharedPreferences.OnSharedPreferenceChangeListener { prefs, key ->
+        if (key == "RCTI18nUtil_forceRTL") {
+            notifyConfigChangedWithDelay()
         }
     }
 
+    private val i18nUtilSharedPrefs = reactContext.getSharedPreferences(
+        "com.facebook.react.modules.i18nmanager.I18nUtil",
+        Context.MODE_PRIVATE
+    )
+
     init {
         reactContext.registerReceiver(configurationChangeReceiver, IntentFilter(Intent.ACTION_CONFIGURATION_CHANGED))
+        i18nUtilSharedPrefs.registerOnSharedPreferenceChangeListener(rtlPreferenceListener)
     }
 
     fun onDestroy() {
         this.removePlatformListeners()
         reactContext.unregisterReceiver(configurationChangeReceiver)
+        i18nUtilSharedPrefs.unregisterOnSharedPreferenceChangeListener(rtlPreferenceListener)
     }
 
     fun addPlatformListener(listener: CxxDependencyListener) {

package/cxx/core/UnistyleWrapper.h

@@ -57,7 +57,7 @@ inline static std::vector<Unistyle::Shared> unistylesFromHashKeys(jsi::Runtime&
     auto& registry = UnistylesRegistry::get();
 
     for (auto& key: keys) {
-        unistyles.emplace_back(registry.getUnistyleById(rt, key));
+        unistyles.emplace_back(registry.getUnistyleById(key));
     }
 
     return unistyles;
@@ -157,7 +157,7 @@ inline static jsi::Value objectFromUnistyle(jsi::Runtime& rt, std::shared_ptr<Hy
         [unistyleID = unistyle->unid, unistylesRuntime, variants, parsedArguments](jsi::Runtime &rt, const jsi::Value &thisValue, const jsi::Value *args, size_t count
     ) {
         auto& registry = UnistylesRegistry::get();
-        auto unistyle = registry.getUnistyleById(rt, unistyleID);
+        auto unistyle = registry.getUnistyleById(unistyleID);
 
         parser::Parser(unistylesRuntime).rebuildUnistyle(rt, unistyle, variants, parsedArguments);
 

package/cxx/core/UnistylesRegistry.cpp

@@ -9,50 +9,44 @@ using namespace facebook::react;
 std::atomic<int> core::UnistylesRegistry::_nextStyleSheetTag{0};
 
 void core::UnistylesRegistry::registerTheme(jsi::Runtime& rt, std::string name, jsi::Value& theme) {
-    auto& state = this->getState(rt);
+    auto& state = this->getState();
 
     state._jsThemes.emplace(name, std::move(theme));
     state._registeredThemeNames.push_back(name);
 }
 
-void core::UnistylesRegistry::registerBreakpoints(jsi::Runtime& rt, std::vector<std::pair<std::string, double>>& sortedBreakpoints) {
-    auto& state = this->getState(rt);
+void core::UnistylesRegistry::registerBreakpoints(std::vector<std::pair<std::string, double>>& sortedBreakpoints) {
+    auto& state = this->getState();
 
     state._sortedBreakpointPairs = std::move(sortedBreakpoints);
 }
 
-void core::UnistylesRegistry::setPrefersAdaptiveThemes(jsi::Runtime& rt, bool prefersAdaptiveThemes) {
-    auto& state = this->getState(rt);
+void core::UnistylesRegistry::setPrefersAdaptiveThemes(bool prefersAdaptiveThemes) {
+    auto& state = this->getState();
 
     state._prefersAdaptiveThemes = prefersAdaptiveThemes;
 }
 
-void core::UnistylesRegistry::setInitialThemeName(jsi::Runtime& rt, std::string themeName) {
-    auto& state = this->getState(rt);
+void core::UnistylesRegistry::setInitialThemeName(std::string themeName) {
+    auto& state = this->getState();
 
     state._initialThemeName = themeName;
 }
 
-core::UnistylesState& core::UnistylesRegistry::getState(jsi::Runtime& rt) {
-    auto it = this->_states.find(&rt);
-
-    helpers::assertThat(rt, it != this->_states.end(), "Unistyles was loaded, but it's not configured. Did you forget to call StyleSheet.configure? If you don't want to use any themes or breakpoints, simply call it with an empty object {}.");
+core::UnistylesState& core::UnistylesRegistry::getState() {
+    if (!this->_state) {
+        throw std::runtime_error("Unistyles was loaded, but it's not configured. Did you forget to call StyleSheet.configure? If you don't want to use any themes or breakpoints, simply call it with an empty object {}.");
+    }
 
-    return it->second;
+    return *this->_state;
 }
 
-void core::UnistylesRegistry::createState(jsi::Runtime& rt) {
-    auto it = this->_states.find(&rt);
-
-    this->_states.emplace(
-        std::piecewise_construct,
-        std::forward_as_tuple(&rt),
-        std::forward_as_tuple(rt)
-    );
+void core::UnistylesRegistry::createState() {
+    this->_state = std::make_unique<UnistylesState>();
 }
 
 void core::UnistylesRegistry::updateTheme(jsi::Runtime& rt, std::string& themeName, jsi::Function&& callback) {
-    auto& state = this->getState(rt);
+    auto& state = this->getState();
     auto it = state._jsThemes.find(themeName);
 
     helpers::assertThat(rt, it != state._jsThemes.end(), "Unistyles: You're trying to update theme '" + themeName + "' but it wasn't registered.");
@@ -70,22 +64,36 @@ void core::UnistylesRegistry::linkShadowNodeWithUnistyle(
     std::vector<std::shared_ptr<UnistyleData>>& unistylesData
 ) {
     this->trafficController.withLock([this, &rt, &unistylesData, shadowNodeFamily](){
+        // Clear suspension state if this family was previously suspended
+        if (_suspendedFamilies.erase(shadowNodeFamily) > 0) {
+            auto* mutableFamily = const_cast<ShadowNodeFamily*>(shadowNodeFamily);
+            mutableFamily->nativeProps_DEPRECATED.reset();
+        }
+
         shadow::ShadowLeafUpdates updates;
         auto parser = parser::Parser(nullptr);
 
-        std::for_each(unistylesData.begin(), unistylesData.end(), [this, &rt, shadowNodeFamily](std::shared_ptr<UnistyleData> unistyleData){
-            this->_shadowRegistry[&rt][shadowNodeFamily].emplace_back(unistyleData);
+        std::for_each(unistylesData.begin(), unistylesData.end(), [this, shadowNodeFamily](std::shared_ptr<UnistyleData> unistyleData){
+            this->_shadowRegistry[shadowNodeFamily].emplace_back(unistyleData);
         });
 
         updates[shadowNodeFamily] = parser.parseStylesToShadowTreeStyles(rt, unistylesData);
 
+        auto* mutableFamily = const_cast<ShadowNodeFamily*>(shadowNodeFamily);
+
+        if (mutableFamily->nativeProps_DEPRECATED) {
+            mutableFamily->nativeProps_DEPRECATED->update(updates[shadowNodeFamily]);
+        } else {
+            mutableFamily->nativeProps_DEPRECATED = std::make_unique<folly::dynamic>(updates[shadowNodeFamily]);
+        }
+
         this->trafficController.setUpdates(updates);
         this->trafficController.resumeUnistylesTraffic();
     });
 }
 
-void core::UnistylesRegistry::removeDuplicatedUnistyles(jsi::Runtime& rt, const ShadowNodeFamily *shadowNodeFamily, std::vector<core::Unistyle::Shared>& unistyles) {
-    auto targetFamilyUnistyles = this->_shadowRegistry[&rt][shadowNodeFamily];
+void core::UnistylesRegistry::removeDuplicatedUnistyles(const ShadowNodeFamily *shadowNodeFamily, std::vector<core::Unistyle::Shared>& unistyles) {
+    auto targetFamilyUnistyles = this->_shadowRegistry[shadowNodeFamily];
 
     unistyles.erase(
         std::remove_if(
@@ -105,32 +113,41 @@ void core::UnistylesRegistry::removeDuplicatedUnistyles(jsi::Runtime& rt, const
     );
 }
 
-void core::UnistylesRegistry::unlinkShadowNodeWithUnistyles(jsi::Runtime& rt, const ShadowNodeFamily* shadowNodeFamily) {
-    this->trafficController.withLock([this, &rt, shadowNodeFamily](){
-        this->_shadowRegistry[&rt].erase(shadowNodeFamily);
+void core::UnistylesRegistry::unlinkShadowNodeWithUnistyles(const ShadowNodeFamily* shadowNodeFamily) {
+    this->trafficController.withLock([this, shadowNodeFamily](){
+        this->_shadowRegistry.erase(shadowNodeFamily);
+        this->_suspendedFamilies.erase(shadowNodeFamily);
         this->trafficController.removeShadowNode(shadowNodeFamily);
+    });
+}
 
-        if (this->_shadowRegistry[&rt].empty()) {
-            this->_shadowRegistry.erase(&rt);
+void core::UnistylesRegistry::suspendShadowNode(const ShadowNodeFamily* shadowNodeFamily) {
+    this->trafficController.withLock([this, shadowNodeFamily](){
+        if (this->_shadowRegistry.contains(shadowNodeFamily)) {
+            this->_suspendedFamilies.insert(shadowNodeFamily);
         }
     });
 }
 
+bool core::UnistylesRegistry::isSuspended(const ShadowNodeFamily* family) const noexcept {
+    return _suspendedFamilies.count(family) > 0;
+}
+
 std::shared_ptr<core::StyleSheet> core::UnistylesRegistry::addStyleSheet(jsi::Runtime& rt, core::StyleSheetType type, jsi::Object&& rawValue) {
     int tag = _nextStyleSheetTag.fetch_add(1);
 
     auto sheet = std::make_shared<core::StyleSheet>(tag, type, std::move(rawValue));
-    this->_styleSheetRegistry[&rt][tag] = sheet;
+    this->_styleSheetRegistry[tag] = sheet;
 
     return sheet;
 }
 
-core::DependencyMap core::UnistylesRegistry::buildDependencyMap(jsi::Runtime& rt, std::vector<UnistyleDependency>& deps) {
+core::DependencyMap core::UnistylesRegistry::buildDependencyMap(std::vector<UnistyleDependency>& deps) {
     core::DependencyMap dependencyMap;
 
     std::unordered_set<UnistyleDependency> uniqueDependencies(deps.begin(), deps.end());
 
-    for (const auto& [family, unistyles] : this->_shadowRegistry[&rt]) {
+    for (const auto& [family, unistyles] : this->_shadowRegistry) {
         bool hasAnyOfDependencies = false;
 
         // Check if any dependency matches
@@ -171,7 +188,7 @@ void core::UnistylesRegistry::shadowLeafUpdateFromUnistyle(jsi::Runtime& rt, Uni
             ? std::make_optional(maybePressableId.asString(rt).utf8(rt))
             : std::nullopt;
 
-        for (const auto& [family, unistyles] : this->_shadowRegistry[&rt]) {
+        for (const auto& [family, unistyles] : this->_shadowRegistry) {
             for (const auto& unistyleData : unistyles) {
                 if (unistyleData->unistyle == unistyle) {
                     updates[family] = parser.parseStylesToShadowTreeStyles(rt, { unistyleData });
@@ -183,7 +200,7 @@ void core::UnistylesRegistry::shadowLeafUpdateFromUnistyle(jsi::Runtime& rt, Uni
     });
 }
 
-std::vector<std::shared_ptr<core::StyleSheet>>core::UnistylesRegistry::getStyleSheetsToRefresh(jsi::Runtime& rt, std::vector<UnistyleDependency>& unistylesDependencies) {
+std::vector<std::shared_ptr<core::StyleSheet>>core::UnistylesRegistry::getStyleSheetsToRefresh(std::vector<UnistyleDependency>& unistylesDependencies) {
     std::vector<std::shared_ptr<core::StyleSheet>> stylesheetsToRefresh;
     std::unordered_set<UnistyleDependency> depSet(
         unistylesDependencies.begin(),
@@ -197,8 +214,6 @@ std::vector<std::shared_ptr<core::StyleSheet>>core::UnistylesRegistry::getStyleS
         return stylesheetsToRefresh;
     }
 
-    auto& styleSheets = this->_styleSheetRegistry[&rt];
-
     auto hasMatchingDependency = [&depSet](const auto& unistyles) {
         for (const auto& [_, unistyle] : unistyles) {
             for (const auto& dep : unistyle->dependencies) {
@@ -211,7 +226,7 @@ std::vector<std::shared_ptr<core::StyleSheet>>core::UnistylesRegistry::getStyleS
         return false;
     };
 
-    for (const auto& [_, styleSheet] : styleSheets) {
+    for (const auto& [_, styleSheet] : this->_styleSheetRegistry) {
         if (styleSheet->type == StyleSheetType::ThemableWithMiniRuntime || styleSheet->type == StyleSheetType::Static) {
             if (hasMatchingDependency(styleSheet->unistyles)) {
                 stylesheetsToRefresh.emplace_back(styleSheet);
@@ -226,8 +241,8 @@ std::vector<std::shared_ptr<core::StyleSheet>>core::UnistylesRegistry::getStyleS
     return stylesheetsToRefresh;
 }
 
-core::Unistyle::Shared core::UnistylesRegistry::getUnistyleById(jsi::Runtime& rt, std::string unistyleID) {
-    for (auto& pair: this->_styleSheetRegistry[&rt]) {
+core::Unistyle::Shared core::UnistylesRegistry::getUnistyleById(std::string unistyleID) {
+    for (auto& pair: this->_styleSheetRegistry) {
         auto [_, stylesheet] = pair;
 
         for (auto unistylePair: stylesheet->unistyles) {
@@ -251,16 +266,10 @@ void core::UnistylesRegistry::setScopedTheme(std::optional<std::string> themeNam
 }
 
 void core::UnistylesRegistry::destroy() {
-    this->_states.clear();
+    this->_state.reset();
     this->_styleSheetRegistry.clear();
     this->_shadowRegistry.clear();
+    this->_suspendedFamilies.clear();
     this->_scopedTheme = std::nullopt;
     _nextStyleSheetTag.store(0);
 }
-
-void core::UnistylesRegistry::destroyState(jsi::Runtime* rt) {
-    this->_states.erase(rt);
-    this->_styleSheetRegistry.erase(rt);
-    this->_shadowRegistry.erase(rt);
-    this->_scopedTheme = std::nullopt;
-}

package/cxx/core/UnistylesRegistry.h

@@ -32,35 +32,37 @@ struct UnistylesRegistry: public StyleSheetRegistry {
     bool shouldUsePointsForBreakpoints = false;
 
     void registerTheme(jsi::Runtime& rt, std::string name, jsi::Value& theme);
-    void registerBreakpoints(jsi::Runtime& rt, std::vector<std::pair<std::string, double>>& sortedBreakpoints);
-    void setPrefersAdaptiveThemes(jsi::Runtime& rt, bool prefersAdaptiveThemes);
-    void setInitialThemeName(jsi::Runtime& rt, std::string themeName);
+    void registerBreakpoints(std::vector<std::pair<std::string, double>>& sortedBreakpoints);
+    void setPrefersAdaptiveThemes(bool prefersAdaptiveThemes);
+    void setInitialThemeName(std::string themeName);
     void updateTheme(jsi::Runtime& rt, std::string& themeName, jsi::Function&& callback);
 
-    UnistylesState& getState(jsi::Runtime& rt);
-    void createState(jsi::Runtime& rt);
-    std::vector<std::shared_ptr<core::StyleSheet>> getStyleSheetsToRefresh(jsi::Runtime& rt, std::vector<UnistyleDependency>& unistylesDependencies);
+    UnistylesState& getState();
+    void createState();
+    std::vector<std::shared_ptr<core::StyleSheet>> getStyleSheetsToRefresh(std::vector<UnistyleDependency>& unistylesDependencies);
     void linkShadowNodeWithUnistyle(jsi::Runtime& rt, const ShadowNodeFamily*, std::vector<std::shared_ptr<UnistyleData>>& unistylesData);
-    void unlinkShadowNodeWithUnistyles(jsi::Runtime& rt, const ShadowNodeFamily*);
+    void unlinkShadowNodeWithUnistyles(const ShadowNodeFamily*);
+    void suspendShadowNode(const ShadowNodeFamily*);
+    bool isSuspended(const ShadowNodeFamily*) const noexcept;
     std::shared_ptr<core::StyleSheet> addStyleSheet(jsi::Runtime& rt, core::StyleSheetType type, jsi::Object&& rawValue);
-    DependencyMap buildDependencyMap(jsi::Runtime& rt, std::vector<UnistyleDependency>& deps);
+    DependencyMap buildDependencyMap(std::vector<UnistyleDependency>& deps);
     void shadowLeafUpdateFromUnistyle(jsi::Runtime& rt, Unistyle::Shared unistyle, jsi::Value& maybePressableId);
     shadow::ShadowTrafficController trafficController{};
     const std::optional<std::string> getScopedTheme();
-    void removeDuplicatedUnistyles(jsi::Runtime& rt, const ShadowNodeFamily* shadowNodeFamily, std::vector<core::Unistyle::Shared>& unistyles);
+    void removeDuplicatedUnistyles(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);
+    core::Unistyle::Shared getUnistyleById(std::string unistyleID);
     void destroy();
-    void destroyState(jsi::Runtime* rt);
 
 private:
     UnistylesRegistry() = default;
 
     static std::atomic<int> _nextStyleSheetTag;
     std::optional<std::string> _scopedTheme{};
-    std::unordered_map<jsi::Runtime*, UnistylesState> _states{};
-    std::unordered_map<jsi::Runtime*, std::unordered_map<int, std::shared_ptr<core::StyleSheet>>> _styleSheetRegistry{};
-    std::unordered_map<jsi::Runtime*, std::unordered_map<const ShadowNodeFamily*, std::vector<std::shared_ptr<UnistyleData>>>> _shadowRegistry{};
+    std::unique_ptr<UnistylesState> _state{};
+    std::unordered_map<int, std::shared_ptr<core::StyleSheet>> _styleSheetRegistry{};
+    std::unordered_map<const ShadowNodeFamily*, std::vector<std::shared_ptr<UnistyleData>>> _shadowRegistry{};
+    std::unordered_set<const ShadowNodeFamily*> _suspendedFamilies{};
 };
 
 inline UnistylesRegistry& UnistylesRegistry::get() {