react-native-unistyles 3.0.0-alpha.43 → 3.0.0-alpha.45

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

@@ -15,17 +15,11 @@ export const schemeToTheme = scheme => {
 };
 export const assignSecrets = (object, secrets) => {
   // @ts-expect-error - assign secrets to object
-  object[`__uni__secrets__${Math.random().toString(16).slice(2)}`] = secrets;
+  object.__uni__secrets__ = secrets;
   return object;
 };
 export const extractSecrets = object => {
-  const secrets = Object.entries(object).reduce((acc, [key, value]) => {
-    if (key.startsWith('__uni__secrets__')) {
-      acc.push(value);
-    }
-    return acc;
-  }, []);
-  return secrets;
+  return keyInObject(object, '__uni__secrets__') ? object.__uni__secrets__ : undefined;
 };
 export const getStyles = values => {
   const returnValue = {};

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

@@ -1 +1 @@
-{"version":3,"names":["ColorScheme","Orientation","isUnistylesMq","parseMq","UnistylesState","keyInObject","reduceObject","schemeToTheme","scheme","Dark","Light","assignSecrets","object","secrets","Math","random","toString","slice","extractSecrets","Object","entries","reduce","acc","key","value","startsWith","push","getStyles","values","returnValue","defineProperties","enumerable","configurable","isInDocument","element","document","body","contains","extractMediaQueryValue","query","_","px","match","undefined","Number","isNaN","getMediaQuery","includes","minWidth","maxWidth","minHeight","maxHeight","filter","Boolean","join","breakpoints","extractUnistyleDependencies","dependencies","uni__dependencies","Array","isArray"],"sourceRoot":"../../../../src","sources":["web/utils/unistyle.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["ColorScheme","Orientation","isUnistylesMq","parseMq","UnistylesState","keyInObject","reduceObject","schemeToTheme","scheme","Dark","Light","assignSecrets","object","secrets","__uni__secrets__","extractSecrets","undefined","getStyles","values","returnValue","Object","defineProperties","value","enumerable","configurable","isInDocument","element","document","body","contains","extractMediaQueryValue","query","_","px","match","Number","isNaN","getMediaQuery","includes","minWidth","maxWidth","minHeight","maxHeight","filter","Boolean","join","breakpoints","extractUnistyleDependencies","dependencies","uni__dependencies","Array","isArray"],"sourceRoot":"../../../../src","sources":["web/utils/unistyle.ts"],"mappings":"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","ignoreList":[]}

package/lib/typescript/src/components/Pressable.d.ts

@@ -1,7 +1,8 @@
 import React from 'react';
+import { type PressableStateCallbackType } from 'react-native';
 import type { PressableProps as Props, View } from 'react-native';
 export declare const Pressable: React.ForwardRefExoticComponent<Props & {
-    rawStyle?: Array<any>;
+    rawStyle?: Array<any> | ((event: PressableStateCallbackType) => Array<any>);
     variants?: Record<string, string | boolean>;
 } & React.RefAttributes<View>>;
 //# sourceMappingURL=Pressable.d.ts.map

package/lib/typescript/src/components/Pressable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Pressable.d.ts","sourceRoot":"","sources":["../../../../src/components/Pressable.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA6B,MAAM,OAAO,CAAA;AAEjD,OAAO,KAAK,EAAE,cAAc,IAAI,KAAK,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AASjE,eAAO,MAAM,SAAS;eAJP,KAAK,CAAC,GAAG,CAAC;eACV,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC;8BA4F7C,CAAA"}
+{"version":3,"file":"Pressable.d.ts","sourceRoot":"","sources":["../../../../src/components/Pressable.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA6B,MAAM,OAAO,CAAA;AACjD,OAAO,EAA2C,KAAK,0BAA0B,EAAE,MAAM,cAAc,CAAA;AACvG,OAAO,KAAK,EAAE,cAAc,IAAI,KAAK,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AASjE,eAAO,MAAM,SAAS;eAJP,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,0BAA0B,KAAK,KAAK,CAAC,GAAG,CAAC,CAAC;eAChE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC;8BAgF7C,CAAA"}

package/lib/typescript/src/components/Pressable.web.d.ts

@@ -5,9 +5,10 @@ type WebPressableState = {
     hovered: boolean;
     focused: boolean;
 };
+type WebPressableStyle = ((state: WebPressableState) => ViewStyle) | ViewStyle;
 export declare const Pressable: React.ForwardRefExoticComponent<Props & {
     variants?: Record<string, string | boolean>;
-    style?: ((state: WebPressableState) => ViewStyle) | ViewStyle;
+    style?: WebPressableStyle;
 } & React.RefAttributes<View>>;
 export {};
 //# sourceMappingURL=Pressable.web.d.ts.map

package/lib/typescript/src/components/Pressable.web.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Pressable.web.d.ts","sourceRoot":"","sources":["../../../../src/components/Pressable.web.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAwC,MAAM,OAAO,CAAA;AAE5D,OAAO,KAAK,EAAE,cAAc,IAAI,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAG5E,KAAK,iBAAiB,GAAG;IACrB,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,OAAO,CAAA;CACnB,CAAA;AAsBD,eAAO,MAAM,SAAS;eAnBP,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC;YACnC,CAAC,CAAC,KAAK,EAAE,iBAAiB,KAAK,SAAS,CAAC,GAAG,SAAS;8BAyF/D,CAAA"}
+{"version":3,"file":"Pressable.web.d.ts","sourceRoot":"","sources":["../../../../src/components/Pressable.web.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAwC,MAAM,OAAO,CAAA;AAE5D,OAAO,KAAK,EAAE,cAAc,IAAI,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAG5E,KAAK,iBAAiB,GAAG;IACrB,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,KAAK,iBAAiB,GAAG,CAAC,CAAC,KAAK,EAAE,iBAAiB,KAAK,SAAS,CAAC,GAAG,SAAS,CAAA;AA4D9E,eAAO,MAAM,SAAS;eAzDP,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC;YACnC,iBAAiB;8BAiH3B,CAAA"}

package/lib/typescript/src/web/shadowRegistry.d.ts

@@ -9,7 +9,7 @@ declare class UnistylesShadowRegistryBuilder {
     private resultsMap;
     private hashMap;
     private classNamesMap;
-    add: (ref: any, _style: Array<Style>, _variants: Record<string, any> | undefined, _args: Array<Array<any>>) => string[] | undefined;
+    add: (ref: any, styles: Array<Style>, _variants: Record<string, any> | undefined, _args: Array<Array<any>>) => string[] | undefined;
     remove: () => void;
 }
 export declare const UnistylesShadowRegistry: UnistylesShadowRegistryBuilder;

package/lib/typescript/src/web/shadowRegistry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shadowRegistry.d.ts","sourceRoot":"","sources":["../../../../src/web/shadowRegistry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAQ/C,KAAK,KAAK,GAAG,eAAe,GAAG,CAAC,CAAC,GAAG,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,KAAK,eAAe,CAAC,CAAA;AAEzE,cAAM,8BAA8B;IAEhC,IAAI,SAA4B;IAChC,MAAM,SAAQ;IACd,MAAM,gBAAa;IACnB,QAAQ,eAAkC;IAC1C,OAAO,aAAW;IAGlB,OAAO,CAAC,UAAU,CAA0C;IAC5D,OAAO,CAAC,OAAO,CAAiC;IAChD,OAAO,CAAC,aAAa,CAAwC;IAE7D,GAAG,QAAS,GAAG,UAAU,KAAK,CAAC,KAAK,CAAC,aAAa,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,SAAS,SAAS,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,0BAoH1G;IAED,MAAM,aAAW;CACpB;AAED,eAAO,MAAM,uBAAuB,gCAAuC,CAAA"}
+{"version":3,"file":"shadowRegistry.d.ts","sourceRoot":"","sources":["../../../../src/web/shadowRegistry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAQ/C,KAAK,KAAK,GAAG,eAAe,GAAG,CAAC,CAAC,GAAG,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,KAAK,eAAe,CAAC,CAAA;AAEzE,cAAM,8BAA8B;IAEhC,IAAI,SAA4B;IAChC,MAAM,SAAQ;IACd,MAAM,gBAAa;IACnB,QAAQ,eAAkC;IAC1C,OAAO,aAAW;IAGlB,OAAO,CAAC,UAAU,CAA0C;IAC5D,OAAO,CAAC,OAAO,CAAiC;IAChD,OAAO,CAAC,aAAa,CAAwC;IAE7D,GAAG,QAAS,GAAG,UAAU,KAAK,CAAC,KAAK,CAAC,aAAa,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,SAAS,SAAS,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,0BAwH1G;IAED,MAAM,aAAW;CACpB;AAED,eAAO,MAAM,uBAAuB,gCAAuC,CAAA"}

package/lib/typescript/src/web/utils/unistyle.d.ts

@@ -10,7 +10,7 @@ export type UnistyleSecrets = {
     __uni__args?: Array<any>;
 };
 export declare const assignSecrets: <T>(object: T, secrets: UnistyleSecrets) => T;
-export declare const extractSecrets: (object: any) => UnistyleSecrets[];
+export declare const extractSecrets: (object: any) => UnistyleSecrets | undefined;
 export declare const getStyles: (values: UnistylesValues) => {};
 export declare const isInDocument: (element: HTMLElement) => boolean;
 export declare const extractMediaQueryValue: (query: string) => number | undefined;

package/lib/typescript/src/web/utils/unistyle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"unistyle.d.ts","sourceRoot":"","sources":["../../../../../src/web/utils/unistyle.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAA;AACpE,OAAO,EAAE,WAAW,EAAe,MAAM,mBAAmB,CAAA;AAC5D,OAAO,KAAK,EAAE,UAAU,EAAE,yBAAyB,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AAKpG,eAAO,MAAM,aAAa,WAAY,WAAW,qBAQhD,CAAA;AAED,MAAM,MAAM,eAAe,GAAG;IAC1B,iBAAiB,EAAE,yBAAyB,CAAC,UAAU,CAAC,CAAC;IACzD,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,GAAG,CAAC,WAAW,CAAC,CAAA;IAC7B,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IACpC,WAAW,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,CAAA;CAC3B,CAAA;AAED,eAAO,MAAM,aAAa,GAAI,CAAC,UAAU,CAAC,WAAW,eAAe,MAKnE,CAAA;AAED,eAAO,MAAM,cAAc,WAAY,GAAG,sBAUzC,CAAA;AAED,eAAO,MAAM,SAAS,WAAY,eAAe,OAUhD,CAAA;AAED,eAAO,MAAM,YAAY,YAAa,WAAW,YAAoC,CAAA;AAErF,eAAO,MAAM,sBAAsB,UAAW,MAAM,uBAYnD,CAAA;AAED,eAAO,MAAM,aAAa,UAAW,MAAM,WAmB1C,CAAA;AAED,eAAO,MAAM,2BAA2B,UAAW,GAAG,yBAQrD,CAAA"}
+{"version":3,"file":"unistyle.d.ts","sourceRoot":"","sources":["../../../../../src/web/utils/unistyle.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAA;AACpE,OAAO,EAAE,WAAW,EAAe,MAAM,mBAAmB,CAAA;AAC5D,OAAO,KAAK,EAAE,UAAU,EAAE,yBAAyB,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AAKpG,eAAO,MAAM,aAAa,WAAY,WAAW,qBAQhD,CAAA;AAED,MAAM,MAAM,eAAe,GAAG;IAC1B,iBAAiB,EAAE,yBAAyB,CAAC,UAAU,CAAC,CAAC;IACzD,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,GAAG,CAAC,WAAW,CAAC,CAAA;IAC7B,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IACpC,WAAW,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,CAAA;CAC3B,CAAA;AAED,eAAO,MAAM,aAAa,GAAI,CAAC,UAAU,CAAC,WAAW,eAAe,MAKnE,CAAA;AAED,eAAO,MAAM,cAAc,WAAY,GAAG,gCAEzC,CAAA;AAED,eAAO,MAAM,SAAS,WAAY,eAAe,OAUhD,CAAA;AAED,eAAO,MAAM,YAAY,YAAa,WAAW,YAAoC,CAAA;AAErF,eAAO,MAAM,sBAAsB,UAAW,MAAM,uBAYnD,CAAA;AAED,eAAO,MAAM,aAAa,UAAW,MAAM,WAmB1C,CAAA;AAED,eAAO,MAAM,2BAA2B,UAAW,GAAG,yBAQrD,CAAA"}

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

@@ -28,7 +28,7 @@ namespace margelo::nitro::unistyles {
     [[maybe_unused]]
     ColorScheme toCpp() const {
       static const auto clazz = javaClassStatic();
-      static const auto fieldOrdinal = clazz->getField<int>("ordinal");
+      static const auto fieldOrdinal = clazz->getField<int>("_ordinal");
       int ordinal = this->getFieldValue(fieldOrdinal);
       return static_cast<ColorScheme>(ordinal);
     }

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

@@ -28,7 +28,7 @@ namespace margelo::nitro::unistyles {
     [[maybe_unused]]
     Orientation toCpp() const {
       static const auto clazz = javaClassStatic();
-      static const auto fieldOrdinal = clazz->getField<int>("ordinal");
+      static const auto fieldOrdinal = clazz->getField<int>("_ordinal");
       int ordinal = this->getFieldValue(fieldOrdinal);
       return static_cast<Orientation>(ordinal);
     }

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

@@ -28,7 +28,7 @@ namespace margelo::nitro::unistyles {
     [[maybe_unused]]
     UnistyleDependency toCpp() const {
       static const auto clazz = javaClassStatic();
-      static const auto fieldOrdinal = clazz->getField<int>("ordinal");
+      static const auto fieldOrdinal = clazz->getField<int>("_ordinal");
       int ordinal = this->getFieldValue(fieldOrdinal);
       return static_cast<UnistyleDependency>(ordinal);
     }

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

@@ -18,5 +18,9 @@ import com.facebook.proguard.annotations.DoNotStrip
 enum class ColorScheme {
   DARK,
   LIGHT,
-  UNSPECIFIED
+  UNSPECIFIED;
+
+  @DoNotStrip
+  @Keep
+  private val _ordinal = ordinal
 }

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

@@ -17,5 +17,9 @@ import com.facebook.proguard.annotations.DoNotStrip
 @Keep
 enum class Orientation {
   PORTRAIT,
-  LANDSCAPE
+  LANDSCAPE;
+
+  @DoNotStrip
+  @Keep
+  private val _ordinal = ordinal
 }

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

@@ -30,5 +30,9 @@ enum class UnistyleDependency {
   FONTSCALE,
   STATUSBAR,
   NAVIGATIONBAR,
-  IME
+  IME;
+
+  @DoNotStrip
+  @Keep
+  private val _ordinal = ordinal
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-unistyles",
-  "version": "3.0.0-alpha.43",
+  "version": "3.0.0-alpha.45",
   "description": "Level up your React Native StyleSheet",
   "scripts": {
     "test": "jest",
@@ -69,11 +69,11 @@
     "husky": "9.1.7",
     "jest": "29.7.0",
     "metro-react-native-babel-preset": "0.77.0",
-    "nitro-codegen": "0.17.0",
+    "nitro-codegen": "0.18.0",
     "react": "18.3.1",
     "react-native": "0.76.3",
     "react-native-builder-bob": "0.33.1",
-    "react-native-nitro-modules": "0.17.0",
+    "react-native-nitro-modules": "0.18.0",
     "react-native-web": "0.19.13",
     "react-test-renderer": "18.3.1",
     "release-it": "17.6.0",

package/plugin/index.js

@@ -131,7 +131,7 @@ module.exports = function ({ types: t }) {
                     return
                 }
 
-                const metadata = getStyleMetadata(t, styleAttr.value.expression)
+                const metadata = getStyleMetadata(t, styleAttr.value.expression, null, state)
 
                 if (openingElementName === 'Pressable') {
                     return handlePressable(t, path, styleAttr, metadata, state)

package/plugin/style.js

@@ -1,4 +1,4 @@
-function getStyleMetadata(t, node, dynamicFunction = null) {
+function getStyleMetadata(t, node, dynamicFunction = null, state) {
     // {styles.container}
     if (t.isMemberExpression(node)) {
         const members = t.isMemberExpression(node.object)
@@ -18,12 +18,12 @@ function getStyleMetadata(t, node, dynamicFunction = null) {
 
     // [styles.container]
     if (t.isArrayExpression(node)) {
-        return node.elements.flatMap(element => getStyleMetadata(t, element))
+        return node.elements.flatMap(element => getStyleMetadata(t, element, null, state))
     }
 
     // [...styles.container]
     if (t.isSpreadElement(node)) {
-        return getStyleMetadata(t, node.argument)
+        return getStyleMetadata(t, node.argument, null, state)
     }
 
     // {{ ...styles.container }}
@@ -42,14 +42,14 @@ function getStyleMetadata(t, node, dynamicFunction = null) {
                     }]
                 }
 
-                return getStyleMetadata(t, prop.argument)
+                return getStyleMetadata(t, prop.argument, null, state)
             })
             .filter(Boolean)
     }
 
     // {styles.container(arg1, arg2)}
     if (t.isCallExpression(node)) {
-        return getStyleMetadata(t, node.callee, node)
+        return getStyleMetadata(t, node.callee, node, state)
     }
 
     if (t.isIdentifier(node)) {
@@ -73,7 +73,7 @@ function getStyleMetadata(t, node, dynamicFunction = null) {
     }
 
     if (t.isArrowFunctionExpression(node)) {
-        return getStyleMetadata(t, node.body, node)
+        return getStyleMetadata(t, node.body, node, state)
     }
 
     // {condition && styles.container}
@@ -87,6 +87,15 @@ function getStyleMetadata(t, node, dynamicFunction = null) {
         }]
     }
 
+    // only when pressable is used
+    if (t.isBlockStatement(node) && state.file.shouldIncludePressable) {
+        const returnStatement = node.body.find(t.isReturnStatement)
+
+        return returnStatement
+            ? getStyleMetadata(t, returnStatement.argument, null, state)
+            : []
+    }
+
     return []
 }
 
@@ -132,7 +141,7 @@ function styleAttributeToArray(t, path) {
     styleAttribute.value.expression = t.arrayExpression([styleAttribute.value.expression])
 }
 
-function metadataToRawStyle(t, metadata) {
+function metadataToRawStyle(t, metadata, styleExpression) {
     const expressions = []
 
     metadata.forEach(meta => {
@@ -149,16 +158,43 @@ function metadataToRawStyle(t, metadata) {
         }
 
         if (meta.logicalExpression) {
-            if (t.isIdentifier(meta.logicalExpression.left)) {
-                if (t.isMemberExpression(meta.logicalExpression.right)) {
-                    return expressions.push(meta.logicalExpression.right)
+            const expression = t.cloneNode(meta.logicalExpression)
+
+            if (t.isIdentifier(expression.left)) {
+                if (t.isCallExpression(expression.right)) {
+                    expression.right = expression.right.callee
                 }
 
-                expressions.push(meta.logicalExpression.right.callee)
+                expressions.push(expression)
+            }
+        }
+
+        if (meta.conditionalExpression) {
+            const expression = t.cloneNode(meta.conditionalExpression)
+
+            if (t.isCallExpression(expression.alternate)) {
+                expression.alternate = expression.alternate.callee
+            }
+
+            if (t.isCallExpression(expression.consequent)) {
+                expression.consequent = expression.consequent.callee
             }
+
+            expressions.push(expression)
         }
     })
 
+    if (t.isArrowFunctionExpression(styleExpression) && styleExpression.params.length === 1) {
+        return t.jsxAttribute(
+            t.jsxIdentifier('rawStyle'),
+            t.jsxExpressionContainer(
+                t.arrowFunctionExpression(styleExpression.params, t.arrayExpression([
+                ...expressions
+                ])
+            ))
+        )
+    }
+
     return t.jsxAttribute(
         t.jsxIdentifier('rawStyle'),
         t.jsxExpressionContainer(t.arrayExpression([
@@ -181,6 +217,7 @@ function wrapInGetBoundArgs(t, toWrap, extraArgs) {
 
 function handlePressableFromMemberExpression(t, path, metadata, wrapInArrowFunction) {
     let expression = undefined
+    let args = []
 
     const members = metadata.at(0).members
 
@@ -194,11 +231,20 @@ function handlePressableFromMemberExpression(t, path, metadata, wrapInArrowFunct
         expression = metadata.at(0)
     }
 
+    if (t.isCallExpression(metadata.at(0))) {
+        expression = metadata.at(0).callee
+        args = metadata.at(0).arguments
+    }
+
     if (!expression) {
         return
     }
 
-    const bindCall = wrapInGetBoundArgs(t , expression, wrapInArrowFunction ? [t.identifier("state")] : [])
+    const bindCall = wrapInGetBoundArgs(t , expression, wrapInArrowFunction ? [t.identifier("state")] : args)
+
+    if (t.isCallExpression(metadata.at(0))) {
+        return bindCall
+    }
 
     if (!wrapInArrowFunction) {
         return t.conditionalExpression(
@@ -240,12 +286,18 @@ function handlePressableArgs(t, path, styleExpression, metadata, parentWrapper,
         return
     }
 
-    if (t.isMemberExpression(wrapper)) {
+    if (t.isMemberExpression(wrapper) && t.isArrayExpression(parentWrapper)) {
         parentWrapper.elements[index] = handlePressableFromMemberExpression(t, path, [metadata[index]])
 
         return
     }
 
+    if (t.isMemberExpression(wrapper) && !t.isArrayExpression(parentWrapper)) {
+        parentWrapper = handlePressableFromMemberExpression(t, path, metadata)
+
+        return
+    }
+
     if (t.isLogicalExpression(wrapper)) {
         if (t.isIdentifier(wrapper.left) && t.isMemberExpression(wrapper.right)) {
             parentWrapper.elements[index].right = handlePressableFromMemberExpression(t, path, [parentWrapper.elements[index].right])
@@ -256,18 +308,30 @@ function handlePressableArgs(t, path, styleExpression, metadata, parentWrapper,
         return
     }
 
-    if (t.isConditionalExpression(wrapper)) {
-        if (t.isMemberExpression(wrapper.alternate)) {
+    if (t.isConditionalExpression(wrapper) && t.isArrayExpression(parentWrapper)) {
+        if (t.isMemberExpression(wrapper.alternate) || t.isCallExpression(wrapper.alternate)) {
             parentWrapper.elements[index].alternate = handlePressableFromMemberExpression(t, path, [parentWrapper.elements[index].alternate])
         }
 
-        if (t.isMemberExpression(wrapper.consequent)) {
+        if (t.isMemberExpression(wrapper.consequent) || t.isCallExpression(wrapper.consequent)) {
             parentWrapper.elements[index].consequent = handlePressableFromMemberExpression(t, path, [parentWrapper.elements[index].consequent])
         }
 
         return
     }
 
+    if (t.isConditionalExpression(wrapper) && !t.isArrayExpression(parentWrapper)) {
+        if (t.isMemberExpression(wrapper.alternate) || t.isCallExpression(wrapper.alternate)) {
+            parentWrapper.alternate = handlePressableFromMemberExpression(t, path, [parentWrapper.alternate])
+        }
+
+        if (t.isMemberExpression(wrapper.consequent) || t.isCallExpression(wrapper.consequent)) {
+            parentWrapper.consequent = handlePressableFromMemberExpression(t, path, [parentWrapper.consequent])
+        }
+
+        return
+    }
+
     const pressableArgs = t.isCallExpression(wrapper)
         ? wrapper.arguments
         : wrapper.argument.arguments
@@ -307,7 +371,7 @@ function handlePressable(t, path, styleAttr, metadata, state) {
     }
 
     // add raw C++ style as prop to be bound
-    path.node.openingElement.attributes.push(metadataToRawStyle(t, metadata))
+    path.node.openingElement.attributes.push(metadataToRawStyle(t, metadata, styleAttr.value.expression))
 
     const styleExpression = styleAttr.value.expression
 
@@ -343,7 +407,7 @@ function handlePressable(t, path, styleAttr, metadata, state) {
 
     // {() => style.pressable(1, 2)}
     if (t.isArrowFunctionExpression(styleExpression) && styleExpression.params.length === 0) {
-        const parentWrapper = t.isBlockStatement(styleExpression.body)
+        let parentWrapper = t.isBlockStatement(styleExpression.body)
             ? styleExpression.body.body.find(node => t.isReturnStatement(node))
             : styleExpression.body
 
@@ -355,6 +419,12 @@ function handlePressable(t, path, styleAttr, metadata, state) {
             return parentWrapper.elements.forEach((wrapper, index) => handlePressableArgs(t, path, styleExpression, metadata, parentWrapper, wrapper, index))
         }
 
+        if (t.isReturnStatement(parentWrapper)) {
+            parentWrapper = parentWrapper.argument
+
+            return handlePressableArgs(t, path, styleExpression, metadata, parentWrapper, parentWrapper)
+        }
+
         const pressableArgs = t.isCallExpression(parentWrapper)
             ? parentWrapper.arguments
             : parentWrapper.argument.arguments
@@ -387,12 +457,16 @@ function handlePressable(t, path, styleAttr, metadata, state) {
     if (t.isArrowFunctionExpression(styleExpression) && styleExpression.params.length > 0) {
         // user used state with custom args we need to getBoundArgs
         // detect between arrow function with body and arrow function
-        const parentWrapper = t.isBlockStatement(styleExpression.body)
+        let parentWrapper = t.isBlockStatement(styleExpression.body)
             ? styleExpression.body.body.find(node => t.isReturnStatement(node))
             : styleExpression.body
 
         if (t.isArrayExpression(parentWrapper)) {
-            return parentWrapper.elements.forEach((wrapper, index) =>handlePressableArgs(t, path, styleExpression, metadata, parentWrapper, wrapper, index))
+            return parentWrapper.elements.forEach((wrapper, index) => handlePressableArgs(t, path, styleExpression, metadata, parentWrapper, wrapper, index))
+        }
+
+        if (t.isReturnStatement(parentWrapper)) {
+            parentWrapper = parentWrapper.argument
         }
 
         handlePressableArgs(t, path, styleExpression, metadata, parentWrapper, parentWrapper)

package/plugin/stylesheet.js

@@ -44,7 +44,7 @@ function isUnistylesStyleSheet(t, path, state) {
 
 function addStyleSheetTag(t, path, state) {
     const callee = path.get('callee')
-    const uniqueId = stringToUniqueId(state.filename) + ++state.file.tagNumber
+    const uniqueId = stringToUniqueId(state.filename.replace(state.cwd, '')) + ++state.file.tagNumber
 
     callee.container.arguments.push(t.numericLiteral(uniqueId))
 }

package/src/components/Pressable.tsx

@@ -1,11 +1,11 @@
 import React, { forwardRef, useRef } from 'react'
-import { Pressable as NativePressableReactNative } from 'react-native'
+import { Pressable as NativePressableReactNative, type PressableStateCallbackType } from 'react-native'
 import type { PressableProps as Props, View } from 'react-native'
 import { UnistylesShadowRegistry } from '../specs'
 import { getId } from '../core'
 
 type PressableProps = Props & {
-    rawStyle?: Array<any>
+    rawStyle?: Array<any> | ((event: PressableStateCallbackType) => Array<any>)
     variants?: Record<string, string | boolean>
 }
 
@@ -36,18 +36,12 @@ export const Pressable = forwardRef<View, PressableProps>(({ variants, style, ra
                 const returnFn = typeof passedRef === 'function'
                     ? passedRef(ref)
                     : () => {}
-                const unistyles = (rawStyle ?? [])
-                    .map((style, index) => {
-                        if (fnArgs[index]) {
-                            return style
-                        }
-
-                        return undefined
-                    })
-                    .filter(Boolean)
+                const unistyles = typeof rawStyle === 'function'
+                    ? rawStyle({ pressed: false })
+                    : (rawStyle ?? [])
 
                 // @ts-expect-error - this is hidden from TS
-                UnistylesShadowRegistry.add(ref, unistyles, variants, [...fnArgs])
+                UnistylesShadowRegistry.add(ref, unistyles, variants, Array.isArray(styleResult) ? fnArgs : [fnArgs])
 
                 return () => {
                     // @ts-expect-error - this is hidden from TS
@@ -71,21 +65,15 @@ export const Pressable = forwardRef<View, PressableProps>(({ variants, style, ra
                             .map(style => typeof style === 'function' ? style.getBoundArgs() : [])
                         : []
                 const pressId = getId()
-                const unistyles = (rawStyle ?? [])
-                    .map((style, index) => {
-                        if (fnArgs[index]) {
-                            return style
-                        }
-
-                        return undefined
-                    })
-                    .filter(Boolean)
+                const unistyles = typeof rawStyle === 'function'
+                    ? rawStyle(state)
+                    : (rawStyle ?? [])
 
                 if (storedRef.current) {
                     // @ts-expect-error - this is hidden from TS
                     UnistylesShadowRegistry.remove(storedRef.current)
                     // @ts-expect-error - this is hidden from TS
-                    UnistylesShadowRegistry.add(storedRef.current, unistyles, variants, [...fnArgs], pressId)
+                    UnistylesShadowRegistry.add(storedRef.current, unistyles, variants, Array.isArray(styleResult) ? fnArgs : [fnArgs], pressId)
                 }
 
                 return typeof styleResult === 'function'

package/src/components/Pressable.web.tsx

@@ -9,9 +9,11 @@ type WebPressableState = {
     focused: boolean
 }
 
+type WebPressableStyle = ((state: WebPressableState) => ViewStyle) | ViewStyle
+
 type PressableProps = Props & {
     variants?: Record<string, string | boolean>
-    style?: ((state: WebPressableState) => ViewStyle) | ViewStyle,
+    style?: WebPressableStyle,
 }
 
 const initialState: WebPressableState = {
@@ -29,8 +31,46 @@ const events = {
     'blur': { focused: false }
 } satisfies Partial<Record<keyof HTMLElementEventMap, Partial<WebPressableState>>>
 
+type UpdateStylesProps = {
+    ref: View | null,
+    style: WebPressableStyle,
+    variants?: Record<string, string | boolean>,
+    state: WebPressableState
+}
+
+const isFunctionWithBoundArgs = (fn: any): fn is Function & { getBoundArgs: Function } => {
+    return typeof fn === 'function' && 'getBoundArgs' in fn
+}
+
+const extractFunctionArgs = (styleResult: any) => {
+    return isFunctionWithBoundArgs(styleResult)
+        ? [styleResult.getBoundArgs()]
+        : Array.isArray(styleResult)
+            ? styleResult.map(style => isFunctionWithBoundArgs(style) ? style.getBoundArgs() : [])
+            : []
+}
+
+const extractStyleResult = (style: any) => {
+    return typeof style === 'function'
+        ? [style()]
+        : Array.isArray(style)
+            ? style.map(style => typeof style === 'function' ? style() : style)
+            : [style]
+}
+
+const updateStyles = ({ ref, style, variants, state }: UpdateStylesProps) => {
+    const styleResult = typeof style === 'function'
+        ? style(state)
+        : style
+    const fnArgs = extractFunctionArgs(styleResult)
+    const extractedResult = extractStyleResult(styleResult)
+
+    // @ts-expect-error - this is hidden from TS
+    UnistylesShadowRegistry.add(ref, extractedResult, variants, fnArgs)
+}
+
 export const Pressable = forwardRef<View, PressableProps>(({ variants, style, ...props }, passedRef) => {
-    const storedRef = useRef<View | null>()
+    const storedRef = useRef<View | null>(null)
     const state = useRef<WebPressableState>(initialState)
     const styleRef = useRef(style)
 
@@ -42,19 +82,12 @@ export const Pressable = forwardRef<View, PressableProps>(({ variants, style, ..
         const handler = (newState: Partial<WebPressableState>) => () => {
             state.current = { ...state.current, ...newState }
 
-            const styleResult = typeof styleRef.current === 'function'
-                ? styleRef.current(state.current)
-                : styleRef.current
-            const fnArgs = typeof styleResult === 'function'
-                // @ts-expect-error - this is hidden from TS
-                ? styleResult.getBoundArgs()
-                : []
-            const extractedResult = typeof styleResult === 'function'
-                ? (styleResult as Function)()
-                : styleResult
-
-            // @ts-expect-error - this is hidden from TS
-            UnistylesShadowRegistry.add(storedRef.current, [extractedResult], variants, [fnArgs])
+            updateStyles({
+                ref: storedRef.current,
+                style: styleRef.current as WebPressableStyle,
+                variants,
+                state: state.current
+            })
         }
 
         if (!storedRef.current) {
@@ -80,23 +113,16 @@ export const Pressable = forwardRef<View, PressableProps>(({ variants, style, ..
             {...props}
             ref={ref => {
                 storedRef.current = ref
-                const styleResult = typeof style === 'function'
-                    ? style(initialState)
-                    : style
-                const fnArgs = typeof styleResult === 'function'
-                    // @ts-expect-error - this is hidden from TS
-                    ? styleResult.getBoundArgs()
-                    : []
-                const extractedResult = typeof styleResult === 'function'
-                    ? (styleResult as Function)()
-                    : styleResult
+                updateStyles({
+                    ref,
+                    style: style as WebPressableStyle,
+                    variants,
+                    state: initialState
+                })
 
                 if (typeof passedRef === 'object' && passedRef !== null) {
                     passedRef.current = ref
                 }
-
-                // @ts-expect-error - this is hidden from TS
-                UnistylesShadowRegistry.add(ref, [extractedResult], variants, [fnArgs])
             }}
         />
     )