react-native-unistyles 3.0.0-alpha.9 → 3.0.0-beta.1

package/cxx/parser/Parser.cpp

@@ -1,4 +1,5 @@
 #include "Parser.h"
+#include "UnistyleWrapper.h"
 
 using namespace margelo::nitro::unistyles;
 using namespace facebook;
@@ -8,19 +9,19 @@ using Variants = std::vector<std::pair<std::string, std::string>>;
 
 // called only once while processing StyleSheet.create
 void parser::Parser::buildUnistyles(jsi::Runtime& rt, std::shared_ptr<StyleSheet> styleSheet) {
-    jsi::Object unwrappedStyleSheet = this->unwrapStyleSheet(rt, styleSheet);
+    jsi::Object unwrappedStyleSheet = this->unwrapStyleSheet(rt, styleSheet, std::nullopt);
 
     helpers::enumerateJSIObject(rt, unwrappedStyleSheet, [&](const std::string& styleKey, jsi::Value& propertyValue){
         helpers::assertThat(rt, propertyValue.isObject(), "Unistyles: Style with name '" + styleKey + "' is not a function or object.");
 
         jsi::Object styleValue = propertyValue.asObject(rt);
 
-
         if (styleValue.isFunction(rt)) {
             styleSheet->unistyles[styleKey] = std::make_shared<UnistyleDynamicFunction>(
                 UnistyleType::DynamicFunction,
                 styleKey,
-                styleValue
+                styleValue,
+                styleSheet
             );
 
             return;
@@ -29,12 +30,13 @@ void parser::Parser::buildUnistyles(jsi::Runtime& rt, std::shared_ptr<StyleSheet
         styleSheet->unistyles[styleKey] = std::make_shared<Unistyle>(
             UnistyleType::Object,
             styleKey,
-            styleValue
+            styleValue,
+            styleSheet
         );
     });
 }
 
-jsi::Object parser::Parser::unwrapStyleSheet(jsi::Runtime& rt, std::shared_ptr<StyleSheet> styleSheet) {
+jsi::Object parser::Parser::unwrapStyleSheet(jsi::Runtime& rt, std::shared_ptr<StyleSheet> styleSheet, std::optional<UnistylesNativeMiniRuntime> maybeMiniRuntime) {
     // firstly we need to get object representation of user's StyleSheet
     // StyleSheet can be a function or an object
 
@@ -45,7 +47,7 @@ jsi::Object parser::Parser::unwrapStyleSheet(jsi::Runtime& rt, std::shared_ptr<S
 
     // StyleSheet is a function
     auto& state = core::UnistylesRegistry::get().getState(rt);
-    auto theme = state.getJSTheme();
+    auto theme = state.getCurrentJSTheme();
 
     if (styleSheet->type == StyleSheetType::Themable) {
         return styleSheet->rawValue
@@ -56,7 +58,7 @@ jsi::Object parser::Parser::unwrapStyleSheet(jsi::Runtime& rt, std::shared_ptr<S
 
     // stylesheet also has a mini runtime dependency
     // StyleSheetType::ThemableWithMiniRuntime
-    auto miniRuntime = this->_unistylesRuntime->getMiniRuntimeAsValue(rt);
+    auto miniRuntime = this->_unistylesRuntime->getMiniRuntimeAsValue(rt, maybeMiniRuntime);
 
     return styleSheet->rawValue
         .asFunction(rt)
@@ -91,28 +93,74 @@ void parser::Parser::rebuildUnistylesWithVariants(jsi::Runtime& rt, std::shared_
             continue;
         }
 
-        // 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 (auto& [styleSheet, map] : dependencyMap) {
-        jsi::Object unwrappedStyleSheet = this->unwrapStyleSheet(rt, styleSheet);
+void parser::Parser::rebuildUnistylesInDependencyMap(jsi::Runtime& rt, DependencyMap& dependencyMap, std::vector<std::shared_ptr<core::StyleSheet>>& styleSheets, std::optional<UnistylesNativeMiniRuntime> maybeMiniRuntime) {
+    std::unordered_map<std::shared_ptr<StyleSheet>, jsi::Value> parsedStyleSheets{};
+    std::unordered_map<std::shared_ptr<core::Unistyle>, bool> parsedUnistyles{};
+
+    // parse all stylesheets that depends on changes
+    for (auto styleSheet : styleSheets) {
+        parsedStyleSheets.emplace(styleSheet, this->unwrapStyleSheet(rt, styleSheet, maybeMiniRuntime));
+    }
+
+    // then parse all visible Unistyles managed by Unistyle
+    for (auto& [shadowNode, unistyles] : dependencyMap) {
+        auto styleSheet = unistyles.begin()->get()->unistyle->parent;
+
+        // stylesheet may be optional for exotic unistyles
+        if (styleSheet != nullptr && !parsedStyleSheets.contains(styleSheet)) {
+            parsedStyleSheets.emplace(styleSheet, this->unwrapStyleSheet(rt, styleSheet, maybeMiniRuntime));
+        }
 
-        for (auto& [shadowNode, unistyles] : map) {
-            for (auto& unistyleData : unistyles) {
-                auto& unistyle = unistyleData->unistyle;
+        for (auto& unistyleData : unistyles) {
+            auto& unistyle = unistyleData->unistyle;
 
-                // StyleSheet might have styles that are not affected
-                if (!unwrappedStyleSheet.hasProperty(rt, unistyle->styleKey.c_str())) {
-                    continue;
+            // for RN styles or inline styles, compute styles only once
+            if (unistyle->styleKey == helpers::EXOTIC_STYLE_KEY) {
+                if (!unistyleData->parsedStyle.has_value()) {
+                    unistyleData->parsedStyle = jsi::Value(rt, unistyle->rawValue).asObject(rt);
+
+                    if (!parsedUnistyles.contains(unistyle)) {
+                        parsedUnistyles.emplace(unistyle, true);
+                    }
                 }
 
-                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);
+                continue;
+            }
+
+            // reference Unistyles StyleSheet as we may mix them for one style
+            auto unistyleStyleSheet = unistyle->parent;
+
+            // we may hit now other StyleSheets that are referenced from affected nodes
+            if (unistyleStyleSheet != nullptr && !parsedStyleSheets.contains(unistyleStyleSheet)) {
+                parsedStyleSheets.emplace(unistyleStyleSheet, this->unwrapStyleSheet(rt, unistyleStyleSheet, maybeMiniRuntime));
+            }
+
+            // StyleSheet might have styles that are not affected
+            if (!parsedStyleSheets[unistyleStyleSheet].asObject(rt).hasProperty(rt, unistyle->styleKey.c_str())) {
+                continue;
+            }
+
+            unistyle->rawValue = parsedStyleSheets[unistyleStyleSheet].asObject(rt).getProperty(rt, unistyle->styleKey.c_str()).asObject(rt);
+            this->rebuildUnistyle(rt, unistyleStyleSheet, 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 to be later accessible
+    // for createUnistylesComponent
+    for (auto styleSheet : styleSheets) {
+        for (auto& [_, unistyle] : styleSheet->unistyles) {
+            if (!parsedUnistyles.contains(unistyle)) {
+                unistyle->rawValue = parsedStyleSheets[styleSheet].asObject(rt).getProperty(rt, unistyle->styleKey.c_str()).asObject(rt);
             }
         }
     }
@@ -146,7 +194,10 @@ 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, dynamicFunctionMetadata.size()).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, variants);
@@ -154,27 +205,19 @@ 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(jsi::Runtime& rt, 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& unistyleData : unistyles) {
-                auto rawProps = this->parseStylesToShadowTreeStyles(rt, unistyleData->parsedStyle.value());
-
-                if (updates.contains(shadowNode)) {
-                    updates[shadowNode].emplace_back(std::move(rawProps));
+    auto& registry = core::UnistylesRegistry::get();
 
-                    continue;
-                }
+    for (const auto& [shadowNode, unistyles] : dependencyMap) {
+        // this step is required to parse string colors eg. #000000 to int representation
+        auto rawProps = this->parseStylesToShadowTreeStyles(rt, unistyles);
 
-                updates.emplace(shadowNode, std::vector<RawProps>{std::move(rawProps)});
-            }
-        }
+        updates.emplace(shadowNode, std::move(rawProps));
     }
 
-    return updates;
+    registry.trafficController.setUpdates(updates);
+    registry.trafficController.resumeUnistylesTraffic();
 }
 
 // first level of StyleSheet, we can expect here different properties than on second level
@@ -238,6 +281,18 @@ 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));
+
+            return;
+        }
+
         if (propertyName == "fontVariant" && propertyValueObject.isArray(rt)) {
             parsedStyle.setProperty(rt, jsi::PropNameID::forUtf8(rt, propertyName), propertyValue);
 
@@ -288,7 +343,9 @@ jsi::Function parser::Parser::createDynamicFunctionProxy(jsi::Runtime& rt, Unist
         jsi::PropNameID::forUtf8(rt, unistyle->styleKey),
         1,
         [this, unistylesRuntime, unistyle](jsi::Runtime& rt, const jsi::Value& thisVal, const jsi::Value* args, size_t count) {
-            auto thisObject = thisVal.asObject(rt);
+            auto thisObject = thisVal.isObject()
+                ? thisVal.asObject(rt)
+                : jsi::Object(rt);
             auto parser = parser::Parser(unistylesRuntime);
 
             // call user function
@@ -296,23 +353,37 @@ jsi::Function parser::Parser::createDynamicFunctionProxy(jsi::Runtime& rt, Unist
 
             // memoize metadata to call it later
             auto unistyleFn = std::dynamic_pointer_cast<UnistyleDynamicFunction>(unistyle);
-            jsi::Array arguments = jsi::Array(rt, count);
-
-            for (size_t i = 0; i < count; i++) {
-                arguments.setValueAtIndex(rt, i, args[i]);
-            }
 
             unistyleFn->unprocessedValue = jsi::Value(rt, result).asObject(rt);
 
-            // todo pass here variants
-            unistyleFn->parsedStyle = this->parseFirstLevel(rt, unistyleFn, std::nullopt);
+            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();
 
-            return jsi::Value(rt, unistyleFn->parsedStyle.value());
+            jsi::Object style = jsi::Value(rt, unistyleFn->parsedStyle.value()).asObject(rt);
+
+            // include dependencies for createUnistylesComponent
+            style.setProperty(rt, "__proto__", generateUnistylesPrototype(rt, unistylesRuntime, unistyle, variants, helpers::functionArgumentsToArray(rt, args, count)));
+
+            // update shadow leaf updates to indicate newest changes
+            auto& registry = core::UnistylesRegistry::get();
+            auto lastArg = count == 0
+                ? jsi::Value::undefined()
+                : jsi::Value(rt, args[count - 1]);
+
+            registry.shadowLeafUpdateFromUnistyle(rt, unistyle, lastArg);
+
+            return style;
     });
 }
 
-// function convert babel generated dependencies to C++ dependencies
+// function converts babel generated dependencies to C++ dependencies
 std::vector<UnistyleDependency> parser::Parser::parseDependencies(jsi::Runtime &rt, jsi::Object&& dependencies) {
     helpers::assertThat(rt, dependencies.isArray(rt), "Unistyles: Babel transform is invalid - unexpected type for dependencies.");
 
@@ -331,10 +402,6 @@ std::vector<UnistyleDependency> parser::Parser::parseDependencies(jsi::Runtime &
 
 // eg. [{ scale: 2 }, { translateX: 100 }]
 jsi::Value parser::Parser::parseTransforms(jsi::Runtime& rt, Unistyle::Shared unistyle, jsi::Object& obj) {
-    if (!obj.isArray(rt)) {
-        return jsi::Value::undefined();
-    }
-
     std::vector<jsi::Value> parsedTransforms{};
 
     parsedTransforms.reserve(2);
@@ -364,6 +431,67 @@ jsi::Value parser::Parser::parseTransforms(jsi::Runtime& rt, Unistyle::Shared un
     return result;
 }
 
+// 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;
+        }
+
+        auto parsedResult = this->parseSecondLevel(rt, unistyle, value);
+
+        parsedBoxShadows.emplace_back(std::move(parsedResult));
+    });
+
+    // create jsi::Array result with correct box shadows
+    jsi::Array result = jsi::Array(rt, parsedBoxShadows.size());
+
+    for (size_t i = 0; i < parsedBoxShadows.size(); i++) {
+        result.setValueAtIndex(rt, i, parsedBoxShadows[i]);
+    }
+
+    return result;
+}
+
+// eg. [{ brightness: 0.5 }, { opacity: 0.25 }]
+jsi::Value parser::Parser::parseFilters(jsi::Runtime &rt, Unistyle::Shared unistyle, jsi::Object &obj) {
+    std::vector<jsi::Value> parsedFilters{};
+
+    parsedFilters.reserve(2);
+
+    helpers::iterateJSIArray(rt, obj.asArray(rt), [&](size_t i, jsi::Value& value){
+        if (!value.isObject()) {
+            return;
+        }
+
+        auto parsedResult = this->parseSecondLevel(rt, unistyle, value);
+
+        // 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;
+        }
+
+        parsedFilters.emplace_back(std::move(parsedResult));
+    });
+
+    // create jsi::Array result with correct filters
+    jsi::Array result = jsi::Array(rt, parsedFilters.size());
+
+    for (size_t i = 0; i < parsedFilters.size(); i++) {
+        result.setValueAtIndex(rt, i, parsedFilters[i]);
+    }
+
+    return result;
+}
+
 // find value based on breakpoints and mq
 jsi::Value parser::Parser::getValueFromBreakpoints(jsi::Runtime& rt, Unistyle::Shared unistyle, jsi::Object& obj) {
     auto& registry = core::UnistylesRegistry::get();
@@ -479,8 +607,8 @@ jsi::Value parser::Parser::getStylesForVariant(jsi::Runtime& rt, const std::stri
         : "default";
     auto hasKey = groupValue.hasProperty(rt, selectedVariantKey);
 
-    if (hasKey && !selectedVariant.has_value()) {
-        // add 'default' selection to variants map
+    if (!hasKey || !selectedVariant.has_value()) {
+        // for no key, add 'default' selection to variants map
         variants.emplace_back(groupName, selectedVariantKey);
     }
 
@@ -518,7 +646,7 @@ jsi::Object parser::Parser::parseCompoundVariants(jsi::Runtime& rt, Unistyle::Sh
     return parsedCompoundVariants;
 }
 
-// check every condition in compound variants, support boolean variants
+// check every condition in compound variants, supports boolean variants
 bool parser::Parser::shouldApplyCompoundVariants(jsi::Runtime& rt, const Variants& variants, jsi::Object& compoundVariant) {
     if (variants.empty()) {
         return false;
@@ -535,7 +663,9 @@ bool parser::Parser::shouldApplyCompoundVariants(jsi::Runtime& rt, const Variant
         auto property = compoundVariant.getProperty(rt, variantKey.c_str());
         auto propertyName = property.isBool()
             ? (property.asBool() ? "true" : "false")
-            : property.asString(rt).utf8(rt);
+            : property.isString()
+                ? property.asString(rt).utf8(rt)
+                : "";
 
         if (propertyName != variantValue) {
             return false;
@@ -613,20 +743,27 @@ jsi::Value parser::Parser::parseSecondLevel(jsi::Runtime &rt, Unistyle::Shared u
     return parsedStyle;
 }
 
-// convert jsi::Object to RawValue with int colors
-RawProps parser::Parser::parseStylesToShadowTreeStyles(jsi::Runtime& rt, const jsi::Object& styles) {
+// convert unistyles to folly with int colors
+folly::dynamic 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);
 
-    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)));
+    for (const auto& unistyleData : unistyles) {
+        // this can happen for exotic stylesheets
+        if (!unistyleData->parsedStyle.has_value()) {
+            return nullptr;
         }
 
-        convertedStyles.setProperty(rt, propertyName.c_str(), propertyValue);
-    });
+        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)));
+            }
+
+            convertedStyles.setProperty(rt, propertyName.c_str(), propertyValue);
+        });
+    }
 
-    return RawProps(rt, std::move(convertedStyles));
+    return jsi::dynamicFromValue(rt, std::move(convertedStyles));
 }
 
 // check is styleKey contains color

package/cxx/parser/Parser.h

@@ -24,23 +24,25 @@ struct Parser {
     void buildUnistyles(jsi::Runtime& rt, std::shared_ptr<StyleSheet> styleSheet);
     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);
-    shadow::ShadowLeafUpdates dependencyMapToShadowLeafUpdates(core::DependencyMap& dependencyMap);
+    void rebuildUnistylesInDependencyMap(jsi::Runtime& rt, core::DependencyMap& dependencyMap, std::vector<std::shared_ptr<core::StyleSheet>>& styleSheets, std::optional<UnistylesNativeMiniRuntime> maybeMiniRuntime);
+    void rebuildShadowLeafUpdates(jsi::Runtime& rt, core::DependencyMap& dependencyMap);
+    folly::dynamic parseStylesToShadowTreeStyles(jsi::Runtime& rt, const std::vector<std::shared_ptr<UnistyleData>>& unistyles);
+    void rebuildUnistyle(jsi::Runtime& rt, std::shared_ptr<StyleSheet> styleSheet, Unistyle::Shared unistyle, const Variants& variants, std::optional<std::vector<folly::dynamic>>);
 
 private:
-    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 unwrapStyleSheet(jsi::Runtime& rt, std::shared_ptr<StyleSheet> styleSheet, std::optional<UnistylesNativeMiniRuntime>);
     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);
     std::vector<UnistyleDependency> parseDependencies(jsi::Runtime &rt, jsi::Object&& dependencies);
     jsi::Value parseTransforms(jsi::Runtime& rt, Unistyle::Shared unistyle, jsi::Object& obj);
+    jsi::Value parseBoxShadow(jsi::Runtime& rt, Unistyle::Shared unistyle, jsi::Object& obj);
+    jsi::Value parseFilters(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, 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, const jsi::Object& parsedStyles);
     bool isColor(const std::string& propertyName);
 
     std::shared_ptr<HybridUnistylesRuntime> _unistylesRuntime;

package/cxx/shadowTree/ShadowLeafUpdate.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <jsi/jsi.h>
+#include <folly/dynamic.h>
 #include <react/renderer/uimanager/UIManager.h>
 
 namespace margelo::nitro::unistyles::shadow {
@@ -8,6 +9,7 @@ namespace margelo::nitro::unistyles::shadow {
 using namespace facebook;
 using namespace facebook::react;
 
-using ShadowLeafUpdates = std::unordered_map<const ShadowNodeFamily*, std::vector<RawProps>>;
+// translates Unistyles changes to unified shadow tree changes
+using ShadowLeafUpdates = std::unordered_map<const ShadowNodeFamily*, folly::dynamic>;
 
 }

package/cxx/shadowTree/ShadowTrafficController.h

@@ -0,0 +1,71 @@
+#pragma once
+
+#import "mutex"
+#import "ShadowLeafUpdate.h"
+
+namespace margelo::nitro::unistyles::shadow {
+
+// Like a traffic officer managing a jam, this struct ensures everything
+// is synchronized within a set timeframe, controlling flow and preventing chaos.
+struct ShadowTrafficController {
+    inline bool shouldStop() {
+        return !_canCommit;
+    }
+
+    inline void stopUnistylesTraffic() {
+        this->_canCommit = false;
+    }
+
+    inline void resumeUnistylesTraffic() {
+        this->_canCommit = true;
+    }
+
+    inline shadow::ShadowLeafUpdates& getUpdates() {
+        std::lock_guard<std::mutex> lock(_mutex);
+ 
+        return _unistylesUpdates;
+    }
+
+    inline void setUpdates(shadow::ShadowLeafUpdates& newUpdates) {
+        std::lock_guard<std::mutex> lock(_mutex);
+
+        auto& targetUpdates = _unistylesUpdates;
+
+        // this is important as overriding updates may skip some interim changes
+        // Unistyles emits different events so this will make sure that everything is synced
+        std::for_each(newUpdates.begin(), newUpdates.end(), [&targetUpdates](auto& pair){
+            if (targetUpdates.contains(pair.first)) {
+                targetUpdates[pair.first] = std::move(pair.second);
+
+                return;
+            }
+
+            targetUpdates.emplace(pair.first, std::move(pair.second));
+        });
+    }
+    
+    inline void removeShadowNode(const ShadowNodeFamily* shadowNodeFamily) {
+        std::lock_guard<std::mutex> lock(_mutex);
+        
+        if (_unistylesUpdates.contains(shadowNodeFamily)) {
+            _unistylesUpdates.erase(shadowNodeFamily);
+        }
+    }
+
+    inline void restore() {
+        std::lock_guard<std::mutex> lock(_mutex);
+        
+        _unistylesUpdates = {};
+        _canCommit = false;
+    }
+
+private:
+    std::atomic<bool> _canCommit = false;
+    shadow::ShadowLeafUpdates _unistylesUpdates{};
+
+    // this struct should be accessed in thread-safe manner. Otherwise shadow tree updates
+    // from different threads will break it
+    std::mutex _mutex;
+};
+
+}

package/cxx/shadowTree/ShadowTreeManager.cpp

@@ -6,26 +6,29 @@ using namespace facebook;
 
 using AffectedNodes = std::unordered_map<const ShadowNodeFamily*, std::unordered_set<int>>;
 
-void shadow::ShadowTreeManager::updateShadowTree(facebook::jsi::Runtime& rt, shadow::ShadowLeafUpdates& updates) {
-    auto& uiManager = UIManagerBinding::getBinding(rt)->getUIManager();
-    const auto &shadowTreeRegistry = uiManager.getShadowTreeRegistry();
+void shadow::ShadowTreeManager::updateShadowTree(const ShadowTreeRegistry& shadowTreeRegistry) {
+    auto& registry = core::UnistylesRegistry::get();
+    auto updates = registry.trafficController.getUpdates();
 
-    shadowTreeRegistry.enumerate([&updates, &rt](const ShadowTree& shadowTree, bool& stop){
+    if (updates.empty()) {
+        return;
+    }
+
+    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
             ));
-            
-            // set unistyles commit trait
+
+            // set unistyles trait
             auto unistylesRootNode = std::reinterpret_pointer_cast<core::UnistylesCommitShadowNode>(newRootNode);
-            
+
             unistylesRootNode->addUnistylesCommitTrait();
 
             return newRootNode;
@@ -36,7 +39,7 @@ void shadow::ShadowTreeManager::updateShadowTree(facebook::jsi::Runtime& rt, sha
         // enableStateReconciliation: https://reactnative.dev/architecture/render-pipeline#react-native-renderer-state-updates
         // mountSynchronously: must be true as this is update from C++ not React
         shadowTree.commit(transaction, {false, true});
-        
+
 
         // for now we're assuming single surface, can be improved in the future
         // stop = true means stop enumerating next shadow tree
@@ -83,7 +86,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);
@@ -93,7 +96,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);
         }
     }
 
@@ -106,14 +109,20 @@ 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));
-        }
+        // this is important and critical
+        // first of all Android doesn't like nullish props (they work perfectly fine on iOS)
+        // second of all Android props MUST be constructed from previous props, otherwise RawProps::~RawProps error occurs
+        // Meta wants to remove shadowNode.getProps()->rawProps, but for now it's the only viable solution
+        #ifdef ANDROID
+            auto safeProps = rawPropsIt->second == nullptr ? folly::dynamic::object() : rawPropsIt->second;
+            auto newProps = folly::dynamic::merge(shadowNode.getProps()->rawProps, safeProps);
+        #else
+            auto newProps = rawPropsIt->second;
+        #endif
+
+        updatedProps = shadowNode
+            .getComponentDescriptor()
+            .cloneProps(propsParserContext, shadowNode.getProps(), RawProps(newProps));
     }
 
     return shadowNode.clone({

package/cxx/shadowTree/ShadowTreeManager.h

@@ -6,6 +6,7 @@
 #include <ranges>
 #include "ShadowLeafUpdate.h"
 #include "UnistylesCommitShadowNode.h"
+#include "UnistylesRegistry.h"
 
 namespace margelo::nitro::unistyles::shadow {
 
@@ -15,9 +16,9 @@ using namespace facebook;
 using AffectedNodes = std::unordered_map<const ShadowNodeFamily *, std::unordered_set<int>>;
 
 struct ShadowTreeManager {
-    static void updateShadowTree(jsi::Runtime& rt, shadow::ShadowLeafUpdates& updates);
+    static void updateShadowTree(const ShadowTreeRegistry& shadowTreeRegistry);
     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/Equatable.swift

@@ -36,7 +36,8 @@ extension UnistylesNativeMiniRuntime {
             dependencies.append(UnistyleDependency.breakpoints)
         }
 
-        if (lhs.orientation != rhs.orientation) {
+        // no need to check isLandscape, as it's always opposite
+        if (lhs.isPortrait != rhs.isPortrait) {
             dependencies.append(UnistyleDependency.orientation)
         }