@tamagui/core 1.0.1-beta.180 → 1.0.1-beta.182

package/src/createVariable.ts

@@ -10,16 +10,14 @@ import { isWeb } from './constants/platform'
 
 const IS_VAR = '__isVar__'
 
-export type VariableValue = string | number
-
-type VariableIn<A extends VariableValue = VariableValue> = {
+type VariableIn<A = any> = {
   val: A
   name: string
   key: string
   isFloating?: boolean
 }
 
-export type Variable<A extends VariableValue = VariableValue> = VariableIn<A> & {
+export type Variable<A = any> = VariableIn<A> & {
   [IS_VAR]?: true
   variable?: string
 }

package/src/helpers/registerCSSVariable.ts

@@ -1,4 +1,4 @@
-import { Variable, VariableValue, createCSSVariable } from '../createVariable'
+import { Variable, createCSSVariable } from '../createVariable'
 
 export const registerCSSVariable = (v: Variable) => {
   tokensValueToVariable.set(v.val, v)
@@ -8,4 +8,4 @@ export const variableToCSS = (v: Variable) => {
   return `--${createCSSVariable(v.name, false)}:${typeof v.val === 'number' ? `${v.val}px` : v.val}`
 }
 
-export const tokensValueToVariable = new Map<VariableValue, any>()
+export const tokensValueToVariable = new Map<any, any>()

package/src/types.tsx

@@ -239,7 +239,7 @@ export type GenericTamaguiConfig = CreateTamaguiConfig<
 export type ThemeDefinition = TamaguiConfig['themes'][keyof TamaguiConfig['themes']]
 export type ThemeKeys = keyof ThemeDefinition
 export type ThemeParsed = {
-  [key in ThemeKeys]: Variable
+  [key in ThemeKeys]: Variable<any>
 }
 export type Tokens = TamaguiConfig['tokens']
 export type Shorthands = TamaguiConfig['shorthands']
@@ -1215,6 +1215,7 @@ export type TamaguiComponentState = {
   focus: boolean
   mounted: boolean
   mediaState?: null | Record<string, boolean>
+  hasAnimation?: boolean
   animation?: null | {
     style?: any
     avoidClasses?: boolean

package/types/config.d.ts

@@ -1,4 +1,4 @@
-import { ConfigListener, TamaguiInternalConfig } from './types';
+import { ConfigListener, TamaguiInternalConfig, Tokens } from './types';
 export declare const setConfig: (next: TamaguiInternalConfig) => void;
 export declare const setConfigFont: (name: string, font: any, fontParsed: any) => void;
 export declare const getHasConfigured: () => boolean;
@@ -15,26 +15,30 @@ export declare const getConfig: () => TamaguiInternalConfig<import("./types").Cr
         [key: string]: any;
     };
 }, import("./types").GenericFonts>;
-export declare const getTokens: () => import("./types").CreateTokens<import("./createVariable").Variable<import("./createVariable").VariableValue>>;
+export declare const getTokens: () => Tokens;
+/**
+ * Note: this is the same as `getTokens`
+ */
+export declare const useTokens: () => Tokens;
 export declare const getThemes: () => {
     [x: string]: {
-        [x: string]: import("./createVariable").Variable<import("./createVariable").VariableValue>;
-        background?: import("./createVariable").Variable<import("./createVariable").VariableValue> | undefined;
-        backgroundHover?: import("./createVariable").Variable<import("./createVariable").VariableValue> | undefined;
-        backgroundPress?: import("./createVariable").Variable<import("./createVariable").VariableValue> | undefined;
-        backgroundFocus?: import("./createVariable").Variable<import("./createVariable").VariableValue> | undefined;
-        color?: import("./createVariable").Variable<import("./createVariable").VariableValue> | undefined;
-        colorHover?: import("./createVariable").Variable<import("./createVariable").VariableValue> | undefined;
-        colorPress?: import("./createVariable").Variable<import("./createVariable").VariableValue> | undefined;
-        colorFocus?: import("./createVariable").Variable<import("./createVariable").VariableValue> | undefined;
-        borderColor?: import("./createVariable").Variable<import("./createVariable").VariableValue> | undefined;
-        borderColorHover?: import("./createVariable").Variable<import("./createVariable").VariableValue> | undefined;
-        borderColorPress?: import("./createVariable").Variable<import("./createVariable").VariableValue> | undefined;
-        borderColorFocus?: import("./createVariable").Variable<import("./createVariable").VariableValue> | undefined;
-        shadowColor?: import("./createVariable").Variable<import("./createVariable").VariableValue> | undefined;
-        shadowColorHover?: import("./createVariable").Variable<import("./createVariable").VariableValue> | undefined;
-        shadowColorPress?: import("./createVariable").Variable<import("./createVariable").VariableValue> | undefined;
-        shadowColorFocus?: import("./createVariable").Variable<import("./createVariable").VariableValue> | undefined;
+        [x: string]: import("./createVariable").Variable<any>;
+        background?: import("./createVariable").Variable<any> | undefined;
+        backgroundHover?: import("./createVariable").Variable<any> | undefined;
+        backgroundPress?: import("./createVariable").Variable<any> | undefined;
+        backgroundFocus?: import("./createVariable").Variable<any> | undefined;
+        color?: import("./createVariable").Variable<any> | undefined;
+        colorHover?: import("./createVariable").Variable<any> | undefined;
+        colorPress?: import("./createVariable").Variable<any> | undefined;
+        colorFocus?: import("./createVariable").Variable<any> | undefined;
+        borderColor?: import("./createVariable").Variable<any> | undefined;
+        borderColorHover?: import("./createVariable").Variable<any> | undefined;
+        borderColorPress?: import("./createVariable").Variable<any> | undefined;
+        borderColorFocus?: import("./createVariable").Variable<any> | undefined;
+        shadowColor?: import("./createVariable").Variable<any> | undefined;
+        shadowColorHover?: import("./createVariable").Variable<any> | undefined;
+        shadowColorPress?: import("./createVariable").Variable<any> | undefined;
+        shadowColorFocus?: import("./createVariable").Variable<any> | undefined;
     };
 };
 export declare const configListeners: Set<ConfigListener>;

package/types/createTheme.d.ts

@@ -2,6 +2,6 @@ import { Variable } from './createVariable';
 declare type GenericTheme = {
     [key: string]: string | Variable;
 };
-export declare const createTheme: <Theme extends GenericTheme>(theme: Theme) => { [K in keyof Theme]: string | Variable<import("./createVariable").VariableValue> | Theme[K]; };
+export declare const createTheme: <Theme extends GenericTheme>(theme: Theme) => { [K in keyof Theme]: string | Variable<any> | Theme[K]; };
 export {};
 //# sourceMappingURL=createTheme.d.ts.map

package/types/createTokens.d.ts

@@ -9,19 +9,19 @@ declare type MakeTokens<T> = T extends {
     zIndex: infer J;
 } ? {
     color: {
-        [key in keyof E]: Variable;
+        [Key in keyof E]: E[Key] extends Variable ? E[Key] : Variable<E[Key]>;
     };
     space: {
-        [key in keyof F]: Variable;
+        [Key in keyof F]: F[Key] extends Variable ? F[Key] : Variable<F[Key]>;
     };
     size: {
-        [key in keyof G]: Variable;
+        [Key in keyof G]: G[Key] extends Variable ? G[Key] : Variable<G[Key]>;
     };
     radius: {
-        [key in keyof H]: Variable;
+        [Key in keyof H]: H[Key] extends Variable ? H[Key] : Variable<H[Key]>;
     };
     zIndex: {
-        [key in keyof J]: Variable;
+        [Key in keyof J]: J[Key] extends Variable ? J[Key] : Variable<J[Key]>;
     };
 } : never;
 export {};

package/types/createVariable.d.ts

@@ -3,14 +3,13 @@
  * Moving to objects for React Server Components support
  */
 declare const IS_VAR = "__isVar__";
-export declare type VariableValue = string | number;
-declare type VariableIn<A extends VariableValue = VariableValue> = {
+declare type VariableIn<A = any> = {
     val: A;
     name: string;
     key: string;
     isFloating?: boolean;
 };
-export declare type Variable<A extends VariableValue = VariableValue> = VariableIn<A> & {
+export declare type Variable<A = any> = VariableIn<A> & {
     [IS_VAR]?: true;
     variable?: string;
 };

package/types/helpers/ThemeManager.d.ts

@@ -26,7 +26,7 @@ export declare class ThemeManager {
     get didChangeTheme(): boolean | null;
     get parentName(): string | null;
     get fullName(): string;
-    getValue(key: string): import("..").Variable<import("..").VariableValue> | undefined;
+    getValue(key: string): import("..").Variable<any> | undefined;
     isTracking(uuid: Object): boolean;
     update({ name, theme, className }?: SetActiveThemeProps, force?: boolean, notify?: boolean): boolean;
     getNextTheme(props?: GetNextThemeProps, debug?: any): {

package/types/helpers/registerCSSVariable.d.ts

@@ -1,5 +1,5 @@
-import { Variable, VariableValue } from '../createVariable';
+import { Variable } from '../createVariable';
 export declare const registerCSSVariable: (v: Variable) => void;
 export declare const variableToCSS: (v: Variable) => string;
-export declare const tokensValueToVariable: Map<VariableValue, any>;
+export declare const tokensValueToVariable: Map<any, any>;
 //# sourceMappingURL=registerCSSVariable.d.ts.map

package/types/types.d.ts

@@ -136,7 +136,7 @@ export declare type GenericTamaguiConfig = CreateTamaguiConfig<GenericTokens, Ge
 export declare type ThemeDefinition = TamaguiConfig['themes'][keyof TamaguiConfig['themes']];
 export declare type ThemeKeys = keyof ThemeDefinition;
 export declare type ThemeParsed = {
-    [key in ThemeKeys]: Variable;
+    [key in ThemeKeys]: Variable<any>;
 };
 export declare type Tokens = TamaguiConfig['tokens'];
 export declare type Shorthands = TamaguiConfig['shorthands'];
@@ -552,6 +552,7 @@ export declare type TamaguiComponentState = {
     focus: boolean;
     mounted: boolean;
     mediaState?: null | Record<string, boolean>;
+    hasAnimation?: boolean;
     animation?: null | {
         style?: any;
         avoidClasses?: boolean;