react-native-unistyles 3.0.0-nightly-20250207 → 3.0.0-nightly-20250210

package/android/CMakeLists.txt

@@ -23,7 +23,7 @@ include_directories(
     ../cxx/shadowTree
 )
 
-string(APPEND CMAKE_CXX_FLAGS "-DFOLLY_NO_CONFIG=1 -DFOLLY_CFG_NO_COROUTINES=1 -DFOLLY_MOBILE=1")
+string(APPEND CMAKE_CXX_FLAGS " -DFOLLY_NO_CONFIG=1 -DFOLLY_CFG_NO_COROUTINES=1 -DFOLLY_MOBILE=1")
 
 set_target_properties(unistyles PROPERTIES
     CXX_STANDARD 20

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

@@ -6,11 +6,13 @@ import android.os.Build
 import android.util.DisplayMetrics
 import android.view.View
 import android.view.WindowManager
+import androidx.annotation.Keep
 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.proguard.annotations.DoNotStrip
 import com.facebook.react.bridge.LifecycleEventListener
 import com.facebook.react.bridge.ReactApplicationContext
 import com.margelo.nitro.unistyles.ColorScheme
@@ -22,6 +24,8 @@ import com.margelo.nitro.unistyles.UnistyleDependency
 import com.margelo.nitro.unistyles.UnistylesNativeMiniRuntime
 import java.util.Locale
 
+@Keep
+@DoNotStrip
 class NativePlatformAndroid(private val reactContext: ReactApplicationContext): HybridNativePlatformSpec(), LifecycleEventListener {
     private val _insets = NativePlatformInsets(reactContext, this::getMiniRuntime) { this.diffMiniRuntime() }
     private var _miniRuntime: UnistylesNativeMiniRuntime = buildMiniRuntime()

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

@@ -5,9 +5,11 @@ import android.os.Build
 import android.view.View
 import android.view.Window
 import android.view.WindowManager
+import androidx.annotation.Keep
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsAnimationCompat
 import androidx.core.view.WindowInsetsCompat
+import com.facebook.proguard.annotations.DoNotStrip
 import com.facebook.react.bridge.ReactApplicationContext
 import com.margelo.nitro.unistyles.Insets
 import com.margelo.nitro.unistyles.UnistyleDependency
@@ -15,6 +17,8 @@ import com.margelo.nitro.unistyles.UnistylesNativeMiniRuntime
 
 typealias CxxImeListener = (miniRuntime: UnistylesNativeMiniRuntime) -> Unit
 
+@Keep
+@DoNotStrip
 class NativePlatformInsets(
     private val reactContext: ReactApplicationContext,
     private val getMiniRuntime: () -> UnistylesNativeMiniRuntime,

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

@@ -6,12 +6,16 @@ import android.content.Intent
 import android.content.IntentFilter
 import android.os.Handler
 import android.os.Looper
+import androidx.annotation.Keep
+import com.facebook.proguard.annotations.DoNotStrip
 import com.facebook.react.bridge.ReactApplicationContext
 import com.margelo.nitro.unistyles.UnistyleDependency
 import com.margelo.nitro.unistyles.UnistylesNativeMiniRuntime
 
 typealias CxxDependencyListener = (dependencies: Array<UnistyleDependency>, miniRuntime: UnistylesNativeMiniRuntime) -> Unit
 
+@Keep
+@DoNotStrip
 class NativePlatformListener(
     private val reactContext: ReactApplicationContext,
     private val getMiniRuntime: () -> UnistylesNativeMiniRuntime,

package/android/src/main/java/com/unistyles/UnistylesModule.kt

@@ -11,6 +11,7 @@ import com.facebook.react.turbomodule.core.interfaces.TurboModuleWithJSIBindings
 import com.facebook.react.uimanager.UIManagerHelper
 import com.facebook.react.uimanager.common.UIManagerType
 import com.margelo.nitro.unistyles.HybridNativePlatformSpec
+import com.margelo.nitro.unistyles.unistylesOnLoad.Companion.initializeNative
 
 @Suppress("KotlinJniMissingFunction")
 class UnistylesModule(reactContext: ReactApplicationContext): NativeTurboUnistylesSpec(reactContext), TurboModuleWithJSIBindings {
@@ -20,6 +21,10 @@ class UnistylesModule(reactContext: ReactApplicationContext): NativeTurboUnistyl
 
     companion object {
         const val NAME = NativeTurboUnistylesSpec.NAME
+
+        init {
+            initializeNative()
+        }
     }
 
     init {

package/cxx/core/HashGenerator.cpp

@@ -17,7 +17,7 @@ std::string HashGenerator::generateHash(const std::string& input) {
     std::stringstream ss;
     ss << std::hex << std::setfill('0') << std::setw(8) << (combinedHash & 0xFFFFFFFF);
 
-    return "unistyles-" + ss.str();
+    return "unistyles_" + ss.str();
 }
 
 }

package/cxx/core/UnistyleWrapper.h

@@ -35,7 +35,7 @@ inline static Unistyle::Shared unistyleFromStaticStyleSheet(jsi::Runtime& rt, js
 
 inline static std::vector<std::string> getUnistylesHashKeys(jsi::Runtime& rt, jsi::Object& object) {
     std::vector<std::string> matchingKeys{};
-    const std::string prefix = "unistyles-";
+    const std::string prefix = "unistyles_";
 
     auto propertyNames = object.getPropertyNames(rt);
     size_t length = propertyNames.length(rt);
@@ -82,13 +82,13 @@ inline static std::vector<Unistyle::Shared> unistylesFromNonExistentNativeState(
 
 You likely altered unistyle hash key and we're not able to recover C++ state attached to this node.)");
     }
-    
+
     // someone merged unistyles, and will be warned in JS
     // the best we can do is to return first unistyle
     if (unistyles.size() > 1) {
         return {unistyles.at(0)};
     }
-    
+
     return unistyles;
 }
 
@@ -137,7 +137,7 @@ inline static jsi::Value objectFromUnistyle(jsi::Runtime& rt, std::shared_ptr<Hy
     auto parsedArguments = arguments.has_value()
         ? helpers::parseDynamicFunctionArguments(rt, arguments.value())
         : std::optional<std::vector<folly::dynamic>>{};
-    
+
     if (arguments.has_value()) {
         // this is required for HybridShadowRegistry::link
         helpers::defineHiddenProperty(rt, secrets, helpers::ARGUMENTS.c_str(), arguments.value());
@@ -148,7 +148,7 @@ inline static jsi::Value objectFromUnistyle(jsi::Runtime& rt, std::shared_ptr<Hy
 
     // this is required for withUnistyles
     helpers::defineHiddenProperty(rt, secrets, helpers::STYLE_DEPENDENCIES.c_str(), helpers::dependenciesToJSIArray(rt, unistyle->dependencies));
-    
+
     // this is required for withUnistyles
     auto hostFn = jsi::Function::createFromHostFunction(
         rt,
@@ -160,7 +160,7 @@ inline static jsi::Value objectFromUnistyle(jsi::Runtime& rt, std::shared_ptr<Hy
 
         return jsi::Value(rt, unistyle->parsedStyle.value()).asObject(rt);
     });
-    
+
     helpers::defineHiddenProperty(rt, secrets, helpers::GET_STYLES.c_str(), std::move(hostFn));
 
     obj.setProperty(rt, unistyleID, secrets);

package/lib/commonjs/components/native/Pressable.native.js

@@ -12,7 +12,7 @@ var _jsxRuntime = require("react/jsx-runtime");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 const getStyles = (styleProps = {}) => {
-  const unistyleKey = Object.keys(styleProps).find(key => key.startsWith('unistyles-'));
+  const unistyleKey = Object.keys(styleProps).find(key => key.startsWith('unistyles_'));
   if (!unistyleKey) {
     return styleProps;
   }
@@ -47,7 +47,7 @@ const Pressable = exports.Pressable = /*#__PURE__*/(0, _react.forwardRef)(({
     style: state => {
       const isPropStyleAFunction = typeof style === 'function';
       const unistyles = isPropStyleAFunction ? style.call(style, state) : getStyles(style);
-      if (!storedRef.current || !isPropStyleAFunction) {
+      if (!storedRef.current) {
         return unistyles;
       }
 

package/lib/commonjs/components/native/Pressable.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","_interopRequireWildcard","require","_reactNative","_core","_specs","_jsxRuntime","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","getStyles","styleProps","unistyleKey","keys","find","key","startsWith","uni__getStyles","Pressable","exports","forwardRef","variants","style","props","forwardedRef","storedRef","useRef","useLayoutEffect","current","UnistylesShadowRegistry","remove","jsx","ref","passForwardedRef","state","isPropStyleAFunction","unistyles","add"],"sourceRoot":"../../../../src","sources":["components/native/Pressable.native.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,uBAAA,CAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AAEA,IAAAE,KAAA,GAAAF,OAAA;AACA,IAAAG,MAAA,GAAAH,OAAA;AAAqD,IAAAI,WAAA,GAAAJ,OAAA;AAAA,SAAAK,yBAAAC,CAAA,6BAAAC,OAAA,mBAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,CAAA,WAAAA,CAAA,GAAAG,CAAA,GAAAD,CAAA,KAAAF,CAAA;AAAA,SAAAP,wBAAAO,CAAA,EAAAE,CAAA,SAAAA,CAAA,IAAAF,CAAA,IAAAA,CAAA,CAAAI,UAAA,SAAAJ,CAAA,eAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,WAAAK,OAAA,EAAAL,CAAA,QAAAG,CAAA,GAAAJ,wBAAA,CAAAG,CAAA,OAAAC,CAAA,IAAAA,CAAA,CAAAG,GAAA,CAAAN,CAAA,UAAAG,CAAA,CAAAI,GAAA,CAAAP,CAAA,OAAAQ,CAAA,KAAAC,SAAA,UAAAC,CAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,CAAA,IAAAd,CAAA,oBAAAc,CAAA,OAAAC,cAAA,CAAAC,IAAA,CAAAhB,CAAA,EAAAc,CAAA,SAAAG,CAAA,GAAAP,CAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAb,CAAA,EAAAc,CAAA,UAAAG,CAAA,KAAAA,CAAA,CAAAV,GAAA,IAAAU,CAAA,CAAAC,GAAA,IAAAP,MAAA,CAAAC,cAAA,CAAAJ,CAAA,EAAAM,CAAA,EAAAG,CAAA,IAAAT,CAAA,CAAAM,CAAA,IAAAd,CAAA,CAAAc,CAAA,YAAAN,CAAA,CAAAH,OAAA,GAAAL,CAAA,EAAAG,CAAA,IAAAA,CAAA,CAAAe,GAAA,CAAAlB,CAAA,EAAAQ,CAAA,GAAAA,CAAA;AAMrD,MAAMW,SAAS,GAAGA,CAACC,UAA+B,GAAG,CAAC,CAAC,KAAK;EACxD,MAAMC,WAAW,GAAGV,MAAM,CACrBW,IAAI,CAACF,UAAU,CAAC,CAChBG,IAAI,CAACC,GAAG,IAAIA,GAAG,CAACC,UAAU,CAAC,YAAY,CAAC,CAAC;EAE9C,IAAI,CAACJ,WAAW,EAAE;IACd,OAAOD,UAAU;EACrB;EAEA,OAAO;IACH;IACA,GAAGA,UAAU,CAACC,WAAW,CAAC,CAACK,cAAc,CAAC,CAAC;IAC3C,CAACL,WAAW,GAAGD,UAAU,CAACC,WAAW;EACzC,CAAC;AACL,CAAC;AAEM,MAAMM,SAAS,GAAAC,OAAA,CAAAD,SAAA,gBAAG,IAAAE,iBAAU,EAAuB,CAAC;EAAEC,QAAQ;EAAEC,KAAK;EAAE,GAAGC;AAAM,CAAC,EAAEC,YAAY,KAAK;EACvG,MAAMC,SAAS,GAAG,IAAAC,aAAM,EAAc,CAAC;EAEvC,IAAAC,sBAAe,EAAC,MAAM;IAClB,OAAO,MAAM;MACT,IAAIF,SAAS,CAACG,OAAO,EAAE;QACnB;QACAC,8BAAuB,CAACC,MAAM,CAACL,SAAS,CAACG,OAAO,CAAC;MACrD;IACJ,CAAC;EACL,CAAC,EAAE,EAAE,CAAC;EAEN,oBACI,IAAAvC,WAAA,CAAA0C,GAAA,EAAC7C,YAAA,CAAAgC,SAA0B;IAAA,GACnBK,KAAK;IACTS,GAAG,EAAEA,GAAG,IAAI;MACR,IAAIA,GAAG,EAAE;QACLP,SAAS,CAACG,OAAO,GAAGI,GAAG;MAC3B;MAEA,OAAO,IAAAC,sBAAgB,EAACV,KAAK,EAAES,GAAG,EAAER,YAAY,CAAC;IACrD,CAAE;IACFF,KAAK,EAAEY,KAAK,IAAI;MACZ,MAAMC,oBAAoB,GAAG,OAAOb,KAAK,KAAK,UAAU;MACxD,MAAMc,SAAS,GAAGD,oBAAoB,GAChCb,KAAK,CAACf,IAAI,CAACe,KAAK,EAAEY,KAAK,CAAC,GACxBxB,SAAS,CAACY,KAAuC,CAAC;MAExD,IAAI,CAACG,SAAS,CAACG,OAAO,IAAI,CAACO,oBAAoB,EAAE;QAC7C,OAAOC,SAAS;MACpB;;MAEA;MACAP,8BAAuB,CAACC,MAAM,CAACL,SAAS,CAACG,OAAO,CAAC;;MAEjD;MACAC,8BAAuB,CAACQ,GAAG,CAACZ,SAAS,CAACG,OAAO,EAAEQ,SAAS,CAAC;MAEzD,OAAOA,SAAS;IACpB;EAAE,CACL,CAAC;AAEV,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["_react","_interopRequireWildcard","require","_reactNative","_core","_specs","_jsxRuntime","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","getStyles","styleProps","unistyleKey","keys","find","key","startsWith","uni__getStyles","Pressable","exports","forwardRef","variants","style","props","forwardedRef","storedRef","useRef","useLayoutEffect","current","UnistylesShadowRegistry","remove","jsx","ref","passForwardedRef","state","isPropStyleAFunction","unistyles","add"],"sourceRoot":"../../../../src","sources":["components/native/Pressable.native.tsx"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/core/warn.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.maybeWarnAboutMultipleUnistyles = void 0;
 const maybeWarnAboutMultipleUnistyles = (style, displayName = 'Unknown') => {
   if (__DEV__ && style && !Array.isArray(style)) {
-    const unistylesKeys = Object.keys(style).filter(key => key.startsWith('unistyles-'));
+    const unistylesKeys = Object.keys(style).filter(key => key.startsWith('unistyles_'));
     if (unistylesKeys.length > 1) {
       console.warn(`Unistyles: we detected style object with ${unistylesKeys.length} unistyles styles. This might cause no updates or unpredictable behavior. Please check style prop for "${displayName}" and use array syntax instead of object syntax.`);
     }

package/lib/commonjs/core/withUnistyles/withUnistyles.js

@@ -33,7 +33,7 @@ const withUnistyles = (Component, mappings) => {
         style: styleClassNames
       } : {}),
       ...(narrowedProps.contentContainerStyle ? {
-        style: contentContainerStyleClassNames
+        contentContainerStyle: contentContainerStyleClassNames
       } : {})
     };
 

package/lib/commonjs/core/withUnistyles/withUnistyles.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","_interopRequireWildcard","require","_utils","_getClassname","_useProxifiedUnistyles","_warn","_jsxRuntime","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","withUnistyles","Component","mappings","forwardRef","props","ref","narrowedProps","styleClassNames","getClassName","style","contentContainerStyleClassNames","contentContainerStyle","proxifiedRuntime","proxifiedTheme","useProxifiedUnistyles","mappingsProps","unistyleProps","uniProps","combinedProps","deepMergeObjects","maybeWarnAboutMultipleUnistyles","displayName","name","NativeComponent","jsx","exports"],"sourceRoot":"../../../../src","sources":["core/withUnistyles/withUnistyles.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","_interopRequireWildcard","require","_utils","_getClassname","_useProxifiedUnistyles","_warn","_jsxRuntime","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","withUnistyles","Component","mappings","forwardRef","props","ref","narrowedProps","styleClassNames","getClassName","style","contentContainerStyleClassNames","contentContainerStyle","proxifiedRuntime","proxifiedTheme","useProxifiedUnistyles","mappingsProps","unistyleProps","uniProps","combinedProps","deepMergeObjects","maybeWarnAboutMultipleUnistyles","displayName","name","NativeComponent","jsx","exports"],"sourceRoot":"../../../../src","sources":["core/withUnistyles/withUnistyles.tsx"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/core/withUnistyles/withUnistyles.native.js

@@ -17,7 +17,7 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
 
 const withUnistyles = (Component, mappings) => {
   const getSecrets = (styleProps = {}) => {
-    const unistyleKey = Object.keys(styleProps).find(key => key.startsWith('unistyles-'));
+    const unistyleKey = Object.keys(styleProps).find(key => key.startsWith('unistyles_'));
     return unistyleKey ? styleProps[unistyleKey] : {
       uni__getStyles: () => styleProps,
       uni__dependencies: []

package/lib/commonjs/web/convert/index.js

@@ -20,7 +20,7 @@ const convertUnistyles = value => {
     ...value._web
   }).flatMap(([unistylesKey, unistylesValue]) => {
     // Keys to omit
-    if (['_classNames', '_web', 'variants', 'compoundVariants', 'uni__dependencies', '__unistyles-secrets__'].includes(unistylesKey) || unistylesKey.startsWith('variant-')) {
+    if (['_classNames', '_web', 'variants', 'compoundVariants', 'uni__dependencies'].includes(unistylesKey) || unistylesKey.startsWith('unistyles_')) {
       return [];
     }
 

package/lib/commonjs/web/convert/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_utils","require","_object","_pseudo","_shadow","_style","_utils2","convertUnistyles","value","hasTextShadow","hasShadow","stylesArray","Object","entries","_web","flatMap","unistylesKey","unistylesValue","includes","startsWith","isPseudo","flattenValues","isTextShadow","getTextShadowStyle","isShadow","getBoxShadowStyle","isFilter","getFilterStyle","isBoxShadow","getBoxShadow","isTransform","getTransformStyle","map","breakpointKey","breakpointValue","getStyle","deepMergeObjects","exports"],"sourceRoot":"../../../../src","sources":["web/convert/index.ts"],"mappings":";;;;;;AACA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,OAAA,GAAAD,OAAA;AACA,IAAAE,OAAA,GAAAF,OAAA;AACA,IAAAG,OAAA,GAAAH,OAAA;AACA,IAAAI,MAAA,GAAAJ,OAAA;AACA,IAAAK,OAAA,GAAAL,OAAA;AAEO,MAAMM,gBAAgB,GAAIC,KAAsB,IAAK;EACxD;EACA,IAAIC,aAAa,GAAG,KAAK;EACzB;EACA,IAAIC,SAAS,GAAG,KAAK;EAErB,MAAMC,WAAW,GAAGC,MAAM,CAACC,OAAO,CAAC;IAC/B,GAAGL,KAAK;IACR,GAAGA,KAAK,CAACM;EACb,CAAC,CAAC,CAACC,OAAO,CAAC,CAAC,CAACC,YAAY,EAAEC,cAAc,CAAC,KAAK;IAC3C;IACA,IAAI,CAAC,aAAa,EAAE,MAAM,EAAE,UAAU,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,uBAAuB,CAAC,CAACC,QAAQ,CAACF,YAAY,CAAC,IAAIA,YAAY,CAACG,UAAU,CAAC,UAAU,CAAC,EAAE;MACrK,OAAO,EAAE;IACb;;IAEA;IACA,IAAI,IAAAC,gBAAQ,EAACJ,YAAY,CAAC,EAAE;MACxB,MAAMK,aAAa,GAAGd,gBAAgB,CAACU,cAAiC,CAAC;MAEzE,OAAO;QAAE,CAACD,YAAY,GAAGK;MAAc,CAAC;IAC5C;;IAEA;IACA,IAAI,IAAAC,oBAAY,EAACN,YAAY,CAAC,EAAE;MAC5B,IAAIP,aAAa,EAAE;QACf,OAAO,EAAE;MACb;MAEAA,aAAa,GAAG,IAAI;MAEpB,OAAO,IAAAc,0BAAkB,EAACf,KAAK,CAAC;IACpC;;IAEA;IACA,IAAI,IAAAgB,gBAAQ,EAACR,YAAY,CAAC,EAAE;MACxB,IAAIN,SAAS,EAAE;QACX,OAAO,EAAE;MACb;MAEAA,SAAS,GAAG,IAAI;MAEhB,OAAO,IAAAe,yBAAiB,EAACjB,KAAK,CAAC;IACnC;IAEA,IAAI,IAAAkB,gBAAQ,EAACV,YAAY,EAAEC,cAAc,CAAC,EAAE;MACxC,OAAO,IAAAU,sBAAc,EAACV,cAAc,CAAC;IACzC;IAEA,IAAI,IAAAW,mBAAW,EAACZ,YAAY,EAAEC,cAAc,CAAC,EAAE;MAC3C,OAAO,IAAAY,oBAAY,EAACZ,cAAc,CAAC;IACvC;;IAEA;IACA,IAAI,IAAAa,mBAAW,EAACd,YAAY,EAAEC,cAAc,CAAC,EAAE;MAC3C,OAAO,IAAAc,yBAAiB,EAACd,cAAc,CAAC;IAC5C;;IAEA;IACA,IAAI,OAAOA,cAAc,KAAK,QAAQ,IAAIA,cAAc,KAAK,IAAI,EAAE;MAC/D,OAAOL,MAAM,CAACC,OAAO,CAACI,cAAc,CAAC,CAACe,GAAG,CAAC,CAAC,CAACC,aAAa,EAAEC,eAAe,CAAC,KAAK;QAC5E,OAAO;UAAE,CAACD,aAAa,GAAG,IAAAE,eAAQ,EAACnB,YAAY,EAAEkB,eAAe;QAAE,CAAC;MACvE,CAAC,CAAC;IACN;;IAEA;IACA,OAAO,IAAAC,eAAQ,EAACnB,YAAY,EAAEC,cAAc,CAAC;EACjD,CAAC,CAA+B;EAEhC,OAAO,IAAAmB,uBAAgB,EAAC,GAAGzB,WAAW,CAAC;AAC3C,CAAC;AAAA0B,OAAA,CAAA9B,gBAAA,GAAAA,gBAAA","ignoreList":[]}
+{"version":3,"names":["_utils","require","_object","_pseudo","_shadow","_style","_utils2","convertUnistyles","value","hasTextShadow","hasShadow","stylesArray","Object","entries","_web","flatMap","unistylesKey","unistylesValue","includes","startsWith","isPseudo","flattenValues","isTextShadow","getTextShadowStyle","isShadow","getBoxShadowStyle","isFilter","getFilterStyle","isBoxShadow","getBoxShadow","isTransform","getTransformStyle","map","breakpointKey","breakpointValue","getStyle","deepMergeObjects","exports"],"sourceRoot":"../../../../src","sources":["web/convert/index.ts"],"mappings":";;;;;;AACA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,OAAA,GAAAD,OAAA;AACA,IAAAE,OAAA,GAAAF,OAAA;AACA,IAAAG,OAAA,GAAAH,OAAA;AACA,IAAAI,MAAA,GAAAJ,OAAA;AACA,IAAAK,OAAA,GAAAL,OAAA;AAEO,MAAMM,gBAAgB,GAAIC,KAAsB,IAAK;EACxD;EACA,IAAIC,aAAa,GAAG,KAAK;EACzB;EACA,IAAIC,SAAS,GAAG,KAAK;EAErB,MAAMC,WAAW,GAAGC,MAAM,CAACC,OAAO,CAAC;IAC/B,GAAGL,KAAK;IACR,GAAGA,KAAK,CAACM;EACb,CAAC,CAAC,CAACC,OAAO,CAAC,CAAC,CAACC,YAAY,EAAEC,cAAc,CAAC,KAAK;IAC3C;IACA,IAAI,CAAC,aAAa,EAAE,MAAM,EAAE,UAAU,EAAE,kBAAkB,EAAE,mBAAmB,CAAC,CAACC,QAAQ,CAACF,YAAY,CAAC,IAAIA,YAAY,CAACG,UAAU,CAAC,YAAY,CAAC,EAAE;MAC9I,OAAO,EAAE;IACb;;IAEA;IACA,IAAI,IAAAC,gBAAQ,EAACJ,YAAY,CAAC,EAAE;MACxB,MAAMK,aAAa,GAAGd,gBAAgB,CAACU,cAAiC,CAAC;MAEzE,OAAO;QAAE,CAACD,YAAY,GAAGK;MAAc,CAAC;IAC5C;;IAEA;IACA,IAAI,IAAAC,oBAAY,EAACN,YAAY,CAAC,EAAE;MAC5B,IAAIP,aAAa,EAAE;QACf,OAAO,EAAE;MACb;MAEAA,aAAa,GAAG,IAAI;MAEpB,OAAO,IAAAc,0BAAkB,EAACf,KAAK,CAAC;IACpC;;IAEA;IACA,IAAI,IAAAgB,gBAAQ,EAACR,YAAY,CAAC,EAAE;MACxB,IAAIN,SAAS,EAAE;QACX,OAAO,EAAE;MACb;MAEAA,SAAS,GAAG,IAAI;MAEhB,OAAO,IAAAe,yBAAiB,EAACjB,KAAK,CAAC;IACnC;IAEA,IAAI,IAAAkB,gBAAQ,EAACV,YAAY,EAAEC,cAAc,CAAC,EAAE;MACxC,OAAO,IAAAU,sBAAc,EAACV,cAAc,CAAC;IACzC;IAEA,IAAI,IAAAW,mBAAW,EAACZ,YAAY,EAAEC,cAAc,CAAC,EAAE;MAC3C,OAAO,IAAAY,oBAAY,EAACZ,cAAc,CAAC;IACvC;;IAEA;IACA,IAAI,IAAAa,mBAAW,EAACd,YAAY,EAAEC,cAAc,CAAC,EAAE;MAC3C,OAAO,IAAAc,yBAAiB,EAACd,cAAc,CAAC;IAC5C;;IAEA;IACA,IAAI,OAAOA,cAAc,KAAK,QAAQ,IAAIA,cAAc,KAAK,IAAI,EAAE;MAC/D,OAAOL,MAAM,CAACC,OAAO,CAACI,cAAc,CAAC,CAACe,GAAG,CAAC,CAAC,CAACC,aAAa,EAAEC,eAAe,CAAC,KAAK;QAC5E,OAAO;UAAE,CAACD,aAAa,GAAG,IAAAE,eAAQ,EAACnB,YAAY,EAAEkB,eAAe;QAAE,CAAC;MACvE,CAAC,CAAC;IACN;;IAEA;IACA,OAAO,IAAAC,eAAQ,EAACnB,YAAY,EAAEC,cAAc,CAAC;EACjD,CAAC,CAA+B;EAEhC,OAAO,IAAAmB,uBAAgB,EAAC,GAAGzB,WAAW,CAAC;AAC3C,CAAC;AAAA0B,OAAA,CAAA9B,gBAAA,GAAAA,gBAAA","ignoreList":[]}

package/lib/commonjs/web/utils/common.js

@@ -53,7 +53,7 @@ const cyrb53 = (data, seed = 0) => {
 };
 const generateHash = value => {
   const serialized = serialize(value);
-  return `unistyles-${cyrb53(serialized).toString(36)}`;
+  return `unistyles_${cyrb53(serialized).toString(36)}`;
 };
 exports.generateHash = generateHash;
 //# sourceMappingURL=common.js.map

package/lib/commonjs/web/utils/unistyle.js

@@ -22,9 +22,9 @@ const assignSecrets = (object, secrets) => {
   const secretsId = Math.random().toString(36).slice(8);
 
   // @ts-expect-error assign hidden secrets
-  object[`unistyles-${secretsId}`] = {};
+  object[`unistyles_${secretsId}`] = {};
   // @ts-expect-error assign hidden secrets
-  Object.defineProperties(object[`unistyles-${secretsId}`], (0, _common.reduceObject)(secrets, secret => ({
+  Object.defineProperties(object[`unistyles_${secretsId}`], (0, _common.reduceObject)(secrets, secret => ({
     value: secret,
     enumerable: false,
     configurable: true
@@ -36,7 +36,7 @@ const extractSecrets = object => {
   if (!object) {
     return undefined;
   }
-  const [, secrets] = Object.entries(object).find(([key]) => key.startsWith('unistyles-')) ?? [];
+  const [, secrets] = Object.entries(object).find(([key]) => key.startsWith('unistyles_')) ?? [];
   if (!secrets) {
     return undefined;
   }

package/lib/module/components/native/Pressable.native.js

@@ -6,7 +6,7 @@ import { passForwardedRef } from '../../core';
 import { UnistylesShadowRegistry } from '../../specs';
 import { jsx as _jsx } from "react/jsx-runtime";
 const getStyles = (styleProps = {}) => {
-  const unistyleKey = Object.keys(styleProps).find(key => key.startsWith('unistyles-'));
+  const unistyleKey = Object.keys(styleProps).find(key => key.startsWith('unistyles_'));
   if (!unistyleKey) {
     return styleProps;
   }
@@ -41,7 +41,7 @@ export const Pressable = /*#__PURE__*/forwardRef(({
     style: state => {
       const isPropStyleAFunction = typeof style === 'function';
       const unistyles = isPropStyleAFunction ? style.call(style, state) : getStyles(style);
-      if (!storedRef.current || !isPropStyleAFunction) {
+      if (!storedRef.current) {
         return unistyles;
       }
 

package/lib/module/components/native/Pressable.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","forwardRef","useLayoutEffect","useRef","Pressable","NativePressableReactNative","passForwardedRef","UnistylesShadowRegistry","jsx","_jsx","getStyles","styleProps","unistyleKey","Object","keys","find","key","startsWith","uni__getStyles","variants","style","props","forwardedRef","storedRef","current","remove","ref","state","isPropStyleAFunction","unistyles","call","add"],"sourceRoot":"../../../../src","sources":["components/native/Pressable.native.tsx"],"mappings":";;AAAA,OAAOA,KAAK,IAAIC,UAAU,EAAEC,eAAe,EAAEC,MAAM,QAAQ,OAAO;AAClE,SAASC,SAAS,IAAIC,0BAA0B,QAAQ,cAAc;AAEtE,SAASC,gBAAgB,QAAQ,YAAY;AAC7C,SAASC,uBAAuB,QAAQ,aAAa;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAMrD,MAAMC,SAAS,GAAGA,CAACC,UAA+B,GAAG,CAAC,CAAC,KAAK;EACxD,MAAMC,WAAW,GAAGC,MAAM,CACrBC,IAAI,CAACH,UAAU,CAAC,CAChBI,IAAI,CAACC,GAAG,IAAIA,GAAG,CAACC,UAAU,CAAC,YAAY,CAAC,CAAC;EAE9C,IAAI,CAACL,WAAW,EAAE;IACd,OAAOD,UAAU;EACrB;EAEA,OAAO;IACH;IACA,GAAGA,UAAU,CAACC,WAAW,CAAC,CAACM,cAAc,CAAC,CAAC;IAC3C,CAACN,WAAW,GAAGD,UAAU,CAACC,WAAW;EACzC,CAAC;AACL,CAAC;AAED,OAAO,MAAMR,SAAS,gBAAGH,UAAU,CAAuB,CAAC;EAAEkB,QAAQ;EAAEC,KAAK;EAAE,GAAGC;AAAM,CAAC,EAAEC,YAAY,KAAK;EACvG,MAAMC,SAAS,GAAGpB,MAAM,CAAc,CAAC;EAEvCD,eAAe,CAAC,MAAM;IAClB,OAAO,MAAM;MACT,IAAIqB,SAAS,CAACC,OAAO,EAAE;QACnB;QACAjB,uBAAuB,CAACkB,MAAM,CAACF,SAAS,CAACC,OAAO,CAAC;MACrD;IACJ,CAAC;EACL,CAAC,EAAE,EAAE,CAAC;EAEN,oBACIf,IAAA,CAACJ,0BAA0B;IAAA,GACnBgB,KAAK;IACTK,GAAG,EAAEA,GAAG,IAAI;MACR,IAAIA,GAAG,EAAE;QACLH,SAAS,CAACC,OAAO,GAAGE,GAAG;MAC3B;MAEA,OAAOpB,gBAAgB,CAACe,KAAK,EAAEK,GAAG,EAAEJ,YAAY,CAAC;IACrD,CAAE;IACFF,KAAK,EAAEO,KAAK,IAAI;MACZ,MAAMC,oBAAoB,GAAG,OAAOR,KAAK,KAAK,UAAU;MACxD,MAAMS,SAAS,GAAGD,oBAAoB,GAChCR,KAAK,CAACU,IAAI,CAACV,KAAK,EAAEO,KAAK,CAAC,GACxBjB,SAAS,CAACU,KAAuC,CAAC;MAExD,IAAI,CAACG,SAAS,CAACC,OAAO,IAAI,CAACI,oBAAoB,EAAE;QAC7C,OAAOC,SAAS;MACpB;;MAEA;MACAtB,uBAAuB,CAACkB,MAAM,CAACF,SAAS,CAACC,OAAO,CAAC;;MAEjD;MACAjB,uBAAuB,CAACwB,GAAG,CAACR,SAAS,CAACC,OAAO,EAAEK,SAAS,CAAC;MAEzD,OAAOA,SAAS;IACpB;EAAE,CACL,CAAC;AAEV,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["React","forwardRef","useLayoutEffect","useRef","Pressable","NativePressableReactNative","passForwardedRef","UnistylesShadowRegistry","jsx","_jsx","getStyles","styleProps","unistyleKey","Object","keys","find","key","startsWith","uni__getStyles","variants","style","props","forwardedRef","storedRef","current","remove","ref","state","isPropStyleAFunction","unistyles","call","add"],"sourceRoot":"../../../../src","sources":["components/native/Pressable.native.tsx"],"mappings":";;AAAA,OAAOA,KAAK,IAAIC,UAAU,EAAEC,eAAe,EAAEC,MAAM,QAAQ,OAAO;AAClE,SAASC,SAAS,IAAIC,0BAA0B,QAAQ,cAAc;AAEtE,SAASC,gBAAgB,QAAQ,YAAY;AAC7C,SAASC,uBAAuB,QAAQ,aAAa;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAMrD,MAAMC,SAAS,GAAGA,CAACC,UAA+B,GAAG,CAAC,CAAC,KAAK;EACxD,MAAMC,WAAW,GAAGC,MAAM,CACrBC,IAAI,CAACH,UAAU,CAAC,CAChBI,IAAI,CAACC,GAAG,IAAIA,GAAG,CAACC,UAAU,CAAC,YAAY,CAAC,CAAC;EAE9C,IAAI,CAACL,WAAW,EAAE;IACd,OAAOD,UAAU;EACrB;EAEA,OAAO;IACH;IACA,GAAGA,UAAU,CAACC,WAAW,CAAC,CAACM,cAAc,CAAC,CAAC;IAC3C,CAACN,WAAW,GAAGD,UAAU,CAACC,WAAW;EACzC,CAAC;AACL,CAAC;AAED,OAAO,MAAMR,SAAS,gBAAGH,UAAU,CAAuB,CAAC;EAAEkB,QAAQ;EAAEC,KAAK;EAAE,GAAGC;AAAM,CAAC,EAAEC,YAAY,KAAK;EACvG,MAAMC,SAAS,GAAGpB,MAAM,CAAc,CAAC;EAEvCD,eAAe,CAAC,MAAM;IAClB,OAAO,MAAM;MACT,IAAIqB,SAAS,CAACC,OAAO,EAAE;QACnB;QACAjB,uBAAuB,CAACkB,MAAM,CAACF,SAAS,CAACC,OAAO,CAAC;MACrD;IACJ,CAAC;EACL,CAAC,EAAE,EAAE,CAAC;EAEN,oBACIf,IAAA,CAACJ,0BAA0B;IAAA,GACnBgB,KAAK;IACTK,GAAG,EAAEA,GAAG,IAAI;MACR,IAAIA,GAAG,EAAE;QACLH,SAAS,CAACC,OAAO,GAAGE,GAAG;MAC3B;MAEA,OAAOpB,gBAAgB,CAACe,KAAK,EAAEK,GAAG,EAAEJ,YAAY,CAAC;IACrD,CAAE;IACFF,KAAK,EAAEO,KAAK,IAAI;MACZ,MAAMC,oBAAoB,GAAG,OAAOR,KAAK,KAAK,UAAU;MACxD,MAAMS,SAAS,GAAGD,oBAAoB,GAChCR,KAAK,CAACU,IAAI,CAACV,KAAK,EAAEO,KAAK,CAAC,GACxBjB,SAAS,CAACU,KAAuC,CAAC;MAExD,IAAI,CAACG,SAAS,CAACC,OAAO,EAAE;QACpB,OAAOK,SAAS;MACpB;;MAEA;MACAtB,uBAAuB,CAACkB,MAAM,CAACF,SAAS,CAACC,OAAO,CAAC;;MAEjD;MACAjB,uBAAuB,CAACwB,GAAG,CAACR,SAAS,CAACC,OAAO,EAAEK,SAAS,CAAC;MAEzD,OAAOA,SAAS;IACpB;EAAE,CACL,CAAC;AAEV,CAAC,CAAC","ignoreList":[]}

package/lib/module/core/warn.js

@@ -2,7 +2,7 @@
 
 export const maybeWarnAboutMultipleUnistyles = (style, displayName = 'Unknown') => {
   if (__DEV__ && style && !Array.isArray(style)) {
-    const unistylesKeys = Object.keys(style).filter(key => key.startsWith('unistyles-'));
+    const unistylesKeys = Object.keys(style).filter(key => key.startsWith('unistyles_'));
     if (unistylesKeys.length > 1) {
       console.warn(`Unistyles: we detected style object with ${unistylesKeys.length} unistyles styles. This might cause no updates or unpredictable behavior. Please check style prop for "${displayName}" and use array syntax instead of object syntax.`);
     }

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

@@ -27,7 +27,7 @@ export const withUnistyles = (Component, mappings) => {
         style: styleClassNames
       } : {}),
       ...(narrowedProps.contentContainerStyle ? {
-        style: contentContainerStyleClassNames
+        contentContainerStyle: contentContainerStyleClassNames
       } : {})
     };
 

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

@@ -1 +1 @@
-{"version":3,"names":["React","forwardRef","deepMergeObjects","getClassName","useProxifiedUnistyles","maybeWarnAboutMultipleUnistyles","jsx","_jsx","withUnistyles","Component","mappings","props","ref","narrowedProps","styleClassNames","style","contentContainerStyleClassNames","contentContainerStyle","proxifiedRuntime","proxifiedTheme","mappingsProps","unistyleProps","uniProps","combinedProps","displayName","name","NativeComponent"],"sourceRoot":"../../../../src","sources":["core/withUnistyles/withUnistyles.tsx"],"mappings":";;AAAA,OAAOA,KAAK,IAAwBC,UAAU,QAAgD,OAAO;AAGrG,SAASC,gBAAgB,QAAQ,aAAa;AAC9C,SAASC,YAAY,QAAQ,iBAAiB;AAC9C,SAASC,qBAAqB,QAAQ,0BAA0B;AAChE,SAASC,+BAA+B,QAAQ,SAAS;;AAGzD;;AAEA;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAGA,OAAO,MAAMC,aAAa,GAAGA,CAAkEC,SAAqB,EAAEC,QAA8B,KAAK;EAUrJ,oBAAOT,UAAU,CAAsD,CAACU,KAAK,EAAEC,GAAG,KAAK;IACnF,MAAMC,aAAa,GAAGF,KAA4C;IAClE,MAAMG,eAAe,GAAGX,YAAY,CAACU,aAAa,CAACE,KAAK,CAAC;IACzD,MAAMC,+BAA+B,GAAGb,YAAY,CAACU,aAAa,CAACI,qBAAqB,CAAC;IACzF,MAAM;MAAEC,gBAAgB;MAAEC;IAAe,CAAC,GAAGf,qBAAqB,CAAC,CAAC;IAEpE,MAAMgB,aAAa,GAAGV,QAAQ,GAAGA,QAAQ,CAACS,cAAc,EAAED,gBAAgB,CAAC,GAAG,CAAC,CAAC;IAChF,MAAMG,aAAa,GAAGR,aAAa,CAACS,QAAQ,GAAGT,aAAa,CAACS,QAAQ,CAACH,cAAc,EAAED,gBAAgB,CAAC,GAAG,CAAC,CAAC;IAE5G,MAAMK,aAAa,GAAG;MAClB,GAAGrB,gBAAgB,CAACkB,aAAa,EAAEC,aAAa,EAAEV,KAAK,CAAC;MACxD,IAAGE,aAAa,CAACE,KAAK,GAAG;QACrBA,KAAK,EAAED;MACX,CAAC,GAAG,CAAC,CAAC;MACN,IAAGD,aAAa,CAACI,qBAAqB,GAAG;QACrCF,KAAK,EAAEC;MACX,CAAC,GAAG,CAAC,CAAC;IACV,CAAQ;;IAER;IACAX,+BAA+B,CAACQ,aAAa,CAACE,KAAK,EAAE,iBAAiBN,SAAS,CAACe,WAAW,IAAIf,SAAS,CAACgB,IAAI,IAAI,SAAS,GAAG,CAAC;IAC9H;IACApB,+BAA+B,CAACQ,aAAa,CAACI,qBAAqB,EAAE,iBAAiBR,SAAS,CAACe,WAAW,IAAIf,SAAS,CAACgB,IAAI,IAAI,SAAS,GAAG,CAAC;IAE9I,MAAMC,eAAe,GAAGjB,SAA0B;IAElD,oBAAOF,IAAA,CAACmB,eAAe;MAAA,GAAKH,aAAa;MAAEX,GAAG,EAAEA;IAAI,CAAE,CAAC;EAC3D,CAAC,CAAC;AACN,CAAC","ignoreList":[]}
+{"version":3,"names":["React","forwardRef","deepMergeObjects","getClassName","useProxifiedUnistyles","maybeWarnAboutMultipleUnistyles","jsx","_jsx","withUnistyles","Component","mappings","props","ref","narrowedProps","styleClassNames","style","contentContainerStyleClassNames","contentContainerStyle","proxifiedRuntime","proxifiedTheme","mappingsProps","unistyleProps","uniProps","combinedProps","displayName","name","NativeComponent"],"sourceRoot":"../../../../src","sources":["core/withUnistyles/withUnistyles.tsx"],"mappings":";;AAAA,OAAOA,KAAK,IAAwBC,UAAU,QAAgD,OAAO;AAGrG,SAASC,gBAAgB,QAAQ,aAAa;AAC9C,SAASC,YAAY,QAAQ,iBAAiB;AAC9C,SAASC,qBAAqB,QAAQ,0BAA0B;AAChE,SAASC,+BAA+B,QAAQ,SAAS;;AAGzD;;AAEA;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAGA,OAAO,MAAMC,aAAa,GAAGA,CAAkEC,SAAqB,EAAEC,QAA8B,KAAK;EAUrJ,oBAAOT,UAAU,CAAsD,CAACU,KAAK,EAAEC,GAAG,KAAK;IACnF,MAAMC,aAAa,GAAGF,KAA4C;IAClE,MAAMG,eAAe,GAAGX,YAAY,CAACU,aAAa,CAACE,KAAK,CAAC;IACzD,MAAMC,+BAA+B,GAAGb,YAAY,CAACU,aAAa,CAACI,qBAAqB,CAAC;IACzF,MAAM;MAAEC,gBAAgB;MAAEC;IAAe,CAAC,GAAGf,qBAAqB,CAAC,CAAC;IAEpE,MAAMgB,aAAa,GAAGV,QAAQ,GAAGA,QAAQ,CAACS,cAAc,EAAED,gBAAgB,CAAC,GAAG,CAAC,CAAC;IAChF,MAAMG,aAAa,GAAGR,aAAa,CAACS,QAAQ,GAAGT,aAAa,CAACS,QAAQ,CAACH,cAAc,EAAED,gBAAgB,CAAC,GAAG,CAAC,CAAC;IAE5G,MAAMK,aAAa,GAAG;MAClB,GAAGrB,gBAAgB,CAACkB,aAAa,EAAEC,aAAa,EAAEV,KAAK,CAAC;MACxD,IAAGE,aAAa,CAACE,KAAK,GAAG;QACrBA,KAAK,EAAED;MACX,CAAC,GAAG,CAAC,CAAC;MACN,IAAGD,aAAa,CAACI,qBAAqB,GAAG;QACrCA,qBAAqB,EAAED;MAC3B,CAAC,GAAG,CAAC,CAAC;IACV,CAAQ;;IAER;IACAX,+BAA+B,CAACQ,aAAa,CAACE,KAAK,EAAE,iBAAiBN,SAAS,CAACe,WAAW,IAAIf,SAAS,CAACgB,IAAI,IAAI,SAAS,GAAG,CAAC;IAC9H;IACApB,+BAA+B,CAACQ,aAAa,CAACI,qBAAqB,EAAE,iBAAiBR,SAAS,CAACe,WAAW,IAAIf,SAAS,CAACgB,IAAI,IAAI,SAAS,GAAG,CAAC;IAE9I,MAAMC,eAAe,GAAGjB,SAA0B;IAElD,oBAAOF,IAAA,CAACmB,eAAe;MAAA,GAAKH,aAAa;MAAEX,GAAG,EAAEA;IAAI,CAAE,CAAC;EAC3D,CAAC,CAAC;AACN,CAAC","ignoreList":[]}

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

@@ -11,7 +11,7 @@ import { maybeWarnAboutMultipleUnistyles } from '../warn';
 import { jsx as _jsx } from "react/jsx-runtime";
 export const withUnistyles = (Component, mappings) => {
   const getSecrets = (styleProps = {}) => {
-    const unistyleKey = Object.keys(styleProps).find(key => key.startsWith('unistyles-'));
+    const unistyleKey = Object.keys(styleProps).find(key => key.startsWith('unistyles_'));
     return unistyleKey ? styleProps[unistyleKey] : {
       uni__getStyles: () => styleProps,
       uni__dependencies: []

package/lib/module/web/convert/index.js

@@ -16,7 +16,7 @@ export const convertUnistyles = value => {
     ...value._web
   }).flatMap(([unistylesKey, unistylesValue]) => {
     // Keys to omit
-    if (['_classNames', '_web', 'variants', 'compoundVariants', 'uni__dependencies', '__unistyles-secrets__'].includes(unistylesKey) || unistylesKey.startsWith('variant-')) {
+    if (['_classNames', '_web', 'variants', 'compoundVariants', 'uni__dependencies'].includes(unistylesKey) || unistylesKey.startsWith('unistyles_')) {
       return [];
     }
 

package/lib/module/web/convert/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["deepMergeObjects","getBoxShadow","getFilterStyle","getTransformStyle","isPseudo","getBoxShadowStyle","getTextShadowStyle","getStyle","isBoxShadow","isFilter","isShadow","isTextShadow","isTransform","convertUnistyles","value","hasTextShadow","hasShadow","stylesArray","Object","entries","_web","flatMap","unistylesKey","unistylesValue","includes","startsWith","flattenValues","map","breakpointKey","breakpointValue"],"sourceRoot":"../../../../src","sources":["web/convert/index.ts"],"mappings":";;AACA,SAASA,gBAAgB,QAAQ,aAAa;AAC9C,SAASC,YAAY,EAAEC,cAAc,EAAEC,iBAAiB,QAAQ,UAAU;AAC1E,SAASC,QAAQ,QAAQ,UAAU;AACnC,SAASC,iBAAiB,EAAEC,kBAAkB,QAAQ,UAAU;AAChE,SAASC,QAAQ,QAAQ,SAAS;AAClC,SAASC,WAAW,EAAEC,QAAQ,EAAEC,QAAQ,EAAEC,YAAY,EAAEC,WAAW,QAAQ,SAAS;AAEpF,OAAO,MAAMC,gBAAgB,GAAIC,KAAsB,IAAK;EACxD;EACA,IAAIC,aAAa,GAAG,KAAK;EACzB;EACA,IAAIC,SAAS,GAAG,KAAK;EAErB,MAAMC,WAAW,GAAGC,MAAM,CAACC,OAAO,CAAC;IAC/B,GAAGL,KAAK;IACR,GAAGA,KAAK,CAACM;EACb,CAAC,CAAC,CAACC,OAAO,CAAC,CAAC,CAACC,YAAY,EAAEC,cAAc,CAAC,KAAK;IAC3C;IACA,IAAI,CAAC,aAAa,EAAE,MAAM,EAAE,UAAU,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,uBAAuB,CAAC,CAACC,QAAQ,CAACF,YAAY,CAAC,IAAIA,YAAY,CAACG,UAAU,CAAC,UAAU,CAAC,EAAE;MACrK,OAAO,EAAE;IACb;;IAEA;IACA,IAAIrB,QAAQ,CAACkB,YAAY,CAAC,EAAE;MACxB,MAAMI,aAAa,GAAGb,gBAAgB,CAACU,cAAiC,CAAC;MAEzE,OAAO;QAAE,CAACD,YAAY,GAAGI;MAAc,CAAC;IAC5C;;IAEA;IACA,IAAIf,YAAY,CAACW,YAAY,CAAC,EAAE;MAC5B,IAAIP,aAAa,EAAE;QACf,OAAO,EAAE;MACb;MAEAA,aAAa,GAAG,IAAI;MAEpB,OAAOT,kBAAkB,CAACQ,KAAK,CAAC;IACpC;;IAEA;IACA,IAAIJ,QAAQ,CAACY,YAAY,CAAC,EAAE;MACxB,IAAIN,SAAS,EAAE;QACX,OAAO,EAAE;MACb;MAEAA,SAAS,GAAG,IAAI;MAEhB,OAAOX,iBAAiB,CAACS,KAAK,CAAC;IACnC;IAEA,IAAIL,QAAQ,CAACa,YAAY,EAAEC,cAAc,CAAC,EAAE;MACxC,OAAOrB,cAAc,CAACqB,cAAc,CAAC;IACzC;IAEA,IAAIf,WAAW,CAACc,YAAY,EAAEC,cAAc,CAAC,EAAE;MAC3C,OAAOtB,YAAY,CAACsB,cAAc,CAAC;IACvC;;IAEA;IACA,IAAIX,WAAW,CAACU,YAAY,EAAEC,cAAc,CAAC,EAAE;MAC3C,OAAOpB,iBAAiB,CAACoB,cAAc,CAAC;IAC5C;;IAEA;IACA,IAAI,OAAOA,cAAc,KAAK,QAAQ,IAAIA,cAAc,KAAK,IAAI,EAAE;MAC/D,OAAOL,MAAM,CAACC,OAAO,CAACI,cAAc,CAAC,CAACI,GAAG,CAAC,CAAC,CAACC,aAAa,EAAEC,eAAe,CAAC,KAAK;QAC5E,OAAO;UAAE,CAACD,aAAa,GAAGrB,QAAQ,CAACe,YAAY,EAAEO,eAAe;QAAE,CAAC;MACvE,CAAC,CAAC;IACN;;IAEA;IACA,OAAOtB,QAAQ,CAACe,YAAY,EAAEC,cAAc,CAAC;EACjD,CAAC,CAA+B;EAEhC,OAAOvB,gBAAgB,CAAC,GAAGiB,WAAW,CAAC;AAC3C,CAAC","ignoreList":[]}
+{"version":3,"names":["deepMergeObjects","getBoxShadow","getFilterStyle","getTransformStyle","isPseudo","getBoxShadowStyle","getTextShadowStyle","getStyle","isBoxShadow","isFilter","isShadow","isTextShadow","isTransform","convertUnistyles","value","hasTextShadow","hasShadow","stylesArray","Object","entries","_web","flatMap","unistylesKey","unistylesValue","includes","startsWith","flattenValues","map","breakpointKey","breakpointValue"],"sourceRoot":"../../../../src","sources":["web/convert/index.ts"],"mappings":";;AACA,SAASA,gBAAgB,QAAQ,aAAa;AAC9C,SAASC,YAAY,EAAEC,cAAc,EAAEC,iBAAiB,QAAQ,UAAU;AAC1E,SAASC,QAAQ,QAAQ,UAAU;AACnC,SAASC,iBAAiB,EAAEC,kBAAkB,QAAQ,UAAU;AAChE,SAASC,QAAQ,QAAQ,SAAS;AAClC,SAASC,WAAW,EAAEC,QAAQ,EAAEC,QAAQ,EAAEC,YAAY,EAAEC,WAAW,QAAQ,SAAS;AAEpF,OAAO,MAAMC,gBAAgB,GAAIC,KAAsB,IAAK;EACxD;EACA,IAAIC,aAAa,GAAG,KAAK;EACzB;EACA,IAAIC,SAAS,GAAG,KAAK;EAErB,MAAMC,WAAW,GAAGC,MAAM,CAACC,OAAO,CAAC;IAC/B,GAAGL,KAAK;IACR,GAAGA,KAAK,CAACM;EACb,CAAC,CAAC,CAACC,OAAO,CAAC,CAAC,CAACC,YAAY,EAAEC,cAAc,CAAC,KAAK;IAC3C;IACA,IAAI,CAAC,aAAa,EAAE,MAAM,EAAE,UAAU,EAAE,kBAAkB,EAAE,mBAAmB,CAAC,CAACC,QAAQ,CAACF,YAAY,CAAC,IAAIA,YAAY,CAACG,UAAU,CAAC,YAAY,CAAC,EAAE;MAC9I,OAAO,EAAE;IACb;;IAEA;IACA,IAAIrB,QAAQ,CAACkB,YAAY,CAAC,EAAE;MACxB,MAAMI,aAAa,GAAGb,gBAAgB,CAACU,cAAiC,CAAC;MAEzE,OAAO;QAAE,CAACD,YAAY,GAAGI;MAAc,CAAC;IAC5C;;IAEA;IACA,IAAIf,YAAY,CAACW,YAAY,CAAC,EAAE;MAC5B,IAAIP,aAAa,EAAE;QACf,OAAO,EAAE;MACb;MAEAA,aAAa,GAAG,IAAI;MAEpB,OAAOT,kBAAkB,CAACQ,KAAK,CAAC;IACpC;;IAEA;IACA,IAAIJ,QAAQ,CAACY,YAAY,CAAC,EAAE;MACxB,IAAIN,SAAS,EAAE;QACX,OAAO,EAAE;MACb;MAEAA,SAAS,GAAG,IAAI;MAEhB,OAAOX,iBAAiB,CAACS,KAAK,CAAC;IACnC;IAEA,IAAIL,QAAQ,CAACa,YAAY,EAAEC,cAAc,CAAC,EAAE;MACxC,OAAOrB,cAAc,CAACqB,cAAc,CAAC;IACzC;IAEA,IAAIf,WAAW,CAACc,YAAY,EAAEC,cAAc,CAAC,EAAE;MAC3C,OAAOtB,YAAY,CAACsB,cAAc,CAAC;IACvC;;IAEA;IACA,IAAIX,WAAW,CAACU,YAAY,EAAEC,cAAc,CAAC,EAAE;MAC3C,OAAOpB,iBAAiB,CAACoB,cAAc,CAAC;IAC5C;;IAEA;IACA,IAAI,OAAOA,cAAc,KAAK,QAAQ,IAAIA,cAAc,KAAK,IAAI,EAAE;MAC/D,OAAOL,MAAM,CAACC,OAAO,CAACI,cAAc,CAAC,CAACI,GAAG,CAAC,CAAC,CAACC,aAAa,EAAEC,eAAe,CAAC,KAAK;QAC5E,OAAO;UAAE,CAACD,aAAa,GAAGrB,QAAQ,CAACe,YAAY,EAAEO,eAAe;QAAE,CAAC;MACvE,CAAC,CAAC;IACN;;IAEA;IACA,OAAOtB,QAAQ,CAACe,YAAY,EAAEC,cAAc,CAAC;EACjD,CAAC,CAA+B;EAEhC,OAAOvB,gBAAgB,CAAC,GAAGiB,WAAW,CAAC;AAC3C,CAAC","ignoreList":[]}

package/lib/module/web/utils/common.js

@@ -42,6 +42,6 @@ const cyrb53 = (data, seed = 0) => {
 };
 export const generateHash = value => {
   const serialized = serialize(value);
-  return `unistyles-${cyrb53(serialized).toString(36)}`;
+  return `unistyles_${cyrb53(serialized).toString(36)}`;
 };
 //# sourceMappingURL=common.js.map

package/lib/module/web/utils/unistyle.js

@@ -17,9 +17,9 @@ export const assignSecrets = (object, secrets) => {
   const secretsId = Math.random().toString(36).slice(8);
 
   // @ts-expect-error assign hidden secrets
-  object[`unistyles-${secretsId}`] = {};
+  object[`unistyles_${secretsId}`] = {};
   // @ts-expect-error assign hidden secrets
-  Object.defineProperties(object[`unistyles-${secretsId}`], reduceObject(secrets, secret => ({
+  Object.defineProperties(object[`unistyles_${secretsId}`], reduceObject(secrets, secret => ({
     value: secret,
     enumerable: false,
     configurable: true
@@ -30,7 +30,7 @@ export const extractSecrets = object => {
   if (!object) {
     return undefined;
   }
-  const [, secrets] = Object.entries(object).find(([key]) => key.startsWith('unistyles-')) ?? [];
+  const [, secrets] = Object.entries(object).find(([key]) => key.startsWith('unistyles_')) ?? [];
   if (!secrets) {
     return undefined;
   }

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

@@ -32,7 +32,7 @@ namespace margelo::nitro::unistyles {
       _javaPart(jni::make_global(jThis)) {}
 
   public:
-    virtual ~JHybridNativePlatformSpec() {
+    ~JHybridNativePlatformSpec() override {
       // Hermes GC can destroy JS objects on a non-JNI Thread.
       jni::ThreadScope::WithClassLoader([&] { _javaPart.reset(); });
     }

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

@@ -7,7 +7,6 @@
 
 package com.margelo.nitro.unistyles
 
-import android.util.Log
 import androidx.annotation.Keep
 import com.facebook.jni.HybridData
 import com.facebook.proguard.annotations.DoNotStrip
@@ -29,100 +28,96 @@ abstract class HybridNativePlatformSpec: HybridObject() {
   private var mHybridData: HybridData = initHybrid()
 
   init {
-    // Pass this `HybridData` through to it's base class,
-    // to represent inheritance to JHybridObject on C++ side
     super.updateNative(mHybridData)
   }
 
-  /**
-   * Call from a child class to initialize HybridData with a child.
-   */
   override fun updateNative(hybridData: HybridData) {
     mHybridData = hybridData
+    super.updateNative(hybridData)
   }
 
   // Properties
-  
+
 
   // Methods
   @DoNotStrip
   @Keep
   abstract fun getInsets(): Insets
-  
+
   @DoNotStrip
   @Keep
   abstract fun getColorScheme(): ColorScheme
-  
+
   @DoNotStrip
   @Keep
   abstract fun getFontScale(): Double
-  
+
   @DoNotStrip
   @Keep
   abstract fun getPixelRatio(): Double
-  
+
   @DoNotStrip
   @Keep
   abstract fun getOrientation(): Orientation
-  
+
   @DoNotStrip
   @Keep
   abstract fun getContentSizeCategory(): String
-  
+
   @DoNotStrip
   @Keep
   abstract fun getScreenDimensions(): Dimensions
-  
+
   @DoNotStrip
   @Keep
   abstract fun getStatusBarDimensions(): Dimensions
-  
+
   @DoNotStrip
   @Keep
   abstract fun getNavigationBarDimensions(): Dimensions
-  
+
   @DoNotStrip
   @Keep
   abstract fun getPrefersRtlDirection(): Boolean
-  
+
   @DoNotStrip
   @Keep
   abstract fun setRootViewBackgroundColor(color: Double): Unit
-  
+
   @DoNotStrip
   @Keep
   abstract fun setNavigationBarHidden(isHidden: Boolean): Unit
-  
+
   @DoNotStrip
   @Keep
   abstract fun setStatusBarHidden(isHidden: Boolean): Unit
-  
+
   @DoNotStrip
   @Keep
   abstract fun setImmersiveMode(isEnabled: Boolean): Unit
-  
+
   @DoNotStrip
   @Keep
   abstract fun getMiniRuntime(): UnistylesNativeMiniRuntime
-  
+
   abstract fun registerPlatformListener(callback: (dependencies: Array<UnistyleDependency>, miniRuntime: UnistylesNativeMiniRuntime) -> Unit): Unit
-  
+
   @DoNotStrip
   @Keep
-  private fun registerPlatformListener_cxx(callback: Func_void_std__vector_UnistyleDependency__UnistylesNativeMiniRuntime): Unit {
+  fun registerPlatformListener_cxx(callback: Func_void_std__vector_UnistyleDependency__UnistylesNativeMiniRuntime): Unit {
     val __result = registerPlatformListener(callback)
     return __result
   }
-  
+
   abstract fun registerImeListener(callback: (miniRuntime: UnistylesNativeMiniRuntime) -> Unit): Unit
-  
+
   @DoNotStrip
   @Keep
-  private fun registerImeListener_cxx(callback: Func_void_UnistylesNativeMiniRuntime): Unit {
+  fun registerImeListener_cxx(callback: Func_void_UnistylesNativeMiniRuntime): Unit {
     val __result = registerImeListener(callback)
     return __result
   }
-  
+
   @DoNotStrip
   @Keep
   abstract fun unregisterPlatformListeners(): Unit
@@ -131,16 +126,5 @@ abstract class HybridNativePlatformSpec: HybridObject() {
 
   companion object {
     private const val TAG = "HybridNativePlatformSpec"
-    init {
-      try {
-        Log.i(TAG, "Loading unistyles C++ library...")
-        System.loadLibrary("unistyles")
-        Log.i(TAG, "Successfully loaded unistyles C++ library!")
-      } catch (e: Error) {
-        Log.e(TAG, "Failed to load unistyles C++ library! Is it properly installed and linked? " +
-                    "Is the name correct? (see `CMakeLists.txt`, at `add_library(...)`)", e)
-        throw e
-      }
-    }
   }
 }

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

@@ -0,0 +1,35 @@
+///
+/// unistylesOnLoad.kt
+/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
+/// https://github.com/mrousavy/nitro
+/// Copyright © 2025 Marc Rousavy @ Margelo
+///
+
+package com.margelo.nitro.unistyles
+
+import android.util.Log
+
+internal class unistylesOnLoad {
+  companion object {
+    private const val TAG = "unistylesOnLoad"
+    private var didLoad = false
+    /**
+     * Initializes the native part of "unistyles".
+     * This method is idempotent and can be called more than once.
+     */
+    @JvmStatic
+    fun initializeNative() {
+      if (didLoad) return
+      try {
+        Log.i(TAG, "Loading unistyles C++ library...")
+        System.loadLibrary("unistyles")
+        Log.i(TAG, "Successfully loaded unistyles C++ library!")
+        didLoad = true
+      } catch (e: Error) {
+        Log.e(TAG, "Failed to load unistyles C++ library! Is it properly installed and linked? " +
+                    "Is the name correct? (see `CMakeLists.txt`, at `add_library(...)`)", e)
+        throw e
+      }
+    }
+  }
+}

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

@@ -44,6 +44,8 @@ def add_nitrogen_files(spec)
   spec.private_header_files = current_private_header_files + [
     # iOS specific specs
     "nitrogen/generated/ios/c++/**/*.{h,hpp}",
+    # Views are framework-specific and should be private
+    "nitrogen/generated/shared/**/views/**/*"
   ]
 
   current_pod_target_xcconfig = spec.attributes_hash['pod_target_xcconfig'] || {}

package/nitrogen/generated/ios/Unistyles-Swift-Cxx-Bridge.cpp

@@ -41,7 +41,7 @@ namespace margelo::nitro::unistyles::bridge::swift {
       throw std::runtime_error("Class \"HybridNativePlatformSpec\" is not implemented in Swift!");
     }
   #endif
-    Unistyles::HybridNativePlatformSpec_cxx swiftPart = swiftWrapper->getSwiftPart();
+    Unistyles::HybridNativePlatformSpec_cxx& swiftPart = swiftWrapper->getSwiftPart();
     return swiftPart.toUnsafe();
   }
 

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

@@ -58,7 +58,9 @@ namespace margelo::nitro::unistyles {
 
   public:
     // Get the Swift part
-    inline Unistyles::HybridNativePlatformSpec_cxx getSwiftPart() noexcept { return _swiftPart; }
+    inline Unistyles::HybridNativePlatformSpec_cxx& getSwiftPart() noexcept {
+      return _swiftPart;
+    }
 
   public:
     // Get memory pressure

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

@@ -9,7 +9,7 @@ import Foundation
 import NitroModules
 
 /// See ``HybridNativePlatformSpec``
-public protocol HybridNativePlatformSpec_protocol: AnyObject {
+public protocol HybridNativePlatformSpec_protocol: HybridObject {
   // Properties
   
 
@@ -35,7 +35,7 @@ public protocol HybridNativePlatformSpec_protocol: AnyObject {
 }
 
 /// See ``HybridNativePlatformSpec``
-public class HybridNativePlatformSpec_base: HybridObjectSpec {
+public class HybridNativePlatformSpec_base {
   private weak var cxxWrapper: HybridNativePlatformSpec_cxx? = nil
   public func getCxxWrapper() -> HybridNativePlatformSpec_cxx {
   #if DEBUG
@@ -51,7 +51,6 @@ public class HybridNativePlatformSpec_base: HybridObjectSpec {
       return cxxWrapper
     }
   }
-  public var memorySize: Int { return 0 }
 }
 
 /**

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

@@ -101,7 +101,7 @@ public class HybridNativePlatformSpec_cxx {
 
   // Methods
   @inline(__always)
-  public func getInsets() -> bridge.Result_Insets_ {
+  public final func getInsets() -> bridge.Result_Insets_ {
     do {
       let __result = try self.__implementation.getInsets()
       let __resultCpp = __result
@@ -113,7 +113,7 @@ public class HybridNativePlatformSpec_cxx {
   }
   
   @inline(__always)
-  public func getColorScheme() -> bridge.Result_ColorScheme_ {
+  public final func getColorScheme() -> bridge.Result_ColorScheme_ {
     do {
       let __result = try self.__implementation.getColorScheme()
       let __resultCpp = __result
@@ -125,7 +125,7 @@ public class HybridNativePlatformSpec_cxx {
   }
   
   @inline(__always)
-  public func getFontScale() -> bridge.Result_double_ {
+  public final func getFontScale() -> bridge.Result_double_ {
     do {
       let __result = try self.__implementation.getFontScale()
       let __resultCpp = __result
@@ -137,7 +137,7 @@ public class HybridNativePlatformSpec_cxx {
   }
   
   @inline(__always)
-  public func getPixelRatio() -> bridge.Result_double_ {
+  public final func getPixelRatio() -> bridge.Result_double_ {
     do {
       let __result = try self.__implementation.getPixelRatio()
       let __resultCpp = __result
@@ -149,7 +149,7 @@ public class HybridNativePlatformSpec_cxx {
   }
   
   @inline(__always)
-  public func getOrientation() -> bridge.Result_Orientation_ {
+  public final func getOrientation() -> bridge.Result_Orientation_ {
     do {
       let __result = try self.__implementation.getOrientation()
       let __resultCpp = __result
@@ -161,7 +161,7 @@ public class HybridNativePlatformSpec_cxx {
   }
   
   @inline(__always)
-  public func getContentSizeCategory() -> bridge.Result_std__string_ {
+  public final func getContentSizeCategory() -> bridge.Result_std__string_ {
     do {
       let __result = try self.__implementation.getContentSizeCategory()
       let __resultCpp = std.string(__result)
@@ -173,7 +173,7 @@ public class HybridNativePlatformSpec_cxx {
   }
   
   @inline(__always)
-  public func getScreenDimensions() -> bridge.Result_Dimensions_ {
+  public final func getScreenDimensions() -> bridge.Result_Dimensions_ {
     do {
       let __result = try self.__implementation.getScreenDimensions()
       let __resultCpp = __result
@@ -185,7 +185,7 @@ public class HybridNativePlatformSpec_cxx {
   }
   
   @inline(__always)
-  public func getStatusBarDimensions() -> bridge.Result_Dimensions_ {
+  public final func getStatusBarDimensions() -> bridge.Result_Dimensions_ {
     do {
       let __result = try self.__implementation.getStatusBarDimensions()
       let __resultCpp = __result
@@ -197,7 +197,7 @@ public class HybridNativePlatformSpec_cxx {
   }
   
   @inline(__always)
-  public func getNavigationBarDimensions() -> bridge.Result_Dimensions_ {
+  public final func getNavigationBarDimensions() -> bridge.Result_Dimensions_ {
     do {
       let __result = try self.__implementation.getNavigationBarDimensions()
       let __resultCpp = __result
@@ -209,7 +209,7 @@ public class HybridNativePlatformSpec_cxx {
   }
   
   @inline(__always)
-  public func getPrefersRtlDirection() -> bridge.Result_bool_ {
+  public final func getPrefersRtlDirection() -> bridge.Result_bool_ {
     do {
       let __result = try self.__implementation.getPrefersRtlDirection()
       let __resultCpp = __result
@@ -221,7 +221,7 @@ public class HybridNativePlatformSpec_cxx {
   }
   
   @inline(__always)
-  public func setRootViewBackgroundColor(color: Double) -> bridge.Result_void_ {
+  public final func setRootViewBackgroundColor(color: Double) -> bridge.Result_void_ {
     do {
       try self.__implementation.setRootViewBackgroundColor(color: color)
       return bridge.create_Result_void_()
@@ -232,7 +232,7 @@ public class HybridNativePlatformSpec_cxx {
   }
   
   @inline(__always)
-  public func setNavigationBarHidden(isHidden: Bool) -> bridge.Result_void_ {
+  public final func setNavigationBarHidden(isHidden: Bool) -> bridge.Result_void_ {
     do {
       try self.__implementation.setNavigationBarHidden(isHidden: isHidden)
       return bridge.create_Result_void_()
@@ -243,7 +243,7 @@ public class HybridNativePlatformSpec_cxx {
   }
   
   @inline(__always)
-  public func setStatusBarHidden(isHidden: Bool) -> bridge.Result_void_ {
+  public final func setStatusBarHidden(isHidden: Bool) -> bridge.Result_void_ {
     do {
       try self.__implementation.setStatusBarHidden(isHidden: isHidden)
       return bridge.create_Result_void_()
@@ -254,7 +254,7 @@ public class HybridNativePlatformSpec_cxx {
   }
   
   @inline(__always)
-  public func setImmersiveMode(isEnabled: Bool) -> bridge.Result_void_ {
+  public final func setImmersiveMode(isEnabled: Bool) -> bridge.Result_void_ {
     do {
       try self.__implementation.setImmersiveMode(isEnabled: isEnabled)
       return bridge.create_Result_void_()
@@ -265,7 +265,7 @@ public class HybridNativePlatformSpec_cxx {
   }
   
   @inline(__always)
-  public func getMiniRuntime() -> bridge.Result_UnistylesNativeMiniRuntime_ {
+  public final func getMiniRuntime() -> bridge.Result_UnistylesNativeMiniRuntime_ {
     do {
       let __result = try self.__implementation.getMiniRuntime()
       let __resultCpp = __result
@@ -277,7 +277,7 @@ public class HybridNativePlatformSpec_cxx {
   }
   
   @inline(__always)
-  public func registerPlatformListener(callback: bridge.Func_void_std__vector_UnistyleDependency__UnistylesNativeMiniRuntime) -> bridge.Result_void_ {
+  public final func registerPlatformListener(callback: bridge.Func_void_std__vector_UnistyleDependency__UnistylesNativeMiniRuntime) -> bridge.Result_void_ {
     do {
       try self.__implementation.registerPlatformListener(callback: { () -> ([UnistyleDependency], UnistylesNativeMiniRuntime) -> Void in
         let __wrappedFunction = bridge.wrap_Func_void_std__vector_UnistyleDependency__UnistylesNativeMiniRuntime(callback)
@@ -299,7 +299,7 @@ public class HybridNativePlatformSpec_cxx {
   }
   
   @inline(__always)
-  public func registerImeListener(callback: bridge.Func_void_UnistylesNativeMiniRuntime) -> bridge.Result_void_ {
+  public final func registerImeListener(callback: bridge.Func_void_UnistylesNativeMiniRuntime) -> bridge.Result_void_ {
     do {
       try self.__implementation.registerImeListener(callback: { () -> (UnistylesNativeMiniRuntime) -> Void in
         let __wrappedFunction = bridge.wrap_Func_void_UnistylesNativeMiniRuntime(callback)
@@ -315,7 +315,7 @@ public class HybridNativePlatformSpec_cxx {
   }
   
   @inline(__always)
-  public func unregisterPlatformListeners() -> bridge.Result_void_ {
+  public final func unregisterPlatformListeners() -> bridge.Result_void_ {
     do {
       try self.__implementation.unregisterPlatformListeners()
       return bridge.create_Result_void_()

package/nitrogen/generated/shared/c++/ColorScheme.hpp

@@ -42,7 +42,7 @@ namespace margelo::nitro {
 
   // C++ ColorScheme <> JS ColorScheme (union)
   template <>
-  struct JSIConverter<ColorScheme> {
+  struct JSIConverter<ColorScheme> final {
     static inline ColorScheme fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
       std::string unionValue = JSIConverter<std::string>::fromJSI(runtime, arg);
       switch (hashString(unionValue.c_str(), unionValue.size())) {

package/nitrogen/generated/shared/c++/Dimensions.hpp

@@ -44,7 +44,7 @@ namespace margelo::nitro {
 
   // C++ Dimensions <> JS Dimensions (object)
   template <>
-  struct JSIConverter<Dimensions> {
+  struct JSIConverter<Dimensions> final {
     static inline Dimensions fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
       jsi::Object obj = arg.asObject(runtime);
       return Dimensions(

package/nitrogen/generated/shared/c++/HybridNativePlatformSpec.hpp

@@ -59,7 +59,7 @@ namespace margelo::nitro::unistyles {
       explicit HybridNativePlatformSpec(): HybridObject(TAG) { }
 
       // Destructor
-      virtual ~HybridNativePlatformSpec() { }
+      ~HybridNativePlatformSpec() override = default;
 
     public:
       // Properties

package/nitrogen/generated/shared/c++/HybridUnistylesNavigationBarSpec.hpp

@@ -40,7 +40,7 @@ namespace margelo::nitro::unistyles {
       explicit HybridUnistylesNavigationBarSpec(): HybridObject(TAG) { }
 
       // Destructor
-      virtual ~HybridUnistylesNavigationBarSpec() { }
+      ~HybridUnistylesNavigationBarSpec() override = default;
 
     public:
       // Properties

package/nitrogen/generated/shared/c++/HybridUnistylesRuntimeSpec.hpp

@@ -56,7 +56,7 @@ namespace margelo::nitro::unistyles {
       explicit HybridUnistylesRuntimeSpec(): HybridObject(TAG) { }
 
       // Destructor
-      virtual ~HybridUnistylesRuntimeSpec() { }
+      ~HybridUnistylesRuntimeSpec() override = default;
 
     public:
       // Properties

package/nitrogen/generated/shared/c++/HybridUnistylesShadowRegistrySpec.hpp

@@ -40,7 +40,7 @@ namespace margelo::nitro::unistyles {
       explicit HybridUnistylesShadowRegistrySpec(): HybridObject(TAG) { }
 
       // Destructor
-      virtual ~HybridUnistylesShadowRegistrySpec() { }
+      ~HybridUnistylesShadowRegistrySpec() override = default;
 
     public:
       // Properties

package/nitrogen/generated/shared/c++/HybridUnistylesStatusBarSpec.hpp

@@ -40,7 +40,7 @@ namespace margelo::nitro::unistyles {
       explicit HybridUnistylesStatusBarSpec(): HybridObject(TAG) { }
 
       // Destructor
-      virtual ~HybridUnistylesStatusBarSpec() { }
+      ~HybridUnistylesStatusBarSpec() override = default;
 
     public:
       // Properties

package/nitrogen/generated/shared/c++/HybridUnistylesStyleSheetSpec.hpp

@@ -43,7 +43,7 @@ namespace margelo::nitro::unistyles {
       explicit HybridUnistylesStyleSheetSpec(): HybridObject(TAG) { }
 
       // Destructor
-      virtual ~HybridUnistylesStyleSheetSpec() { }
+      ~HybridUnistylesStyleSheetSpec() override = default;
 
     public:
       // Properties

package/nitrogen/generated/shared/c++/Insets.hpp

@@ -47,7 +47,7 @@ namespace margelo::nitro {
 
   // C++ Insets <> JS Insets (object)
   template <>
-  struct JSIConverter<Insets> {
+  struct JSIConverter<Insets> final {
     static inline Insets fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
       jsi::Object obj = arg.asObject(runtime);
       return Insets(

package/nitrogen/generated/shared/c++/Orientation.hpp

@@ -41,7 +41,7 @@ namespace margelo::nitro {
 
   // C++ Orientation <> JS Orientation (union)
   template <>
-  struct JSIConverter<Orientation> {
+  struct JSIConverter<Orientation> final {
     static inline Orientation fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
       std::string unionValue = JSIConverter<std::string>::fromJSI(runtime, arg);
       switch (hashString(unionValue.c_str(), unionValue.size())) {

package/nitrogen/generated/shared/c++/UnistyleDependency.hpp

@@ -50,7 +50,7 @@ namespace margelo::nitro {
 
   // C++ UnistyleDependency <> JS UnistyleDependency (enum)
   template <>
-  struct JSIConverter<UnistyleDependency> {
+  struct JSIConverter<UnistyleDependency> final {
     static inline UnistyleDependency fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
       int enumValue = JSIConverter<int>::fromJSI(runtime, arg);
       return static_cast<UnistyleDependency>(enumValue);

package/nitrogen/generated/shared/c++/UnistylesCxxMiniRuntime.hpp

@@ -65,7 +65,7 @@ namespace margelo::nitro {
 
   // C++ UnistylesCxxMiniRuntime <> JS UnistylesCxxMiniRuntime (object)
   template <>
-  struct JSIConverter<UnistylesCxxMiniRuntime> {
+  struct JSIConverter<UnistylesCxxMiniRuntime> final {
     static inline UnistylesCxxMiniRuntime fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
       jsi::Object obj = arg.asObject(runtime);
       return UnistylesCxxMiniRuntime(

package/nitrogen/generated/shared/c++/UnistylesNativeMiniRuntime.hpp

@@ -61,7 +61,7 @@ namespace margelo::nitro {
 
   // C++ UnistylesNativeMiniRuntime <> JS UnistylesNativeMiniRuntime (object)
   template <>
-  struct JSIConverter<UnistylesNativeMiniRuntime> {
+  struct JSIConverter<UnistylesNativeMiniRuntime> final {
     static inline UnistylesNativeMiniRuntime fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
       jsi::Object obj = arg.asObject(runtime);
       return UnistylesNativeMiniRuntime(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-unistyles",
-  "version": "3.0.0-nightly-20250207",
+  "version": "3.0.0-nightly-20250210",
   "description": "Level up your React Native StyleSheet",
   "scripts": {
     "test": "jest",
@@ -98,11 +98,11 @@
     "husky": "9.1.7",
     "jest": "29.7.0",
     "metro-react-native-babel-preset": "0.77.0",
-    "nitro-codegen": "0.21.0",
+    "nitro-codegen": "0.22.1",
     "react": "18.3.1",
     "react-native": "0.77.0",
     "react-native-builder-bob": "0.33.1",
-    "react-native-nitro-modules": "0.21.0",
+    "react-native-nitro-modules": "0.22.1",
     "react-native-web": "0.19.13",
     "react-test-renderer": "18.3.1",
     "release-it": "17.6.0",

package/plugin/index.js

@@ -159,7 +159,7 @@ module.exports = function ({ types: t }) {
                     if (detectedDependencies) {
                         if (t.isObjectExpression(arg)) {
                             arg.properties.forEach(property => {
-                                if (detectedDependencies[property.key.name]) {
+                                if (detectedDependencies.hasOwnProperty(property.key.name)) {
                                     addDependencies(t, state, property.key.name, property, detectedDependencies[property.key.name])
                                 }
                             })
@@ -179,7 +179,7 @@ module.exports = function ({ types: t }) {
                         // Ensure the function body returns an object
                         if (t.isObjectExpression(body)) {
                             body.properties.forEach(property => {
-                                if (detectedDependencies[property.key.name]) {
+                                if (detectedDependencies.hasOwnProperty(property.key.name)) {
                                     addDependencies(t, state, property.key.name, property, detectedDependencies[property.key.name])
                                 }
                             })

package/plugin/stylesheet.js

@@ -153,7 +153,7 @@ function getStylesDependenciesFromObject(t, path) {
             ...acc,
             [key]: [label]
         }
-    }, [])
+    }, {})
 }
 
 function getStylesDependenciesFromFunction(t, path) {
@@ -415,7 +415,7 @@ function getStylesDependenciesFromFunction(t, path) {
                 ...acc,
                 [key]: [label]
             }
-        }, [])
+        }, {})
 }
 
 function toUnistylesDependency(dependency) {

package/src/components/native/Pressable.native.tsx

@@ -11,7 +11,7 @@ type PressableProps = Props & {
 const getStyles = (styleProps: Record<string, any> = {}) => {
     const unistyleKey = Object
         .keys(styleProps)
-        .find(key => key.startsWith('unistyles-'))
+        .find(key => key.startsWith('unistyles_'))
 
     if (!unistyleKey) {
         return styleProps
@@ -52,7 +52,7 @@ export const Pressable = forwardRef<View, PressableProps>(({ variants, style, ..
                     ? style.call(style, state)
                     : getStyles(style as unknown as Record<string, any>)
 
-                if (!storedRef.current || !isPropStyleAFunction) {
+                if (!storedRef.current) {
                     return unistyles
                 }
 

package/src/core/warn.ts

@@ -4,7 +4,7 @@ export const maybeWarnAboutMultipleUnistyles = (style: ViewStyle, displayName =
     if (__DEV__ && style && !Array.isArray(style)) {
         const unistylesKeys = Object
             .keys(style)
-            .filter(key => key.startsWith('unistyles-'))
+            .filter(key => key.startsWith('unistyles_'))
 
         if (unistylesKeys.length > 1) {
             console.warn(`Unistyles: we detected style object with ${unistylesKeys.length} unistyles styles. This might cause no updates or unpredictable behavior. Please check style prop for "${displayName}" and use array syntax instead of object syntax.`)

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

@@ -19,7 +19,7 @@ export const withUnistyles = <TComponent, TMappings extends GenericComponentProp
     const getSecrets = (styleProps: Record<string, any> = {}): { uni__getStyles(): any, uni__dependencies: Array<UnistyleDependency> } => {
         const unistyleKey = Object
             .keys(styleProps)
-            .find(key => key.startsWith('unistyles-'))
+            .find(key => key.startsWith('unistyles_'))
 
         return unistyleKey
             ? styleProps[unistyleKey]

package/src/core/withUnistyles/withUnistyles.tsx

@@ -37,7 +37,7 @@ export const withUnistyles = <TComponent, TMappings extends GenericComponentProp
                 style: styleClassNames,
             } : {},
             ...narrowedProps.contentContainerStyle ? {
-                style: contentContainerStyleClassNames,
+                contentContainerStyle: contentContainerStyleClassNames,
             } : {},
         } as any
 

package/src/web/convert/index.ts

@@ -17,7 +17,7 @@ export const convertUnistyles = (value: UnistylesValues) => {
         ...value._web
     }).flatMap(([unistylesKey, unistylesValue]) => {
         // Keys to omit
-        if (['_classNames', '_web', 'variants', 'compoundVariants', 'uni__dependencies', '__unistyles-secrets__'].includes(unistylesKey) || unistylesKey.startsWith('variant-')) {
+        if (['_classNames', '_web', 'variants', 'compoundVariants', 'uni__dependencies'].includes(unistylesKey) || unistylesKey.startsWith('unistyles_')) {
             return []
         }
 

package/src/web/utils/common.ts

@@ -65,5 +65,5 @@ const cyrb53 = (data: string, seed = 0) => {
 export const generateHash = (value: any) => {
     const serialized = serialize(value)
 
-    return `unistyles-${cyrb53(serialized).toString(36)}`
+    return `unistyles_${cyrb53(serialized).toString(36)}`
 }

package/src/web/utils/unistyle.ts

@@ -27,9 +27,9 @@ export const assignSecrets = <T>(object: T, secrets: UnistyleSecrets) => {
     const secretsId = Math.random().toString(36).slice(8)
 
     // @ts-expect-error assign hidden secrets
-    object[`unistyles-${secretsId}`] = {}
+    object[`unistyles_${secretsId}`] = {}
     // @ts-expect-error assign hidden secrets
-    Object.defineProperties(object[`unistyles-${secretsId}`], reduceObject(secrets, secret => ({
+    Object.defineProperties(object[`unistyles_${secretsId}`], reduceObject(secrets, secret => ({
         value: secret,
         enumerable: false,
         configurable: true
@@ -43,7 +43,7 @@ export const extractSecrets = (object: any) => {
         return undefined
     }
 
-    const [, secrets] = Object.entries(object).find(([key]) => key.startsWith('unistyles-')) ?? []
+    const [, secrets] = Object.entries(object).find(([key]) => key.startsWith('unistyles_')) ?? []
 
     if (!secrets) {
         return undefined