react-native-unistyles 3.0.0-alpha.40 → 3.0.0-alpha.41

package/android/CMakeLists.txt

@@ -34,3 +34,6 @@ set_target_properties(unistyles PROPERTIES
 
 # For React Native 0.76 and above, we don't need to link anything
 # as NitroModules will automatically add ReactAndroid::reactnative prefab
+if (ReactAndroid_VERSION_MINOR LESS 76)
+    message(FATAL_ERROR "Unistyles 3.0 requires min. React Native version to be 0.76")
+endif ()

package/android/build.gradle

@@ -79,3 +79,13 @@ dependencies {
     implementation 'com.facebook.react:react-native'
     implementation project(":react-native-nitro-modules")
 }
+
+tasks.register("checkNativeTurboUnistylesSpec") {
+    doLast {
+        if (!isNewArchitectureEnabled()) {
+            throw new GradleException("Unistyles 3.0 requires your project to have New Architecture enabled.")
+        }
+    }
+}
+
+preBuild.dependsOn checkNativeTurboUnistylesSpec

package/android/src/main/java/com/unistyles/NativePlatform+android.kt

@@ -8,6 +8,7 @@ import android.view.View
 import android.view.WindowManager
 import androidx.core.text.TextUtilsCompat
 import androidx.core.view.ViewCompat
+import androidx.core.view.WindowCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.WindowInsetsControllerCompat
 import com.facebook.react.bridge.LifecycleEventListener
@@ -279,7 +280,15 @@ class NativePlatformAndroid(private val reactContext: ReactApplicationContext):
         try {
             Class.forName("com.zoontek.rnedgetoedge.EdgeToEdgePackage")
         } catch (exception: ClassNotFoundException) {
-            throw IllegalStateException("Unistyles: react-native-edge-to-edge is not installed.")
+            enableEdgeToEdge()
+        }
+    }
+
+    private fun enableEdgeToEdge() {
+        reactContext.currentActivity?.let { activity ->
+            activity.runOnUiThread {
+                WindowCompat.setDecorFitsSystemWindows(activity.window, false)
+            }
         }
     }
 }

package/cxx/common/Constants.h

@@ -9,5 +9,6 @@ static const std::string STYLE_VARIANTS = "uni__variants";
 static const std::string WEB_STYLE_KEY = "_web";
 static const std::string EXOTIC_STYLE_KEY = "_exotic";
 static const std::string NAME_STYLE_KEY = "__unistyles_name";
+static const std::string UNI_PRESSABLE_ID = "__uni_pressable_id";
 
 }

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, std::vector<folly::dynamic>& arguments)
-        : unistyle{unistyle}, variants(std::move(variants)), dynamicFunctionMetadata{std::move(arguments)} {}
+    UnistyleData(Unistyle::Shared unistyle, const Variants& variants, std::vector<folly::dynamic>& arguments, std::optional<std::string> uniquePressableId)
+        : unistyle{unistyle}, variants(std::move(variants)), dynamicFunctionMetadata{std::move(arguments)}, pressableId{std::move(uniquePressableId)} {}
 
     UnistyleData(const UnistyleData&) = delete;
     UnistyleData(UnistyleData&& other) = delete;
@@ -18,6 +18,7 @@ struct UnistyleData {
     core::Variants variants;
     std::optional<jsi::Object> parsedStyle = std::nullopt;
     std::optional<std::vector<folly::dynamic>> dynamicFunctionMetadata = std::nullopt;
+    std::optional<std::string> pressableId = std::nullopt;
 };
 
 }

package/cxx/core/UnistylesRegistry.cpp

@@ -73,7 +73,8 @@ void core::UnistylesRegistry::linkShadowNodeWithUnistyle(
     const ShadowNodeFamily* shadowNodeFamily,
     std::vector<core::Unistyle::Shared>& unistyles,
     Variants& variants,
-    std::vector<std::vector<folly::dynamic>>& arguments
+    std::vector<std::vector<folly::dynamic>>& arguments,
+    std::optional<std::string> uniquePressableId
 ) {
     auto parser = parser::Parser(nullptr);
     shadow::ShadowLeafUpdates updates;
@@ -81,7 +82,7 @@ void core::UnistylesRegistry::linkShadowNodeWithUnistyle(
     for (size_t index = 0; index < unistyles.size(); index++) {
         Unistyle::Shared unistyle = unistyles[index];
 
-        this->_shadowRegistry[&rt][shadowNodeFamily].emplace_back(std::make_shared<UnistyleData>(unistyle, variants, arguments[index]));
+        this->_shadowRegistry[&rt][shadowNodeFamily].emplace_back(std::make_shared<UnistyleData>(unistyle, variants, arguments[index], uniquePressableId));
 
         // add or update node for shadow leaf updates
         // dynamic functions are parsed later
@@ -148,15 +149,18 @@ core::DependencyMap core::UnistylesRegistry::buildDependencyMap(jsi::Runtime& rt
 
 // called from proxied function only, we don't know host
 // so we need to rebuild all instances as they may have different variants
-void core::UnistylesRegistry::shadowLeafUpdateFromUnistyle(jsi::Runtime& rt, Unistyle::Shared unistyle) {
+void core::UnistylesRegistry::shadowLeafUpdateFromUnistyle(jsi::Runtime& rt, Unistyle::Shared unistyle, std::optional<std::string> uniquePressableId) {
     shadow::ShadowLeafUpdates updates;
     auto parser = parser::Parser(nullptr);
 
     for (const auto& [family, unistyles] : this->_shadowRegistry[&rt]) {
         for (const auto& unistyleData : unistyles) {
             if (unistyleData->unistyle == unistyle) {
-                // update state eg. for pressable
-                unistyleData->parsedStyle = jsi::Value(rt, unistyle->parsedStyle.value()).asObject(rt);
+                // special case for pressable
+                if (uniquePressableId.has_value() && unistyleData->pressableId.has_value() && uniquePressableId.value() == unistyleData->pressableId.value()) {
+                    unistyleData->parsedStyle = jsi::Value(rt, unistyle->parsedStyle.value()).asObject(rt);
+                }
+                
                 updates[family] = parser.parseStylesToShadowTreeStyles(rt, { unistyleData });
             }
         }

package/cxx/core/UnistylesRegistry.h

@@ -37,11 +37,11 @@ struct UnistylesRegistry: public StyleSheetRegistry {
     UnistylesState& getState(jsi::Runtime& rt);
     void createState(jsi::Runtime& rt);
     std::vector<std::shared_ptr<core::StyleSheet>> getStyleSheetsToRefresh(jsi::Runtime& rt, std::vector<UnistyleDependency>& unistylesDependencies);
-    void linkShadowNodeWithUnistyle(jsi::Runtime& rt, const ShadowNodeFamily*, std::vector<core::Unistyle::Shared>& unistyles, Variants& variants, std::vector<std::vector<folly::dynamic>>&);
+    void linkShadowNodeWithUnistyle(jsi::Runtime& rt, const ShadowNodeFamily*, std::vector<core::Unistyle::Shared>& unistyles, Variants& variants, std::vector<std::vector<folly::dynamic>>&, std::optional<std::string> uniquePressableId);
     void unlinkShadowNodeWithUnistyles(jsi::Runtime& rt, const ShadowNodeFamily*);
     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);
-    void shadowLeafUpdateFromUnistyle(jsi::Runtime& rt, Unistyle::Shared unistyle);
+    void shadowLeafUpdateFromUnistyle(jsi::Runtime& rt, Unistyle::Shared unistyle, std::optional<std::string> uniquePressableId);
     shadow::ShadowTrafficController trafficController{};
 
 private:

package/cxx/hybridObjects/HybridShadowRegistry.cpp

@@ -4,12 +4,15 @@ 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 == 4, "Unistyles: Invalid babel transform 'ShadowRegistry link' expected 4 arguments.");
+    helpers::assertThat(rt, count == 5, "Unistyles: Invalid babel transform 'ShadowRegistry link' expected 5 arguments.");
 
     ShadowNode::Shared shadowNodeWrapper = shadowNodeFromValue(rt, args[0]);
     std::vector<core::Unistyle::Shared> unistyleWrappers = core::unistyleFromValue(rt, args[1]);
     core::Variants variants = helpers::variantsToPairs(rt, args[2].asObject(rt));
     jsi::Array rawArguments = args[3].asObject(rt).asArray(rt);
+    std::optional<std::string> uniquePressableId = args[4].isUndefined()
+        ? std::nullopt
+        : std::make_optional<std::string>(args[4].asString(rt).utf8(rt));
     std::vector<std::vector<folly::dynamic>> arguments;
     auto& registry = core::UnistylesRegistry::get();
     
@@ -17,7 +20,7 @@ jsi::Value HybridShadowRegistry::link(jsi::Runtime &rt, const jsi::Value &thisVa
         arguments.push_back(helpers::parseDynamicFunctionArguments(rt, value.asObject(rt).asArray(rt)));
     });
     
-    registry.linkShadowNodeWithUnistyle(rt, &shadowNodeWrapper->getFamily(), unistyleWrappers, variants, arguments);
+    registry.linkShadowNodeWithUnistyle(rt, &shadowNodeWrapper->getFamily(), unistyleWrappers, variants, arguments, uniquePressableId);
 
     return jsi::Value::undefined();
 }

package/cxx/parser/Parser.cpp

@@ -210,6 +210,7 @@ void parser::Parser::rebuildShadowLeafUpdates(jsi::Runtime& rt, core::Dependency
     auto& registry = core::UnistylesRegistry::get();
 
     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::move(rawProps));
@@ -333,6 +334,26 @@ jsi::Object parser::Parser::parseFirstLevel(jsi::Runtime& rt, Unistyle::Shared u
     return parsedStyle;
 }
 
+std::optional<std::string> parser::Parser::getUniquePressableIdFromArguments(jsi::Runtime& rt, const jsi::Value* args, size_t count) {
+    if (count == 0) {
+        return std::nullopt;
+    }
+
+    auto& lastArg = args[count - 1];
+
+    if (!lastArg.isObject()) {
+        return std::nullopt;
+    }
+
+    auto lastArgObj = lastArg.asObject(rt);
+
+    if (!lastArgObj.hasProperty(rt, helpers::UNI_PRESSABLE_ID.c_str())) {
+        return std::nullopt;
+    }
+
+    return lastArgObj.getProperty(rt, helpers::UNI_PRESSABLE_ID.c_str()).asString(rt).utf8(rt);
+}
+
 // function replaces original user dynamic function with additional logic to memoize arguments
 jsi::Function parser::Parser::createDynamicFunctionProxy(jsi::Runtime& rt, Unistyle::Shared unistyle) {
     auto unistylesRuntime = this->_unistylesRuntime;
@@ -371,13 +392,13 @@ jsi::Function parser::Parser::createDynamicFunctionProxy(jsi::Runtime& rt, Unist
             // update shadow leaf updates to indicate newest changes
             auto& registry = core::UnistylesRegistry::get();
 
-            registry.shadowLeafUpdateFromUnistyle(rt, unistyle);
+            registry.shadowLeafUpdateFromUnistyle(rt, unistyle, getUniquePressableIdFromArguments(rt, args, count));
 
             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.");
 
@@ -640,7 +661,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;

package/cxx/parser/Parser.h

@@ -43,6 +43,7 @@ private:
     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);
+    std::optional<std::string> getUniquePressableIdFromArguments(jsi::Runtime& rt, const jsi::Value* args, size_t count);
     bool isColor(const std::string& propertyName);
 
     std::shared_ptr<HybridUnistylesRuntime> _unistylesRuntime;

package/cxx/shadowTree/ShadowLeafUpdate.h

@@ -9,6 +9,7 @@ namespace margelo::nitro::unistyles::shadow {
 using namespace facebook;
 using namespace facebook::react;
 
+// translates Unistyles changes to unified shadow tree changes
 using ShadowLeafUpdates = std::unordered_map<const ShadowNodeFamily*, folly::dynamic>;
 
 }

package/cxx/shadowTree/ShadowTreeManager.cpp

@@ -109,6 +109,10 @@ ShadowNode::Unshared shadow::ShadowTreeManager::cloneShadowTree(const ShadowNode
             *shadowNode.getContextContainer()
         };
 
+        // 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);

package/ios/Extensions.swift

@@ -1,11 +1,13 @@
 import Foundation
 
 extension UIColor {
+    // int is universal way of color representation
+    // iOS API expects UIColor, so we need to translate it
     public static func fromInt(_ color: Int) -> UIColor {
         let red = CGFloat((color >> 16) & 0xFF) / 255.0
         let green = CGFloat((color >> 8) & 0xFF) / 255.0
         let blue = CGFloat(color & 0xFF) / 255.0
-        
+
         return UIColor(red: red, green: green, blue: blue, alpha: 1.0)
     }
 }

package/ios/NativePlatform+ios.swift

@@ -187,11 +187,22 @@ class NativeIOSPlatform: HybridNativePlatformSpec {
             return getContentSizeCategoryFn()
         }
     }
+    
+    func getMainWindow() -> UIWindow? {
+        guard let mainWindow = UIApplication.shared.connectedScenes
+            .compactMap({ $0 as? UIWindowScene })
+            .flatMap({ $0.windows })
+            .first(where: { $0.isKeyWindow }) else {
+            return nil
+        }
+        
+        return mainWindow
+    }
 
     // todo handle IME animation
     func getInsets() -> Insets {
         func getInsetsFn() -> Insets {
-            guard let window = UIApplication.shared.windows.first else {
+            guard let window = getMainWindow() else {
                 // this should never happen, but it's better to return zeros
                 return Insets(top: 0, bottom: 0, left: 0, right: 0, ime: 0)
             }
@@ -235,7 +246,7 @@ class NativeIOSPlatform: HybridNativePlatformSpec {
 
     func getStatusBarDimensions() -> Dimensions {
         func getStatusBarDimensionsFn() -> Dimensions {
-            guard let window = UIApplication.shared.windows.first,
+            guard let window = getMainWindow(),
                   let statusBarManager = window.windowScene?.statusBarManager else {
                 // this should never happen, but it's better to return defaults
                 return Dimensions(width: 0, height: 0)

package/ios/NativePlatformListener+ios.swift

@@ -4,7 +4,6 @@ extension NativeIOSPlatform {
     func setupPlatformListeners() {
         NotificationCenter.default.publisher(for: NSNotification.Name("RCTWindowFrameDidChangeNotification"))
             // add small delay (10ms) to make sure all values are up ot date
-            // we MUST call it on current thread, otherwise random crashes occurs
             .delay(for: .milliseconds(10), scheduler: RunLoop.current)
             .sink { [weak self] notification in
                 self?.onWindowChange(notification)

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

@@ -14,7 +14,7 @@ const findShadowNodeForHandle = handle => {
   }
   return node;
 };
-HybridShadowRegistry.add = (handle, styles, variants, args) => {
+HybridShadowRegistry.add = (handle, styles, variants, args, uniquePressableId) => {
   // virtualized nodes can be null
   if (!handle || !styles || !Array.isArray(styles)) {
     return;
@@ -22,7 +22,7 @@ HybridShadowRegistry.add = (handle, styles, variants, args) => {
 
   // filter Reanimated styles and styles that are undefined
   const filteredStyles = styles.filter(style => !style?.initial?.updater).filter(Boolean);
-  HybridShadowRegistry.link(findShadowNodeForHandle(handle), filteredStyles, variants ?? {}, args ?? []);
+  HybridShadowRegistry.link(findShadowNodeForHandle(handle), filteredStyles, variants ?? {}, args ?? [], uniquePressableId);
 };
 HybridShadowRegistry.remove = handle => {
   if (!handle) {

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","styles","variants","args","Array","isArray","filteredStyles","filter","style","initial","updater","Boolean","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,MAAM,EAAEC,QAAQ,EAAEC,IAAI,KAAK;EAC3D;EACA,IAAI,CAACV,MAAM,IAAI,CAACQ,MAAM,IAAI,CAACG,KAAK,CAACC,OAAO,CAACJ,MAAM,CAAC,EAAE;IAC9C;EACJ;;EAEA;EACA,MAAMK,cAAc,GAAGL,MAAM,CACxBM,MAAM,CAACC,KAAK,IAAI,CAACA,KAAK,EAAEC,OAAO,EAAEC,OAAO,CAAC,CACzCH,MAAM,CAACI,OAAO,CAAC;EAEpBtB,oBAAoB,CAACuB,IAAI,CAACpB,uBAAuB,CAACC,MAAM,CAAC,EAAEa,cAAc,EAAEJ,QAAQ,IAAI,CAAC,CAAC,EAAEC,IAAI,IAAI,EAAE,CAAC;AAC1G,CAAC;AAEDd,oBAAoB,CAACwB,MAAM,GAAGpB,MAAM,IAAI;EACpC,IAAI,CAACA,MAAM,EAAE;IACT;EACJ;EAEAJ,oBAAoB,CAACyB,MAAM,CAACtB,uBAAuB,CAACC,MAAM,CAAC,CAAC;AAChE,CAAC;AAQM,MAAMsB,uBAAuB,GAAAC,OAAA,CAAAD,uBAAA,GAAG1B,oBAA4D","ignoreList":[]}
+{"version":3,"names":["_reactNativeNitroModules","require","HybridShadowRegistry","NitroModules","createHybridObject","findShadowNodeForHandle","handle","node","__internalInstanceHandle","stateNode","getScrollResponder","getNativeScrollRef","Error","add","styles","variants","args","uniquePressableId","Array","isArray","filteredStyles","filter","style","initial","updater","Boolean","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,MAAM,EAAEC,QAAQ,EAAEC,IAAI,EAAEC,iBAAiB,KAAK;EAC9E;EACA,IAAI,CAACX,MAAM,IAAI,CAACQ,MAAM,IAAI,CAACI,KAAK,CAACC,OAAO,CAACL,MAAM,CAAC,EAAE;IAC9C;EACJ;;EAEA;EACA,MAAMM,cAAc,GAAGN,MAAM,CACxBO,MAAM,CAACC,KAAK,IAAI,CAACA,KAAK,EAAEC,OAAO,EAAEC,OAAO,CAAC,CACzCH,MAAM,CAACI,OAAO,CAAC;EAEpBvB,oBAAoB,CAACwB,IAAI,CAACrB,uBAAuB,CAACC,MAAM,CAAC,EAAEc,cAAc,EAAEL,QAAQ,IAAI,CAAC,CAAC,EAAEC,IAAI,IAAI,EAAE,EAAEC,iBAAiB,CAAC;AAC7H,CAAC;AAEDf,oBAAoB,CAACyB,MAAM,GAAGrB,MAAM,IAAI;EACpC,IAAI,CAACA,MAAM,EAAE;IACT;EACJ;EAEAJ,oBAAoB,CAAC0B,MAAM,CAACvB,uBAAuB,CAACC,MAAM,CAAC,CAAC;AAChE,CAAC;AAQM,MAAMuB,uBAAuB,GAAAC,OAAA,CAAAD,uBAAA,GAAG3B,oBAA4D","ignoreList":[]}

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

@@ -10,7 +10,7 @@ const findShadowNodeForHandle = handle => {
   }
   return node;
 };
-HybridShadowRegistry.add = (handle, styles, variants, args) => {
+HybridShadowRegistry.add = (handle, styles, variants, args, uniquePressableId) => {
   // virtualized nodes can be null
   if (!handle || !styles || !Array.isArray(styles)) {
     return;
@@ -18,7 +18,7 @@ HybridShadowRegistry.add = (handle, styles, variants, args) => {
 
   // filter Reanimated styles and styles that are undefined
   const filteredStyles = styles.filter(style => !style?.initial?.updater).filter(Boolean);
-  HybridShadowRegistry.link(findShadowNodeForHandle(handle), filteredStyles, variants ?? {}, args ?? []);
+  HybridShadowRegistry.link(findShadowNodeForHandle(handle), filteredStyles, variants ?? {}, args ?? [], uniquePressableId);
 };
 HybridShadowRegistry.remove = handle => {
   if (!handle) {

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","styles","variants","args","Array","isArray","filteredStyles","filter","style","initial","updater","Boolean","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,MAAM,EAAEC,QAAQ,EAAEC,IAAI,KAAK;EAC3D;EACA,IAAI,CAACV,MAAM,IAAI,CAACQ,MAAM,IAAI,CAACG,KAAK,CAACC,OAAO,CAACJ,MAAM,CAAC,EAAE;IAC9C;EACJ;;EAEA;EACA,MAAMK,cAAc,GAAGL,MAAM,CACxBM,MAAM,CAACC,KAAK,IAAI,CAACA,KAAK,EAAEC,OAAO,EAAEC,OAAO,CAAC,CACzCH,MAAM,CAACI,OAAO,CAAC;EAEpBrB,oBAAoB,CAACsB,IAAI,CAACpB,uBAAuB,CAACC,MAAM,CAAC,EAAEa,cAAc,EAAEJ,QAAQ,IAAI,CAAC,CAAC,EAAEC,IAAI,IAAI,EAAE,CAAC;AAC1G,CAAC;AAEDb,oBAAoB,CAACuB,MAAM,GAAGpB,MAAM,IAAI;EACpC,IAAI,CAACA,MAAM,EAAE;IACT;EACJ;EAEAH,oBAAoB,CAACwB,MAAM,CAACtB,uBAAuB,CAACC,MAAM,CAAC,CAAC;AAChE,CAAC;AAQD,OAAO,MAAMsB,uBAAuB,GAAGzB,oBAA4D","ignoreList":[]}
+{"version":3,"names":["NitroModules","HybridShadowRegistry","createHybridObject","findShadowNodeForHandle","handle","node","__internalInstanceHandle","stateNode","getScrollResponder","getNativeScrollRef","Error","add","styles","variants","args","uniquePressableId","Array","isArray","filteredStyles","filter","style","initial","updater","Boolean","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,MAAM,EAAEC,QAAQ,EAAEC,IAAI,EAAEC,iBAAiB,KAAK;EAC9E;EACA,IAAI,CAACX,MAAM,IAAI,CAACQ,MAAM,IAAI,CAACI,KAAK,CAACC,OAAO,CAACL,MAAM,CAAC,EAAE;IAC9C;EACJ;;EAEA;EACA,MAAMM,cAAc,GAAGN,MAAM,CACxBO,MAAM,CAACC,KAAK,IAAI,CAACA,KAAK,EAAEC,OAAO,EAAEC,OAAO,CAAC,CACzCH,MAAM,CAACI,OAAO,CAAC;EAEpBtB,oBAAoB,CAACuB,IAAI,CAACrB,uBAAuB,CAACC,MAAM,CAAC,EAAEc,cAAc,EAAEL,QAAQ,IAAI,CAAC,CAAC,EAAEC,IAAI,IAAI,EAAE,EAAEC,iBAAiB,CAAC;AAC7H,CAAC;AAEDd,oBAAoB,CAACwB,MAAM,GAAGrB,MAAM,IAAI;EACpC,IAAI,CAACA,MAAM,EAAE;IACT;EACJ;EAEAH,oBAAoB,CAACyB,MAAM,CAACvB,uBAAuB,CAACC,MAAM,CAAC,CAAC;AAChE,CAAC;AAQD,OAAO,MAAMuB,uBAAuB,GAAG1B,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, styles?: Array<Unistyle>, variants?: Record<string, string | boolean>, args?: Array<Array<any>>): void;
+    add(handle?: ViewHandle, styles?: Array<Unistyle>, variants?: Record<string, string | boolean>, args?: Array<Array<any>>, uniquePressableId?: string): void;
     remove(handle?: ViewHandle): void;
-    link(node: ShadowNode, styles?: Array<Unistyle>, variants?: Record<string, string | boolean>, args?: Array<Array<any>>): void;
+    link(node: ShadowNode, styles?: Array<Unistyle>, variants?: Record<string, string | boolean>, args?: Array<Array<any>>, uniquePressableId?: string): void;
     unlink(node: ShadowNode): 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,MAAM,CAAC,EAAE,KAAK,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,IAAI,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC;IAChI,MAAM,CAAC,MAAM,CAAC,EAAE,UAAU,GAAG,IAAI,CAAC;IAElC,IAAI,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,CAAC,EAAE,KAAK,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,IAAI,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC;IAC9H,MAAM,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI,CAAA;CACjC;AAuCD,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,MAAM,CAAC,EAAE,KAAK,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,IAAI,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,iBAAiB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5J,MAAM,CAAC,MAAM,CAAC,EAAE,UAAU,GAAG,IAAI,CAAC;IAElC,IAAI,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,CAAC,EAAE,KAAK,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,IAAI,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,iBAAiB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1J,MAAM,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI,CAAA;CACjC;AAuCD,KAAK,cAAc,GACb,KAAK,GACL,QAAQ,GACR,MAAM,GACN,QAAQ,CAAA;AAEd,eAAO,MAAM,uBAAuB,EAA2B,IAAI,CAAC,cAAc,EAAE,cAAc,CAAC,CAAA"}

package/nitrogen/generated/ios/Unistyles-Swift-Cxx-Umbrella.hpp

@@ -43,7 +43,7 @@ namespace margelo::nitro::unistyles { struct UnistylesNativeMiniRuntime; }
 #include <NitroModules/ArrayBufferHolder.hpp>
 #include <NitroModules/AnyMapHolder.hpp>
 #include <NitroModules/HybridContext.hpp>
-#include <NitroModules/PromiseHolder.hpp>
+#include <NitroModules/RuntimeError.hpp>
 
 // Forward declarations of Swift defined types
 // Forward declaration of `HybridNativePlatformSpecCxx` to properly resolve imports.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-unistyles",
-  "version": "3.0.0-alpha.40",
+  "version": "3.0.0-alpha.41",
   "description": "Level up your React Native StyleSheet",
   "scripts": {
     "test": "jest",
@@ -74,11 +74,11 @@
     "husky": "9.1.6",
     "jest": "29.7.0",
     "metro-react-native-babel-preset": "0.77.0",
-    "nitro-codegen": "0.16.2",
+    "nitro-codegen": "0.17.0",
     "react": "18.3.1",
     "react-native": "0.76.0",
     "react-native-builder-bob": "0.30.2",
-    "react-native-nitro-modules": "0.16.2",
+    "react-native-nitro-modules": "0.17.0",
     "react-test-renderer": "18.3.1",
     "release-it": "17.10.0",
     "typescript": "5.6.3"

package/plugin/index.js

@@ -128,9 +128,9 @@ module.exports = function ({ types: t }) {
                     return
                 }
 
-                if (openingElementName === 'Pressable') {
-                    handlePressable(t, path, styleAttr, metadata)
-                }
+                const uniquePressableId = openingElementName === 'Pressable'
+                    ? handlePressable(t, path, styleAttr, metadata)
+                    : undefined
 
                 styleAttributeToArray(t, path)
 
@@ -144,8 +144,8 @@ module.exports = function ({ types: t }) {
                 }
 
                 refProp
-                    ? overrideRef(t, path, refProp, metadata, state)
-                    : addRef(t, path, metadata, state)
+                    ? overrideRef(t, path, refProp, metadata, state, uniquePressableId)
+                    : addRef(t, path, metadata, state, uniquePressableId)
             },
             CallExpression(path, state) {
                 if (isUsingVariants(t, path)) {

package/plugin/ref.js

@@ -1,5 +1,9 @@
 const { PRESSABLE_STATE_NAME } = require('./common')
 
+function generateUniqueId() {
+    return `${Math.random().toString(36).substring(2, 9)}`
+}
+
 function getRefProp(t, path) {
     return path.node.openingElement.attributes.find(attr =>
         t.isJSXAttribute(attr) &&
@@ -90,7 +94,8 @@ function arrayFromDynamicFunctionArgs(t, metadata, path) {
 
     return t.arrayExpression(memberExpressions)
 }
-function addRef(t, path, metadata, state) {
+
+function addRef(t, path, metadata, state, uniquePressableId) {
     const hasVariants = state.file.hasVariants
 
     const newRefFunction = t.arrowFunctionExpression(
@@ -103,8 +108,9 @@ function addRef(t, path, metadata, state) {
                         t.identifier('ref'),
                         arrayExpressionFromMetadata(t, metadata),
                         t.identifier(hasVariants ? '__uni__variants' : 'undefined'),
-                        arrayFromDynamicFunctionArgs(t, metadata, path)
-                    ]
+                        arrayFromDynamicFunctionArgs(t, metadata, path),
+                        uniquePressableId ? t.stringLiteral(uniquePressableId) : undefined
+                    ].filter(Boolean)
                 )
             ),
             t.returnStatement(
@@ -126,7 +132,7 @@ function addRef(t, path, metadata, state) {
     path.node.openingElement.attributes.push(newRefProp)
 }
 
-function overrideRef(t, path, refProp, metadata, state) {
+function overrideRef(t, path, refProp, metadata, state, uniquePressableId) {
     const hasVariants = state.file.hasVariants
     const uniqueRefName = path.scope.generateUidIdentifier('ref').name
     const isIdentifier = t.isIdentifier(refProp.value.expression)
@@ -152,8 +158,9 @@ function overrideRef(t, path, refProp, metadata, state) {
                             t.identifier(uniqueRefName),
                             arrayExpressionFromMetadata(t, metadata),
                             t.identifier(hasVariants ? '__uni__variants' : 'undefined'),
-                            arrayFromDynamicFunctionArgs(t, metadata, path)
-                        ]
+                            arrayFromDynamicFunctionArgs(t, metadata, path),
+                            uniquePressableId ? t.stringLiteral(uniquePressableId) : undefined
+                        ].filter(Boolean)
                     )
                 ),
                 t.returnStatement(
@@ -197,8 +204,9 @@ function overrideRef(t, path, refProp, metadata, state) {
                             t.identifier(userRefName),
                             arrayExpressionFromMetadata(t, metadata),
                             t.identifier(hasVariants ? '__uni__variants' : 'undefined'),
-                            arrayFromDynamicFunctionArgs(t, metadata, path)
-                        ]
+                            arrayFromDynamicFunctionArgs(t, metadata, path),
+                            uniquePressableId ? t.stringLiteral(uniquePressableId) : undefined
+                        ].filter(Boolean)
                     )
                 ),
                 // Merged cleanup function
@@ -259,8 +267,9 @@ function overrideRef(t, path, refProp, metadata, state) {
                         t.identifier(uniqueRefName),
                         arrayExpressionFromMetadata(t, metadata),
                         t.identifier(hasVariants ? '__uni__variants' : 'undefined'),
-                        arrayFromDynamicFunctionArgs(t, metadata, path)
-                    ]
+                        arrayFromDynamicFunctionArgs(t, metadata, path),
+                        uniquePressableId ? t.stringLiteral(uniquePressableId) : undefined
+                    ].filter(Boolean)
                 )
             ),
             t.returnStatement(
@@ -291,5 +300,6 @@ module.exports = {
     getRefProp,
     addRef,
     overrideRef,
-    hasStringRef
+    hasStringRef,
+    generateUniqueId
 }

package/plugin/style.js

@@ -1,4 +1,5 @@
 const { PRESSABLE_STATE_NAME } = require('./common')
+const { generateUniqueId } = require('./ref')
 
 function getStyleMetadata(t, node, dynamicFunction = null) {
     // {styles.container}
@@ -143,6 +144,8 @@ function handlePressable(t, path, styleAttr, metadata) {
             t.identifier(members[0])
         )
 
+        const uniquePressableId = generateUniqueId()
+
         // state => typeof style.pressable === 'function' ? style.pressable(state) : style.pressable
         styleAttr.value.expression = t.arrowFunctionExpression(
             [t.identifier("state")],
@@ -157,13 +160,18 @@ function handlePressable(t, path, styleAttr, metadata) {
                 ),
                 t.callExpression(
                     stylePath,
-                    [t.identifier("state")]
+                    [t.identifier("state"), t.objectExpression([
+                        t.objectProperty(
+                            t.identifier("__uni_pressable_id"),
+                            t.stringLiteral(uniquePressableId)
+                        )
+                    ])]
                 ),
                 stylePath
             )
         )
 
-        return
+        return uniquePressableId
     }
 
     // {style.pressable(1, 2)}
@@ -212,8 +220,19 @@ function handlePressable(t, path, styleAttr, metadata) {
             return arg
         })
 
+        const uniquePressableId = generateUniqueId()
+
+        args.arguments.push(t.objectExpression([
+            t.objectProperty(
+                t.identifier("__uni_pressable_id"),
+                t.stringLiteral(uniquePressableId)
+            )
+        ]))
+
         // update arrow function arg name
         styleExpression.params[0].name = PRESSABLE_STATE_NAME
+
+        return uniquePressableId
     }
 }
 

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, styles?: Array<Unistyle>, variants?: Record<string, string | boolean>, args?: Array<Array<any>>): void,
+    add(handle?: ViewHandle, styles?: Array<Unistyle>, variants?: Record<string, string | boolean>, args?: Array<Array<any>>, uniquePressableId?: string): void,
     remove(handle?: ViewHandle): void,
     // JSI
-    link(node: ShadowNode, styles?: Array<Unistyle>, variants?: Record<string, string | boolean>, args?: Array<Array<any>>): void,
+    link(node: ShadowNode, styles?: Array<Unistyle>, variants?: Record<string, string | boolean>, args?: Array<Array<any>>, uniquePressableId?: string): void,
     unlink(node: ShadowNode): void
 }
 
@@ -26,7 +26,7 @@ const findShadowNodeForHandle = (handle: ViewHandle) => {
     return node
 }
 
-HybridShadowRegistry.add = (handle, styles, variants, args) => {
+HybridShadowRegistry.add = (handle, styles, variants, args, uniquePressableId) => {
     // virtualized nodes can be null
     if (!handle || !styles || !Array.isArray(styles)) {
         return
@@ -37,7 +37,7 @@ HybridShadowRegistry.add = (handle, styles, variants, args) => {
         .filter(style => !style?.initial?.updater)
         .filter(Boolean)
 
-    HybridShadowRegistry.link(findShadowNodeForHandle(handle), filteredStyles, variants ?? {}, args ?? [])
+    HybridShadowRegistry.link(findShadowNodeForHandle(handle), filteredStyles, variants ?? {}, args ?? [], uniquePressableId)
 }
 
 HybridShadowRegistry.remove = handle => {