@tamagui/web 3.0.0-beta.1432.1 → 3.0.0-beta.1444.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/web",
-  "version": "3.0.0-beta.1432.1",
+  "version": "3.0.0-beta.1444.1",
   "license": "MIT",
   "author": {
     "name": "Nate Wienert"
@@ -100,23 +100,23 @@
     "test:web": "vitest --typecheck --run"
   },
   "dependencies": {
-    "@tamagui/animation-helpers": "3.0.0-beta.1432.1",
-    "@tamagui/compose-refs": "3.0.0-beta.1432.1",
-    "@tamagui/constants": "3.0.0-beta.1432.1",
-    "@tamagui/dom": "3.0.0-beta.1432.1",
-    "@tamagui/helpers": "3.0.0-beta.1432.1",
-    "@tamagui/is-equal-shallow": "3.0.0-beta.1432.1",
-    "@tamagui/native": "3.0.0-beta.1432.1",
-    "@tamagui/normalize-css-color": "3.0.0-beta.1432.1",
-    "@tamagui/react-native-types": "3.0.0-beta.1432.1",
-    "@tamagui/style-grammar": "3.0.0-beta.1432.1",
-    "@tamagui/types": "3.0.0-beta.1432.1",
-    "@tamagui/use-did-finish-ssr": "3.0.0-beta.1432.1",
-    "@tamagui/use-event": "3.0.0-beta.1432.1",
-    "@tamagui/use-force-update": "3.0.0-beta.1432.1"
+    "@tamagui/animation-helpers": "3.0.0-beta.1444.1",
+    "@tamagui/compose-refs": "3.0.0-beta.1444.1",
+    "@tamagui/constants": "3.0.0-beta.1444.1",
+    "@tamagui/dom": "3.0.0-beta.1444.1",
+    "@tamagui/helpers": "3.0.0-beta.1444.1",
+    "@tamagui/is-equal-shallow": "3.0.0-beta.1444.1",
+    "@tamagui/native": "3.0.0-beta.1444.1",
+    "@tamagui/normalize-css-color": "3.0.0-beta.1444.1",
+    "@tamagui/react-native-types": "3.0.0-beta.1444.1",
+    "@tamagui/style-grammar": "3.0.0-beta.1444.1",
+    "@tamagui/types": "3.0.0-beta.1444.1",
+    "@tamagui/use-did-finish-ssr": "3.0.0-beta.1444.1",
+    "@tamagui/use-event": "3.0.0-beta.1444.1",
+    "@tamagui/use-force-update": "3.0.0-beta.1444.1"
   },
   "devDependencies": {
-    "@tamagui/build": "3.0.0-beta.1432.1",
+    "@tamagui/build": "3.0.0-beta.1444.1",
     "@testing-library/react": "^16.1.0",
     "csstype": "^3.0.10",
     "react": "19.2.3",

package/src/createComponent.tsx

@@ -644,7 +644,14 @@ export function createComponent<
         ? false
         : props['data-disable-theme'] && !('theme' in props)
 
-    const disableTheme = disableThemeProp || isHOC
+    // a styled HOC leaves theming to the component it wraps and hands it the
+    // theme prop. on native the HOC's own styles resolve to values here, before
+    // that, so an HOC given a theme themes itself and the wrapped component
+    // inherits it instead of applying it a second time. keyed on presence, like
+    // disableThemeProp, so hook order never changes across renders
+    const hocThemesSelf =
+      process.env.TAMAGUI_TARGET === 'native' && isHOC && 'theme' in props
+    const disableTheme = disableThemeProp || (isHOC && !hocThemesSelf)
 
     if (process.env.NODE_ENV === 'development' && time) time`theme-props`
 
@@ -1323,7 +1330,6 @@ export function createComponent<
       asChild,
       children,
       themeShallow,
-      spaceDirection: _spaceDirection,
       onPress,
       onLongPress,
       onPressIn,
@@ -1355,7 +1361,7 @@ export function createComponent<
     }
 
     if (isHOC) {
-      if (typeof _themeProp !== 'undefined') {
+      if (typeof _themeProp !== 'undefined' && !hocThemesSelf) {
         viewProps.theme = _themeProp
       }
       if (typeof passThrough !== 'undefined') {

package/src/helpers/getSplitStyles.tsx

@@ -449,6 +449,7 @@ const passFrontendContainerType = 27
 const passSourceLayer = 28
 const passParentCursor = 29
 const passMapSourceKey = 30
+const passVariantOutput = 31
 
 const passFlags = 13
 
@@ -919,6 +920,30 @@ function contributeProp(
     }
   }
 
+  // variants hold styles and aria/data attributes (data- is handled above),
+  // which flatten to the same attribute. anything else a variant sets (a
+  // theme, a handler, a prop for the wrapped component) is dropped, so a
+  // variant means the same flattened or not
+  if (
+    pass[passVariantOutput] &&
+    !isValidStyleKeyInit &&
+    !keyInit.startsWith('aria-') &&
+    !(keyInit in stylePropsAll) &&
+    !(keyInit in skipProps) &&
+    !(variants && keyInit in variants) &&
+    !(parentVariants && keyInit in parentVariants) &&
+    !styledContextKeys?.has(keyInit) &&
+    !(styledContext && keyInit in styledContext)
+  ) {
+    if (process.env.NODE_ENV === 'development') {
+      warnOnce(
+        `variant-non-style:${keyInit}`,
+        `a variant set "${keyInit}", which is not a style. Variants hold styles and aria/data attributes only: set "${keyInit}" on the component one level up.`
+      )
+    }
+    return
+  }
+
   if (process.env.TAMAGUI_TARGET === 'web') {
     if (!noExpand) {
       // map the React Native-shaped public prop surface onto DOM attributes in
@@ -4064,9 +4089,12 @@ export function emitVariantStyle(
       {})[key] = original
   }
   const parent = pass[passParentCursor]
+  const parentVariantOutput = pass[passVariantOutput]
   pass[passParentCursor] = condition
+  pass[passVariantOutput] = true
   contributeProp(pass, key, value, original, disabled)
   pass[passParentCursor] = parent
+  pass[passVariantOutput] = parentVariantOutput
 }
 
 // handles finding and resolving the fontFamily to the token name

package/src/styled.tsx

@@ -19,6 +19,7 @@ import type {
   StaticConfig,
   StaticConfigPublic,
   StylableComponent,
+  StyleOnlyVariants,
   StyledContext,
   StyledDynamicFn,
   StyledDynamicProp,
@@ -26,6 +27,7 @@ import type {
   TamaguiComponent,
   ThemeValueGet,
   VariantDefinitions,
+  VariantStyleProps,
 } from './types'
 
 type AreVariantsUndefined<Variants> =
@@ -78,7 +80,15 @@ export type StyledOptions<
   ContextPropKeys
 > & {
   displayName?: string
-  variants?: Variants | undefined
+  variants?:
+    | (Variants &
+        NoInferLocal<
+          StyleOnlyVariants<
+            Variants,
+            keyof VariantStyleProps<ParentComponent, StyledConfig>
+          >
+        >)
+    | undefined
   defaultVariants?: NoInferLocal<GetVariantAcceptedValues<NonNullable<Variants>>>
   context?: Context
   contextProps?: readonly Extract<

package/src/types.tsx

@@ -3443,39 +3443,63 @@ export type VariantDefinitions<
   }
     ? S
     : {},
-  MyProps extends object = Partial<
-    GetVariantProps<
-      Parent,
-      StaticConfig['isText'] extends true
-        ? true
-        : StaticConfig['isInput'] extends true
-          ? true
-          : false
-    >
-  >,
+  MyProps extends object = VariantStyleProps<Parent, StaticConfig>,
   Val = any,
 > = VariantDefinitionFromProps<MyProps, Val> & {
   _isEmpty?: 1
 }
 
+export type VariantStyleProps<
+  Parent extends StylableComponent,
+  StaticConfig extends StaticConfigPublic,
+> = Partial<
+  GetVariantProps<
+    Parent,
+    StaticConfig['isText'] extends true
+      ? true
+      : StaticConfig['isInput'] extends true
+        ? true
+        : false
+  >
+>
+
+/**
+ * the exact-key check styled() runs on the variants it infers: a key that is
+ * not a style, shorthand, aria/data attribute, or variant of the component is
+ * `never`, since inference alone never flags extra keys.
+ */
+export type StyleOnlyVariants<Variants, AllowedKeys extends PropertyKey> = {
+  [Name in keyof Variants]: Variants[Name] extends StyledDynamic<any, any>
+    ? Variants[Name]
+    : {
+        [Value in keyof Variants[Name]]: Variants[Name][Value] extends object
+          ? {
+              [Key in keyof Variants[Name][Value]]: Key extends
+                | AllowedKeys
+                | keyof Variants
+                | `aria-${string}`
+                | `data-${string}`
+                ? Variants[Name][Value][Key]
+                : never
+            }
+          : Variants[Name][Value]
+      }
+}
+
 export type StaticStyleInput = string
 
+// variants are styles only: a variant value holds style props and the parent's
+// variants, never a non-style prop such as theme. a component that changes
+// theme with a variant does it one level up, as a theme prop.
 export type GetVariantProps<
   A extends StylableComponent,
   IsText extends boolean | undefined,
 > = A extends {
-  __tama: [
-    infer Props,
-    any,
-    infer NonStyledProps,
-    infer BaseStyles,
-    infer VariantProps,
-    any,
-  ]
+  __tama: [any, any, any, infer BaseStyles, infer VariantProps, any]
 }
-  ? Props extends TamaDefer
-    ? GetFinalProps<NonStyledProps, BaseStyles, VariantProps>
-    : Props
+  ? BaseStyles extends object
+    ? WithThemeAndShorthands<BaseStyles, VariantProps>
+    : {}
   : WithThemeAndShorthands<IsText extends true ? TextStylePropsBase : StackStyleBase>
 
 export type VariantDefinitionFromProps<MyProps, Val> = MyProps extends object

package/types/createComponent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createComponent.d.ts","sourceRoot":"","sources":["../src/createComponent.tsx"],"names":[],"mappings":"AAaA,OAAO,KAA2C,MAAM,OAAO,CAAA;AAuC/D,OAAO,KAAK,EASV,YAAY,EACZ,gBAAgB,EAChB,qBAAqB,EACrB,cAAc,EAOf,MAAM,SAAS,CAAA;AAahB,KAAK,iBAAiB,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,qBAAqB,CAAC,CAAC,CAAA;AAEpF,eAAO,MAAM,kBAAkB,wBAA+B,CAAA;AAuK9D,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,wEA8kE3B"}
+{"version":3,"file":"createComponent.d.ts","sourceRoot":"","sources":["../src/createComponent.tsx"],"names":[],"mappings":"AAaA,OAAO,KAA2C,MAAM,OAAO,CAAA;AAuC/D,OAAO,KAAK,EASV,YAAY,EACZ,gBAAgB,EAChB,qBAAqB,EACrB,cAAc,EAOf,MAAM,SAAS,CAAA;AAahB,KAAK,iBAAiB,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,qBAAqB,CAAC,CAAC,CAAA;AAEpF,eAAO,MAAM,kBAAkB,wBAA+B,CAAA;AAuK9D,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,wEAolE3B"}

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

@@ -1 +1 @@
-{"version":3,"file":"getSplitStyles.d.ts","sourceRoot":"","sources":["../../src/helpers/getSplitStyles.tsx"],"names":[],"mappings":"AA0BA,OAAO,KAAK,EACV,gBAAgB,EAEhB,mBAAmB,EAEnB,iBAAiB,EACjB,SAAS,EACT,cAAc,EACd,aAAa,EAGb,eAAe,EACf,YAAY,EAGZ,qBAAqB,EACrB,qBAAqB,EAErB,WAAW,EAGZ,MAAM,UAAU,CAAA;AAkBjB,OAAO,EAAE,oBAAoB,EAAE,KAAK,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAKlF,OAAO,EAAE,oBAAoB,EAAE,CAAA;AAqB/B,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAA;AAe3D,OAAO,EAAE,0BAA0B,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAA;AACvF,YAAY,EACV,iBAAiB,EACjB,cAAc,EACd,iBAAiB,EACjB,oBAAoB,GACrB,MAAM,mBAAmB,CAAA;AAC1B,OAAO,EAAE,mBAAmB,EAAE,CAAA;AAE9B,MAAM,MAAM,WAAW,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAA;AAK3D,MAAM,MAAM,gBAAgB,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAA;AAMhE,MAAM,MAAM,aAAa,GAAG,CAC1B,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,EAC3B,YAAY,CAAC,EAAE,gBAAgB,GAAG,IAAI,EAEtC,WAAW,CAAC,EAAE,MAAM,EACpB,iBAAiB,CAAC,EAAE,OAAO,EAC3B,KAAK,CAAC,EAAE,SAAS,EAEjB,eAAe,CAAC,EAAE,mBAAmB,GAAG,IAAI,EAC5C,iBAAiB,CAAC,EAAE,iBAAiB,KAClC,IAAI,GAAG,cAAc,CAAA;AA4U1B,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,WAEhF;AAmqBD,eAAO,MAAM,cAAc,EAAE,aAwrB5B,CAAA;AAqYD,MAAM,MAAM,UAAU,GAAG,CACvB,KAAK,EAAE,aAAa,EACpB,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,GAAG,EACV,gBAAgB,CAAC,EAAE,OAAO,EAC1B,aAAa,CAAC,EAAE,GAAG,KAChB,IAAI,CAAA;AAs3CT,KAAK,oBAAoB,GAAG,CAAC,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,KAAK,IAAI,CAAA;AAgCnF,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,aAAa,EACpB,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,GAAG,EACV,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,oBAAoB,GAAG,IAAI,EACjC,QAAQ,SAAI,EACZ,WAAW,UAAQ,WA4OpB;AA6HD,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,aAAa,EACpB,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,GAAG,EACV,QAAQ,EAAE,GAAG,EACb,SAAS,EAAE,OAAO,EAClB,QAAQ,EAAE,OAAO,QAsBlB;AAID,wBAAgB,+BAA+B,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,qBAAqB,sBAgBtF;AAMD,cAAc,mBAAmB,CAAA"}
+{"version":3,"file":"getSplitStyles.d.ts","sourceRoot":"","sources":["../../src/helpers/getSplitStyles.tsx"],"names":[],"mappings":"AA0BA,OAAO,KAAK,EACV,gBAAgB,EAEhB,mBAAmB,EAEnB,iBAAiB,EACjB,SAAS,EACT,cAAc,EACd,aAAa,EAGb,eAAe,EACf,YAAY,EAGZ,qBAAqB,EACrB,qBAAqB,EAErB,WAAW,EAGZ,MAAM,UAAU,CAAA;AAkBjB,OAAO,EAAE,oBAAoB,EAAE,KAAK,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAKlF,OAAO,EAAE,oBAAoB,EAAE,CAAA;AAqB/B,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAA;AAe3D,OAAO,EAAE,0BAA0B,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAA;AACvF,YAAY,EACV,iBAAiB,EACjB,cAAc,EACd,iBAAiB,EACjB,oBAAoB,GACrB,MAAM,mBAAmB,CAAA;AAC1B,OAAO,EAAE,mBAAmB,EAAE,CAAA;AAE9B,MAAM,MAAM,WAAW,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAA;AAK3D,MAAM,MAAM,gBAAgB,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAA;AAMhE,MAAM,MAAM,aAAa,GAAG,CAC1B,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,EAC3B,YAAY,CAAC,EAAE,gBAAgB,GAAG,IAAI,EAEtC,WAAW,CAAC,EAAE,MAAM,EACpB,iBAAiB,CAAC,EAAE,OAAO,EAC3B,KAAK,CAAC,EAAE,SAAS,EAEjB,eAAe,CAAC,EAAE,mBAAmB,GAAG,IAAI,EAC5C,iBAAiB,CAAC,EAAE,iBAAiB,KAClC,IAAI,GAAG,cAAc,CAAA;AA6U1B,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,WAEhF;AA2rBD,eAAO,MAAM,cAAc,EAAE,aAwrB5B,CAAA;AAqYD,MAAM,MAAM,UAAU,GAAG,CACvB,KAAK,EAAE,aAAa,EACpB,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,GAAG,EACV,gBAAgB,CAAC,EAAE,OAAO,EAC1B,aAAa,CAAC,EAAE,GAAG,KAChB,IAAI,CAAA;AAs3CT,KAAK,oBAAoB,GAAG,CAAC,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,KAAK,IAAI,CAAA;AAgCnF,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,aAAa,EACpB,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,GAAG,EACV,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,oBAAoB,GAAG,IAAI,EACjC,QAAQ,SAAI,EACZ,WAAW,UAAQ,WA4OpB;AA6HD,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,aAAa,EACpB,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,GAAG,EACV,QAAQ,EAAE,GAAG,EACb,SAAS,EAAE,OAAO,EAClB,QAAQ,EAAE,OAAO,QAyBlB;AAID,wBAAgB,+BAA+B,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,qBAAqB,sBAgBtF;AAMD,cAAc,mBAAmB,CAAA"}

package/types/styled.d.ts

@@ -1,7 +1,7 @@
 import { styledDynamic } from './helpers/styledDynamic';
 import type { FrontendComponent, StyleFrontend } from './helpers/styleFrontend';
 import type { GetRef } from './interfaces/GetRef';
-import type { GetBaseStyles, GetNonStyledProps, GetProps, GetStaticConfig, GetStyledVariants, InferStyledProps, StaticConfigPublic, StylableComponent, StyledContext, StyledDynamicFn, StyledDynamicProp, TamaDefer, TamaguiComponent, VariantDefinitions } from './types';
+import type { GetBaseStyles, GetNonStyledProps, GetProps, GetStaticConfig, GetStyledVariants, InferStyledProps, StaticConfigPublic, StylableComponent, StyleOnlyVariants, StyledContext, StyledDynamicFn, StyledDynamicProp, TamaDefer, TamaguiComponent, VariantDefinitions, VariantStyleProps } from './types';
 type AreVariantsUndefined<Variants> = Required<Variants> extends {
     _isEmpty: 1;
 } ? true : false;
@@ -14,7 +14,7 @@ type IsAny<T> = 0 extends 1 & T ? true : false;
 type GetStyledOptionsAcceptedProps<ParentComponent extends StylableComponent, StyledConfig extends StaticConfigPublic, Variants extends VariantDefinitions<ParentComponent, StyledConfig>, Context, ContextPropKeys extends string> = Partial<InferStyledProps<ParentComponent, StyledConfig>> & (AreVariantsUndefined<Variants> extends true ? {} : Partial<GetVariantAcceptedValues<Variants>>) & GetStyledContextProps<Context, ContextPropKeys>;
 export type StyledOptions<ParentComponent extends StylableComponent, StyledConfig extends StaticConfigPublic, Variants extends VariantDefinitions<ParentComponent, StyledConfig>, Context extends StyledContext<any> | undefined = undefined, ContextPropKeys extends string = GetStyledContextDefaultKeys<Context>> = GetStyledOptionsAcceptedProps<ParentComponent, StyledConfig, Variants, Context, ContextPropKeys> & {
     displayName?: string;
-    variants?: Variants | undefined;
+    variants?: (Variants & NoInferLocal<StyleOnlyVariants<Variants, keyof VariantStyleProps<ParentComponent, StyledConfig>>>) | undefined;
     defaultVariants?: NoInferLocal<GetVariantAcceptedValues<NonNullable<Variants>>>;
     context?: Context;
     contextProps?: readonly Extract<ContextPropKeys, keyof GetStyledContextAllProps<Context> & string>[];

package/types/styled.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"styled.d.ts","sourceRoot":"","sources":["../src/styled.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"styled.d.ts","sourceRoot":"","sources":["../src/styled.tsx"],"names":[],"mappings":"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"}

package/types/types.d.ts

@@ -2044,20 +2044,26 @@ export type StyledDynamic<Val = any, Output extends object = Record<string, any>
 export type StyledResolver<Props = Record<string, any>, Output extends object = Record<string, any>> = (props: Props, env: StyledDynamicEnv) => Partial<Output> | null | undefined;
 export type VariantDefinitions<Parent extends StylableComponent = TamaguiComponent, StaticConfig extends StaticConfigPublic = Parent extends {
     __tama: [any, any, any, any, any, infer S];
-} ? S : {}, MyProps extends object = Partial<GetVariantProps<Parent, StaticConfig['isText'] extends true ? true : StaticConfig['isInput'] extends true ? true : false>>, Val = any> = VariantDefinitionFromProps<MyProps, Val> & {
+} ? S : {}, MyProps extends object = VariantStyleProps<Parent, StaticConfig>, Val = any> = VariantDefinitionFromProps<MyProps, Val> & {
     _isEmpty?: 1;
 };
+export type VariantStyleProps<Parent extends StylableComponent, StaticConfig extends StaticConfigPublic> = Partial<GetVariantProps<Parent, StaticConfig['isText'] extends true ? true : StaticConfig['isInput'] extends true ? true : false>>;
+/**
+ * the exact-key check styled() runs on the variants it infers: a key that is
+ * not a style, shorthand, aria/data attribute, or variant of the component is
+ * `never`, since inference alone never flags extra keys.
+ */
+export type StyleOnlyVariants<Variants, AllowedKeys extends PropertyKey> = {
+    [Name in keyof Variants]: Variants[Name] extends StyledDynamic<any, any> ? Variants[Name] : {
+        [Value in keyof Variants[Name]]: Variants[Name][Value] extends object ? {
+            [Key in keyof Variants[Name][Value]]: Key extends AllowedKeys | keyof Variants | `aria-${string}` | `data-${string}` ? Variants[Name][Value][Key] : never;
+        } : Variants[Name][Value];
+    };
+};
 export type StaticStyleInput = string;
 export type GetVariantProps<A extends StylableComponent, IsText extends boolean | undefined> = A extends {
-    __tama: [
-        infer Props,
-        any,
-        infer NonStyledProps,
-        infer BaseStyles,
-        infer VariantProps,
-        any
-    ];
-} ? Props extends TamaDefer ? GetFinalProps<NonStyledProps, BaseStyles, VariantProps> : Props : WithThemeAndShorthands<IsText extends true ? TextStylePropsBase : StackStyleBase>;
+    __tama: [any, any, any, infer BaseStyles, infer VariantProps, any];
+} ? BaseStyles extends object ? WithThemeAndShorthands<BaseStyles, VariantProps> : {} : WithThemeAndShorthands<IsText extends true ? TextStylePropsBase : StackStyleBase>;
 export type VariantDefinitionFromProps<MyProps, Val> = MyProps extends object ? {
     [propName: string]: StyledDynamic<any, MyProps> | {
         [Key in string | number | 'true' | 'false']?: MyProps | StaticStyleInput;