react-native-unistyles 3.0.16 → 3.0.17

package/README.md

@@ -21,14 +21,14 @@ yarn add react-native-unistyles
 Install dependencies:
 
 ```shell
-yarn add react-native-edge-to-edge react-native-nitro-modules@0.31.2
+yarn add react-native-edge-to-edge react-native-nitro-modules@0.31.3
 ```
 
 > To avoid unexpected behavior, always use a fixed version of `react-native-nitro-modules`
 
 | react-native-unistyles | react-native-nitro-modules |
 |------------------------|----------------------------|
-| 3.0.0                  | 0.31.2                     |
+| 3.0.0                  | 0.31.3                     |
 
 Then follow [installation guides](https://unistyl.es/v3/start/getting-started) for your platform.
 
@@ -74,6 +74,9 @@ Then follow [installation guides](https://unistyl.es/v3/start/getting-started) f
 <a href="https://github.com/kerwanp">
      <img src="https://avatars.githubusercontent.com/u/36955373?v=4" height="70px" width="70px" alt="kerwanp" />
 </a>
+<a href="https://github.com/rauchg">
+     <img src="https://avatars.githubusercontent.com/u/13041?v=4" height="70px" width="70px" alt="rauchg" />
+</a>
 
 ## Past sponsors
 

package/cxx/hybridObjects/HybridStyleSheet.cpp

@@ -251,9 +251,9 @@ void HybridStyleSheet::loadExternalMethods(const jsi::Value& thisValue, jsi::Run
     auto maybeProcessColorFn = jsMethods.asObject(rt).getProperty(rt, "processColor");
 
     helpers::assertThat(rt, maybeProcessColorFn.isObject(), "Unistyles: Can't load processColor function from JS.");
-    
+
     auto maybeParseBoxShadowStringFn = jsMethods.asObject(rt).getProperty(rt, "parseBoxShadowString");
-    
+
     helpers::assertThat(rt, maybeParseBoxShadowStringFn.isObject(), "Unistyles: Can't load parseBoxShadowString function from JS.");
 
     auto processColorFn = maybeProcessColorFn.asObject(rt).asFunction(rt);
@@ -386,25 +386,36 @@ void HybridStyleSheet::onImeChange(UnistylesNativeMiniRuntime miniRuntime) {
 }
 
 void HybridStyleSheet::notifyJSListeners(std::vector<UnistyleDependency>& dependencies) {
-    if (!dependencies.empty()) {
-        std::for_each(this->_changeListeners.begin(), this->_changeListeners.end(), [&](auto& listener){
-            (*listener)(dependencies);
-        });
+    if (dependencies.empty()) {
+        return;
+    }
+
+    std::vector<std::function<void(std::vector<UnistyleDependency>&)>> callbacks;
+    {
+        std::lock_guard<std::mutex> lock(this->_listenersMutex);
+        callbacks.reserve(this->_changeListeners.size());
+
+        for (auto& [id, listener] : this->_changeListeners) {
+            callbacks.push_back(*listener);
+        }
+    }
+
+    for (auto& callback : callbacks) {
+        callback(dependencies);
     }
 }
 
 std::function<void ()> HybridStyleSheet::addChangeListener(const std::function<void (const std::vector<UnistyleDependency>&)>& onChanged) {
-    auto listener = std::make_unique<std::function<void(std::vector<UnistyleDependency>&)>>(onChanged);
+    static size_t nextListenerId = 0;
 
-    this->_changeListeners.push_back(std::move(listener));
+    std::lock_guard<std::mutex> lock(this->_listenersMutex);
 
-    return [this, listenerPtr = this->_changeListeners.back().get()](){
-        auto it = std::find_if(this->_changeListeners.begin(), this->_changeListeners.end(), [listenerPtr](auto& ptr) {
-            return ptr.get() == listenerPtr;
-        });
+    size_t id = nextListenerId++;
+    auto listener = std::make_unique<std::function<void(std::vector<UnistyleDependency>&)>>(onChanged);
+    this->_changeListeners[id] = std::move(listener);
 
-        if (it != this->_changeListeners.end()) {
-            this->_changeListeners.erase(it);
-        }
+    return [this, id](){
+        std::lock_guard<std::mutex> lock(this->_listenersMutex);
+        this->_changeListeners.erase(id);
     };
 }

package/cxx/hybridObjects/HybridStyleSheet.h

@@ -2,6 +2,8 @@
 
 #include <cmath>
 #include <jsi/jsi.h>
+#include <mutex>
+#include <unordered_map>
 #include "HybridUnistylesRuntime.h"
 #include "HybridUnistylesStyleSheetSpec.hpp"
 #include "RNStyle.h"
@@ -72,7 +74,8 @@ private:
 
     bool isInitialized = false;
     double __unid = -1;
-    std::vector<std::unique_ptr<const std::function<void(std::vector<UnistyleDependency>&)>>> _changeListeners{};
+    std::unordered_map<size_t, std::unique_ptr<std::function<void(std::vector<UnistyleDependency>&)>>> _changeListeners{};
+    std::mutex _listenersMutex;
     std::shared_ptr<HybridUnistylesRuntime> _unistylesRuntime;
     std::shared_ptr<UIManager> _uiManager;
 };

package/nitrogen/generated/android/c++/JHybridNativePlatformSpec.cpp

@@ -60,6 +60,12 @@ namespace margelo::nitro::unistyles {
     method(_javaPart);
   }
 
+  std::string JHybridNativePlatformSpec::toString() {
+    static const auto method = javaClassStatic()->getMethod<jni::JString()>("toString");
+    auto javaString = method(_javaPart);
+    return javaString->toStdString();
+  }
+
   // Properties
   
 

package/nitrogen/generated/android/c++/JHybridNativePlatformSpec.hpp

@@ -41,6 +41,7 @@ namespace margelo::nitro::unistyles {
   public:
     size_t getExternalMemorySize() noexcept override;
     void dispose() noexcept override;
+    std::string toString() override;
 
   public:
     inline const jni::global_ref<JHybridNativePlatformSpec::javaobject>& getJavaPart() const noexcept {

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

@@ -24,6 +24,8 @@ data class Dimensions(
   @Keep
   val height: Double
 ) {
+  /* primary constructor */
+
   private companion object {
     /**
      * Constructor called from C++

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

@@ -36,6 +36,11 @@ abstract class HybridNativePlatformSpec: HybridObject() {
     super.updateNative(hybridData)
   }
 
+  // Default implementation of `HybridObject.toString()`
+  override fun toString(): String {
+    return "[HybridObject NativePlatform]"
+  }
+
   // Properties
   
 

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

@@ -33,6 +33,8 @@ data class Insets(
   @Keep
   val ime: Double
 ) {
+  /* primary constructor */
+
   private companion object {
     /**
      * Constructor called from C++

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

@@ -51,6 +51,8 @@ data class UnistylesNativeMiniRuntime(
   @Keep
   val isLandscape: Boolean
 ) {
+  /* primary constructor */
+
   private companion object {
     /**
      * Constructor called from C++

package/nitrogen/generated/ios/c++/HybridNativePlatformSpecSwift.hpp

@@ -69,6 +69,9 @@ namespace margelo::nitro::unistyles {
     void dispose() noexcept override {
       _swiftPart.dispose();
     }
+    std::string toString() override {
+      return _swiftPart.toString();
+    }
 
   public:
     // Properties

package/nitrogen/generated/ios/swift/HybridNativePlatformSpec.swift

@@ -34,6 +34,13 @@ public protocol HybridNativePlatformSpec_protocol: HybridObject {
   func unregisterPlatformListeners() throws -> Void
 }
 
+public extension HybridNativePlatformSpec_protocol {
+  /// Default implementation of ``HybridObject.toString``
+  func toString() -> String {
+    return "[HybridObject NativePlatform]"
+  }
+}
+
 /// See ``HybridNativePlatformSpec``
 open class HybridNativePlatformSpec_base {
   private weak var cxxWrapper: HybridNativePlatformSpec_cxx? = nil

package/nitrogen/generated/ios/swift/HybridNativePlatformSpec_cxx.swift

@@ -76,7 +76,7 @@ open class HybridNativePlatformSpec_cxx {
    */
   public func getCxxPart() -> bridge.std__shared_ptr_HybridNativePlatformSpec_ {
     let cachedCxxPart = self.__cxxPart.lock()
-    if cachedCxxPart.__convertToBool() {
+    if Bool(fromCxx: cachedCxxPart) {
       return cachedCxxPart
     } else {
       let newCxxPart = bridge.create_std__shared_ptr_HybridNativePlatformSpec_(self.toUnsafe())
@@ -105,6 +105,14 @@ open class HybridNativePlatformSpec_cxx {
     self.__implementation.dispose()
   }
 
+  /**
+   * Call toString() on the Swift class.
+   */
+  @inline(__always)
+  public func toString() -> String {
+    return self.__implementation.toString()
+  }
+
   // Properties
   
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-unistyles",
-  "version": "3.0.16",
+  "version": "3.0.17",
   "description": "Level up your React Native StyleSheet",
   "scripts": {
     "test": "NODE_ENV=babel-test jest ./plugin",
@@ -11,7 +11,6 @@
     "check:ci": "biome check",
     "prepare": "husky && bob build && yarn plugin:build && yarn repack:plugin:build",
     "precommit": "concurrently 'yarn tsc' 'yarn lint' 'yarn check' 'yarn test' 'yarn circular:check'",
-    "release": "release-it",
     "plugin:build": "node plugin/esbuild.js",
     "repack:plugin:build": "node repack-plugin/esbuild.js",
     "circular:check": "dpdm --no-warning --no-tree -T --exit-code circular:1 src/**/*.ts",
@@ -136,7 +135,6 @@
     "@callstack/repack": "5.1.0",
     "@commitlint/config-conventional": "19.8.1",
     "@react-native/normalize-colors": "0.79.2",
-    "@release-it/conventional-changelog": "8.0.2",
     "@rspack/core": "1.3.10",
     "@types/jest": "29.5.14",
     "@types/react": "19.1.4",
@@ -148,15 +146,14 @@
     "husky": "9.1.7",
     "jest": "29.7.0",
     "metro-react-native-babel-preset": "0.77.0",
-    "nitrogen": "0.31.2",
+    "nitrogen": "0.31.3",
     "react": "19.1.0",
     "react-native": "0.79.2",
     "react-native-builder-bob": "0.40.10",
-    "react-native-nitro-modules": "0.31.2",
+    "react-native-nitro-modules": "0.31.3",
     "react-native-reanimated": "3.17.5",
     "react-native-web": "0.20.0",
     "react-test-renderer": "19.1.0",
-    "release-it": "17.11.0",
     "typescript": "5.8.3"
   },
   "peerDependencies": {
@@ -200,63 +197,6 @@
       "@commitlint/config-conventional"
     ]
   },
-  "release-it": {
-    "git": {
-      "commitMessage": "chore: release ${version}",
-      "tagName": "v${version}"
-    },
-    "npm": {
-      "publish": true
-    },
-    "github": {
-      "release": true
-    },
-    "plugins": {
-      "@release-it/conventional-changelog": {
-        "writerOpts": {
-          "groupBy": "type",
-          "commitGroupsSort": [
-            "feat",
-            "fix",
-            "perf",
-            "refactor",
-            "docs",
-            "chore"
-          ],
-          "commitsSort": [
-            "scope",
-            "subject"
-          ]
-        },
-        "types": [
-          {
-            "type": "feat",
-            "section": "Features"
-          },
-          {
-            "type": "fix",
-            "section": "Bug Fixes"
-          },
-          {
-            "type": "perf",
-            "section": "Performance Improvements"
-          },
-          {
-            "type": "refactor",
-            "section": "Code Refactoring"
-          },
-          {
-            "type": "docs",
-            "section": "Documentation"
-          },
-          {
-            "type": "chore",
-            "section": "Maintenance"
-          }
-        ]
-      }
-    }
-  },
   "react-native-builder-bob": {
     "source": "src",
     "output": "lib",

package/plugin/index.js

@@ -355,14 +355,33 @@ function isKindOfStyleSheet(path2, state) {
   if (path2.node.arguments.length !== 1) {
     return false;
   }
-  if (!t4.isObjectExpression(path2.node.arguments[0])) {
+  const { callee } = path2.node;
+  const isCreateCall = t4.isMemberExpression(callee) && t4.isIdentifier(callee.property) && callee.property.name === "create" && (t4.isIdentifier(callee.object) || t4.isMemberExpression(callee.object));
+  if (!isCreateCall) {
     return false;
   }
-  if (!path2.node.arguments[0].properties.some((property) => t4.isObjectProperty(property) && t4.isObjectExpression(property.value))) {
+  const argument = path2.node.arguments[0];
+  if (t4.isArrowFunctionExpression(argument)) {
+    if (argument.params.length > 2) {
+      return false;
+    }
+    if (t4.isObjectExpression(argument.body) && argument.body.properties.length > 0) {
+      return true;
+    }
+    if (t4.isBlockStatement(argument.body)) {
+      const returnStatements = getReturnStatementsFromBody(argument.body);
+      return returnStatements.some(
+        (ret) => ret.argument && t4.isObjectExpression(ret.argument) && ret.argument.properties.length > 0
+      );
+    }
     return false;
   }
-  const { callee } = path2.node;
-  return t4.isMemberExpression(callee) && t4.isIdentifier(callee.property) && callee.property.name === "create" && t4.isIdentifier(callee.object);
+  if (t4.isObjectExpression(argument)) {
+    return argument.properties.some(
+      (property) => t4.isObjectProperty(property) && t4.isObjectExpression(property.value)
+    );
+  }
+  return false;
 }
 function addStyleSheetTag(path2, state) {
   const str = state.filename?.replace(state.cwd, "") ?? "";