react-native-unistyles 3.0.0-nightly-20250208 → 3.0.0-nightly-20250213

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-20250208",
+  "version": "3.0.0-nightly-20250213",
   "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/import.js

@@ -31,7 +31,7 @@ function addUnistylesImport(t, path, state) {
         const newImport = t.importDeclaration(
             [t.importSpecifier(t.identifier(localName), t.identifier(name))],
             t.stringLiteral(state.opts.isLocal
-                ? state.file.opts.filename.split('react-native-unistyles').at(0).concat(`react-native-unistyles/components/native/${name}`)
+                ? state.file.opts.filename.split('react-native-unistyles').at(0).concat(`react-native-unistyles/src/components/native/${name}`)
                 : `react-native-unistyles/components/native/${name}`
             )
         )

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
@@ -40,10 +40,18 @@ export const Pressable = forwardRef<View, PressableProps>(({ variants, style, ..
         <NativePressableReactNative
             {...props}
             ref={ref => {
+                const isPropStyleAFunction = typeof style === 'function'
+                const unistyles = isPropStyleAFunction
+                    ? style.call(style, { pressed: false })
+                    : getStyles(style as unknown as Record<string, any>)
+
                 if (ref) {
                     storedRef.current = ref
                 }
 
+                // @ts-expect-error - this is hidden from TS
+                UnistylesShadowRegistry.add(storedRef.current, unistyles)
+
                 return passForwardedRef(props, ref, forwardedRef)
             }}
             style={state => {

package/src/core/useProxifiedUnistyles/useProxifiedUnistyles.ts

@@ -26,8 +26,8 @@ const RTDependencyMap = {
     themeName: UnistyleDependency.ThemeName,
 } satisfies Partial<Record<keyof UnistylesMiniRuntime, UnistyleDependency>>
 
-export const useProxifiedUnistyles = () => {
-    const scopedTheme = UnistylesShadowRegistry.getScopedTheme() as UnistylesTheme
+export const useProxifiedUnistyles = (forcedTheme?: UnistylesTheme) => {
+    const scopedTheme = forcedTheme ?? UnistylesShadowRegistry.getScopedTheme() as UnistylesTheme
     const [dependencies] = useState(() => new Set<number>())
     const [theme, setTheme] = useState(UnistylesRuntime.getTheme(scopedTheme))
     const [_, runtimeChanged] = useReducer(() => ({}), {})

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

@@ -1,5 +1,6 @@
-import React, { forwardRef, useEffect, type ComponentType } from 'react'
-import type { UnistyleDependency } from '../../specs'
+import React, { forwardRef, useEffect, type ComponentType, useRef } from 'react'
+import { type UnistyleDependency, UnistylesShadowRegistry } from '../../specs'
+import type { UnistylesTheme } from '../../types'
 import type { PartialBy } from '../../types/common'
 import { deepMergeObjects } from '../../utils'
 import { useProxifiedUnistyles } from '../useProxifiedUnistyles'
@@ -19,7 +20,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]
@@ -38,7 +39,8 @@ export const withUnistyles = <TComponent, TMappings extends GenericComponentProp
         // @ts-ignore we don't know the type of the component
         maybeWarnAboutMultipleUnistyles(narrowedProps.contentContainerStyle, `withUnistyles(${Component.displayName ?? Component.name ?? 'Unknown'})`)
 
-        const { proxifiedRuntime, proxifiedTheme, addDependencies } = useProxifiedUnistyles()
+        const scopedTheme = useRef(UnistylesShadowRegistry.getScopedTheme() as UnistylesTheme)
+        const { proxifiedRuntime, proxifiedTheme, addDependencies } = useProxifiedUnistyles(scopedTheme.current)
 
         useEffect(() => {
             const styleSecrets = getSecrets(narrowedProps.style)

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