react-native-unistyles 3.0.0-alpha.8 → 3.0.0-alpha.9

package/cxx/common/Helpers.h

@@ -1,6 +1,8 @@
 #pragma once
 
 #include <jsi/jsi.h>
+#include <jsi/JSIDynamic.h>
+#include <folly/dynamic.h>
 #include <unordered_set>
 
 using namespace facebook;
@@ -114,4 +116,60 @@ inline Variants variantsToPairs(jsi::Runtime& rt, jsi::Object&& variants) {
     return pairs;
 }
 
+inline std::vector<folly::dynamic> parseDynamicFunctionArguments(jsi::Runtime& rt, jsi::Array& arguments) {
+    std::vector<folly::dynamic> parsedArgument{};
+    size_t count = arguments.size(rt);
+
+    parsedArgument.reserve(count);
+
+    for (size_t i = 0; i < count; i++) {
+        jsi::Value arg = arguments.getValueAtIndex(rt, 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;
+}
+
 }

package/cxx/core/Unistyle.h

@@ -14,11 +14,6 @@ enum class UnistyleType {
     DynamicFunction
 };
 
-struct DynamicFunctionMetadata {
-    size_t count;
-    std::vector<folly::dynamic> arguments;
-};
-
 struct Unistyle {
     using Shared = std::shared_ptr<Unistyle>;
 
@@ -75,7 +70,6 @@ struct UnistyleDynamicFunction: public Unistyle {
 
     std::optional<jsi::Object> unprocessedValue;
     std::optional<jsi::Function> proxiedFunction = std::nullopt;
-    std::optional<DynamicFunctionMetadata> dynamicFunctionMetadata = std::nullopt;
 };
 
 }

package/cxx/core/UnistyleData.h

@@ -8,8 +8,8 @@ namespace margelo::nitro::unistyles::core {
 using Variants = std::vector<std::pair<std::string, std::string>>;
 
 struct UnistyleData {
-    UnistyleData(Unistyle::Shared unistyle, const Variants& variants)
-        : unistyle{unistyle}, variants(std::move(variants)) {}
+    UnistyleData(Unistyle::Shared unistyle, const Variants& variants, std::vector<folly::dynamic>& arguments)
+        : unistyle{unistyle}, variants(std::move(variants)), dynamicFunctionMetadata{std::move(arguments)} {}
 
     UnistyleData(const UnistyleData&) = delete;
     UnistyleData(UnistyleData&& other): unistyle{other.unistyle}, variants(std::move(other.variants)) {}
@@ -17,6 +17,7 @@ struct UnistyleData {
     core::Unistyle::Shared unistyle;
     core::Variants variants;
     std::optional<jsi::Object> parsedStyle = std::nullopt;
+    std::optional<std::vector<folly::dynamic>> dynamicFunctionMetadata = std::nullopt;
 };
 
 }

package/cxx/core/UnistyleWrapper.h

@@ -26,24 +26,24 @@ inline static Unistyle::Shared unistyleFromValue(jsi::Runtime& rt, const jsi::Va
 
 inline static jsi::Value valueFromUnistyle(jsi::Runtime& rt, Unistyle::Shared unistyle) {
     auto wrappedUnistyle = std::make_shared<UnistyleWrapper>(unistyle);
-    
+
     if (unistyle->type == UnistyleType::Object) {
         jsi::Object obj = jsi::Object(rt);
-        
+
         obj.setNativeState(rt, std::move(wrappedUnistyle));
         helpers::defineHiddenProperty(rt, obj, helpers::UNISTYLES_ID.c_str(), unistyle->styleKey);
-        
+
         helpers::mergeJSIObjects(rt, obj, unistyle->parsedStyle.value());
-        
+
         return obj;
     }
-    
+
     auto unistyleFn = std::dynamic_pointer_cast<UnistyleDynamicFunction>(unistyle);
     auto hostFn = jsi::Value(rt, unistyleFn->proxiedFunction.value()).asObject(rt).asFunction(rt);
 
     hostFn.setNativeState(rt, std::move(wrappedUnistyle));
     hostFn.setProperty(rt, helpers::UNISTYLES_ID.c_str(), unistyleFn->styleKey);
-    
+
     return std::move(hostFn);
 }
 

package/cxx/core/UnistylesRegistry.cpp

@@ -74,19 +74,20 @@ void core::UnistylesRegistry::updateTheme(jsi::Runtime& rt, std::string& themeNa
 void core::UnistylesRegistry::linkShadowNodeWithUnistyle(
     const ShadowNodeFamily* shadowNodeFamily,
     const core::Unistyle::Shared unistyle,
-    Variants& variants
+    Variants& variants,
+    std::vector<folly::dynamic>& arguments
 ) {
     if (!this->_shadowRegistry.contains(shadowNodeFamily)) {
         this->_shadowRegistry[shadowNodeFamily] = {};
     }
 
-    this->_shadowRegistry[shadowNodeFamily].emplace_back(std::make_pair(unistyle, std::move(variants)));
+    this->_shadowRegistry[shadowNodeFamily].emplace_back(std::make_shared<UnistyleData>(unistyle, variants, arguments));
 }
 
 void core::UnistylesRegistry::unlinkShadowNodeWithUnistyle(const ShadowNodeFamily* shadowNodeFamily, const core::Unistyle::Shared unistyle) {
     auto& unistylesVec = this->_shadowRegistry[shadowNodeFamily];
-    auto it = std::find_if(unistylesVec.begin(), unistylesVec.end(), [unistyle](std::pair<core::Unistyle::Shared, Variants> pair){
-        return pair.first == unistyle;
+    auto it = std::find_if(unistylesVec.begin(), unistylesVec.end(), [unistyle](std::shared_ptr<UnistyleData> unistyleData){
+        return unistyleData->unistyle == unistyle;
     });
 
     if (it != unistylesVec.end()) {
@@ -124,12 +125,12 @@ core::DependencyMap core::UnistylesRegistry::buildDependencyMap(jsi::Runtime& rt
             for (const auto& pair : this->_shadowRegistry) {
                 const auto& [family, unistyles] = pair;
 
-                for (const auto& [shadowUnistyle, variants] : unistyles) {
-                    if (unistyle != shadowUnistyle) {
+                for (const auto& unistyleData : unistyles) {
+                    if (unistyle != unistyleData->unistyle) {
                         continue;
                     }
 
-                    dependencyMap[styleSheet][family].emplace_back(unistyle, variants);
+                    dependencyMap[styleSheet][family].emplace_back(unistyleData);
                 }
             }
         }
@@ -146,12 +147,12 @@ core::DependencyMap core::UnistylesRegistry::buildDependencyMap(jsi::Runtime& rt
             for (const auto& pair : this->_shadowRegistry) {
                 const auto& [family, unistyles] = pair;
 
-                for (const auto& [shadowUnistyle, variants] : unistyles) {
-                    if (unistyle != shadowUnistyle) {
+                for (const auto& unistyleData : unistyles) {
+                    if (unistyle != unistyleData->unistyle) {
                         continue;
                     }
 
-                    dependencyMap[styleSheet][family].emplace_back(unistyle, variants);
+                    dependencyMap[styleSheet][family].emplace_back(unistyleData);
                 }
             }
         }

package/cxx/core/UnistylesRegistry.h

@@ -2,6 +2,7 @@
 
 #include "set"
 #include <jsi/jsi.h>
+#include <folly/dynamic.h>
 #include <react/renderer/uimanager/UIManager.h>
 #include <unordered_map>
 #include <unordered_set>
@@ -20,7 +21,7 @@ using namespace facebook::react;
 
 using DependencyMap = std::unordered_map<
     std::shared_ptr<core::StyleSheet>,
-    std::unordered_map<const ShadowNodeFamily*, std::vector<UnistyleData>>
+    std::unordered_map<const ShadowNodeFamily*, std::vector<std::shared_ptr<UnistyleData>>>
 >;
 
 struct UnistylesRegistry: public StyleSheetRegistry {
@@ -37,7 +38,7 @@ struct UnistylesRegistry: public StyleSheetRegistry {
 
     UnistylesState& getState(jsi::Runtime& rt);
     void createState(jsi::Runtime& rt);
-    void linkShadowNodeWithUnistyle(const ShadowNodeFamily*, const core::Unistyle::Shared, Variants& variants);
+    void linkShadowNodeWithUnistyle(const ShadowNodeFamily*, const core::Unistyle::Shared, Variants& variants, std::vector<folly::dynamic>&);
     void unlinkShadowNodeWithUnistyle(const ShadowNodeFamily*, const core::Unistyle::Shared);
     std::shared_ptr<core::StyleSheet> addStyleSheet(jsi::Runtime& rt, int tag, core::StyleSheetType type, jsi::Object&& rawValue);
     DependencyMap buildDependencyMap(jsi::Runtime& rt, std::vector<UnistyleDependency>& deps);
@@ -48,7 +49,7 @@ private:
 
     std::unordered_map<jsi::Runtime*, UnistylesState> _states{};
     std::unordered_map<jsi::Runtime*, std::unordered_map<int, std::shared_ptr<core::StyleSheet>>> _styleSheetRegistry{};
-    std::unordered_map<const ShadowNodeFamily*, std::vector<std::pair<core::Unistyle::Shared, Variants>>> _shadowRegistry{};
+    std::unordered_map<const ShadowNodeFamily*, std::vector<std::shared_ptr<UnistyleData>>> _shadowRegistry{};
 };
 
 UnistylesRegistry& UnistylesRegistry::get() {

package/cxx/hybridObjects/HybridShadowRegistry.cpp

@@ -4,15 +4,17 @@ using namespace margelo::nitro::unistyles;
 using namespace facebook::react;
 
 jsi::Value HybridShadowRegistry::link(jsi::Runtime &rt, const jsi::Value &thisValue, const jsi::Value *args, size_t count) {
-    helpers::assertThat(rt, count == 3, "Unistyles: Invalid babel transform 'ShadowRegistry link' expected 3 arguments.");
+    helpers::assertThat(rt, count == 4, "Unistyles: Invalid babel transform 'ShadowRegistry link' expected 4 arguments.");
     
     ShadowNode::Shared shadowNodeWrapper = shadowNodeFromValue(rt, args[0]);
     core::Unistyle::Shared unistyleWrapper = core::unistyleFromValue(rt, args[1]);
     core::Variants variants = helpers::variantsToPairs(rt, args[2].asObject(rt));
+    auto rawArguments = args[3].asObject(rt).asArray(rt);
+    std::vector<folly::dynamic> arguments = helpers::parseDynamicFunctionArguments(rt, rawArguments);
     
     auto& registry = core::UnistylesRegistry::get();
     
-    registry.linkShadowNodeWithUnistyle(&shadowNodeWrapper->getFamily(), unistyleWrapper, variants);
+    registry.linkShadowNodeWithUnistyle(&shadowNodeWrapper->getFamily(), unistyleWrapper, variants, arguments);
     
     return jsi::Value::undefined();
 }

package/cxx/parser/Parser.cpp

@@ -91,7 +91,8 @@ void parser::Parser::rebuildUnistylesWithVariants(jsi::Runtime& rt, std::shared_
             continue;
         }
 
-        this->rebuildUnistyle(rt, styleSheet, unistyle, variants);
+        // todo skip dynamic functions
+        this->rebuildUnistyle(rt, styleSheet, unistyle, variants, std::nullopt);
     }
 }
 
@@ -101,22 +102,24 @@ void parser::Parser::rebuildUnistylesInDependencyMap(jsi::Runtime& rt, Dependenc
         jsi::Object unwrappedStyleSheet = this->unwrapStyleSheet(rt, styleSheet);
 
         for (auto& [shadowNode, unistyles] : map) {
-            for (auto& [unistyle, variants, parsedStyle] : unistyles) {
+            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;
                 }
 
                 unistyle->rawValue = unwrappedStyleSheet.getProperty(rt, unistyle->styleKey.c_str()).asObject(rt);
-                this->rebuildUnistyle(rt, styleSheet, unistyle, variants);
-                parsedStyle = jsi::Value(rt, unistyle->parsedStyle.value()).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, const Variants& variants) {
+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, variants);
 
@@ -125,20 +128,17 @@ void parser::Parser::rebuildUnistyle(jsi::Runtime& rt, std::shared_ptr<StyleShee
 
     // 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(), "Unistyles: 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);
+        args.reserve(dynamicFunctionMetadata.size());
 
-        for (int i = 0; i < metadata.count; i++) {
-            folly::dynamic& arg = metadata.arguments.at(i);
+        for (int i = 0; i < dynamicFunctionMetadata.size(); i++) {
+            folly::dynamic& arg = dynamicFunctionMetadata.at(i);
 
             args.emplace_back(jsi::valueFromDynamic(rt, arg));
         }
@@ -146,7 +146,7 @@ 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->proxiedFunction.value().callAsConstructor(rt, argStart, dynamicFunctionMetadata.size()).asObject(rt);
 
         unistyleFn->unprocessedValue = std::move(functionResult);
         unistyleFn->parsedStyle = this->parseFirstLevel(rt, unistyleFn, variants);
@@ -160,9 +160,9 @@ shadow::ShadowLeafUpdates parser::Parser::dependencyMapToShadowLeafUpdates(core:
 
     for (const auto& [styleSheet, map] : dependencyMap) {
         for (const auto& [shadowNode, unistyles] : map) {
-            for (const auto& [unistyle, variants, parsedStyle] : unistyles) {
-                auto rawProps = this->parseStylesToShadowTreeStyles(rt, parsedStyle.value());
-                
+            for (const auto& unistyleData : unistyles) {
+                auto rawProps = this->parseStylesToShadowTreeStyles(rt, unistyleData->parsedStyle.value());
+
                 if (updates.contains(shadowNode)) {
                     updates[shadowNode].emplace_back(std::move(rawProps));
 
@@ -177,62 +177,6 @@ shadow::ShadowLeafUpdates parser::Parser::dependencyMapToShadowLeafUpdates(core:
     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;;
-        }
-
-        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, std::optional<Variants> variants) {
@@ -352,13 +296,15 @@ 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);
 
-            unistyleFn->dynamicFunctionMetadata = core::DynamicFunctionMetadata{
-                count,
-                this->parseDynamicFunctionArguments(rt, count, args)
-            };
+            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);
             unistyleFn->seal();
 
@@ -532,7 +478,7 @@ jsi::Value parser::Parser::getStylesForVariant(jsi::Runtime& rt, const std::stri
         ? 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);

package/cxx/parser/Parser.h

@@ -28,12 +28,11 @@ struct Parser {
     shadow::ShadowLeafUpdates dependencyMapToShadowLeafUpdates(core::DependencyMap& dependencyMap);
 
 private:
-    void rebuildUnistyle(jsi::Runtime& rt, std::shared_ptr<StyleSheet> styleSheet, Unistyle::Shared unistyle, const Variants& variants);
+    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, 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<folly::dynamic> parseDynamicFunctionArguments(jsi::Runtime& rt, size_t count, const jsi::Value* arguments);
     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);

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

@@ -14,11 +14,11 @@ const findShadowNodeForHandle = handle => {
   }
   return node;
 };
-HybridShadowRegistry.add = (handle, style, variants) => {
+HybridShadowRegistry.add = (handle, style, variants, args) => {
   if (!handle || !style?.__unid) {
     return;
   }
-  HybridShadowRegistry.link(findShadowNodeForHandle(handle), style, variants ?? {});
+  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","variants","__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,EAAEC,QAAQ,KAAK;EACpD,IAAI,CAACT,MAAM,IAAI,CAACQ,KAAK,EAAEE,MAAM,EAAE;IAC3B;EACJ;EAEAd,oBAAoB,CAACe,IAAI,CAACZ,uBAAuB,CAACC,MAAM,CAAC,EAAEQ,KAAK,EAAEC,QAAQ,IAAI,CAAC,CAAC,CAAC;AACrF,CAAC;AAEDb,oBAAoB,CAACgB,MAAM,GAAG,CAACZ,MAAM,EAAEQ,KAAK,KAAK;EAC7C,IAAI,CAACR,MAAM,IAAI,CAACQ,KAAK,EAAEE,MAAM,EAAE;IAC3B;EACJ;EAEAd,oBAAoB,CAACiB,MAAM,CAACd,uBAAuB,CAACC,MAAM,CAAC,EAAEQ,KAAK,CAAC;AACvE,CAAC;AAQM,MAAMM,uBAAuB,GAAAC,OAAA,CAAAD,uBAAA,GAAGlB,oBAA4D","ignoreList":[]}
+{"version":3,"names":["_reactNativeNitroModules","require","HybridShadowRegistry","NitroModules","createHybridObject","findShadowNodeForHandle","handle","node","__internalInstanceHandle","stateNode","getScrollResponder","getNativeScrollRef","Error","add","style","variants","args","__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,EAAEC,QAAQ,EAAEC,IAAI,KAAK;EAC1D,IAAI,CAACV,MAAM,IAAI,CAACQ,KAAK,EAAEG,MAAM,EAAE;IAC3B;EACJ;EAEAf,oBAAoB,CAACgB,IAAI,CAACb,uBAAuB,CAACC,MAAM,CAAC,EAAEQ,KAAK,EAAEC,QAAQ,IAAI,CAAC,CAAC,EAAEC,IAAI,IAAI,EAAE,CAAC;AACjG,CAAC;AAEDd,oBAAoB,CAACiB,MAAM,GAAG,CAACb,MAAM,EAAEQ,KAAK,KAAK;EAC7C,IAAI,CAACR,MAAM,IAAI,CAACQ,KAAK,EAAEG,MAAM,EAAE;IAC3B;EACJ;EAEAf,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/module/specs/ShadowRegistry/index.js

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

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

@@ -1 +1 @@
-{"version":3,"names":["NitroModules","HybridShadowRegistry","createHybridObject","findShadowNodeForHandle","handle","node","__internalInstanceHandle","stateNode","getScrollResponder","getNativeScrollRef","Error","add","style","variants","__unid","link","remove","unlink","UnistylesShadowRegistry"],"sourceRoot":"../../../../src","sources":["specs/ShadowRegistry/index.ts"],"mappings":";;AAAA,SAASA,YAAY,QAAQ,4BAA4B;AAazD,MAAMC,oBAAoB,GAAGD,YAAY,CAACE,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;AAEDJ,oBAAoB,CAACU,GAAG,GAAG,CAACP,MAAM,EAAEQ,KAAK,EAAEC,QAAQ,KAAK;EACpD,IAAI,CAACT,MAAM,IAAI,CAACQ,KAAK,EAAEE,MAAM,EAAE;IAC3B;EACJ;EAEAb,oBAAoB,CAACc,IAAI,CAACZ,uBAAuB,CAACC,MAAM,CAAC,EAAEQ,KAAK,EAAEC,QAAQ,IAAI,CAAC,CAAC,CAAC;AACrF,CAAC;AAEDZ,oBAAoB,CAACe,MAAM,GAAG,CAACZ,MAAM,EAAEQ,KAAK,KAAK;EAC7C,IAAI,CAACR,MAAM,IAAI,CAACQ,KAAK,EAAEE,MAAM,EAAE;IAC3B;EACJ;EAEAb,oBAAoB,CAACgB,MAAM,CAACd,uBAAuB,CAACC,MAAM,CAAC,EAAEQ,KAAK,CAAC;AACvE,CAAC;AAQD,OAAO,MAAMM,uBAAuB,GAAGjB,oBAA4D","ignoreList":[]}
+{"version":3,"names":["NitroModules","HybridShadowRegistry","createHybridObject","findShadowNodeForHandle","handle","node","__internalInstanceHandle","stateNode","getScrollResponder","getNativeScrollRef","Error","add","style","variants","args","__unid","link","remove","unlink","UnistylesShadowRegistry"],"sourceRoot":"../../../../src","sources":["specs/ShadowRegistry/index.ts"],"mappings":";;AAAA,SAASA,YAAY,QAAQ,4BAA4B;AAazD,MAAMC,oBAAoB,GAAGD,YAAY,CAACE,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;AAEDJ,oBAAoB,CAACU,GAAG,GAAG,CAACP,MAAM,EAAEQ,KAAK,EAAEC,QAAQ,EAAEC,IAAI,KAAK;EAC1D,IAAI,CAACV,MAAM,IAAI,CAACQ,KAAK,EAAEG,MAAM,EAAE;IAC3B;EACJ;EAEAd,oBAAoB,CAACe,IAAI,CAACb,uBAAuB,CAACC,MAAM,CAAC,EAAEQ,KAAK,EAAEC,QAAQ,IAAI,CAAC,CAAC,EAAEC,IAAI,IAAI,EAAE,CAAC;AACjG,CAAC;AAEDb,oBAAoB,CAACgB,MAAM,GAAG,CAACb,MAAM,EAAEQ,KAAK,KAAK;EAC7C,IAAI,CAACR,MAAM,IAAI,CAACQ,KAAK,EAAEG,MAAM,EAAE;IAC3B;EACJ;EAEAd,oBAAoB,CAACiB,MAAM,CAACf,uBAAuB,CAACC,MAAM,CAAC,EAAEQ,KAAK,CAAC;AACvE,CAAC;AAQD,OAAO,MAAMO,uBAAuB,GAAGlB,oBAA4D","ignoreList":[]}

package/lib/typescript/src/specs/ShadowRegistry/index.d.ts

@@ -1,9 +1,9 @@
 import type { UnistylesShadowRegistry as UnistylesShadowRegistrySpec } from './ShadowRegistry.nitro';
 import type { ShadowNode, Unistyle, ViewHandle } from './types';
 interface ShadowRegistry extends UnistylesShadowRegistrySpec {
-    add(handle?: ViewHandle, style?: Unistyle, variants?: Record<string, string | boolean>): void;
+    add(handle?: ViewHandle, style?: Unistyle, variants?: Record<string, string | boolean>, args?: Array<any>): void;
     remove(handle?: ViewHandle, style?: Unistyle): void;
-    link(node: ShadowNode, style: Unistyle, variants?: Record<string, string | boolean>): void;
+    link(node: ShadowNode, style: Unistyle, variants?: Record<string, string | boolean>, args?: Array<any>): void;
     unlink(node: ShadowNode, style: Unistyle): void;
 }
 type PrivateMethods = 'add' | 'remove' | 'link' | 'unlink';

package/lib/typescript/src/specs/ShadowRegistry/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/specs/ShadowRegistry/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,uBAAuB,IAAI,2BAA2B,EAAE,MAAM,wBAAwB,CAAA;AACpG,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAE/D,UAAU,cAAe,SAAQ,2BAA2B;IAExD,GAAG,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE,KAAK,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,IAAI,CAAC;IAC9F,MAAM,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE,KAAK,CAAC,EAAE,QAAQ,GAAG,IAAI,CAAC;IAEpD,IAAI,CAAC,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,IAAI,CAAC;IAC3F,MAAM,CAAC,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,QAAQ,GAAG,IAAI,CAAA;CAClD;AAiCD,KAAK,cAAc,GACb,KAAK,GACL,QAAQ,GACR,MAAM,GACN,QAAQ,CAAA;AAEd,eAAO,MAAM,uBAAuB,EAA2B,IAAI,CAAC,cAAc,EAAE,cAAc,CAAC,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/specs/ShadowRegistry/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,uBAAuB,IAAI,2BAA2B,EAAE,MAAM,wBAAwB,CAAA;AACpG,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAE/D,UAAU,cAAe,SAAQ,2BAA2B;IAExD,GAAG,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE,KAAK,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,IAAI,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;IACjH,MAAM,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE,KAAK,CAAC,EAAE,QAAQ,GAAG,IAAI,CAAC;IAEpD,IAAI,CAAC,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,IAAI,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;IAC9G,MAAM,CAAC,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,QAAQ,GAAG,IAAI,CAAA;CAClD;AAiCD,KAAK,cAAc,GACb,KAAK,GACL,QAAQ,GACR,MAAM,GACN,QAAQ,CAAA;AAEd,eAAO,MAAM,uBAAuB,EAA2B,IAAI,CAAC,cAAc,EAAE,cAAc,CAAC,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-unistyles",
-  "version": "3.0.0-alpha.8",
+  "version": "3.0.0-alpha.9",
   "description": "Level up your React Native StyleSheet",
   "scripts": {
     "test": "jest",

package/plugin/__tests__/dependencies.spec.js

@@ -51,7 +51,7 @@ pluginTester({
                         <View
                             style={styles.container}
                             ref={ref => {
-                                UnistylesShadowRegistry.add(ref, styles.container, undefined)
+                                UnistylesShadowRegistry.add(ref, styles.container, undefined, undefined)
                                 return () => UnistylesShadowRegistry.remove(ref, styles.container)
                             }}
                         >
@@ -112,7 +112,7 @@ pluginTester({
                         <View
                             style={styles.container}
                             ref={ref => {
-                                UnistylesShadowRegistry.add(ref, styles.container, undefined)
+                                UnistylesShadowRegistry.add(ref, styles.container, undefined, undefined)
                                 return () => UnistylesShadowRegistry.remove(ref, styles.container)
                             }}
                         >
@@ -167,7 +167,7 @@ pluginTester({
                         <View
                             style={styles.container}
                             ref={ref => {
-                                UnistylesShadowRegistry.add(ref, styles.container, undefined)
+                                UnistylesShadowRegistry.add(ref, styles.container, undefined, undefined)
                                 return () => UnistylesShadowRegistry.remove(ref, styles.container)
                             }}
                         >
@@ -280,7 +280,7 @@ pluginTester({
                         <View
                             style={styles.container}
                             ref={ref => {
-                                UnistylesShadowRegistry.add(ref, styles.container, undefined)
+                                UnistylesShadowRegistry.add(ref, styles.container, undefined, undefined)
                                 return () => UnistylesShadowRegistry.remove(ref, styles.container)
                             }}
                         >
@@ -405,7 +405,7 @@ pluginTester({
                         <View
                             style={styles.container}
                             ref={ref => {
-                                UnistylesShadowRegistry.add(ref, styles.container, undefined)
+                                UnistylesShadowRegistry.add(ref, styles.container, undefined, undefined)
                                 return () => UnistylesShadowRegistry.remove(ref, styles.container)
                             }}
                         >

package/plugin/__tests__/ref.spec.js

@@ -78,7 +78,7 @@ pluginTester({
                         <View
                             style={styles.container}
                             ref={ref => {
-                                UnistylesShadowRegistry.add(ref, styles.container, undefined)
+                                UnistylesShadowRegistry.add(ref, styles.container, undefined, undefined)
                                 return () => UnistylesShadowRegistry.remove(ref, styles.container)
                             }}
                         >
@@ -131,7 +131,7 @@ pluginTester({
                         <View
                             ref={_ref => {
                                 ref.current = _ref
-                                UnistylesShadowRegistry.add(_ref, styles.container, undefined)
+                                UnistylesShadowRegistry.add(_ref, styles.container, undefined, undefined)
                                 return () => UnistylesShadowRegistry.remove(_ref, styles.container)
                             }}
                             style={styles.container}
@@ -192,7 +192,7 @@ pluginTester({
                             ref={ref => {
                                 doSomething(ref)
                                 myRef.current = ref
-                                UnistylesShadowRegistry.add(ref, styles.container, undefined)
+                                UnistylesShadowRegistry.add(ref, styles.container, undefined, undefined)
                                 return () => {
                                     UnistylesShadowRegistry.remove(ref, styles.container)
                                 }
@@ -259,7 +259,7 @@ pluginTester({
                             ref={ref => {
                                 doSomething(ref)
                                 myRef.current = ref
-                                UnistylesShadowRegistry.add(ref, styles.container, undefined)
+                                UnistylesShadowRegistry.add(ref, styles.container, undefined, undefined)
                                 return () => {
                                     ;(() => {
                                         customCleanup()
@@ -333,7 +333,7 @@ pluginTester({
                         <View
                             ref={_ref => {
                                 fn(_ref)
-                                UnistylesShadowRegistry.add(_ref, styles.container, undefined)
+                                UnistylesShadowRegistry.add(_ref, styles.container, undefined, undefined)
                                 return () => {
                                     ;(() => {
                                         customCleanup2()
@@ -407,7 +407,7 @@ pluginTester({
                         <View
                             ref={_ref => {
                                 fn(_ref)
-                                UnistylesShadowRegistry.add(_ref, styles.container, undefined)
+                                UnistylesShadowRegistry.add(_ref, styles.container, undefined, undefined)
                                 return () => {
                                     ;(() => {
                                         customCleanup2()
@@ -637,7 +637,7 @@ pluginTester({
                         <View
                             ref={_ref => {
                                 myRef.current = _ref
-                                UnistylesShadowRegistry.add(_ref, styles.container, undefined)
+                                UnistylesShadowRegistry.add(_ref, styles.container, undefined, undefined)
                                 return () => UnistylesShadowRegistry.remove(_ref, styles.container)
                             }}
                             style={{
@@ -704,7 +704,7 @@ pluginTester({
                         <View
                             ref={_ref => {
                                 myRef.current = _ref
-                                UnistylesShadowRegistry.add(_ref, styles.container, undefined)
+                                UnistylesShadowRegistry.add(_ref, styles.container, undefined, undefined)
                                 return () => UnistylesShadowRegistry.remove(_ref, styles.container)
                             }}
                             style={[
@@ -766,7 +766,7 @@ pluginTester({
                         <View
                             ref={_ref => {
                                 myRef.current = _ref
-                                UnistylesShadowRegistry.add(_ref, styles.container, undefined)
+                                UnistylesShadowRegistry.add(_ref, styles.container, undefined, undefined)
                                 return () => UnistylesShadowRegistry.remove(_ref, styles.container)
                             }}
                             style={[styles.container]}
@@ -825,9 +825,7 @@ pluginTester({
                         <View
                             ref={_ref => {
                                 myRef.current = _ref
-
-                                styles.container(1, 2, _ref)
-                                UnistylesShadowRegistry.add(_ref, styles.container, undefined)
+                                UnistylesShadowRegistry.add(_ref, styles.container, undefined, [1, 2])
                                 return () => UnistylesShadowRegistry.remove(_ref, styles.container)
                             }}
                             style={[styles.container(1, 2)]}
@@ -887,9 +885,7 @@ pluginTester({
                         <View
                             ref={_ref => {
                                 myRef.current = _ref
-
-                                styles.container(1, 2, _ref)
-                                UnistylesShadowRegistry.add(_ref, styles.container, undefined)
+                                UnistylesShadowRegistry.add(_ref, styles.container, undefined, [1, 2])
                                 return () => UnistylesShadowRegistry.remove(_ref, styles.container)
                             }}
                             style={{ backgroundColor: 'red', ...styles.container(1, 2) }}
@@ -964,8 +960,7 @@ pluginTester({
                         <View
                             ref={_ref => {
                                 myRef.current = _ref
-                                uhh.dkk(_ref)
-                                UnistylesShadowRegistry.add(_ref, uhh.dkk, __uni__variants)
+                                UnistylesShadowRegistry.add(_ref, uhh.dkk, __uni__variants, [])
                                 return () => UnistylesShadowRegistry.remove(_ref, uhh.dkk)
                             }}
                             style={uhh.dkk()}
@@ -1033,8 +1028,7 @@ pluginTester({
                         <View
                             ref={_ref => {
                                 myRef.current = _ref
-                                uhh.dkk(_ref)
-                                UnistylesShadowRegistry.add(_ref, uhh.dkk, undefined)
+                                UnistylesShadowRegistry.add(_ref, uhh.dkk, undefined, [])
                                 return () => UnistylesShadowRegistry.remove(_ref, uhh.dkk)
                             }}
                             style={uhh.dkk()}
@@ -1086,24 +1080,21 @@ pluginTester({
                             <View
                                 style={styles.container(1, 5)}
                                 ref={ref => {
-                                    styles.container(1, 5, ref)
-                                    UnistylesShadowRegistry.add(ref, styles.container, undefined)
+                                    UnistylesShadowRegistry.add(ref, styles.container, undefined, [1, 5])
                                     return () => UnistylesShadowRegistry.remove(ref, styles.container)
                                 }}
                             />
                             <View
                                 style={styles.container(2, 6)}
                                 ref={ref => {
-                                    styles.container(2, 6, ref)
-                                    UnistylesShadowRegistry.add(ref, styles.container, undefined)
+                                    UnistylesShadowRegistry.add(ref, styles.container, undefined, [2, 6])
                                     return () => UnistylesShadowRegistry.remove(ref, styles.container)
                                 }}
                             />
                             <View
                                 style={styles.container(5, 1)}
                                 ref={ref => {
-                                    styles.container(5, 1, ref)
-                                    UnistylesShadowRegistry.add(ref, styles.container, undefined)
+                                    UnistylesShadowRegistry.add(ref, styles.container, undefined, [5, 1])
                                     return () => UnistylesShadowRegistry.remove(ref, styles.container)
                                 }}
                             />
@@ -1152,10 +1143,8 @@ pluginTester({
                             <View
                                 style={[styles.container(1, 5), styles.container2(1, 6)]}
                                 ref={ref => {
-                                    styles.container(1, 5, ref)
-                                    UnistylesShadowRegistry.add(ref, styles.container, undefined)
-                                    styles.container2(1, 6, ref)
-                                    UnistylesShadowRegistry.add(ref, styles.container2, undefined)
+                                    UnistylesShadowRegistry.add(ref, styles.container, undefined, [1, 5])
+                                    UnistylesShadowRegistry.add(ref, styles.container2, undefined, [1, 6])
                                     return () => {
                                         ;(() => UnistylesShadowRegistry.remove(ref, styles.container))()
                                         UnistylesShadowRegistry.remove(ref, styles.container2)

package/plugin/__tests__/stylesheet.spec.js

@@ -41,7 +41,7 @@ pluginTester({
                         <View
                             style={styles.container}
                             ref={ref => {
-                                UnistylesShadowRegistry.add(ref, styles.container, undefined)
+                                UnistylesShadowRegistry.add(ref, styles.container, undefined, undefined)
                                 return () => UnistylesShadowRegistry.remove(ref, styles.container)
                             }}
                         >
@@ -88,7 +88,7 @@ pluginTester({
                         <View
                             style={styles.container}
                             ref={ref => {
-                                UnistylesShadowRegistry.add(ref, styles.container, undefined)
+                                UnistylesShadowRegistry.add(ref, styles.container, undefined, undefined)
                                 return () => UnistylesShadowRegistry.remove(ref, styles.container)
                             }}
                         >
@@ -136,7 +136,7 @@ pluginTester({
                         <View
                             style={styles.container}
                             ref={ref => {
-                                UnistylesShadowRegistry.add(ref, styles.container, undefined)
+                                UnistylesShadowRegistry.add(ref, styles.container, undefined, undefined)
                                 return () => UnistylesShadowRegistry.remove(ref, styles.container)
                             }}
                         >
@@ -185,7 +185,7 @@ pluginTester({
                         <View
                             style={styles.container}
                             ref={ref => {
-                                UnistylesShadowRegistry.add(ref, styles.container, undefined)
+                                UnistylesShadowRegistry.add(ref, styles.container, undefined, undefined)
                                 return () => UnistylesShadowRegistry.remove(ref, styles.container)
                             }}
                         >
@@ -235,7 +235,7 @@ pluginTester({
                         <View
                             style={styles.container}
                             ref={ref => {
-                                UnistylesShadowRegistry.add(ref, styles.container, undefined)
+                                UnistylesShadowRegistry.add(ref, styles.container, undefined, undefined)
                                 return () => UnistylesShadowRegistry.remove(ref, styles.container)
                             }}
                         >
@@ -286,7 +286,7 @@ pluginTester({
                         <View
                             style={styles.container}
                             ref={ref => {
-                                UnistylesShadowRegistry.add(ref, styles.container, undefined)
+                                UnistylesShadowRegistry.add(ref, styles.container, undefined, undefined)
                                 return () => UnistylesShadowRegistry.remove(ref, styles.container)
                             }}
                         >
@@ -338,7 +338,7 @@ pluginTester({
                         <View
                             style={styles.container}
                             ref={ref => {
-                                UnistylesShadowRegistry.add(ref, styles.container, undefined)
+                                UnistylesShadowRegistry.add(ref, styles.container, undefined, undefined)
                                 return () => UnistylesShadowRegistry.remove(ref, styles.container)
                             }}
                         >
@@ -392,7 +392,7 @@ pluginTester({
                         <View
                             style={styles.container}
                             ref={ref => {
-                                UnistylesShadowRegistry.add(ref, styles.container, undefined)
+                                UnistylesShadowRegistry.add(ref, styles.container, undefined, undefined)
                                 return () => UnistylesShadowRegistry.remove(ref, styles.container)
                             }}
                         >
@@ -454,7 +454,7 @@ pluginTester({
                         <View
                             style={styles.container}
                             ref={ref => {
-                                UnistylesShadowRegistry.add(ref, styles.container, undefined)
+                                UnistylesShadowRegistry.add(ref, styles.container, undefined, undefined)
                                 return () => UnistylesShadowRegistry.remove(ref, styles.container)
                             }}
                         >

package/plugin/ref.js

@@ -20,19 +20,14 @@ function addRef(t, path, metadata, state) {
     const newRefFunction = t.arrowFunctionExpression(
         [t.identifier('ref')],
         t.blockStatement([
-            metadata.dynamicFunction ? t.expressionStatement(
-                t.callExpression(
-                    metadata.dynamicFunction.callee,
-                    metadata.dynamicFunction.arguments.concat(t.identifier('ref'))
-                )
-            ) : null,
             t.expressionStatement(
                 t.callExpression(
                     t.memberExpression(t.identifier('UnistylesShadowRegistry'), t.identifier('add')),
                     [
                         t.identifier('ref'),
                         t.memberExpression(t.identifier(metadata.styleObj), t.identifier(metadata.styleProp)),
-                        t.identifier(hasVariants ? '__uni__variants' : 'undefined')
+                        t.identifier(hasVariants ? '__uni__variants' : 'undefined'),
+                        metadata.dynamicFunction ? t.arrayExpression(metadata.dynamicFunction.arguments) : t.identifier('undefined')
                     ]
                 )
             ),
@@ -44,7 +39,7 @@ function addRef(t, path, metadata, state) {
                     )
                 )
             )
-        ].filter(Boolean))
+        ])
     )
 
     const newRefProp = t.jsxAttribute(
@@ -74,12 +69,6 @@ function overrideRef(t, path, refProp, metadata, state) {
                         t.identifier(uniqueRefName)
                     )
                 ),
-                metadata.dynamicFunction ? t.expressionStatement(
-                    t.callExpression(
-                        metadata.dynamicFunction.callee,
-                        metadata.dynamicFunction.arguments.concat(t.identifier(uniqueRefName))
-                    )
-                ) : null,
                 t.expressionStatement(
                     t.callExpression(
                         t.memberExpression(t.identifier('UnistylesShadowRegistry'), t.identifier('add')),
@@ -87,7 +76,8 @@ function overrideRef(t, path, refProp, metadata, state) {
                         [
                             t.identifier(uniqueRefName),
                             t.memberExpression(t.identifier(metadata.styleObj), t.identifier(metadata.styleProp)),
-                            t.identifier(hasVariants ? '__uni__variants' : 'undefined')
+                            t.identifier(hasVariants ? '__uni__variants' : 'undefined'),
+                            metadata.dynamicFunction ? t.arrayExpression(metadata.dynamicFunction.arguments) : t.identifier('undefined')
                         ]
                     )
                 ),
@@ -99,7 +89,7 @@ function overrideRef(t, path, refProp, metadata, state) {
                         )
                     )
                 )
-            ].filter(Boolean))
+            ])
         )
 
         refProp.value = t.jsxExpressionContainer(newRefFunction)
@@ -120,19 +110,14 @@ function overrideRef(t, path, refProp, metadata, state) {
             [t.identifier('ref')],
             t.blockStatement([
                 ...userStatements.filter(statement => !t.isReturnStatement(statement)),
-                metadata.dynamicFunction ? t.expressionStatement(
-                    t.callExpression(
-                        metadata.dynamicFunction.callee,
-                        metadata.dynamicFunction.arguments.concat(t.identifier('ref'))
-                    )
-                ) : null,
                 t.expressionStatement(
                     t.callExpression(
                         t.memberExpression(t.identifier('UnistylesShadowRegistry'), t.identifier('add')),
                         [
                             t.identifier('ref'),
                             t.memberExpression(t.identifier(metadata.styleObj), t.identifier(metadata.styleProp)),
-                            t.identifier(hasVariants ? '__uni__variants' : 'undefined')
+                            t.identifier(hasVariants ? '__uni__variants' : 'undefined'),
+                            metadata.dynamicFunction ? t.arrayExpression(metadata.dynamicFunction.arguments) : t.identifier('undefined')
                         ]
                     )
                 ),
@@ -152,7 +137,7 @@ function overrideRef(t, path, refProp, metadata, state) {
                         )
                     ]))
                 )
-            ].filter(Boolean))
+            ])
         )
 
         refProp.value = t.jsxExpressionContainer(newRefFunction)
@@ -185,19 +170,14 @@ function overrideRef(t, path, refProp, metadata, state) {
             t.expressionStatement(
                 t.callExpression(userFunctionName, [t.identifier(uniqueRefName)])
             ),
-            metadata.dynamicFunction ? t.expressionStatement(
-                t.callExpression(
-                    metadata.dynamicFunction.callee,
-                    metadata.dynamicFunction.arguments.concat(t.identifier(uniqueRefName))
-                )
-            ) : null,
             t.expressionStatement(
                 t.callExpression(
                     t.memberExpression(t.identifier('UnistylesShadowRegistry'), t.identifier('add')),
                     [
                         t.identifier(uniqueRefName),
                         t.memberExpression(t.identifier(metadata.styleObj), t.identifier(metadata.styleProp)),
-                        t.identifier(hasVariants ? '__uni__variants' : 'undefined')
+                        t.identifier(hasVariants ? '__uni__variants' : 'undefined'),
+                        metadata.dynamicFunction ? t.arrayExpression(metadata.dynamicFunction.arguments) : t.identifier('undefined')
                     ]
                 )
             ),
@@ -216,7 +196,7 @@ function overrideRef(t, path, refProp, metadata, state) {
                     )
                 ]))
             )
-        ].filter(Boolean))
+        ])
     )
 
     refProp.value = t.jsxExpressionContainer(newRefFunction)

package/src/specs/ShadowRegistry/index.ts

@@ -4,10 +4,10 @@ import type { ShadowNode, Unistyle, ViewHandle } from './types'
 
 interface ShadowRegistry extends UnistylesShadowRegistrySpec {
     // Babel API
-    add(handle?: ViewHandle, style?: Unistyle, variants?: Record<string, string | boolean>): void,
+    add(handle?: ViewHandle, style?: Unistyle, variants?: Record<string, string | boolean>, args?: Array<any>): void,
     remove(handle?: ViewHandle, style?: Unistyle): void,
     // JSI
-    link(node: ShadowNode, style: Unistyle, variants?: Record<string, string | boolean>): void,
+    link(node: ShadowNode, style: Unistyle, variants?: Record<string, string | boolean>, args?: Array<any>): void,
     unlink(node: ShadowNode, style: Unistyle): void
 }
 
@@ -26,12 +26,12 @@ const findShadowNodeForHandle = (handle: ViewHandle) => {
     return node
 }
 
-HybridShadowRegistry.add = (handle, style, variants) => {
+HybridShadowRegistry.add = (handle, style, variants, args) => {
     if (!handle || !style?.__unid) {
         return
     }
 
-    HybridShadowRegistry.link(findShadowNodeForHandle(handle), style, variants ?? {})
+    HybridShadowRegistry.link(findShadowNodeForHandle(handle), style, variants ?? {}, args ?? [])
 }
 
 HybridShadowRegistry.remove = (handle, style) => {