react-native-unistyles 3.0.0-beta.1 → 3.0.0-beta.2

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/web/index.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAiBN,MAAM,KAAK,MAAM;yBACT,KAAK,CAAC,MAAM,CAAC;;CAErC,CAAA;AAED,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAA;AAC5C,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAA;AAC1D,cAAc,QAAQ,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/web/index.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAA;AAEzD,eAAO,MAAM,UAAU;;YAED,yBAAyB;;;;;;;;;;;;;;;iBAe9B,MAAM,KAAK,MAAM;yBACT,KAAK,CAAC,MAAM,CAAC;mBACd,MAAM;CAC7B,CAAA;AAED,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAA;AAC5C,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAA;AAC1D,cAAc,QAAQ,CAAA"}

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

@@ -1,7 +1,6 @@
 import type { UnistylesTheme, UnistylesValues } from '../types';
 import type { StyleSheet, StyleSheetWithSuperPowers } from '../types/stylesheet';
-import type { UnistyleDependency } from '../specs/NativePlatform';
-import type { UnistylesMiniRuntime } from '../specs';
+import type { UnistylesMiniRuntime, UnistyleDependency } from '../specs';
 declare class UnistylesRegistryBuilder {
     #private;
     private readonly stylesheets;
@@ -9,7 +8,7 @@ declare class UnistylesRegistryBuilder {
     private readonly disposeListenersMap;
     private readonly dependenciesMap;
     private get styleTag();
-    getComputedStylesheet: (stylesheet: StyleSheetWithSuperPowers<StyleSheet>) => StyleSheet;
+    getComputedStylesheet: (stylesheet: StyleSheetWithSuperPowers<StyleSheet>, scopedThemeName?: UnistylesTheme) => StyleSheet;
     addDependenciesToStylesheet: (stylesheet: (theme: UnistylesTheme, miniRuntime: UnistylesMiniRuntime) => StyleSheet, dependencies: Array<UnistyleDependency>) => void;
     add: (value: UnistylesValues) => {
         hash: string;

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

@@ -1 +1 @@
-{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../../../src/web/registry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAC/D,OAAO,KAAK,EAAE,UAAU,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAA;AAKhF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AACjE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAA;AAWpD,cAAM,wBAAwB;;IAC1B,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA+D;IAC3F,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA0C;IAExE,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAkC;IACtE,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA4E;IAE5G,OAAO,KAAK,QAAQ,GAcnB;IAED,qBAAqB,eAAgB,yBAAyB,CAAC,UAAU,CAAC,gBAkBzE;IAED,2BAA2B,eAAgB,CAAC,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,oBAAoB,KAAK,UAAU,gBAAgB,KAAK,CAAC,kBAAkB,CAAC,UAe3J;IAED,GAAG,UAAW,eAAe;;;MAiB5B;IAED,WAAW,SAAU,MAAM,UAAU,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,UAwEvD;IAED,OAAO,CAAC,SAAS,CAmBhB;IAED,MAAM,UAAW,eAAe,UAmB/B;CACJ;AAED,eAAO,MAAM,iBAAiB,0BAAiC,CAAA"}
+{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../../../src/web/registry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAC/D,OAAO,KAAK,EAAE,UAAU,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAA;AAKhF,OAAO,KAAK,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAWxE,cAAM,wBAAwB;;IAC1B,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA+D;IAC3F,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA0C;IAExE,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAkC;IACtE,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA4E;IAE5G,OAAO,KAAK,QAAQ,GAcnB;IAED,qBAAqB,eAAgB,yBAAyB,CAAC,UAAU,CAAC,oBAAoB,cAAc,gBA4B3G;IAED,2BAA2B,eAAgB,CAAC,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,oBAAoB,KAAK,UAAU,gBAAgB,KAAK,CAAC,kBAAkB,CAAC,UAe3J;IAED,GAAG,UAAW,eAAe;;;MAiB5B;IAED,WAAW,SAAU,MAAM,UAAU,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,UAwEvD;IAED,OAAO,CAAC,SAAS,CAmBhB;IAED,MAAM,UAAW,eAAe,UAmB/B;CACJ;AAED,eAAO,MAAM,iBAAiB,0BAAiC,CAAA"}

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

@@ -1 +1 @@
-{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../../../src/web/runtime.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,KAAK,QAAQ,EAAE,KAAK,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAC3F,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAA;AACrE,OAAO,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAA;AAMjD,cAAM,uBAAuB;IACzB,UAAU,wBAAuB;IACjC,SAAS,wBAAsB;IAE/B,OAAO,CAAC,aAAa;IAYrB,OAAO,CAAC,YAAY;IAYpB,IAAI,WAAW,gBASd;IAED,IAAI,SAAS,cAMZ;IAED,IAAI,mBAAmB,2BAEtB;IAED,IAAI,WAAW,sCAEd;IAED,IAAI,UAAU,wDAEb;IAED,IAAI,WAAW,gBAMd;IAED,IAAI,KAAK,UAER;IAED,IAAI,UAAU,WAEb;IAED,IAAI,MAAM;;;MAYT;IAED,IAAI,SAAS,WAEZ;IAED,IAAI,MAAM;;;;;;MAQT;IAED,IAAI,SAAS,oDAEZ;IAED,IAAI,GAAG,YAEN;IAED,IAAI,iBAAiB,YAEpB;IAED,IAAI,aAAa,2DAEhB;IAED,IAAI,WAAW,IAAI,oBAAoB,CAuBtC;IAED,QAAQ,cAAe,YAAY,UAYlC;IAED,iBAAiB,cAAe,OAAO,UAQtC;IAED,0BAA0B,UAAW,MAAM,UAM1C;IAED,gBAAgB,aAAW;IAE3B,WAAW,cAAe,YAAY,WAAW,CAAC,YAAY,EAAE,QAAQ,KAAK,QAAQ,UAQpF;IAED,QAAQ,mCAQP;CACJ;AAED,eAAO,MAAM,gBAAgB,yBAAgC,CAAA"}
+{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../../../src/web/runtime.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,KAAK,QAAQ,EAAE,KAAK,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAC3F,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAA;AACrE,OAAO,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAA;AAQjD,cAAM,uBAAuB;IACzB,UAAU,wBAAuB;IACjC,SAAS,wBAAsB;IAE/B,OAAO,CAAC,aAAa;IAYrB,OAAO,CAAC,YAAY;IAYpB,IAAI,WAAW,gBASd;IAED,IAAI,SAAS,cAMZ;IAED,IAAI,mBAAmB,2BAEtB;IAED,IAAI,WAAW,sCAEd;IAED,IAAI,UAAU,wDAEb;IAED,IAAI,WAAW,gBAMd;IAED,IAAI,KAAK,UAER;IAED,IAAI,UAAU,WAEb;IAED,IAAI,MAAM;;;MAYT;IAED,IAAI,SAAS,WAEZ;IAED,IAAI,MAAM;;;;;;MAQT;IAED,IAAI,SAAS,oDAEZ;IAED,IAAI,GAAG,YAEN;IAED,IAAI,iBAAiB,YAEpB;IAED,IAAI,aAAa,2DAEhB;IAED,IAAI,WAAW,IAAI,oBAAoB,CAuBtC;IAED,QAAQ,cAAe,YAAY,UAYlC;IAED,iBAAiB,cAAe,OAAO,UAQtC;IAED,0BAA0B,UAAW,MAAM,UAM1C;IAED,gBAAgB,aAAW;IAE3B,WAAW,cAAe,YAAY,WAAW,CAAC,YAAY,EAAE,QAAQ,KAAK,QAAQ,UAQpF;IAED,QAAQ,mCAQP;CACJ;AAED,eAAO,MAAM,gBAAgB,yBAAgC,CAAA"}

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

@@ -1,4 +1,4 @@
-import type { UnistylesValues } from '../types';
+import type { UnistylesTheme, UnistylesValues } from '../types';
 type Style = UnistylesValues | ((...args: Array<any>) => UnistylesValues);
 declare class UnistylesShadowRegistryBuilder {
     name: string;
@@ -7,9 +7,17 @@ declare class UnistylesShadowRegistryBuilder {
     toString: () => string;
     dispose: () => void;
     private resultsMap;
-    private hashMap;
     private classNamesMap;
-    add: (ref: any, styles: Array<Style>, _variants: Record<string, any> | undefined, _args: Array<Array<any>>) => string[] | undefined;
+    private selectedVariants;
+    private scopedTheme;
+    private disposeMap;
+    add: (ref: any, styles: Array<Style>) => string[] | undefined;
+    selectVariants: (variants?: Record<string, string | boolean | undefined>) => void;
+    setScopedTheme: (theme?: UnistylesTheme) => void;
+    getScopedTheme: () => undefined;
+    getVariants: () => {
+        [k: string]: string | boolean | 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,0BAwH1G;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,cAAc,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAO/D,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,aAAa,CAAwC;IAC7D,OAAO,CAAC,gBAAgB,CAAkD;IAC1E,OAAO,CAAC,WAAW,CAAwC;IAC3D,OAAO,CAAC,UAAU,CAAuC;IAEzD,GAAG,QAAS,GAAG,UAAU,KAAK,CAAC,KAAK,CAAC,0BAiHpC;IAED,cAAc,cAAe,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS,CAAC,UAUxE;IAED,cAAc,WAAY,cAAc,UAEvC;IAED,cAAc,kBAAyB;IAEvC,WAAW;;MAA4D;IAEvE,MAAM,aAAW;CACpB;AAED,eAAO,MAAM,uBAAuB,gCAAuC,CAAA"}

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

@@ -6,12 +6,11 @@ export type UnistyleSecrets = {
     __uni__stylesheet: StyleSheetWithSuperPowers<StyleSheet>;
     __uni__key: string;
     __uni__refs: Set<HTMLElement>;
-    __uni__variants: Record<string, any>;
     __uni__args?: Array<any>;
 };
 export declare const assignSecrets: <T>(object: T, secrets: UnistyleSecrets) => T;
 export declare const extractSecrets: (object: any) => UnistyleSecrets | undefined;
-export declare const getStyles: (values: UnistylesValues) => {};
+export declare const removeInlineStyles: (values: UnistylesValues) => {};
 export declare const isInDocument: (element: HTMLElement) => boolean;
 export declare const extractMediaQueryValue: (query: string) => number | undefined;
 export declare const getMediaQuery: (query: string) => string;

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,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"}
+{"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,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,kBAAkB,WAAY,eAAe,OAUzD,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/ios/Unistyles-Swift-Cxx-Umbrella.hpp

@@ -54,6 +54,9 @@ namespace Unistyles { class HybridNativePlatformSpecCxx; }
 // This header is generated by Xcode/Swift on every app build.
 // If it cannot be found, make sure the Swift module's name (= podspec name) is actually "Unistyles".
 #include "Unistyles-Swift.h"
+// Same as above, but used when building with frameworks (`use_frameworks`)
+#elif __has_include(<Unistyles/Unistyles-Swift.h>)
+#include <Unistyles/Unistyles-Swift.h>
 #else
 #error Unistyles's autogenerated Swift header cannot be found! Make sure the Swift module's name (= podspec name) is actually "Unistyles", and try building the app first.
 #endif

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-unistyles",
-  "version": "3.0.0-beta.1",
+  "version": "3.0.0-beta.2",
   "description": "Level up your React Native StyleSheet",
   "scripts": {
     "test": "jest",
@@ -70,11 +70,11 @@
     "husky": "9.1.7",
     "jest": "29.7.0",
     "metro-react-native-babel-preset": "0.77.0",
-    "nitro-codegen": "0.18.0",
+    "nitro-codegen": "0.18.2",
     "react": "18.3.1",
     "react-native": "0.76.3",
     "react-native-builder-bob": "0.33.1",
-    "react-native-nitro-modules": "0.18.0",
+    "react-native-nitro-modules": "0.18.2",
     "react-native-web": "0.19.13",
     "react-test-renderer": "18.3.1",
     "release-it": "17.6.0",
@@ -93,7 +93,7 @@
   ],
   "packageManager": "yarn@3.6.1",
   "engines": {
-    "node": ">= 20.0.0"
+    "node": ">= 18.0.0"
   },
   "jest": {
     "preset": "react-native",

package/plugin/common.js

@@ -1,7 +1,10 @@
 function getIdentifierNameFromExpression(t, memberExpression) {
     if (t.isMemberExpression(memberExpression)) {
         if (memberExpression.computed) {
-            return getIdentifierNameFromExpression(t, memberExpression.property).flat()
+            return [
+                getIdentifierNameFromExpression(t, memberExpression.property),
+                getIdentifierNameFromExpression(t, memberExpression.object)
+            ].flat()
         }
 
         const object = memberExpression.object
@@ -15,11 +18,6 @@ function getIdentifierNameFromExpression(t, memberExpression) {
         if (t.isMemberExpression(object)) {
             return getIdentifierNameFromExpression(t, object).flat()
         }
-
-        // If the object is a computed property, it may also be an Identifier
-        if (t.isMemberExpression(object) && t.isIdentifier(object.property)) {
-            return [object.object.name]
-        }
     }
 
     if (t.isBinaryExpression(memberExpression)) {

package/plugin/import.js

@@ -1,34 +1,71 @@
-module.exports = function addUnistylesImport(t, path, state) {
-    const newImport = t.importDeclaration(
-        [
-            t.importSpecifier(t.identifier('UnistylesShadowRegistry'), t.identifier('UnistylesShadowRegistry')),
-            ...state.file.shouldIncludePressable
-                ? [
-                    t.importSpecifier(t.identifier('Pressable'), t.identifier('Pressable')),
-                    t.importSpecifier(t.identifier('getBoundArgs'), t.identifier('getBoundArgs'))
-                ]
-                : []
-        ].filter(Boolean),
-        t.stringLiteral('react-native-unistyles')
-    )
-
-    if (state.file.shouldIncludePressable) {
-        const rnImport = path.node.body.find(node => t.isImportDeclaration(node) && node.source.value === 'react-native')
-
-        if (rnImport) {
-            rnImport.specifiers = rnImport.specifiers.filter(specifier => specifier.local.name !== 'Pressable')
+function addUnistylesImport(t, path, state) {
+    const localNames = Object.keys(state.reactNativeImports)
+    const names = Object.values(state.reactNativeImports)
+    const pairs = Object.entries(state.reactNativeImports)
+    const nodesToRemove = []
+
+    // remove rn-imports
+    path.node.body.forEach(node => {
+        // user might have multiple imports like import type, import
+        if (t.isImportDeclaration(node) && node.source.value === 'react-native') {
+            node.specifiers = node.specifiers.filter(specifier => !localNames.some(name => name === specifier.local.name))
+
+            if (node.specifiers.length === 0) {
+                nodesToRemove.push(node)
+            }
         }
+    })
 
-        const rnWebImport = path.node.body.find(node => t.isImportDeclaration(node) && node.source.value === 'react-native-web/dist/exports/Pressable')
-        const unistylesImport = path.node.body.find(node => t.isImportDeclaration(node) && node.source.value === 'react-native-unistyles')
-        const hasUniPressable = unistylesImport && unistylesImport.specifiers
-            ? unistylesImport.specifiers.find(specifier => specifier.imported.name === 'Pressable' && specifier.local.name !== "NativePressableReactNative")
-            : false
+    // remove RNWeb imports
+    names.forEach(name => {
+        const rnWebImport = path.node.body.find(node => t.isImportDeclaration(node) && node.source.value === `react-native-web/dist/exports/${name}`)
 
-        if (rnWebImport && !hasUniPressable) {
+        if (rnWebImport) {
             rnWebImport.specifiers = []
         }
+    })
+
+    // import components from react-native-unistyles
+    pairs.forEach(([localName, name]) => {
+        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/src/components/native/${name}`)
+                : `react-native-unistyles/src/components/native/${name}`
+            )
+        )
+
+        path.node.body.unshift(newImport)
+    })
+
+    // import variants
+    if (state.file.hasVariants) {
+        const unistylesImport = path.node.body
+            .find(node => t.isImportDeclaration(node) && node.source.value === 'react-native-unistyles')
+
+        if (unistylesImport) {
+            // prevent duplications
+            if (!unistylesImport.specifiers.some(specifier => specifier.local.name === 'Variants')) {
+                unistylesImport.specifiers.push(t.importSpecifier(t.identifier('Variants'), t.identifier('Variants')))
+            }
+        } else {
+            // Add a new import declaration for "Variants" from "react-native-unistyles"
+            const newImport = t.importDeclaration(
+                [t.importSpecifier(t.identifier('Variants'), t.identifier('Variants'))],
+                t.stringLiteral('react-native-unistyles')
+            )
+
+            path.node.body.unshift(newImport)
+        }
     }
 
-    path.node.body.unshift(newImport)
+    // cleanup
+    nodesToRemove.forEach(node => path.node.body.splice(path.node.body.indexOf(node), 1))
+}
+
+const isInsideNodeModules = state => state.file.opts.filename.includes('node_modules')
+
+module.exports = {
+    isInsideNodeModules,
+    addUnistylesImport
 }

package/plugin/index.js

@@ -1,35 +1,41 @@
-const addUnistylesImport = require('./import')
+const { addUnistylesImport, isInsideNodeModules } = require('./import')
 const { getStyleMetadata, getStyleAttribute, styleAttributeToArray, handlePressable } = require('./style')
-const { getRefProp, addRef, overrideRef, hasStringRef } = require('./ref')
-const { isUnistylesStyleSheet, analyzeDependencies, addStyleSheetTag, getUnistyle } = require('./stylesheet')
-const { isUsingVariants, extractVariants } = require('./variants')
+const { hasStringRef } = require('./ref')
+const { isUnistylesStyleSheet, analyzeDependencies, addStyleSheetTag, getUnistyles } = require('./stylesheet')
+const { isUsingVariants, extractVariants, addJSXVariants } = require('./variants')
 
 const reactNativeComponentNames = [
+    'ActivityIndicator',
     'View',
     'Text',
     'Image',
     'ImageBackground',
     'KeyboardAvoidingView',
-    'Modal',
     'Pressable',
     'ScrollView',
     'FlatList',
     'SectionList',
     'Switch',
-    'Text',
     'TextInput',
+    'RefreshControl',
     'TouchableHighlight',
     'TouchableOpacity',
-    'TouchableWithoutFeedback',
     'VirtualizedList'
 ]
 
+// Modal - there is no exposed native handle
+// TouchableWithoutFeedback - can't accept a ref
+
 module.exports = function ({ types: t }) {
     return {
         name: 'babel-react-native-unistyles',
         visitor: {
             Program: {
                 enter(path, state) {
+                    if (isInsideNodeModules(state)) {
+                        return
+                    }
+
                     state.file.hasAnyUnistyle = false
                     state.file.hasUnistylesImport = false
                     state.file.shouldIncludePressable = false
@@ -40,7 +46,7 @@ module.exports = function ({ types: t }) {
                     state.reactNativeImports = {}
                 },
                 exit(path, state) {
-                    if (state.file.hasAnyUnistyle) {
+                    if (state.file.hasAnyUnistyle || state.file.hasVariants) {
                         addUnistylesImport(t, path, state)
                     }
                 }
@@ -65,6 +71,10 @@ module.exports = function ({ types: t }) {
                 }
             },
             VariableDeclaration(path, state) {
+                if (isInsideNodeModules(state)) {
+                    return
+                }
+
                 path.node.declarations.forEach((declaration) => {
                     if (t.isArrowFunctionExpression(declaration.init) || t.isFunctionExpression(declaration.init)) {
                         const componentName = declaration.id
@@ -78,6 +88,10 @@ module.exports = function ({ types: t }) {
                 })
             },
             ImportDeclaration(path, state) {
+                if (isInsideNodeModules(state)) {
+                    return
+                }
+
                 const importSource = path.node.source.value
 
                 if (importSource.includes('react-native-unistyles')) {
@@ -97,7 +111,7 @@ module.exports = function ({ types: t }) {
                         }
 
                         if (specifier.imported && reactNativeComponentNames.includes(specifier.imported.name)) {
-                            state.reactNativeImports[specifier.local.name] = true
+                            state.reactNativeImports[specifier.local.name] = specifier.imported.name
                         }
                     })
                 }
@@ -107,6 +121,10 @@ module.exports = function ({ types: t }) {
                 }
             },
             JSXElement(path, state) {
+                if (isInsideNodeModules(state)) {
+                    return
+                }
+
                 if (state.file.isClassComponent) {
                     return
                 }
@@ -147,17 +165,15 @@ module.exports = function ({ types: t }) {
                 // to add import
                 state.file.hasAnyUnistyle = true
 
-                const refProp = getRefProp(t, path)
-
-                if (!refProp && hasStringRef(t, path)) {
+                if (hasStringRef(t, path)) {
                     throw new Error("Detected string based ref which is not supported by Unistyles.")
                 }
-
-                refProp
-                    ? overrideRef(t, path, refProp, metadata, state)
-                    : addRef(t, path, metadata, state)
             },
             CallExpression(path, state) {
+                if (isInsideNodeModules(state)) {
+                    return
+                }
+
                 if (isUsingVariants(t, path)) {
                     extractVariants(t, path, state)
                 }
@@ -174,13 +190,11 @@ module.exports = function ({ types: t }) {
                 if (t.isObjectExpression(arg)) {
                     arg.properties.forEach(property => {
                         if (t.isObjectProperty(property)) {
-                            const propertyValue = getUnistyle(t, property)
+                            const propertyValues = getUnistyles(t, property)
 
-                            if (!propertyValue) {
-                                return
-                            }
-
-                            analyzeDependencies(t, state, property.key.name, propertyValue)
+                            propertyValues.forEach(propertyValue => {
+                                analyzeDependencies(t, state, property.key.name, propertyValue)
+                            })
                         }
                     })
                 }
@@ -204,17 +218,23 @@ module.exports = function ({ types: t }) {
                     if (t.isObjectExpression(body)) {
                         body.properties.forEach(property => {
                             if (t.isObjectProperty(property)) {
-                                const propertyValue = getUnistyle(t, property)
-
-                                if (!propertyValue) {
-                                    return
-                                }
+                                const propertyValues = getUnistyles(t, property)
 
-                                analyzeDependencies(t, state, property.key.name, propertyValue, themeLocalName, miniRuntimeLocalName)
+                                propertyValues.forEach(propertyValue => {
+                                    analyzeDependencies(t, state, property.key.name, propertyValue, themeLocalName, miniRuntimeLocalName)
+                                })
                             }
                         })
                     }
                 }
+            },
+            ReturnStatement(path, state) {
+                // ignore nested returns in JSX elements
+                const hasJSXParent = path.findParent(p => p.isJSXElement())
+
+                if (!hasJSXParent && state.file.hasVariants) {
+                    addJSXVariants(t, path, state)
+                }
             }
         }
     }