react-native-unistyles 3.0.0-alpha.29 → 3.0.0-alpha.30

package/cxx/common/Helpers.h

@@ -3,6 +3,7 @@
 #include <jsi/jsi.h>
 #include <jsi/JSIDynamic.h>
 #include <folly/dynamic.h>
+#include "Unistyles-Swift-Cxx-Umbrella.hpp"
 #include <unordered_set>
 
 using namespace facebook;
@@ -192,4 +193,14 @@ inline std::vector<folly::dynamic> parseDynamicFunctionArguments(jsi::Runtime& r
     return parsedArgument;
 }
 
+inline static jsi::Array dependenciesToJSIArray(jsi::Runtime& rt, const std::vector<UnistyleDependency>& vec) {
+    jsi::Array result(rt, vec.size());
+
+    for (size_t i = 0; i < vec.size(); i++) {
+        result.setValueAtIndex(rt, i, jsi::Value(static_cast<int>(vec[i])));
+    }
+
+    return result;
+}
+
 }

package/cxx/core/HostStyle.cpp

@@ -22,7 +22,7 @@ jsi::Value HostStyle::get(jsi::Runtime& rt, const jsi::PropNameID& propNameId) {
     if (propertyName == helpers::UNISTYLES_ID) {
         return jsi::Value(this->_styleSheet->tag);
     }
-
+    
     if (propertyName == helpers::ADD_VARIANTS_FN) {
         return this->createAddVariantsProxyFunction(rt);
     }

package/cxx/core/UnistyleWrapper.h

@@ -40,20 +40,20 @@ inline static std::vector<Unistyle::Shared> unistylesFromNonExistentNativeState(
     }
 
     throw jsi::JSError(rt, R"(Unistyles: Style is not bound!
-    
+
 Potential reasons:
 - You likely used the spread operator on a Unistyle style outside of a JSX component
-    
+
 If you need to merge styles, do it within the style prop of your JSX component:
-    
+
 style={{...styles.container, ...styles.otherProp}}
-or 
+or
 style={[styles.container, styles.otherProp]}
 
 If you pass computed style prop to component use array syntax:
 
 customStyleProp={[styles.container, styles.otherProp]}
-    
+
 Copying a Unistyle style outside of a JSX element will remove its internal C++ state, leading to unexpected behavior.)");
 }
 
@@ -77,10 +77,11 @@ inline static jsi::Value valueFromUnistyle(jsi::Runtime& rt, Unistyle::Shared un
 
     if (unistyle->type == UnistyleType::Object) {
         jsi::Object obj = jsi::Object(rt);
-       
+
         obj.setNativeState(rt, std::move(wrappedUnistyle));
         obj.setProperty(rt, helpers::NAME_STYLE_KEY.c_str(), jsi::String::createFromUtf8(rt, unistyle->styleKey));
-        
+
+        helpers::defineHiddenProperty(rt, obj, helpers::STYLE_DEPENDENCIES.c_str(), helpers::dependenciesToJSIArray(rt, unistyle->dependencies));
         helpers::mergeJSIObjects(rt, obj, unistyle->parsedStyle.value());
 
         return obj;
@@ -91,7 +92,7 @@ inline static jsi::Value valueFromUnistyle(jsi::Runtime& rt, Unistyle::Shared un
 
     hostFn.setNativeState(rt, std::move(wrappedUnistyle));
     hostFn.setProperty(rt, helpers::NAME_STYLE_KEY.c_str(), jsi::String::createFromUtf8(rt, unistyleFn->styleKey));
-    
+
     return std::move(hostFn);
 }
 

package/cxx/core/UnistylesCommitHook.cpp

@@ -32,7 +32,7 @@ RootShadowNode::Unshared core::UnistylesCommitHook::shadowTreeWillCommit(
         return newRootShadowNode;
     }
 
-    auto shadowLeafUpdates = this->getUnistylesUpdates();
+    auto& shadowLeafUpdates = registry.trafficController._unistylesUpdates;
 
     if (shadowLeafUpdates.size() == 0) {
         return newRootShadowNode;
@@ -41,22 +41,11 @@ RootShadowNode::Unshared core::UnistylesCommitHook::shadowTreeWillCommit(
     // this is required, otherwise we end up with old shadow tree in mount hook
     registry.trafficController.stopUnistylesTraffic();
 
-    auto affectedNodes = shadow::ShadowTreeManager::findAffectedNodes(*rootNode, shadowLeafUpdates);
+    auto affectedNodes = shadow::ShadowTreeManager::findAffectedNodes(*rootNode, shadowLeafUpdates[_rt]);
 
     return std::static_pointer_cast<RootShadowNode>(shadow::ShadowTreeManager::cloneShadowTree(
-        *this->_rt,
         *rootNode,
-        shadowLeafUpdates,
+        shadowLeafUpdates[_rt],
         affectedNodes
     ));
 }
-
-shadow::ShadowLeafUpdates core::UnistylesCommitHook::getUnistylesUpdates() {
-    auto& registry = core::UnistylesRegistry::get();
-    auto parser = parser::Parser(this->_unistylesRuntime);
-    auto dependencyMap = registry.buildDependencyMap(*this->_rt);
-
-    // don't rebuild dependency map, at this point it's already done
-
-    return parser.dependencyMapToShadowLeafUpdates(dependencyMap);
-}

package/cxx/core/UnistylesCommitHook.h

@@ -2,8 +2,6 @@
 
 #include <react/renderer/uimanager/UIManager.h>
 #include <react/renderer/uimanager/UIManagerCommitHook.h>
-#include "HybridUnistylesRuntime.h"
-#include "Parser.h"
 #include "ShadowTreeManager.h"
 #include "ShadowTrafficController.h"
 
@@ -12,21 +10,17 @@ namespace margelo::nitro::unistyles::core {
 using namespace facebook::react;
 
 struct UnistylesCommitHook : public UIManagerCommitHook {
-    UnistylesCommitHook(std::shared_ptr<UIManager> uiManager, std::shared_ptr<HybridUnistylesRuntime> unistylesRuntime, jsi::Runtime& rt)
-        : _unistylesRuntime{unistylesRuntime}, _uiManager{uiManager}, _rt{&rt} {
-            _uiManager->registerCommitHook(*this);
-        }
-    
+    UnistylesCommitHook(std::shared_ptr<UIManager> uiManager, jsi::Runtime& rt) : _uiManager{uiManager}, _rt{&rt} {
+        _uiManager->registerCommitHook(*this);
+    }
+
     ~UnistylesCommitHook() noexcept override;
 
     void commitHookWasRegistered(const UIManager &uiManager) noexcept override;
     void commitHookWasUnregistered(const UIManager &uiManager) noexcept override;
     RootShadowNode::Unshared shadowTreeWillCommit(const ShadowTree &shadowTree, const RootShadowNode::Shared &oldRootShadowNode, const RootShadowNode::Unshared &newRootShadowNode) noexcept override;
-    
-    shadow::ShadowLeafUpdates getUnistylesUpdates();
-    
+
 private:
-    std::shared_ptr<HybridUnistylesRuntime> _unistylesRuntime;
     std::shared_ptr<UIManager> _uiManager;
     jsi::Runtime* _rt;
 };

package/cxx/core/UnistylesMountHook.cpp

@@ -1,5 +1,4 @@
 #include "UnistylesMountHook.h"
-#include "ShadowTreeManager.h"
 
 using namespace margelo::nitro::unistyles;
 using namespace facebook::react;

package/cxx/core/UnistylesMountHook.h

@@ -2,8 +2,6 @@
 
 #include <react/renderer/uimanager/UIManager.h>
 #include <react/renderer/uimanager/UIManagerMountHook.h>
-#include "HybridUnistylesRuntime.h"
-#include "Parser.h"
 #include "ShadowTreeManager.h"
 
 namespace margelo::nitro::unistyles::core {

package/cxx/core/UnistylesRegistry.cpp

@@ -158,7 +158,7 @@ std::vector<std::shared_ptr<core::StyleSheet>> core::UnistylesRegistry::getStyle
     std::for_each(styleSheets.begin(), styleSheets.end(), [&](std::pair<int, std::shared_ptr<core::StyleSheet>> pair){
         auto& [_, styleSheet] = pair;
 
-        if (styleSheet->type == StyleSheetType::ThemableWithMiniRuntime && runtimeDidChange) {
+        if (styleSheet->type == StyleSheetType::ThemableWithMiniRuntime && (themeDidChange || runtimeDidChange)) {
             stylesheetsToRefresh.emplace_back(styleSheet);
 
             return;

package/cxx/core/UnistylesRegistry.h

@@ -44,7 +44,7 @@ struct UnistylesRegistry: public StyleSheetRegistry {
     Unistyle::Shared findUnistyleFromKey(jsi::Runtime& rt, std::string styleKey, int tag);
     DependencyMap buildDependencyMap(jsi::Runtime& rt);
     shadow::ShadowTrafficController trafficController{};
-    
+
 private:
     UnistylesRegistry() = default;
 

package/cxx/hybridObjects/HybridStyleSheet.cpp

@@ -14,6 +14,10 @@ double HybridStyleSheet::getUnid() {
 }
 
 jsi::Value HybridStyleSheet::create(jsi::Runtime& rt, const jsi::Value &thisVal, const jsi::Value *arguments, size_t count) {
+    if (count == 1) {
+        helpers::assertThat(rt, count == 2, "Unistyles is not initialized correctly. Please add babel plugin to your babel config.");
+    }
+
     // second argument is hidden, so validation is perfectly fine
     helpers::assertThat(rt, count == 2, "StyleSheet.create expected to be called with one argument.");
     helpers::assertThat(rt, arguments[0].isObject(), "StyleSheet.create expected to be called with object or function.");
@@ -226,18 +230,19 @@ void HybridStyleSheet::loadExternalMethods(const jsi::Value& thisValue, jsi::Run
 }
 
 void HybridStyleSheet::registerHooks(jsi::Runtime& rt) {
-    this->_unistylesCommitHook = std::make_shared<core::UnistylesCommitHook>(this->_uiManager, this->_unistylesRuntime, rt);
+    this->_unistylesCommitHook = std::make_shared<core::UnistylesCommitHook>(this->_uiManager, rt);
     this->_unistylesMountHook = std::make_shared<core::UnistylesMountHook>(this->_uiManager);
 }
 
-void HybridStyleSheet::onPlatformDependenciesChange(std::vector<UnistyleDependency> dependencies) {
+void HybridStyleSheet::onPlatformDependenciesChange(std::vector<UnistyleDependency> unistylesDependencies) {
     if (this->_unistylesRuntime == nullptr) {
         return;
     }
 
-    this->_unistylesRuntime->runOnJSThread([this, &dependencies](jsi::Runtime& rt){
+    this->_unistylesRuntime->runOnJSThread([this, unistylesDependencies](jsi::Runtime& rt){
         auto& registry = core::UnistylesRegistry::get();
         auto parser = parser::Parser(this->_unistylesRuntime);
+        auto dependencies = std::move(unistylesDependencies);
 
         // re-compute new breakpoint
         auto dimensionsIt = std::find(dependencies.begin(), dependencies.end(), UnistyleDependency::DIMENSIONS);
@@ -259,22 +264,23 @@ void HybridStyleSheet::onPlatformDependenciesChange(std::vector<UnistyleDependen
             this->_unistylesRuntime->includeDependenciesForColorSchemeChange(dependencies);
         }
 
-        this->notifyJSListeners(dependencies);
-
         auto dependencyMap = registry.buildDependencyMap(rt, dependencies);
 
         if (dependencyMap.size() == 0) {
+            this->notifyJSListeners(dependencies);
+
             return;
         }
 
         parser.rebuildUnistylesInDependencyMap(rt, dependencyMap, dependentStyleSheets);
 
+        this->notifyJSListeners(dependencies);
+
         // this is required, otherwise shadow tree will ignore Unistyles commit
         registry.trafficController.setHasUnistylesCommit(true);
+        parser.rebuildShadowLeafUpdates(dependencyMap);
 
-        auto shadowLeafUpdates = parser.dependencyMapToShadowLeafUpdates(dependencyMap);
-
-        shadow::ShadowTreeManager::updateShadowTree(rt, shadowLeafUpdates);
+        shadow::ShadowTreeManager::updateShadowTree(rt, registry.trafficController._unistylesUpdates[&rt]);
     });
 }
 
@@ -286,6 +292,7 @@ void HybridStyleSheet::onImeChange() {
     this->_unistylesRuntime->runOnJSThread([this](jsi::Runtime& rt){
         auto& registry = core::UnistylesRegistry::get();
         auto parser = parser::Parser(this->_unistylesRuntime);
+
         std::vector<UnistyleDependency> dependencies{UnistyleDependency::IME};
 
         this->notifyJSListeners(dependencies);
@@ -300,10 +307,9 @@ void HybridStyleSheet::onImeChange() {
 
         // this is required, otherwise shadow tree will ignore Unistyles commit
         registry.trafficController.setHasUnistylesCommit(true);
+        parser.rebuildShadowLeafUpdates(dependencyMap);
 
-        auto shadowLeafUpdates = parser.dependencyMapToShadowLeafUpdates(dependencyMap);
-
-        shadow::ShadowTreeManager::updateShadowTree(rt, shadowLeafUpdates);
+        shadow::ShadowTreeManager::updateShadowTree(rt, registry.trafficController._unistylesUpdates[&rt]);
     });
 }
 

package/cxx/hybridObjects/HybridStyleSheet.h

@@ -26,7 +26,7 @@ struct HybridStyleSheet: public HybridUnistylesStyleSheetSpec {
                   std::bind(&HybridStyleSheet::onImeChange, this)
             );
       }
-    
+
     ~HybridStyleSheet() {
         this->_unistylesRuntime->unregisterPlatformListeners();
     }

package/cxx/parser/Parser.cpp

@@ -122,7 +122,7 @@ void parser::Parser::rebuildUnistylesInDependencyMap(jsi::Runtime& rt, Dependenc
             // for RN styles or inline styles, compute styles only once
             if (unistyle->styleKey == helpers::EXOTIC_STYLE_KEY.c_str() && !unistyleData->parsedStyle.has_value()) {
                 unistyleData->parsedStyle = jsi::Value(rt, unistyle->rawValue).asObject(rt);
-                
+
                 if (!parsedUnistyles.contains(unistyle)) {
                     parsedUnistyles.emplace(unistyle, true);
                 }
@@ -138,13 +138,13 @@ void parser::Parser::rebuildUnistylesInDependencyMap(jsi::Runtime& rt, Dependenc
             unistyle->rawValue = parsedStyleSheets[styleSheet].asObject(rt).getProperty(rt, unistyle->styleKey.c_str()).asObject(rt);
             this->rebuildUnistyle(rt, styleSheet, unistyle, unistyleData->variants, unistyleData->dynamicFunctionMetadata);
             unistyleData->parsedStyle = jsi::Value(rt, unistyle->parsedStyle.value()).asObject(rt);
-            
+
             if (!parsedUnistyles.contains(unistyle)) {
                 parsedUnistyles.emplace(unistyle, true);
             }
         }
     }
-    
+
     // parse whatever left in StyleSheets
     for (auto styleSheet : styleSheets) {
         for (auto& [_, unistyle] : styleSheet->unistyles) {
@@ -196,8 +196,9 @@ void parser::Parser::rebuildUnistyle(jsi::Runtime& rt, std::shared_ptr<StyleShee
 }
 
 // convert dependency map to shadow tree updates
-shadow::ShadowLeafUpdates parser::Parser::dependencyMapToShadowLeafUpdates(core::DependencyMap& dependencyMap) {
+void parser::Parser::rebuildShadowLeafUpdates(core::DependencyMap& dependencyMap) {
     shadow::ShadowLeafUpdates updates;
+    auto& registry = core::UnistylesRegistry::get();
     auto& rt = this->_unistylesRuntime->getRuntime();
 
     for (const auto& [shadowNode, unistyles] : dependencyMap) {
@@ -206,7 +207,7 @@ shadow::ShadowLeafUpdates parser::Parser::dependencyMapToShadowLeafUpdates(core:
         updates.emplace(shadowNode, std::move(rawProps));
     }
 
-    return updates;
+    registry.trafficController._unistylesUpdates[&rt] = std::move(updates);
 }
 
 // first level of StyleSheet, we can expect here different properties than on second level
@@ -269,13 +270,13 @@ jsi::Object parser::Parser::parseFirstLevel(jsi::Runtime& rt, Unistyle::Shared u
 
             return;
         }
-        
+
         if (propertyName == "boxShadow" && propertyValueObject.isArray(rt)) {
             parsedStyle.setProperty(rt, jsi::PropNameID::forUtf8(rt, propertyName), parseBoxShadow(rt, unistyle, propertyValueObject));
 
             return;
         }
-        
+
         if (propertyName == "filter" && propertyValueObject.isArray(rt)) {
             parsedStyle.setProperty(rt, jsi::PropNameID::forUtf8(rt, propertyName), parseFilters(rt, unistyle, propertyValueObject));
 
@@ -353,7 +354,12 @@ jsi::Function parser::Parser::createDynamicFunctionProxy(jsi::Runtime& rt, Unist
             unistyleFn->parsedStyle = this->parseFirstLevel(rt, unistyleFn, variants);
             unistyleFn->seal();
 
-            return jsi::Value(rt, unistyleFn->parsedStyle.value());
+            // include dependencies for createUnistylesComponent
+            jsi::Object style = jsi::Value(rt, unistyleFn->parsedStyle.value()).asObject(rt);
+
+            helpers::defineHiddenProperty(rt, style, helpers::STYLE_DEPENDENCIES, helpers::dependenciesToJSIArray(rt, unistyle->dependencies));
+
+            return style;
     });
 }
 
@@ -408,9 +414,9 @@ jsi::Value parser::Parser::parseTransforms(jsi::Runtime& rt, Unistyle::Shared un
 // eg [{offsetX: 5, offsetY: 5, blurRadius: 5, spreadDistance: 0, color: ‘rgba(255, 0, 0, 0.5)’}]
 jsi::Value parser::Parser::parseBoxShadow(jsi::Runtime &rt, Unistyle::Shared unistyle, jsi::Object &obj) {
     std::vector<jsi::Value> parsedBoxShadows{};
-    
+
     parsedBoxShadows.reserve(2);
-    
+
     helpers::iterateJSIArray(rt, obj.asArray(rt), [&](size_t i, jsi::Value& value){
         if (!value.isObject()) {
             return;
@@ -420,7 +426,7 @@ jsi::Value parser::Parser::parseBoxShadow(jsi::Runtime &rt, Unistyle::Shared uni
 
         parsedBoxShadows.emplace_back(std::move(parsedResult));
     });
-    
+
     // create jsi::Array result with correct box shadows
     jsi::Array result = jsi::Array(rt, parsedBoxShadows.size());
 
@@ -436,7 +442,7 @@ jsi::Value parser::Parser::parseFilters(jsi::Runtime &rt, Unistyle::Shared unist
     std::vector<jsi::Value> parsedFilters{};
 
     parsedFilters.reserve(2);
-    
+
     helpers::iterateJSIArray(rt, obj.asArray(rt), [&](size_t i, jsi::Value& value){
         if (!value.isObject()) {
             return;
@@ -447,7 +453,7 @@ jsi::Value parser::Parser::parseFilters(jsi::Runtime &rt, Unistyle::Shared unist
         // take only one filter per object
         jsi::Array propertyNames = parsedResult.asObject(rt).getPropertyNames(rt);
         size_t length = propertyNames.size(rt);
-        
+
         // ignore no filters
         if (length == 0) {
             return;
@@ -455,7 +461,7 @@ jsi::Value parser::Parser::parseFilters(jsi::Runtime &rt, Unistyle::Shared unist
 
         parsedFilters.emplace_back(std::move(parsedResult));
     });
-    
+
     // create jsi::Array result with correct filters
     jsi::Array result = jsi::Array(rt, parsedFilters.size());
 

package/cxx/parser/Parser.h

@@ -25,7 +25,7 @@ struct Parser {
     void parseUnistyles(jsi::Runtime& rt, std::shared_ptr<StyleSheet> styleSheet);
     void rebuildUnistylesWithVariants(jsi::Runtime& rt, std::shared_ptr<StyleSheet> styleSheet, Variants& variants);
     void rebuildUnistylesInDependencyMap(jsi::Runtime& rt, core::DependencyMap& dependencyMap, std::vector<std::shared_ptr<core::StyleSheet>> styleSheets);
-    shadow::ShadowLeafUpdates dependencyMapToShadowLeafUpdates(core::DependencyMap& dependencyMap);
+    void rebuildShadowLeafUpdates(core::DependencyMap& dependencyMap);
 
 private:
     void rebuildUnistyle(jsi::Runtime& rt, std::shared_ptr<StyleSheet> styleSheet, Unistyle::Shared unistyle, const Variants& variants, std::optional<std::vector<folly::dynamic>>);

package/cxx/shadowTree/ShadowTrafficController.h

@@ -1,5 +1,7 @@
 #pragma once
 
+#import "ShadowLeafUpdate.h"
+
 namespace margelo::nitro::unistyles::shadow {
 
 // Like a traffic officer managing a jam, this struct ensures everything
@@ -25,6 +27,8 @@ struct ShadowTrafficController {
         this->_canCommit = true;
     }
     
+    std::unordered_map<jsi::Runtime*, shadow::ShadowLeafUpdates> _unistylesUpdates{};
+    
 private:
     bool _hasCommit = false;
     bool _canCommit = false;

package/cxx/shadowTree/ShadowTreeManager.cpp

@@ -17,14 +17,13 @@ void shadow::ShadowTreeManager::updateShadowTree(facebook::jsi::Runtime& rt, sha
         return;
     }
 
-    shadowTreeRegistry.enumerate([&updates, &rt](const ShadowTree& shadowTree, bool& stop){
+    shadowTreeRegistry.enumerate([&updates](const ShadowTree& shadowTree, bool& stop){
         // we could iterate via updates and create multiple commits
         // but it can cause performance issues for hundreds of nodes
         // so let's mutate Shadow Tree in single transaction
         auto transaction = [&](const RootShadowNode& oldRootShadowNode) {
             auto affectedNodes = shadow::ShadowTreeManager::findAffectedNodes(oldRootShadowNode, updates);
             auto newRootNode = std::static_pointer_cast<RootShadowNode>(shadow::ShadowTreeManager::cloneShadowTree(
-                rt,
                 oldRootShadowNode,
                 updates,
                 affectedNodes
@@ -90,7 +89,7 @@ AffectedNodes shadow::ShadowTreeManager::findAffectedNodes(const RootShadowNode&
 
 // based on Reanimated algorithm
 // clone affected nodes recursively, inject props and commit tree
-ShadowNode::Unshared shadow::ShadowTreeManager::cloneShadowTree(jsi::Runtime& rt, const ShadowNode &shadowNode, ShadowLeafUpdates& updates, AffectedNodes& affectedNodes) {
+ShadowNode::Unshared shadow::ShadowTreeManager::cloneShadowTree(const ShadowNode &shadowNode, ShadowLeafUpdates& updates, AffectedNodes& affectedNodes) {
     const auto family = &shadowNode.getFamily();
     const auto rawPropsIt = updates.find(family);
     const auto childrenIt = affectedNodes.find(family);
@@ -100,7 +99,7 @@ ShadowNode::Unshared shadow::ShadowTreeManager::cloneShadowTree(jsi::Runtime& rt
     if (childrenIt != affectedNodes.end()) {
         // get all indexes of children and clone it recursively
         for (const auto index : childrenIt->second) {
-            children[index] = cloneShadowTree(rt, *children[index], updates, affectedNodes);
+            children[index] = cloneShadowTree(*children[index], updates, affectedNodes);
         }
     }
 

package/cxx/shadowTree/ShadowTreeManager.h

@@ -18,7 +18,7 @@ using AffectedNodes = std::unordered_map<const ShadowNodeFamily *, std::unordere
 struct ShadowTreeManager {
     static void updateShadowTree(jsi::Runtime& rt, shadow::ShadowLeafUpdates& updates);
     static AffectedNodes findAffectedNodes(const RootShadowNode& rootNode, ShadowLeafUpdates& updates);
-    static ShadowNode::Unshared cloneShadowTree(jsi::Runtime& rt, const ShadowNode &shadowNode, ShadowLeafUpdates& updates, AffectedNodes& affectedNodes);
+    static ShadowNode::Unshared cloneShadowTree(const ShadowNode &shadowNode, ShadowLeafUpdates& updates, AffectedNodes& affectedNodes);
 };
 
 }

package/ios/UnistylesModuleOnLoad.mm

@@ -11,8 +11,7 @@ using namespace margelo::nitro;
 RCT_EXPORT_MODULE(Unistyles)
 
 __weak RCTSurfacePresenter* _surfacePresenter;
-
- @synthesize runtimeExecutor = _runtimeExecutor;
+@synthesize runtimeExecutor = _runtimeExecutor;
 
 + (BOOL)requiresMainQueueSetup {
     return YES;
@@ -27,6 +26,8 @@ __weak RCTSurfacePresenter* _surfacePresenter;
     // check if this is live reload, if so let's replace UnistylesRuntime with new runtime
     auto hasUnistylesRuntime = HybridObjectRegistry::hasHybridObject("UnistylesRuntime");
 
+    auto& registry = core::UnistylesRegistry::get();
+
     if (hasUnistylesRuntime) {
         HybridObjectRegistry::unregisterHybridObjectConstructor("UnistylesRuntime");
         HybridObjectRegistry::unregisterHybridObjectConstructor("UnistylesStyleSheet");
@@ -39,12 +40,11 @@ __weak RCTSurfacePresenter* _surfacePresenter;
 - (void)createHybrids:(jsi::Runtime&)rt {
     auto runOnJSThread = ([executor = _runtimeExecutor](std::function<void(jsi::Runtime& rt)> &&callback) {
         __block auto objcCallback = callback;
-
+        
         [executor execute:^(jsi::Runtime& rt){
             objcCallback(rt);
         }];
     });
-
     auto nativePlatform = Unistyles::NativePlatform::create();
     auto unistylesRuntime = std::make_shared<HybridUnistylesRuntime>(nativePlatform, rt, runOnJSThread);
     auto uiManager = [_surfacePresenter scheduler].uiManager;

package/lib/commonjs/common.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNative","require","isWeb","exports","Platform","OS","isIOS","isAndroid"],"sourceRoot":"../../src","sources":["common.ts"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AAEO,MAAMC,KAAK,GAAAC,OAAA,CAAAD,KAAA,GAAGE,qBAAQ,CAACC,EAAE,KAAK,KAAK;AACnC,MAAMC,KAAK,GAAAH,OAAA,CAAAG,KAAA,GAAGF,qBAAQ,CAACC,EAAE,KAAK,KAAK;AACnC,MAAME,SAAS,GAAAJ,OAAA,CAAAI,SAAA,GAAGH,qBAAQ,CAACC,EAAE,KAAK,SAAS","ignoreList":[]}
+{"version":3,"names":["_reactNative","require","isWeb","exports","Platform","OS","isIOS","isAndroid"],"sourceRoot":"../../src","sources":["common.js"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AACO,MAAMC,KAAK,GAAAC,OAAA,CAAAD,KAAA,GAAGE,qBAAQ,CAACC,EAAE,KAAK,KAAK;AACnC,MAAMC,KAAK,GAAAH,OAAA,CAAAG,KAAA,GAAGF,qBAAQ,CAACC,EAAE,KAAK,KAAK;AACnC,MAAME,SAAS,GAAAJ,OAAA,CAAAI,SAAA,GAAGH,qBAAQ,CAACC,EAAE,KAAK,SAAS","ignoreList":[]}

package/lib/commonjs/core/createUnistylesComponent.js

@@ -0,0 +1,18 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createUnistylesComponent = void 0;
+var _react = _interopRequireDefault(require("react"));
+var _jsxRuntime = require("react/jsx-runtime");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+const createUnistylesComponent = (Component, _) => {
+  return props => {
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
+      ...props
+    });
+  };
+};
+exports.createUnistylesComponent = createUnistylesComponent;
+//# sourceMappingURL=createUnistylesComponent.js.map

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

@@ -0,0 +1 @@
+{"version":3,"names":["_react","_interopRequireDefault","require","_jsxRuntime","e","__esModule","default","createUnistylesComponent","Component","_","props","jsx","exports"],"sourceRoot":"../../../src","sources":["core/createUnistylesComponent.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AAAsE,IAAAC,WAAA,GAAAD,OAAA;AAAA,SAAAD,uBAAAG,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAK/D,MAAMG,wBAAwB,GAAGA,CAA+BC,SAAY,EAAEC,CAAc,KAAK;EACpG,OAAQC,KAAwB,IAAK;IACjC,oBAAO,IAAAP,WAAA,CAAAQ,GAAA,EAACH,SAAS;MAAA,GAAKE;IAAK,CAAG,CAAC;EACnC,CAAC;AACL,CAAC;AAAAE,OAAA,CAAAL,wBAAA,GAAAA,wBAAA","ignoreList":[]}

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

@@ -0,0 +1,45 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createUnistylesComponent = void 0;
+var _react = _interopRequireWildcard(require("react"));
+var _specs = require("../specs");
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+const createUnistylesComponent = (Component, mappings) => {
+  return props => {
+    const [theme, setTheme] = (0, _react.useState)(_specs.UnistylesRuntime.getTheme());
+    const [, setRt] = (0, _react.useState)(0);
+    (0, _react.useEffect)(() => {
+      const removeChangeListener = _specs.StyleSheet.addChangeListener(dependencies => {
+        const componentDependencies = props.style?.uni__dependencies || mappings(theme).style?.uni__dependencies;
+        if (dependencies.includes(_specs.UnistyleDependency.Theme) && (!componentDependencies || componentDependencies.includes(_specs.UnistyleDependency.Theme))) {
+          setTheme(_specs.UnistylesRuntime.getTheme());
+        }
+        if (dependencies.some(dependency => dependency >= 2) && (!componentDependencies || componentDependencies.some(dependency => dependency >= 2))) {
+          setRt(prevState => prevState + 1);
+        }
+      });
+      return () => {
+        removeChangeListener();
+      };
+    }, []);
+    const mergedProps = {
+      ...mappings(theme)
+    };
+    Object.keys(props).forEach(key => {
+      if (key in mergedProps) {
+        mergedProps[key] = Object.assign(props[key], mergedProps[key]);
+        return;
+      }
+      mergedProps[key] = props[key];
+    });
+    return /*#__PURE__*/_react.default.createElement(Component, {
+      ...mergedProps
+    });
+  };
+};
+exports.createUnistylesComponent = createUnistylesComponent;
+//# sourceMappingURL=createUnistylesComponent.native.js.mapL=createUnistylesComponent.native.js.map

package/lib/commonjs/core/createUnistylesComponent.native.js.map

@@ -0,0 +1,2 @@
+{"version":3,"names":["_react","_interopRequireWildcard","require","_specs","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","createUnistylesComponent","Component","mappings","props","theme","setTheme","useState","UnistylesRuntime","getTheme","setRt","useEffect","removeChangeListener","StyleSheet","addChangeListener","dependencies","componentDependencies","style","uni__dependencies","includes","UnistyleDependency","Theme","some","dependency","prevState","mergedProps","keys","forEach","key","assign","React","createElement","exports"],"sourceRoot":"../../../src","sources":["core/createUnistylesComponent.native.js"],"mappings":"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","ignoreList":[]}
+AA,GAAAA,wBAAA","ignoreList":[]}

package/lib/commonjs/core/index.js

@@ -3,6 +3,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+Object.defineProperty(exports, "createUnistylesComponent", {
+  enumerable: true,
+  get: function () {
+    return _createUnistylesComponent.createUnistylesComponent;
+  }
+});
 Object.defineProperty(exports, "useBreakpoint", {
   enumerable: true,
   get: function () {
@@ -17,4 +23,5 @@ Object.defineProperty(exports, "useTheme", {
 });
 var _useBreakpoint = require("./useBreakpoint");
 var _useTheme = require("./useTheme");
+var _createUnistylesComponent = require("./createUnistylesComponent");
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["_useBreakpoint","require","_useTheme"],"sourceRoot":"../../../src","sources":["core/index.ts"],"mappings":";;;;;;;;;;;;;;;;;AAAA,IAAAA,cAAA,GAAAC,OAAA;AACA,IAAAC,SAAA,GAAAD,OAAA","ignoreList":[]}
+{"version":3,"names":["_useBreakpoint","require","_useTheme","_createUnistylesComponent"],"sourceRoot":"../../../src","sources":["core/index.ts"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,cAAA,GAAAC,OAAA;AACA,IAAAC,SAAA,GAAAD,OAAA;AACA,IAAAE,yBAAA,GAAAF,OAAA","ignoreList":[]}

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

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_web","_listener","_NativePlatform","useBreakpoint","breakpoint","setBreakpoint","useState","UnistylesRuntime","useEffect","removeChangeListener","UnistylesListener","addListeners","UnistyleDependency","Breakpoints","exports"],"sourceRoot":"../../../src","sources":["core/useBreakpoint.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,IAAA,GAAAD,OAAA;AACA,IAAAE,SAAA,GAAAF,OAAA;AACA,IAAAG,eAAA,GAAAH,OAAA;AAEO,MAAMI,aAAa,GAAGA,CAAA,KAAM;EAC/B,MAAM,CAACC,UAAU,EAAEC,aAAa,CAAC,GAAG,IAAAC,eAAQ,EAACC,qBAAgB,CAACH,UAAU,CAAC;EAEzE,IAAAI,gBAAS,EAAC,MAAM;IACZ,MAAMC,oBAAoB,GAAGC,2BAAiB,CAACC,YAAY,CAAC,CAACC,kCAAkB,CAACC,WAAW,CAAC,EAAE,MAAMR,aAAa,CAACE,qBAAgB,CAACH,UAAU,CAAC,CAAC;IAE/I,OAAO,MAAM;MACTK,oBAAoB,CAAC,CAAC;IAC1B,CAAC;EACL,CAAC,EAAE,EAAE,CAAC;EAEN,OAAOL,UAAU;AACrB,CAAC;AAAAU,OAAA,CAAAX,aAAA,GAAAA,aAAA","ignoreList":[]}
+{"version":3,"names":["_react","require","_web","_listener","_NativePlatform","useBreakpoint","breakpoint","setBreakpoint","useState","UnistylesRuntime","useEffect","removeChangeListener","UnistylesListener","addListeners","UnistyleDependency","Breakpoints","exports"],"sourceRoot":"../../../src","sources":["core/useBreakpoint.js"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,IAAA,GAAAD,OAAA;AACA,IAAAE,SAAA,GAAAF,OAAA;AACA,IAAAG,eAAA,GAAAH,OAAA;AACO,MAAMI,aAAa,GAAGA,CAAA,KAAM;EAC/B,MAAM,CAACC,UAAU,EAAEC,aAAa,CAAC,GAAG,IAAAC,eAAQ,EAACC,qBAAgB,CAACH,UAAU,CAAC;EACzE,IAAAI,gBAAS,EAAC,MAAM;IACZ,MAAMC,oBAAoB,GAAGC,2BAAiB,CAACC,YAAY,CAAC,CAACC,kCAAkB,CAACC,WAAW,CAAC,EAAE,MAAMR,aAAa,CAACE,qBAAgB,CAACH,UAAU,CAAC,CAAC;IAC/I,OAAO,MAAM;MACTK,oBAAoB,CAAC,CAAC;IAC1B,CAAC;EACL,CAAC,EAAE,EAAE,CAAC;EACN,OAAOL,UAAU;AACrB,CAAC;AAACU,OAAA,CAAAX,aAAA,GAAAA,aAAA","ignoreList":[]}

package/lib/commonjs/core/useBreakpoint.native.js.map

@@ -1 +1,2 @@
-{"version":3,"names":["_react","require","_specs","useBreakpoint","breakpoint","setBreakpoint","useState","UnistylesRuntime","useEffect","removeChangeListener","StyleSheet","addChangeListener","dependencies","includes","UnistyleDependency","Breakpoints","exports"],"sourceRoot":"../../../src","sources":["core/useBreakpoint.native.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,MAAA,GAAAD,OAAA;AAGO,MAAME,aAAa,GAAGA,CAAA,KAAM;EAC/B,MAAM,CAACC,UAAU,EAAEC,aAAa,CAAC,GAAG,IAAAC,eAAQ,EAACC,uBAAgB,CAACH,UAAU,CAAC;EAEzE,IAAAI,gBAAS,EAAC,MAAM;IACZ,MAAMC,oBAAoB,GAAIC,iBAAU,CAAyBC,iBAAiB,CAACC,YAAY,IAAI;MAC/F,IAAIA,YAAY,CAACC,QAAQ,CAACC,yBAAkB,CAACC,WAAW,CAAC,EAAE;QACvDV,aAAa,CAACE,uBAAgB,CAACH,UAAU,CAAC;MAC9C;IACJ,CAAC,CAAC;IAEF,OAAO,MAAM;MACTK,oBAAoB,CAAC,CAAC;IAC1B,CAAC;EACL,CAAC,EAAE,EAAE,CAAC;EAEN,OAAOL,UAAU;AACrB,CAAC;AAAAY,OAAA,CAAAb,aAAA,GAAAA,aAAA","ignoreList":[]}
+{"version":3,"names":["_react","require","_specs","useBreakpoint","breakpoint","setBreakpoint","useState","UnistylesRuntime","useEffect","removeChangeListener","StyleSheet","addChangeListener","dependencies","includes","UnistyleDependency","Breakpoints","exports"],"sourceRoot":"../../../src","sources":["core/useBreakpoint.native.js"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,MAAA,GAAAD,OAAA;AACO,MAAME,aAAa,GAAGA,CAAA,KAAM;EAC/B,MAAM,CAACC,UAAU,EAAEC,aAAa,CAAC,GAAG,IAAAC,eAAQ,EAACC,uBAAgB,CAACH,UAAU,CAAC;EACzE,IAAAI,gBAAS,EAAC,MAAM;IACZ,MAAMC,oBAAoB,GAAGC,iBAAU,CAACC,iBAAiB,CAACC,YAAY,IAAI;MACtE,IAAIA,YAAY,CAACC,QAAQ,CAACC,yBAAkB,CAACC,WAAW,CAAC,EAAE;QACvDV,aAAa,CAACE,uBAAgB,CAACH,UAAU,CAAC;MAC9C;IACJ,CAAC,CAAC;IACF,OAAO,MAAM;MACTK,oBAAoB,CAAC,CAAC;IAC1B,CAAC;EACL,CAAC,EAAE,EAAE,CAAC;EACN,OAAOL,UAAU;AACrB,CAAC;AAACY,OAAA,CAAAb,aAAA,GAAAA,aAAA","ignoreList":[]}
+