@tamagui/text 1.0.1-beta.138 → 1.0.1-beta.141

package/dist/cjs/wrapChildrenInText.js

@@ -25,37 +25,38 @@ __export(wrapChildrenInText_exports, {
 });
 module.exports = __toCommonJS(wrapChildrenInText_exports);
 var import_react = __toESM(require("react"));
-function wrapChildrenInText(TextComponent, {
-  children,
-  textProps,
-  size,
-  noTextWrap,
-  color,
-  fontFamily,
-  fontSize,
-  fontWeight,
-  letterSpacing,
-  textAlign
-}) {
+function wrapChildrenInText(TextComponent, propsIn) {
+  const {
+    children,
+    textProps,
+    size,
+    noTextWrap,
+    color,
+    fontFamily,
+    fontSize,
+    fontWeight,
+    letterSpacing,
+    textAlign
+  } = propsIn;
   if (noTextWrap || !children) {
     return children;
   }
   const allChildren = import_react.default.Children.toArray(children);
   const nextChildren = [];
   let lastIsString = false;
-  const directTextProps = {};
+  const props = {};
   if (color)
-    directTextProps.color = color;
+    props.color = color;
   if (fontFamily)
-    directTextProps.fontFamily = fontFamily;
+    props.fontFamily = fontFamily;
   if (fontSize)
-    directTextProps.fontSize = fontSize;
+    props.fontSize = fontSize;
   if (fontWeight)
-    directTextProps.fontWeight = fontWeight;
+    props.fontWeight = fontWeight;
   if (letterSpacing)
-    directTextProps.letterSpacing = letterSpacing;
+    props.letterSpacing = letterSpacing;
   if (textAlign)
-    directTextProps.textAlign = textAlign;
+    props.textAlign = textAlign;
   function concatStringChildren() {
     if (!lastIsString)
       return;
@@ -63,7 +64,7 @@ function wrapChildrenInText(TextComponent, {
     const childrenStrings = nextChildren[index];
     nextChildren[index] = /* @__PURE__ */ import_react.default.createElement(TextComponent, {
       key: index,
-      ...directTextProps,
+      ...props,
       size,
       ...textProps
     }, childrenStrings);

package/dist/cjs/wrapChildrenInText.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/wrapChildrenInText.tsx"],
-  "sourcesContent": ["import type { SizeTokens } from '@tamagui/core'\nimport React from 'react'\n\nimport { TextParentStyles } from './types'\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  const allChildren = React.Children.toArray(children)\n  const 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": ";;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,mBAAkB;AASX,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,QAAM,cAAc,qBAAM,SAAS,QAAQ,QAAQ;AACnD,QAAM,eAAsB,CAAC;AAC7B,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,mDAAC;AAAA,MAAc,KAAK;AAAA,MAAQ,GAAG;AAAA,MAAiB;AAAA,MAAa,GAAG;AAAA,OAC7D,eACH;AAAA,EAEJ;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;",
+  "sourcesContent": ["import type { SizeTokens } from '@tamagui/core'\nimport React from 'react'\n\nimport { TextParentStyles } from './types'\n\ntype Props = TextParentStyles & {\n  children?: React.ReactNode\n  size?: SizeTokens\n}\n\nexport function wrapChildrenInText(TextComponent: any, propsIn: Props) {\n  const {\n    children,\n    textProps,\n    size,\n    noTextWrap,\n    color,\n    fontFamily,\n    fontSize,\n    fontWeight,\n    letterSpacing,\n    textAlign,\n  } = propsIn\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  const allChildren = React.Children.toArray(children)\n  const nextChildren: any[] = []\n  let lastIsString = false\n  const props: any = {}\n  // to avoid setting undefined\n  if (color) props.color = color\n  if (fontFamily) props.fontFamily = fontFamily\n  if (fontSize) props.fontSize = fontSize\n  if (fontWeight) props.fontWeight = fontWeight\n  if (letterSpacing) props.letterSpacing = letterSpacing\n  if (textAlign) props.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} {...props} 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": ";;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,mBAAkB;AASX,4BAA4B,eAAoB,SAAgB;AACrE,QAAM;AAAA,IACJ;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,MACE;AAEJ,MAAI,cAAc,CAAC,UAAU;AAC3B,WAAO;AAAA,EACT;AAOA,QAAM,cAAc,qBAAM,SAAS,QAAQ,QAAQ;AACnD,QAAM,eAAsB,CAAC;AAC7B,MAAI,eAAe;AACnB,QAAM,QAAa,CAAC;AAEpB,MAAI;AAAO,UAAM,QAAQ;AACzB,MAAI;AAAY,UAAM,aAAa;AACnC,MAAI;AAAU,UAAM,WAAW;AAC/B,MAAI;AAAY,UAAM,aAAa;AACnC,MAAI;AAAe,UAAM,gBAAgB;AACzC,MAAI;AAAW,UAAM,YAAY;AAEjC,kCAAgC;AAC9B,QAAI,CAAC;AAAc;AACnB,UAAM,QAAQ,aAAa,SAAS;AACpC,UAAM,kBAAkB,aAAa;AACrC,iBAAa,SACX,mDAAC;AAAA,MAAc,KAAK;AAAA,MAAQ,GAAG;AAAA,MAAO;AAAA,MAAa,GAAG;AAAA,OACnD,eACH;AAAA,EAEJ;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/esm/wrapChildrenInText.js

@@ -1,35 +1,36 @@
 import React from "react";
-function wrapChildrenInText(TextComponent, {
-  children,
-  textProps,
-  size,
-  noTextWrap,
-  color,
-  fontFamily,
-  fontSize,
-  fontWeight,
-  letterSpacing,
-  textAlign
-}) {
+function wrapChildrenInText(TextComponent, propsIn) {
+  const {
+    children,
+    textProps,
+    size,
+    noTextWrap,
+    color,
+    fontFamily,
+    fontSize,
+    fontWeight,
+    letterSpacing,
+    textAlign
+  } = propsIn;
   if (noTextWrap || !children) {
     return children;
   }
   const allChildren = React.Children.toArray(children);
   const nextChildren = [];
   let lastIsString = false;
-  const directTextProps = {};
+  const props = {};
   if (color)
-    directTextProps.color = color;
+    props.color = color;
   if (fontFamily)
-    directTextProps.fontFamily = fontFamily;
+    props.fontFamily = fontFamily;
   if (fontSize)
-    directTextProps.fontSize = fontSize;
+    props.fontSize = fontSize;
   if (fontWeight)
-    directTextProps.fontWeight = fontWeight;
+    props.fontWeight = fontWeight;
   if (letterSpacing)
-    directTextProps.letterSpacing = letterSpacing;
+    props.letterSpacing = letterSpacing;
   if (textAlign)
-    directTextProps.textAlign = textAlign;
+    props.textAlign = textAlign;
   function concatStringChildren() {
     if (!lastIsString)
       return;
@@ -37,7 +38,7 @@ function wrapChildrenInText(TextComponent, {
     const childrenStrings = nextChildren[index];
     nextChildren[index] = /* @__PURE__ */ React.createElement(TextComponent, {
       key: index,
-      ...directTextProps,
+      ...props,
       size,
       ...textProps
     }, childrenStrings);

package/dist/esm/wrapChildrenInText.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/wrapChildrenInText.tsx"],
-  "sourcesContent": ["import type { SizeTokens } from '@tamagui/core'\nimport React from 'react'\n\nimport { TextParentStyles } from './types'\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  const allChildren = React.Children.toArray(children)\n  const 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;AASO,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,QAAM,cAAc,MAAM,SAAS,QAAQ,QAAQ;AACnD,QAAM,eAAsB,CAAC;AAC7B,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,oCAAC;AAAA,MAAc,KAAK;AAAA,MAAQ,GAAG;AAAA,MAAiB;AAAA,MAAa,GAAG;AAAA,OAC7D,eACH;AAAA,EAEJ;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;",
+  "sourcesContent": ["import type { SizeTokens } from '@tamagui/core'\nimport React from 'react'\n\nimport { TextParentStyles } from './types'\n\ntype Props = TextParentStyles & {\n  children?: React.ReactNode\n  size?: SizeTokens\n}\n\nexport function wrapChildrenInText(TextComponent: any, propsIn: Props) {\n  const {\n    children,\n    textProps,\n    size,\n    noTextWrap,\n    color,\n    fontFamily,\n    fontSize,\n    fontWeight,\n    letterSpacing,\n    textAlign,\n  } = propsIn\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  const allChildren = React.Children.toArray(children)\n  const nextChildren: any[] = []\n  let lastIsString = false\n  const props: any = {}\n  // to avoid setting undefined\n  if (color) props.color = color\n  if (fontFamily) props.fontFamily = fontFamily\n  if (fontSize) props.fontSize = fontSize\n  if (fontWeight) props.fontWeight = fontWeight\n  if (letterSpacing) props.letterSpacing = letterSpacing\n  if (textAlign) props.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} {...props} 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;AASO,4BAA4B,eAAoB,SAAgB;AACrE,QAAM;AAAA,IACJ;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,MACE;AAEJ,MAAI,cAAc,CAAC,UAAU;AAC3B,WAAO;AAAA,EACT;AAOA,QAAM,cAAc,MAAM,SAAS,QAAQ,QAAQ;AACnD,QAAM,eAAsB,CAAC;AAC7B,MAAI,eAAe;AACnB,QAAM,QAAa,CAAC;AAEpB,MAAI;AAAO,UAAM,QAAQ;AACzB,MAAI;AAAY,UAAM,aAAa;AACnC,MAAI;AAAU,UAAM,WAAW;AAC/B,MAAI;AAAY,UAAM,aAAa;AACnC,MAAI;AAAe,UAAM,gBAAgB;AACzC,MAAI;AAAW,UAAM,YAAY;AAEjC,kCAAgC;AAC9B,QAAI,CAAC;AAAc;AACnB,UAAM,QAAQ,aAAa,SAAS;AACpC,UAAM,kBAAkB,aAAa;AACrC,iBAAa,SACX,oCAAC;AAAA,MAAc,KAAK;AAAA,MAAQ,GAAG;AAAA,MAAO;AAAA,MAAa,GAAG;AAAA,OACnD,eACH;AAAA,EAEJ;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.js

@@ -1,41 +1,42 @@
 import React from "react";
-function wrapChildrenInText(TextComponent, {
-  children,
-  textProps,
-  size,
-  noTextWrap,
-  color,
-  fontFamily,
-  fontSize,
-  fontWeight,
-  letterSpacing,
-  textAlign
-}) {
+function wrapChildrenInText(TextComponent, propsIn) {
+  const {
+    children,
+    textProps,
+    size,
+    noTextWrap,
+    color,
+    fontFamily,
+    fontSize,
+    fontWeight,
+    letterSpacing,
+    textAlign
+  } = propsIn;
   if (noTextWrap || !children) {
     return children;
   }
   const allChildren = React.Children.toArray(children);
   const nextChildren = [];
   let lastIsString = false;
-  const directTextProps = {};
+  const props = {};
   if (color)
-    directTextProps.color = color;
+    props.color = color;
   if (fontFamily)
-    directTextProps.fontFamily = fontFamily;
+    props.fontFamily = fontFamily;
   if (fontSize)
-    directTextProps.fontSize = fontSize;
+    props.fontSize = fontSize;
   if (fontWeight)
-    directTextProps.fontWeight = fontWeight;
+    props.fontWeight = fontWeight;
   if (letterSpacing)
-    directTextProps.letterSpacing = letterSpacing;
+    props.letterSpacing = letterSpacing;
   if (textAlign)
-    directTextProps.textAlign = textAlign;
+    props.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>;
+    nextChildren[index] = <TextComponent key={index} {...props} size={size} {...textProps}>{childrenStrings}</TextComponent>;
   }
   for (const child of allChildren) {
     const last = nextChildren[nextChildren.length - 1];

package/dist/jsx/wrapChildrenInText.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/wrapChildrenInText.tsx"],
-  "sourcesContent": ["import type { SizeTokens } from '@tamagui/core'\nimport React from 'react'\n\nimport { TextParentStyles } from './types'\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  const allChildren = React.Children.toArray(children)\n  const 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;AASO,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,QAAM,cAAc,MAAM,SAAS,QAAQ,QAAQ;AACnD,QAAM,eAAsB,CAAC;AAC7B,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;",
+  "sourcesContent": ["import type { SizeTokens } from '@tamagui/core'\nimport React from 'react'\n\nimport { TextParentStyles } from './types'\n\ntype Props = TextParentStyles & {\n  children?: React.ReactNode\n  size?: SizeTokens\n}\n\nexport function wrapChildrenInText(TextComponent: any, propsIn: Props) {\n  const {\n    children,\n    textProps,\n    size,\n    noTextWrap,\n    color,\n    fontFamily,\n    fontSize,\n    fontWeight,\n    letterSpacing,\n    textAlign,\n  } = propsIn\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  const allChildren = React.Children.toArray(children)\n  const nextChildren: any[] = []\n  let lastIsString = false\n  const props: any = {}\n  // to avoid setting undefined\n  if (color) props.color = color\n  if (fontFamily) props.fontFamily = fontFamily\n  if (fontSize) props.fontSize = fontSize\n  if (fontWeight) props.fontWeight = fontWeight\n  if (letterSpacing) props.letterSpacing = letterSpacing\n  if (textAlign) props.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} {...props} 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;AASO,4BAA4B,eAAoB,SAAgB;AACrE,QAAM;AAAA,IACJ;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,MACE;AAEJ,MAAI,cAAc,CAAC,UAAU;AAC3B,WAAO;AAAA,EACT;AAOA,QAAM,cAAc,MAAM,SAAS,QAAQ,QAAQ;AACnD,QAAM,eAAsB,CAAC;AAC7B,MAAI,eAAe;AACnB,QAAM,QAAa,CAAC;AAEpB,MAAI;AAAO,UAAM,QAAQ;AACzB,MAAI;AAAY,UAAM,aAAa;AACnC,MAAI;AAAU,UAAM,WAAW;AAC/B,MAAI;AAAY,UAAM,aAAa;AACnC,MAAI;AAAe,UAAM,gBAAgB;AACzC,MAAI;AAAW,UAAM,YAAY;AAEjC,kCAAgC;AAC9B,QAAI,CAAC;AAAc;AACnB,UAAM,QAAQ,aAAa,SAAS;AACpC,UAAM,kBAAkB,aAAa;AACrC,iBAAa,SACX,CAAC,cAAc,KAAK,WAAW,OAAO,MAAM,UAAU,YACnD,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/text",
-  "version": "1.0.1-beta.138",
+  "version": "1.0.1-beta.141",
   "sideEffects": [
     "*.css"
   ],
@@ -24,15 +24,15 @@
     "test": "vitest --config ../vite-plugin-internal/vite.config.ts --run"
   },
   "dependencies": {
-    "@tamagui/core": "^1.0.1-beta.138",
-    "@tamagui/helpers-tamagui": "^1.0.1-beta.138"
+    "@tamagui/core": "^1.0.1-beta.141",
+    "@tamagui/helpers-tamagui": "^1.0.1-beta.141"
   },
   "peerDependencies": {
     "react": "*",
     "react-dom": "*"
   },
   "devDependencies": {
-    "@tamagui/build": "^1.0.1-beta.138",
+    "@tamagui/build": "^1.0.1-beta.141",
     "react": "*",
     "react-dom": "*",
     "vitest": "^0.20.3"

package/src/wrapChildrenInText.tsx

@@ -8,9 +8,8 @@ type Props = TextParentStyles & {
   size?: SizeTokens
 }
 
-export function wrapChildrenInText(
-  TextComponent: any,
-  {
+export function wrapChildrenInText(TextComponent: any, propsIn: Props) {
+  const {
     children,
     textProps,
     size,
@@ -21,8 +20,8 @@ export function wrapChildrenInText(
     fontWeight,
     letterSpacing,
     textAlign,
-  }: Props
-) {
+  } = propsIn
+
   if (noTextWrap || !children) {
     return children
   }
@@ -35,21 +34,21 @@ export function wrapChildrenInText(
   const allChildren = React.Children.toArray(children)
   const nextChildren: any[] = []
   let lastIsString = false
-  const directTextProps: any = {}
+  const props: 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
+  if (color) props.color = color
+  if (fontFamily) props.fontFamily = fontFamily
+  if (fontSize) props.fontSize = fontSize
+  if (fontWeight) props.fontWeight = fontWeight
+  if (letterSpacing) props.letterSpacing = letterSpacing
+  if (textAlign) props.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}>
+      <TextComponent key={index} {...props} size={size} {...textProps}>
         {childrenStrings}
       </TextComponent>
     )

package/types/wrapChildrenInText.d.ts

@@ -5,6 +5,6 @@ declare type Props = TextParentStyles & {
     children?: React.ReactNode;
     size?: SizeTokens;
 };
-export declare function wrapChildrenInText(TextComponent: any, { children, textProps, size, noTextWrap, color, fontFamily, fontSize, fontWeight, letterSpacing, textAlign, }: Props): string | number | boolean | any[] | React.ReactElement<any, string | React.JSXElementConstructor<any>> | React.ReactFragment | null | undefined;
+export declare function wrapChildrenInText(TextComponent: any, propsIn: Props): string | number | boolean | any[] | React.ReactElement<any, string | React.JSXElementConstructor<any>> | React.ReactFragment | null | undefined;
 export {};
 //# sourceMappingURL=wrapChildrenInText.d.ts.map