react-native-unistyles 3.0.0-alpha.1 → 3.0.0-alpha.11

package/cxx/hybridObjects/HybridUnistylesRuntime.h

@@ -58,6 +58,8 @@ struct HybridUnistylesRuntime: public HybridUnistylesRuntimeSpec {
     UnistylesCxxMiniRuntime getMiniRuntime() override;
     jsi::Value getMiniRuntimeAsValue(jsi::Runtime& rt);
     jsi::Runtime& getRuntime();
+    void includeDependenciesForColorSchemeChange(std::vector<UnistyleDependency>& deps);
+    void calculateNewThemeAndDependencies(std::vector<UnistyleDependency>& deps);
 
 private:
     jsi::Runtime* _rt;

package/cxx/parser/Parser.cpp

@@ -11,7 +11,7 @@ void parser::Parser::buildUnistyles(jsi::Runtime& rt, std::shared_ptr<StyleSheet
     jsi::Object unwrappedStyleSheet = this->unwrapStyleSheet(rt, styleSheet);
 
     helpers::enumerateJSIObject(rt, unwrappedStyleSheet, [&](const std::string& styleKey, jsi::Value& propertyValue){
-        helpers::assertThat(rt, propertyValue.isObject(), "style with name '" + styleKey + "' is not a function or object.");
+        helpers::assertThat(rt, propertyValue.isObject(), "Unistyles: Style with name '" + styleKey + "' is not a function or object.");
 
         jsi::Object styleValue = propertyValue.asObject(rt);
 
@@ -20,7 +20,8 @@ void parser::Parser::buildUnistyles(jsi::Runtime& rt, std::shared_ptr<StyleSheet
             styleSheet->unistyles[styleKey] = std::make_shared<UnistyleDynamicFunction>(
                 UnistyleType::DynamicFunction,
                 styleKey,
-                styleValue
+                styleValue,
+                styleSheet
             );
 
             return;
@@ -29,7 +30,8 @@ void parser::Parser::buildUnistyles(jsi::Runtime& rt, std::shared_ptr<StyleSheet
         styleSheet->unistyles[styleKey] = std::make_shared<Unistyle>(
             UnistyleType::Object,
             styleKey,
-            styleValue
+            styleValue,
+            styleSheet
         );
     });
 }
@@ -68,14 +70,14 @@ jsi::Object parser::Parser::unwrapStyleSheet(jsi::Runtime& rt, std::shared_ptr<S
 void parser::Parser::parseUnistyles(jsi::Runtime& rt, std::shared_ptr<StyleSheet> styleSheet) {
     for (const auto& [_, unistyle] : styleSheet->unistyles) {
         if (unistyle->type == core::UnistyleType::Object) {
-            auto result = this->parseFirstLevel(rt, unistyle, styleSheet->variants);
+            auto result = this->parseFirstLevel(rt, unistyle, std::nullopt);
 
             unistyle->parsedStyle = std::move(result);
             unistyle->seal();
         }
 
         if (unistyle->type == core::UnistyleType::DynamicFunction) {
-            auto hostFn = this->createDynamicFunctionProxy(rt, unistyle, styleSheet->variants);
+            auto hostFn = this->createDynamicFunctionProxy(rt, unistyle);
             auto unistyleFn = std::dynamic_pointer_cast<UnistyleDynamicFunction>(unistyle);
 
             // defer parsing dynamic functions
@@ -85,57 +87,60 @@ void parser::Parser::parseUnistyles(jsi::Runtime& rt, std::shared_ptr<StyleSheet
 }
 
 // rebuild all unistyles in StyleSheet that depends on variants
-void parser::Parser::rebuildUnistylesWithVariants(jsi::Runtime& rt, std::shared_ptr<StyleSheet> styleSheet) {
+void parser::Parser::rebuildUnistylesWithVariants(jsi::Runtime& rt, std::shared_ptr<StyleSheet> styleSheet, Variants& variants) {
     for (const auto& [_, unistyle] : styleSheet->unistyles) {
         if (!unistyle->dependsOn(UnistyleDependency::VARIANTS)) {
             continue;
         }
 
-        this->rebuildUnistyle(rt, styleSheet, unistyle);
+        // todo skip dynamic functions
+        this->rebuildUnistyle(rt, styleSheet, unistyle, variants, std::nullopt);
     }
 }
 
 // rebuild all unistyles that are affected by platform event
 void parser::Parser::rebuildUnistylesInDependencyMap(jsi::Runtime& rt, DependencyMap& dependencyMap) {
-    for (const auto& [styleSheet, map] : dependencyMap) {
+    for (auto& [shadowNode, unistyles] : dependencyMap) {
+        auto styleSheet = unistyles.begin()->get()->unistyle->parent;
+        
         jsi::Object unwrappedStyleSheet = this->unwrapStyleSheet(rt, styleSheet);
 
-        for (const auto& [shadowNode, unistyles] : map) {
-            for (const auto& unistyle : unistyles) {
-                // StyleSheet might have styles that are not affected
-                if (!unwrappedStyleSheet.hasProperty(rt, unistyle->styleKey.c_str())) {
-                    continue;
-                }
+        for (auto& unistyleData : unistyles) {
+            auto& unistyle = unistyleData->unistyle;
 
-                unistyle->rawValue = unwrappedStyleSheet.getProperty(rt, unistyle->styleKey.c_str()).asObject(rt);
-                this->rebuildUnistyle(rt, styleSheet, unistyle);
+            // StyleSheet might have styles that are not affected
+            if (!unwrappedStyleSheet.hasProperty(rt, unistyle->styleKey.c_str())) {
+                continue;
             }
+
+            unistyle->rawValue = unwrappedStyleSheet.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);
         }
     }
 }
 
 // rebuild single unistyle
-void parser::Parser::rebuildUnistyle(jsi::Runtime& rt, std::shared_ptr<StyleSheet> styleSheet, Unistyle::Shared unistyle) {
+void parser::Parser::rebuildUnistyle(jsi::Runtime& rt, std::shared_ptr<StyleSheet> styleSheet, Unistyle::Shared unistyle, const Variants& variants, std::optional<std::vector<folly::dynamic>> metadata) {
     if (unistyle->type == core::UnistyleType::Object) {
-        auto result = this->parseFirstLevel(rt, unistyle, styleSheet->variants);
+        auto result = this->parseFirstLevel(rt, unistyle, variants);
 
         unistyle->parsedStyle = std::move(result);
     }
 
     // for functions we need to call memoized function
     // with last know arguments and parse it with new theme and mini runtime
-    if (unistyle->type == core::UnistyleType::DynamicFunction) {
+    if (unistyle->type == core::UnistyleType::DynamicFunction && metadata.has_value()) {
         auto unistyleFn = std::dynamic_pointer_cast<UnistyleDynamicFunction>(unistyle);
-        auto maybeMetadata = unistyleFn->dynamicFunctionMetadata;
-
-        helpers::assertThat(rt, maybeMetadata.has_value(), "Your dynamic function '" + unistyleFn->styleKey + "' has no metadata and can't be processed.");
 
         // convert arguments to jsi::Value
-        auto metadata = unistyleFn->dynamicFunctionMetadata.value();
+        auto dynamicFunctionMetadata = metadata.value();
         std::vector<jsi::Value> args{};
 
-        for (int i = 0; i < metadata.count; i++) {
-            folly::dynamic& arg = metadata.arguments.at(i);
+        args.reserve(dynamicFunctionMetadata.size());
+
+        for (int i = 0; i < dynamicFunctionMetadata.size(); i++) {
+            folly::dynamic& arg = dynamicFunctionMetadata.at(i);
 
             args.emplace_back(jsi::valueFromDynamic(rt, arg));
         }
@@ -143,94 +148,33 @@ void parser::Parser::rebuildUnistyle(jsi::Runtime& rt, std::shared_ptr<StyleShee
         const jsi::Value *argStart = args.data();
 
         // call cached function with memoized arguments
-        auto functionResult = unistyleFn->proxiedFunction.value().callAsConstructor(rt, argStart, metadata.count).asObject(rt);
+        auto functionResult = unistyleFn->rawValue
+            .asFunction(rt)
+            .call(rt, argStart, dynamicFunctionMetadata.size())
+            .asObject(rt);
 
         unistyleFn->unprocessedValue = std::move(functionResult);
-        unistyleFn->parsedStyle = this->parseFirstLevel(rt, unistyleFn, styleSheet->variants);
+        unistyleFn->parsedStyle = this->parseFirstLevel(rt, unistyleFn, variants);
     }
 }
 
 // convert dependency map to shadow tree updates
-shadow::ShadowLeafUpdates parser::Parser::dependencyMapToShadowLeafUpdates(DependencyMap& dependencyMap) {
+shadow::ShadowLeafUpdates parser::Parser::dependencyMapToShadowLeafUpdates(core::DependencyMap& dependencyMap) {
     shadow::ShadowLeafUpdates updates;
     auto& rt = this->_unistylesRuntime->getRuntime();
-
-    for (const auto& [styleSheet, map] : dependencyMap) {
-        for (const auto& [shadowNode, unistyles] : map) {
-            for (const auto& unistyle : unistyles) {
-                auto rawProps = this->parseStylesToShadowTreeStyles(rt, unistyle->parsedStyle.value());
-
-                if (updates.contains(shadowNode)) {
-                    updates[shadowNode].emplace_back(std::move(rawProps));
-
-                    continue;
-                }
-
-                updates.emplace(shadowNode, std::vector<RawProps>{std::move(rawProps)});
-            }
-        }
+    
+    for (const auto& [shadowNode, unistyles] : dependencyMap) {
+        auto rawProps = this->parseStylesToShadowTreeStyles(rt, unistyles);
+        
+        updates.emplace(shadowNode, std::move(rawProps));
     }
 
     return updates;
 }
 
-// convert jsi::Value arguments to folly::dynamic
-std::vector<folly::dynamic> parser::Parser::parseDynamicFunctionArguments(jsi::Runtime& rt, size_t count, const jsi::Value* arguments) {
-    std::vector<folly::dynamic> parsedArgument{};
-
-    for (size_t i = 0; i < count; i++) {
-        auto& arg = arguments[i];
-
-        if (arg.isBool()) {
-            parsedArgument.push_back(folly::dynamic(arg.asBool()));
-
-            continue;
-        }
-
-        if (arg.isNumber()) {
-            parsedArgument.push_back(folly::dynamic(arg.asNumber()));
-
-            continue;
-        }
-
-        if (arg.isString()) {
-            parsedArgument.push_back(folly::dynamic(arg.asString(rt).utf8(rt)));
-
-            continue;
-        }
-
-        if (arg.isUndefined()) {
-            parsedArgument.push_back(folly::dynamic());
-
-            continue;
-        }
-
-        if (arg.isNull()) {
-            parsedArgument.push_back(folly::dynamic(nullptr));
-
-            continue;
-        }
-
-        if (!arg.isObject()) {
-            continue;;
-        }
-
-        auto argObj = arg.asObject(rt);
-
-        // allow arrays and objects too
-        if (!argObj.isFunction(rt) && !argObj.isArrayBuffer(rt)) {
-            parsedArgument.push_back(jsi::dynamicFromValue(rt, arg));
-
-            continue;
-        }
-    }
-
-    return parsedArgument;
-}
-
 // first level of StyleSheet, we can expect here different properties than on second level
 // eg. variants, compoundVariants, mq, breakpoints etc.
-jsi::Object parser::Parser::parseFirstLevel(jsi::Runtime& rt, Unistyle::Shared unistyle, Variants& variants) {
+jsi::Object parser::Parser::parseFirstLevel(jsi::Runtime& rt, Unistyle::Shared unistyle, std::optional<Variants> variants) {
     // for objects - we simply operate on them
     // for functions we need to work on the unprocessed result (object)
     auto& style = unistyle->type == core::UnistyleType::Object
@@ -312,20 +256,16 @@ jsi::Object parser::Parser::parseFirstLevel(jsi::Runtime& rt, Unistyle::Shared u
 
         parsedStyle.setProperty(rt, jsi::PropNameID::forUtf8(rt, propertyName), this->parseSecondLevel(rt, unistyle, valueFromBreakpoint));
     });
-    
-    if (shouldParseVariants) {
-        unistyle->addDependency(UnistyleDependency::VARIANTS);
-    }
 
-    if (shouldParseVariants && !variants.empty()) {
+    if (shouldParseVariants && variants.has_value() && !variants.value().empty()) {
         auto propertyValueObject = style.getProperty(rt, "variants").asObject(rt);
-        auto parsedVariant = this->parseVariants(rt, unistyle, propertyValueObject, variants);
+        auto parsedVariant = this->parseVariants(rt, unistyle, propertyValueObject, variants.value());
 
         helpers::mergeJSIObjects(rt, parsedStyle, parsedVariant);
 
         if (shouldParseCompoundVariants) {
             auto compoundVariants = style.getProperty(rt, "compoundVariants").asObject(rt);
-            auto parsedCompoundVariants = this->parseCompoundVariants(rt, unistyle, compoundVariants, variants);
+            auto parsedCompoundVariants = this->parseCompoundVariants(rt, unistyle, compoundVariants, variants.value());
 
             helpers::mergeJSIObjects(rt, parsedStyle, parsedCompoundVariants);
         }
@@ -335,29 +275,32 @@ jsi::Object parser::Parser::parseFirstLevel(jsi::Runtime& rt, Unistyle::Shared u
 }
 
 // function replaces original user dynamic function with additional logic to memoize arguments
-jsi::Function parser::Parser::createDynamicFunctionProxy(jsi::Runtime& rt, Unistyle::Shared unistyle, Variants& variants) {
+jsi::Function parser::Parser::createDynamicFunctionProxy(jsi::Runtime& rt, Unistyle::Shared unistyle) {
     auto unistylesRuntime = this->_unistylesRuntime;
 
     return jsi::Function::createFromHostFunction(
         rt,
         jsi::PropNameID::forUtf8(rt, unistyle->styleKey),
         1,
-        [this, unistylesRuntime, unistyle, &variants](jsi::Runtime& rt, const jsi::Value& thisVal, const jsi::Value* args, size_t count) {
+        [this, unistylesRuntime, unistyle](jsi::Runtime& rt, const jsi::Value& thisVal, const jsi::Value* args, size_t count) {
             auto thisObject = thisVal.asObject(rt);
             auto parser = parser::Parser(unistylesRuntime);
-
+            
             // call user function
             auto result = unistyle->rawValue.asFunction(rt).call(rt, args, count);
 
             // memoize metadata to call it later
             auto unistyleFn = std::dynamic_pointer_cast<UnistyleDynamicFunction>(unistyle);
 
-            unistyleFn->dynamicFunctionMetadata = core::DynamicFunctionMetadata{
-                count,
-                this->parseDynamicFunctionArguments(rt, count, args)
-            };
-
             unistyleFn->unprocessedValue = jsi::Value(rt, result).asObject(rt);
+
+            jsi::Value rawVariants = thisObject.hasProperty(rt, helpers::STYLE_VARIANTS.c_str())
+                ? thisObject.getProperty(rt, helpers::STYLE_VARIANTS.c_str())
+                : jsi::Value::undefined();
+            std::optional<Variants> variants = rawVariants.isUndefined()
+                ? std::nullopt
+                : std::optional<Variants>(helpers::variantsToPairs(rt, rawVariants.asObject(rt)));
+            
             unistyleFn->parsedStyle = this->parseFirstLevel(rt, unistyleFn, variants);
             unistyleFn->seal();
 
@@ -367,9 +310,11 @@ jsi::Function parser::Parser::createDynamicFunctionProxy(jsi::Runtime& rt, Unist
 
 // function convert babel generated dependencies to C++ dependencies
 std::vector<UnistyleDependency> parser::Parser::parseDependencies(jsi::Runtime &rt, jsi::Object&& dependencies) {
-    helpers::assertThat(rt, dependencies.isArray(rt), "babel transform is invalid. Unexpected type for dependencies. Please report new Github issue.");
+    helpers::assertThat(rt, dependencies.isArray(rt), "Unistyles: Babel transform is invalid - unexpected type for dependencies.");
 
-    std::vector<UnistyleDependency> parsedDependencies;
+    std::vector<UnistyleDependency> parsedDependencies{};
+
+    parsedDependencies.reserve(5);
 
     helpers::iterateJSIArray(rt, dependencies.asArray(rt), [&](size_t i, jsi::Value& value){
         auto dependency = static_cast<UnistyleDependency>(value.asNumber());
@@ -388,6 +333,8 @@ jsi::Value parser::Parser::parseTransforms(jsi::Runtime& rt, Unistyle::Shared un
 
     std::vector<jsi::Value> parsedTransforms{};
 
+    parsedTransforms.reserve(2);
+
     helpers::iterateJSIArray(rt, obj.asArray(rt), [&](size_t i, jsi::Value& value){
         if (!value.isObject()) {
             return;
@@ -434,7 +381,7 @@ jsi::Value parser::Parser::getValueFromBreakpoints(jsi::Runtime& rt, Unistyle::S
         auto propertyName = propertyNames.getValueAtIndex(rt, i).asString(rt).utf8(rt);
         auto propertyValue = obj.getProperty(rt, propertyName.c_str());
         auto mq = core::UnistylesMQ{propertyName};
-        
+
         if (mq.isMQ()) {
             unistyle->addDependency(UnistyleDependency::BREAKPOINTS);
         }
@@ -447,11 +394,11 @@ jsi::Value parser::Parser::getValueFromBreakpoints(jsi::Runtime& rt, Unistyle::S
 
     // check orientation breakpoints if user didn't register own breakpoint
     bool hasOrientationBreakpoint = obj.hasProperty(rt, currentOrientation);
-    
+
     if (hasOrientationBreakpoint) {
         unistyle->addDependency(UnistyleDependency::BREAKPOINTS);
     }
-    
+
     if (!hasBreakpoints && hasOrientationBreakpoint) {
         return obj.getProperty(rt, currentOrientation);
     }
@@ -459,7 +406,7 @@ jsi::Value parser::Parser::getValueFromBreakpoints(jsi::Runtime& rt, Unistyle::S
     if (!currentBreakpoint.has_value()) {
         return jsi::Value::undefined();
     }
-    
+
     unistyle->addDependency(UnistyleDependency::BREAKPOINTS);
 
     // if you're still here it means that there is no
@@ -505,7 +452,7 @@ jsi::Object parser::Parser::parseVariants(jsi::Runtime& rt, Unistyle::Shared uni
             : std::nullopt;
 
         // we've got a match, but we need to check some condition
-        auto styles = this->getStylesForVariant(rt, groupValue.asObject(rt), selectedVariant);
+        auto styles = this->getStylesForVariant(rt, groupName, groupValue.asObject(rt), selectedVariant, variants);
 
         // oops, invalid variant
         if (styles.isUndefined() || !styles.isObject()) {
@@ -521,13 +468,19 @@ jsi::Object parser::Parser::parseVariants(jsi::Runtime& rt, Unistyle::Shared uni
 }
 
 // helpers function to support 'default' variants
-jsi::Value parser::Parser::getStylesForVariant(jsi::Runtime& rt, jsi::Object&& groupValue, std::optional<std::string> selectedVariant) {
+jsi::Value parser::Parser::getStylesForVariant(jsi::Runtime& rt, const std::string groupName, jsi::Object&& groupValue, std::optional<std::string> selectedVariant, Variants& variants) {
     // if there is no value, let's try 'default'
     auto selectedVariantKey = selectedVariant.has_value()
         ? selectedVariant.value().c_str()
         : "default";
+    auto hasKey = groupValue.hasProperty(rt, selectedVariantKey);
+
+    if (hasKey && !selectedVariant.has_value()) {
+        // add 'default' selection to variants map
+        variants.emplace_back(groupName, selectedVariantKey);
+    }
 
-    if (groupValue.hasProperty(rt, selectedVariantKey)) {
+    if (hasKey) {
         return groupValue.getProperty(rt, selectedVariantKey);
     }
 
@@ -567,22 +520,12 @@ bool parser::Parser::shouldApplyCompoundVariants(jsi::Runtime& rt, const Variant
         return false;
     }
 
-    jsi::Array propertyNames = compoundVariant.getPropertyNames(rt);
-    size_t length = propertyNames.size(rt);
-    size_t allConditions = compoundVariant.hasProperty(rt, "styles")
-        ? length - 1
-        : length;
-
-    if (allConditions != variants.size()) {
-        return false;
-    }
-
     for (auto it = variants.cbegin(); it != variants.cend(); ++it) {
         auto variantKey = it->first;
         auto variantValue = it->second;
 
         if (!compoundVariant.hasProperty(rt, variantKey.c_str())) {
-            return false;
+            continue;
         }
 
         auto property = compoundVariant.getProperty(rt, variantKey.c_str());
@@ -666,41 +609,20 @@ jsi::Value parser::Parser::parseSecondLevel(jsi::Runtime &rt, Unistyle::Shared u
     return parsedStyle;
 }
 
-// helpers function that convert variants from JS to C++ variants
-Variants parser::Parser::variantsToPairs(jsi::Runtime& rt, jsi::Object&& variants) {
-    Variants pairs{};
-
-    helpers::enumerateJSIObject(rt, variants, [&](const std::string& variantName, jsi::Value& variantValue){
-        if (variantValue.isUndefined() || variantValue.isNull()) {
-            return;
-        }
-
-        if (variantValue.isBool()) {
-            pairs.emplace_back(std::make_pair(variantName, variantValue.asBool() ? "true" : "false"));
-
-            return;
-        }
-
-        if (variantValue.isString()) {
-            pairs.emplace_back(std::make_pair(variantName, variantValue.asString(rt).utf8(rt)));
-        }
-    });
-
-    return pairs;
-}
-
-// convert jsi::Object to RawValue with int colors
-RawProps parser::Parser::parseStylesToShadowTreeStyles(jsi::Runtime& rt, jsi::Object& styles) {
+// convert unistyles to RawValue with int colors
+RawProps parser::Parser::parseStylesToShadowTreeStyles(jsi::Runtime& rt, const std::vector<std::shared_ptr<UnistyleData>>& unistyles) {
     jsi::Object convertedStyles = jsi::Object(rt);
     auto& state = core::UnistylesRegistry::get().getState(rt);
+    
+    for (const auto& unistyleData : unistyles) {
+        helpers::enumerateJSIObject(rt, unistyleData->parsedStyle.value(), [&](const std::string& propertyName, jsi::Value& propertyValue){
+            if (this->isColor(propertyName)) {
+                return convertedStyles.setProperty(rt, propertyName.c_str(), jsi::Value(state.parseColor(propertyValue)));
+            }
 
-    helpers::enumerateJSIObject(rt, styles, [&](const std::string& propertyName, jsi::Value& propertyValue){
-        if (this->isColor(propertyName)) {
-            return convertedStyles.setProperty(rt, propertyName.c_str(), jsi::Value(state.parseColor(propertyValue)));
-        }
-
-        convertedStyles.setProperty(rt, propertyName.c_str(), propertyValue);
-    });
+            convertedStyles.setProperty(rt, propertyName.c_str(), propertyValue);
+        });
+    }
 
     return RawProps(rt, std::move(convertedStyles));
 }

package/cxx/parser/Parser.h

@@ -17,36 +17,30 @@ using namespace facebook;
 using namespace margelo::nitro::unistyles::core;
 
 using Variants = std::vector<std::pair<std::string, std::string>>;
-using DependencyMap = std::unordered_map<
-    std::shared_ptr<core::StyleSheet>,
-    std::unordered_map<const ShadowNodeFamily*, std::vector<core::Unistyle::Shared>>
->;
 
 struct Parser {
     Parser(std::shared_ptr<HybridUnistylesRuntime> unistylesRuntime): _unistylesRuntime{unistylesRuntime} {}
 
     void buildUnistyles(jsi::Runtime& rt, std::shared_ptr<StyleSheet> styleSheet);
     void parseUnistyles(jsi::Runtime& rt, std::shared_ptr<StyleSheet> styleSheet);
-    Variants variantsToPairs(jsi::Runtime& rt, jsi::Object&& variants);
-    void rebuildUnistylesWithVariants(jsi::Runtime& rt, std::shared_ptr<StyleSheet> styleSheet);
-    void rebuildUnistylesInDependencyMap(jsi::Runtime& rt, DependencyMap& dependencyMap);
-    shadow::ShadowLeafUpdates dependencyMapToShadowLeafUpdates(DependencyMap& dependencyMap);
+    void rebuildUnistylesWithVariants(jsi::Runtime& rt, std::shared_ptr<StyleSheet> styleSheet, Variants& variants);
+    void rebuildUnistylesInDependencyMap(jsi::Runtime& rt, core::DependencyMap& dependencyMap);
+    shadow::ShadowLeafUpdates dependencyMapToShadowLeafUpdates(core::DependencyMap& dependencyMap);
 
 private:
-    void rebuildUnistyle(jsi::Runtime& rt, std::shared_ptr<StyleSheet> styleSheet, Unistyle::Shared unistyle);
+    void rebuildUnistyle(jsi::Runtime& rt, std::shared_ptr<StyleSheet> styleSheet, Unistyle::Shared unistyle, const Variants& variants, std::optional<std::vector<folly::dynamic>>);
     jsi::Object unwrapStyleSheet(jsi::Runtime& rt, std::shared_ptr<StyleSheet> styleSheet);
-    jsi::Object parseFirstLevel(jsi::Runtime& rt, Unistyle::Shared unistyle, Variants& variants);
+    jsi::Object parseFirstLevel(jsi::Runtime& rt, Unistyle::Shared unistyle, std::optional<Variants> variants);
     jsi::Value parseSecondLevel(jsi::Runtime& rt, Unistyle::Shared unistyle, jsi::Value& nestedObject);
-    jsi::Function createDynamicFunctionProxy(jsi::Runtime& rt, Unistyle::Shared unistyle, Variants& variants);
-    std::vector<folly::dynamic> parseDynamicFunctionArguments(jsi::Runtime& rt, size_t count, const jsi::Value* arguments);
+    jsi::Function createDynamicFunctionProxy(jsi::Runtime& rt, Unistyle::Shared unistyle);
     std::vector<UnistyleDependency> parseDependencies(jsi::Runtime &rt, jsi::Object&& dependencies);
     jsi::Value parseTransforms(jsi::Runtime& rt, Unistyle::Shared unistyle, jsi::Object& obj);
     jsi::Value getValueFromBreakpoints(jsi::Runtime& rt, Unistyle::Shared unistyle, jsi::Object& obj);
     jsi::Object parseVariants(jsi::Runtime& rt, Unistyle::Shared unistyle, jsi::Object& obj, Variants& variants);
-    jsi::Value getStylesForVariant(jsi::Runtime& rt, jsi::Object&& groupValue, std::optional<std::string> selectedVariant);
+    jsi::Value getStylesForVariant(jsi::Runtime& rt, const std::string groupName, jsi::Object&& groupValue, std::optional<std::string> selectedVariant, Variants& variants);
     jsi::Object parseCompoundVariants(jsi::Runtime& rt, Unistyle::Shared unistyle, jsi::Object& obj, Variants& variants);
     bool shouldApplyCompoundVariants(jsi::Runtime& rt, const Variants& variants, jsi::Object& compoundVariant);
-    RawProps parseStylesToShadowTreeStyles(jsi::Runtime& rt, jsi::Object& parsedStyles);
+    RawProps parseStylesToShadowTreeStyles(jsi::Runtime& rt, const std::vector<std::shared_ptr<UnistyleData>>& unistyles);
     bool isColor(const std::string& propertyName);
 
     std::shared_ptr<HybridUnistylesRuntime> _unistylesRuntime;

package/cxx/shadowTree/ShadowLeafUpdate.h

@@ -8,6 +8,6 @@ namespace margelo::nitro::unistyles::shadow {
 using namespace facebook;
 using namespace facebook::react;
 
-using ShadowLeafUpdates = std::unordered_map<const ShadowNodeFamily*, std::vector<RawProps>>;
+using ShadowLeafUpdates = std::unordered_map<const ShadowNodeFamily*, RawProps>;
 
 }

package/cxx/shadowTree/ShadowTreeManager.cpp

@@ -106,14 +106,9 @@ ShadowNode::Unshared shadow::ShadowTreeManager::cloneShadowTree(jsi::Runtime& rt
             *shadowNode.getContextContainer()
         };
 
-        updatedProps = shadowNode.getProps();
-
-        // we may have multiple Unistyles for single node, so we must apply them all
-        for (const auto& props: rawPropsIt->second) {
-            updatedProps = shadowNode
-                .getComponentDescriptor()
-                .cloneProps(propsParserContext, updatedProps, RawProps(props));
-        }
+        updatedProps = shadowNode
+            .getComponentDescriptor()
+            .cloneProps(propsParserContext, shadowNode.getProps(), RawProps(rawPropsIt->second));
     }
 
     return shadowNode.clone({

package/ios/UnistylesModuleOnLoad.h

@@ -3,6 +3,8 @@
 #import <React/RCTEventEmitter.h>
 #import <ReactCommon/RCTTurboModuleWithJSIBindings.h>
 #import "TurboUnistyles/TurboUnistyles.h"
+#import <React/RCTSurfacePresenter.h>
+#import <React/RCTScheduler.h>
 
 @interface UnistylesModule: RCTEventEmitter<NativeTurboUnistylesSpec>
 @end

package/ios/UnistylesModuleOnLoad.mm

@@ -10,10 +10,16 @@ using namespace margelo::nitro;
 
 RCT_EXPORT_MODULE(Unistyles)
 
+__weak RCTSurfacePresenter* _surfacePresenter;
+
 + (BOOL)requiresMainQueueSetup {
     return YES;
 }
 
+- (void)setSurfacePresenter:(id<RCTSurfacePresenterStub>)surfacePresenter {
+    _surfacePresenter = surfacePresenter;
+}
+
 - (void)installJSIBindingsWithRuntime:(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
@@ -31,7 +37,8 @@ RCT_EXPORT_MODULE(Unistyles)
 - (void)createHybrids:(jsi::Runtime&)rt {
     auto nativePlatform = Unistyles::NativePlatform::create();
     auto unistylesRuntime = std::make_shared<HybridUnistylesRuntime>(nativePlatform, rt);
-    auto styleSheet = std::make_shared<HybridStyleSheet>(unistylesRuntime);
+    auto uiManager = [_surfacePresenter scheduler].uiManager;
+    auto styleSheet = std::make_shared<HybridStyleSheet>(unistylesRuntime, uiManager);
 
     HybridObjectRegistry::registerHybridObjectConstructor("UnistylesRuntime", [unistylesRuntime]() -> std::shared_ptr<HybridObject>{
         return unistylesRuntime;

package/lib/commonjs/specs/NavigtionBar/index.js

@@ -9,7 +9,7 @@ const attachNavigationBarJSMethods = hybridObject => {
   const privateHybrid = hybridObject;
   privateHybrid._setBackgroundColor = hybridObject.setBackgroundColor;
   hybridObject.setBackgroundColor = color => {
-    const parsedColor = (0, _reactNative.processColor)(color);
+    const parsedColor = (0, _reactNative.processColor)(color) ?? 0;
     privateHybrid._setBackgroundColor(parsedColor);
   };
 };

package/lib/commonjs/specs/NavigtionBar/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNative","require","attachNavigationBarJSMethods","hybridObject","privateHybrid","_setBackgroundColor","setBackgroundColor","color","parsedColor","processColor","exports"],"sourceRoot":"../../../../src","sources":["specs/NavigtionBar/index.ts"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AASO,MAAMC,4BAA4B,GAAIC,YAAoC,IAAK;EAClF,MAAMC,aAAa,GAAGD,YAA6C;EAEnEC,aAAa,CAACC,mBAAmB,GAAGF,YAAY,CAACG,kBAAkB;EACnEH,YAAY,CAACG,kBAAkB,GAAIC,KAAc,IAAK;IAClD,MAAMC,WAAW,GAAG,IAAAC,yBAAY,EAACF,KAAK,CAAC;IAEvCH,aAAa,CAACC,mBAAmB,CAACG,WAAqB,CAAC;EAC5D,CAAC;AACL,CAAC;AAAAE,OAAA,CAAAR,4BAAA,GAAAA,4BAAA","ignoreList":[]}
+{"version":3,"names":["_reactNative","require","attachNavigationBarJSMethods","hybridObject","privateHybrid","_setBackgroundColor","setBackgroundColor","color","parsedColor","processColor","exports"],"sourceRoot":"../../../../src","sources":["specs/NavigtionBar/index.ts"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AASO,MAAMC,4BAA4B,GAAIC,YAAoC,IAAK;EAClF,MAAMC,aAAa,GAAGD,YAA6C;EAEnEC,aAAa,CAACC,mBAAmB,GAAGF,YAAY,CAACG,kBAAkB;EACnEH,YAAY,CAACG,kBAAkB,GAAIC,KAAc,IAAK;IAClD,MAAMC,WAAW,GAAG,IAAAC,yBAAY,EAACF,KAAK,CAAC,IAAI,CAAC;IAE5CH,aAAa,CAACC,mBAAmB,CAACG,WAAqB,CAAC;EAC5D,CAAC;AACL,CAAC;AAAAE,OAAA,CAAAR,4BAAA,GAAAA,4BAAA","ignoreList":[]}

package/lib/commonjs/specs/ShadowRegistry/index.js

@@ -14,11 +14,11 @@ const findShadowNodeForHandle = handle => {
   }
   return node;
 };
-HybridShadowRegistry.add = (handle, style) => {
-  if (!handle || !style?.__unid) {
+HybridShadowRegistry.add = (handle, style, variants, args) => {
+  if (!handle) {
     return;
   }
-  HybridShadowRegistry.link(findShadowNodeForHandle(handle), style);
+  HybridShadowRegistry.link(findShadowNodeForHandle(handle), style, variants ?? {}, args ?? []);
 };
 HybridShadowRegistry.remove = (handle, style) => {
   if (!handle || !style?.__unid) {

package/lib/commonjs/specs/ShadowRegistry/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNativeNitroModules","require","HybridShadowRegistry","NitroModules","createHybridObject","findShadowNodeForHandle","handle","node","__internalInstanceHandle","stateNode","getScrollResponder","getNativeScrollRef","Error","add","style","__unid","link","remove","unlink","UnistylesShadowRegistry","exports"],"sourceRoot":"../../../../src","sources":["specs/ShadowRegistry/index.ts"],"mappings":";;;;;;AAAA,IAAAA,wBAAA,GAAAC,OAAA;AAaA,MAAMC,oBAAoB,GAAGC,qCAAY,CAACC,kBAAkB,CAAiB,yBAAyB,CAAC;AAEvG,MAAMC,uBAAuB,GAAIC,MAAkB,IAAK;EACpD,MAAMC,IAAI,GAAGD,MAAM,EAAEE,wBAAwB,EAAEC,SAAS,EAAEF,IAAI,IACvDD,MAAM,EAAEI,kBAAkB,GAAG,CAAC,EAAEC,kBAAkB,GAAG,CAAC,EAAEH,wBAAwB,EAAEC,SAAS,EAAEF,IAAI,IACjGD,MAAM,EAAEK,kBAAkB,GAAG,CAAC,EAAEH,wBAAwB,EAAEC,SAAS,EAAEF,IAAI;EAEhF,IAAI,CAACA,IAAI,EAAE;IACP;IACA,MAAM,IAAIK,KAAK,CAAC,uDAAuD,CAAC;EAC5E;EAEA,OAAOL,IAAI;AACf,CAAC;AAEDL,oBAAoB,CAACW,GAAG,GAAG,CAACP,MAAM,EAAEQ,KAAK,KAAK;EAC1C,IAAI,CAACR,MAAM,IAAI,CAACQ,KAAK,EAAEC,MAAM,EAAE;IAC3B;EACJ;EAEAb,oBAAoB,CAACc,IAAI,CAACX,uBAAuB,CAACC,MAAM,CAAC,EAAEQ,KAAK,CAAC;AACrE,CAAC;AAEDZ,oBAAoB,CAACe,MAAM,GAAG,CAACX,MAAM,EAAEQ,KAAK,KAAK;EAC7C,IAAI,CAACR,MAAM,IAAI,CAACQ,KAAK,EAAEC,MAAM,EAAE;IAC3B;EACJ;EAEAb,oBAAoB,CAACgB,MAAM,CAACb,uBAAuB,CAACC,MAAM,CAAC,EAAEQ,KAAK,CAAC;AACvE,CAAC;AAQM,MAAMK,uBAAuB,GAAAC,OAAA,CAAAD,uBAAA,GAAGjB,oBAA4D","ignoreList":[]}
+{"version":3,"names":["_reactNativeNitroModules","require","HybridShadowRegistry","NitroModules","createHybridObject","findShadowNodeForHandle","handle","node","__internalInstanceHandle","stateNode","getScrollResponder","getNativeScrollRef","Error","add","style","variants","args","link","remove","__unid","unlink","UnistylesShadowRegistry","exports"],"sourceRoot":"../../../../src","sources":["specs/ShadowRegistry/index.ts"],"mappings":";;;;;;AAAA,IAAAA,wBAAA,GAAAC,OAAA;AAaA,MAAMC,oBAAoB,GAAGC,qCAAY,CAACC,kBAAkB,CAAiB,yBAAyB,CAAC;AAEvG,MAAMC,uBAAuB,GAAIC,MAAkB,IAAK;EACpD,MAAMC,IAAI,GAAGD,MAAM,EAAEE,wBAAwB,EAAEC,SAAS,EAAEF,IAAI,IACvDD,MAAM,EAAEI,kBAAkB,GAAG,CAAC,EAAEC,kBAAkB,GAAG,CAAC,EAAEH,wBAAwB,EAAEC,SAAS,EAAEF,IAAI,IACjGD,MAAM,EAAEK,kBAAkB,GAAG,CAAC,EAAEH,wBAAwB,EAAEC,SAAS,EAAEF,IAAI;EAEhF,IAAI,CAACA,IAAI,EAAE;IACP;IACA,MAAM,IAAIK,KAAK,CAAC,uDAAuD,CAAC;EAC5E;EAEA,OAAOL,IAAI;AACf,CAAC;AAEDL,oBAAoB,CAACW,GAAG,GAAG,CAACP,MAAM,EAAEQ,KAAK,EAAEC,QAAQ,EAAEC,IAAI,KAAK;EAC1D,IAAI,CAACV,MAAM,EAAE;IACT;EACJ;EAEAJ,oBAAoB,CAACe,IAAI,CAACZ,uBAAuB,CAACC,MAAM,CAAC,EAAEQ,KAAK,EAAEC,QAAQ,IAAI,CAAC,CAAC,EAAEC,IAAI,IAAI,EAAE,CAAC;AACjG,CAAC;AAEDd,oBAAoB,CAACgB,MAAM,GAAG,CAACZ,MAAM,EAAEQ,KAAK,KAAK;EAC7C,IAAI,CAACR,MAAM,IAAI,CAACQ,KAAK,EAAEK,MAAM,EAAE;IAC3B;EACJ;EAEAjB,oBAAoB,CAACkB,MAAM,CAACf,uBAAuB,CAACC,MAAM,CAAC,EAAEQ,KAAK,CAAC;AACvE,CAAC;AAQM,MAAMO,uBAAuB,GAAAC,OAAA,CAAAD,uBAAA,GAAGnB,oBAA4D","ignoreList":[]}

package/lib/commonjs/specs/StatusBar/index.js

@@ -25,7 +25,7 @@ const attachStatusBarJSMethods = hybridObject => {
   };
   privateHybrid._setBackgroundColor = hybridObject.setBackgroundColor;
   hybridObject.setBackgroundColor = color => {
-    const parsedColor = (0, _reactNative.processColor)(color);
+    const parsedColor = (0, _reactNative.processColor)(color) ?? 0;
     privateHybrid._setBackgroundColor(parsedColor);
   };
 };

package/lib/commonjs/specs/StatusBar/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNative","require","_types","attachStatusBarJSMethods","hybridObject","setStyle","style","animated","StatusBarStyle","Light","NativeStatusBar","setBarStyle","Dark","Default","privateHybrid","_setHidden","setHidden","isHidden","animation","_setBackgroundColor","setBackgroundColor","color","parsedColor","processColor","exports"],"sourceRoot":"../../../../src","sources":["specs/StatusBar/index.ts"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AAEA,IAAAC,MAAA,GAAAD,OAAA;AAYO,MAAME,wBAAwB,GAAIC,YAAgC,IAAK;EAC1EA,YAAY,CAACC,QAAQ,GAAG,CAACC,KAAqB,EAAEC,QAAkB,KAAK;IACnE,QAAQD,KAAK;MACT,KAAKE,qBAAc,CAACC,KAAK;QACrB,OAAOC,sBAAe,CAACC,WAAW,CAAC,eAAe,EAAEJ,QAAQ,CAAC;MACjE,KAAKC,qBAAc,CAACI,IAAI;QACpB,OAAOF,sBAAe,CAACC,WAAW,CAAC,cAAc,EAAEJ,QAAQ,CAAC;MAChE,KAAKC,qBAAc,CAACK,OAAO;QACvB,OAAOH,sBAAe,CAACC,WAAW,CAAC,SAAS,EAAEJ,QAAQ,CAAC;IAC/D;EACJ,CAAC;EAED,MAAMO,aAAa,GAAGV,YAAyC;EAE/DU,aAAa,CAACC,UAAU,GAAGX,YAAY,CAACY,SAAS;EACjDZ,YAAY,CAACY,SAAS,GAAG,CAACC,QAAiB,EAAEC,SAAoC,KAAK;IAClFR,sBAAe,CAACM,SAAS,CAACC,QAAQ,EAAEC,SAAS,CAAC;IAC9CJ,aAAa,CAACC,UAAU,CAACE,QAAQ,CAAC;EACtC,CAAC;EAEDH,aAAa,CAACK,mBAAmB,GAAGf,YAAY,CAACgB,kBAAkB;EACnEhB,YAAY,CAACgB,kBAAkB,GAAIC,KAAc,IAAK;IAClD,MAAMC,WAAW,GAAG,IAAAC,yBAAY,EAACF,KAAK,CAAC;IAEvCP,aAAa,CAACK,mBAAmB,CAACG,WAAqB,CAAC;EAC5D,CAAC;AACL,CAAC;AAAAE,OAAA,CAAArB,wBAAA,GAAAA,wBAAA","ignoreList":[]}
+{"version":3,"names":["_reactNative","require","_types","attachStatusBarJSMethods","hybridObject","setStyle","style","animated","StatusBarStyle","Light","NativeStatusBar","setBarStyle","Dark","Default","privateHybrid","_setHidden","setHidden","isHidden","animation","_setBackgroundColor","setBackgroundColor","color","parsedColor","processColor","exports"],"sourceRoot":"../../../../src","sources":["specs/StatusBar/index.ts"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AAEA,IAAAC,MAAA,GAAAD,OAAA;AAYO,MAAME,wBAAwB,GAAIC,YAAgC,IAAK;EAC1EA,YAAY,CAACC,QAAQ,GAAG,CAACC,KAAqB,EAAEC,QAAkB,KAAK;IACnE,QAAQD,KAAK;MACT,KAAKE,qBAAc,CAACC,KAAK;QACrB,OAAOC,sBAAe,CAACC,WAAW,CAAC,eAAe,EAAEJ,QAAQ,CAAC;MACjE,KAAKC,qBAAc,CAACI,IAAI;QACpB,OAAOF,sBAAe,CAACC,WAAW,CAAC,cAAc,EAAEJ,QAAQ,CAAC;MAChE,KAAKC,qBAAc,CAACK,OAAO;QACvB,OAAOH,sBAAe,CAACC,WAAW,CAAC,SAAS,EAAEJ,QAAQ,CAAC;IAC/D;EACJ,CAAC;EAED,MAAMO,aAAa,GAAGV,YAAyC;EAE/DU,aAAa,CAACC,UAAU,GAAGX,YAAY,CAACY,SAAS;EACjDZ,YAAY,CAACY,SAAS,GAAG,CAACC,QAAiB,EAAEC,SAAoC,KAAK;IAClFR,sBAAe,CAACM,SAAS,CAACC,QAAQ,EAAEC,SAAS,CAAC;IAC9CJ,aAAa,CAACC,UAAU,CAACE,QAAQ,CAAC;EACtC,CAAC;EAEDH,aAAa,CAACK,mBAAmB,GAAGf,YAAY,CAACgB,kBAAkB;EACnEhB,YAAY,CAACgB,kBAAkB,GAAIC,KAAc,IAAK;IAClD,MAAMC,WAAW,GAAG,IAAAC,yBAAY,EAACF,KAAK,CAAC,IAAI,CAAC;IAE5CP,aAAa,CAACK,mBAAmB,CAACG,WAAqB,CAAC;EAC5D,CAAC;AACL,CAAC;AAAAE,OAAA,CAAArB,wBAAA,GAAAA,wBAAA","ignoreList":[]}