react-native-unistyles 3.0.0-alpha.3 → 3.0.0-alpha.31

package/cxx/parser/Parser.cpp

@@ -11,16 +11,16 @@ 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);
 
-
         if (styleValue.isFunction(rt)) {
             styleSheet->unistyles[styleKey] = std::make_shared<UnistyleDynamicFunction>(
                 UnistyleType::DynamicFunction,
                 styleKey,
-                styleValue
+                styleValue,
+                styleSheet
             );
 
             return;
@@ -29,7 +29,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
         );
     });
 }
@@ -45,7 +46,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
@@ -68,14 +69,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,59 +86,108 @@ 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) {
-        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;
+void parser::Parser::rebuildUnistylesInDependencyMap(jsi::Runtime& rt, DependencyMap& dependencyMap, std::vector<std::shared_ptr<core::StyleSheet>> styleSheets) {
+    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));
+    }
+
+    // then parse all visible Unistyles
+    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));
+        }
+
+        for (auto& unistyleData : unistyles) {
+            auto& unistyle = unistyleData->unistyle;
+
+            // for RN styles or inline styles, compute styles only once
+            if (unistyle->styleKey == helpers::EXOTIC_STYLE_KEY.c_str()) {
+                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);
+                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));
+            }
+
+            // 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
+    for (auto styleSheet : styleSheets) {
+        for (auto& [_, unistyle] : styleSheet->unistyles) {
+            if (!parsedUnistyles.contains(unistyle)) {
+                parsedUnistyles.emplace(unistyle, true);
+                unistyle->rawValue = parsedStyleSheets[styleSheet].asObject(rt).getProperty(rt, unistyle->styleKey.c_str()).asObject(rt);
+                this->rebuildUnistyle(rt, styleSheet, unistyle, {}, std::nullopt);
             }
         }
     }
 }
 
 // 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{};
-        
-        args.reserve(3);
 
-        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));
         }
@@ -145,96 +195,37 @@ 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) {
+void parser::Parser::rebuildShadowLeafUpdates(core::DependencyMap& dependencyMap) {
     shadow::ShadowLeafUpdates updates;
+    auto& registry = core::UnistylesRegistry::get();
     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;
-                }
+    for (const auto& [shadowNode, unistyles] : dependencyMap) {
+        auto rawProps = this->parseStylesToShadowTreeStyles(rt, unistyles);
 
-                updates.emplace(shadowNode, std::vector<RawProps>{std::move(rawProps)});
-            }
-        }
+        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{};
-    
-    parsedArgument.reserve(3);
-
-    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;;
-        }
+    registry.trafficController.setUpdates(rt, updates);
 
-        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;
+    // this is required, we need to indicate that there are new changes
+    registry.trafficController.resumeUnistylesTraffic();
 }
 
 // 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
@@ -293,6 +284,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);
 
@@ -316,20 +319,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);
         }
@@ -339,14 +338,14 @@ 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);
 
@@ -356,25 +355,38 @@ jsi::Function parser::Parser::createDynamicFunctionProxy(jsi::Runtime& rt, Unist
             // 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();
 
-            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));
+
+            // update shadow leaf updates to indicate newest changes
+            auto& registry = core::UnistylesRegistry::get();
+
+            registry.shadowLeafUpdateFromUnistyle(rt, unistyle);
+
+            return style;
     });
 }
 
 // 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{};
-    
+
     parsedDependencies.reserve(5);
 
     helpers::iterateJSIArray(rt, dependencies.asArray(rt), [&](size_t i, jsi::Value& value){
@@ -388,12 +400,8 @@ 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);
 
     helpers::iterateJSIArray(rt, obj.asArray(rt), [&](size_t i, jsi::Value& value){
@@ -421,6 +429,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();
@@ -442,7 +511,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);
         }
@@ -455,11 +524,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);
     }
@@ -467,7 +536,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
@@ -513,7 +582,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()) {
@@ -529,13 +598,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 (groupValue.hasProperty(rt, selectedVariantKey)) {
+    if (!hasKey || !selectedVariant.has_value()) {
+        // for no key, add 'default' selection to variants map
+        variants.emplace_back(groupName, selectedVariantKey);
+    }
+
+    if (hasKey) {
         return groupValue.getProperty(rt, selectedVariantKey);
     }
 
@@ -575,28 +650,20 @@ 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());
         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;
@@ -674,35 +741,39 @@ 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{};
+// 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, variants, [&](const std::string& variantName, jsi::Value& variantValue){
-        if (variantValue.isUndefined() || variantValue.isNull()) {
-            return;
+    for (const auto& unistyleData : unistyles) {
+        // this can happen for exotic stylesheets
+        if (!unistyleData->parsedStyle.has_value()) {
+            unistyleData->parsedStyle = jsi::Value(rt, unistyleData->unistyle->rawValue).asObject(rt);
         }
 
-        if (variantValue.isBool()) {
-            pairs.emplace_back(std::make_pair(variantName, variantValue.asBool() ? "true" : "false"));
-
-            return;
-        }
+        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)));
+            }
 
-        if (variantValue.isString()) {
-            pairs.emplace_back(std::make_pair(variantName, variantValue.asString(rt).utf8(rt)));
-        }
-    });
+            convertedStyles.setProperty(rt, propertyName.c_str(), propertyValue);
+        });
+    }
 
-    return pairs;
+    return jsi::dynamicFromValue(rt, std::move(convertedStyles));
 }
 
-// convert jsi::Object to RawValue with int colors
-RawProps parser::Parser::parseStylesToShadowTreeStyles(jsi::Runtime& rt, jsi::Object& styles) {
+folly::dynamic parser::Parser::parseUnistyleToShadowTreeStyles(jsi::Runtime& rt, const Unistyle::Shared unistyle) {
     jsi::Object convertedStyles = jsi::Object(rt);
     auto& state = core::UnistylesRegistry::get().getState(rt);
 
-    helpers::enumerateJSIObject(rt, styles, [&](const std::string& propertyName, jsi::Value& propertyValue){
+    // can happen for exotic styles
+    if (!unistyle->parsedStyle.has_value()) {
+        unistyle->parsedStyle = jsi::Value(rt, unistyle->rawValue).asObject(rt);
+    }
+
+    helpers::enumerateJSIObject(rt, unistyle->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)));
         }
@@ -710,7 +781,7 @@ RawProps parser::Parser::parseStylesToShadowTreeStyles(jsi::Runtime& rt, jsi::Ob
         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