react-native-unistyles 3.2.1 → 3.2.3

package/cxx/core/UnistylesRegistry.cpp

@@ -61,34 +61,31 @@ void core::UnistylesRegistry::updateTheme(jsi::Runtime& rt, std::string& themeNa
 void core::UnistylesRegistry::linkShadowNodeWithUnistyle(
     jsi::Runtime& rt,
     const ShadowNodeFamily* shadowNodeFamily,
-    std::vector<std::shared_ptr<UnistyleData>>& unistylesData
+    std::vector<std::shared_ptr<UnistyleData>>& unistylesData,
+    std::optional<folly::dynamic> initialScopedUpdate
 ) {
-    this->trafficController.withLock([this, &rt, &unistylesData, shadowNodeFamily](){
+    this->trafficController.withLock([this, &rt, &unistylesData, shadowNodeFamily, &initialScopedUpdate](){
         // Clear suspension state if this family was previously suspended
         if (_suspendedFamilies.erase(shadowNodeFamily) > 0) {
             auto* mutableFamily = const_cast<ShadowNodeFamily*>(shadowNodeFamily);
             mutableFamily->nativeProps_DEPRECATED.reset();
+            // Clear old registry entries to prevent stale UnistyleData accumulation
+            this->_shadowRegistry.erase(shadowNodeFamily);
+            // Remove any stale traffic controller entry (e.g. from a theme change during suspension)
+            this->trafficController.removeShadowNode(shadowNodeFamily);
         }
 
-        shadow::ShadowLeafUpdates updates;
-        auto parser = parser::Parser(nullptr);
-
         std::for_each(unistylesData.begin(), unistylesData.end(), [this, shadowNodeFamily](std::shared_ptr<UnistyleData> unistyleData){
             this->_shadowRegistry[shadowNodeFamily].emplace_back(unistyleData);
         });
 
-        updates[shadowNodeFamily] = parser.parseStylesToShadowTreeStyles(rt, unistylesData);
-
-        auto* mutableFamily = const_cast<ShadowNodeFamily*>(shadowNodeFamily);
+        // Required for scoped themes to apply on initial mount
+        if (initialScopedUpdate.has_value()) {
+            shadow::ShadowLeafUpdates updates;
 
-        if (mutableFamily->nativeProps_DEPRECATED) {
-            mutableFamily->nativeProps_DEPRECATED->update(updates[shadowNodeFamily]);
-        } else {
-            mutableFamily->nativeProps_DEPRECATED = std::make_unique<folly::dynamic>(updates[shadowNodeFamily]);
+            updates.emplace(shadowNodeFamily, std::move(*initialScopedUpdate));
+            this->trafficController.setUpdates(updates);
         }
-
-        this->trafficController.setUpdates(updates);
-        this->trafficController.resumeUnistylesTraffic();
     });
 }
 

package/cxx/core/UnistylesRegistry.h

@@ -40,7 +40,7 @@ struct UnistylesRegistry: public StyleSheetRegistry {
     UnistylesState& getState();
     void createState();
     std::vector<std::shared_ptr<core::StyleSheet>> getStyleSheetsToRefresh(std::vector<UnistyleDependency>& unistylesDependencies);
-    void linkShadowNodeWithUnistyle(jsi::Runtime& rt, const ShadowNodeFamily*, std::vector<std::shared_ptr<UnistyleData>>& unistylesData);
+    void linkShadowNodeWithUnistyle(jsi::Runtime& rt, const ShadowNodeFamily*, std::vector<std::shared_ptr<UnistyleData>>& unistylesData, std::optional<folly::dynamic> initialScopedUpdate = std::nullopt);
     void unlinkShadowNodeWithUnistyles(const ShadowNodeFamily*);
     void suspendShadowNode(const ShadowNodeFamily*);
     bool isSuspended(const ShadowNodeFamily*) const noexcept;

package/cxx/hybridObjects/HybridShadowRegistry.cpp

@@ -13,10 +13,13 @@ jsi::Value HybridShadowRegistry::link(jsi::Runtime &rt, const jsi::Value &thisVa
     auto& registry = core::UnistylesRegistry::get();
 
     // this is special case for Animated, and prevents appending same unistyles to node
-    registry.removeDuplicatedUnistyles(&shadowNodeWrapper->getFamily(), unistyleWrappers);
+    // skip for suspended families - they need a full re-link with fresh UnistyleData
+    if (!registry.isSuspended(&shadowNodeWrapper->getFamily())) {
+        registry.removeDuplicatedUnistyles(&shadowNodeWrapper->getFamily(), unistyleWrappers);
 
-    if (unistyleWrappers.empty()) {
-        return jsi::Value::undefined();
+        if (unistyleWrappers.empty()) {
+            return jsi::Value::undefined();
+        }
     }
 
     for (size_t i = 0; i < unistyleWrappers.size(); i++) {
@@ -91,10 +94,17 @@ jsi::Value HybridShadowRegistry::link(jsi::Runtime &rt, const jsi::Value &thisVa
         unistylesData.emplace_back(unistyleData);
     }
 
+    std::optional<folly::dynamic> initialScopedUpdate;
+
+    if (scopedTheme.has_value()) {
+        initialScopedUpdate = parser.parseStylesToShadowTreeStyles(rt, unistylesData);
+    }
+
     registry.linkShadowNodeWithUnistyle(
         rt,
         &shadowNodeWrapper->getFamily(),
-        unistylesData
+        unistylesData,
+        std::move(initialScopedUpdate)
     );
 
     return jsi::Value::undefined();

package/nitrogen/generated/ios/Unistyles+autolinking.rb

@@ -56,5 +56,7 @@ def add_nitrogen_files(spec)
     "SWIFT_OBJC_INTEROP_MODE" => "objcxx",
     # Enables stricter modular headers
     "DEFINES_MODULE" => "YES",
+    # Disable auto-generated ObjC header for Swift (Static linkage on Xcode 26.4 breaks here)
+    "SWIFT_INSTALL_OBJC_HEADER" => "NO",
   })
 end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-unistyles",
-  "version": "3.2.1",
+  "version": "3.2.3",
   "description": "Level up your React Native StyleSheet",
   "scripts": {
     "test": "NODE_ENV=babel-test jest ./plugin ./src/__tests__",
@@ -145,13 +145,13 @@
     "@babel/plugin-syntax-jsx": "7.28.6",
     "@babel/runtime": "7.28.6",
     "@react-native/babel-preset": "0.83.2",
-    "nitrogen": "0.35.2",
+    "nitrogen": "0.35.4",
     "oxfmt": "0.35.0",
     "oxlint": "1.50.0",
     "react": "19.2.0",
     "react-native": "0.83.2",
     "react-native-builder-bob": "0.40.18",
-    "react-native-nitro-modules": "0.35.2",
+    "react-native-nitro-modules": "0.35.4",
     "react-native-reanimated": "4.2.2",
     "react-native-web": "0.21.2",
     "typescript": "5.9.3"