@tamagui/button 1.26.0 → 1.27.0-1684163004699

package/dist/jsx/themed.js

@@ -0,0 +1,232 @@
+import { createContextScope } from "@tamagui/create-context";
+import { getFontSize } from "@tamagui/font-size";
+import { getButtonSized } from "@tamagui/get-button-sized";
+import { useGetThemedIcon } from "@tamagui/helpers-tamagui";
+import { wrapChildrenInText } from "@tamagui/text";
+import {
+  ButtonNestingContext,
+  getConfig,
+  getVariableValue,
+  isRSC,
+  spacedChildren,
+  styled,
+  useMediaPropsActive,
+  withStaticProperties
+} from "@tamagui/web";
+import { useCallback, useContext, useEffect, useState } from "react";
+import {
+  BUTTON_ICON_NAME,
+  BUTTON_NAME,
+  BUTTON_TEXT_NAME,
+  Button as BaseButton
+} from "./Button";
+const ButtonFrame = styled(BaseButton, {
+  name: BUTTON_NAME,
+  variants: {
+    unstyled: {
+      false: {
+        size: "$true",
+        justifyContent: "center",
+        alignItems: "center",
+        flexWrap: "nowrap",
+        flexDirection: "row",
+        cursor: "pointer",
+        hoverTheme: true,
+        pressTheme: true,
+        backgrounded: true,
+        borderWidth: 1,
+        borderColor: "$borderColor",
+        pressStyle: {
+          borderColor: "$borderColorPress"
+        },
+        focusStyle: {
+          outlineColor: "$borderColorFocus",
+          outlineStyle: "solid",
+          outlineWidth: 2
+        }
+      }
+    },
+    size: {
+      "...size": getButtonSized
+    },
+    active: {
+      true: {
+        hoverStyle: {
+          backgroundColor: "$background"
+        }
+      }
+    },
+    disabled: {
+      true: {
+        pointerEvents: "none"
+      }
+    }
+  },
+  defaultVariants: {
+    unstyled: false
+  }
+});
+const [createButtonContext, createButtonScope] = createContextScope(BUTTON_NAME);
+const [ButtonProvider, useButtonContext] = createButtonContext("Button");
+const ButtonTextFrame = styled(BaseButton.Text, {
+  name: BUTTON_TEXT_NAME,
+  variants: {
+    unstyled: {
+      false: {
+        userSelect: "none",
+        cursor: "pointer",
+        // flexGrow 1 leads to inconsistent native style where text pushes to start of view
+        flexGrow: 0,
+        flexShrink: 1,
+        ellipse: true,
+        color: "$color"
+      }
+    }
+  },
+  defaultVariants: {
+    unstyled: false
+  }
+});
+const ButtonText = ButtonTextFrame.styleable(
+  (props, ref) => {
+    const context = useButtonContext(BUTTON_TEXT_NAME, props.__scopeButton);
+    useEffect(() => {
+      const unregister = context.registerButtonText();
+      return () => unregister();
+    }, [context.registerButtonText]);
+    return <ButtonTextFrame ref={ref} color={context.color} size={context.size} {...props}>{props.children}</ButtonTextFrame>;
+  }
+);
+const ButtonIcon = (props) => {
+  const { children, scaleIcon = 1 } = props;
+  const context = useButtonContext(BUTTON_ICON_NAME, props.__scopeButton);
+  const size = context.size;
+  const color = context.color;
+  const iconSize = (typeof size === "number" ? size * 0.5 : getFontSize(size)) * scaleIcon;
+  const getThemedIcon = useGetThemedIcon({ size: iconSize, color });
+  return getThemedIcon(children);
+};
+const ButtonComponent = ButtonFrame.styleable(
+  (props, ref) => {
+    const buttonApi = props.forceButtonApi ?? getConfig().buttonApi ?? "mixed";
+    const { props: buttonProps } = useButton(props);
+    const [buttonTextCount, setButtonTextCount] = useState(0);
+    const registerButtonText = useCallback(() => {
+      if (buttonApi === "simple") {
+        console.warn(
+          "You are using Button.Text with simple button API. Either remove Button.Text or use either `buttonApi: composable` or `mixed` in your tamagui config."
+        );
+      }
+      if (buttonApi === "composable")
+        return () => {
+        };
+      setButtonTextCount((prev) => prev + 1);
+      return () => setButtonTextCount((prev) => prev - 1);
+    }, [setButtonTextCount]);
+    const usesComposableApi = buttonApi === "composable" || buttonApi === "mixed" && buttonTextCount > 0;
+    return <ButtonProvider
+      scope={props.__scopeButton}
+      size={props.size ?? "$true"}
+      color={props.color}
+      usesComposableApi={usesComposableApi}
+      registerButtonText={registerButtonText}
+    ><ButtonFrame unstyled={props.unstyled ?? false} ref={ref} {...buttonProps} /></ButtonProvider>;
+  }
+);
+const Button = withStaticProperties(ButtonComponent, {
+  Text: ButtonText,
+  Icon: ButtonIcon
+});
+function useButton(propsIn, { Text = ButtonTextFrame } = { Text: ButtonTextFrame }) {
+  const {
+    children,
+    icon,
+    iconAfter,
+    noTextWrap,
+    theme: themeName,
+    space,
+    spaceFlex,
+    scaleIcon = 1,
+    scaleSpace = 0.66,
+    separator,
+    // text props
+    color,
+    fontWeight,
+    letterSpacing,
+    fontSize,
+    fontFamily,
+    fontStyle,
+    textAlign,
+    unstyled = false,
+    textProps,
+    ...rest
+  } = propsIn;
+  const isNested = isRSC ? false : useContext(ButtonNestingContext);
+  const propsActive = useMediaPropsActive(propsIn);
+  const size = propsActive.size || "$true";
+  const iconSize = (typeof size === "number" ? size * 0.5 : getFontSize(size)) * scaleIcon;
+  const getThemedIcon = useGetThemedIcon({ size: iconSize, color });
+  const [themedIcon, themedIconAfter] = [icon, iconAfter].map(getThemedIcon);
+  const spaceSize = propsActive.space ?? getVariableValue(iconSize) * scaleSpace;
+  const contents = wrapChildrenInText(
+    Text,
+    propsActive,
+    Text === ButtonTextFrame ? {
+      unstyled
+    } : void 0
+  );
+  const inner = spacedChildren({
+    // a bit arbitrary but scaling to font size is necessary so long as button does
+    space: spaceSize,
+    spaceFlex,
+    separator,
+    direction: propsActive.flexDirection === "column" || propsActive.flexDirection === "column-reverse" ? "vertical" : "horizontal",
+    children: [themedIcon, ...contents, themedIconAfter]
+  });
+  const tag = isNested ? "span" : (
+    // defaults to <a /> when accessibilityRole = link
+    // see https://github.com/tamagui/tamagui/issues/505
+    propsIn.accessibilityRole === "link" ? "a" : void 0
+  );
+  const props = {
+    ...propsActive.disabled && {
+      // in rnw - false still has keyboard tabIndex, undefined = not actually focusable
+      focusable: void 0,
+      // even with tabIndex unset, it will keep focusStyle on web so disable it here
+      focusStyle: {
+        borderColor: "$background"
+      }
+    },
+    tag,
+    ...rest,
+    children: isRSC ? inner : <ButtonNestingContext.Provider value={true}>{inner}</ButtonNestingContext.Provider>
+  };
+  return {
+    spaceSize,
+    isNested,
+    props
+  };
+}
+const buttonStaticConfig = {
+  inlineProps: /* @__PURE__ */ new Set([
+    // text props go here (can't really optimize them, but we never fully extract button anyway)
+    // may be able to remove this entirely, as the compiler / runtime have gotten better
+    "color",
+    "fontWeight",
+    "fontSize",
+    "fontFamily",
+    "fontStyle",
+    "letterSpacing",
+    "textAlign",
+    "unstyled"
+  ])
+};
+export {
+  Button,
+  ButtonFrame,
+  ButtonTextFrame as ButtonText,
+  buttonStaticConfig,
+  createButtonScope,
+  useButton
+};
+//# sourceMappingURL=themed.js.map

package/dist/jsx/themed.js.map

@@ -0,0 +1,6 @@
+{
+  "version": 3,
+  "sources": ["../../src/themed.tsx"],
+  "mappings": "AACA,SAAS,0BAA0B;AACnC,SAAS,mBAAmB;AAC5B,SAAS,sBAAsB;AAC/B,SAAoB,wBAAwB;AAC5C,SAA2B,0BAA0B;AACrD;AAAA,EACE;AAAA,EAKA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,SAA4B,aAAa,YAAY,WAAW,gBAAgB;AAEhF;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA,UAAU;AAAA,OACL;AAEP,MAAM,cAAc,OAAO,YAAY;AAAA,EACrC,MAAM;AAAA,EACN,UAAU;AAAA,IACR,UAAU;AAAA,MACR,OAAO;AAAA,QACL,MAAM;AAAA,QACN,gBAAgB;AAAA,QAChB,YAAY;AAAA,QACZ,UAAU;AAAA,QACV,eAAe;AAAA,QACf,QAAQ;AAAA,QACR,YAAY;AAAA,QACZ,YAAY;AAAA,QACZ,cAAc;AAAA,QACd,aAAa;AAAA,QACb,aAAa;AAAA,QAEb,YAAY;AAAA,UACV,aAAa;AAAA,QACf;AAAA,QAEA,YAAY;AAAA,UACV,cAAc;AAAA,UACd,cAAc;AAAA,UACd,cAAc;AAAA,QAChB;AAAA,MACF;AAAA,IACF;AAAA,IAEA,MAAM;AAAA,MACJ,WAAW;AAAA,IACb;AAAA,IAEA,QAAQ;AAAA,MACN,MAAM;AAAA,QACJ,YAAY;AAAA,UACV,iBAAiB;AAAA,QACnB;AAAA,MACF;AAAA,IACF;AAAA,IAEA,UAAU;AAAA,MACR,MAAM;AAAA,QACJ,eAAe;AAAA,MACjB;AAAA,IACF;AAAA,EACF;AAAA,EAEA,iBAAiB;AAAA,IACf,UAAU;AAAA,EACZ;AACF,CAAC;AAgDD,MAAM,CAAC,qBAAqB,iBAAiB,IAAI,mBAAmB,WAAW;AAY/E,MAAM,CAAC,gBAAgB,gBAAgB,IACrC,oBAAwC,QAAQ;AAGlD,MAAM,kBAAkB,OAAO,WAAW,MAAM;AAAA,EAC9C,MAAM;AAAA,EACN,UAAU;AAAA,IACR,UAAU;AAAA,MACR,OAAO;AAAA,QACL,YAAY;AAAA,QACZ,QAAQ;AAAA;AAAA,QAER,UAAU;AAAA,QACV,YAAY;AAAA,QACZ,SAAS;AAAA,QACT,OAAO;AAAA,MACT;AAAA,IACF;AAAA,EACF;AAAA,EAEA,iBAAiB;AAAA,IACf,UAAU;AAAA,EACZ;AACF,CAAC;AAED,MAAM,aAAa,gBAAgB;AAAA,EACjC,CAAC,OAAsD,QAAQ;AAC7D,UAAM,UAAU,iBAAiB,kBAAkB,MAAM,aAAa;AACtE,cAAU,MAAM;AACd,YAAM,aAAa,QAAQ,mBAAmB;AAC9C,aAAO,MAAM,WAAW;AAAA,IAC1B,GAAG,CAAC,QAAQ,kBAAkB,CAAC;AAE/B,WACE,CAAC,gBAAgB,KAAK,KAAK,OAAO,QAAQ,OAAO,MAAM,QAAQ,UAAU,QACtE,MAAM,SACT,EAFC;AAAA,EAIL;AACF;AAOA,MAAM,aAAa,CAAC,UAAiD;AACnE,QAAM,EAAE,UAAU,YAAY,EAAE,IAAI;AACpC,QAAM,UAAU,iBAAiB,kBAAkB,MAAM,aAAa;AAEtE,QAAM,OAAO,QAAQ;AACrB,QAAM,QAAQ,QAAQ;AAEtB,QAAM,YAAY,OAAO,SAAS,WAAW,OAAO,MAAM,YAAY,IAAI,KAAK;AAC/E,QAAM,gBAAgB,iBAAiB,EAAE,MAAM,UAAU,MAAM,CAAC;AAChE,SAAO,cAAc,QAAQ;AAC/B;AAEA,MAAM,kBAAkB,YAAY;AAAA,EAClC,CAAC,OAAiC,QAAQ;AACxC,UAAM,YAAY,MAAM,kBAAkB,UAAU,EAAE,aAAa;AACnE,UAAM,EAAE,OAAO,YAAY,IAAI,UAAU,KAAK;AAC9C,UAAM,CAAC,iBAAiB,kBAAkB,IAAI,SAAS,CAAC;AAExD,UAAM,qBAAqB,YAAY,MAAM;AAC3C,UAAI,cAAc,UAAU;AAC1B,gBAAQ;AAAA,UACN;AAAA,QACF;AAAA,MACF;AAEA,UAAI,cAAc;AAAc,eAAO,MAAM;AAAA,QAAC;AAG9C,yBAAmB,CAAC,SAAS,OAAO,CAAC;AACrC,aAAO,MAAM,mBAAmB,CAAC,SAAS,OAAO,CAAC;AAAA,IACpD,GAAG,CAAC,kBAAkB,CAAC;AAEvB,UAAM,oBACJ,cAAc,gBAAiB,cAAc,WAAW,kBAAkB;AAE5E,WACE,CAAC;AAAA,MACC,OAAO,MAAM;AAAA,MACb,MAAM,MAAM,QAAQ;AAAA,MACpB,OAAO,MAAM;AAAA,MACb,mBAAmB;AAAA,MACnB,oBAAoB;AAAA,KAEpB,CAAC,YAAY,UAAU,MAAM,YAAY,OAAO,KAAK,SAAS,aAAa,EAC7E,EARC;AAAA,EAUL;AACF;AAEA,MAAM,SAAS,qBAAqB,iBAAiB;AAAA,EACnD,MAAM;AAAA,EACN,MAAM;AACR,CAAC;AAMD,SAAS,UACP,SACA,EAAE,OAAO,gBAAgB,IAAmB,EAAE,MAAM,gBAAgB,GACpE;AAEA,QAAM;AAAA,IACJ;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,OAAO;AAAA,IACP;AAAA,IACA;AAAA,IACA,YAAY;AAAA,IACZ,aAAa;AAAA,IACb;AAAA;AAAA,IAGA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,WAAW;AAAA,IACX;AAAA,IAEA,GAAG;AAAA,EACL,IAAI;AAEJ,QAAM,WAAW,QAAQ,QAAQ,WAAW,oBAAoB;AAChE,QAAM,cAAc,oBAAoB,OAAO;AAC/C,QAAM,OAAO,YAAY,QAAQ;AACjC,QAAM,YAAY,OAAO,SAAS,WAAW,OAAO,MAAM,YAAY,IAAI,KAAK;AAC/E,QAAM,gBAAgB,iBAAiB,EAAE,MAAM,UAAU,MAAM,CAAC;AAChE,QAAM,CAAC,YAAY,eAAe,IAAI,CAAC,MAAM,SAAS,EAAE,IAAI,aAAa;AACzE,QAAM,YAAY,YAAY,SAAS,iBAAiB,QAAQ,IAAI;AACpE,QAAM,WAAW;AAAA,IACf;AAAA,IACA;AAAA,IACA,SAAS,kBACL;AAAA,MACE;AAAA,IACF,IACA;AAAA,EACN;AACA,QAAM,QAAQ,eAAe;AAAA;AAAA,IAE3B,OAAO;AAAA,IACP;AAAA,IACA;AAAA,IACA,WACE,YAAY,kBAAkB,YAC9B,YAAY,kBAAkB,mBAC1B,aACA;AAAA,IACN,UAAU,CAAC,YAAY,GAAG,UAAU,eAAe;AAAA,EACrD,CAAC;AAGD,QAAM,MAAM,WACR;AAAA;AAAA;AAAA,IAGF,QAAQ,sBAAsB,SAC5B,MACA;AAAA;AAEJ,QAAM,QAAQ;AAAA,IACZ,GAAI,YAAY,YAAY;AAAA;AAAA,MAE1B,WAAW;AAAA;AAAA,MAEX,YAAY;AAAA,QACV,aAAa;AAAA,MACf;AAAA,IACF;AAAA,IACA;AAAA,IACA,GAAG;AAAA,IACH,UAAU,QACR,QAEA,CAAC,qBAAqB,SAAS,OAAO,OAAO,MAAM,EAAlD,qBAAqB;AAAA,EAE1B;AAEA,SAAO;AAAA,IACL;AAAA,IACA;AAAA,IACA;AAAA,EACF;AACF;AAEA,MAAM,qBAAqB;AAAA,EACzB,aAAa,oBAAI,IAAI;AAAA;AAAA;AAAA,IAGnB;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF,CAAC;AACH;",
+  "names": []
+}

package/dist/jsx/themed.mjs.map

@@ -0,0 +1,6 @@
+{
+  "version": 3,
+  "sources": ["../../src/themed.tsx"],
+  "mappings": "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",
+  "names": []
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/button",
-  "version": "1.26.0",
+  "version": "1.27.0-1684163004699",
   "sideEffects": [
     "*.css"
   ],
@@ -29,17 +29,17 @@
     }
   },
   "dependencies": {
-    "@tamagui/font-size": "1.26.0",
-    "@tamagui/get-button-sized": "1.26.0",
-    "@tamagui/helpers-tamagui": "1.26.0",
-    "@tamagui/text": "1.26.0",
-    "@tamagui/web": "1.26.0"
+    "@tamagui/font-size": "1.27.0-1684163004699",
+    "@tamagui/get-button-sized": "1.27.0-1684163004699",
+    "@tamagui/helpers-tamagui": "1.27.0-1684163004699",
+    "@tamagui/text": "1.27.0-1684163004699",
+    "@tamagui/web": "1.27.0-1684163004699"
   },
   "peerDependencies": {
     "react": "*"
   },
   "devDependencies": {
-    "@tamagui/build": "1.26.0",
+    "@tamagui/build": "1.27.0-1684163004699",
     "react": "^18.2.0",
     "vitest": "^0.26.3"
   },

package/src/Button.test.tsx

@@ -1,12 +1,9 @@
 process.env.TAMAGUI_TARGET = 'web'
 
 import { getDefaultTamaguiConfig } from '@tamagui/config-default'
-import { TamaguiProvider, createTamagui } from '@tamagui/core'
-import { render } from '@testing-library/react'
+import { createTamagui } from '@tamagui/core'
 import { describe, expect, test } from 'vitest'
 
-import { Button } from '.'
-
 const conf = createTamagui(getDefaultTamaguiConfig())
 
 describe('Button', () => {

package/src/Button.tsx

@@ -1,16 +1,15 @@
-import type { Scope } from '@tamagui/create-context'
-import { createContextScope } from '@tamagui/create-context'
 import { getFontSize } from '@tamagui/font-size'
 import { getButtonSized } from '@tamagui/get-button-sized'
-import { ColorProp, useGetThemedIcon } from '@tamagui/helpers-tamagui'
+import { useGetThemedIcon } from '@tamagui/helpers-tamagui'
 import { ThemeableStack } from '@tamagui/stacks'
 import { SizableText, TextParentStyles, wrapChildrenInText } from '@tamagui/text'
 import {
   ButtonNestingContext,
+  ColorStyleProp,
   GetProps,
   SizeTokens,
-  TamaguiElement,
   ThemeableProps,
+  createStyledContext,
   getVariableValue,
   isRSC,
   spacedChildren,
@@ -18,14 +17,14 @@ import {
   useProps,
   withStaticProperties,
 } from '@tamagui/web'
-import {
-  FunctionComponent,
-  forwardRef,
-  useCallback,
-  useContext,
-  useEffect,
-  useState,
-} from 'react'
+import { FunctionComponent, useContext } from 'react'
+
+export const ButtonContext = createStyledContext<{
+  size: SizeTokens
+  color?: ColorStyleProp
+}>({
+  size: '$true',
+})
 
 type ButtonIconProps = { color?: string; size?: number }
 type IconProp = JSX.Element | FunctionComponent<ButtonIconProps> | null
@@ -66,6 +65,7 @@ const BUTTON_NAME = 'Button'
 const ButtonFrame = styled(ThemeableStack, {
   name: BUTTON_NAME,
   tag: 'button',
+  context: ButtonContext,
   focusable: true,
 
   variants: {
@@ -81,18 +81,13 @@ const ButtonFrame = styled(ThemeableStack, {
         pressTheme: true,
         backgrounded: true,
         borderWidth: 1,
-        borderColor: 'transparent',
+        borderColor: '$borderColor',
 
         pressStyle: {
-          borderColor: 'transparent',
-        },
-
-        hoverStyle: {
-          borderColor: 'transparent',
+          borderColor: '$borderColorPress',
         },
 
         focusStyle: {
-          borderColor: '$borderColorFocus',
           outlineColor: '$borderColorFocus',
           outlineStyle: 'solid',
           outlineWidth: 2,
@@ -124,9 +119,9 @@ const ButtonFrame = styled(ThemeableStack, {
   },
 })
 
-const BUTTON_TEXT_NAME = 'ButtonText'
-const ButtonTextFrame = styled(SizableText, {
-  name: BUTTON_TEXT_NAME,
+const ButtonText = styled(SizableText, {
+  name: 'ButtonText',
+  context: ButtonContext,
 
   variants: {
     unstyled: {
@@ -147,82 +142,22 @@ const ButtonTextFrame = styled(SizableText, {
   },
 })
 
-type ScopedProps<P> = P & { __scopeButton?: Scope }
-const [createButtonContext, createButtonScope] = createContextScope('Button')
-
-type ButtonContextValue = {
-  size: SizeTokens
-  color: ColorProp
-
-  // used to keep backward compat with the new Button.Text api
-  hasTextComponent: boolean
-  registerButtonText: () => () => void
-}
-
-const [ButtonProvider, useButtonContext] =
-  createButtonContext<ButtonContextValue>('Button')
-
-const ButtonTextComponent = ButtonTextFrame.extractable(
-  forwardRef<TamaguiElement, ScopedProps<GetProps<typeof ButtonTextFrame>>>(
-    (props, ref) => {
-      const context = useButtonContext(BUTTON_TEXT_NAME, props.__scopeButton)
-
-      useEffect(() => {
-        const unregister = context.registerButtonText()
-        return () => unregister()
-      }, [context.registerButtonText])
-
-      return <ButtonTextFrame size={props.size ?? context.size} {...props} ref={ref} />
-    }
-  )
-)
-
-const BUTTON_ICON_NAME = 'ButtonIcon'
-
-const ButtonIcon = (
-  props: ScopedProps<{
-    children: React.ReactNode
-    scaleIcon?: number
-  }>
-) => {
+const ButtonIcon = (props: { children: React.ReactNode; scaleIcon?: number }) => {
   const { children, scaleIcon = 1 } = props
-  const context = useButtonContext(BUTTON_ICON_NAME, props.__scopeButton)
-
-  const size = context.size
-  const color = context.color
-
+  const { size, color } = useContext(ButtonContext)
   const iconSize = (typeof size === 'number' ? size * 0.5 : getFontSize(size)) * scaleIcon
   const getThemedIcon = useGetThemedIcon({ size: iconSize, color })
   return getThemedIcon(children)
 }
 
-const ButtonComponent = ButtonFrame.styleable<ScopedProps<ButtonProps>>(function Button(
-  props,
-  ref
-) {
+const ButtonComponent = ButtonFrame.styleable<ButtonProps>(function Button(props, ref) {
   const { props: buttonProps } = useButton(props)
-  const [buttonTextCount, setButtonTextCount] = useState(0)
-
-  const registerButtonText = useCallback(() => {
-    setButtonTextCount((prev) => prev + 1)
-    return () => setButtonTextCount((prev) => prev - 1)
-  }, [setButtonTextCount])
-
-  const hasTextComponent = buttonTextCount > 0
-
-  return (
-    <ButtonProvider
-      scope={props.__scopeButton}
-      color={props.color}
-      hasTextComponent={hasTextComponent}
-      size={props.size ?? '$true'}
-      registerButtonText={registerButtonText}
-    >
-      <ButtonFrame {...(hasTextComponent ? props : buttonProps)} ref={ref} />
-    </ButtonProvider>
-  )
+  return <ButtonFrame {...buttonProps} ref={ref} />
 })
 
+/**
+ * @deprecated Instead of useButton, see the Button docs for the newer and much improved Advanced customization pattern: https://tamagui.dev/docs/components/button
+ */
 const buttonStaticConfig = {
   inlineProps: new Set([
     // text props go here (can't really optimize them, but we never fully extract button anyway)
@@ -239,13 +174,16 @@ const buttonStaticConfig = {
 }
 
 const Button = withStaticProperties(ButtonComponent, {
-  Text: ButtonTextComponent,
+  Text: ButtonText,
   Icon: ButtonIcon,
 })
 
+/**
+ * @deprecated Instead of useButton, see the Button docs for the newer and much improved Advanced customization pattern: https://tamagui.dev/docs/components/button
+ */
 function useButton(
   propsIn: ButtonProps,
-  { Text = ButtonTextFrame }: { Text: any } = { Text: ButtonTextFrame }
+  { Text = ButtonText }: { Text: any } = { Text: ButtonText }
 ) {
   // careful not to desctructure and re-order props, order is important
   const {
@@ -284,12 +222,13 @@ function useButton(
   const contents = wrapChildrenInText(
     Text,
     propsActive,
-    Text === ButtonTextFrame && hasUnstyled
+    Text === ButtonText && hasUnstyled
       ? {
           unstyled: propsIn.unstyled,
         }
       : undefined
   )
+
   const inner = spacedChildren({
     // a bit arbitrary but scaling to font size is necessary so long as button does
     space: spaceSize,
@@ -338,14 +277,13 @@ function useButton(
 }
 
 export {
-  createButtonScope,
   Button,
+  ButtonFrame,
+  ButtonText,
+  ButtonIcon,
 
-  // legacy api
+  // legacy
   useButton,
   buttonStaticConfig,
-  ButtonFrame,
-  ButtonTextFrame as ButtonText,
 }
-
 export type { ButtonProps }