@tamagui/text 1.0.0-beta.9 → 1.0.1-beta.102

package/dist/jsx/SizableText.js

@@ -1,14 +1,17 @@
-import { Text, getTextSize, styled } from "@tamagui/core";
+import { Text, getFont, styled } from "@tamagui/core";
 const SizableText = styled(Text, {
   name: "SizableText",
   fontFamily: "$body",
   variants: {
-    size: getTextSize
+    size: getFont
   },
   defaultVariants: {
     size: "$4"
   }
+}, {
+  inlineWhenUnflattened: /* @__PURE__ */ new Set(["fontFamily"])
 });
 export {
   SizableText
 };
+//# sourceMappingURL=SizableText.js.map

package/dist/jsx/SizableText.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../src/SizableText.tsx"],
+  "sourcesContent": ["import { GetProps, Text, getFont, styled } from '@tamagui/core'\n\nexport const SizableText = styled(\n  Text,\n  {\n    name: 'SizableText',\n    fontFamily: '$body',\n\n    variants: {\n      size: getFont,\n    },\n\n    defaultVariants: {\n      size: '$4',\n    },\n  },\n  {\n    inlineWhenUnflattened: new Set(['fontFamily']),\n  }\n)\n\nexport type SizableTextProps = GetProps<typeof SizableText>\n"],
+  "mappings": "AAAA;AAEO,MAAM,cAAc,OACzB,MACA;AAAA,EACE,MAAM;AAAA,EACN,YAAY;AAAA,EAEZ,UAAU;AAAA,IACR,MAAM;AAAA,EACR;AAAA,EAEA,iBAAiB;AAAA,IACf,MAAM;AAAA,EACR;AACF,GACA;AAAA,EACE,uBAAuB,oBAAI,IAAI,CAAC,YAAY,CAAC;AAC/C,CACF;",
+  "names": []
+}

package/dist/jsx/Texts.js

@@ -0,0 +1 @@
+//# sourceMappingURL=Texts.js.map

package/dist/jsx/Texts.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": [],
+  "sourcesContent": [],
+  "mappings": "",
+  "names": []
+}

package/dist/jsx/index.js

@@ -1,2 +1,5 @@
 export * from "./SizableText";
 export * from "./Paragraph";
+export * from "./Headings";
+export * from "./wrapChildrenInText";
+//# sourceMappingURL=index.js.map

package/dist/jsx/index.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../src/index.tsx"],
+  "sourcesContent": ["export * from './SizableText'\nexport * from './Paragraph'\nexport * from './Headings'\nexport * from './wrapChildrenInText'\n"],
+  "mappings": "AAAA;AACA;AACA;AACA;",
+  "names": []
+}

package/dist/jsx/wrapChildrenInText.js

@@ -0,0 +1,61 @@
+import React from "react";
+function wrapChildrenInText(TextComponent, {
+  children,
+  textProps,
+  size,
+  noTextWrap,
+  color,
+  fontFamily,
+  fontSize,
+  fontWeight,
+  letterSpacing,
+  textAlign
+}) {
+  if (noTextWrap || !children) {
+    return children;
+  }
+  let allChildren = React.Children.toArray(children);
+  let nextChildren = [];
+  let lastIsString = false;
+  const directTextProps = {};
+  if (color)
+    directTextProps.color = color;
+  if (fontFamily)
+    directTextProps.fontFamily = fontFamily;
+  if (fontSize)
+    directTextProps.fontSize = fontSize;
+  if (fontWeight)
+    directTextProps.fontWeight = fontWeight;
+  if (letterSpacing)
+    directTextProps.letterSpacing = letterSpacing;
+  if (textAlign)
+    directTextProps.textAlign = textAlign;
+  function concatStringChildren() {
+    if (!lastIsString)
+      return;
+    const index = nextChildren.length - 1;
+    const childrenStrings = nextChildren[index];
+    nextChildren[index] = <TextComponent key={index} {...directTextProps} size={size} {...textProps}>{childrenStrings}</TextComponent>;
+  }
+  for (const child of allChildren) {
+    const last = nextChildren[nextChildren.length - 1];
+    const isString = typeof child === "string";
+    if (isString) {
+      if (lastIsString) {
+        last.push(child);
+      } else {
+        nextChildren.push([child]);
+      }
+    } else {
+      concatStringChildren();
+      nextChildren.push(child);
+    }
+    lastIsString = isString;
+  }
+  concatStringChildren();
+  return nextChildren;
+}
+export {
+  wrapChildrenInText
+};
+//# sourceMappingURL=wrapChildrenInText.js.map

package/dist/jsx/wrapChildrenInText.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../src/wrapChildrenInText.tsx"],
+  "sourcesContent": ["import type { SizeTokens } from '@tamagui/core'\nimport React from 'react'\n\nimport { SizableTextProps } from './SizableText'\n\nexport type TextParentStyles = {\n  color?: SizableTextProps['color']\n  fontWeight?: SizableTextProps['fontWeight']\n  fontSize?: SizableTextProps['fontSize']\n  fontFamily?: SizableTextProps['fontFamily']\n  letterSpacing?: SizableTextProps['letterSpacing']\n  textAlign?: SizableTextProps['textAlign']\n  // all the other text controls\n  textProps?: Partial<SizableTextProps>\n  noTextWrap?: boolean\n}\n\ntype Props = TextParentStyles & {\n  children?: React.ReactNode\n  size?: SizeTokens\n}\n\nexport function wrapChildrenInText(\n  TextComponent: any,\n  {\n    children,\n    textProps,\n    size,\n    noTextWrap,\n    color,\n    fontFamily,\n    fontSize,\n    fontWeight,\n    letterSpacing,\n    textAlign,\n  }: Props\n) {\n  if (noTextWrap || !children) {\n    return children\n  }\n\n  // in the case of using variables, like so:\n  // <ListItem>Hello, {name}</ListItem>\n  // it gives us props.children as ['Hello, ', 'name']\n  // but we don't want to wrap multiple SizableText around each part\n  // so we group them\n  let allChildren = React.Children.toArray(children)\n  let nextChildren: any[] = []\n  let lastIsString = false\n  const directTextProps: any = {}\n  // to avoid setting undefined\n  if (color) directTextProps.color = color\n  if (fontFamily) directTextProps.fontFamily = fontFamily\n  if (fontSize) directTextProps.fontSize = fontSize\n  if (fontWeight) directTextProps.fontWeight = fontWeight\n  if (letterSpacing) directTextProps.letterSpacing = letterSpacing\n  if (textAlign) directTextProps.textAlign = textAlign\n\n  function concatStringChildren() {\n    if (!lastIsString) return\n    const index = nextChildren.length - 1\n    const childrenStrings = nextChildren[index]\n    nextChildren[index] = (\n      <TextComponent key={index} {...directTextProps} size={size} {...textProps}>\n        {childrenStrings}\n      </TextComponent>\n    )\n  }\n\n  for (const child of allChildren) {\n    const last = nextChildren[nextChildren.length - 1]\n    const isString = typeof child === 'string'\n    if (isString) {\n      if (lastIsString) {\n        last.push(child)\n      } else {\n        nextChildren.push([child])\n      }\n    } else {\n      concatStringChildren()\n      nextChildren.push(child)\n    }\n    lastIsString = isString\n  }\n  concatStringChildren()\n\n  return nextChildren\n}\n"],
+  "mappings": "AACA;AAqBO,4BACL,eACA;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,GAEF;AACA,MAAI,cAAc,CAAC,UAAU;AAC3B,WAAO;AAAA,EACT;AAOA,MAAI,cAAc,MAAM,SAAS,QAAQ,QAAQ;AACjD,MAAI,eAAsB,CAAC;AAC3B,MAAI,eAAe;AACnB,QAAM,kBAAuB,CAAC;AAE9B,MAAI;AAAO,oBAAgB,QAAQ;AACnC,MAAI;AAAY,oBAAgB,aAAa;AAC7C,MAAI;AAAU,oBAAgB,WAAW;AACzC,MAAI;AAAY,oBAAgB,aAAa;AAC7C,MAAI;AAAe,oBAAgB,gBAAgB;AACnD,MAAI;AAAW,oBAAgB,YAAY;AAE3C,kCAAgC;AAC9B,QAAI,CAAC;AAAc;AACnB,UAAM,QAAQ,aAAa,SAAS;AACpC,UAAM,kBAAkB,aAAa;AACrC,iBAAa,SACX,CAAC,cAAc,KAAK,WAAW,iBAAiB,MAAM,UAAU,YAC7D,gBACH,EAFC;AAAA,EAIL;AAEA,aAAW,SAAS,aAAa;AAC/B,UAAM,OAAO,aAAa,aAAa,SAAS;AAChD,UAAM,WAAW,OAAO,UAAU;AAClC,QAAI,UAAU;AACZ,UAAI,cAAc;AAChB,aAAK,KAAK,KAAK;AAAA,MACjB,OAAO;AACL,qBAAa,KAAK,CAAC,KAAK,CAAC;AAAA,MAC3B;AAAA,IACF,OAAO;AACL,2BAAqB;AACrB,mBAAa,KAAK,KAAK;AAAA,IACzB;AACA,mBAAe;AAAA,EACjB;AACA,uBAAqB;AAErB,SAAO;AACT;",
+  "names": []
+}

package/dist/jsx/wrapChildrenInText.test.js

@@ -0,0 +1,29 @@
+import { expect, test } from "vitest";
+import { wrapChildrenInText } from "./wrapChildrenInText";
+const Comp = () => {
+};
+const re = <div data-id={Math.random()} />;
+const reID = re.props["data-id"];
+test("should wrap all string children, not wrap others", () => {
+  const out = wrapChildrenInText(Comp, {
+    children: [re, "a", "b", re, "c", re, "d"]
+  });
+  expect(out[0].props["data-id"]).toBe(reID);
+  expect(out[1].type).toBe(Comp);
+  expect(out[1].props.children).toStrictEqual(["a", "b"]);
+  expect(out[2].props["data-id"]).toBe(reID);
+  expect(out[3].type).toBe(Comp);
+  expect(out[3].props.children).toStrictEqual(["c"]);
+  expect(out[4].props["data-id"]).toBe(reID);
+  expect(out[5].type).toBe(Comp);
+  expect(out[5].props.children).toStrictEqual(["d"]);
+});
+test("should first child string", () => {
+  const out = wrapChildrenInText(Comp, {
+    children: ["a", re]
+  });
+  expect(out[0].type).toBe(Comp);
+  expect(out[0].props.children).toStrictEqual(["a"]);
+  expect(out[1].props["data-id"]).toBe(reID);
+});
+//# sourceMappingURL=wrapChildrenInText.test.js.map

package/dist/jsx/wrapChildrenInText.test.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../src/wrapChildrenInText.test.tsx"],
+  "sourcesContent": ["import React from 'react'\nimport { expect, test } from 'vitest'\n\nimport { wrapChildrenInText } from './wrapChildrenInText'\n\nconst Comp = () => {}\nconst re = <div data-id={Math.random()} />\nconst reID = re.props['data-id']\n\ntest('should wrap all string children, not wrap others', () => {\n  const out = wrapChildrenInText(Comp, {\n    children: [re, 'a', 'b', re, 'c', re, 'd'],\n  }) as any\n\n  expect(out[0].props['data-id']).toBe(reID)\n\n  expect(out[1].type).toBe(Comp)\n  expect(out[1].props.children).toStrictEqual(['a', 'b'])\n\n  expect(out[2].props['data-id']).toBe(reID)\n\n  expect(out[3].type).toBe(Comp)\n  expect(out[3].props.children).toStrictEqual(['c'])\n\n  expect(out[4].props['data-id']).toBe(reID)\n\n  expect(out[5].type).toBe(Comp)\n  expect(out[5].props.children).toStrictEqual(['d'])\n})\n\ntest('should first child string', () => {\n  const out = wrapChildrenInText(Comp, {\n    children: ['a', re],\n  }) as any\n\n  expect(out[0].type).toBe(Comp)\n  expect(out[0].props.children).toStrictEqual(['a'])\n\n  expect(out[1].props['data-id']).toBe(reID)\n})\n"],
+  "mappings": "AACA;AAEA;AAEA,MAAM,OAAO,MAAM;AAAC;AACpB,MAAM,KAAK,CAAC,IAAI,SAAS,KAAK,OAAO,GAAG;AACxC,MAAM,OAAO,GAAG,MAAM;AAEtB,KAAK,oDAAoD,MAAM;AAC7D,QAAM,MAAM,mBAAmB,MAAM;AAAA,IACnC,UAAU,CAAC,IAAI,KAAK,KAAK,IAAI,KAAK,IAAI,GAAG;AAAA,EAC3C,CAAC;AAED,SAAO,IAAI,GAAG,MAAM,UAAU,EAAE,KAAK,IAAI;AAEzC,SAAO,IAAI,GAAG,IAAI,EAAE,KAAK,IAAI;AAC7B,SAAO,IAAI,GAAG,MAAM,QAAQ,EAAE,cAAc,CAAC,KAAK,GAAG,CAAC;AAEtD,SAAO,IAAI,GAAG,MAAM,UAAU,EAAE,KAAK,IAAI;AAEzC,SAAO,IAAI,GAAG,IAAI,EAAE,KAAK,IAAI;AAC7B,SAAO,IAAI,GAAG,MAAM,QAAQ,EAAE,cAAc,CAAC,GAAG,CAAC;AAEjD,SAAO,IAAI,GAAG,MAAM,UAAU,EAAE,KAAK,IAAI;AAEzC,SAAO,IAAI,GAAG,IAAI,EAAE,KAAK,IAAI;AAC7B,SAAO,IAAI,GAAG,MAAM,QAAQ,EAAE,cAAc,CAAC,GAAG,CAAC;AACnD,CAAC;AAED,KAAK,6BAA6B,MAAM;AACtC,QAAM,MAAM,mBAAmB,MAAM;AAAA,IACnC,UAAU,CAAC,KAAK,EAAE;AAAA,EACpB,CAAC;AAED,SAAO,IAAI,GAAG,IAAI,EAAE,KAAK,IAAI;AAC7B,SAAO,IAAI,GAAG,MAAM,QAAQ,EAAE,cAAc,CAAC,GAAG,CAAC;AAEjD,SAAO,IAAI,GAAG,MAAM,UAAU,EAAE,KAAK,IAAI;AAC3C,CAAC;",
+  "names": []
+}

package/package.json

@@ -1,31 +1,39 @@
 {
   "name": "@tamagui/text",
-  "version": "1.0.0-beta.9",
-  "sideEffects": false,
+  "version": "1.0.1-beta.102",
+  "sideEffects": [
+    "*.css"
+  ],
   "source": "src/index.ts",
-  "typings": "types",
+  "types": "./types/index.d.ts",
   "main": "dist/cjs",
   "module": "dist/esm",
   "module:jsx": "dist/jsx",
   "files": [
+    "src",
     "types",
     "dist"
   ],
   "scripts": {
     "build": "tamagui-build",
-    "watch": "tamagui-build --watch"
+    "watch": "tamagui-build --watch",
+    "clean": "tamagui-build clean",
+    "clean:build": "tamagui-build clean:build",
+    "test": "vitest --config ../vite-plugin-internal/vite.config.ts"
   },
   "dependencies": {
-    "@tamagui/core": "^1.0.0-beta.9"
+    "@tamagui/core": "^1.0.1-beta.102"
   },
   "peerDependencies": {
     "react": "*",
     "react-dom": "*"
   },
   "devDependencies": {
-    "@tamagui/build": "^1.0.0-beta.9",
+    "@tamagui/build": "^1.0.1-beta.102",
+    "@tamagui/vite-plugin-internal": "^1.0.1-beta.102",
     "react": "*",
-    "react-dom": "*"
+    "react-dom": "*",
+    "vitest": "^0.17.1"
   },
   "publishConfig": {
     "access": "public"

package/src/Headings.tsx

@@ -0,0 +1,48 @@
+import { styled } from '@tamagui/core'
+
+import { Paragraph } from './Paragraph'
+
+export const Heading = styled(Paragraph, {
+  tag: 'span',
+  name: 'Heading',
+  accessibilityRole: 'header',
+  fontFamily: '$heading',
+  size: '$8',
+  margin: 0,
+})
+
+export const H1 = styled(Heading, {
+  name: 'H1',
+  tag: 'h1',
+  size: '$10',
+})
+
+export const H2 = styled(Heading, {
+  name: 'H2',
+  tag: 'h2',
+  size: '$9',
+})
+
+export const H3 = styled(Heading, {
+  name: 'H3',
+  tag: 'h3',
+  size: '$8',
+})
+
+export const H4 = styled(Heading, {
+  name: 'H4',
+  tag: 'h4',
+  size: '$7',
+})
+
+export const H5 = styled(Heading, {
+  name: 'H5',
+  tag: 'h5',
+  size: '$6',
+})
+
+export const H6 = styled(Heading, {
+  name: 'H6',
+  tag: 'h6',
+  size: '$5',
+})

package/src/Paragraph.tsx

@@ -0,0 +1,12 @@
+import { PropTypes, styled } from '@tamagui/core'
+
+import { SizableText } from './SizableText'
+
+export const Paragraph = styled(SizableText, {
+  name: 'Paragraph',
+  tag: 'p',
+  selectable: true,
+  cursor: 'text',
+})
+
+export type ParagraphProps = PropTypes<typeof Paragraph>

package/src/SizableText.tsx

@@ -0,0 +1,22 @@
+import { GetProps, Text, getFont, styled } from '@tamagui/core'
+
+export const SizableText = styled(
+  Text,
+  {
+    name: 'SizableText',
+    fontFamily: '$body',
+
+    variants: {
+      size: getFont,
+    },
+
+    defaultVariants: {
+      size: '$4',
+    },
+  },
+  {
+    inlineWhenUnflattened: new Set(['fontFamily']),
+  }
+)
+
+export type SizableTextProps = GetProps<typeof SizableText>

package/src/index.tsx

@@ -0,0 +1,4 @@
+export * from './SizableText'
+export * from './Paragraph'
+export * from './Headings'
+export * from './wrapChildrenInText'

package/src/wrapChildrenInText.test.tsx

@@ -0,0 +1,40 @@
+import React from 'react'
+import { expect, test } from 'vitest'
+
+import { wrapChildrenInText } from './wrapChildrenInText'
+
+const Comp = () => {}
+const re = <div data-id={Math.random()} />
+const reID = re.props['data-id']
+
+test('should wrap all string children, not wrap others', () => {
+  const out = wrapChildrenInText(Comp, {
+    children: [re, 'a', 'b', re, 'c', re, 'd'],
+  }) as any
+
+  expect(out[0].props['data-id']).toBe(reID)
+
+  expect(out[1].type).toBe(Comp)
+  expect(out[1].props.children).toStrictEqual(['a', 'b'])
+
+  expect(out[2].props['data-id']).toBe(reID)
+
+  expect(out[3].type).toBe(Comp)
+  expect(out[3].props.children).toStrictEqual(['c'])
+
+  expect(out[4].props['data-id']).toBe(reID)
+
+  expect(out[5].type).toBe(Comp)
+  expect(out[5].props.children).toStrictEqual(['d'])
+})
+
+test('should first child string', () => {
+  const out = wrapChildrenInText(Comp, {
+    children: ['a', re],
+  }) as any
+
+  expect(out[0].type).toBe(Comp)
+  expect(out[0].props.children).toStrictEqual(['a'])
+
+  expect(out[1].props['data-id']).toBe(reID)
+})

package/src/wrapChildrenInText.tsx

@@ -0,0 +1,88 @@
+import type { SizeTokens } from '@tamagui/core'
+import React from 'react'
+
+import { SizableTextProps } from './SizableText'
+
+export type TextParentStyles = {
+  color?: SizableTextProps['color']
+  fontWeight?: SizableTextProps['fontWeight']
+  fontSize?: SizableTextProps['fontSize']
+  fontFamily?: SizableTextProps['fontFamily']
+  letterSpacing?: SizableTextProps['letterSpacing']
+  textAlign?: SizableTextProps['textAlign']
+  // all the other text controls
+  textProps?: Partial<SizableTextProps>
+  noTextWrap?: boolean
+}
+
+type Props = TextParentStyles & {
+  children?: React.ReactNode
+  size?: SizeTokens
+}
+
+export function wrapChildrenInText(
+  TextComponent: any,
+  {
+    children,
+    textProps,
+    size,
+    noTextWrap,
+    color,
+    fontFamily,
+    fontSize,
+    fontWeight,
+    letterSpacing,
+    textAlign,
+  }: Props
+) {
+  if (noTextWrap || !children) {
+    return children
+  }
+
+  // in the case of using variables, like so:
+  // <ListItem>Hello, {name}</ListItem>
+  // it gives us props.children as ['Hello, ', 'name']
+  // but we don't want to wrap multiple SizableText around each part
+  // so we group them
+  let allChildren = React.Children.toArray(children)
+  let nextChildren: any[] = []
+  let lastIsString = false
+  const directTextProps: any = {}
+  // to avoid setting undefined
+  if (color) directTextProps.color = color
+  if (fontFamily) directTextProps.fontFamily = fontFamily
+  if (fontSize) directTextProps.fontSize = fontSize
+  if (fontWeight) directTextProps.fontWeight = fontWeight
+  if (letterSpacing) directTextProps.letterSpacing = letterSpacing
+  if (textAlign) directTextProps.textAlign = textAlign
+
+  function concatStringChildren() {
+    if (!lastIsString) return
+    const index = nextChildren.length - 1
+    const childrenStrings = nextChildren[index]
+    nextChildren[index] = (
+      <TextComponent key={index} {...directTextProps} size={size} {...textProps}>
+        {childrenStrings}
+      </TextComponent>
+    )
+  }
+
+  for (const child of allChildren) {
+    const last = nextChildren[nextChildren.length - 1]
+    const isString = typeof child === 'string'
+    if (isString) {
+      if (lastIsString) {
+        last.push(child)
+      } else {
+        nextChildren.push([child])
+      }
+    } else {
+      concatStringChildren()
+      nextChildren.push(child)
+    }
+    lastIsString = isString
+  }
+  concatStringChildren()
+
+  return nextChildren
+}