react-native-unistyles 3.2.3 → 3.2.4

package/README.md

@@ -76,9 +76,6 @@ Then follow [installation guides](https://unistyl.es/v3/start/getting-started) f
 <a href="https://github.com/AdiRishi">
      <img src="https://avatars.githubusercontent.com/u/8351234?v=4" height="70px" width="70px" alt="AdiRishi" />
 </a>
-<a href="https://github.com/cybercarrot">
-     <img src="https://avatars.githubusercontent.com/u/6837094?v=4" height="70px" width="70px" alt="cybercarrot" />
-</a>
 
 
 ## Past sponsors
@@ -155,6 +152,9 @@ Then follow [installation guides](https://unistyl.es/v3/start/getting-started) f
 <a href="https://github.com/biw">
      <img src="https://avatars.githubusercontent.com/u/6139501?v=4" height="60px" width="60px" alt="biw" />
 </a>
+<a href="https://github.com/cybercarrot">
+     <img src="https://avatars.githubusercontent.com/u/6837094?v=4" height="60px" width="60px" alt="cybercarrot" />
+</a>
 
 ## Sponsor my work
 

package/cxx/core/UnistyleWrapper.h

@@ -158,8 +158,29 @@ inline static jsi::Value objectFromUnistyle(jsi::Runtime& rt, std::shared_ptr<Hy
     ) {
         auto& registry = UnistylesRegistry::get();
         auto unistyle = registry.getUnistyleById(unistyleID);
+        auto scopedTheme = registry.getScopedTheme();
+        parser::Parser parser(unistylesRuntime);
 
-        parser::Parser(unistylesRuntime).rebuildUnistyle(rt, unistyle, variants, parsedArguments);
+        // scoped theme path — parse with scope so `withUnistyles`-wrapped
+        // components inside <ScopedTheme> reflect the scope instead of the global theme
+        if (scopedTheme.has_value() && unistyle->styleKey != helpers::EXOTIC_STYLE_KEY) {
+            std::vector<folly::dynamic> scopedArguments = parsedArguments.has_value()
+                ? parsedArguments.value()
+                : std::vector<folly::dynamic>{};
+
+            auto unistyleData = std::make_shared<UnistyleData>(unistyle, variants, scopedArguments, scopedTheme);
+            auto parsedStyleSheet = parser.getParsedStyleSheetForScopedTheme(rt, unistyle, scopedTheme.value());
+
+            if (!parsedStyleSheet.isUndefined()) {
+                parser.rebuildUnistyleWithScopedTheme(rt, parsedStyleSheet, unistyleData);
+
+                if (unistyleData->parsedStyle.has_value()) {
+                    return jsi::Value(rt, unistyleData->parsedStyle.value()).asObject(rt);
+                }
+            }
+        }
+
+        parser.rebuildUnistyle(rt, unistyle, variants, parsedArguments);
 
         return jsi::Value(rt, unistyle->parsedStyle.value()).asObject(rt);
     });

package/cxx/hybridObjects/HybridStyleSheet.cpp

@@ -271,32 +271,9 @@ void HybridStyleSheet::onPlatformDependenciesChange(std::vector<UnistyleDependen
             return;
         }
 
-        auto& registry = core::UnistylesRegistry::get();
-        auto parser = parser::Parser(self->_unistylesRuntime);
         auto unistyleDependencies = dependencies;
-        auto dependencyMap = registry.buildDependencyMap(unistyleDependencies);
-
-        if (dependencyMap.empty()) {
-            self->notifyJSListeners(unistyleDependencies);
-        }
-
-        // in a later step, we will rebuild only Unistyles with mounted StyleSheets
-        // however, user may have StyleSheets with components that haven't mounted yet
-        // we need to rebuild all dependent StyleSheets as well
-        auto dependentStyleSheets = registry.getStyleSheetsToRefresh(unistyleDependencies);
-
-        parser.rebuildUnistylesInDependencyMap(rt, dependencyMap, dependentStyleSheets, std::nullopt);
-
-        // we need to stop here if there is nothing to update at the moment,
-        // but we need to compute dependentStyleSheets
-        if (dependencyMap.empty()) {
-            return;
-        }
-
-        parser.rebuildShadowLeafUpdates(rt, dependencyMap);
 
-        self->notifyJSListeners(unistyleDependencies);
-        shadow::ShadowTreeManager::updateShadowTree(rt);
+        self->applyDependencyChanges(rt, unistyleDependencies, std::nullopt);
     });
 }
 
@@ -316,7 +293,6 @@ void HybridStyleSheet::onPlatformNativeDependenciesChange(std::vector<UnistyleDe
         }
 
         auto& registry = core::UnistylesRegistry::get();
-        auto parser = parser::Parser(self->_unistylesRuntime);
         auto unistyleDependencies = std::move(dependencies);
 
         // re-compute new breakpoint
@@ -339,29 +315,7 @@ void HybridStyleSheet::onPlatformNativeDependenciesChange(std::vector<UnistyleDe
             self->_unistylesRuntime->includeDependenciesForColorSchemeChange(unistyleDependencies);
         }
 
-        auto dependencyMap = registry.buildDependencyMap(unistyleDependencies);
-
-        if (dependencyMap.empty()) {
-            self->notifyJSListeners(unistyleDependencies);
-        }
-
-        // in a later step, we will rebuild only Unistyles with mounted StyleSheets
-        // however, user may have StyleSheets with components that haven't mounted yet
-        // we need to rebuild all dependent StyleSheets as well
-        auto dependentStyleSheets = registry.getStyleSheetsToRefresh(unistyleDependencies);
-
-        parser.rebuildUnistylesInDependencyMap(rt, dependencyMap, dependentStyleSheets, miniRuntime);
-
-        // we need to stop here if there is nothing to update at the moment,
-        // but we need to compute dependentStyleSheets
-        if (dependencyMap.empty()) {
-            return;
-        }
-
-        parser.rebuildShadowLeafUpdates(rt, dependencyMap);
-
-        self->notifyJSListeners(unistyleDependencies);
-        shadow::ShadowTreeManager::updateShadowTree(rt);
+        self->applyDependencyChanges(rt, unistyleDependencies, miniRuntime);
     });
 }
 
@@ -380,26 +334,36 @@ void HybridStyleSheet::onImeChange(UnistylesNativeMiniRuntime miniRuntime) {
         }
 
         std::vector<UnistyleDependency> dependencies{UnistyleDependency::IME};
-        auto& registry = core::UnistylesRegistry::get();
-        auto parser = parser::Parser(self->_unistylesRuntime);
-        auto dependencyMap = registry.buildDependencyMap(dependencies);
 
-        if (dependencyMap.empty()) {
-            self->notifyJSListeners(dependencies);
+        self->applyDependencyChanges(rt, dependencies, miniRuntime);
+    });
+}
 
-            return;
-        }
+void HybridStyleSheet::applyDependencyChanges(jsi::Runtime& rt, std::vector<UnistyleDependency>& dependencies, std::optional<UnistylesNativeMiniRuntime> maybeMiniRuntime) {
+    auto& registry = core::UnistylesRegistry::get();
+    auto parser = parser::Parser(this->_unistylesRuntime);
+    auto dependencyMap = registry.buildDependencyMap(dependencies);
+
+    // include StyleSheets consumed only by JS (withUnistyles) — they aren't in dependencyMap
+    // but their rawValue must still be refreshed so rerenders read fresh closures
+    auto dependentStyleSheets = registry.getStyleSheetsToRefresh(dependencies);
+
+    if (dependencyMap.empty() && dependentStyleSheets.empty()) {
+        return;
+    }
 
-        // we don't care about other unmounted stylesheets as their not visible
-        // so user won't see any changes
-        std::vector<std::shared_ptr<core::StyleSheet>> dependentStyleSheets;
+    // rebuild rawValue BEFORE notifying listeners so JS rerenders read fresh closures
+    parser.rebuildUnistylesInDependencyMap(rt, dependencyMap, dependentStyleSheets, maybeMiniRuntime);
 
-        parser.rebuildUnistylesInDependencyMap(rt, dependencyMap, dependentStyleSheets, miniRuntime);
+    if (!dependencyMap.empty()) {
         parser.rebuildShadowLeafUpdates(rt, dependencyMap);
+    }
+
+    this->notifyJSListeners(dependencies);
 
-        self->notifyJSListeners(dependencies);
+    if (!dependencyMap.empty()) {
         shadow::ShadowTreeManager::updateShadowTree(rt);
-    });
+    }
 }
 
 void HybridStyleSheet::notifyJSListeners(std::vector<UnistyleDependency>& dependencies) {

package/cxx/hybridObjects/HybridStyleSheet.h

@@ -3,6 +3,7 @@
 #include <cmath>
 #include <jsi/jsi.h>
 #include <mutex>
+#include <optional>
 #include <unordered_map>
 #include "HybridUnistylesRuntime.h"
 #include "HybridUnistylesStyleSheetSpec.hpp"
@@ -69,6 +70,7 @@ private:
     void onPlatformDependenciesChange(std::vector<UnistyleDependency> dependencies);
     void onPlatformNativeDependenciesChange(std::vector<UnistyleDependency> dependencies, UnistylesNativeMiniRuntime miniRuntime);
     void onImeChange(UnistylesNativeMiniRuntime miniRuntime);
+    void applyDependencyChanges(jsi::Runtime& rt, std::vector<UnistyleDependency>& dependencies, std::optional<UnistylesNativeMiniRuntime> maybeMiniRuntime);
     void notifyJSListeners(std::vector<UnistyleDependency>& dependencies);
 
     bool isInitialized = false;

package/cxx/parser/Parser.cpp

@@ -494,7 +494,7 @@ jsi::Object parser::Parser::parseFirstLevel(jsi::Runtime& rt, Unistyle::Shared u
 
             return;
         }
-        
+
         if (propertyValue.isBool() && propertyName == "includeFontPadding") {
             parsedStyle.setProperty(rt, jsi::PropNameID::forUtf8(rt, propertyName), propertyValue);
 
@@ -1008,6 +1008,15 @@ jsi::Value parser::Parser::parseSecondLevel(jsi::Runtime &rt, Unistyle::Shared u
             return;
         }
 
+        // PlatformColor / DynamicColorIOS / Android ColorResource objects must
+        // pass through unchanged — otherwise getValueFromBreakpoints treats them
+        // as a breakpoint map and strips the color
+        if (helpers::isPlatformColor(rt, nestedObjectStyle)) {
+            parsedStyle.setProperty(rt, propertyName.c_str(), propertyValue);
+
+            return;
+        }
+
         auto isArray = nestedObjectStyle.isArray(rt);
 
         if (!isArray) {

package/nitrogen/generated/android/kotlin/com/margelo/nitro/unistyles/Dimensions.kt

@@ -9,6 +9,7 @@ package com.margelo.nitro.unistyles
 
 import androidx.annotation.Keep
 import com.facebook.proguard.annotations.DoNotStrip
+import java.util.Objects
 
 
 /**
@@ -26,6 +27,20 @@ data class Dimensions(
 ) {
   /* primary constructor */
 
+  override fun equals(other: Any?): Boolean {
+    if (this === other) return true
+    if (other !is Dimensions) return false
+    return Objects.deepEquals(this.width, other.width)
+      && Objects.deepEquals(this.height, other.height)
+  }
+
+  override fun hashCode(): Int {
+    return arrayOf(
+      width,
+      height
+    ).contentDeepHashCode()
+  }
+
   companion object {
     /**
      * Constructor called from C++

package/nitrogen/generated/android/kotlin/com/margelo/nitro/unistyles/Insets.kt

@@ -9,6 +9,7 @@ package com.margelo.nitro.unistyles
 
 import androidx.annotation.Keep
 import com.facebook.proguard.annotations.DoNotStrip
+import java.util.Objects
 
 
 /**
@@ -35,6 +36,26 @@ data class Insets(
 ) {
   /* primary constructor */
 
+  override fun equals(other: Any?): Boolean {
+    if (this === other) return true
+    if (other !is Insets) return false
+    return Objects.deepEquals(this.top, other.top)
+      && Objects.deepEquals(this.bottom, other.bottom)
+      && Objects.deepEquals(this.left, other.left)
+      && Objects.deepEquals(this.right, other.right)
+      && Objects.deepEquals(this.ime, other.ime)
+  }
+
+  override fun hashCode(): Int {
+    return arrayOf(
+      top,
+      bottom,
+      left,
+      right,
+      ime
+    ).contentDeepHashCode()
+  }
+
   companion object {
     /**
      * Constructor called from C++

package/nitrogen/generated/android/kotlin/com/margelo/nitro/unistyles/UnistylesNativeMiniRuntime.kt

@@ -9,6 +9,7 @@ package com.margelo.nitro.unistyles
 
 import androidx.annotation.Keep
 import com.facebook.proguard.annotations.DoNotStrip
+import java.util.Objects
 
 
 /**
@@ -53,6 +54,38 @@ data class UnistylesNativeMiniRuntime(
 ) {
   /* primary constructor */
 
+  override fun equals(other: Any?): Boolean {
+    if (this === other) return true
+    if (other !is UnistylesNativeMiniRuntime) return false
+    return Objects.deepEquals(this.colorScheme, other.colorScheme)
+      && Objects.deepEquals(this.screen, other.screen)
+      && Objects.deepEquals(this.contentSizeCategory, other.contentSizeCategory)
+      && Objects.deepEquals(this.insets, other.insets)
+      && Objects.deepEquals(this.pixelRatio, other.pixelRatio)
+      && Objects.deepEquals(this.fontScale, other.fontScale)
+      && Objects.deepEquals(this.rtl, other.rtl)
+      && Objects.deepEquals(this.statusBar, other.statusBar)
+      && Objects.deepEquals(this.navigationBar, other.navigationBar)
+      && Objects.deepEquals(this.isPortrait, other.isPortrait)
+      && Objects.deepEquals(this.isLandscape, other.isLandscape)
+  }
+
+  override fun hashCode(): Int {
+    return arrayOf(
+      colorScheme,
+      screen,
+      contentSizeCategory,
+      insets,
+      pixelRatio,
+      fontScale,
+      rtl,
+      statusBar,
+      navigationBar,
+      isPortrait,
+      isLandscape
+    ).contentDeepHashCode()
+  }
+
   companion object {
     /**
      * Constructor called from C++

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-unistyles",
-  "version": "3.2.3",
+  "version": "3.2.4",
   "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.4",
+    "nitrogen": "0.35.5",
     "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.4",
+    "react-native-nitro-modules": "0.35.5",
     "react-native-reanimated": "4.2.2",
     "react-native-web": "0.21.2",
     "typescript": "5.9.3"