@tamagui/text 2.7.7 → 3.0.0-beta.1091.1

package/src/Headings.tsx

@@ -5,23 +5,23 @@ import { Paragraph } from './Paragraph'
 
 export const Heading = styled(Paragraph, {
   render: 'span',
-  name: 'Heading',
+  displayName: 'Heading',
   role: 'heading',
-  fontFamily: '$heading',
-  size: '$8',
+  fontFamily: 'heading',
   margin: 0,
+  size: '8',
 })
 
 export type HeadingProps = GetProps<typeof Heading>
 
 export const H1 = styled(Heading, {
-  name: 'H1',
+  displayName: 'H1',
   render: 'h1',
 
   variants: {
     unstyled: {
       false: {
-        size: '$10',
+        size: '10',
       },
     },
   } as const,
@@ -32,13 +32,13 @@ export const H1 = styled(Heading, {
 })
 
 export const H2 = styled(Heading, {
-  name: 'H2',
+  displayName: 'H2',
   render: 'h2',
 
   variants: {
     unstyled: {
       false: {
-        size: '$9',
+        size: '9',
       },
     },
   } as const,
@@ -49,13 +49,13 @@ export const H2 = styled(Heading, {
 })
 
 export const H3 = styled(Heading, {
-  name: 'H3',
+  displayName: 'H3',
   render: 'h3',
 
   variants: {
     unstyled: {
       false: {
-        size: '$8',
+        size: '8',
       },
     },
   } as const,
@@ -66,13 +66,13 @@ export const H3 = styled(Heading, {
 })
 
 export const H4 = styled(Heading, {
-  name: 'H4',
+  displayName: 'H4',
   render: 'h4',
 
   variants: {
     unstyled: {
       false: {
-        size: '$7',
+        size: '7',
       },
     },
   } as const,
@@ -83,13 +83,13 @@ export const H4 = styled(Heading, {
 })
 
 export const H5 = styled(Heading, {
-  name: 'H5',
+  displayName: 'H5',
   render: 'h5',
 
   variants: {
     unstyled: {
       false: {
-        size: '$6',
+        size: '6',
       },
     },
   } as const,
@@ -100,13 +100,13 @@ export const H5 = styled(Heading, {
 })
 
 export const H6 = styled(Heading, {
-  name: 'H6',
+  displayName: 'H6',
   render: 'h6',
 
   variants: {
     unstyled: {
       false: {
-        size: '$5',
+        size: '5',
       },
     },
   } as const,

package/src/Paragraph.tsx

@@ -4,12 +4,13 @@ import { styled } from '@tamagui/web'
 import { SizableText } from './SizableText'
 
 export const Paragraph = styled(SizableText, {
-  name: 'Paragraph',
+  displayName: 'Paragraph',
+  className: 'tm-paragraph',
   render: 'p',
   userSelect: 'auto',
-  color: '$color',
-  size: '$true',
+  color: 'color',
   whiteSpace: 'normal',
+  size: true,
 })
 
 export type ParagraphProps = GetProps<typeof Paragraph>

package/src/SizableText.tsx

@@ -2,24 +2,42 @@ import { getFontSized } from '@tamagui/get-font-sized'
 import type { GetProps } from '@tamagui/web'
 import { Text, styled } from '@tamagui/web'
 
-export const SizableText = styled(Text, {
-  name: 'SizableText',
-  fontFamily: '$body',
-
+const SizableTextFrame = styled(Text, {
+  displayName: 'SizableText',
+  fontFamily: 'body',
+  color: 'color',
+  size: true,
   variants: {
-    unstyled: {
-      false: {
-        size: '$true',
-        color: '$color',
-      },
-    },
-
     size: getFontSized,
   },
+})
 
-  defaultVariants: {
-    unstyled: process.env.TAMAGUI_HEADLESS === '1',
-  },
+export const SizableText = SizableTextFrame.resolve((props, env) => {
+  if (props.fontFamily === 'inherit') {
+    return { fontFamily: 'inherit' }
+  }
+
+  // This replaces the old `fontFamily: { any: ... }` variant. Only an
+  // authored fontFamily prop triggered that variant; running it for the
+  // component's inherited base family would let this resolver overwrite a
+  // later variant's size (for example H1's unstyled=false -> size=10).
+  if (props.fontFamily === undefined) {
+    return {}
+  }
+
+  const size =
+    props.size === true && props.fontSize ? props.fontSize : (props.size ?? true)
+  const sized = getFontSized(size as any, env)
+  return {
+    color: sized?.color,
+    fontFamily: sized?.fontFamily,
+    fontSize: sized?.fontSize,
+    fontStyle: sized?.fontStyle,
+    fontWeight: sized?.fontWeight,
+    letterSpacing: sized?.letterSpacing,
+    lineHeight: sized?.lineHeight,
+    textTransform: sized?.textTransform,
+  }
 })
 
 SizableText.staticConfig.inlineProps = new Set([
@@ -27,23 +45,4 @@ SizableText.staticConfig.inlineProps = new Set([
   'maxFontSizeMultiplier',
 ])
 
-// we are doing weird stuff to avoid bad types
-// TODO make this just work
-SizableText.staticConfig.variants!.fontFamily = {
-  '...': (val, extras) => {
-    // pass through inherit directly without font variant expansion
-    if (val === 'inherit') {
-      return { fontFamily: 'inherit' }
-    }
-
-    const sizeProp = extras.props['size']
-    const fontSizeProp = extras.props['fontSize']
-    const size =
-      sizeProp === '$true' && fontSizeProp
-        ? fontSizeProp
-        : extras.props['size'] || '$true'
-    return getFontSized(size, extras)
-  },
-}
-
 export type SizableTextProps = GetProps<typeof SizableText>

package/src/types.ts

@@ -1,5 +1,22 @@
+import {
+  stylePropsTextOnly,
+  type Shorthands,
+  type TextStyle,
+  type TextStylePropsBase,
+  type WithShorthands,
+} from '@tamagui/web'
+
 import type { SizableTextProps } from './SizableText'
 
+export const textParentProps = {
+  ...stylePropsTextOnly,
+  ellipsis: true,
+  maxFontSizeMultiplier: true,
+  noTextWrap: true,
+  numberOfLines: true,
+  textProps: true,
+} as const
+
 export type TextContextStyles = {
   color?: SizableTextProps['color']
   fontWeight?: SizableTextProps['fontWeight']
@@ -12,8 +29,16 @@ export type TextContextStyles = {
   maxFontSizeMultiplier?: number
 }
 
-export type TextParentStyles = TextContextStyles & {
-  // all the other text controls
-  textProps?: Partial<SizableTextProps>
-  noTextWrap?: boolean
-}
+type TextParentStyleKeys = Extract<keyof TextStylePropsBase, keyof typeof textParentProps>
+
+type TextParentStyleProps = Partial<Pick<TextStyle, TextParentStyleKeys>>
+type TextParentShorthandKeys = {
+  [Key in keyof Shorthands]: Shorthands[Key] extends TextParentStyleKeys ? Key : never
+}[keyof Shorthands]
+
+export type TextParentStyles = TextParentStyleProps &
+  Pick<WithShorthands<TextParentStyleProps>, TextParentShorthandKeys> & {
+    maxFontSizeMultiplier?: number
+    textProps?: Partial<SizableTextProps>
+    noTextWrap?: boolean
+  }

package/src/wrapChildrenInText.tsx

@@ -5,14 +5,12 @@ import type { TextParentStyles } from './types'
 
 type Props = TextParentStyles & {
   children?: React.ReactNode
-  size?: SizeTokens
+  size?: SizeTokens | true
 }
 
 export function wrapChildrenInText(
   TextComponent: any,
-  propsIn: Props & {
-    unstyled?: boolean
-  },
+  propsIn: Props & {},
   extraProps?: Record<string, any>
 ) {
   const {
@@ -51,14 +49,37 @@ export function wrapChildrenInText(
   if (ellipsis !== undefined) props.ellipsis = ellipsis
   if (maxFontSizeMultiplier != null) props.maxFontSizeMultiplier = maxFontSizeMultiplier
 
-  return React.Children.toArray(children).map((child, index) => {
-    return typeof child === 'string' ? (
-      // so "data-disable-theme" is a hack to fix themeInverse, don't ask me why
-      <TextComponent key={index} {...props} {...textProps}>
-        {child}
+  // adjacent text children are joined into ONE TextComponent. `<Button>hi {name}</Button>`
+  // is two children ('hi ', name), and wrapping each separately renders them as sibling
+  // text nodes: they lay out with a gap, ellipsis/wrapping applies per fragment instead of
+  // to the whole string, and assistive tech (plus native test matchers) sees fragments
+  // rather than one label. Numbers count as text too — leaving them unwrapped throws
+  // "Text strings must be rendered within a <Text>" on native.
+  const out: React.ReactNode[] = []
+  let run: (string | number)[] = []
+  let runKey = 0
+
+  const flushRun = () => {
+    if (!run.length) return
+    out.push(
+      // data-disable-theme keeps wrapped text from adding another theme boundary
+      <TextComponent key={`text-${runKey}`} {...props} {...textProps}>
+        {run.length === 1 ? run[0] : run.join('')}
       </TextComponent>
-    ) : (
-      child
     )
+    run = []
+  }
+
+  React.Children.toArray(children).forEach((child, index) => {
+    if (typeof child === 'string' || typeof child === 'number') {
+      if (!run.length) runKey = index
+      run.push(child)
+      return
+    }
+    flushRun()
+    out.push(child)
   })
+  flushRun()
+
+  return out
 }

package/types/Emphasis.d.ts

@@ -1,4 +1,16 @@
-export declare const Strong: import("@tamagui/web").TamaguiComponent<import("@tamagui/web").TamaDefer, import("@tamagui/web").TamaguiTextElement, import("@tamagui/web").TextNonStyleProps, import("@tamagui/web").TextStylePropsBase, {}, import("@tamagui/web").StaticConfigPublic>;
-export declare const Span: import("@tamagui/web").TamaguiComponent<import("@tamagui/web").TamaDefer, import("@tamagui/web").TamaguiTextElement, import("@tamagui/web").TextNonStyleProps, import("@tamagui/web").TextStylePropsBase, {}, import("@tamagui/web").StaticConfigPublic>;
-export declare const Em: import("@tamagui/web").TamaguiComponent<import("@tamagui/web").TamaDefer, import("@tamagui/web").TamaguiTextElement, import("@tamagui/web").TextNonStyleProps, import("@tamagui/web").TextStylePropsBase, {}, import("@tamagui/web").StaticConfigPublic>;
+export declare const Strong: import("react").FunctionComponent<Omit<import("@tamagui/web").TextNonStyleProps, keyof import("@tamagui/web").TextStylePropsBase> & import("@tamagui/web").WithThemeValues<import("@tamagui/web").TextStylePropsBase> & import("@tamagui/web").WithFlatVariantValues<{}> & import("@tamagui/web").WithShorthands<import("@tamagui/web").WithThemeValues<import("@tamagui/web").TextStylePropsBase>> & {
+    ref?: import("react").Ref<import("@tamagui/web").TamaguiTextElement> | undefined;
+}> & import("@tamagui/web").StaticComponentObject<import("@tamagui/web").TamaDefer, import("@tamagui/web").TamaguiTextElement, import("@tamagui/web").TextNonStyleProps, import("@tamagui/web").TextStylePropsBase, {}, import("@tamagui/web").StaticConfigPublic> & Omit<import("@tamagui/web").StaticConfigPublic, "staticConfig"> & {
+    __tama: [import("@tamagui/web").TamaDefer, import("@tamagui/web").TamaguiTextElement, import("@tamagui/web").TextNonStyleProps, import("@tamagui/web").TextStylePropsBase, {}, import("@tamagui/web").StaticConfigPublic];
+};
+export declare const Span: import("react").FunctionComponent<Omit<import("@tamagui/web").TextNonStyleProps, keyof import("@tamagui/web").TextStylePropsBase> & import("@tamagui/web").WithThemeValues<import("@tamagui/web").TextStylePropsBase> & import("@tamagui/web").WithFlatVariantValues<{}> & import("@tamagui/web").WithShorthands<import("@tamagui/web").WithThemeValues<import("@tamagui/web").TextStylePropsBase>> & {
+    ref?: import("react").Ref<import("@tamagui/web").TamaguiTextElement> | undefined;
+}> & import("@tamagui/web").StaticComponentObject<import("@tamagui/web").TamaDefer, import("@tamagui/web").TamaguiTextElement, import("@tamagui/web").TextNonStyleProps, import("@tamagui/web").TextStylePropsBase, {}, import("@tamagui/web").StaticConfigPublic> & Omit<import("@tamagui/web").StaticConfigPublic, "staticConfig"> & {
+    __tama: [import("@tamagui/web").TamaDefer, import("@tamagui/web").TamaguiTextElement, import("@tamagui/web").TextNonStyleProps, import("@tamagui/web").TextStylePropsBase, {}, import("@tamagui/web").StaticConfigPublic];
+};
+export declare const Em: import("react").FunctionComponent<Omit<import("@tamagui/web").TextNonStyleProps, keyof import("@tamagui/web").TextStylePropsBase> & import("@tamagui/web").WithThemeValues<import("@tamagui/web").TextStylePropsBase> & import("@tamagui/web").WithFlatVariantValues<{}> & import("@tamagui/web").WithShorthands<import("@tamagui/web").WithThemeValues<import("@tamagui/web").TextStylePropsBase>> & {
+    ref?: import("react").Ref<import("@tamagui/web").TamaguiTextElement> | undefined;
+}> & import("@tamagui/web").StaticComponentObject<import("@tamagui/web").TamaDefer, import("@tamagui/web").TamaguiTextElement, import("@tamagui/web").TextNonStyleProps, import("@tamagui/web").TextStylePropsBase, {}, import("@tamagui/web").StaticConfigPublic> & Omit<import("@tamagui/web").StaticConfigPublic, "staticConfig"> & {
+    __tama: [import("@tamagui/web").TamaDefer, import("@tamagui/web").TamaguiTextElement, import("@tamagui/web").TextNonStyleProps, import("@tamagui/web").TextStylePropsBase, {}, import("@tamagui/web").StaticConfigPublic];
+};
 //# sourceMappingURL=Emphasis.d.ts.map

package/types/Emphasis.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Emphasis.d.ts","sourceRoot":"","sources":["../src/Emphasis.tsx"],"names":[],"mappings":"AAEA,eAAO,MAAM,MAAM,0PAGjB,CAAA;AAEF,eAAO,MAAM,IAAI,0PAEf,CAAA;AAEF,eAAO,MAAM,EAAE,0PAGb,CAAA"}
+{"version":3,"file":"Emphasis.d.ts","sourceRoot":"","sources":["../src/Emphasis.tsx"],"names":[],"mappings":"AAEA,eAAO,MAAM,MAAM;;;;CAGjB,CAAA;AAEF,eAAO,MAAM,IAAI;;;;CAEf,CAAA;AAEF,eAAO,MAAM,EAAE;;;;CAGb,CAAA"}

package/types/Headings.d.ts

@@ -1,31 +1,98 @@
 import type { GetProps } from '@tamagui/web';
-export declare const Heading: import("@tamagui/web").TamaguiComponent<import("@tamagui/web").TamaDefer, import("@tamagui/web").TamaguiTextElement, import("@tamagui/web").TextNonStyleProps, import("@tamagui/web").TextStylePropsBase, {
-    unstyled?: boolean | undefined;
-    size?: import("@tamagui/web").FontSizeTokens | undefined;
-}, import("@tamagui/web").StaticConfigPublic>;
+export declare const Heading: import("react").FunctionComponent<Omit<import("@tamagui/web").TextNonStyleProps, "size" | keyof import("@tamagui/web").TextStylePropsBase> & import("@tamagui/web").WithThemeValues<import("@tamagui/web").TextStylePropsBase> & import("@tamagui/web").WithFlatVariantValues<{
+    size?: import("@tamagui/web").FontSize | undefined;
+}> & import("@tamagui/web").WithShorthands<import("@tamagui/web").WithThemeValues<import("@tamagui/web").TextStylePropsBase>> & {
+    ref?: import("react").Ref<import("@tamagui/web").TamaguiTextElement> | undefined;
+}> & import("@tamagui/web").StaticComponentObject<import("@tamagui/web").TamaDefer, import("@tamagui/web").TamaguiTextElement, import("@tamagui/web").TextNonStyleProps, import("@tamagui/web").TextStylePropsBase, {
+    size?: import("@tamagui/web").FontSize | undefined;
+}, import("@tamagui/web").StaticConfigPublic> & Omit<import("@tamagui/web").StaticConfigPublic, "staticConfig"> & {
+    __tama: [import("@tamagui/web").TamaDefer, import("@tamagui/web").TamaguiTextElement, import("@tamagui/web").TextNonStyleProps, import("@tamagui/web").TextStylePropsBase, {
+        size?: import("@tamagui/web").FontSize | undefined;
+    }, import("@tamagui/web").StaticConfigPublic];
+};
 export type HeadingProps = GetProps<typeof Heading>;
-export declare const H1: import("@tamagui/web").TamaguiComponent<import("@tamagui/web").TamaDefer, import("@tamagui/web").TamaguiTextElement, import("@tamagui/web").TextNonStyleProps, import("@tamagui/web").TextStylePropsBase, {
+export declare const H1: import("react").FunctionComponent<Omit<import("@tamagui/web").TextNonStyleProps, "size" | "unstyled" | keyof import("@tamagui/web").TextStylePropsBase> & import("@tamagui/web").WithThemeValues<import("@tamagui/web").TextStylePropsBase> & import("@tamagui/web").WithFlatVariantValues<{
+    size?: import("@tamagui/web").FontSize | undefined;
+    unstyled?: boolean | undefined;
+}> & import("@tamagui/web").WithShorthands<import("@tamagui/web").WithThemeValues<import("@tamagui/web").TextStylePropsBase>> & {
+    ref?: import("react").Ref<import("@tamagui/web").TamaguiTextElement> | undefined;
+}> & import("@tamagui/web").StaticComponentObject<import("@tamagui/web").TamaDefer, import("@tamagui/web").TamaguiTextElement, import("@tamagui/web").TextNonStyleProps, import("@tamagui/web").TextStylePropsBase, {
+    size?: import("@tamagui/web").FontSize | undefined;
+    unstyled?: boolean | undefined;
+}, import("@tamagui/web").StaticConfigPublic> & Omit<import("@tamagui/web").StaticConfigPublic, "staticConfig"> & {
+    __tama: [import("@tamagui/web").TamaDefer, import("@tamagui/web").TamaguiTextElement, import("@tamagui/web").TextNonStyleProps, import("@tamagui/web").TextStylePropsBase, {
+        size?: import("@tamagui/web").FontSize | undefined;
+        unstyled?: boolean | undefined;
+    }, import("@tamagui/web").StaticConfigPublic];
+};
+export declare const H2: import("react").FunctionComponent<Omit<import("@tamagui/web").TextNonStyleProps, "size" | "unstyled" | keyof import("@tamagui/web").TextStylePropsBase> & import("@tamagui/web").WithThemeValues<import("@tamagui/web").TextStylePropsBase> & import("@tamagui/web").WithFlatVariantValues<{
+    size?: import("@tamagui/web").FontSize | undefined;
+    unstyled?: boolean | undefined;
+}> & import("@tamagui/web").WithShorthands<import("@tamagui/web").WithThemeValues<import("@tamagui/web").TextStylePropsBase>> & {
+    ref?: import("react").Ref<import("@tamagui/web").TamaguiTextElement> | undefined;
+}> & import("@tamagui/web").StaticComponentObject<import("@tamagui/web").TamaDefer, import("@tamagui/web").TamaguiTextElement, import("@tamagui/web").TextNonStyleProps, import("@tamagui/web").TextStylePropsBase, {
+    size?: import("@tamagui/web").FontSize | undefined;
+    unstyled?: boolean | undefined;
+}, import("@tamagui/web").StaticConfigPublic> & Omit<import("@tamagui/web").StaticConfigPublic, "staticConfig"> & {
+    __tama: [import("@tamagui/web").TamaDefer, import("@tamagui/web").TamaguiTextElement, import("@tamagui/web").TextNonStyleProps, import("@tamagui/web").TextStylePropsBase, {
+        size?: import("@tamagui/web").FontSize | undefined;
+        unstyled?: boolean | undefined;
+    }, import("@tamagui/web").StaticConfigPublic];
+};
+export declare const H3: import("react").FunctionComponent<Omit<import("@tamagui/web").TextNonStyleProps, "size" | "unstyled" | keyof import("@tamagui/web").TextStylePropsBase> & import("@tamagui/web").WithThemeValues<import("@tamagui/web").TextStylePropsBase> & import("@tamagui/web").WithFlatVariantValues<{
+    size?: import("@tamagui/web").FontSize | undefined;
+    unstyled?: boolean | undefined;
+}> & import("@tamagui/web").WithShorthands<import("@tamagui/web").WithThemeValues<import("@tamagui/web").TextStylePropsBase>> & {
+    ref?: import("react").Ref<import("@tamagui/web").TamaguiTextElement> | undefined;
+}> & import("@tamagui/web").StaticComponentObject<import("@tamagui/web").TamaDefer, import("@tamagui/web").TamaguiTextElement, import("@tamagui/web").TextNonStyleProps, import("@tamagui/web").TextStylePropsBase, {
+    size?: import("@tamagui/web").FontSize | undefined;
+    unstyled?: boolean | undefined;
+}, import("@tamagui/web").StaticConfigPublic> & Omit<import("@tamagui/web").StaticConfigPublic, "staticConfig"> & {
+    __tama: [import("@tamagui/web").TamaDefer, import("@tamagui/web").TamaguiTextElement, import("@tamagui/web").TextNonStyleProps, import("@tamagui/web").TextStylePropsBase, {
+        size?: import("@tamagui/web").FontSize | undefined;
+        unstyled?: boolean | undefined;
+    }, import("@tamagui/web").StaticConfigPublic];
+};
+export declare const H4: import("react").FunctionComponent<Omit<import("@tamagui/web").TextNonStyleProps, "size" | "unstyled" | keyof import("@tamagui/web").TextStylePropsBase> & import("@tamagui/web").WithThemeValues<import("@tamagui/web").TextStylePropsBase> & import("@tamagui/web").WithFlatVariantValues<{
+    size?: import("@tamagui/web").FontSize | undefined;
     unstyled?: boolean | undefined;
-    size?: import("@tamagui/web").FontSizeTokens | undefined;
-}, import("@tamagui/web").StaticConfigPublic>;
-export declare const H2: import("@tamagui/web").TamaguiComponent<import("@tamagui/web").TamaDefer, import("@tamagui/web").TamaguiTextElement, import("@tamagui/web").TextNonStyleProps, import("@tamagui/web").TextStylePropsBase, {
+}> & import("@tamagui/web").WithShorthands<import("@tamagui/web").WithThemeValues<import("@tamagui/web").TextStylePropsBase>> & {
+    ref?: import("react").Ref<import("@tamagui/web").TamaguiTextElement> | undefined;
+}> & import("@tamagui/web").StaticComponentObject<import("@tamagui/web").TamaDefer, import("@tamagui/web").TamaguiTextElement, import("@tamagui/web").TextNonStyleProps, import("@tamagui/web").TextStylePropsBase, {
+    size?: import("@tamagui/web").FontSize | undefined;
     unstyled?: boolean | undefined;
-    size?: import("@tamagui/web").FontSizeTokens | undefined;
-}, import("@tamagui/web").StaticConfigPublic>;
-export declare const H3: import("@tamagui/web").TamaguiComponent<import("@tamagui/web").TamaDefer, import("@tamagui/web").TamaguiTextElement, import("@tamagui/web").TextNonStyleProps, import("@tamagui/web").TextStylePropsBase, {
+}, import("@tamagui/web").StaticConfigPublic> & Omit<import("@tamagui/web").StaticConfigPublic, "staticConfig"> & {
+    __tama: [import("@tamagui/web").TamaDefer, import("@tamagui/web").TamaguiTextElement, import("@tamagui/web").TextNonStyleProps, import("@tamagui/web").TextStylePropsBase, {
+        size?: import("@tamagui/web").FontSize | undefined;
+        unstyled?: boolean | undefined;
+    }, import("@tamagui/web").StaticConfigPublic];
+};
+export declare const H5: import("react").FunctionComponent<Omit<import("@tamagui/web").TextNonStyleProps, "size" | "unstyled" | keyof import("@tamagui/web").TextStylePropsBase> & import("@tamagui/web").WithThemeValues<import("@tamagui/web").TextStylePropsBase> & import("@tamagui/web").WithFlatVariantValues<{
+    size?: import("@tamagui/web").FontSize | undefined;
     unstyled?: boolean | undefined;
-    size?: import("@tamagui/web").FontSizeTokens | undefined;
-}, import("@tamagui/web").StaticConfigPublic>;
-export declare const H4: import("@tamagui/web").TamaguiComponent<import("@tamagui/web").TamaDefer, import("@tamagui/web").TamaguiTextElement, import("@tamagui/web").TextNonStyleProps, import("@tamagui/web").TextStylePropsBase, {
+}> & import("@tamagui/web").WithShorthands<import("@tamagui/web").WithThemeValues<import("@tamagui/web").TextStylePropsBase>> & {
+    ref?: import("react").Ref<import("@tamagui/web").TamaguiTextElement> | undefined;
+}> & import("@tamagui/web").StaticComponentObject<import("@tamagui/web").TamaDefer, import("@tamagui/web").TamaguiTextElement, import("@tamagui/web").TextNonStyleProps, import("@tamagui/web").TextStylePropsBase, {
+    size?: import("@tamagui/web").FontSize | undefined;
     unstyled?: boolean | undefined;
-    size?: import("@tamagui/web").FontSizeTokens | undefined;
-}, import("@tamagui/web").StaticConfigPublic>;
-export declare const H5: import("@tamagui/web").TamaguiComponent<import("@tamagui/web").TamaDefer, import("@tamagui/web").TamaguiTextElement, import("@tamagui/web").TextNonStyleProps, import("@tamagui/web").TextStylePropsBase, {
+}, import("@tamagui/web").StaticConfigPublic> & Omit<import("@tamagui/web").StaticConfigPublic, "staticConfig"> & {
+    __tama: [import("@tamagui/web").TamaDefer, import("@tamagui/web").TamaguiTextElement, import("@tamagui/web").TextNonStyleProps, import("@tamagui/web").TextStylePropsBase, {
+        size?: import("@tamagui/web").FontSize | undefined;
+        unstyled?: boolean | undefined;
+    }, import("@tamagui/web").StaticConfigPublic];
+};
+export declare const H6: import("react").FunctionComponent<Omit<import("@tamagui/web").TextNonStyleProps, "size" | "unstyled" | keyof import("@tamagui/web").TextStylePropsBase> & import("@tamagui/web").WithThemeValues<import("@tamagui/web").TextStylePropsBase> & import("@tamagui/web").WithFlatVariantValues<{
+    size?: import("@tamagui/web").FontSize | undefined;
     unstyled?: boolean | undefined;
-    size?: import("@tamagui/web").FontSizeTokens | undefined;
-}, import("@tamagui/web").StaticConfigPublic>;
-export declare const H6: import("@tamagui/web").TamaguiComponent<import("@tamagui/web").TamaDefer, import("@tamagui/web").TamaguiTextElement, import("@tamagui/web").TextNonStyleProps, import("@tamagui/web").TextStylePropsBase, {
+}> & import("@tamagui/web").WithShorthands<import("@tamagui/web").WithThemeValues<import("@tamagui/web").TextStylePropsBase>> & {
+    ref?: import("react").Ref<import("@tamagui/web").TamaguiTextElement> | undefined;
+}> & import("@tamagui/web").StaticComponentObject<import("@tamagui/web").TamaDefer, import("@tamagui/web").TamaguiTextElement, import("@tamagui/web").TextNonStyleProps, import("@tamagui/web").TextStylePropsBase, {
+    size?: import("@tamagui/web").FontSize | undefined;
     unstyled?: boolean | undefined;
-    size?: import("@tamagui/web").FontSizeTokens | undefined;
-}, import("@tamagui/web").StaticConfigPublic>;
+}, import("@tamagui/web").StaticConfigPublic> & Omit<import("@tamagui/web").StaticConfigPublic, "staticConfig"> & {
+    __tama: [import("@tamagui/web").TamaDefer, import("@tamagui/web").TamaguiTextElement, import("@tamagui/web").TextNonStyleProps, import("@tamagui/web").TextStylePropsBase, {
+        size?: import("@tamagui/web").FontSize | undefined;
+        unstyled?: boolean | undefined;
+    }, import("@tamagui/web").StaticConfigPublic];
+};
 //# sourceMappingURL=Headings.d.ts.map

package/types/Headings.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Headings.d.ts","sourceRoot":"","sources":["../src/Headings.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;AAK5C,eAAO,MAAM,OAAO;;;6CAOlB,CAAA;AAEF,MAAM,MAAM,YAAY,GAAG,QAAQ,CAAC,OAAO,OAAO,CAAC,CAAA;AAEnD,eAAO,MAAM,EAAE;;;6CAeb,CAAA;AAEF,eAAO,MAAM,EAAE;;;6CAeb,CAAA;AAEF,eAAO,MAAM,EAAE;;;6CAeb,CAAA;AAEF,eAAO,MAAM,EAAE;;;6CAeb,CAAA;AAEF,eAAO,MAAM,EAAE;;;6CAeb,CAAA;AAEF,eAAO,MAAM,EAAE;;;6CAeb,CAAA"}
+{"version":3,"file":"Headings.d.ts","sourceRoot":"","sources":["../src/Headings.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;AAK5C,eAAO,MAAM,OAAO;;;;;;;;;;CAOlB,CAAA;AAEF,MAAM,MAAM,YAAY,GAAG,QAAQ,CAAC,OAAO,OAAO,CAAC,CAAA;AAEnD,eAAO,MAAM,EAAE;;;;;;;;;;;;;CAeb,CAAA;AAEF,eAAO,MAAM,EAAE;;;;;;;;;;;;;CAeb,CAAA;AAEF,eAAO,MAAM,EAAE;;;;;;;;;;;;;CAeb,CAAA;AAEF,eAAO,MAAM,EAAE;;;;;;;;;;;;;CAeb,CAAA;AAEF,eAAO,MAAM,EAAE;;;;;;;;;;;;;CAeb,CAAA;AAEF,eAAO,MAAM,EAAE;;;;;;;;;;;;;CAeb,CAAA"}

package/types/Paragraph.d.ts

@@ -1,7 +1,14 @@
 import type { GetProps } from '@tamagui/web';
-export declare const Paragraph: import("@tamagui/web").TamaguiComponent<import("@tamagui/web").TamaDefer, import("@tamagui/web").TamaguiTextElement, import("@tamagui/web").TextNonStyleProps, import("@tamagui/web").TextStylePropsBase, {
-    unstyled?: boolean | undefined;
-    size?: import("@tamagui/web").FontSizeTokens | undefined;
-}, import("@tamagui/web").StaticConfigPublic>;
+export declare const Paragraph: import("react").FunctionComponent<Omit<import("@tamagui/web").TextNonStyleProps, "size" | keyof import("@tamagui/web").TextStylePropsBase> & import("@tamagui/web").WithThemeValues<import("@tamagui/web").TextStylePropsBase> & import("@tamagui/web").WithFlatVariantValues<{
+    size?: import("@tamagui/web").FontSize | undefined;
+}> & import("@tamagui/web").WithShorthands<import("@tamagui/web").WithThemeValues<import("@tamagui/web").TextStylePropsBase>> & {
+    ref?: import("react").Ref<import("@tamagui/web").TamaguiTextElement> | undefined;
+}> & import("@tamagui/web").StaticComponentObject<import("@tamagui/web").TamaDefer, import("@tamagui/web").TamaguiTextElement, import("@tamagui/web").TextNonStyleProps, import("@tamagui/web").TextStylePropsBase, {
+    size?: import("@tamagui/web").FontSize | undefined;
+}, import("@tamagui/web").StaticConfigPublic> & Omit<import("@tamagui/web").StaticConfigPublic, "staticConfig"> & {
+    __tama: [import("@tamagui/web").TamaDefer, import("@tamagui/web").TamaguiTextElement, import("@tamagui/web").TextNonStyleProps, import("@tamagui/web").TextStylePropsBase, {
+        size?: import("@tamagui/web").FontSize | undefined;
+    }, import("@tamagui/web").StaticConfigPublic];
+};
 export type ParagraphProps = GetProps<typeof Paragraph>;
 //# sourceMappingURL=Paragraph.d.ts.map

package/types/Paragraph.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Paragraph.d.ts","sourceRoot":"","sources":["../src/Paragraph.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;AAK5C,eAAO,MAAM,SAAS;;;6CAOpB,CAAA;AAEF,MAAM,MAAM,cAAc,GAAG,QAAQ,CAAC,OAAO,SAAS,CAAC,CAAA"}
+{"version":3,"file":"Paragraph.d.ts","sourceRoot":"","sources":["../src/Paragraph.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;AAK5C,eAAO,MAAM,SAAS;;;;;;;;;;CAQpB,CAAA;AAEF,MAAM,MAAM,cAAc,GAAG,QAAQ,CAAC,OAAO,SAAS,CAAC,CAAA"}

package/types/SizableText.d.ts

@@ -1,7 +1,6 @@
 import type { GetProps } from '@tamagui/web';
 export declare const SizableText: import("@tamagui/web").TamaguiComponent<import("@tamagui/web").TamaDefer, import("@tamagui/web").TamaguiTextElement, import("@tamagui/web").TextNonStyleProps, import("@tamagui/web").TextStylePropsBase, {
-    unstyled?: boolean | undefined;
-    size?: import("@tamagui/web").FontSizeTokens | undefined;
+    size?: import("@tamagui/web").FontSize | undefined;
 }, import("@tamagui/web").StaticConfigPublic>;
 export type SizableTextProps = GetProps<typeof SizableText>;
 //# sourceMappingURL=SizableText.d.ts.map

package/types/SizableText.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SizableText.d.ts","sourceRoot":"","sources":["../src/SizableText.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;AAG5C,eAAO,MAAM,WAAW;;;6CAkBtB,CAAA;AA0BF,MAAM,MAAM,gBAAgB,GAAG,QAAQ,CAAC,OAAO,WAAW,CAAC,CAAA"}
+{"version":3,"file":"SizableText.d.ts","sourceRoot":"","sources":["../src/SizableText.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;AAa5C,eAAO,MAAM,WAAW;;6CA0BtB,CAAA;AAOF,MAAM,MAAM,gBAAgB,GAAG,QAAQ,CAAC,OAAO,WAAW,CAAC,CAAA"}

package/types/types.d.ts

@@ -1,4 +1,40 @@
+import { type Shorthands, type TextStyle, type TextStylePropsBase, type WithShorthands } from '@tamagui/web';
 import type { SizableTextProps } from './SizableText';
+export declare const textParentProps: {
+    readonly WebkitBoxOrient: true;
+    readonly WebkitLineClamp: true;
+    readonly color: true;
+    readonly font: true;
+    readonly fontFamily: true;
+    readonly fontSize: true;
+    readonly fontStyle: true;
+    readonly fontVariant: true;
+    readonly fontWeight: true;
+    readonly letterSpacing: true;
+    readonly lineHeight: true;
+    readonly textAlign: true;
+    readonly textDecoration: true;
+    readonly textDecorationColor: true;
+    readonly textDecorationDistance: true;
+    readonly textDecorationLine: true;
+    readonly textDecorationStyle: true;
+    readonly textOverflow: true;
+    readonly textShadow: true;
+    readonly textShadowColor: true;
+    readonly textShadowOffset: true;
+    readonly textShadowRadius: true;
+    readonly textTransform: true;
+    readonly userSelect: true;
+    readonly verticalAlign: true;
+    readonly whiteSpace: true;
+    readonly wordWrap: true;
+    readonly writingDirection: true;
+    readonly ellipsis: true;
+    readonly maxFontSizeMultiplier: true;
+    readonly noTextWrap: true;
+    readonly numberOfLines: true;
+    readonly textProps: true;
+};
 export type TextContextStyles = {
     color?: SizableTextProps['color'];
     fontWeight?: SizableTextProps['fontWeight'];
@@ -10,8 +46,15 @@ export type TextContextStyles = {
     ellipsis?: SizableTextProps['ellipsis'];
     maxFontSizeMultiplier?: number;
 };
-export type TextParentStyles = TextContextStyles & {
+type TextParentStyleKeys = Extract<keyof TextStylePropsBase, keyof typeof textParentProps>;
+type TextParentStyleProps = Partial<Pick<TextStyle, TextParentStyleKeys>>;
+type TextParentShorthandKeys = {
+    [Key in keyof Shorthands]: Shorthands[Key] extends TextParentStyleKeys ? Key : never;
+}[keyof Shorthands];
+export type TextParentStyles = TextParentStyleProps & Pick<WithShorthands<TextParentStyleProps>, TextParentShorthandKeys> & {
+    maxFontSizeMultiplier?: number;
     textProps?: Partial<SizableTextProps>;
     noTextWrap?: boolean;
 };
+export {};
 //# sourceMappingURL=types.d.ts.map

package/types/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAA;AAErD,MAAM,MAAM,iBAAiB,GAAG;IAC9B,KAAK,CAAC,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAA;IACjC,UAAU,CAAC,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAA;IAC3C,QAAQ,CAAC,EAAE,gBAAgB,CAAC,UAAU,CAAC,CAAA;IACvC,UAAU,CAAC,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAA;IAC3C,SAAS,CAAC,EAAE,gBAAgB,CAAC,WAAW,CAAC,CAAA;IACzC,aAAa,CAAC,EAAE,gBAAgB,CAAC,eAAe,CAAC,CAAA;IACjD,SAAS,CAAC,EAAE,gBAAgB,CAAC,WAAW,CAAC,CAAA;IACzC,QAAQ,CAAC,EAAE,gBAAgB,CAAC,UAAU,CAAC,CAAA;IACvC,qBAAqB,CAAC,EAAE,MAAM,CAAA;CAC/B,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG,iBAAiB,GAAG;IAEjD,SAAS,CAAC,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAA;IACrC,UAAU,CAAC,EAAE,OAAO,CAAA;CACrB,CAAA"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,UAAU,EACf,KAAK,SAAS,EACd,KAAK,kBAAkB,EACvB,KAAK,cAAc,EACpB,MAAM,cAAc,CAAA;AAErB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAA;AAErD,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAOlB,CAAA;AAEV,MAAM,MAAM,iBAAiB,GAAG;IAC9B,KAAK,CAAC,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAA;IACjC,UAAU,CAAC,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAA;IAC3C,QAAQ,CAAC,EAAE,gBAAgB,CAAC,UAAU,CAAC,CAAA;IACvC,UAAU,CAAC,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAA;IAC3C,SAAS,CAAC,EAAE,gBAAgB,CAAC,WAAW,CAAC,CAAA;IACzC,aAAa,CAAC,EAAE,gBAAgB,CAAC,eAAe,CAAC,CAAA;IACjD,SAAS,CAAC,EAAE,gBAAgB,CAAC,WAAW,CAAC,CAAA;IACzC,QAAQ,CAAC,EAAE,gBAAgB,CAAC,UAAU,CAAC,CAAA;IACvC,qBAAqB,CAAC,EAAE,MAAM,CAAA;CAC/B,CAAA;AAED,KAAK,mBAAmB,GAAG,OAAO,CAAC,MAAM,kBAAkB,EAAE,MAAM,OAAO,eAAe,CAAC,CAAA;AAE1F,KAAK,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,mBAAmB,CAAC,CAAC,CAAA;AACzE,KAAK,uBAAuB,GAAG;KAC5B,GAAG,IAAI,MAAM,UAAU,GAAG,UAAU,CAAC,GAAG,CAAC,SAAS,mBAAmB,GAAG,GAAG,GAAG,KAAK;CACrF,CAAC,MAAM,UAAU,CAAC,CAAA;AAEnB,MAAM,MAAM,gBAAgB,GAAG,oBAAoB,GACjD,IAAI,CAAC,cAAc,CAAC,oBAAoB,CAAC,EAAE,uBAAuB,CAAC,GAAG;IACpE,qBAAqB,CAAC,EAAE,MAAM,CAAA;IAC9B,SAAS,CAAC,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAA;IACrC,UAAU,CAAC,EAAE,OAAO,CAAA;CACrB,CAAA"}

package/types/wrapChildrenInText.d.ts

@@ -3,10 +3,8 @@ import React from 'react';
 import type { TextParentStyles } from './types';
 type Props = TextParentStyles & {
     children?: React.ReactNode;
-    size?: SizeTokens;
+    size?: SizeTokens | true;
 };
-export declare function wrapChildrenInText(TextComponent: any, propsIn: Props & {
-    unstyled?: boolean;
-}, extraProps?: Record<string, any>): React.ReactNode[] | (number | bigint | Iterable<React.ReactNode> | Promise<string | number | bigint | boolean | React.ReactPortal | React.ReactElement<unknown, string | React.JSXElementConstructor<any>> | Iterable<React.ReactNode> | null | undefined> | import("react/jsx-runtime").JSX.Element)[];
+export declare function wrapChildrenInText(TextComponent: any, propsIn: Props & {}, extraProps?: Record<string, any>): React.ReactNode[];
 export {};
 //# sourceMappingURL=wrapChildrenInText.d.ts.map

package/types/wrapChildrenInText.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wrapChildrenInText.d.ts","sourceRoot":"","sources":["../src/wrapChildrenInText.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAC9C,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAA;AAE/C,KAAK,KAAK,GAAG,gBAAgB,GAAG;IAC9B,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC1B,IAAI,CAAC,EAAE,UAAU,CAAA;CAClB,CAAA;AAED,wBAAgB,kBAAkB,CAChC,aAAa,EAAE,GAAG,EAClB,OAAO,EAAE,KAAK,GAAG;IACf,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,EACD,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,2SAgDjC"}
+{"version":3,"file":"wrapChildrenInText.d.ts","sourceRoot":"","sources":["../src/wrapChildrenInText.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAC9C,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAA;AAE/C,KAAK,KAAK,GAAG,gBAAgB,GAAG;IAC9B,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC1B,IAAI,CAAC,EAAE,UAAU,GAAG,IAAI,CAAA;CACzB,CAAA;AAED,wBAAgB,kBAAkB,CAChC,aAAa,EAAE,GAAG,EAClB,OAAO,EAAE,KAAK,GAAG,EAAE,EACnB,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,qBAuEjC"}

package/dist/esm/index.js.map

@@ -1 +0,0 @@
-{"version":3,"names":[],"sources":["../../src/index.tsx"],"sourcesContent":[null],"mappings":"AAAA,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc","ignoreList":[]}

package/dist/esm/index.mjs.map

@@ -1 +0,0 @@
-{"version":3,"names":[],"sources":["../../src/index.tsx"],"sourcesContent":[null],"mappings":"AAAA,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc","ignoreList":[]}

package/dist/esm/index.native.js.map

@@ -1 +0,0 @@
-{"version":3,"names":[],"sources":["../../src/index.tsx"],"sourcesContent":[null],"mappings":"AAAA,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc","ignoreList":[]}

package/dist/jsx/index.js.map

@@ -1 +0,0 @@
-{"version":3,"names":[],"sources":["../../src/index.tsx"],"sourcesContent":[null],"mappings":"AAAA,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc","ignoreList":[]}

package/dist/jsx/index.mjs.map

@@ -1 +0,0 @@
-{"version":3,"names":[],"sources":["../../src/index.tsx"],"sourcesContent":[null],"mappings":"AAAA,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc","ignoreList":[]}