react-native-unistyles 2.0.0-alpha.13 → 2.0.0-alpha.15

package/lib/typescript/src/types/unistyles.d.ts

@@ -1,9 +1,8 @@
-import { CxxUnistylesEventTypes, ScreenOrientation } from '../common';
+import { UnistylesEventType, ScreenOrientation } from '../common';
 import type { UnistylesThemes, UnistylesBreakpoints } from '../global';
 import type { ScreenSize } from './core';
-import type { Optional } from './common';
 import type { UnistylesPlugin } from './plugin';
-export type ColorSchemeName = Optional<'light' | 'dark'>;
+export type ColorSchemeName = 'light' | 'dark' | 'unspecified';
 export type UnistylesConfig = {
     adaptiveThemes?: boolean;
     experimentalPlugins?: Array<UnistylesPlugin>;
@@ -26,13 +25,13 @@ export type UnistylesBridge = {
     removePlugin(pluginName: string): void;
 };
 export type UnistylesThemeEvent = {
-    type: CxxUnistylesEventTypes.Theme;
+    type: UnistylesEventType.Theme;
     payload: {
         themeName: keyof UnistylesThemes;
     };
 };
 export type UnistylesMobileLayoutEvent = {
-    type: CxxUnistylesEventTypes.Layout;
+    type: UnistylesEventType.Layout;
     payload: {
         screen: ScreenSize;
         breakpoint: keyof UnistylesBreakpoints;
@@ -40,7 +39,7 @@ export type UnistylesMobileLayoutEvent = {
     };
 };
 export type UnistylesPluginEvent = {
-    type: CxxUnistylesEventTypes.Plugin;
+    type: UnistylesEventType.Plugin;
 };
 export type UnistylesEvents = UnistylesThemeEvent | UnistylesMobileLayoutEvent | UnistylesPluginEvent;
 //# sourceMappingURL=unistyles.d.ts.map

package/lib/typescript/src/types/unistyles.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"unistyles.d.ts","sourceRoot":"","sources":["../../../../src/types/unistyles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAA;AACrE,OAAO,KAAK,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAA;AACtE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAA;AACxC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AACxC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAE/C,MAAM,MAAM,eAAe,GAAG,QAAQ,CAAC,OAAO,GAAG,MAAM,CAAC,CAAA;AAExD,MAAM,MAAM,eAAe,GAAG;IAC1B,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,mBAAmB,CAAC,EAAE,KAAK,CAAC,eAAe,CAAC,CAAC;IAC7C,YAAY,CAAC,EAAE,MAAM,eAAe,CAAA;CACvC,CAAA;AAED,MAAM,MAAM,eAAe,GAAG;IAE1B,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAC9B,iBAAiB,EAAE,OAAO,CAAC;IAC3B,SAAS,EAAE,MAAM,eAAe,CAAC;IACjC,UAAU,EAAE,MAAM,oBAAoB,CAAC;IACvC,WAAW,EAAE,eAAe,CAAC;IAC7B,qBAAqB,EAAE,KAAK,CAAC,CAAC,MAAM,oBAAoB,EAAE,oBAAoB,CAAC,MAAM,oBAAoB,CAAC,CAAC,CAAC,CAAC;IAG7G,MAAM,EAAE,KAAK,CAAC,MAAM,eAAe,CAAC,CAAC;IACrC,cAAc,CAAC,WAAW,EAAE,oBAAoB,GAAG,IAAI,CAAC;IACxD,QAAQ,CAAC,IAAI,EAAE,MAAM,eAAe,GAAG,IAAI,CAAC;IAC5C,iBAAiB,CAAC,MAAM,EAAE,OAAO,GAAG,IAAI,CAAC;IACzC,SAAS,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAG,IAAI,CAAC;IACrD,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAA;CACzC,CAAA;AAED,MAAM,MAAM,mBAAmB,GAAG;IAC9B,IAAI,EAAE,sBAAsB,CAAC,KAAK,CAAC;IACnC,OAAO,EAAE;QACL,SAAS,EAAE,MAAM,eAAe,CAAA;KACnC,CAAA;CACJ,CAAA;AAED,MAAM,MAAM,0BAA0B,GAAG;IACrC,IAAI,EAAE,sBAAsB,CAAC,MAAM,CAAC;IACpC,OAAO,EAAE;QACL,MAAM,EAAE,UAAU,CAAC;QACnB,UAAU,EAAE,MAAM,oBAAoB,CAAC;QACvC,WAAW,EAAE,OAAO,iBAAiB,CAAC,MAAM,OAAO,iBAAiB,CAAC,CAAA;KACxE,CAAA;CACJ,CAAA;AAED,MAAM,MAAM,oBAAoB,GAAG;IAC/B,IAAI,EAAE,sBAAsB,CAAC,MAAM,CAAA;CACtC,CAAA;AAED,MAAM,MAAM,eAAe,GAAG,mBAAmB,GAAG,0BAA0B,GAAG,oBAAoB,CAAA"}
+{"version":3,"file":"unistyles.d.ts","sourceRoot":"","sources":["../../../../src/types/unistyles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAA;AACjE,OAAO,KAAK,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAA;AACtE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAA;AACxC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAE/C,MAAM,MAAM,eAAe,GAAG,OAAO,GAAG,MAAM,GAAG,aAAa,CAAA;AAE9D,MAAM,MAAM,eAAe,GAAG;IAC1B,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,mBAAmB,CAAC,EAAE,KAAK,CAAC,eAAe,CAAC,CAAC;IAC7C,YAAY,CAAC,EAAE,MAAM,eAAe,CAAA;CACvC,CAAA;AAED,MAAM,MAAM,eAAe,GAAG;IAE1B,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAC9B,iBAAiB,EAAE,OAAO,CAAC;IAC3B,SAAS,EAAE,MAAM,eAAe,CAAC;IACjC,UAAU,EAAE,MAAM,oBAAoB,CAAC;IACvC,WAAW,EAAE,eAAe,CAAC;IAC7B,qBAAqB,EAAE,KAAK,CAAC,CAAC,MAAM,oBAAoB,EAAE,oBAAoB,CAAC,MAAM,oBAAoB,CAAC,CAAC,CAAC,CAAC;IAG7G,MAAM,EAAE,KAAK,CAAC,MAAM,eAAe,CAAC,CAAC;IACrC,cAAc,CAAC,WAAW,EAAE,oBAAoB,GAAG,IAAI,CAAC;IACxD,QAAQ,CAAC,IAAI,EAAE,MAAM,eAAe,GAAG,IAAI,CAAC;IAC5C,iBAAiB,CAAC,MAAM,EAAE,OAAO,GAAG,IAAI,CAAC;IACzC,SAAS,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAG,IAAI,CAAC;IACrD,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAA;CACzC,CAAA;AAED,MAAM,MAAM,mBAAmB,GAAG;IAC9B,IAAI,EAAE,kBAAkB,CAAC,KAAK,CAAC;IAC/B,OAAO,EAAE;QACL,SAAS,EAAE,MAAM,eAAe,CAAA;KACnC,CAAA;CACJ,CAAA;AAED,MAAM,MAAM,0BAA0B,GAAG;IACrC,IAAI,EAAE,kBAAkB,CAAC,MAAM,CAAC;IAChC,OAAO,EAAE;QACL,MAAM,EAAE,UAAU,CAAC;QACnB,UAAU,EAAE,MAAM,oBAAoB,CAAC;QACvC,WAAW,EAAE,OAAO,iBAAiB,CAAC,MAAM,OAAO,iBAAiB,CAAC,CAAA;KACxE,CAAA;CACJ,CAAA;AAED,MAAM,MAAM,oBAAoB,GAAG;IAC/B,IAAI,EAAE,kBAAkB,CAAC,MAAM,CAAA;CAClC,CAAA;AAED,MAAM,MAAM,eAAe,GAAG,mBAAmB,GAAG,0BAA0B,GAAG,oBAAoB,CAAA"}

package/lib/typescript/src/types/variants.d.ts

@@ -1,8 +1,14 @@
-export type ExtractVariantNames<T> = T extends object ? {
-    [K in keyof T]: T[K] extends {
-        variants: infer V;
-    } ? V extends object ? {
-        [VK in keyof V]: VK extends 'default' ? never : VK;
-    }[keyof V] | ExtractVariantNames<V> : never : ExtractVariantNames<T[K]>;
-}[keyof T] : never;
+export type ExtractVariantNames<T> = T extends (...args: any) => infer R ? ExtractVariantKeys<R> : ExtractVariantKeys<T>;
+type ExtractVariantKeys<T> = T extends object ? ExtractVariant<T[keyof T]> : never;
+type ExtractSubVariantKeys<T> = T extends object ? keyof Omit<T, 'default'> | undefined : never;
+type ExtractVariant<T> = T extends (...args: any) => infer R ? R extends {
+    variants: infer V;
+} ? {
+    [key in keyof V]?: ExtractSubVariantKeys<V[key]>;
+} : never : T extends {
+    variants: infer V;
+} ? {
+    [key in keyof V]?: ExtractSubVariantKeys<V[key]>;
+} : never;
+export {};
 //# sourceMappingURL=variants.d.ts.map

package/lib/typescript/src/types/variants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"variants.d.ts","sourceRoot":"","sources":["../../../../src/types/variants.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,mBAAmB,CAAC,CAAC,IAAI,CAAC,SAAS,MAAM,GAC/C;KACG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS;QAAE,QAAQ,EAAE,MAAM,CAAC,CAAA;KAAE,GAC5C,CAAC,SAAS,MAAM,GACX;SAAG,EAAE,IAAI,MAAM,CAAC,GAAG,EAAE,SAAS,SAAS,GACpC,KAAK,GAAG,EAAE;KAAE,CAAC,MAAM,CAAC,CAAC,GAAG,mBAAmB,CAAC,CAAC,CAAC,GAClD,KAAK,GACT,mBAAmB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAClC,CAAC,MAAM,CAAC,CAAC,GACR,KAAK,CAAA"}
+{"version":3,"file":"variants.d.ts","sourceRoot":"","sources":["../../../../src/types/variants.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,mBAAmB,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,IAAI,EAAE,GAAG,KAAK,MAAM,CAAC,GAClE,kBAAkB,CAAC,CAAC,CAAC,GACrB,kBAAkB,CAAC,CAAC,CAAC,CAAA;AAE3B,KAAK,kBAAkB,CAAC,CAAC,IAAI,CAAC,SAAS,MAAM,GACvC,cAAc,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAC1B,KAAK,CAAA;AAEX,KAAK,qBAAqB,CAAC,CAAC,IAAI,CAAC,SAAS,MAAM,GAC1C,MAAM,IAAI,CAAC,CAAC,EAAE,SAAS,CAAC,GAAG,SAAS,GACpC,KAAK,CAAA;AAEX,KAAK,cAAc,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,IAAI,EAAE,GAAG,KAAK,MAAM,CAAC,GACtD,CAAC,SAAS;IAAE,QAAQ,EAAE,MAAM,CAAC,CAAA;CAAE,GAC3B;KAAG,GAAG,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,qBAAqB,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;CAAE,GACpD,KAAK,GACT,CAAC,SAAS;IAAE,QAAQ,EAAE,MAAM,CAAC,CAAA;CAAE,GAC3B;KAAG,GAAG,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,qBAAqB,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;CAAE,GACpD,KAAK,CAAA"}

package/lib/typescript/src/useStyles.d.ts

@@ -1,10 +1,10 @@
-import type { CreateStylesFactory, CustomNamedStyles, ExtractVariantNames, ReactNativeStyleSheet, UnistylesTheme } from './types';
 import type { UnistylesBreakpoints } from './global';
-type ParsedStylesheet<ST extends CustomNamedStyles<ST>> = {
+import type { ExtractVariantNames, ReactNativeStyleSheet, StyleSheetWithSuperPowers, UnistylesTheme } from './types';
+type ParsedStylesheet<ST extends StyleSheetWithSuperPowers> = {
     theme: UnistylesTheme;
     breakpoint: keyof UnistylesBreakpoints;
     styles: ReactNativeStyleSheet<ST>;
 };
-export declare const useStyles: <ST extends CustomNamedStyles<ST>>(stylesheet?: ST | CreateStylesFactory<ST, never> | undefined, variant?: (ExtractVariantNames<ST> & string) | undefined) => ParsedStylesheet<ST>;
+export declare const useStyles: <ST extends StyleSheetWithSuperPowers>(stylesheet?: ST | undefined, variantsMap?: ExtractVariantNames<ST> | undefined) => ParsedStylesheet<ST>;
 export {};
 //# sourceMappingURL=useStyles.d.ts.map

package/lib/typescript/src/useStyles.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useStyles.d.ts","sourceRoot":"","sources":["../../../src/useStyles.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACR,mBAAmB,EACnB,iBAAiB,EACjB,mBAAmB,EACnB,qBAAqB,EACrB,cAAc,EACjB,MAAM,SAAS,CAAA;AAEhB,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAA;AAEpD,KAAK,gBAAgB,CAAC,EAAE,SAAS,iBAAiB,CAAC,EAAE,CAAC,IAAI;IACtD,KAAK,EAAE,cAAc,CAAC;IACtB,UAAU,EAAE,MAAM,oBAAoB,CAAC;IACvC,MAAM,EAAE,qBAAqB,CAAC,EAAE,CAAC,CAAA;CACpC,CAAA;AAED,eAAO,MAAM,SAAS,oLA0CrB,CAAA"}
+{"version":3,"file":"useStyles.d.ts","sourceRoot":"","sources":["../../../src/useStyles.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAA;AAEpD,OAAO,KAAK,EACR,mBAAmB,EACnB,qBAAqB,EACrB,yBAAyB,EACzB,cAAc,EACjB,MAAM,SAAS,CAAA;AAEhB,KAAK,gBAAgB,CAAC,EAAE,SAAS,yBAAyB,IAAI;IAC1D,KAAK,EAAE,cAAc,CAAC;IACtB,UAAU,EAAE,MAAM,oBAAoB,CAAC;IACvC,MAAM,EAAE,qBAAqB,CAAC,EAAE,CAAC,CAAA;CACpC,CAAA;AAED,eAAO,MAAM,SAAS,gJAgDrB,CAAA"}

package/lib/typescript/src/utils/index.d.ts

@@ -1,5 +1,4 @@
-export { mq, MQSymbol } from './mq';
-export { getKeyForVariant } from './variants';
+export { mq, MQSymbol, MQHeight, MQWidth, MQHeightAndWidth, MQWidthAndHeight } from './mq';
 export { getKeyForUnistylesMediaQuery, isWithinTheWidthAndHeight, isValidMq, parseMq } from './mqParser';
 export { getValueForBreakpoint } from './breakpoints';
 export { proxifyFunction, parseStyle } from './styles';

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAA;AACnC,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAC7C,OAAO,EAAE,4BAA4B,EAAE,yBAAyB,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AACxG,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAA;AACrD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,MAAM,CAAA;AAC1F,OAAO,EAAE,4BAA4B,EAAE,yBAAyB,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AACxG,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAA;AACrD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA"}

package/lib/typescript/src/utils/mq.d.ts

@@ -1,21 +1,27 @@
-import type { MediaQuery, Nullable } from '../types';
+import type { Nullable } from '../types';
 import type { UnistylesBreakpoints } from '../global';
 export declare const MQSymbol: unique symbol;
+export declare const MQWidth: unique symbol;
+export declare const MQHeight: unique symbol;
+export declare const MQWidthAndHeight: unique symbol;
+export declare const MQHeightAndWidth: unique symbol;
 type MQValue = keyof UnistylesBreakpoints | number;
 type MQHandler = {
-    w(wMin?: Nullable<MQValue>, wMax?: MQValue): WidthHandler;
-    width(wMin?: Nullable<MQValue>, wMax?: MQValue): WidthHandler;
-    h(hMin?: Nullable<MQValue>, hMax?: MQValue): HeightHandler;
-    height(hMin?: Nullable<MQValue>, hMax?: MQValue): HeightHandler;
+    only: {
+        width(wMin?: Nullable<MQValue>, wMax?: MQValue): typeof MQWidth;
+        height(hMin?: Nullable<MQValue>, hMax?: MQValue): typeof MQHeight;
+    };
+    width(wMin?: Nullable<MQValue>, wMax?: MQValue): {
+        and: {
+            height(hMin?: Nullable<MQValue>, hMax?: MQValue): typeof MQWidthAndHeight;
+        };
+    };
+    height(hMin?: Nullable<MQValue>, hMax?: MQValue): {
+        and: {
+            width(wMin?: Nullable<MQValue>, wMax?: MQValue): typeof MQHeightAndWidth;
+        };
+    };
 };
-type HeightHandler = {
-    w(wMin?: Nullable<MQValue>, wMax?: MQValue): MediaQuery;
-    width(wMin?: Nullable<MQValue>, wMax?: MQValue): MediaQuery;
-} & MediaQuery;
-type WidthHandler = {
-    h(hMin?: Nullable<MQValue>, hMax?: MQValue): MediaQuery;
-    height(hMin?: Nullable<MQValue>, hMax?: MQValue): MediaQuery;
-} & MediaQuery;
 export declare const mq: MQHandler;
 export {};
 //# sourceMappingURL=mq.d.ts.map

package/lib/typescript/src/utils/mq.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mq.d.ts","sourceRoot":"","sources":["../../../../src/utils/mq.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AACpD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAA;AAGrD,eAAO,MAAM,QAAQ,eAAyB,CAAA;AAE9C,KAAK,OAAO,GAAG,MAAM,oBAAoB,GAAG,MAAM,CAAA;AAElD,KAAK,SAAS,GAAG;IACb,CAAC,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,EAAE,OAAO,GAAG,YAAY,CAAC;IAC1D,KAAK,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,EAAE,OAAO,GAAG,YAAY,CAAC;IAC9D,CAAC,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,EAAE,OAAO,GAAG,aAAa,CAAC;IAC3D,MAAM,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,EAAE,OAAO,GAAG,aAAa,CAAA;CAClE,CAAA;AAED,KAAK,aAAa,GAAG;IACjB,CAAC,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,EAAE,OAAO,GAAG,UAAU,CAAC;IACxD,KAAK,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,EAAE,OAAO,GAAG,UAAU,CAAA;CAC9D,GAAG,UAAU,CAAA;AAEd,KAAK,YAAY,GAAG;IAChB,CAAC,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,EAAE,OAAO,GAAG,UAAU,CAAC;IACxD,MAAM,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,EAAE,OAAO,GAAG,UAAU,CAAA;CAC/D,GAAG,UAAU,CAAA;AAsEd,eAAO,MAAM,EAAE,WAYb,CAAA"}
+{"version":3,"file":"mq.d.ts","sourceRoot":"","sources":["../../../../src/utils/mq.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AACxC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAA;AAGrD,eAAO,MAAM,QAAQ,eAAyB,CAAA;AAC9C,eAAO,MAAM,OAAO,eAA+B,CAAA;AACnD,eAAO,MAAM,QAAQ,eAAgC,CAAA;AACrD,eAAO,MAAM,gBAAgB,eAA0C,CAAA;AACvE,eAAO,MAAM,gBAAgB,eAA0C,CAAA;AAEvE,KAAK,OAAO,GAAG,MAAM,oBAAoB,GAAG,MAAM,CAAA;AAElD,KAAK,SAAS,GAAG;IACb,IAAI,EAAE;QACF,KAAK,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,EAAE,OAAO,GAAG,OAAO,OAAO,CAAC;QAChE,MAAM,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,EAAE,OAAO,GAAG,OAAO,QAAQ,CAAC;KACrE,CAAC;IACF,KAAK,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,EAAE,OAAO,GAAG;QAC7C,GAAG,EAAE;YACD,MAAM,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,EAAE,OAAO,GAAG,OAAO,gBAAgB,CAAA;SAC5E,CAAA;KACJ,CAAC;IACF,MAAM,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,EAAE,OAAO,GAAG;QAC9C,GAAG,EAAE;YACD,KAAK,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,EAAE,OAAO,GAAG,OAAO,gBAAgB,CAAA;SAC3E,CAAA;KACJ,CAAA;CACJ,CAAA;AA0ED,eAAO,MAAM,EAAE,WAmBb,CAAA"}

package/lib/typescript/src/utils/styles.d.ts

@@ -1,6 +1,6 @@
-import type { CustomNamedStyles, ScreenSize, RNStyle } from '../types';
-import type { UnistylesBreakpoints } from '../global';
-export declare const proxifyFunction: (key: string, fn: Function, breakpoint: keyof UnistylesBreakpoints & string, screenSize: ScreenSize, variant?: string) => Function;
+import type { UnistylesPlugin, StyleSheet, Optional } from '../types';
+import type { UnistylesRuntime } from '../core';
+export declare const proxifyFunction: (key: string, fn: Function, plugins: Array<UnistylesPlugin>, runtime: UnistylesRuntime, variant?: Record<string, Optional<string>>) => Function;
 export declare const isPlatformColor: <T extends {}>(value: T) => boolean;
-export declare const parseStyle: <T extends RNStyle>(key: string, style: CustomNamedStyles<T>, breakpoint: keyof UnistylesBreakpoints & string, screenSize: ScreenSize, variant?: string) => T;
+export declare const parseStyle: <T extends StyleSheet>(key: string, style: T, plugins: Array<UnistylesPlugin>, runtime: UnistylesRuntime, variant?: Record<string, Optional<string>>) => T;
 //# sourceMappingURL=styles.d.ts.map

package/lib/typescript/src/utils/styles.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"styles.d.ts","sourceRoot":"","sources":["../../../../src/utils/styles.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,UAAU,EAAe,OAAO,EAAE,MAAM,UAAU,CAAA;AAEnF,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAA;AAKrD,eAAO,MAAM,eAAe,QACnB,MAAM,MACP,QAAQ,cAAc,MAAM,oBAAoB,GAAG,MAAM,cACjD,UAAU,YACZ,MAAM,KACjB,QAGD,CAAA;AAEF,eAAO,MAAM,eAAe,8BAA6B,OAMxD,CAAA;AAED,eAAO,MAAM,UAAU,2BACd,MAAM,2CAEC,MAAM,oBAAoB,GAAG,MAAM,cACnC,UAAU,YACZ,MAAM,MA4DnB,CAAA"}
+{"version":3,"file":"styles.d.ts","sourceRoot":"","sources":["../../../../src/utils/styles.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAe,eAAe,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AAElF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAA;AAK/C,eAAO,MAAM,eAAe,QACnB,MAAM,MACP,QAAQ,WACH,MAAM,eAAe,CAAC,WACtB,gBAAgB,YACf,OAAO,MAAM,EAAE,SAAS,MAAM,CAAC,CAAC,KAC3C,QAGD,CAAA;AAEF,eAAO,MAAM,eAAe,8BAA6B,OAMxD,CAAA;AAED,eAAO,MAAM,UAAU,8BACd,MAAM,qBAEF,MAAM,eAAe,CAAC,WACtB,gBAAgB,YACf,OAAO,MAAM,EAAE,SAAS,MAAM,CAAC,CAAC,MA0C7C,CAAA"}

package/lib/typescript/src/utils/variants.d.ts

@@ -1,3 +1,3 @@
-import type { Optional, NestedStyle } from '../types';
-export declare const getKeyForVariant: (value: NestedStyle, variant?: string) => Optional<string>;
+import type { Optional, StyleSheet } from '../types';
+export declare const getStyleWithVariants: (style: StyleSheet, variantValues?: Record<string, Optional<string>>) => StyleSheet;
 //# sourceMappingURL=variants.d.ts.map

package/lib/typescript/src/utils/variants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"variants.d.ts","sourceRoot":"","sources":["../../../../src/utils/variants.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,UAAU,CAAA;AAErD,eAAO,MAAM,gBAAgB,UAAW,WAAW,YAAY,MAAM,KAAG,SAAS,MAAM,CAUtF,CAAA"}
+{"version":3,"file":"variants.d.ts","sourceRoot":"","sources":["../../../../src/utils/variants.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,UAAU,EAAe,MAAM,UAAU,CAAA;AAqCjE,eAAO,MAAM,oBAAoB,UACtB,UAAU,kBACD,OAAO,MAAM,EAAE,SAAS,MAAM,CAAC,CAAC,eAqBnD,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-unistyles",
-  "version": "2.0.0-alpha.13",
+  "version": "2.0.0-alpha.15",
   "description": "Level up your React Native StyleSheet",
   "scripts": {
     "test": "jest",
@@ -50,23 +50,23 @@
     "registry": "https://registry.npmjs.org/"
   },
   "devDependencies": {
-    "@commitlint/config-conventional": "18.1.0",
+    "@commitlint/config-conventional": "18.4.3",
     "@react-native/eslint-config": "0.74.0",
     "@react-native/normalize-colors": "0.74.1",
-    "@release-it/conventional-changelog": "7.0.2",
+    "@release-it/conventional-changelog": "8.0.1",
     "@testing-library/react-hooks": "8.0.1",
-    "@types/jest": "29.5.7",
-    "@types/react": "18.2.34",
-    "@typescript-eslint/eslint-plugin": "6.9.1",
-    "@typescript-eslint/eslint-plugin-tslint": "6.9.1",
-    "@typescript-eslint/parser": "6.9.1",
-    "commitlint": "18.2.0",
+    "@types/jest": "29.5.10",
+    "@types/react": "18.2.38",
+    "@typescript-eslint/eslint-plugin": "6.12.0",
+    "@typescript-eslint/eslint-plugin-tslint": "6.12.0",
+    "@typescript-eslint/parser": "6.12.0",
+    "commitlint": "18.4.3",
     "concurrently": "8.2.2",
-    "eslint": "8.53.0",
+    "eslint": "8.54.0",
     "eslint-config-codemask": "1.1.7",
     "eslint-plugin-functional": "6.0.0",
     "eslint-plugin-import": "2.29.0",
-    "eslint-plugin-jsdoc": "46.8.2",
+    "eslint-plugin-jsdoc": "46.9.0",
     "eslint-plugin-jsx-a11y": "6.8.0",
     "eslint-plugin-nested-if": "1.0.0",
     "eslint-plugin-no-else": "0.2.2",
@@ -77,11 +77,11 @@
     "husky": "8.0.3",
     "jest": "29.7.0",
     "react": "18.2.0",
-    "react-native": "0.72.6",
-    "react-native-builder-bob": "0.23.1",
+    "react-native": "0.72.7",
+    "react-native-builder-bob": "0.23.2",
     "react-native-web": "0.19.9",
     "react-test-renderer": "18.2.0",
-    "release-it": "16.2.1",
+    "release-it": "17.0.0",
     "typescript": "5.2.2"
   },
   "peerDependencies": {

package/src/common.ts

@@ -15,20 +15,20 @@ export const ScreenOrientation = {
     Portrait: 'portrait'
 } as const
 
-export enum CxxUnistylesEventTypes {
+export enum UnistylesEventType {
     Theme = 'theme',
     Layout = 'layout',
     Plugin = 'plugin'
 }
 
 export enum UnistylesError {
-    RuntimeUnavailable = 'UNISTYLES_ERROR_RUNTIME_UNAVAILABLE',
-    ThemeNotFound = 'UNISTYLES_ERROR_THEME_NOT_FOUND',
-    ThemeNotRegistered = 'UNISTYLES_ERROR_THEME_NOT_REGISTERED',
-    ThemesCannotBeEmpty = 'UNISTYLES_ERROR_THEMES_CANNOT_BE_EMPTY',
-    BreakpointsCannotBeEmpty = 'UNISTYLES_ERROR_BREAKPOINTS_CANNOT_BE_EMPTY',
-    BreakpointsMustStartFromZero = 'UNISTYLES_ERROR_BREAKPOINTS_MUST_START_FROM_ZERO',
-    InvalidPluginName = 'UNISTYLES_ERROR_INVALID_PLUGIN_NAME',
-    DuplicatePluginName = 'UNISTYLES_ERROR_DUPLICATE_PLUGIN_NAME',
-    CantRemoveInternalPlugin = 'UNISTYLES_ERROR_CANT_REMOVE_INTERNAL_PLUGIN'
+    RuntimeUnavailable = 'Unistyles runtime is not available. Make sure you followed the installation instructions.',
+    ThemeNotFound = 'You are trying to get a theme that is not registered.',
+    ThemeNotRegistered = 'You are trying to set a theme that is not registered.',
+    ThemesCannotBeEmpty = 'You are trying to register an empty themes object.',
+    BreakpointsCannotBeEmpty = 'You are trying to register an empty breakpoints object.',
+    BreakpointsMustStartFromZero = 'One breakpoint must start from 0.',
+    InvalidPluginName = 'Plugin name can\'t start from reserved prefix. Use another name.',
+    DuplicatePluginName = 'You are trying to register a plugin with a name that is already registered.',
+    CantRemoveInternalPlugin = 'You are trying to remove an internal unistyles plugin.'
 }

package/src/core/UnistyleRegistry.ts

@@ -1,10 +1,13 @@
 import type { UnistylesBridge, UnistylesConfig, UnistylesPlugin } from '../types'
 import type { UnistylesBreakpoints, UnistylesThemes } from '../global'
-import { UnistylesError } from '../common'
+import { isWeb, UnistylesError } from '../common'
+import { normalizeWebStylesPlugin } from '../plugins'
 
 export class UnistyleRegistry {
     public config: UnistylesConfig = {}
-    public plugins: Array<UnistylesPlugin> = []
+    public plugins: Array<UnistylesPlugin> = isWeb
+        ? [normalizeWebStylesPlugin]
+        : []
     public themeNames: Array<keyof UnistylesThemes> = []
     public themes: UnistylesThemes = {} as UnistylesThemes
     public breakpoints: UnistylesBreakpoints = {} as UnistylesBreakpoints
@@ -68,7 +71,7 @@ export class UnistyleRegistry {
             throw new Error(UnistylesError.DuplicatePluginName)
         }
 
-        this.plugins = this.plugins.concat([plugin])
+        this.plugins = [plugin].concat(this.plugins)
         this.unistylesBridge.addPlugin(plugin.name, notify)
     }
 

package/src/core/UnistylesRuntime.ts

@@ -44,7 +44,7 @@ export class UnistylesRuntime {
     }
 
     public setTheme = (name: keyof UnistylesThemes) => {
-        if (this.unistylesRegistry.hasTheme(name)) {
+        if (name !== this.themeName && this.unistylesRegistry.hasTheme(name)) {
             this.unistylesBridge.useTheme(name)
 
             return true

package/src/createStyleSheet.ts

@@ -1,9 +1,3 @@
-import type { CustomNamedStyles, UnistylesTheme } from './types'
+import type { StyleSheetWithSuperPowers } from './types'
 
-export const createStyleSheet = <S, X>(styles: S | CustomNamedStyles<S> | X | ((theme: UnistylesTheme) => X | CustomNamedStyles<X>)): S | X => {
-    if (typeof styles === 'function') {
-        return styles as X
-    }
-
-    return styles as S
-}
+export const createStyleSheet = <S extends StyleSheetWithSuperPowers>(stylesheet: S): S => stylesheet

package/src/global.ts

@@ -1,5 +1,6 @@
 export interface UnistylesThemes {}
 export interface UnistylesBreakpoints {
+    // these breakpoints are only available on mobile, when you didn't specify any breakpoints
     landscape?: number,
     portrait?: number,
 }

package/src/hooks/index.ts

@@ -1,2 +1,3 @@
 export { useInitialTheme } from './useInitialTheme'
 export { useUnistyles } from './useUnistyles'
+export { useVariants } from './useVariants'

package/src/hooks/useUnistyles.ts

@@ -1,7 +1,7 @@
 import { NativeEventEmitter, NativeModules } from 'react-native'
 import { useEffect, useState } from 'react'
 import { unistyles } from '../core'
-import { CxxUnistylesEventTypes } from '../common'
+import { UnistylesEventType } from '../common'
 import type { UnistylesEvents, UnistylesMobileLayoutEvent, UnistylesThemeEvent } from '../types'
 
 const unistylesEvents = new NativeEventEmitter(NativeModules.Unistyles)
@@ -23,24 +23,21 @@ export const useUnistyles = () => {
             'onChange',
             (event: UnistylesEvents) => {
                 switch (event.type) {
-                    case CxxUnistylesEventTypes.Theme: {
+                    case UnistylesEventType.Theme: {
                         const themeEvent = event as UnistylesThemeEvent
 
                         return setTheme(unistyles.registry.getTheme(themeEvent.payload.themeName))
                     }
-                    case CxxUnistylesEventTypes.Layout: {
+                    case UnistylesEventType.Layout: {
                         const layoutEvent = event as UnistylesMobileLayoutEvent
 
                         return setLayout({
                             breakpoint: layoutEvent.payload.breakpoint,
                             orientation: layoutEvent.payload.orientation,
-                            screenSize: {
-                                width: layoutEvent.payload.screen.width,
-                                height: layoutEvent.payload.screen.height
-                            }
+                            screenSize: layoutEvent.payload.screen
                         })
                     }
-                    case CxxUnistylesEventTypes.Plugin: {
+                    case UnistylesEventType.Plugin: {
                         return setPlugins(unistyles.runtime.enabledPlugins)
                     }
                     default:

package/src/hooks/useVariants.ts

@@ -0,0 +1,23 @@
+import { useRef } from 'react'
+import type { Optional } from '../types'
+
+const compareVariants = (prevVariants?: Record<string, Optional<string>>, nextVariants?: Record<string, Optional<string>>) => {
+    const keysA = Object.keys(prevVariants ?? {})
+    const keysB = Object.keys(nextVariants ?? {})
+
+    if (keysA.length !== keysB.length) {
+        return false
+    }
+
+    return keysA.every(key => prevVariants![key] === (nextVariants ?? {})[key])
+}
+
+export const useVariants = (variantsMap?: Record<string, Optional<string>>) => {
+    const variantsRef = useRef<Optional<Record<string, Optional<string>>>>(variantsMap)
+
+    if (!compareVariants(variantsRef.current, variantsMap)) {
+        variantsRef.current = variantsMap
+    }
+
+    return variantsRef.current
+}

package/src/plugins/normalizer/normalizer.ts

@@ -1,7 +1,7 @@
 // based on react-native-web normalizer
 // https://github.com/necolas/react-native-web
 import normalizeColors from '@react-native/normalize-colors'
-import type { TextShadow, Transforms, BoxShadow } from '../../types'
+import type { TextShadow, Transforms, BoxShadow, Nullable } from '../../types'
 
 type Preprocessor = {
     createTextShadowValue(style: TextShadow): string,
@@ -15,9 +15,9 @@ export const normalizeColor = (color: string, opacity: number = 1) => {
         return color
     }
 
-    const integer = normalizeColors(color) as number | null
+    const integer = normalizeColors(color) as Nullable<number>
 
-    // If the colour is an unknown format, the return value is null
+    // If the color is an unknown format, the return value is null
     if (integer === null) {
         return color
     }

package/src/plugins/withPlugins.ts

@@ -1,17 +1,15 @@
-import type { RNStyle } from '../types'
-import { normalizeWebStylesPlugin } from './normalizeWebStylesPlugin'
-import { isWeb } from '../common'
-import { unistyles } from '../core'
+import type { RNStyle, UnistylesPlugin } from '../types'
+import type { UnistylesRuntime } from '../core'
 
-const UNISTYLES_PLUGINS = isWeb
-    ? [normalizeWebStylesPlugin]
-    : []
+export const withPlugins = (
+    key: string,
+    style: RNStyle,
+    plugins: Array<UnistylesPlugin>,
+    runtime: UnistylesRuntime
+) => plugins.reduce((acc, plugin) => {
+    if (plugin.onParsedStyle) {
+        return plugin.onParsedStyle(key, acc, runtime)
+    }
 
-export const withPlugins = (key: string, style: RNStyle) => unistyles.registry.plugins.concat(UNISTYLES_PLUGINS)
-    .reduce((acc, plugin) => {
-        if (plugin.onParsedStyle) {
-            return plugin.onParsedStyle(key, acc, unistyles.runtime)
-        }
-
-        return acc
-    }, style)
+    return acc
+}, style)

package/src/types/breakpoints.ts

@@ -1,34 +1,55 @@
-import type { OpaqueColorValue } from 'react-native'
-import type { UnistylesBreakpoints } from '../global'
-import type { MediaQuery } from './mq'
+import type { ColorValue, OpaqueColorValue } from 'react-native'
+import type { UnistylesTheme } from '../types'
+import type { AllAvailableKeys, BreakpointsOrMediaQueries } from './stylesheet'
 
 type WithEmptyObject<V> = keyof V extends never ? {} : V
 
-type ExtractBreakpoints<T> = T extends Partial<Record<keyof UnistylesBreakpoints & string, infer V>>
-    ? WithEmptyObject<V>
-    : T extends (...args: infer A) => infer R
-        ? (...args: A) => ExtractBreakpoints<R>
-        : {
-            [K in keyof T]: T[K] extends (...args: infer A) => infer R
-                ? (...args: A) => ExtractBreakpoints<R>
-                : T[K] extends object
-                    ? ExtractBreakpoints<T[K]>
+type ExtractBreakpoints<T> = T extends Partial<Record<BreakpointsOrMediaQueries, infer R>>
+    ? WithEmptyObject<R>
+    : {
+        [K in keyof T]: T[K] extends object
+            ? T[K] extends OpaqueColorValue
+                ? ColorValue
+                : ExtractBreakpoints<T[K]>
+            : T[K]
+    }
+
+type ParseNestedObject<T> = T extends (...args: infer A) => infer R
+    ? (...args: A) => ParseNestedObject<R>
+    : keyof T extends AllAvailableKeys
+        ? ExtractBreakpoints<T>
+        : T extends { variants: infer R }
+            ? ParseVariants<FlattenVariants<R>> & ParseNestedObject<Omit<T, 'variants'>>
+            : {
+                [K in keyof T]: T[K] extends object
+                    ? T[K] extends OpaqueColorValue
+                        ? ColorValue
+                        : ExtractBreakpoints<T[K]>
                     : T[K]
-        }
+            }
 
-type UnionToIntersection<U> =
-    (U extends any ? (k: U) => void : never) extends ((k: infer I) => void) ? I : never
+type FlattenVariants<T> = T extends object
+    ? {
+        [K in keyof T]: T[K] extends object
+            ? {
+                [key in keyof T[K]]: T[K][key] extends object
+                    ? ParseNestedObject<T[K][key]>
+                    : never
+            }
+            : never
+    }
+    : never
 
-type RemoveKeysWithPrefix<T> = T extends (...args: Array<any>) => infer R
-    ? (...args: Parameters<T>) => RemoveKeysWithPrefix<R>
-    : T extends object
-        ? T extends OpaqueColorValue
-            ? string
-            : T extends Record<string, infer _V>
-                ? T extends { variants: infer _V }
-                    ? Omit<T, 'variants'> & UnionToIntersection<_V[keyof _V]>
-                    : { [K in keyof T as K extends MediaQuery ? keyof UnistylesBreakpoints & string : K]: RemoveKeysWithPrefix<T[K]> }
-                : { [K in keyof T]: RemoveKeysWithPrefix<T[K]> }
+type ParseVariants<T> = T extends object
+    ? T[keyof T] extends object
+        ? ParseVariants<T[keyof T]>
         : T
+    : T
+
+type ParseStyleKeys<T> = T extends object
+    ? { [K in keyof T]: ParseNestedObject<T[K]> }
+    : never
 
-export type ReactNativeStyleSheet<T> = ExtractBreakpoints<RemoveKeysWithPrefix<T>>
+export type ReactNativeStyleSheet<T> = T extends (theme: UnistylesTheme) => infer R
+    ? ParseStyleKeys<R>
+    : ParseStyleKeys<T>

package/src/types/core.ts

@@ -17,17 +17,12 @@ import type { ImageStyle, TextStyle, ViewStyle } from 'react-native'
 import type { UnistylesBreakpoints, UnistylesThemes } from '../global'
 import type { MediaQuery } from './mq'
 
-type ShadowOffset = {
+export type ShadowOffset = {
     width: number,
     height: number
 }
 
-export type ScreenSize = {
-    width: number,
-    height: number
-}
-
-type TransformStyles =
+export type TransformStyles =
     & PerpectiveTransform
     & RotateTransform
     & RotateXTransform
@@ -42,40 +37,9 @@ type TransformStyles =
     & SkewYTransform
     & MatrixTransform
 
-type UnistyleNested = {
-    shadowOffset?: DeepUniStyle<ShadowOffset>,
-    textShadowOffset?: DeepUniStyle<ShadowOffset>,
-    transform?: Array<DeepUniStyle<TransformStyles>>,
-    variants?: Record<string, UnistyleView | UnistyleText | UnistyleImage & Omit<UnistyleNested, 'variants'>>
-}
-
-type UniStyle<V> = {
-    [innerKey in keyof UnistylesBreakpoints]?: V
-} | {
-    [innerKey in MediaQuery]: V
-}
-
-type DeepUniStyle<T> = {
-    [K in keyof T]?: UniStyle<T[K]> | T[K]
-}
-
-// these props are treated differently to nest breakpoints and media queries
-type NestedTypes = 'shadowOffset' | 'transform' | 'textShadowOffset'
-
-type UnistyleView = DeepUniStyle<Omit<ViewStyle, NestedTypes>>
-type UnistyleText = DeepUniStyle<Omit<TextStyle, NestedTypes>>
-type UnistyleImage = DeepUniStyle<Omit<ImageStyle, NestedTypes>>
-
-export type StaticStyles =
-    | UnistyleView
-    | UnistyleText
-    | UnistyleImage
-    & UnistyleNested
-
-export type CustomNamedStyles<T> = {
-    [K in keyof T]: T[K] extends (...args: infer A) => StaticStyles
-        ? (...args: A) => StaticStyles
-        : StaticStyles
+export type ScreenSize = {
+    width: number,
+    height: number
 }
 
 export type RNStyle = ViewStyle | TextStyle | ImageStyle
@@ -83,4 +47,4 @@ export type RNValue = number | string | undefined
 export type NestedStyle = Record<keyof UnistylesBreakpoints | MediaQuery, RNValue>
 export type NestedStylePairs = Array<[keyof UnistylesBreakpoints | MediaQuery, RNValue]>
 export type UnistylesTheme = UnistylesThemes[keyof UnistylesThemes]
-export type CreateStylesFactory<ST, Theme> = (theme: Theme) => ST
+export type CreateStylesFactory<ST> = (theme: UnistylesTheme) => ST