@tamagui/web 1.74.19 → 1.74.21

package/src/styled.tsx

@@ -1,6 +1,7 @@
 import { createComponent } from './createComponent'
 import { StyledContext } from './helpers/createStyledContext'
 import { mergeVariants } from './helpers/mergeVariants'
+import { withStaticProperties } from './helpers/withStaticProperties'
 import type { GetRef } from './interfaces/GetRef'
 import { getReactNativeConfig } from './setupReactNative'
 import type {
@@ -14,6 +15,8 @@ import type {
   VariantDefinitions,
   VariantSpreadFunction,
 } from './types'
+import { Stack } from './views/Stack'
+import { Text } from './views/Text'
 
 type GetBaseProps<A extends StylableComponent> = A extends TamaguiComponent<
   any,
@@ -40,9 +43,16 @@ type GetVariantAcceptedValues<V> = V extends Object
     }
   : undefined
 
+type ValueOf<T> = T[keyof T]
+type AreVariantsUndefined<V> = V extends undefined
+  ? true
+  : ValueOf<V> extends undefined
+  ? true
+  : false
+
 export function styled<
   ParentComponent extends StylableComponent,
-  Variants extends VariantDefinitions<ParentComponent> | void = VariantDefinitions<ParentComponent> | void
+  Variants extends VariantDefinitions<ParentComponent> | void
 >(
   ComponentIn: ParentComponent,
   // this should be Partial<GetProps<ParentComponent>> but causes excessively deep type issues
@@ -55,6 +65,69 @@ export function styled<
   },
   staticExtractionOptions?: Partial<StaticConfig>
 ) {
+  // do type stuff at top for easier readability
+
+  // get parent props without pseudos and medias so we can rebuild both with new variants
+  // get parent props without pseudos and medias so we can rebuild both with new variants
+  type ParentPropsBase = GetBaseProps<ParentComponent>
+  type ParentVariants = GetVariantProps<ParentComponent>
+
+  type OurVariantProps = Variants extends undefined
+    ? {}
+    : GetVariantAcceptedValues<Variants>
+
+  type MergedVariants = AreVariantsUndefined<OurVariantProps> extends true
+    ? ParentVariants
+    : AreVariantsUndefined<ParentVariants> extends true
+    ? OurVariantProps
+    : {
+        [Key in keyof ParentVariants | keyof OurVariantProps]?:
+          | (Key extends keyof ParentVariants ? ParentVariants[Key] : undefined)
+          | (Key extends keyof OurVariantProps ? OurVariantProps[Key] : undefined)
+      }
+
+  type OurPropsBaseBase = ParentPropsBase & MergedVariants
+
+  /**
+   * de-opting a bit of type niceness because were hitting depth issues too soon
+   * before we had:
+   *
+   * type OurPropsBase = OurPropsBaseBase & PseudoProps<Partial<OurPropsBaseBase>>
+   * and then below in type Props you would remove the PseudoProps line
+   * that would give you nicely merged pseudo sub-styles but its just too much for TS
+   * so now pseudos wont be nicely typed inside media queries, but at least we can nest
+   */
+  type OurPropsBase = OurPropsBaseBase
+
+  type Props = Variants extends void
+    ? GetProps<ParentComponent>
+    : // start with base props
+      OurPropsBase &
+        // add in pseudo
+        PseudoProps<Partial<OurPropsBaseBase>> &
+        // add in media
+        MediaProps<Partial<OurPropsBase>>
+
+  type ParentStaticProperties = {
+    [Key in Exclude<
+      keyof ParentComponent,
+      | 'defaultProps'
+      | 'propTypes'
+      | '$$typeof'
+      | 'staticConfig'
+      | 'extractable'
+      | 'styleable'
+    >]: ParentComponent[Key]
+  }
+
+  type StyledComponent = TamaguiComponent<
+    Props,
+    GetRef<ParentComponent>,
+    ParentPropsBase,
+    MergedVariants,
+    ParentStaticProperties
+  >
+
   // validate not using a variant over an existing valid style
   if (process.env.NODE_ENV !== 'production') {
     if (!ComponentIn) {
@@ -166,57 +239,6 @@ export function styled<
 
   const component = createComponent(staticConfigProps || {})
 
-  // get parent props without pseudos and medias so we can rebuild both with new variants
-  // get parent props without pseudos and medias so we can rebuild both with new variants
-  type ParentPropsBase = GetBaseProps<ParentComponent>
-  type ParentVariants = GetVariantProps<ParentComponent>
-
-  type OurVariantProps = Variants extends void ? {} : GetVariantAcceptedValues<Variants>
-
-  type VariantProps = Omit<ParentVariants, keyof OurVariantProps> & OurVariantProps
-  type OurPropsBaseBase = ParentPropsBase & VariantProps
-
-  /**
-   * de-opting a bit of type niceness because were hitting depth issues too soon
-   * before we had:
-   *
-   * type OurPropsBase = OurPropsBaseBase & PseudoProps<Partial<OurPropsBaseBase>>
-   * and then below in type Props you would remove the PseudoProps line
-   * that would give you nicely merged pseudo sub-styles but its just too much for TS
-   * so now pseudos wont be nicely typed inside media queries, but at least we can nest
-   */
-
-  type OurPropsBase = OurPropsBaseBase
-
-  type Props = Variants extends void
-    ? GetProps<ParentComponent>
-    : // start with base props
-      OurPropsBase &
-        // add in pseudo
-        PseudoProps<Partial<OurPropsBaseBase>> &
-        // add in media
-        MediaProps<Partial<OurPropsBase>>
-
-  type ParentStaticProperties = {
-    [Key in Exclude<
-      keyof ParentComponent,
-      | 'defaultProps'
-      | 'propTypes'
-      | '$$typeof'
-      | 'staticConfig'
-      | 'extractable'
-      | 'styleable'
-    >]: ParentComponent[Key]
-  }
-
-  type StyledComponent = TamaguiComponent<
-    Props,
-    GetRef<ParentComponent>,
-    ParentPropsBase,
-    ParentVariants & OurVariantProps,
-    ParentStaticProperties
-  >
-
   for (const key in ComponentIn) {
     if (key in component) continue
     // @ts-expect-error assigning static properties over
@@ -307,3 +329,54 @@ export function styled<
 
 // const y = <Test someting>sadad</Test>
 // const z = <Test3 someting="$true" ork>sadad</Test3>
+
+//
+// merges variant types properly:
+
+// const OneVariant = styled(Stack, {
+//   variants: {
+//     variant: {
+//       test: { backgroundColor: 'gray' },
+//     },
+//   } as const,
+// })
+// const Second = styled(Stack, {
+//   variants: {
+//     variant: {
+//       simple: { backgroundColor: 'gray' },
+//       colorful: { backgroundColor: 'violet' },
+//     },
+//   } as const,
+// })
+// const TwoVariant = styled(OneVariant, {
+//   variants: {
+//     variant: {
+//       simple: { backgroundColor: 'gray' },
+//       colorful: { backgroundColor: 'violet' },
+//     },
+//   } as const,
+// })
+
+// type X = typeof OneVariant extends TamaguiComponent<any, any, any, infer V> ? V : any
+// type V = typeof Second extends TamaguiComponent<any, any, any, infer V> ? V : any
+
+// type V2 = VariantDefinitions<typeof OneVariant>
+
+// type R = typeof TwoVariant extends TamaguiComponent<any, any, any, infer V> ? V : any
+
+// type Keys = keyof X | keyof V
+// type Z = {
+//   [Key in Keys]: V[Key] | X[Key]
+// }
+
+// const a: Z = {
+//   variant: 'colorful',
+// }
+// const b: Z = {
+//   variant: 'simple',
+// }
+// const c: Z = {
+//   variant: 'invalid',
+// }
+
+// const y = <TwoVariant variant="colorful" />

package/src/types.tsx

@@ -42,7 +42,7 @@ export type DebugProp = boolean | 'break' | 'verbose' | 'visualize' | 'profile'
 
 export type TamaguiComponentPropsBaseBase = {
   target?: string
-  hitSlop?: PressableProps['hitSlop']
+
   /**
    * When truthy passes through all props to a single child element, and avoids rendering its own element.
    * Must pass just one child React element that will receive all the props.
@@ -1354,21 +1354,19 @@ export type StyleableOptions = {
   staticConfig?: Partial<StaticConfig>
 }
 
-export type Styleable<Props, Ref> = <
-  CustomProps extends Object,
-  X extends FunctionComponent<any> = FunctionComponent<
-    ThemeableProps & Props & CustomProps
-  >
+export type Styleable<Props, Ref, BaseProps, VariantProps, ParentStaticProperties> = <
+  CustomProps extends Object | void = void,
+  X extends FunctionComponent<any> = FunctionComponent<any>
 >(
   a: X,
   options?: StyleableOptions
-) => ReactComponentWithRef<
-  CustomProps & Omit<Props & ThemeableProps, keyof CustomProps>,
-  Ref
-> & {
-  staticConfig: StaticConfig
-  styleable: Styleable<Props, Ref>
-}
+) => TamaguiComponent<
+  CustomProps extends void ? Props : Omit<Props, keyof CustomProps> & CustomProps,
+  Ref,
+  BaseProps,
+  VariantProps,
+  ParentStaticProperties
+>
 
 export type TamaguiComponent<
   Props = any,
@@ -1377,22 +1375,23 @@ export type TamaguiComponent<
   VariantProps = {},
   ParentStaticProperties = {}
 > = ReactComponentWithRef<Props, Ref> &
-  StaticComponentObject<Props, Ref> &
+  StaticComponentObject<Props, Ref, BaseProps, VariantProps, ParentStaticProperties> &
   ParentStaticProperties & {
     __baseProps: BaseProps
     __variantProps: VariantProps
   }
 
-type StaticComponentObject<Props, Ref> = {
-  staticConfig: StaticConfig
-
-  /** @deprecated use `styleable` instead (same functionality, better name) */
-  extractable: <X>(a: X, staticConfig?: Partial<StaticConfig>) => X
-  /*
-   * 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, Ref>
-}
+type StaticComponentObject<Props, Ref, BaseProps, VariantProps, ParentStaticProperties> =
+  {
+    staticConfig: StaticConfig
+
+    /** @deprecated use `styleable` instead (same functionality, better name) */
+    extractable: <X>(a: X, staticConfig?: Partial<StaticConfig>) => X
+    /*
+     * 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, Ref, BaseProps, VariantProps, ParentStaticProperties>
+  }
 
 export type TamaguiComponentExpectingVariants<
   Props = {},
@@ -1516,7 +1515,7 @@ export type StaticConfigPublic = {
 }
 
 type StaticConfigBase = StaticConfigPublic & {
-  Component?: FunctionComponent<any> & StaticComponentObject<any, any>
+  Component?: FunctionComponent<any> & StaticComponentObject<any, any, any, any, any>
 
   variants?: GenericVariantDefinitions
 

package/types/createComponent.d.ts

@@ -1,11 +1,11 @@
 import React from 'react';
 import { DebugProp, SpaceDirection, SpaceValue, SpacerProps, StackProps, StaticConfig, TamaguiComponent, TamaguiElement, TextProps } from './types';
 export declare const mouseUps: Set<Function>;
-export declare function createComponent<ComponentPropTypes extends StackProps | TextProps = {}, Ref = TamaguiElement, BaseProps = never>(staticConfig: StaticConfig): TamaguiComponent<ComponentPropTypes, Ref, BaseProps, {}>;
+export declare function createComponent<ComponentPropTypes extends StackProps | TextProps = {}, Ref = TamaguiElement, BaseProps = never>(staticConfig: StaticConfig): TamaguiComponent<ComponentPropTypes, Ref, BaseProps, void>;
 export declare function Unspaced(props: {
     children?: any;
 }): any;
-export declare const Spacer: TamaguiComponent<SpacerProps, TamaguiElement, never, {}>;
+export declare const Spacer: TamaguiComponent<SpacerProps, TamaguiElement, never, void>;
 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,KAaN,MAAM,OAAO,CAAA;AAsBd,OAAO,EAEL,SAAS,EAKT,cAAc,EACd,UAAU,EACV,WAAW,EACX,UAAU,EACV,YAAY,EAEZ,gBAAgB,EAGhB,cAAc,EAEd,SAAS,EAKV,MAAM,SAAS,CAAA;AAoBhB,eAAO,MAAM,QAAQ,eAAsB,CAAA;AA6D3C,wBAAgB,eAAe,CAC7B,kBAAkB,SAAS,UAAU,GAAG,SAAS,GAAG,EAAE,EACtD,GAAG,GAAG,cAAc,EACpB,SAAS,GAAG,KAAK,EACjB,YAAY,EAAE,YAAY,4DAysC3B;AAsBD,wBAAgB,QAAQ,CAAC,KAAK,EAAE;IAAE,QAAQ,CAAC,EAAE,GAAG,CAAA;CAAE,OAEjD;AAiBD,eAAO,MAAM,MAAM,0DAqCjB,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,CAAA;IAC1B,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,KAaN,MAAM,OAAO,CAAA;AAsBd,OAAO,EAEL,SAAS,EAKT,cAAc,EACd,UAAU,EACV,WAAW,EACX,UAAU,EACV,YAAY,EAEZ,gBAAgB,EAGhB,cAAc,EAEd,SAAS,EAKV,MAAM,SAAS,CAAA;AAoBhB,eAAO,MAAM,QAAQ,eAAsB,CAAA;AA6D3C,wBAAgB,eAAe,CAC7B,kBAAkB,SAAS,UAAU,GAAG,SAAS,GAAG,EAAE,EACtD,GAAG,GAAG,cAAc,EACpB,SAAS,GAAG,KAAK,EACjB,YAAY,EAAE,YAAY,8DAysC3B;AAsBD,wBAAgB,QAAQ,CAAC,KAAK,EAAE;IAAE,QAAQ,CAAC,EAAE,GAAG,CAAA;CAAE,OAEjD;AAiBD,eAAO,MAAM,MAAM,4DAqCjB,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,CAAA;IAC1B,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/withStaticProperties.d.ts

@@ -1,2 +1,4 @@
-export declare const withStaticProperties: <A extends Function, B>(component: A, staticProps: B) => A & B;
+type Combined<A, B> = A & B;
+export declare const withStaticProperties: <A extends Function, B>(component: A, staticProps: B) => Combined<A, B>;
+export {};
 //# sourceMappingURL=withStaticProperties.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"withStaticProperties.d.ts","sourceRoot":"","sources":["../../src/helpers/withStaticProperties.tsx"],"names":[],"mappings":"AAIA,eAAO,MAAM,oBAAoB,gEAyBhC,CAAA"}
+{"version":3,"file":"withStaticProperties.d.ts","sourceRoot":"","sources":["../../src/helpers/withStaticProperties.tsx"],"names":[],"mappings":"AAIA,KAAK,QAAQ,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAE3B,eAAO,MAAM,oBAAoB,yEAyBhC,CAAA"}

package/types/styled.d.ts

@@ -6,12 +6,14 @@ type GetVariantProps<A extends StylableComponent> = A extends TamaguiComponent<a
 type GetVariantAcceptedValues<V> = V extends Object ? {
     [Key in keyof V]?: V[Key] extends VariantSpreadFunction<any, infer Val> ? Val : GetVariantValues<keyof V[Key]>;
 } : undefined;
-export declare function styled<ParentComponent extends StylableComponent, Variants extends VariantDefinitions<ParentComponent> | void = VariantDefinitions<ParentComponent> | void>(ComponentIn: ParentComponent, options?: GetProps<ParentComponent> & {
+type ValueOf<T> = T[keyof T];
+type AreVariantsUndefined<V> = V extends undefined ? true : ValueOf<V> extends undefined ? true : false;
+export declare function styled<ParentComponent extends StylableComponent, Variants extends VariantDefinitions<ParentComponent> | void>(ComponentIn: ParentComponent, options?: GetProps<ParentComponent> & {
     name?: string;
     variants?: Variants | undefined;
     defaultVariants?: GetVariantAcceptedValues<Variants>;
     context?: StyledContext;
     acceptsClassName?: boolean;
-}, staticExtractionOptions?: Partial<StaticConfig>): TamaguiComponent<Variants extends void ? GetProps<ParentComponent> : GetBaseProps<ParentComponent> & Omit<GetVariantProps<ParentComponent>, keyof (Variants extends void ? {} : GetVariantAcceptedValues<Variants>)> & (Variants extends void ? {} : GetVariantAcceptedValues<Variants>) & PseudoProps<Partial<GetBaseProps<ParentComponent> & Omit<GetVariantProps<ParentComponent>, keyof (Variants extends void ? {} : GetVariantAcceptedValues<Variants>)> & (Variants extends void ? {} : GetVariantAcceptedValues<Variants>)>> & MediaProps<Partial<GetBaseProps<ParentComponent> & Omit<GetVariantProps<ParentComponent>, keyof (Variants extends void ? {} : GetVariantAcceptedValues<Variants>)> & (Variants extends void ? {} : GetVariantAcceptedValues<Variants>)>>, GetRef<ParentComponent>, GetBaseProps<ParentComponent>, GetVariantProps<ParentComponent> & (Variants extends void ? {} : GetVariantAcceptedValues<Variants>), { [Key in Exclude<keyof ParentComponent, "defaultProps" | "propTypes" | "staticConfig" | "extractable" | "styleable" | "$$typeof">]: ParentComponent[Key]; }>;
+}, staticExtractionOptions?: Partial<StaticConfig>): TamaguiComponent<Variants extends void ? GetProps<ParentComponent> : GetBaseProps<ParentComponent> & (AreVariantsUndefined<Variants extends undefined ? {} : GetVariantAcceptedValues<Variants>> extends true ? GetVariantProps<ParentComponent> : AreVariantsUndefined<GetVariantProps<ParentComponent>> extends true ? Variants extends undefined ? {} : GetVariantAcceptedValues<Variants> : { [Key in keyof GetVariantProps<ParentComponent> | keyof (Variants extends undefined ? {} : GetVariantAcceptedValues<Variants>)]?: (Key extends keyof GetVariantProps<ParentComponent> ? GetVariantProps<ParentComponent>[Key] : undefined) | (Key extends keyof (Variants extends undefined ? {} : GetVariantAcceptedValues<Variants>) ? (Variants extends undefined ? {} : GetVariantAcceptedValues<Variants>)[Key] : undefined) | undefined; }) & PseudoProps<Partial<GetBaseProps<ParentComponent> & (AreVariantsUndefined<Variants extends undefined ? {} : GetVariantAcceptedValues<Variants>> extends true ? GetVariantProps<ParentComponent> : AreVariantsUndefined<GetVariantProps<ParentComponent>> extends true ? Variants extends undefined ? {} : GetVariantAcceptedValues<Variants> : { [Key in keyof GetVariantProps<ParentComponent> | keyof (Variants extends undefined ? {} : GetVariantAcceptedValues<Variants>)]?: (Key extends keyof GetVariantProps<ParentComponent> ? GetVariantProps<ParentComponent>[Key] : undefined) | (Key extends keyof (Variants extends undefined ? {} : GetVariantAcceptedValues<Variants>) ? (Variants extends undefined ? {} : GetVariantAcceptedValues<Variants>)[Key] : undefined) | undefined; })>> & MediaProps<Partial<GetBaseProps<ParentComponent> & (AreVariantsUndefined<Variants extends undefined ? {} : GetVariantAcceptedValues<Variants>> extends true ? GetVariantProps<ParentComponent> : AreVariantsUndefined<GetVariantProps<ParentComponent>> extends true ? Variants extends undefined ? {} : GetVariantAcceptedValues<Variants> : { [Key in keyof GetVariantProps<ParentComponent> | keyof (Variants extends undefined ? {} : GetVariantAcceptedValues<Variants>)]?: (Key extends keyof GetVariantProps<ParentComponent> ? GetVariantProps<ParentComponent>[Key] : undefined) | (Key extends keyof (Variants extends undefined ? {} : GetVariantAcceptedValues<Variants>) ? (Variants extends undefined ? {} : GetVariantAcceptedValues<Variants>)[Key] : undefined) | undefined; })>>, GetRef<ParentComponent>, GetBaseProps<ParentComponent>, AreVariantsUndefined<Variants extends undefined ? {} : GetVariantAcceptedValues<Variants>> extends true ? GetVariantProps<ParentComponent> : AreVariantsUndefined<GetVariantProps<ParentComponent>> extends true ? Variants extends undefined ? {} : GetVariantAcceptedValues<Variants> : { [Key in keyof GetVariantProps<ParentComponent> | keyof (Variants extends undefined ? {} : GetVariantAcceptedValues<Variants>)]?: (Key extends keyof GetVariantProps<ParentComponent> ? GetVariantProps<ParentComponent>[Key] : undefined) | (Key extends keyof (Variants extends undefined ? {} : GetVariantAcceptedValues<Variants>) ? (Variants extends undefined ? {} : GetVariantAcceptedValues<Variants>)[Key] : undefined) | undefined; }, { [Key_1 in Exclude<keyof ParentComponent, "defaultProps" | "propTypes" | "staticConfig" | "extractable" | "styleable" | "$$typeof">]: ParentComponent[Key_1]; }>;
 export {};
 //# sourceMappingURL=styled.d.ts.map

package/types/styled.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"styled.d.ts","sourceRoot":"","sources":["../src/styled.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAA;AAE7D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAEjD,OAAO,KAAK,EACV,QAAQ,EACR,gBAAgB,EAChB,UAAU,EACV,WAAW,EACX,YAAY,EACZ,iBAAiB,EACjB,gBAAgB,EAChB,kBAAkB,EAClB,qBAAqB,EACtB,MAAM,SAAS,CAAA;AAEhB,KAAK,YAAY,CAAC,CAAC,SAAS,iBAAiB,IAAI,CAAC,SAAS,gBAAgB,CACzE,GAAG,EACH,GAAG,EACH,MAAM,CAAC,CACR,GACG,CAAC,GACD,QAAQ,CAAC,CAAC,CAAC,CAAA;AAEf,KAAK,eAAe,CAAC,CAAC,SAAS,iBAAiB,IAAI,CAAC,SAAS,gBAAgB,CAC5E,GAAG,EACH,GAAG,EACH,GAAG,EACH,MAAM,CAAC,CACR,GACG,CAAC,GACD,EAAE,CAAA;AAEN,KAAK,wBAAwB,CAAC,CAAC,IAAI,CAAC,SAAS,MAAM,GAC/C;KACG,GAAG,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,SAAS,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,CAAC,GACnE,GAAG,GACH,gBAAgB,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC;CACnC,GACD,SAAS,CAAA;AAEb,wBAAgB,MAAM,CACpB,eAAe,SAAS,iBAAiB,EACzC,QAAQ,SAAS,kBAAkB,CAAC,eAAe,CAAC,GAAG,IAAI,GAAG,kBAAkB,CAAC,eAAe,CAAC,GAAG,IAAI,EAExG,WAAW,EAAE,eAAe,EAE5B,OAAO,CAAC,EAAE,QAAQ,CAAC,eAAe,CAAC,GAAG;IACpC,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,QAAQ,GAAG,SAAS,CAAA;IAC/B,eAAe,CAAC,EAAE,wBAAwB,CAAC,QAAQ,CAAC,CAAA;IACpD,OAAO,CAAC,EAAE,aAAa,CAAA;IACvB,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAC3B,EACD,uBAAuB,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,gjCA2KhD"}
+{"version":3,"file":"styled.d.ts","sourceRoot":"","sources":["../src/styled.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAA;AAG7D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAEjD,OAAO,KAAK,EACV,QAAQ,EACR,gBAAgB,EAChB,UAAU,EACV,WAAW,EACX,YAAY,EACZ,iBAAiB,EACjB,gBAAgB,EAChB,kBAAkB,EAClB,qBAAqB,EACtB,MAAM,SAAS,CAAA;AAIhB,KAAK,YAAY,CAAC,CAAC,SAAS,iBAAiB,IAAI,CAAC,SAAS,gBAAgB,CACzE,GAAG,EACH,GAAG,EACH,MAAM,CAAC,CACR,GACG,CAAC,GACD,QAAQ,CAAC,CAAC,CAAC,CAAA;AAEf,KAAK,eAAe,CAAC,CAAC,SAAS,iBAAiB,IAAI,CAAC,SAAS,gBAAgB,CAC5E,GAAG,EACH,GAAG,EACH,GAAG,EACH,MAAM,CAAC,CACR,GACG,CAAC,GACD,EAAE,CAAA;AAEN,KAAK,wBAAwB,CAAC,CAAC,IAAI,CAAC,SAAS,MAAM,GAC/C;KACG,GAAG,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,SAAS,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,CAAC,GACnE,GAAG,GACH,gBAAgB,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC;CACnC,GACD,SAAS,CAAA;AAEb,KAAK,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAA;AAC5B,KAAK,oBAAoB,CAAC,CAAC,IAAI,CAAC,SAAS,SAAS,GAC9C,IAAI,GACJ,OAAO,CAAC,CAAC,CAAC,SAAS,SAAS,GAC5B,IAAI,GACJ,KAAK,CAAA;AAET,wBAAgB,MAAM,CACpB,eAAe,SAAS,iBAAiB,EACzC,QAAQ,SAAS,kBAAkB,CAAC,eAAe,CAAC,GAAG,IAAI,EAE3D,WAAW,EAAE,eAAe,EAE5B,OAAO,CAAC,EAAE,QAAQ,CAAC,eAAe,CAAC,GAAG;IACpC,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,QAAQ,GAAG,SAAS,CAAA;IAC/B,eAAe,CAAC,EAAE,wBAAwB,CAAC,QAAQ,CAAC,CAAA;IACpD,OAAO,CAAC,EAAE,aAAa,CAAA;IACvB,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAC3B,EACD,uBAAuB,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,yuGAuLhD"}

package/types/types.d.ts

@@ -17,7 +17,6 @@ export type TamaguiTextElement = HTMLElement | RNText;
 export type DebugProp = boolean | 'break' | 'verbose' | 'visualize' | 'profile';
 export type TamaguiComponentPropsBaseBase = {
     target?: string;
-    hitSlop?: PressableProps['hitSlop'];
     /**
      * When truthy passes through all props to a single child element, and avoids rendering its own element.
      * Must pass just one child React element that will receive all the props.
@@ -754,19 +753,16 @@ export type StyleableOptions = {
     disableTheme?: boolean;
     staticConfig?: Partial<StaticConfig>;
 };
-export type Styleable<Props, Ref> = <CustomProps extends Object, X extends FunctionComponent<any> = FunctionComponent<ThemeableProps & Props & CustomProps>>(a: X, options?: StyleableOptions) => ReactComponentWithRef<CustomProps & Omit<Props & ThemeableProps, keyof CustomProps>, Ref> & {
-    staticConfig: StaticConfig;
-    styleable: Styleable<Props, Ref>;
-};
-export type TamaguiComponent<Props = any, Ref = any, BaseProps = {}, VariantProps = {}, ParentStaticProperties = {}> = ReactComponentWithRef<Props, Ref> & StaticComponentObject<Props, Ref> & ParentStaticProperties & {
+export type Styleable<Props, Ref, BaseProps, VariantProps, ParentStaticProperties> = <CustomProps extends Object | void = void, X extends FunctionComponent<any> = FunctionComponent<any>>(a: X, options?: StyleableOptions) => TamaguiComponent<CustomProps extends void ? Props : Omit<Props, keyof CustomProps> & CustomProps, Ref, BaseProps, VariantProps, ParentStaticProperties>;
+export type TamaguiComponent<Props = any, Ref = any, BaseProps = {}, VariantProps = {}, ParentStaticProperties = {}> = ReactComponentWithRef<Props, Ref> & StaticComponentObject<Props, Ref, BaseProps, VariantProps, ParentStaticProperties> & ParentStaticProperties & {
     __baseProps: BaseProps;
     __variantProps: VariantProps;
 };
-type StaticComponentObject<Props, Ref> = {
+type StaticComponentObject<Props, Ref, BaseProps, VariantProps, ParentStaticProperties> = {
     staticConfig: StaticConfig;
     /** @deprecated use `styleable` instead (same functionality, better name) */
     extractable: <X>(a: X, staticConfig?: Partial<StaticConfig>) => X;
-    styleable: Styleable<Props, Ref>;
+    styleable: Styleable<Props, Ref, BaseProps, VariantProps, ParentStaticProperties>;
 };
 export type TamaguiComponentExpectingVariants<Props = {}, Variants = {}> = TamaguiComponent<Props, any, any, Variants>;
 export type TamaguiProviderProps = Partial<Omit<ThemeProviderProps, 'children'>> & {
@@ -859,7 +855,7 @@ export type StaticConfigPublic = {
     acceptsClassName?: boolean;
 };
 type StaticConfigBase = StaticConfigPublic & {
-    Component?: FunctionComponent<any> & StaticComponentObject<any, any>;
+    Component?: FunctionComponent<any> & StaticComponentObject<any, any, any, any, any>;
     variants?: GenericVariantDefinitions;
     context?: StyledContext;
     /**