react-native-unistyles 3.0.0-nightly-20250513 → 3.0.0-nightly-20250526

package/README.md

@@ -28,8 +28,8 @@ yarn add react-native-edge-to-edge react-native-nitro-modules@0.25.2
 
 | react-native-unistyles | react-native-nitro-modules |
 |------------------------|----------------------------|
-| 3.0.0-nightly-20250508 | 0.25.2                     |
-| 3.0.0-rc.3             | 0.25.2                     |
+| 3.0.0-nightly-20250520 | 0.25.2                     |
+| 3.0.0-rc.4             | 0.25.2                     |
 
 Then follow [installation guides](https://unistyl.es/v3/start/getting-started) for your platform.
 
@@ -60,9 +60,6 @@ Then follow [installation guides](https://unistyl.es/v3/start/getting-started) f
 <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/FTCHD">
-     <img src="https://avatars.githubusercontent.com/u/144691102?v=4" height="70px" width="70px" alt="FTCHD" />
-</a>
 <a href="https://github.com/mobily">
      <img src="https://avatars.githubusercontent.com/u/1467712?v=4" height="70px" width="70px" alt="mobily" />
 </a>
@@ -81,8 +78,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/loopsware">
-     <img src="https://avatars.githubusercontent.com/u/161434039?s=200&v=4" height="70px" width="70px" alt="loopsware" />
+<a href="https://github.com/avega99">
+     <img src="https://avatars.githubusercontent.com/u/177598670?v=4" height="70px" width="70px" alt="avega99" />
 </a>
 
 ## Past sponsors
@@ -126,6 +123,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>
 
 ## Sponsor my work
 

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

@@ -10,19 +10,16 @@ using namespace facebook::react;
 UnistylesModule::UnistylesModule(
     jni::alias_ref<UnistylesModule::jhybridobject> jThis,
     jni::alias_ref<react::JRuntimeExecutor::javaobject> runtimeExecutorHolder,
-    jni::alias_ref<JFabricUIManager::javaobject> fabricUIManager,
     jni::alias_ref<JHybridNativePlatformSpec::javaobject> nativePlatform
 ):  _runtimeExecutor(runtimeExecutorHolder->cthis()->get()),
-    _uiManager(fabricUIManager->getBinding()->getScheduler()->getUIManager()),
     _nativePlatform(nativePlatform->cthis()) {}
 
 jni::local_ref<UnistylesModule::jhybriddata> UnistylesModule::initHybrid(
     jni::alias_ref<UnistylesModule::jhybridobject> jThis,
     jni::alias_ref<JRuntimeExecutor::javaobject> runtimeExecutorHolder,
-    jni::alias_ref<JFabricUIManager::javaobject> fabricUIManager,
     jni::alias_ref<JHybridNativePlatformSpec::javaobject> nativePlatform
 ) {
-    return makeCxxInstance(jThis, runtimeExecutorHolder, fabricUIManager, nativePlatform);
+    return makeCxxInstance(jThis, runtimeExecutorHolder, nativePlatform);
 }
 
 void UnistylesModule::registerNatives() {
@@ -34,10 +31,9 @@ void UnistylesModule::registerNatives() {
 
 jni::local_ref<BindingsInstallerHolder::javaobject> UnistylesModule::getBindingsInstaller(jni::alias_ref<UnistylesModule::javaobject> jobj) {
     auto& runtimeExecutor = jobj->cthis()->_runtimeExecutor;
-    auto& uiManager = jobj->cthis()->_uiManager;
     auto& nativePlatform = jobj->cthis()->_nativePlatform;
 
-    return BindingsInstallerHolder::newObjectCxxArgs([&runtimeExecutor, &uiManager, &nativePlatform](jsi::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");
@@ -56,7 +52,7 @@ jni::local_ref<BindingsInstallerHolder::javaobject> UnistylesModule::getBindings
 
         // init hybrids
         auto unistylesRuntime = std::make_shared<HybridUnistylesRuntime>(nativePlatform, rt, runOnJSThread);
-        auto styleSheet = std::make_shared<HybridStyleSheet>(unistylesRuntime, uiManager);
+        auto styleSheet = std::make_shared<HybridStyleSheet>(unistylesRuntime);
 
         HybridObjectRegistry::registerHybridObjectConstructor("UnistylesRuntime", [unistylesRuntime]() -> std::shared_ptr<HybridObject>{
             return unistylesRuntime;

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

@@ -1,7 +1,6 @@
 #pragma once
 
 #include <ReactCommon/BindingsInstallerHolder.h>
-#include <react/fabric/JFabricUIManager.h>
 #include <react/jni/JRuntimeExecutor.h>
 #include <react/renderer/scheduler/Scheduler.h>
 #include <fbjni/fbjni.h>
@@ -19,7 +18,6 @@ struct UnistylesModule : public jni::HybridClass<UnistylesModule> {
     explicit UnistylesModule(
         jni::alias_ref<jhybridobject> jThis,
         jni::alias_ref<react::JRuntimeExecutor::javaobject> runtimeExecutorHolder,
-        jni::alias_ref<JFabricUIManager::javaobject> fabricUIManager,
         jni::alias_ref<JHybridNativePlatformSpec::javaobject> nativePlatform
     );
 
@@ -27,14 +25,12 @@ struct UnistylesModule : public jni::HybridClass<UnistylesModule> {
     static jni::local_ref<jhybriddata> initHybrid(
         jni::alias_ref<jhybridobject> jThis,
         jni::alias_ref<JRuntimeExecutor::javaobject> runtimeExecutorHolder,
-        jni::alias_ref<JFabricUIManager::javaobject>,
         jni::alias_ref<JHybridNativePlatformSpec::javaobject> nativePlatform
     );
 
     static jni::local_ref<BindingsInstallerHolder::javaobject> getBindingsInstaller(jni::alias_ref<UnistylesModule::javaobject> jThis);
 
 private:
-    std::shared_ptr<UIManager> _uiManager;
     RuntimeExecutor _runtimeExecutor;
     std::shared_ptr<HybridNativePlatformSpec> _nativePlatform;
 };

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

@@ -5,11 +5,8 @@ import com.facebook.jni.HybridData
 import com.facebook.proguard.annotations.DoNotStrip
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.RuntimeExecutor
-import com.facebook.react.fabric.FabricUIManager
 import com.facebook.react.turbomodule.core.interfaces.BindingsInstallerHolder
 import com.facebook.react.turbomodule.core.interfaces.TurboModuleWithJSIBindings
-import com.facebook.react.uimanager.UIManagerHelper
-import com.facebook.react.uimanager.common.UIManagerType
 import com.margelo.nitro.unistyles.HybridNativePlatformSpec
 import com.margelo.nitro.unistyles.unistylesOnLoad.Companion.initializeNative
 
@@ -34,10 +31,8 @@ class UnistylesModule(reactContext: ReactApplicationContext): NativeTurboUnistyl
     private fun initializeHybridData(reactContext: ReactApplicationContext): HybridData {
         val runtimeExecutor = reactContext.catalystInstance?.runtimeExecutor
             ?: throw IllegalStateException("Unistyles: React Native runtime executor is not available. Please follow installation guides.")
-        val fabricUIManager = UIManagerHelper.getUIManager(reactContext, UIManagerType.FABRIC) as? FabricUIManager
-            ?: throw IllegalStateException("Unistyles: Fabric UI Manager is not available. Please follow installation guides.")
 
-        return initHybrid(runtimeExecutor, fabricUIManager, _nativePlatform)
+        return initHybrid(runtimeExecutor, _nativePlatform)
     }
 
     @DoNotStrip
@@ -46,7 +41,6 @@ class UnistylesModule(reactContext: ReactApplicationContext): NativeTurboUnistyl
     @DoNotStrip
     private external fun initHybrid(
         runtimeExecutor: RuntimeExecutor,
-        fabricUIManager: FabricUIManager,
         nativePlatform: HybridNativePlatformSpec
     ): HybridData
 }

package/cxx/core/UnistylesCommitShadowNode.h

@@ -8,32 +8,11 @@ namespace margelo::nitro::unistyles::core {
 // React Native uses 0-10
 // Reanimated uses 27-28
 constexpr shadow::ShadowNodeTraits::Trait UnistylesCommitTrait{1 << 30};
-constexpr shadow::ShadowNodeTraits::Trait UnistylesMountTrait{1 << 31};
 
 struct UnistylesCommitShadowNode: public shadow::ShadowNode {
     inline void addUnistylesCommitTrait() {
         traits_.set(UnistylesCommitTrait);
     }
-    
-    inline void removeUnistylesCommitTrait() {
-        traits_.unset(UnistylesCommitTrait);
-    }
-    
-    inline bool hasUnistylesCommitTrait() {
-        return traits_.check(UnistylesCommitTrait);
-    }
-    
-    inline void addUnistylesMountTrait() {
-        traits_.set(UnistylesMountTrait);
-    }
-    
-    inline void removeUnistylesMountTrait() {
-        traits_.unset(UnistylesMountTrait);
-    }
-    
-    inline bool hasUnistylesMountTrait() {
-        return traits_.check(UnistylesMountTrait);
-    }
 };
 
 }

package/cxx/core/UnistylesRegistry.cpp

@@ -82,7 +82,7 @@ void core::UnistylesRegistry::linkShadowNodeWithUnistyle(
         });
 
         updates[shadowNodeFamily] = parser.parseStylesToShadowTreeStyles(rt, unistylesData);
-        
+
         this->trafficController.setUpdates(updates);
         this->trafficController.resumeUnistylesTraffic();
     });
@@ -127,31 +127,36 @@ std::shared_ptr<core::StyleSheet> core::UnistylesRegistry::addStyleSheet(jsi::Ru
 }
 
 core::DependencyMap core::UnistylesRegistry::buildDependencyMap(jsi::Runtime& rt, std::vector<UnistyleDependency>& deps) {
-    DependencyMap dependencyMap;
-    std::set<UnistyleDependency> uniqueDependencies(deps.begin(), deps.end());
+    core::DependencyMap dependencyMap;
+
+    std::unordered_set<UnistyleDependency> uniqueDependencies(deps.begin(), deps.end());
 
     for (const auto& [family, unistyles] : this->_shadowRegistry[&rt]) {
+        bool hasAnyOfDependencies = false;
+
+        // Check if any dependency matches
         for (const auto& unistyleData : unistyles) {
-            bool hasAnyOfDependencies = std::any_of(
-                unistyleData->unistyle->dependencies.begin(),
-                unistyleData->unistyle->dependencies.end(),
-                [&uniqueDependencies](UnistyleDependency dep) {
-                    return std::find(uniqueDependencies.begin(), uniqueDependencies.end(), dep) != uniqueDependencies.end();
+            for (const auto& dep : unistyleData->unistyle->dependencies) {
+                if (uniqueDependencies.count(dep)) {
+                    hasAnyOfDependencies = true;
+                    break;
                 }
-            );
-
-            if (!hasAnyOfDependencies) {
-                continue;
             }
 
-            // we need to take in count all unistyles from the shadowNode
-            // as user might be using spreads and not all of them may have dependencies
-            for (const auto& unistyleData : unistyles) {
-                dependencyMap[family].emplace_back(unistyleData);
-            }
+            if (hasAnyOfDependencies) {
+                break;
+            };
+        }
 
-            break;
+        if (!hasAnyOfDependencies) {
+            continue;
         }
+
+        dependencyMap[family].insert(
+            dependencyMap[family].end(),
+            unistyles.begin(),
+            unistyles.end()
+        );
     }
 
     return dependencyMap;
@@ -179,48 +184,45 @@ 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>> stylesheetsToRefresh{};
-    auto themeDidChangeIt = std::find(unistylesDependencies.begin(),
-                                      unistylesDependencies.end(),
-                                      UnistyleDependency::THEME);
-    auto themeDidChange = themeDidChangeIt != unistylesDependencies.end();
-    auto runtimeDidChange = (themeDidChange && unistylesDependencies.size() > 1) || unistylesDependencies.size() > 0;
+std::vector<std::shared_ptr<core::StyleSheet>>core::UnistylesRegistry::getStyleSheetsToRefresh(jsi::Runtime& rt, std::vector<UnistyleDependency>& unistylesDependencies) {
+    std::vector<std::shared_ptr<core::StyleSheet>> stylesheetsToRefresh;
+    std::unordered_set<UnistyleDependency> depSet(
+        unistylesDependencies.begin(),
+        unistylesDependencies.end()
+    );
+
+    bool themeDidChange = depSet.count(UnistyleDependency::THEME) > 0;
+    bool runtimeDidChange = (themeDidChange && depSet.size() > 1) || !depSet.empty();
 
-    // if nothing changed, skip further lookup
     if (!themeDidChange && !runtimeDidChange) {
         return stylesheetsToRefresh;
     }
 
     auto& styleSheets = this->_styleSheetRegistry[&rt];
 
-    std::for_each(styleSheets.begin(), styleSheets.end(), [&](std::pair<int, std::shared_ptr<core::StyleSheet>> pair){
-        auto& [_, styleSheet] = pair;
-
+    for (const auto& [_, styleSheet] : styleSheets) {
         if (styleSheet->type == StyleSheetType::ThemableWithMiniRuntime) {
-            for (const auto& unistylePair: styleSheet->unistyles) {
-                auto& [_, unistyle] = unistylePair;
-
-                bool hasAnyOfDependencies = std::any_of(
-                    unistyle->dependencies.begin(),
-                    unistyle->dependencies.end(),
-                    [&unistylesDependencies](UnistyleDependency dep) {
-                        return std::find(unistylesDependencies.begin(), unistylesDependencies.end(), dep) != unistylesDependencies.end();
+            auto hasMatchingDependency = [&depSet](const auto& unistyles) {
+                for (const auto& [_, unistyle] : unistyles) {
+                    for (const auto& dep : unistyle->dependencies) {
+                        if (depSet.count(dep)) {
+                            return true;
+                        }
                     }
-                );
+                }
 
-                if (hasAnyOfDependencies) {
-                    stylesheetsToRefresh.emplace_back(styleSheet);
+                return false;
+            };
 
-                    return;
-                }
+            if (hasMatchingDependency(styleSheet->unistyles)) {
+                stylesheetsToRefresh.emplace_back(styleSheet);
             }
         }
 
         if (styleSheet->type == StyleSheetType::Themable && themeDidChange) {
             stylesheetsToRefresh.emplace_back(styleSheet);
         }
-    });
+    }
 
     return stylesheetsToRefresh;
 }

package/cxx/hybridObjects/HybridStyleSheet.cpp

@@ -87,7 +87,6 @@ jsi::Value HybridStyleSheet::init(jsi::Runtime &rt, const jsi::Value &thisVal, c
     registry.createState(rt);
 
     loadExternalMethods(thisVal, rt);
-    registerHooks(rt);
 
     this->isInitialized = true;
 
@@ -256,18 +255,6 @@ void HybridStyleSheet::loadExternalMethods(const jsi::Value& thisValue, jsi::Run
     state.registerProcessColorFunction(std::move(processColorFn));
 }
 
-void HybridStyleSheet::registerHooks(jsi::Runtime& rt) {
-    // cleanup Shadow updates
-    auto& registry = core::UnistylesRegistry::get();
-    
-    registry.trafficController.withLock([&registry](){
-        registry.trafficController.restore();
-    });
-
-    this->_unistylesCommitHook = std::make_shared<core::UnistylesCommitHook>(this->_uiManager);
-    this->_unistylesMountHook = std::make_shared<core::UnistylesMountHook>(this->_uiManager);
-}
-
 void HybridStyleSheet::onPlatformDependenciesChange(std::vector<UnistyleDependency> dependencies) {
     // this event listener is triggered from C++ module, and it's only about theme / adaptive theme changes
     if (dependencies.size() == 0) {

package/cxx/hybridObjects/HybridStyleSheet.h

@@ -9,15 +9,13 @@
 #include "UnistylesConstants.h"
 #include "Breakpoints.h"
 #include "Parser.h"
-#include "UnistylesCommitHook.h"
-#include "UnistylesMountHook.h"
+#include "ShadowTreeManager.h"
 
 using namespace margelo::nitro::unistyles;
 using namespace facebook::react;
 
 struct HybridStyleSheet: public HybridUnistylesStyleSheetSpec {
-    HybridStyleSheet(std::shared_ptr<HybridUnistylesRuntime> unistylesRuntime, std::shared_ptr<UIManager> uiManager)
-        : HybridObject(TAG), _unistylesRuntime{unistylesRuntime}, _uiManager{uiManager} {
+    HybridStyleSheet(std::shared_ptr<HybridUnistylesRuntime> unistylesRuntime): HybridObject(TAG), _unistylesRuntime{unistylesRuntime} {
             this->_unistylesRuntime->registerPlatformListener(
                   std::bind(&HybridStyleSheet::onPlatformDependenciesChange, this, std::placeholders::_1)
             );
@@ -67,7 +65,6 @@ private:
     void verifyAndSelectTheme(jsi::Runtime &rt);
     void setThemeFromColorScheme(jsi::Runtime& rt);
     void loadExternalMethods(const jsi::Value& thisValue, jsi::Runtime& rt);
-    void registerHooks(jsi::Runtime& rt);
     void onPlatformDependenciesChange(std::vector<UnistyleDependency> dependencies);
     void onPlatformNativeDependenciesChange(std::vector<UnistyleDependency> dependencies, UnistylesNativeMiniRuntime miniRuntime);
     void onImeChange(UnistylesNativeMiniRuntime miniRuntime);
@@ -77,8 +74,6 @@ private:
     double __unid = -1;
     std::vector<std::unique_ptr<const std::function<void(std::vector<UnistyleDependency>&)>>> _changeListeners{};
     std::shared_ptr<HybridUnistylesRuntime> _unistylesRuntime;
-    std::shared_ptr<core::UnistylesCommitHook> _unistylesCommitHook;
-    std::shared_ptr<core::UnistylesMountHook> _unistylesMountHook;
     std::shared_ptr<UIManager> _uiManager;
 };