@tamagui/button 2.0.0-rc.8 → 2.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/button",
-  "version": "2.0.0-rc.8",
+  "version": "2.0.0",
   "gitHead": "a49cc7ea6b93ba384e77a4880ae48ac4a5635c14",
   "source": "src/index.ts",
   "files": [
@@ -19,15 +19,12 @@
     "./package.json": "./package.json",
     ".": {
       "types": "./types/index.d.ts",
-      "react-native": {
-        "module": "./dist/esm/index.native.js",
-        "import": "./dist/esm/index.native.js",
-        "require": "./dist/cjs/index.native.js"
-      },
+      "react-native": "./dist/esm/index.native.js",
+      "browser": "./dist/esm/index.mjs",
       "module": "./dist/esm/index.mjs",
       "import": "./dist/esm/index.mjs",
       "require": "./dist/cjs/index.cjs",
-      "default": "./dist/cjs/index.native.js"
+      "default": "./dist/esm/index.mjs"
     }
   },
   "publishConfig": {
@@ -40,19 +37,19 @@
     "clean:build": "tamagui-build clean:build"
   },
   "dependencies": {
-    "@tamagui/config-default": "2.0.0-rc.8",
-    "@tamagui/core": "2.0.0-rc.8",
-    "@tamagui/font-size": "2.0.0-rc.8",
-    "@tamagui/get-button-sized": "2.0.0-rc.8",
-    "@tamagui/helpers": "2.0.0-rc.8",
-    "@tamagui/helpers-tamagui": "2.0.0-rc.8",
-    "@tamagui/spacer": "2.0.0-rc.8",
-    "@tamagui/stacks": "2.0.0-rc.8",
-    "@tamagui/text": "2.0.0-rc.8",
-    "@tamagui/web": "2.0.0-rc.8"
+    "@tamagui/config-default": "2.0.0",
+    "@tamagui/core": "2.0.0",
+    "@tamagui/get-button-sized": "2.0.0",
+    "@tamagui/helpers": "2.0.0",
+    "@tamagui/helpers-tamagui": "2.0.0",
+    "@tamagui/spacer": "2.0.0",
+    "@tamagui/stacks": "2.0.0",
+    "@tamagui/text": "2.0.0",
+    "@tamagui/font-size": "2.0.0",
+    "@tamagui/web": "2.0.0"
   },
   "devDependencies": {
-    "@tamagui/build": "2.0.0-rc.8",
+    "@tamagui/build": "2.0.0",
     "react": ">=19",
     "vitest": "4.0.4"
   },

package/src/Button.test.tsx

@@ -1,6 +1,7 @@
 import { getDefaultTamaguiConfig } from '@tamagui/config-default'
 import { createTamagui } from '@tamagui/core'
 import { describe, expect, test } from 'vitest'
+import { Button } from './Button'
 
 const conf = createTamagui(getDefaultTamaguiConfig())
 
@@ -9,6 +10,29 @@ describe('Button', () => {
     expect(true).toBeTruthy()
   })
 
+  // type tests for native button props (issue #3914)
+  test('accepts native button html props', () => {
+    // these should type check without errors
+    const _submitBtn = <Button type="submit">Submit</Button>
+    const _resetBtn = <Button type="reset">Reset</Button>
+    const _buttonBtn = <Button type="button">Button</Button>
+    const _formBtn = (
+      <Button
+        type="submit"
+        form="myForm"
+        formAction="/submit"
+        formMethod="post"
+        formTarget="_blank"
+        formNoValidate
+        name="submitBtn"
+        value="submit"
+      >
+        Submit
+      </Button>
+    )
+    expect(true).toBeTruthy()
+  })
+
   // test(`Adapts to a when given accessibilityRole="link"`, async () => {
   //   const { container } = render(
   //     <TamaguiProvider config={conf} defaultTheme="light">

package/src/Button.tsx

@@ -1,9 +1,10 @@
 import { getFontSize } from '@tamagui/font-size'
 import { getButtonSized } from '@tamagui/get-button-sized'
-import { getIcon } from '@tamagui/helpers-tamagui'
+import { getIcon, useCurrentColor } from '@tamagui/helpers-tamagui'
 import { ButtonNestingContext, getElevation, themeableVariants } from '@tamagui/stacks'
+import type { TextContextStyles, TextParentStyles } from '@tamagui/text'
 import { SizableText, wrapChildrenInText } from '@tamagui/text'
-import type { ColorTokens, GetProps, SizeTokens, Token } from '@tamagui/web'
+import type { GetProps, SizeTokens, Token } from '@tamagui/web'
 import {
   createStyledContext,
   getTokenValue,
@@ -17,16 +18,25 @@ import { useContext } from 'react'
 
 type ButtonVariant = 'outlined'
 
-const context = createStyledContext<{
+type ButtonContextStyles = TextContextStyles & {
   size?: SizeTokens
   variant?: ButtonVariant
-  color?: ColorTokens | string
   elevation?: SizeTokens | number
-}>({
+}
+
+const context = createStyledContext<ButtonContextStyles>({
   size: undefined,
   variant: undefined,
   color: undefined,
   elevation: undefined,
+  ellipsis: undefined,
+  fontFamily: undefined,
+  fontSize: undefined,
+  fontStyle: undefined,
+  fontWeight: undefined,
+  letterSpacing: undefined,
+  maxFontSizeMultiplier: undefined,
+  textAlign: undefined,
 })
 
 const Frame = styled(View, {
@@ -38,17 +48,26 @@ const Frame = styled(View, {
 
   variants: {
     unstyled: {
+      true: {
+        // reset browser <button> defaults
+        outlineWidth: 0,
+        borderWidth: 0,
+        backgroundColor: 'transparent',
+      },
       false: {
         size: '$true',
         justifyContent: 'center',
         alignItems: 'center',
         flexWrap: 'nowrap',
         flexDirection: 'row',
-        cursor: 'pointer',
         backgroundColor: '$background',
         borderWidth: 1,
         borderColor: 'transparent',
 
+        '$platform-web': {
+          cursor: 'pointer',
+        },
+
         hoverStyle: {
           backgroundColor: '$backgroundHover',
           borderColor: '$borderColorHover',
@@ -137,12 +156,15 @@ const Text = styled(SizableText, {
     unstyled: {
       false: {
         userSelect: 'none',
-        cursor: 'pointer',
         // flexGrow 1 leads to inconsistent native style where text pushes to start of view
         flexGrow: 0,
         flexShrink: 1,
         ellipsis: true,
         color: '$color',
+
+        '$platform-web': {
+          cursor: 'pointer',
+        },
       },
     },
   } as const,
@@ -164,6 +186,11 @@ const Icon = (props: {
   }
 
   const sizeToken = size ?? styledContext.size
+  const iconColorProp =
+    styledContext.color === 'unset' || typeof styledContext.color === 'number'
+      ? undefined
+      : styledContext.color
+  const iconColor = useCurrentColor(iconColorProp)
 
   const iconSize =
     (typeof sizeToken === 'number' ? sizeToken * 0.5 : getFontSize(sizeToken as Token)) *
@@ -171,14 +198,14 @@ const Icon = (props: {
 
   return getIcon(children, {
     size: iconSize,
-    color: styledContext.color,
+    color: iconColor,
   })
 }
 
 export const ButtonContext = createStyledContext<{
   size?: SizeTokens
   variant?: ButtonVariant
-  color?: ColorTokens | string
+  color?: ButtonContextStyles['color']
 }>({
   size: undefined,
   variant: undefined,
@@ -187,11 +214,22 @@ export const ButtonContext = createStyledContext<{
 
 type IconProp = JSX.Element | FunctionComponent<{ color?: any; size?: any }> | null
 
-type ButtonExtraProps = {
+type ButtonExtraProps = TextParentStyles & {
   icon?: IconProp
   iconAfter?: IconProp
   scaleIcon?: number
   iconSize?: SizeTokens
+
+  // native button html props
+  type?: 'submit' | 'reset' | 'button'
+  form?: string
+  formAction?: string
+  formEncType?: string
+  formMethod?: string
+  formNoValidate?: boolean
+  formTarget?: string
+  name?: string
+  value?: string | readonly string[] | number
 }
 
 const ButtonComponent = Frame.styleable<ButtonExtraProps>((propsIn, ref) => {
@@ -203,11 +241,35 @@ const ButtonComponent = Frame.styleable<ButtonExtraProps>((propsIn, ref) => {
     noExpand: true,
   })
 
-  const { children, iconSize, icon, iconAfter, scaleIcon = 1, ...props } = processedProps
+  const {
+    children,
+    iconSize,
+    icon,
+    iconAfter,
+    scaleIcon = 1,
+    noTextWrap,
+    textProps,
+    color,
+    ellipsis,
+    fontFamily,
+    fontSize,
+    fontStyle,
+    fontWeight,
+    letterSpacing,
+    maxFontSizeMultiplier,
+    textAlign,
+    ...props
+  } = processedProps
 
   const size = propsIn.size || (propsIn.unstyled ? undefined : '$true')
 
   const styledContext = context.useStyledContext()
+  const contextColor = color ?? propsIn.color ?? styledContext?.color
+  const iconColorProp =
+    contextColor === 'unset' || typeof contextColor === 'number'
+      ? undefined
+      : contextColor
+  const iconColor = useCurrentColor(iconColorProp)
   const finalSize = iconSize ?? size ?? styledContext?.size
   const iconSizeNumber =
     (typeof finalSize === 'number' ? finalSize * 0.5 : getFontSize(finalSize as Token)) *
@@ -217,34 +279,76 @@ const ButtonComponent = Frame.styleable<ButtonExtraProps>((propsIn, ref) => {
     if (!icon) return null
     return getIcon(icon, {
       size: iconSizeNumber,
-      color: styledContext?.color,
+      color: iconColor,
       // No marginLeft or marginRight needed - spacing is handled by the gap property in Frame's size variants
     })
   })
 
   const wrappedChildren = wrapChildrenInText(
     Text,
-    { children },
+    {
+      children,
+      color: contextColor,
+      ellipsis: ellipsis ?? propsIn.ellipsis ?? styledContext?.ellipsis,
+      fontFamily: fontFamily ?? propsIn.fontFamily ?? styledContext?.fontFamily,
+      fontSize: fontSize ?? propsIn.fontSize ?? styledContext?.fontSize,
+      fontStyle: fontStyle ?? propsIn.fontStyle ?? styledContext?.fontStyle,
+      fontWeight: fontWeight ?? propsIn.fontWeight ?? styledContext?.fontWeight,
+      letterSpacing:
+        letterSpacing ?? propsIn.letterSpacing ?? styledContext?.letterSpacing,
+      maxFontSizeMultiplier:
+        maxFontSizeMultiplier ??
+        propsIn.maxFontSizeMultiplier ??
+        styledContext?.maxFontSizeMultiplier,
+      noTextWrap: noTextWrap ?? propsIn.noTextWrap,
+      textAlign: textAlign ?? propsIn.textAlign ?? styledContext?.textAlign,
+      textProps: textProps ?? propsIn.textProps,
+    },
     {
       unstyled: process.env.TAMAGUI_HEADLESS === '1',
       size: finalSize ?? styledContext?.size,
     }
   )
 
+  const textContext: TextContextStyles = {
+    color: contextColor,
+    ellipsis: ellipsis ?? propsIn.ellipsis ?? styledContext?.ellipsis,
+    fontFamily: fontFamily ?? propsIn.fontFamily ?? styledContext?.fontFamily,
+    fontSize: fontSize ?? propsIn.fontSize ?? styledContext?.fontSize,
+    fontStyle: fontStyle ?? propsIn.fontStyle ?? styledContext?.fontStyle,
+    fontWeight: fontWeight ?? propsIn.fontWeight ?? styledContext?.fontWeight,
+    letterSpacing: letterSpacing ?? propsIn.letterSpacing ?? styledContext?.letterSpacing,
+    maxFontSizeMultiplier:
+      maxFontSizeMultiplier ??
+      propsIn.maxFontSizeMultiplier ??
+      styledContext?.maxFontSizeMultiplier,
+    textAlign: textAlign ?? propsIn.textAlign ?? styledContext?.textAlign,
+  }
+
+  const buttonContext: ButtonContextStyles = {
+    ...styledContext,
+    ...textContext,
+    size: props.size ?? propsIn.size ?? styledContext?.size,
+    variant: props.variant ?? propsIn.variant ?? styledContext?.variant,
+    elevation: props.elevation ?? propsIn.elevation ?? styledContext?.elevation,
+  }
+
   return (
     <ButtonNestingContext.Provider value={true}>
-      <Frame
-        ref={ref}
-        {...props}
-        {...(isNested && { render: 'span' })}
-        // Pass resolved size to circular variant when no explicit size provided
-        {...(props.circular && !propsIn.size && { size })}
-        tabIndex={0}
-      >
-        {themedIcon}
-        {wrappedChildren}
-        {themedIconAfter}
-      </Frame>
+      <context.Provider {...buttonContext}>
+        <Frame
+          ref={ref}
+          {...props}
+          {...(isNested && { render: 'span' })}
+          // pass resolved size to circular variant when no explicit size provided
+          {...(props.circular && !propsIn.size && { size })}
+          tabIndex={0}
+        >
+          {themedIcon}
+          {wrappedChildren}
+          {themedIconAfter}
+        </Frame>
+      </context.Provider>
     </ButtonNestingContext.Provider>
   )
 })

package/src/v1/Button.tsx

@@ -85,6 +85,12 @@ const ButtonFrame = styled(ThemeableStack, {
 
   variants: {
     unstyled: {
+      true: {
+        // reset browser <button> defaults
+        outlineWidth: 0,
+        borderWidth: 0,
+        backgroundColor: 'transparent',
+      },
       false: {
         size: '$true',
         justifyContent: 'center',

package/types/Button.d.ts

@@ -1,103 +1,212 @@
-import type { ColorTokens, GetProps, SizeTokens } from '@tamagui/web';
+import type { TextContextStyles } from '@tamagui/text';
+import type { GetProps, SizeTokens } from '@tamagui/web';
 import type { FunctionComponent, JSX } from 'react';
 type ButtonVariant = 'outlined';
+type ButtonContextStyles = TextContextStyles & {
+    size?: SizeTokens;
+    variant?: ButtonVariant;
+    elevation?: SizeTokens | number;
+};
 export declare const ButtonContext: import("@tamagui/web").StyledContext<{
     size?: SizeTokens;
     variant?: ButtonVariant;
-    color?: ColorTokens | string;
+    color?: ButtonContextStyles["color"];
 }>;
 type IconProp = JSX.Element | FunctionComponent<{
     color?: any;
     size?: any;
 }> | null;
-type ButtonExtraProps = {
-    icon?: IconProp;
-    iconAfter?: IconProp;
-    scaleIcon?: number;
-    iconSize?: SizeTokens;
-};
 declare const ButtonComponent: import("@tamagui/web").TamaguiComponent<Omit<import("@tamagui/web").GetFinalProps<import("@tamagui/web").StackNonStyleProps, import("@tamagui/web").StackStyleBase, {
     size?: number | SizeTokens | undefined;
     variant?: "outlined" | undefined;
+    disabled?: boolean | undefined;
+    unstyled?: boolean | undefined;
     elevation?: number | SizeTokens | undefined;
     circular?: boolean | undefined;
     chromeless?: boolean | "all" | undefined;
-    disabled?: boolean | undefined;
-    unstyled?: boolean | undefined;
-}>, keyof ButtonExtraProps> & ButtonExtraProps, import("@tamagui/web").TamaguiElement, import("@tamagui/web").StackNonStyleProps & ButtonExtraProps, import("@tamagui/web").StackStyleBase, {
+}>, "form" | "name" | "value" | keyof TextContextStyles | "textProps" | "noTextWrap" | "icon" | "iconAfter" | "scaleIcon" | "iconSize" | "type" | "formAction" | "formEncType" | "formMethod" | "formNoValidate" | "formTarget"> & TextContextStyles & {
+    textProps?: Partial<import("@tamagui/text").SizableTextProps>;
+    noTextWrap?: boolean;
+} & {
+    icon?: IconProp;
+    iconAfter?: IconProp;
+    scaleIcon?: number;
+    iconSize?: SizeTokens;
+    type?: "submit" | "reset" | "button";
+    form?: string;
+    formAction?: string;
+    formEncType?: string;
+    formMethod?: string;
+    formNoValidate?: boolean;
+    formTarget?: string;
+    name?: string;
+    value?: string | readonly string[] | number;
+}, import("@tamagui/web").TamaguiElement, import("@tamagui/web").StackNonStyleProps & TextContextStyles & {
+    textProps?: Partial<import("@tamagui/text").SizableTextProps>;
+    noTextWrap?: boolean;
+} & {
+    icon?: IconProp;
+    iconAfter?: IconProp;
+    scaleIcon?: number;
+    iconSize?: SizeTokens;
+    type?: "submit" | "reset" | "button";
+    form?: string;
+    formAction?: string;
+    formEncType?: string;
+    formMethod?: string;
+    formNoValidate?: boolean;
+    formTarget?: string;
+    name?: string;
+    value?: string | readonly string[] | number;
+}, import("@tamagui/web").StackStyleBase, {
     size?: number | SizeTokens | undefined;
     variant?: "outlined" | undefined;
+    disabled?: boolean | undefined;
+    unstyled?: boolean | undefined;
     elevation?: number | SizeTokens | undefined;
     circular?: boolean | undefined;
     chromeless?: boolean | "all" | undefined;
-    disabled?: boolean | undefined;
-    unstyled?: boolean | undefined;
 }, import("@tamagui/web").StaticConfigPublic>;
 export declare const Button: import("react").ForwardRefExoticComponent<Omit<import("@tamagui/web").GetFinalProps<import("@tamagui/web").StackNonStyleProps, import("@tamagui/web").StackStyleBase, {
     size?: number | SizeTokens | undefined;
     variant?: "outlined" | undefined;
+    disabled?: boolean | undefined;
+    unstyled?: boolean | undefined;
     elevation?: number | SizeTokens | undefined;
     circular?: boolean | undefined;
     chromeless?: boolean | "all" | undefined;
-    disabled?: boolean | undefined;
-    unstyled?: boolean | undefined;
-}>, keyof ButtonExtraProps> & ButtonExtraProps & import("react").RefAttributes<import("@tamagui/web").TamaguiElement>> & import("@tamagui/web").StaticComponentObject<Omit<import("@tamagui/web").GetFinalProps<import("@tamagui/web").StackNonStyleProps, import("@tamagui/web").StackStyleBase, {
+}>, "form" | "name" | "value" | keyof TextContextStyles | "textProps" | "noTextWrap" | "icon" | "iconAfter" | "scaleIcon" | "iconSize" | "type" | "formAction" | "formEncType" | "formMethod" | "formNoValidate" | "formTarget"> & TextContextStyles & {
+    textProps?: Partial<import("@tamagui/text").SizableTextProps>;
+    noTextWrap?: boolean;
+} & {
+    icon?: IconProp;
+    iconAfter?: IconProp;
+    scaleIcon?: number;
+    iconSize?: SizeTokens;
+    type?: "submit" | "reset" | "button";
+    form?: string;
+    formAction?: string;
+    formEncType?: string;
+    formMethod?: string;
+    formNoValidate?: boolean;
+    formTarget?: string;
+    name?: string;
+    value?: string | readonly string[] | number;
+} & import("react").RefAttributes<import("@tamagui/web").TamaguiElement>> & import("@tamagui/web").StaticComponentObject<Omit<import("@tamagui/web").GetFinalProps<import("@tamagui/web").StackNonStyleProps, import("@tamagui/web").StackStyleBase, {
     size?: number | SizeTokens | undefined;
     variant?: "outlined" | undefined;
+    disabled?: boolean | undefined;
+    unstyled?: boolean | undefined;
     elevation?: number | SizeTokens | undefined;
     circular?: boolean | undefined;
     chromeless?: boolean | "all" | undefined;
-    disabled?: boolean | undefined;
-    unstyled?: boolean | undefined;
-}>, keyof ButtonExtraProps> & ButtonExtraProps, import("@tamagui/web").TamaguiElement, import("@tamagui/web").StackNonStyleProps & ButtonExtraProps, import("@tamagui/web").StackStyleBase, {
+}>, "form" | "name" | "value" | keyof TextContextStyles | "textProps" | "noTextWrap" | "icon" | "iconAfter" | "scaleIcon" | "iconSize" | "type" | "formAction" | "formEncType" | "formMethod" | "formNoValidate" | "formTarget"> & TextContextStyles & {
+    textProps?: Partial<import("@tamagui/text").SizableTextProps>;
+    noTextWrap?: boolean;
+} & {
+    icon?: IconProp;
+    iconAfter?: IconProp;
+    scaleIcon?: number;
+    iconSize?: SizeTokens;
+    type?: "submit" | "reset" | "button";
+    form?: string;
+    formAction?: string;
+    formEncType?: string;
+    formMethod?: string;
+    formNoValidate?: boolean;
+    formTarget?: string;
+    name?: string;
+    value?: string | readonly string[] | number;
+}, import("@tamagui/web").TamaguiElement, import("@tamagui/web").StackNonStyleProps & TextContextStyles & {
+    textProps?: Partial<import("@tamagui/text").SizableTextProps>;
+    noTextWrap?: boolean;
+} & {
+    icon?: IconProp;
+    iconAfter?: IconProp;
+    scaleIcon?: number;
+    iconSize?: SizeTokens;
+    type?: "submit" | "reset" | "button";
+    form?: string;
+    formAction?: string;
+    formEncType?: string;
+    formMethod?: string;
+    formNoValidate?: boolean;
+    formTarget?: string;
+    name?: string;
+    value?: string | readonly string[] | number;
+}, import("@tamagui/web").StackStyleBase, {
     size?: number | SizeTokens | undefined;
     variant?: "outlined" | undefined;
+    disabled?: boolean | undefined;
+    unstyled?: boolean | undefined;
     elevation?: number | SizeTokens | undefined;
     circular?: boolean | undefined;
     chromeless?: boolean | "all" | undefined;
-    disabled?: boolean | undefined;
-    unstyled?: boolean | undefined;
 }, import("@tamagui/web").StaticConfigPublic> & Omit<import("@tamagui/web").StaticConfigPublic, "staticConfig" | "styleable"> & {
     __tama: [Omit<import("@tamagui/web").GetFinalProps<import("@tamagui/web").StackNonStyleProps, import("@tamagui/web").StackStyleBase, {
         size?: number | SizeTokens | undefined;
         variant?: "outlined" | undefined;
+        disabled?: boolean | undefined;
+        unstyled?: boolean | undefined;
         elevation?: number | SizeTokens | undefined;
         circular?: boolean | undefined;
         chromeless?: boolean | "all" | undefined;
-        disabled?: boolean | undefined;
-        unstyled?: boolean | undefined;
-    }>, keyof ButtonExtraProps> & ButtonExtraProps, import("@tamagui/web").TamaguiElement, import("@tamagui/web").StackNonStyleProps & ButtonExtraProps, import("@tamagui/web").StackStyleBase, {
+    }>, "form" | "name" | "value" | keyof TextContextStyles | "textProps" | "noTextWrap" | "icon" | "iconAfter" | "scaleIcon" | "iconSize" | "type" | "formAction" | "formEncType" | "formMethod" | "formNoValidate" | "formTarget"> & TextContextStyles & {
+        textProps?: Partial<import("@tamagui/text").SizableTextProps>;
+        noTextWrap?: boolean;
+    } & {
+        icon?: IconProp;
+        iconAfter?: IconProp;
+        scaleIcon?: number;
+        iconSize?: SizeTokens;
+        type?: "submit" | "reset" | "button";
+        form?: string;
+        formAction?: string;
+        formEncType?: string;
+        formMethod?: string;
+        formNoValidate?: boolean;
+        formTarget?: string;
+        name?: string;
+        value?: string | readonly string[] | number;
+    }, import("@tamagui/web").TamaguiElement, import("@tamagui/web").StackNonStyleProps & TextContextStyles & {
+        textProps?: Partial<import("@tamagui/text").SizableTextProps>;
+        noTextWrap?: boolean;
+    } & {
+        icon?: IconProp;
+        iconAfter?: IconProp;
+        scaleIcon?: number;
+        iconSize?: SizeTokens;
+        type?: "submit" | "reset" | "button";
+        form?: string;
+        formAction?: string;
+        formEncType?: string;
+        formMethod?: string;
+        formNoValidate?: boolean;
+        formTarget?: string;
+        name?: string;
+        value?: string | readonly string[] | number;
+    }, import("@tamagui/web").StackStyleBase, {
         size?: number | SizeTokens | undefined;
         variant?: "outlined" | undefined;
+        disabled?: boolean | undefined;
+        unstyled?: boolean | undefined;
         elevation?: number | SizeTokens | undefined;
         circular?: boolean | undefined;
         chromeless?: boolean | "all" | undefined;
-        disabled?: boolean | undefined;
-        unstyled?: boolean | undefined;
     }, import("@tamagui/web").StaticConfigPublic];
 } & {
-    Apply: import("react").Provider<{
-        size?: SizeTokens;
-        variant?: ButtonVariant;
-        color?: ColorTokens | string;
-        elevation?: SizeTokens | number;
-    }> & import("react").ProviderExoticComponent<Partial<{
-        size?: SizeTokens;
-        variant?: ButtonVariant;
-        color?: ColorTokens | string;
-        elevation?: SizeTokens | number;
-    }> & {
+    Apply: import("react").Provider<ButtonContextStyles> & import("react").ProviderExoticComponent<Partial<ButtonContextStyles> & {
         children?: import("react").ReactNode;
         scope?: string;
     }>;
     Frame: import("@tamagui/web").TamaguiComponent<import("@tamagui/web").TamaDefer, import("@tamagui/web").TamaguiElement, import("@tamagui/web").StackNonStyleProps, import("@tamagui/web").StackStyleBase, {
         size?: number | SizeTokens | undefined;
         variant?: "outlined" | undefined;
+        disabled?: boolean | undefined;
+        unstyled?: boolean | undefined;
         elevation?: number | SizeTokens | undefined;
         circular?: boolean | undefined;
         chromeless?: boolean | "all" | undefined;
-        disabled?: boolean | undefined;
-        unstyled?: boolean | undefined;
     }, import("@tamagui/web").StaticConfigPublic>;
     Text: import("@tamagui/web").TamaguiComponent<import("@tamagui/web").TamaDefer, import("@tamagui/web").TamaguiTextElement, import("@tamagui/web").TextNonStyleProps, import("@tamagui/web").TextStylePropsBase, {
         size?: import("@tamagui/web").FontSizeTokens | undefined;

package/types/Button.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Button.d.ts","sourceRoot":"","sources":["../src/Button.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAE,UAAU,EAAS,MAAM,cAAc,CAAA;AAS5E,OAAO,KAAK,EAAE,iBAAiB,EAAE,GAAG,EAAE,MAAM,OAAO,CAAA;AAGnD,KAAK,aAAa,GAAG,UAAU,CAAA;AAgK/B,eAAO,MAAM,aAAa;WACjB,UAAU;cACP,aAAa;YACf,WAAW,GAAG,MAAM;EAK5B,CAAA;AAEF,KAAK,QAAQ,GAAG,GAAG,CAAC,OAAO,GAAG,iBAAiB,CAAC;IAAE,KAAK,CAAC,EAAE,GAAG,CAAC;IAAC,IAAI,CAAC,EAAE,GAAG,CAAA;CAAE,CAAC,GAAG,IAAI,CAAA;AAEnF,KAAK,gBAAgB,GAAG;IACtB,IAAI,CAAC,EAAE,QAAQ,CAAA;IACf,SAAS,CAAC,EAAE,QAAQ,CAAA;IACpB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,QAAQ,CAAC,EAAE,UAAU,CAAA;CACtB,CAAA;AAED,QAAA,MAAM,eAAe;;;;;;;;;;;;;;;;6CAqDnB,CAAA;AAEF,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;eAvOV,UAAU;kBACP,aAAa;gBACf,WAAW,GAAG,MAAM;oBAChB,UAAU,GAAG,MAAM;;eAHxB,UAAU;kBACP,aAAa;gBACf,WAAW,GAAG,MAAM;oBAChB,UAAU,GAAG,MAAM;;;;;;;;;;;;;;;;;;kBAmIZ;QACnB,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;QACzB,SAAS,CAAC,EAAE,MAAM,CAAA;QAClB,IAAI,CAAC,EAAE,UAAU,CAAA;KAClB;CAkGC,CAAA;AAEF,MAAM,MAAM,WAAW,GAAG,QAAQ,CAAC,OAAO,eAAe,CAAC,CAAA"}
+{"version":3,"file":"Button.d.ts","sourceRoot":"","sources":["../src/Button.tsx"],"names":[],"mappings":"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"}