react-native-unistyles 3.0.16 → 3.0.18

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.8
 ```
 
 > 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.8                     |
 
 Then follow [installation guides](https://unistyl.es/v3/start/getting-started) for your platform.
 
@@ -74,6 +74,12 @@ 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>
+<a href="https://github.com/oliverloops">
+     <img src="https://avatars.githubusercontent.com/u/33361399?v=4" height="70px" width="70px" alt="oliverloops" />
+</a>
 
 ## Past sponsors
 

package/cxx/core/HostUnistyle.cpp

@@ -17,6 +17,12 @@ std::vector<jsi::PropNameID> HostUnistyle::getPropertyNames(jsi::Runtime& rt) {
     return propertyNames;
 }
 
+HostUnistyle::~HostUnistyle() {
+    if (this->_ownsStyleSheet) {
+        this->_stylesheet->unistyles.clear();
+    }
+}
+
 jsi::Value HostUnistyle::get(jsi::Runtime& rt, const jsi::PropNameID& propNameId) {
     auto propertyName = propNameId.utf8(rt);
 
@@ -92,23 +98,23 @@ jsi::Function HostUnistyle::createAddVariantsProxyFunction(jsi::Runtime& rt) {
             this->_stylesheet->type,
             jsi::Value(rt, this->_stylesheet->rawValue).asObject(rt)
         );
-        
+
         parser.buildUnistyles(rt, stylesheetCopy);
         parser.parseUnistyles(rt, stylesheetCopy);
-        
+
         helpers::enumerateJSIObject(rt, thisVal.asObject(rt), [this, &parser, &rt, &variants, stylesheetCopy](const std::string& name, jsi::Value& value){
             if (name == helpers::ADD_VARIANTS_FN || !stylesheetCopy->unistyles.contains(name)) {
                 return;
             }
 
             auto unistyle = stylesheetCopy->unistyles[name];
-            
+
             if (unistyle->dependsOn(UnistyleDependency::VARIANTS)) {
                 parser.rebuildUnistyle(rt, unistyle, variants, std::nullopt);
             }
         });
 
-        auto style = std::make_shared<core::HostUnistyle>(stylesheetCopy, this->_unistylesRuntime, variants);
+        auto style = std::make_shared<core::HostUnistyle>(stylesheetCopy, this->_unistylesRuntime, variants, true);
         auto styleHostObject = jsi::Object::createFromHostObject(rt, style);
 
         return styleHostObject;

package/cxx/core/HostUnistyle.h

@@ -9,8 +9,9 @@ namespace margelo::nitro::unistyles::core {
 using Variants = std::vector<std::pair<std::string, std::string>>;
 
 struct JSI_EXPORT HostUnistyle : public jsi::HostObject {
-    HostUnistyle(std::shared_ptr<StyleSheet> stylesheet, std::shared_ptr<HybridUnistylesRuntime> unistylesRuntime, Variants& variants)
-        : _stylesheet(stylesheet), _unistylesRuntime{unistylesRuntime}, _variants{std::move(variants)} {};
+    HostUnistyle(std::shared_ptr<StyleSheet> stylesheet, std::shared_ptr<HybridUnistylesRuntime> unistylesRuntime, Variants& variants, bool ownsStyleSheet = false)
+        : _stylesheet(stylesheet), _unistylesRuntime{unistylesRuntime}, _variants{std::move(variants)}, _ownsStyleSheet(ownsStyleSheet) {};
+    ~HostUnistyle();
 
     std::vector<jsi::PropNameID> getPropertyNames(jsi::Runtime& rt);
     jsi::Value get(jsi::Runtime& rt, const jsi::PropNameID& propNameId);
@@ -19,6 +20,7 @@ struct JSI_EXPORT HostUnistyle : public jsi::HostObject {
     jsi::Function createAddVariantsProxyFunction(jsi::Runtime& rt);
 
 private:
+    bool _ownsStyleSheet;
     Variants _variants;
     std::shared_ptr<StyleSheet> _stylesheet;
     std::shared_ptr<HybridUnistylesRuntime> _unistylesRuntime;

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/lib/commonjs/core/withUnistyles/withUnistyles.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","_interopRequireWildcard","require","_specs","_utils","_useProxifiedUnistyles","_warn","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","withUnistyles","Component","mappings","getSecrets","styleProps","styles","Array","isArray","flat","secrets","filter","Boolean","reduce","acc","style","unistyleKey","keys","find","key","startsWith","concat","uni__getStyles","uni__dependencies","secret","assign","dependencies","flatMap","forwardRef","props","ref","narrowedProps","NativeComponent","maybeWarnAboutMultipleUnistyles","displayName","name","contentContainerStyle","scopedTheme","useRef","UnistylesShadowRegistry","getScopedTheme","proxifiedRuntime","proxifiedTheme","addDependencies","useProxifiedUnistyles","current","useEffect","styleSecrets","contentContainerStyleSecrets","from","Set","mappingsKey","mappingsProps","uniPropsKey","unistyleProps","uniProps","finalProps","deepMergeObjects","jsx","exports"],"sourceRoot":"../../../../src","sources":["core/withUnistyles/withUnistyles.native.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","_interopRequireWildcard","require","_specs","_utils","_useProxifiedUnistyles","_warn","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","withUnistyles","Component","mappings","getSecrets","styleProps","styles","Array","isArray","flat","secrets","filter","Boolean","reduce","acc","style","unistyleKey","keys","find","key","startsWith","concat","uni__getStyles","uni__dependencies","secret","assign","dependencies","flatMap","forwardRef","props","ref","narrowedProps","NativeComponent","maybeWarnAboutMultipleUnistyles","displayName","name","contentContainerStyle","scopedTheme","useRef","UnistylesShadowRegistry","getScopedTheme","proxifiedRuntime","proxifiedTheme","addDependencies","useProxifiedUnistyles","current","useEffect","styleSecrets","contentContainerStyleSecrets","from","Set","mappingsKey","mappingsProps","uniPropsKey","unistyleProps","uniProps","finalProps","deepMergeObjects","jsx","exports"],"sourceRoot":"../../../../src","sources":["core/withUnistyles/withUnistyles.native.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,uBAAA,CAAAC,OAAA;AACA,IAAAC,MAAA,GAAAD,OAAA;AAEA,IAAAE,MAAA,GAAAF,OAAA;AACA,IAAAG,sBAAA,GAAAH,OAAA;AACA,IAAAI,KAAA,GAAAJ,OAAA;AAAyD,IAAAK,WAAA,GAAAL,OAAA;AAAA,SAAAD,wBAAAO,CAAA,EAAAC,CAAA,6BAAAC,OAAA,MAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAT,uBAAA,YAAAA,CAAAO,CAAA,EAAAC,CAAA,SAAAA,CAAA,IAAAD,CAAA,IAAAA,CAAA,CAAAK,UAAA,SAAAL,CAAA,MAAAM,CAAA,EAAAC,CAAA,EAAAC,CAAA,KAAAC,SAAA,QAAAC,OAAA,EAAAV,CAAA,iBAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,SAAAQ,CAAA,MAAAF,CAAA,GAAAL,CAAA,GAAAG,CAAA,GAAAD,CAAA,QAAAG,CAAA,CAAAK,GAAA,CAAAX,CAAA,UAAAM,CAAA,CAAAM,GAAA,CAAAZ,CAAA,GAAAM,CAAA,CAAAO,GAAA,CAAAb,CAAA,EAAAQ,CAAA,gBAAAP,CAAA,IAAAD,CAAA,gBAAAC,CAAA,OAAAa,cAAA,CAAAC,IAAA,CAAAf,CAAA,EAAAC,CAAA,OAAAM,CAAA,IAAAD,CAAA,GAAAU,MAAA,CAAAC,cAAA,KAAAD,MAAA,CAAAE,wBAAA,CAAAlB,CAAA,EAAAC,CAAA,OAAAM,CAAA,CAAAK,GAAA,IAAAL,CAAA,CAAAM,GAAA,IAAAP,CAAA,CAAAE,CAAA,EAAAP,CAAA,EAAAM,CAAA,IAAAC,CAAA,CAAAP,CAAA,IAAAD,CAAA,CAAAC,CAAA,WAAAO,CAAA,KAAAR,CAAA,EAAAC,CAAA;AAGzD;;AAEA;;AAaO,MAAMkB,aAAa,GAAGA,CAAkEC,SAAqB,EAAEC,QAA8B,KAAK;EAUrJ,MAAMC,UAAU,GAAGA,CAACC,UAA+B,GAAG,CAAC,CAAC,KAAoB;IACxE,MAAMC,MAAM,GAAGC,KAAK,CAACC,OAAO,CAACH,UAAU,CAAC,GAClCA,UAAU,CAACI,IAAI,CAAC,CAAC,GACjB,CAACJ,UAAU,CAAC;IAElB,MAAMK,OAAgC,GAAGJ,MAAM,CAC1CK,MAAM,CAACC,OAAO,CAAC,CACfC,MAAM,CAAC,CAACC,GAAG,EAAEC,KAAK,KAAK;MACpB,MAAMC,WAAW,GAAGlB,MAAM,CACrBmB,IAAI,CAACF,KAAK,CAAC,CACXG,IAAI,CAACC,GAAG,IAAIA,GAAG,CAACC,UAAU,CAAC,YAAY,CAAC,CAAC;MAE9C,OAAON,GAAG,CAACO,MAAM,CAAC,CACdL,WAAW,GACLD,KAAK,CAACC,WAAW,CAAC,GAClB;QACEM,cAAc,EAAEA,CAAA,KAAMP,KAAK;QAC3BQ,iBAAiB,EAAE;MACvB,CAAC,CACR,CAAC;IACN,CAAC,EAAE,EAAE,CAAC;IAEV,OAAO;MACHjB,MAAM,EAAEI,OAAO,CAACG,MAAM,CAAC,CAACC,GAAG,EAAEU,MAAM,KAAK1B,MAAM,CACzC2B,MAAM,CAACX,GAAG,EAAEU,MAAM,CAACF,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC,CAAwB,CAAC;MACrEI,YAAY,EAAEhB,OAAO,CAACiB,OAAO,CAACH,MAAM,IAAIA,MAAM,CAACD,iBAAiB;IACpE,CAAC;EACL,CAAC;EAED,oBAAO,IAAAK,iBAAU,EAAsD,CAACC,KAAK,EAAEC,GAAG,KAAK;IACnF,MAAMC,aAAa,GAAGF,KAA4C;IAClE,MAAMG,eAAe,GAAG9B,SAA0B;;IAElD;IACA,IAAA+B,qCAA+B,EAACF,aAAa,CAAChB,KAAK,EAAE,iBAAiBb,SAAS,CAACgC,WAAW,IAAIhC,SAAS,CAACiC,IAAI,IAAI,SAAS,GAAG,CAAC;IAC9H;IACA,IAAAF,qCAA+B,EAACF,aAAa,CAACK,qBAAqB,EAAE,iBAAiBlC,SAAS,CAACgC,WAAW,IAAIhC,SAAS,CAACiC,IAAI,IAAI,SAAS,GAAG,CAAC;IAE9I,MAAME,WAAW,GAAG,IAAAC,aAAM,EAACC,8BAAuB,CAACC,cAAc,CAAC,CAAmB,CAAC;IACtF,MAAM;MAAEC,gBAAgB;MAAEC,cAAc;MAAEC;IAAgB,CAAC,GAAG,IAAAC,4CAAqB,EAACP,WAAW,CAACQ,OAAO,CAAC;IAExG,IAAAC,gBAAS,EAAC,MAAM;MACZ,MAAMC,YAAY,GAAG3C,UAAU,CAAC2B,aAAa,CAAChB,KAAK,CAAC;MACpD,MAAMiC,4BAA4B,GAAG5C,UAAU,CAAC2B,aAAa,CAACK,qBAAqB,CAAC;MAEpFO,eAAe,CAACpC,KAAK,CAAC0C,IAAI,CAAC,IAAIC,GAAG,CAAC,CAAC,GAAGH,YAAY,CAACrB,YAAY,EAAE,GAAGsB,4BAA4B,CAACtB,YAAY,CAAC,CAAC,CAAC,CAAC;IACtH,CAAC,EAAE,CAACK,aAAa,CAAChB,KAAK,EAAEgB,aAAa,CAACK,qBAAqB,CAAC,CAAC;IAE9D,MAAM;MAAEjB,GAAG,EAAEgC,WAAW;MAAE,GAAGC;IAAc,CAAC,GAAGjD,QAAQ,GAAGA,QAAQ,CAACuC,cAAc,EAAED,gBAAgB,CAAC,GAAG,CAAC,CAAC;IACzG,MAAM;MAAEtB,GAAG,EAAEkC,WAAW;MAAE,GAAGC;IAAc,CAAC,GAAGvB,aAAa,CAACwB,QAAQ,GAAGxB,aAAa,CAACwB,QAAQ,CAACb,cAAc,EAAED,gBAAgB,CAAC,GAAG,CAAC,CAAC;IAErI,MAAMM,YAAY,GAAG3C,UAAU,CAAC2B,aAAa,CAAChB,KAAK,CAAC;IACpD,MAAMiC,4BAA4B,GAAG5C,UAAU,CAAC2B,aAAa,CAACK,qBAAqB,CAAC;IAEpF,MAAMoB,UAAU,GAAG;MACf,GAAG,IAAAC,uBAAgB,EAACL,aAAa,EAAEE,aAAa,EAAEzB,KAAK,CAAC;MACxD,IAAGE,aAAa,CAAChB,KAAK,GAAG;QACrBA,KAAK,EAAEgC,YAAY,CAACzC;MACxB,CAAC,GAAG,CAAC,CAAC;MACN,IAAGyB,aAAa,CAACK,qBAAqB,GAAG;QACrCA,qBAAqB,EAAEY,4BAA4B,CAAC1C;MACxD,CAAC,GAAG,CAAC,CAAC;IACV,CAAQ;IAER,oBACI,IAAAzB,WAAA,CAAA6E,GAAA,EAAC1B,eAAe;MAAA,GAERwB,UAAU;MACd1B,GAAG,EAAEA;IAAI,GAFJuB,WAAW,IAAIF,WAGvB,CAAC;EAEV,CAAC,CAAC;AACN,CAAC;AAAAQ,OAAA,CAAA1D,aAAA,GAAAA,aAAA","ignoreList":[]}

package/lib/module/core/withUnistyles/withUnistyles.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","forwardRef","useEffect","useRef","UnistylesShadowRegistry","deepMergeObjects","useProxifiedUnistyles","maybeWarnAboutMultipleUnistyles","jsx","_jsx","withUnistyles","Component","mappings","getSecrets","styleProps","styles","Array","isArray","flat","secrets","filter","Boolean","reduce","acc","style","unistyleKey","Object","keys","find","key","startsWith","concat","uni__getStyles","uni__dependencies","secret","assign","dependencies","flatMap","props","ref","narrowedProps","NativeComponent","displayName","name","contentContainerStyle","scopedTheme","getScopedTheme","proxifiedRuntime","proxifiedTheme","addDependencies","current","styleSecrets","contentContainerStyleSecrets","from","Set","mappingsKey","mappingsProps","uniPropsKey","unistyleProps","uniProps","finalProps"],"sourceRoot":"../../../../src","sources":["core/withUnistyles/withUnistyles.native.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["React","forwardRef","useEffect","useRef","UnistylesShadowRegistry","deepMergeObjects","useProxifiedUnistyles","maybeWarnAboutMultipleUnistyles","jsx","_jsx","withUnistyles","Component","mappings","getSecrets","styleProps","styles","Array","isArray","flat","secrets","filter","Boolean","reduce","acc","style","unistyleKey","Object","keys","find","key","startsWith","concat","uni__getStyles","uni__dependencies","secret","assign","dependencies","flatMap","props","ref","narrowedProps","NativeComponent","displayName","name","contentContainerStyle","scopedTheme","getScopedTheme","proxifiedRuntime","proxifiedTheme","addDependencies","current","styleSecrets","contentContainerStyleSecrets","from","Set","mappingsKey","mappingsProps","uniPropsKey","unistyleProps","uniProps","finalProps"],"sourceRoot":"../../../../src","sources":["core/withUnistyles/withUnistyles.native.tsx"],"mappings":"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","ignoreList":[]}

package/lib/typescript/src/core/withUnistyles/withUnistyles.native.d.ts

@@ -1,6 +1,8 @@
-import React from 'react';
+import React, { type ComponentProps } from 'react';
 import type { Mappings } from './types';
 type GenericComponentProps<P> = ComponentProps<P>;
-export declare const withUnistyles: <TComponent, TMappings extends GenericComponentProps<TComponent>>(Component: TComponent, mappings?: Mappings<TMappings>) => React.ForwardRefExoticComponent<any>;
+export declare const withUnistyles: <TComponent, TMappings extends GenericComponentProps<TComponent>>(Component: TComponent, mappings?: Mappings<TMappings>) => React.ForwardRefExoticComponent<React.PropsWithoutRef<Partial<React.ComponentProps<TComponent>> & {
+    uniProps?: Mappings<React.ComponentProps<TComponent>>;
+}> & React.RefAttributes<React.ComponentRef<TComponent>>>;
 export {};
 //# sourceMappingURL=withUnistyles.native.d.ts.map

package/lib/typescript/src/core/withUnistyles/withUnistyles.native.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"withUnistyles.native.d.ts","sourceRoot":"","sources":["../../../../../src/core/withUnistyles/withUnistyles.native.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA4D,MAAM,OAAO,CAAA;AAMhF,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAGvC,KAAK,qBAAqB,CAAC,CAAC,IAAI,cAAc,CAAC,CAAC,CAAC,CAAA;AAcjD,eAAO,MAAM,aAAa,GAAI,UAAU,EAAE,SAAS,SAAS,qBAAqB,CAAC,UAAU,CAAC,EAAE,WAAW,UAAU,EAAE,WAAW,QAAQ,CAAC,SAAS,CAAC,yCA8EnJ,CAAA"}
+{"version":3,"file":"withUnistyles.native.d.ts","sourceRoot":"","sources":["../../../../../src/core/withUnistyles/withUnistyles.native.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAiC,KAAK,cAAc,EAAyC,MAAM,OAAO,CAAA;AAMxH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAGvC,KAAK,qBAAqB,CAAC,CAAC,IAAI,cAAc,CAAC,CAAC,CAAC,CAAA;AAcjD,eAAO,MAAM,aAAa,GAAI,UAAU,EAAE,SAAS,SAAS,qBAAqB,CAAC,UAAU,CAAC,EAAE,WAAW,UAAU,EAAE,WAAW,QAAQ,CAAC,SAAS,CAAC;eAGjI,QAAQ,kCAAQ;yDA+ElC,CAAA"}

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

@@ -47,7 +47,8 @@ namespace margelo::nitro::unistyles {
         jni::local_ref<jni::JArrayClass<JUnistyleDependency>> __array = jni::JArrayClass<JUnistyleDependency>::newArray(__size);
         for (size_t __i = 0; __i < __size; __i++) {
           const auto& __element = dependencies[__i];
-          __array->setElement(__i, *JUnistyleDependency::fromCpp(__element));
+          auto __elementJni = JUnistyleDependency::fromCpp(__element);
+          __array->setElement(__i, *__elementJni);
         }
         return __array;
       }(), JUnistylesNativeMiniRuntime::fromCpp(miniRuntime));

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/Unistyles-Swift-Cxx-Bridge.cpp

@@ -10,6 +10,7 @@
 // Include C++ implementation defined types
 #include "HybridNativePlatformSpecSwift.hpp"
 #include "Unistyles-Swift-Cxx-Umbrella.hpp"
+#include <NitroModules/NitroDefines.hpp>
 
 namespace margelo::nitro::unistyles::bridge::swift {
 

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/Dimensions.swift

@@ -5,6 +5,7 @@
 /// Copyright © 2025 Marc Rousavy @ Margelo
 ///
 
+import Foundation
 import NitroModules
 
 /**

package/nitrogen/generated/ios/swift/Func_void_UnistylesNativeMiniRuntime.swift

@@ -5,9 +5,9 @@
 /// Copyright © 2025 Marc Rousavy @ Margelo
 ///
 
+import Foundation
 import NitroModules
 
-
 /**
  * Wraps a Swift `(_ miniRuntime: UnistylesNativeMiniRuntime) -> Void` as a class.
  * This class can be used from C++, e.g. to wrap the Swift closure as a `std::function`.

package/nitrogen/generated/ios/swift/Func_void_std__vector_UnistyleDependency__UnistylesNativeMiniRuntime.swift

@@ -5,9 +5,9 @@
 /// Copyright © 2025 Marc Rousavy @ Margelo
 ///
 
+import Foundation
 import NitroModules
 
-
 /**
  * Wraps a Swift `(_ dependencies: [UnistyleDependency], _ miniRuntime: UnistylesNativeMiniRuntime) -> Void` as a class.
  * This class can be used from C++, e.g. to wrap the Swift closure as a `std::function`.

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/nitrogen/generated/ios/swift/Insets.swift

@@ -5,6 +5,7 @@
 /// Copyright © 2025 Marc Rousavy @ Margelo
 ///
 
+import Foundation
 import NitroModules
 
 /**

package/nitrogen/generated/ios/swift/UnistylesNativeMiniRuntime.swift

@@ -5,6 +5,7 @@
 /// Copyright © 2025 Marc Rousavy @ Margelo
 ///
 
+import Foundation
 import NitroModules
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-unistyles",
-  "version": "3.0.16",
+  "version": "3.0.18",
   "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.8",
     "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.8",
     "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, "") ?? "";

package/src/core/withUnistyles/withUnistyles.native.tsx

@@ -1,6 +1,6 @@
-import React, { forwardRef, useEffect, type ComponentType, useRef } from 'react'
+import React, { forwardRef, useEffect, useRef, type ComponentProps, type ComponentRef, type ComponentType } from 'react'
 import { type UnistyleDependency, UnistylesShadowRegistry } from '../../specs'
-import type { UnistylesTheme } from '../../types'
+import type { UnistylesTheme, UnistylesValues } from '../../types'
 import { deepMergeObjects } from '../../utils'
 import { useProxifiedUnistyles } from '../useProxifiedUnistyles'
 import { maybeWarnAboutMultipleUnistyles } from '../warn'
@@ -26,6 +26,10 @@ export const withUnistyles = <TComponent, TMappings extends GenericComponentProp
     type PropsWithUnistyles = Partial<TProps> & {
         uniProps?: Mappings<TProps>
     }
+    type UnistyleStyles = {
+        style?: UnistylesValues,
+        contentContainerStyle?: UnistylesValues
+    }
 
     const getSecrets = (styleProps: Record<string, any> = {}): MappedSecrets => {
         const styles = Array.isArray(styleProps)
@@ -57,7 +61,7 @@ export const withUnistyles = <TComponent, TMappings extends GenericComponentProp
     }
 
     return forwardRef<GenericComponentRef<TComponent>, PropsWithUnistyles>((props, ref) => {
-        const narrowedProps = props as PropsWithUnistyles
+        const narrowedProps = props as PropsWithUnistyles & UnistyleStyles
         const NativeComponent = Component as ComponentType
 
         // @ts-ignore we don't know the type of the component
@@ -94,7 +98,7 @@ export const withUnistyles = <TComponent, TMappings extends GenericComponentProp
         return (
             <NativeComponent
                 key={uniPropsKey || mappingsKey}
-                {...finalProps as TProps}
+                {...finalProps}
                 ref={ref}
             />
         )