@tamagui/core 1.0.1-beta.31 → 1.0.1-beta.32

package/dist/cjs/helpers/getStackSize.js

@@ -50,9 +50,9 @@ const createGetStackSize = /* @__PURE__ */ __name((scale) => (val, extras) => {
   const { radius, minHeight, px, py } = getSizeScaledToFont(val, scale, extras);
   return {
     minHeight,
+    borderRadius: props.circular ? 1e5 : props.borderRadius ?? radius,
     paddingHorizontal: props.circular ? 0 : px,
-    paddingVertical: props.circular ? 0 : py,
-    borderRadius: props.circular ? 1e5 : props.borderRadius ?? radius
+    paddingVertical: props.circular ? 0 : py
   };
 }, "createGetStackSize");
 const buttonScaling = { sizeX: 0.9, sizeY: 0.333 };

package/dist/cjs/helpers/getStackSize.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/getStackSize.ts"],
-  "sourcesContent": ["import { VariantSpreadExtras, getVariableValue, isVariable } from '@tamagui/core'\n\nimport { SizeTokens } from '../types'\n\n// for use in sizable things\n\ntype ScaleProps = { sizeX: number; sizeY: number }\n\nexport type ScaleVariantExtras = Pick<VariantSpreadExtras<any>, 'tokens' | 'props' | 'fonts'>\n\nexport const getSizeScaledToFont = (\n  val: string | number,\n  { sizeX = 1, sizeY = 1 }: ScaleProps,\n  { tokens, props, fonts }: ScaleVariantExtras\n) => {\n  const size = tokens.size[val] ?? val ?? tokens.size['$4'] ?? 14\n  const radius = tokens.radius[val] ?? tokens.radius['$4'] ?? size\n  const sizePx = +(isVariable(size) ? size.val : size)\n  const scaleSize = isVariable(size) ? 2 : 1\n  const px = Math.round(sizePx * sizeX)\n  const py = Math.round(sizePx * sizeY)\n  // keep buttons height aligned to the font used\n  const font = fonts[props.fontFamily] || fonts['$body']\n  const lineHeights = font.lineHeight\n  const lineHeight = lineHeights[val] ?? lineHeights['$4']\n  const minHeight = Math.round(getVariableValue(lineHeight) + py * scaleSize)\n  return {\n    px,\n    py,\n    radius,\n    size,\n    lineHeight,\n    minHeight,\n  }\n}\n\nexport const createGetStackSize =\n  (scale: ScaleProps) => (val: SizeTokens | number, extras: VariantSpreadExtras<any>) => {\n    const { props } = extras\n    const { radius, minHeight, px, py } = getSizeScaledToFont(val, scale, extras)\n    return {\n      minHeight,\n      paddingHorizontal: props.circular ? 0 : px,\n      paddingVertical: props.circular ? 0 : py,\n      borderRadius: props.circular ? 100_000 : props.borderRadius ?? radius,\n    }\n  }\n\nexport const buttonScaling = { sizeX: 0.9, sizeY: 0.333 }\nexport const getButtonSize = createGetStackSize(buttonScaling)\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAkE;AAU3D,MAAM,sBAAsB,wBACjC,KACA,EAAE,QAAQ,GAAG,QAAQ,KACrB,EAAE,QAAQ,OAAO,YACd;AACH,QAAM,OAAO,OAAO,KAAK,QAAQ,OAAO,OAAO,KAAK,SAAS;AAC7D,QAAM,SAAS,OAAO,OAAO,QAAQ,OAAO,OAAO,SAAS;AAC5D,QAAM,SAAS,CAAE,6BAAW,IAAI,IAAI,KAAK,MAAM;AAC/C,QAAM,YAAY,4BAAW,IAAI,IAAI,IAAI;AACzC,QAAM,KAAK,KAAK,MAAM,SAAS,KAAK;AACpC,QAAM,KAAK,KAAK,MAAM,SAAS,KAAK;AAEpC,QAAM,OAAO,MAAM,MAAM,eAAe,MAAM;AAC9C,QAAM,cAAc,KAAK;AACzB,QAAM,aAAa,YAAY,QAAQ,YAAY;AACnD,QAAM,YAAY,KAAK,MAAM,kCAAiB,UAAU,IAAI,KAAK,SAAS;AAC1E,SAAO;AAAA,IACL;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF;AACF,GAxBmC;AA0B5B,MAAM,qBACX,wBAAC,UAAsB,CAAC,KAA0B,WAAqC;AACrF,QAAM,EAAE,UAAU;AAClB,QAAM,EAAE,QAAQ,WAAW,IAAI,OAAO,oBAAoB,KAAK,OAAO,MAAM;AAC5E,SAAO;AAAA,IACL;AAAA,IACA,mBAAmB,MAAM,WAAW,IAAI;AAAA,IACxC,iBAAiB,MAAM,WAAW,IAAI;AAAA,IACtC,cAAc,MAAM,WAAW,MAAU,MAAM,gBAAgB;AAAA,EACjE;AACF,GATA;AAWK,MAAM,gBAAgB,EAAE,OAAO,KAAK,OAAO,MAAM;AACjD,MAAM,gBAAgB,mBAAmB,aAAa;",
+  "sourcesContent": ["import { VariantSpreadExtras, getVariableValue, isVariable } from '@tamagui/core'\n\nimport { SizeTokens } from '../types'\n\n// for use in sizable things\n\ntype ScaleProps = { sizeX: number; sizeY: number }\n\nexport type ScaleVariantExtras = Pick<VariantSpreadExtras<any>, 'tokens' | 'props' | 'fonts'>\n\nexport const getSizeScaledToFont = (\n  val: string | number,\n  { sizeX = 1, sizeY = 1 }: ScaleProps,\n  { tokens, props, fonts }: ScaleVariantExtras\n) => {\n  const size = tokens.size[val] ?? val ?? tokens.size['$4'] ?? 14\n  const radius = tokens.radius[val] ?? tokens.radius['$4'] ?? size\n  const sizePx = +(isVariable(size) ? size.val : size)\n  const scaleSize = isVariable(size) ? 2 : 1\n  const px = Math.round(sizePx * sizeX)\n  const py = Math.round(sizePx * sizeY)\n  // keep buttons height aligned to the font used\n  const font = fonts[props.fontFamily] || fonts['$body']\n  const lineHeights = font.lineHeight\n  const lineHeight = lineHeights[val] ?? lineHeights['$4']\n  const minHeight = Math.round(getVariableValue(lineHeight) + py * scaleSize)\n  return {\n    px,\n    py,\n    radius,\n    size,\n    lineHeight,\n    minHeight,\n  }\n}\n\nexport const createGetStackSize =\n  (scale: ScaleProps) => (val: SizeTokens | number, extras: VariantSpreadExtras<any>) => {\n    const { props } = extras\n    const { radius, minHeight, px, py } = getSizeScaledToFont(val, scale, extras)\n    return {\n      minHeight,\n      borderRadius: props.circular ? 100_000 : props.borderRadius ?? radius,\n      paddingHorizontal: props.circular ? 0 : px,\n      paddingVertical: props.circular ? 0 : py,\n    }\n  }\n\nexport const buttonScaling = { sizeX: 0.9, sizeY: 0.333 }\nexport const getButtonSize = createGetStackSize(buttonScaling)\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAkE;AAU3D,MAAM,sBAAsB,wBACjC,KACA,EAAE,QAAQ,GAAG,QAAQ,KACrB,EAAE,QAAQ,OAAO,YACd;AACH,QAAM,OAAO,OAAO,KAAK,QAAQ,OAAO,OAAO,KAAK,SAAS;AAC7D,QAAM,SAAS,OAAO,OAAO,QAAQ,OAAO,OAAO,SAAS;AAC5D,QAAM,SAAS,CAAE,6BAAW,IAAI,IAAI,KAAK,MAAM;AAC/C,QAAM,YAAY,4BAAW,IAAI,IAAI,IAAI;AACzC,QAAM,KAAK,KAAK,MAAM,SAAS,KAAK;AACpC,QAAM,KAAK,KAAK,MAAM,SAAS,KAAK;AAEpC,QAAM,OAAO,MAAM,MAAM,eAAe,MAAM;AAC9C,QAAM,cAAc,KAAK;AACzB,QAAM,aAAa,YAAY,QAAQ,YAAY;AACnD,QAAM,YAAY,KAAK,MAAM,kCAAiB,UAAU,IAAI,KAAK,SAAS;AAC1E,SAAO;AAAA,IACL;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF;AACF,GAxBmC;AA0B5B,MAAM,qBACX,wBAAC,UAAsB,CAAC,KAA0B,WAAqC;AACrF,QAAM,EAAE,UAAU;AAClB,QAAM,EAAE,QAAQ,WAAW,IAAI,OAAO,oBAAoB,KAAK,OAAO,MAAM;AAC5E,SAAO;AAAA,IACL;AAAA,IACA,cAAc,MAAM,WAAW,MAAU,MAAM,gBAAgB;AAAA,IAC/D,mBAAmB,MAAM,WAAW,IAAI;AAAA,IACxC,iBAAiB,MAAM,WAAW,IAAI;AAAA,EACxC;AACF,GATA;AAWK,MAAM,gBAAgB,EAAE,OAAO,KAAK,OAAO,MAAM;AACjD,MAAM,gBAAgB,mBAAmB,aAAa;",
   "names": []
 }

package/dist/cjs/helpers/isTamaguiElement.js

@@ -22,9 +22,15 @@ __export(isTamaguiElement_exports, {
 });
 module.exports = __toCommonJS(isTamaguiElement_exports);
 var import_react = require("react");
-const isTamaguiElement = /* @__PURE__ */ __name((child) => {
+const isTamaguiElement = /* @__PURE__ */ __name((child, name) => {
   var _a;
-  return (0, import_react.isValidElement)(child) && !!((_a = child.type["staticConfig"]) == null ? void 0 : _a.parsed);
+  const isTamagui = (0, import_react.isValidElement)(child) && !!((_a = child.type["staticConfig"]) == null ? void 0 : _a.parsed);
+  if (!isTamagui)
+    return false;
+  if (name) {
+    return name === child.type["staticConfig"].componentName;
+  }
+  return true;
 }, "isTamaguiElement");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cjs/helpers/isTamaguiElement.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/isTamaguiElement.tsx"],
-  "sourcesContent": ["import React, { isValidElement } from 'react'\n\nexport const isTamaguiElement = (child: any): child is React.ReactElement => {\n  return isValidElement(child) && !!child.type['staticConfig']?.parsed\n}\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAsC;AAE/B,MAAM,mBAAmB,wBAAC,UAA4C;AAF7E;AAGE,SAAO,iCAAe,KAAK,KAAK,CAAC,CAAC,aAAM,KAAK,oBAAX,mBAA4B;AAChE,GAFgC;",
+  "sourcesContent": ["import React, { isValidElement } from 'react'\n\nexport const isTamaguiElement = (child: any, name?: string): child is React.ReactElement => {\n  const isTamagui = isValidElement(child) && !!child.type['staticConfig']?.parsed\n  if (!isTamagui) return false\n  if (name) {\n    return name === child.type['staticConfig'].componentName\n  }\n  return true\n}\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAsC;AAE/B,MAAM,mBAAmB,wBAAC,OAAY,SAA+C;AAF5F;AAGE,QAAM,YAAY,iCAAe,KAAK,KAAK,CAAC,CAAC,aAAM,KAAK,oBAAX,mBAA4B;AACzE,MAAI,CAAC;AAAW,WAAO;AACvB,MAAI,MAAM;AACR,WAAO,SAAS,MAAM,KAAK,gBAAgB;AAAA,EAC7C;AACA,SAAO;AACT,GAPgC;",
   "names": []
 }

package/dist/esm/helpers/getStackSize.js

@@ -28,9 +28,9 @@ const createGetStackSize = /* @__PURE__ */ __name((scale) => (val, extras) => {
   const { radius, minHeight, px, py } = getSizeScaledToFont(val, scale, extras);
   return {
     minHeight,
+    borderRadius: props.circular ? 1e5 : (_a = props.borderRadius) != null ? _a : radius,
     paddingHorizontal: props.circular ? 0 : px,
-    paddingVertical: props.circular ? 0 : py,
-    borderRadius: props.circular ? 1e5 : (_a = props.borderRadius) != null ? _a : radius
+    paddingVertical: props.circular ? 0 : py
   };
 }, "createGetStackSize");
 const buttonScaling = { sizeX: 0.9, sizeY: 0.333 };

package/dist/esm/helpers/getStackSize.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/getStackSize.ts"],
-  "sourcesContent": ["import { VariantSpreadExtras, getVariableValue, isVariable } from '@tamagui/core'\n\nimport { SizeTokens } from '../types'\n\n// for use in sizable things\n\ntype ScaleProps = { sizeX: number; sizeY: number }\n\nexport type ScaleVariantExtras = Pick<VariantSpreadExtras<any>, 'tokens' | 'props' | 'fonts'>\n\nexport const getSizeScaledToFont = (\n  val: string | number,\n  { sizeX = 1, sizeY = 1 }: ScaleProps,\n  { tokens, props, fonts }: ScaleVariantExtras\n) => {\n  const size = tokens.size[val] ?? val ?? tokens.size['$4'] ?? 14\n  const radius = tokens.radius[val] ?? tokens.radius['$4'] ?? size\n  const sizePx = +(isVariable(size) ? size.val : size)\n  const scaleSize = isVariable(size) ? 2 : 1\n  const px = Math.round(sizePx * sizeX)\n  const py = Math.round(sizePx * sizeY)\n  // keep buttons height aligned to the font used\n  const font = fonts[props.fontFamily] || fonts['$body']\n  const lineHeights = font.lineHeight\n  const lineHeight = lineHeights[val] ?? lineHeights['$4']\n  const minHeight = Math.round(getVariableValue(lineHeight) + py * scaleSize)\n  return {\n    px,\n    py,\n    radius,\n    size,\n    lineHeight,\n    minHeight,\n  }\n}\n\nexport const createGetStackSize =\n  (scale: ScaleProps) => (val: SizeTokens | number, extras: VariantSpreadExtras<any>) => {\n    const { props } = extras\n    const { radius, minHeight, px, py } = getSizeScaledToFont(val, scale, extras)\n    return {\n      minHeight,\n      paddingHorizontal: props.circular ? 0 : px,\n      paddingVertical: props.circular ? 0 : py,\n      borderRadius: props.circular ? 100_000 : props.borderRadius ?? radius,\n    }\n  }\n\nexport const buttonScaling = { sizeX: 0.9, sizeY: 0.333 }\nexport const getButtonSize = createGetStackSize(buttonScaling)\n"],
-  "mappings": ";;AAAA;AAUO,MAAM,sBAAsB,wBACjC,KACA,EAAE,QAAQ,GAAG,QAAQ,KACrB,EAAE,QAAQ,OAAO,YACd;AAdL;AAeE,QAAM,OAAO,yBAAO,KAAK,SAAZ,YAAoB,QAApB,YAA2B,OAAO,KAAK,UAAvC,YAAgD;AAC7D,QAAM,SAAS,mBAAO,OAAO,SAAd,YAAsB,OAAO,OAAO,UAApC,YAA6C;AAC5D,QAAM,SAAS,CAAE,YAAW,IAAI,IAAI,KAAK,MAAM;AAC/C,QAAM,YAAY,WAAW,IAAI,IAAI,IAAI;AACzC,QAAM,KAAK,KAAK,MAAM,SAAS,KAAK;AACpC,QAAM,KAAK,KAAK,MAAM,SAAS,KAAK;AAEpC,QAAM,OAAO,MAAM,MAAM,eAAe,MAAM;AAC9C,QAAM,cAAc,KAAK;AACzB,QAAM,aAAa,kBAAY,SAAZ,YAAoB,YAAY;AACnD,QAAM,YAAY,KAAK,MAAM,iBAAiB,UAAU,IAAI,KAAK,SAAS;AAC1E,SAAO;AAAA,IACL;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF;AACF,GAxBmC;AA0B5B,MAAM,qBACX,wBAAC,UAAsB,CAAC,KAA0B,WAAqC;AArCzF;AAsCI,QAAM,EAAE,UAAU;AAClB,QAAM,EAAE,QAAQ,WAAW,IAAI,OAAO,oBAAoB,KAAK,OAAO,MAAM;AAC5E,SAAO;AAAA,IACL;AAAA,IACA,mBAAmB,MAAM,WAAW,IAAI;AAAA,IACxC,iBAAiB,MAAM,WAAW,IAAI;AAAA,IACtC,cAAc,MAAM,WAAW,MAAU,YAAM,iBAAN,YAAsB;AAAA,EACjE;AACF,GATA;AAWK,MAAM,gBAAgB,EAAE,OAAO,KAAK,OAAO,MAAM;AACjD,MAAM,gBAAgB,mBAAmB,aAAa;",
+  "sourcesContent": ["import { VariantSpreadExtras, getVariableValue, isVariable } from '@tamagui/core'\n\nimport { SizeTokens } from '../types'\n\n// for use in sizable things\n\ntype ScaleProps = { sizeX: number; sizeY: number }\n\nexport type ScaleVariantExtras = Pick<VariantSpreadExtras<any>, 'tokens' | 'props' | 'fonts'>\n\nexport const getSizeScaledToFont = (\n  val: string | number,\n  { sizeX = 1, sizeY = 1 }: ScaleProps,\n  { tokens, props, fonts }: ScaleVariantExtras\n) => {\n  const size = tokens.size[val] ?? val ?? tokens.size['$4'] ?? 14\n  const radius = tokens.radius[val] ?? tokens.radius['$4'] ?? size\n  const sizePx = +(isVariable(size) ? size.val : size)\n  const scaleSize = isVariable(size) ? 2 : 1\n  const px = Math.round(sizePx * sizeX)\n  const py = Math.round(sizePx * sizeY)\n  // keep buttons height aligned to the font used\n  const font = fonts[props.fontFamily] || fonts['$body']\n  const lineHeights = font.lineHeight\n  const lineHeight = lineHeights[val] ?? lineHeights['$4']\n  const minHeight = Math.round(getVariableValue(lineHeight) + py * scaleSize)\n  return {\n    px,\n    py,\n    radius,\n    size,\n    lineHeight,\n    minHeight,\n  }\n}\n\nexport const createGetStackSize =\n  (scale: ScaleProps) => (val: SizeTokens | number, extras: VariantSpreadExtras<any>) => {\n    const { props } = extras\n    const { radius, minHeight, px, py } = getSizeScaledToFont(val, scale, extras)\n    return {\n      minHeight,\n      borderRadius: props.circular ? 100_000 : props.borderRadius ?? radius,\n      paddingHorizontal: props.circular ? 0 : px,\n      paddingVertical: props.circular ? 0 : py,\n    }\n  }\n\nexport const buttonScaling = { sizeX: 0.9, sizeY: 0.333 }\nexport const getButtonSize = createGetStackSize(buttonScaling)\n"],
+  "mappings": ";;AAAA;AAUO,MAAM,sBAAsB,wBACjC,KACA,EAAE,QAAQ,GAAG,QAAQ,KACrB,EAAE,QAAQ,OAAO,YACd;AAdL;AAeE,QAAM,OAAO,yBAAO,KAAK,SAAZ,YAAoB,QAApB,YAA2B,OAAO,KAAK,UAAvC,YAAgD;AAC7D,QAAM,SAAS,mBAAO,OAAO,SAAd,YAAsB,OAAO,OAAO,UAApC,YAA6C;AAC5D,QAAM,SAAS,CAAE,YAAW,IAAI,IAAI,KAAK,MAAM;AAC/C,QAAM,YAAY,WAAW,IAAI,IAAI,IAAI;AACzC,QAAM,KAAK,KAAK,MAAM,SAAS,KAAK;AACpC,QAAM,KAAK,KAAK,MAAM,SAAS,KAAK;AAEpC,QAAM,OAAO,MAAM,MAAM,eAAe,MAAM;AAC9C,QAAM,cAAc,KAAK;AACzB,QAAM,aAAa,kBAAY,SAAZ,YAAoB,YAAY;AACnD,QAAM,YAAY,KAAK,MAAM,iBAAiB,UAAU,IAAI,KAAK,SAAS;AAC1E,SAAO;AAAA,IACL;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF;AACF,GAxBmC;AA0B5B,MAAM,qBACX,wBAAC,UAAsB,CAAC,KAA0B,WAAqC;AArCzF;AAsCI,QAAM,EAAE,UAAU;AAClB,QAAM,EAAE,QAAQ,WAAW,IAAI,OAAO,oBAAoB,KAAK,OAAO,MAAM;AAC5E,SAAO;AAAA,IACL;AAAA,IACA,cAAc,MAAM,WAAW,MAAU,YAAM,iBAAN,YAAsB;AAAA,IAC/D,mBAAmB,MAAM,WAAW,IAAI;AAAA,IACxC,iBAAiB,MAAM,WAAW,IAAI;AAAA,EACxC;AACF,GATA;AAWK,MAAM,gBAAgB,EAAE,OAAO,KAAK,OAAO,MAAM;AACjD,MAAM,gBAAgB,mBAAmB,aAAa;",
   "names": []
 }

package/dist/esm/helpers/isTamaguiElement.js

@@ -1,9 +1,15 @@
 var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 import { isValidElement } from "react";
-const isTamaguiElement = /* @__PURE__ */ __name((child) => {
+const isTamaguiElement = /* @__PURE__ */ __name((child, name) => {
   var _a;
-  return isValidElement(child) && !!((_a = child.type["staticConfig"]) == null ? void 0 : _a.parsed);
+  const isTamagui = isValidElement(child) && !!((_a = child.type["staticConfig"]) == null ? void 0 : _a.parsed);
+  if (!isTamagui)
+    return false;
+  if (name) {
+    return name === child.type["staticConfig"].componentName;
+  }
+  return true;
 }, "isTamaguiElement");
 export {
   isTamaguiElement

package/dist/esm/helpers/isTamaguiElement.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/isTamaguiElement.tsx"],
-  "sourcesContent": ["import React, { isValidElement } from 'react'\n\nexport const isTamaguiElement = (child: any): child is React.ReactElement => {\n  return isValidElement(child) && !!child.type['staticConfig']?.parsed\n}\n"],
-  "mappings": ";;AAAA;AAEO,MAAM,mBAAmB,wBAAC,UAA4C;AAF7E;AAGE,SAAO,eAAe,KAAK,KAAK,CAAC,CAAC,aAAM,KAAK,oBAAX,mBAA4B;AAChE,GAFgC;",
+  "sourcesContent": ["import React, { isValidElement } from 'react'\n\nexport const isTamaguiElement = (child: any, name?: string): child is React.ReactElement => {\n  const isTamagui = isValidElement(child) && !!child.type['staticConfig']?.parsed\n  if (!isTamagui) return false\n  if (name) {\n    return name === child.type['staticConfig'].componentName\n  }\n  return true\n}\n"],
+  "mappings": ";;AAAA;AAEO,MAAM,mBAAmB,wBAAC,OAAY,SAA+C;AAF5F;AAGE,QAAM,YAAY,eAAe,KAAK,KAAK,CAAC,CAAC,aAAM,KAAK,oBAAX,mBAA4B;AACzE,MAAI,CAAC;AAAW,WAAO;AACvB,MAAI,MAAM;AACR,WAAO,SAAS,MAAM,KAAK,gBAAgB;AAAA,EAC7C;AACA,SAAO;AACT,GAPgC;",
   "names": []
 }

package/dist/jsx/helpers/getStackSize.js

@@ -28,9 +28,9 @@ const createGetStackSize = /* @__PURE__ */ __name((scale) => (val, extras) => {
   const { radius, minHeight, px, py } = getSizeScaledToFont(val, scale, extras);
   return {
     minHeight,
+    borderRadius: props.circular ? 1e5 : (_a = props.borderRadius) != null ? _a : radius,
     paddingHorizontal: props.circular ? 0 : px,
-    paddingVertical: props.circular ? 0 : py,
-    borderRadius: props.circular ? 1e5 : (_a = props.borderRadius) != null ? _a : radius
+    paddingVertical: props.circular ? 0 : py
   };
 }, "createGetStackSize");
 const buttonScaling = { sizeX: 0.9, sizeY: 0.333 };

package/dist/jsx/helpers/isTamaguiElement.js

@@ -1,9 +1,15 @@
 var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 import { isValidElement } from "react";
-const isTamaguiElement = /* @__PURE__ */ __name((child) => {
+const isTamaguiElement = /* @__PURE__ */ __name((child, name) => {
   var _a;
-  return isValidElement(child) && !!((_a = child.type["staticConfig"]) == null ? void 0 : _a.parsed);
+  const isTamagui = isValidElement(child) && !!((_a = child.type["staticConfig"]) == null ? void 0 : _a.parsed);
+  if (!isTamagui)
+    return false;
+  if (name) {
+    return name === child.type["staticConfig"].componentName;
+  }
+  return true;
 }, "isTamaguiElement");
 export {
   isTamaguiElement

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/core",
-  "version": "1.0.1-beta.31",
+  "version": "1.0.1-beta.32",
   "source": "src/index.ts",
   "main": "dist/cjs",
   "module": "dist/esm",
@@ -21,10 +21,10 @@
   ],
   "dependencies": {
     "@expo/match-media": "^0.3.0",
-    "@tamagui/helpers": "^1.0.1-beta.31",
+    "@tamagui/helpers": "^1.0.1-beta.32",
     "@tamagui/ow": "^0.28.1",
-    "@tamagui/use-debounce": "^1.0.1-beta.31",
-    "@tamagui/use-force-update": "^1.0.1-beta.31",
+    "@tamagui/use-debounce": "^1.0.1-beta.32",
+    "@tamagui/use-force-update": "^1.0.1-beta.32",
     "expo-screen-orientation": "^4.2.0",
     "hyphenate-style-name": "^1.0.4",
     "inline-style-prefixer": "^6.0.0",
@@ -36,7 +36,7 @@
     "react-native-web": "*"
   },
   "devDependencies": {
-    "@tamagui/build": "^1.0.1-beta.31",
+    "@tamagui/build": "^1.0.1-beta.32",
     "@types/react": "^17.0.35",
     "csstype": "^3.0.10",
     "esbuild": "^0.14.36",

package/types/helpers/getStackSize.d.ts

@@ -15,9 +15,9 @@ export declare const getSizeScaledToFont: (val: string | number, { sizeX, sizeY
 };
 export declare const createGetStackSize: (scale: ScaleProps) => (val: SizeTokens | number, extras: VariantSpreadExtras<any>) => {
     minHeight: number;
+    borderRadius: any;
     paddingHorizontal: number;
     paddingVertical: number;
-    borderRadius: any;
 };
 export declare const buttonScaling: {
     sizeX: number;
@@ -25,9 +25,9 @@ export declare const buttonScaling: {
 };
 export declare const getButtonSize: (val: SizeTokens | number, extras: VariantSpreadExtras<any>) => {
     minHeight: number;
+    borderRadius: any;
     paddingHorizontal: number;
     paddingVertical: number;
-    borderRadius: any;
 };
 export {};
 //# sourceMappingURL=getStackSize.d.ts.map

package/types/helpers/isTamaguiElement.d.ts

@@ -1,3 +1,3 @@
 import React from 'react';
-export declare const isTamaguiElement: (child: any) => child is React.ReactElement<any, string | React.JSXElementConstructor<any>>;
+export declare const isTamaguiElement: (child: any, name?: string | undefined) => child is React.ReactElement<any, string | React.JSXElementConstructor<any>>;
 //# sourceMappingURL=isTamaguiElement.d.ts.map

package/types/helpers/isTamaguiElement.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"isTamaguiElement.d.ts","sourceRoot":"","sources":["../../src/helpers/isTamaguiElement.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAyB,MAAM,OAAO,CAAA;AAE7C,eAAO,MAAM,gBAAgB,UAAW,GAAG,gFAE1C,CAAA"}
+{"version":3,"file":"isTamaguiElement.d.ts","sourceRoot":"","sources":["../../src/helpers/isTamaguiElement.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAyB,MAAM,OAAO,CAAA;AAE7C,eAAO,MAAM,gBAAgB,UAAW,GAAG,2GAO1C,CAAA"}