@tamagui/web 1.88.6 → 1.88.8

package/src/types.tsx

@@ -21,13 +21,13 @@ import type {
 import type { Variable } from './createVariable'
 import { StyledContext } from './helpers/createStyledContext'
 import { CSSColorNames } from './interfaces/CSSColorNames'
+import { ColorKeys, SizeKeys, SpaceKeys } from './interfaces/KeyTypes'
 import { RNOnlyProps } from './interfaces/RNExclusiveTypes'
-import type { LanguageContextType } from './views/FontLanguage.types'
-import type { ThemeProviderProps } from './views/ThemeProvider'
+import { TamaguiComponentPropsBaseBase } from './interfaces/TamaguiComponentPropsBaseBase'
 import { TamaguiComponentState } from './interfaces/TamaguiComponentState'
 import { WebOnlyPressEvents } from './interfaces/WebOnlyPressEvents'
-import { TamaguiComponentPropsBaseBase } from './interfaces/TamaguiComponentPropsBaseBase'
-import { SizeKeys, SpaceKeys, ColorKeys } from './interfaces/KeyTypes'
+import type { LanguageContextType } from './views/FontLanguage.types'
+import type { ThemeProviderProps } from './views/ThemeProvider'
 
 export * from './interfaces/KeyTypes'
 export * from './interfaces/TamaguiComponentState'
@@ -453,7 +453,7 @@ export interface SpacerStyleProps
   extends Omit<StackStyleBase, keyof SpacerUniqueProps>,
     SpacerUniqueProps {}
 
-export type SpacerProps = WithThemeShorthandsPseudosMedia<SpacerStyleProps>
+export type SpacerProps = WithThemeShorthandsPseudosMedia<SpacerStyleProps, {}>
 
 type AllowedValueSettingBase =
   | boolean
@@ -1112,10 +1112,23 @@ export type GetThemeValueForKey<K extends string | symbol | number> =
         : never
       : never)
 
-export type WithThemeValues<T extends object> = {
-  [K in keyof T]: ThemeValueGet<K> extends never
-    ? T[K] | 'unset'
-    : GetThemeValueForKey<K> | Exclude<T[K], string> | 'unset'
+export type GetThemeValuesFor<
+  T extends Object,
+  K extends keyof T,
+  AddUnset,
+> = ThemeValueGet<K> extends never
+  ? T[K] | (AddUnset extends true ? 'unset' : never)
+  :
+      | GetThemeValueForKey<K>
+      | Exclude<T[K], string>
+      | (AddUnset extends true ? 'unset' : never)
+
+export type WithThemeValues<T extends Object, Variants extends Object> = {
+  [K in keyof T | keyof Variants]?: K extends keyof Variants
+    ? GetThemeValuesFor<Variants, K, false>
+    : K extends keyof T
+      ? GetThemeValuesFor<T, K, true>
+      : never
 }
 
 export type NarrowShorthands = Narrow<Shorthands>
@@ -1156,21 +1169,31 @@ export type AllPlatforms = 'web' | 'native' | 'android' | 'ios'
 //
 // add both theme and shorthands
 //
-export type WithThemeAndShorthands<A extends Object> = OnlyAllowShorthands extends true
-  ? WithThemeValues<Omit<A, Longhands>> & WithShorthands<WithThemeValues<A>>
-  : WithThemeValues<A> & WithShorthands<WithThemeValues<A>>
+export type WithThemeAndShorthands<
+  A extends Object,
+  Variants extends Object,
+> = OnlyAllowShorthands extends true
+  ? WithThemeValues<Omit<A, Longhands>, Variants> &
+      WithShorthands<WithThemeValues<A, Variants>>
+  : WithThemeValues<A, Variants> & WithShorthands<WithThemeValues<A, Variants>>
 
 //
 // combines all of theme, shorthands, pseudos...
 //
-export type WithThemeShorthandsAndPseudos<A extends Object> = WithThemeAndShorthands<A> &
-  WithPseudoProps<WithThemeAndShorthands<A>>
+export type WithThemeShorthandsAndPseudos<
+  A extends Object,
+  Variants extends Object,
+> = WithThemeAndShorthands<A, Variants> &
+  WithPseudoProps<WithThemeAndShorthands<A, Variants>>
 
 //
 // ... media queries and animations
 //
-export type WithThemeShorthandsPseudosMedia<A extends Object> =
-  WithThemeShorthandsAndPseudos<A> & WithMediaProps<WithThemeShorthandsAndPseudos<A>>
+export type WithThemeShorthandsPseudosMedia<
+  A extends Object,
+  Variants extends Object,
+> = WithThemeShorthandsAndPseudos<A, Variants> &
+  WithMediaProps<WithThemeShorthandsAndPseudos<A, Variants>>
 
 /**
  * Base style-only props (no media, pseudo):
@@ -1289,7 +1312,7 @@ export interface StackNonStyleProps
   style?: StyleProp<LooseCombinedObjects<React.CSSProperties, ViewStyle>>
 }
 
-export type StackStyle = WithThemeShorthandsPseudosMedia<StackStyleBase>
+export type StackStyle = WithThemeShorthandsPseudosMedia<StackStyleBase, {}>
 
 export type StackProps = StackNonStyleProps & StackStyle
 
@@ -1313,7 +1336,7 @@ export interface TextNonStyleProps
   style?: StyleProp<LooseCombinedObjects<React.CSSProperties, TextStyle>>
 }
 
-export type TextStyleProps = WithThemeShorthandsPseudosMedia<TextStylePropsBase>
+export type TextStyleProps = WithThemeShorthandsPseudosMedia<TextStylePropsBase, {}>
 
 export type TextProps = TextNonStyleProps & TextStyleProps
 
@@ -1335,42 +1358,48 @@ export type Styleable<
   Ref,
   NonStyledProps,
   BaseStyles extends Object,
-  VariantProps,
+  VariantProps extends Object,
   ParentStaticProperties,
 > = <
-  CustomProps extends Object | void = void,
-  MergedProps = CustomProps extends void
-    ? Props
-    : Omit<Props, keyof CustomProps> & CustomProps,
-  FunctionDef extends FunctionComponent<MergedProps> = FunctionComponent<MergedProps>,
+  CustomProps extends Object | void,
+  FunctionDef extends FunctionComponent<any> = FunctionComponent<
+    GetFinalProps<
+      NonStyledProps & CustomProps,
+      Omit<BaseStyles, keyof CustomProps>,
+      VariantProps
+    >
+  >,
 >(
   a: FunctionDef,
   options?: StyleableOptions
 ) => TamaguiComponent<
-  MergedProps,
+  Props,
   Ref,
   NonStyledProps & CustomProps,
-  BaseStyles,
+  Omit<BaseStyles, keyof CustomProps>,
   VariantProps,
   ParentStaticProperties
 >
 
-export type GetFinalProps<NonStyleProps, StylePropsBase> = Omit<
+export type GetFinalProps<
   NonStyleProps,
-  keyof StylePropsBase
-> &
-  (StylePropsBase extends Object ? WithThemeShorthandsPseudosMedia<StylePropsBase> : {})
+  StylePropsBase,
+  VariantProps extends Object,
+> = StylePropsBase extends Object
+  ? Omit<NonStyleProps, keyof StylePropsBase> &
+      WithThemeShorthandsPseudosMedia<StylePropsBase, VariantProps>
+  : NonStyleProps
 
 export type TamaguiComponent<
   Props = any,
   Ref = any,
   NonStyledProps = {},
   BaseStyles extends Object = {},
-  VariantProps = {},
+  VariantProps extends Object = {},
   ParentStaticProperties = {},
 > = ForwardRefExoticComponent<
   (Props extends TamaDefer
-    ? GetFinalProps<NonStyledProps, BaseStyles & VariantProps>
+    ? GetFinalProps<NonStyledProps, BaseStyles, VariantProps>
     : Props) &
     RefAttributes<Ref>
 > &
@@ -1388,20 +1417,25 @@ export type TamaguiComponent<
 
 export type InferGenericComponentProps<A> = A extends ComponentType<infer Props>
   ? Props
-  : A extends new (
-        props: infer Props
-      ) => any
-    ? Props
-    : {}
-
-export type InferStyledProps<
-  A extends StylableComponent,
-  B extends StaticConfigPublic,
-> = A extends {
+  : A extends ReactComponentWithRef<infer P, any>
+    ? P
+    : A extends ForwardRefExoticComponent<infer P>
+      ? P
+      : A extends new (
+            props: infer Props
+          ) => any
+        ? Props
+        : {}
+
+export type InferStyledProps<A extends StylableComponent, B extends Object> = A extends {
   __tama: any
 }
   ? GetProps<A>
-  : GetFinalProps<InferGenericComponentProps<A>, GetBaseStyles<{}, B>>
+  : GetFinalProps<
+      InferGenericComponentProps<A>,
+      GetBaseStyles<A, B>,
+      GetVariantProps<A, B>
+    >
 
 export type GetProps<A extends StylableComponent> = A extends {
   __tama: [
@@ -1414,7 +1448,9 @@ export type GetProps<A extends StylableComponent> = A extends {
   ]
 }
   ? Props extends TamaDefer
-    ? GetFinalProps<NonStyledProps, BaseStyles & VariantProps>
+    ? VariantProps extends Object
+      ? GetFinalProps<NonStyledProps, BaseStyles, VariantProps>
+      : never
     : Props
   : InferGenericComponentProps<A>
 
@@ -1424,14 +1460,20 @@ export type GetNonStyledProps<A extends StylableComponent> = A extends {
   ? B
   : TamaguiComponentPropsBaseBase & GetProps<A>
 
-export type GetBaseStyles<A, B> = A extends {
+export type GetBaseStyles<A, B extends StaticConfig> = A extends {
   __tama: [any, any, any, infer C, any, any]
 }
   ? C
-  : B extends { isText: true }
+  : ShouldHaveTextBaseStyles<B> extends true
     ? TextStylePropsBase
     : StackStyleBase
 
+type ShouldHaveTextBaseStyles<SC extends StaticConfig> = SC extends { isText: true }
+  ? true
+  : SC extends { isInput: true }
+    ? true
+    : false
+
 export type GetStyledVariants<A> = A extends {
   __tama: [any, any, any, any, infer B, any]
 }
@@ -1449,7 +1491,7 @@ export type StaticComponentObject<
   Ref,
   NonStyledProps,
   BaseStyles extends Object,
-  VariantProps,
+  VariantProps extends Object,
   ParentStaticProperties,
 > = {
   staticConfig: StaticConfig
@@ -1460,9 +1502,7 @@ export type StaticComponentObject<
    * If you want your HOC of a styled() component to also be able to be styled(), you need this to wrap it.
    */
   styleable: Styleable<
-    Props extends TamaDefer
-      ? GetFinalProps<NonStyledProps, BaseStyles & VariantProps>
-      : Props,
+    Props,
     Ref,
     NonStyledProps,
     BaseStyles,
@@ -1541,10 +1581,15 @@ export type StaticConfigPublic = {
   neverFlatten?: boolean | 'jsx'
 
   /**
-   * Determines ultimate output tag (Text vs View)
+   * Determines ultimate output tag (Text vs View) and accepted props (text props vs view)
    */
   isText?: boolean
 
+  /**
+   * Adds support for text props and handles focus properly
+   */
+  isInput?: boolean
+
   /**
    * Which style keys are allowed to be extracted.
    */
@@ -1608,11 +1653,6 @@ type StaticConfigBase = StaticConfigPublic & {
    */
   memo?: boolean
 
-  /**
-   * Used internally for handling focus
-   */
-  isInput?: boolean
-
   /**
    * Used internally for knowing how to handle when a HOC is in-between styled()
    */
@@ -1664,8 +1704,8 @@ export type SpreadKeys =
 
 export type VariantDefinitions<
   Parent extends StylableComponent = TamaguiComponent,
-  StaticConfig extends StaticConfigPublic = {},
-  MyProps extends Object = Partial<GetVariantProps<Parent, StaticConfig['isText']>>,
+  SC extends StaticConfig = {},
+  MyProps extends Object = Partial<GetVariantProps<Parent, SC>>,
   Val = any,
 > = VariantDefinitionFromProps<MyProps, Val> & {
   _isEmpty?: 1
@@ -1673,7 +1713,7 @@ export type VariantDefinitions<
 
 export type GetVariantProps<
   A extends StylableComponent,
-  IsText extends boolean | undefined,
+  B extends StaticConfigPublic,
 > = A extends {
   __tama: [
     infer Props,
@@ -1685,11 +1725,11 @@ export type GetVariantProps<
   ]
 }
   ? Props extends TamaDefer
-    ? GetFinalProps<NonStyledProps, BaseStyles & VariantProps>
+    ? VariantProps extends Object
+      ? GetFinalProps<NonStyledProps, BaseStyles, VariantProps>
+      : never
     : Props
-  : WithThemeShorthandsPseudosMedia<
-      IsText extends true ? TextStylePropsBase : StackStyleBase
-    >
+  : {}
 
 export type VariantDefinitionFromProps<MyProps, Val> = MyProps extends Object
   ? {

package/types/createComponent.d.ts

@@ -1,14 +1,14 @@
 import React from 'react';
 import { DebugProp, SpaceDirection, SpaceValue, SpacerProps, SpacerStyleProps, StackNonStyleProps, StaticConfig, TamaguiComponent, TamaguiElement } from './types';
 export declare const mouseUps: Set<Function>;
-export declare function createComponent<ComponentPropTypes extends Record<string, any> = {}, Ref extends TamaguiElement = TamaguiElement, BaseProps = never, BaseStyles extends Object = never>(staticConfig: StaticConfig): TamaguiComponent<ComponentPropTypes, Ref, BaseProps, BaseStyles, void>;
+export declare function createComponent<ComponentPropTypes extends Record<string, any> = {}, Ref extends TamaguiElement = TamaguiElement, BaseProps = never, BaseStyles extends Object = never>(staticConfig: StaticConfig): TamaguiComponent<ComponentPropTypes, Ref, BaseProps, BaseStyles, {}>;
 export declare function Unspaced(props: {
     children?: any;
 }): any;
 export declare namespace Unspaced {
     var isUnspaced: boolean;
 }
-export declare const Spacer: TamaguiComponent<SpacerProps, TamaguiElement, StackNonStyleProps, SpacerStyleProps, void>;
+export declare const Spacer: TamaguiComponent<SpacerProps, TamaguiElement, StackNonStyleProps, SpacerStyleProps, {}>;
 export type SpacedChildrenProps = {
     isZStack?: boolean;
     children?: React.ReactNode;

package/types/createComponent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createComponent.d.ts","sourceRoot":"","sources":["../src/createComponent.tsx"],"names":[],"mappings":"AAIA,OAAO,KAYN,MAAM,OAAO,CAAA;AAuBd,OAAO,EAEL,SAAS,EAMT,cAAc,EACd,UAAU,EACV,WAAW,EACX,gBAAgB,EAChB,kBAAkB,EAElB,YAAY,EAEZ,gBAAgB,EAEhB,cAAc,EAMf,MAAM,SAAS,CAAA;AAiBhB,eAAO,MAAM,QAAQ,eAAsB,CAAA;AA6D3C,wBAAgB,eAAe,CAC7B,kBAAkB,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,EAAE,EACnD,GAAG,SAAS,cAAc,GAAG,cAAc,EAC3C,SAAS,GAAG,KAAK,EACjB,UAAU,SAAS,MAAM,GAAG,KAAK,EACjC,YAAY,EAAE,YAAY,0EAirC3B;AAsBD,wBAAgB,QAAQ,CAAC,KAAK,EAAE;IAAE,QAAQ,CAAC,EAAE,GAAG,CAAA;CAAE,OAEjD;yBAFe,QAAQ;;;AAkBxB,eAAO,MAAM,MAAM,2FA0CjB,CAAA;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC1B,KAAK,CAAC,EAAE,UAAU,CAAA;IAClB,SAAS,CAAC,EAAE,OAAO,GAAG,MAAM,CAAA;IAC5B,SAAS,CAAC,EAAE,cAAc,GAAG,OAAO,CAAA;IACpC,SAAS,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC3B,KAAK,CAAC,EAAE,SAAS,CAAA;CAClB,CAAA;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,mBAAmB,mBAiGxD"}
+{"version":3,"file":"createComponent.d.ts","sourceRoot":"","sources":["../src/createComponent.tsx"],"names":[],"mappings":"AAIA,OAAO,KAYN,MAAM,OAAO,CAAA;AAuBd,OAAO,EAEL,SAAS,EAMT,cAAc,EACd,UAAU,EACV,WAAW,EACX,gBAAgB,EAChB,kBAAkB,EAElB,YAAY,EAEZ,gBAAgB,EAEhB,cAAc,EAMf,MAAM,SAAS,CAAA;AAiBhB,eAAO,MAAM,QAAQ,eAAsB,CAAA;AA6D3C,wBAAgB,eAAe,CAC7B,kBAAkB,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,EAAE,EACnD,GAAG,SAAS,cAAc,GAAG,cAAc,EAC3C,SAAS,GAAG,KAAK,EACjB,UAAU,SAAS,MAAM,GAAG,KAAK,EACjC,YAAY,EAAE,YAAY,wEAmrC3B;AAsBD,wBAAgB,QAAQ,CAAC,KAAK,EAAE;IAAE,QAAQ,CAAC,EAAE,GAAG,CAAA;CAAE,OAEjD;yBAFe,QAAQ;;;AAkBxB,eAAO,MAAM,MAAM,yFA0CjB,CAAA;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC1B,KAAK,CAAC,EAAE,UAAU,CAAA;IAClB,SAAS,CAAC,EAAE,OAAO,GAAG,MAAM,CAAA;IAC5B,SAAS,CAAC,EAAE,cAAc,GAAG,OAAO,CAAA;IACpC,SAAS,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC3B,KAAK,CAAC,EAAE,SAAS,CAAA;CAClB,CAAA;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,mBAAmB,mBAiGxD"}

package/types/helpers/getSplitStyles.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getSplitStyles.d.ts","sourceRoot":"","sources":["../../src/helpers/getSplitStyles.tsx"],"names":[],"mappings":"AAmCA,OAAO,KAAK,EAEV,iBAAiB,EACjB,SAAS,EACT,cAAc,EACd,aAAa,EAOb,eAAe,EACf,YAAY,EAGZ,cAAc,EACd,WAAW,EAEZ,MAAM,UAAU,CAAA;AACjB,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAA;AA4BhF,MAAM,MAAM,WAAW,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAA;AAE3D,MAAM,MAAM,gBAAgB,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAA;AAMhE,KAAK,aAAa,GAAG,CACnB,KAAK,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,EAC7B,YAAY,EAAE,YAAY,EAC1B,KAAK,EAAE,WAAW,EAClB,SAAS,EAAE,MAAM,EACjB,cAAc,EAAE,qBAAqB,EACrC,UAAU,EAAE,eAAe,EAC3B,iBAAiB,CAAC,EAAE,cAAc,GAAG,IAAI,EACzC,OAAO,CAAC,EAAE,iBAAiB,EAE3B,WAAW,CAAC,EAAE,MAAM,EACpB,KAAK,CAAC,EAAE,SAAS,KACd,cAAc,CAAA;AAEnB,eAAO,MAAM,UAAU,MAAM,CAAA;AA+B7B,eAAO,MAAM,cAAc,EAAE,aAooC5B,CAAA;AA2DD,eAAO,MAAM,WAAW,eACV,aAAa,UACjB,MAAM,WACL,MAAM,wBACO,OAAO,KAC5B,cA2BF,CAAA;AAqBD,eAAO,MAAM,cAAc,EAAE,aAQ5B,CAAA"}
+{"version":3,"file":"getSplitStyles.d.ts","sourceRoot":"","sources":["../../src/helpers/getSplitStyles.tsx"],"names":[],"mappings":"AAmCA,OAAO,KAAK,EAEV,iBAAiB,EACjB,SAAS,EACT,cAAc,EACd,aAAa,EAOb,eAAe,EACf,YAAY,EAGZ,cAAc,EACd,WAAW,EAEZ,MAAM,UAAU,CAAA;AACjB,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAA;AA4BhF,MAAM,MAAM,WAAW,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAA;AAE3D,MAAM,MAAM,gBAAgB,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAA;AAMhE,KAAK,aAAa,GAAG,CACnB,KAAK,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,EAC7B,YAAY,EAAE,YAAY,EAC1B,KAAK,EAAE,WAAW,EAClB,SAAS,EAAE,MAAM,EACjB,cAAc,EAAE,qBAAqB,EACrC,UAAU,EAAE,eAAe,EAC3B,iBAAiB,CAAC,EAAE,cAAc,GAAG,IAAI,EACzC,OAAO,CAAC,EAAE,iBAAiB,EAE3B,WAAW,CAAC,EAAE,MAAM,EACpB,KAAK,CAAC,EAAE,SAAS,KACd,cAAc,CAAA;AAEnB,eAAO,MAAM,UAAU,MAAM,CAAA;AAgC7B,eAAO,MAAM,cAAc,EAAE,aAqoC5B,CAAA;AA2DD,eAAO,MAAM,WAAW,eACV,aAAa,UACjB,MAAM,WACL,MAAM,wBACO,OAAO,KAC5B,cA2BF,CAAA;AAqBD,eAAO,MAAM,cAAc,EAAE,aAQ5B,CAAA"}

package/types/types.d.ts

@@ -5,13 +5,13 @@ import type { Text as RNText, TextProps as ReactTextProps, TextStyle, View, View
 import type { Variable } from './createVariable';
 import { StyledContext } from './helpers/createStyledContext';
 import { CSSColorNames } from './interfaces/CSSColorNames';
+import { ColorKeys, SizeKeys, SpaceKeys } from './interfaces/KeyTypes';
 import { RNOnlyProps } from './interfaces/RNExclusiveTypes';
-import type { LanguageContextType } from './views/FontLanguage.types';
-import type { ThemeProviderProps } from './views/ThemeProvider';
+import { TamaguiComponentPropsBaseBase } from './interfaces/TamaguiComponentPropsBaseBase';
 import { TamaguiComponentState } from './interfaces/TamaguiComponentState';
 import { WebOnlyPressEvents } from './interfaces/WebOnlyPressEvents';
-import { TamaguiComponentPropsBaseBase } from './interfaces/TamaguiComponentPropsBaseBase';
-import { SizeKeys, SpaceKeys, ColorKeys } from './interfaces/KeyTypes';
+import type { LanguageContextType } from './views/FontLanguage.types';
+import type { ThemeProviderProps } from './views/ThemeProvider';
 export * from './interfaces/KeyTypes';
 export * from './interfaces/TamaguiComponentState';
 export type { MediaStyleObject, StyleObject } from '@tamagui/helpers';
@@ -270,7 +270,7 @@ export type SpacerUniqueProps = {
 };
 export interface SpacerStyleProps extends Omit<StackStyleBase, keyof SpacerUniqueProps>, SpacerUniqueProps {
 }
-export type SpacerProps = WithThemeShorthandsPseudosMedia<SpacerStyleProps>;
+export type SpacerProps = WithThemeShorthandsPseudosMedia<SpacerStyleProps, {}>;
 type AllowedValueSettingBase = boolean | 'strict' | 'somewhat-strict' | 'strict-web' | 'somewhat-strict-web';
 type AllowedStyleValuesSettingSize = AllowedValueSettingBase | 'number' | 'percent';
 type AllowedStyleValuesSettingZIndex = AllowedValueSettingBase | 'number';
@@ -600,8 +600,9 @@ export type ThemeValueGet<K extends string | number | symbol> = K extends 'theme
 export type GetThemeValueForKey<K extends string | symbol | number> = ThemeValueGet<K> | ThemeValueFallback | (TamaguiSettings extends {
     autocompleteSpecificTokens: infer Val;
 } ? Val extends true | undefined ? SpecificTokens : never : never);
-export type WithThemeValues<T extends object> = {
-    [K in keyof T]: ThemeValueGet<K> extends never ? T[K] | 'unset' : GetThemeValueForKey<K> | Exclude<T[K], string> | 'unset';
+export type GetThemeValuesFor<T extends Object, K extends keyof T, AddUnset> = ThemeValueGet<K> extends never ? T[K] | (AddUnset extends true ? 'unset' : never) : GetThemeValueForKey<K> | Exclude<T[K], string> | (AddUnset extends true ? 'unset' : never);
+export type WithThemeValues<T extends Object, Variants extends Object> = {
+    [K in keyof T | keyof Variants]?: K extends keyof Variants ? GetThemeValuesFor<Variants, K, false> : K extends keyof T ? GetThemeValuesFor<T, K, true> : never;
 };
 export type NarrowShorthands = Narrow<Shorthands>;
 export type Longhands = NarrowShorthands[keyof NarrowShorthands];
@@ -625,9 +626,9 @@ export type PseudoStyles = {
     exitStyle?: ViewStyle;
 };
 export type AllPlatforms = 'web' | 'native' | 'android' | 'ios';
-export type WithThemeAndShorthands<A extends Object> = OnlyAllowShorthands extends true ? WithThemeValues<Omit<A, Longhands>> & WithShorthands<WithThemeValues<A>> : WithThemeValues<A> & WithShorthands<WithThemeValues<A>>;
-export type WithThemeShorthandsAndPseudos<A extends Object> = WithThemeAndShorthands<A> & WithPseudoProps<WithThemeAndShorthands<A>>;
-export type WithThemeShorthandsPseudosMedia<A extends Object> = WithThemeShorthandsAndPseudos<A> & WithMediaProps<WithThemeShorthandsAndPseudos<A>>;
+export type WithThemeAndShorthands<A extends Object, Variants extends Object> = OnlyAllowShorthands extends true ? WithThemeValues<Omit<A, Longhands>, Variants> & WithShorthands<WithThemeValues<A, Variants>> : WithThemeValues<A, Variants> & WithShorthands<WithThemeValues<A, Variants>>;
+export type WithThemeShorthandsAndPseudos<A extends Object, Variants extends Object> = WithThemeAndShorthands<A, Variants> & WithPseudoProps<WithThemeAndShorthands<A, Variants>>;
+export type WithThemeShorthandsPseudosMedia<A extends Object, Variants extends Object> = WithThemeShorthandsAndPseudos<A, Variants> & WithMediaProps<WithThemeShorthandsAndPseudos<A, Variants>>;
 /**
  * Base style-only props (no media, pseudo):
  */
@@ -696,12 +697,12 @@ type LooseCombinedObjects<A extends Object, B extends Object> = A | B | (A & B);
 export interface StackNonStyleProps extends Omit<ViewProps, 'pointerEvents' | 'display' | 'children' | RNOnlyProps | keyof ExtendBaseStackProps | 'style'>, ExtendBaseStackProps, TamaguiComponentPropsBase {
     style?: StyleProp<LooseCombinedObjects<React.CSSProperties, ViewStyle>>;
 }
-export type StackStyle = WithThemeShorthandsPseudosMedia<StackStyleBase>;
+export type StackStyle = WithThemeShorthandsPseudosMedia<StackStyleBase, {}>;
 export type StackProps = StackNonStyleProps & StackStyle;
 export interface TextNonStyleProps extends Omit<ReactTextProps, 'children' | keyof WebOnlyPressEvents | RNOnlyProps | keyof ExtendBaseTextProps | 'style'>, ExtendBaseTextProps, TamaguiComponentPropsBase {
     style?: StyleProp<LooseCombinedObjects<React.CSSProperties, TextStyle>>;
 }
-export type TextStyleProps = WithThemeShorthandsPseudosMedia<TextStylePropsBase>;
+export type TextStyleProps = WithThemeShorthandsPseudosMedia<TextStylePropsBase, {}>;
 export type TextProps = TextNonStyleProps & TextStyleProps;
 export interface ThemeableProps {
     theme?: ThemeName | null;
@@ -714,15 +715,15 @@ export type StyleableOptions = {
     disableTheme?: boolean;
     staticConfig?: Partial<StaticConfig>;
 };
-export type Styleable<Props, Ref, NonStyledProps, BaseStyles extends Object, VariantProps, ParentStaticProperties> = <CustomProps extends Object | void = void, MergedProps = CustomProps extends void ? Props : Omit<Props, keyof CustomProps> & CustomProps, FunctionDef extends FunctionComponent<MergedProps> = FunctionComponent<MergedProps>>(a: FunctionDef, options?: StyleableOptions) => TamaguiComponent<MergedProps, Ref, NonStyledProps & CustomProps, BaseStyles, VariantProps, ParentStaticProperties>;
-export type GetFinalProps<NonStyleProps, StylePropsBase> = Omit<NonStyleProps, keyof StylePropsBase> & (StylePropsBase extends Object ? WithThemeShorthandsPseudosMedia<StylePropsBase> : {});
-export type TamaguiComponent<Props = any, Ref = any, NonStyledProps = {}, BaseStyles extends Object = {}, VariantProps = {}, ParentStaticProperties = {}> = ForwardRefExoticComponent<(Props extends TamaDefer ? GetFinalProps<NonStyledProps, BaseStyles & VariantProps> : Props) & RefAttributes<Ref>> & StaticComponentObject<Props, Ref, NonStyledProps, BaseStyles, VariantProps, ParentStaticProperties> & Omit<ParentStaticProperties, 'staticConfig' | 'extractable' | 'styleable'> & {
+export type Styleable<Props, Ref, NonStyledProps, BaseStyles extends Object, VariantProps extends Object, ParentStaticProperties> = <CustomProps extends Object | void, FunctionDef extends FunctionComponent<any> = FunctionComponent<GetFinalProps<NonStyledProps & CustomProps, Omit<BaseStyles, keyof CustomProps>, VariantProps>>>(a: FunctionDef, options?: StyleableOptions) => TamaguiComponent<Props, Ref, NonStyledProps & CustomProps, Omit<BaseStyles, keyof CustomProps>, VariantProps, ParentStaticProperties>;
+export type GetFinalProps<NonStyleProps, StylePropsBase, VariantProps extends Object> = StylePropsBase extends Object ? Omit<NonStyleProps, keyof StylePropsBase> & WithThemeShorthandsPseudosMedia<StylePropsBase, VariantProps> : NonStyleProps;
+export type TamaguiComponent<Props = any, Ref = any, NonStyledProps = {}, BaseStyles extends Object = {}, VariantProps extends Object = {}, ParentStaticProperties = {}> = ForwardRefExoticComponent<(Props extends TamaDefer ? GetFinalProps<NonStyledProps, BaseStyles, VariantProps> : Props) & RefAttributes<Ref>> & StaticComponentObject<Props, Ref, NonStyledProps, BaseStyles, VariantProps, ParentStaticProperties> & Omit<ParentStaticProperties, 'staticConfig' | 'extractable' | 'styleable'> & {
     __tama: [Props, Ref, NonStyledProps, BaseStyles, VariantProps, ParentStaticProperties];
 };
-export type InferGenericComponentProps<A> = A extends ComponentType<infer Props> ? Props : A extends new (props: infer Props) => any ? Props : {};
-export type InferStyledProps<A extends StylableComponent, B extends StaticConfigPublic> = A extends {
+export type InferGenericComponentProps<A> = A extends ComponentType<infer Props> ? Props : A extends ReactComponentWithRef<infer P, any> ? P : A extends ForwardRefExoticComponent<infer P> ? P : A extends new (props: infer Props) => any ? Props : {};
+export type InferStyledProps<A extends StylableComponent, B extends Object> = A extends {
     __tama: any;
-} ? GetProps<A> : GetFinalProps<InferGenericComponentProps<A>, GetBaseStyles<{}, B>>;
+} ? GetProps<A> : GetFinalProps<InferGenericComponentProps<A>, GetBaseStyles<A, B>, GetVariantProps<A, B>>;
 export type GetProps<A extends StylableComponent> = A extends {
     __tama: [
         infer Props,
@@ -732,26 +733,29 @@ export type GetProps<A extends StylableComponent> = A extends {
         infer VariantProps,
         any
     ];
-} ? Props extends TamaDefer ? GetFinalProps<NonStyledProps, BaseStyles & VariantProps> : Props : InferGenericComponentProps<A>;
+} ? Props extends TamaDefer ? VariantProps extends Object ? GetFinalProps<NonStyledProps, BaseStyles, VariantProps> : never : Props : InferGenericComponentProps<A>;
 export type GetNonStyledProps<A extends StylableComponent> = A extends {
     __tama: [any, any, infer B, any, any, any];
 } ? B : TamaguiComponentPropsBaseBase & GetProps<A>;
-export type GetBaseStyles<A, B> = A extends {
+export type GetBaseStyles<A, B extends StaticConfig> = A extends {
     __tama: [any, any, any, infer C, any, any];
-} ? C : B extends {
+} ? C : ShouldHaveTextBaseStyles<B> extends true ? TextStylePropsBase : StackStyleBase;
+type ShouldHaveTextBaseStyles<SC extends StaticConfig> = SC extends {
     isText: true;
-} ? TextStylePropsBase : StackStyleBase;
+} ? true : SC extends {
+    isInput: true;
+} ? true : false;
 export type GetStyledVariants<A> = A extends {
     __tama: [any, any, any, any, infer B, any];
 } ? B : {};
 export type GetStaticConfig<A> = A extends {
     __tama: [any, any, any, any, any, infer B];
 } ? B : A;
-export type StaticComponentObject<Props, Ref, NonStyledProps, BaseStyles extends Object, VariantProps, ParentStaticProperties> = {
+export type StaticComponentObject<Props, Ref, NonStyledProps, BaseStyles extends Object, VariantProps extends Object, ParentStaticProperties> = {
     staticConfig: StaticConfig;
     /** @deprecated use `styleable` instead (same functionality, better name) */
     extractable: <X>(a: X, staticConfig?: Partial<StaticConfig>) => X;
-    styleable: Styleable<Props extends TamaDefer ? GetFinalProps<NonStyledProps, BaseStyles & VariantProps> : Props, Ref, NonStyledProps, BaseStyles, VariantProps, ParentStaticProperties>;
+    styleable: Styleable<Props, Ref, NonStyledProps, BaseStyles, VariantProps, ParentStaticProperties>;
 };
 export type TamaguiComponentExpectingVariants<Props = {}, Variants extends Object = {}> = TamaguiComponent<Props, any, any, any, Variants>;
 export type TamaguiProviderProps = Partial<Omit<ThemeProviderProps, 'children'>> & {
@@ -797,9 +801,13 @@ export type StaticConfigPublic = {
      */
     neverFlatten?: boolean | 'jsx';
     /**
-     * Determines ultimate output tag (Text vs View)
+     * Determines ultimate output tag (Text vs View) and accepted props (text props vs view)
      */
     isText?: boolean;
+    /**
+     * Adds support for text props and handles focus properly
+     */
+    isInput?: boolean;
     /**
      * Which style keys are allowed to be extracted.
      */
@@ -854,10 +862,6 @@ type StaticConfigBase = StaticConfigPublic & {
      * Memoize the component
      */
     memo?: boolean;
-    /**
-     * Used internally for handling focus
-     */
-    isInput?: boolean;
     /**
      * Used internally for knowing how to handle when a HOC is in-between styled()
      */
@@ -879,10 +883,10 @@ export type ViewStyleWithPseudos = TextStyleProps | (TextStyleProps & {
  */
 export type StylableComponent = TamaguiComponent | ComponentType<any> | ForwardRefExoticComponent<any> | ReactComponentWithRef<any, any> | (new (props: any) => any);
 export type SpreadKeys = '...fontSize' | '...fontStyle' | '...fontTransform' | '...lineHeight' | '...letterSpacing' | '...size' | '...space' | '...color' | '...zIndex' | '...theme' | '...radius';
-export type VariantDefinitions<Parent extends StylableComponent = TamaguiComponent, StaticConfig extends StaticConfigPublic = {}, MyProps extends Object = Partial<GetVariantProps<Parent, StaticConfig['isText']>>, Val = any> = VariantDefinitionFromProps<MyProps, Val> & {
+export type VariantDefinitions<Parent extends StylableComponent = TamaguiComponent, SC extends StaticConfig = {}, MyProps extends Object = Partial<GetVariantProps<Parent, SC>>, Val = any> = VariantDefinitionFromProps<MyProps, Val> & {
     _isEmpty?: 1;
 };
-export type GetVariantProps<A extends StylableComponent, IsText extends boolean | undefined> = A extends {
+export type GetVariantProps<A extends StylableComponent, B extends StaticConfigPublic> = A extends {
     __tama: [
         infer Props,
         any,
@@ -891,7 +895,7 @@ export type GetVariantProps<A extends StylableComponent, IsText extends boolean
         infer VariantProps,
         any
     ];
-} ? Props extends TamaDefer ? GetFinalProps<NonStyledProps, BaseStyles & VariantProps> : Props : WithThemeShorthandsPseudosMedia<IsText extends true ? TextStylePropsBase : StackStyleBase>;
+} ? Props extends TamaDefer ? VariantProps extends Object ? GetFinalProps<NonStyledProps, BaseStyles, VariantProps> : never : Props : {};
 export type VariantDefinitionFromProps<MyProps, Val> = MyProps extends Object ? {
     [propName: string]: VariantSpreadFunction<MyProps, Val> | ({
         [Key in SpreadKeys]?: Key extends '...fontSize' ? FontSizeVariantSpreadFunction<MyProps> : Key extends '...size' ? SizeVariantSpreadFunction<MyProps> : Key extends '...space' ? SpaceVariantSpreadFunction<MyProps> : Key extends '...color' ? ColorVariantSpreadFunction<MyProps> : Key extends '...lineHeight' ? FontLineHeightVariantSpreadFunction<MyProps> : Key extends '...fontTransform' ? FontTransformVariantSpreadFunction<MyProps> : Key extends '...fontStyle' ? FontStyleVariantSpreadFunction<MyProps> : Key extends '...letterSpacing' ? FontLetterSpacingVariantSpreadFunction<MyProps> : Key extends '...zIndex' ? ZIndexVariantSpreadFunction<MyProps> : Key extends '...radius' ? RadiusVariantSpreadFunction<MyProps> : Key extends '...theme' ? ThemeVariantSpreadFunction<MyProps> : never;