@tamagui/get-font-sized 2.7.7 → 3.0.0-beta.1093.1

package/dist/cjs/index.cjs

@@ -3,113 +3,63 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
-  for (var name in all) __defProp(target, name, {
-    get: all[name],
-    enumerable: true
-  });
+	for (var name in all) __defProp(target, name, {
+		get: all[name],
+		enumerable: true
+	});
 };
 var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
-      get: () => from[key],
-      enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
-    });
-  }
-  return to;
+	if (from && typeof from === "object" || typeof from === "function") {
+		for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
+			get: () => from[key],
+			enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+		});
+	}
+	return to;
 };
-var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
-  value: true
-}), mod);
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var index_exports = {};
 __export(index_exports, {
-  SizableText: () => SizableText,
-  getFontSized: () => getFontSized
+	SizableText: () => SizableText,
+	getFontSized: () => getFontSized
 });
 module.exports = __toCommonJS(index_exports);
-var import_constants = require("@tamagui/constants");
+var import_size = require("@tamagui/size");
 var import_web = require("@tamagui/web");
-const getFontSized = (sizeTokenIn = "$true", {
-  font,
-  fontFamily,
-  props
-}) => {
-  if (!font) {
-    return {
-      fontSize: sizeTokenIn
-    };
-  }
-  const sizeToken = sizeTokenIn === "$true" ? getDefaultSizeToken(font) : sizeTokenIn;
-  const style = {};
-  if (typeof sizeToken === "number") {
-    style.fontSize = sizeToken;
-    if (fontFamily) style.fontFamily = fontFamily;
-    if (props.fontStyle) style.fontStyle = props.fontStyle;
-    if (props.color) style.color = props.color;
-    return style;
-  }
-  const fontSize = font.size[sizeToken];
-  const lineHeight = font.lineHeight?.[sizeToken];
-  const fontWeight = font.weight?.[sizeToken];
-  const letterSpacing = font.letterSpacing?.[sizeToken];
-  const textTransform = font.transform?.[sizeToken];
-  const fontStyle = props.fontStyle ?? font.style?.[sizeToken];
-  const color = props.color ?? font.color?.[sizeToken];
-  if (fontStyle) style.fontStyle = fontStyle;
-  if (textTransform) style.textTransform = textTransform;
-  if (fontFamily) style.fontFamily = fontFamily;
-  if (fontWeight) style.fontWeight = fontWeight;
-  if (letterSpacing) style.letterSpacing = letterSpacing;
-  if (fontSize) style.fontSize = fontSize;
-  if (lineHeight) style.lineHeight = lineHeight;
-  if (color) style.color = color;
-  if (process.env.NODE_ENV === "development") {
-    if (props["debug"] && props["debug"] === "verbose") {
-      console.groupCollapsed("  \u{1F539} getFontSized", sizeTokenIn, sizeToken);
-      if (import_constants.isClient) {
-        console.info({
-          style,
-          props,
-          font
-        });
-      }
-      console.groupEnd();
-    }
-  }
-  return style;
-};
+const getFontSized = import_web.styled.dynamic((sizeTokenIn = true, env) => {
+	const { font, fontFamily } = env;
+	if (!font) {
+		return { fontSize: sizeTokenIn };
+	}
+	if (typeof sizeTokenIn === "number") {
+		return {
+			fontSize: sizeTokenIn,
+			fontFamily
+		};
+	}
+	const key = String(sizeTokenIn).replace(/^\$/, "");
+	const sizeToken = sizeTokenIn === true || env.sizes?.[key] != null ? (0, import_size.resolveSize)(sizeTokenIn, env).fontSizeKey : key;
+	const fontSize = font.size[sizeToken];
+	const lineHeight = font.lineHeight?.[sizeToken];
+	const fontWeight = font.weight?.[sizeToken];
+	const letterSpacing = font.letterSpacing?.[sizeToken];
+	const textTransform = font.transform?.[sizeToken];
+	const fontStyle = font.style?.[sizeToken];
+	const color = font.color?.[sizeToken];
+	return {
+		color,
+		fontFamily,
+		fontSize,
+		fontStyle,
+		fontWeight,
+		letterSpacing,
+		lineHeight,
+		textTransform
+	};
+});
 const SizableText = (0, import_web.styled)(import_web.Text, {
-  name: "SizableText",
-  fontFamily: "$body",
-  variants: {
-    size: {
-      "...fontSize": getFontSized
-    }
-  },
-  defaultVariants: {
-    size: "$true"
-  }
+	displayName: "SizableText",
+	fontFamily: "body",
+	variants: { size: getFontSized },
+	defaultVariants: { size: true }
 });
-const cache = /* @__PURE__ */new WeakMap();
-function getDefaultSizeToken(font) {
-  if (typeof font === "object" && cache.has(font)) {
-    return cache.get(font);
-  }
-  const tokens = (0, import_web.getTokens)();
-  const sizeTokens = "$true" in font.size ? font.size : tokens?.size;
-  if (!sizeTokens) {
-    return Object.keys(font.size)[3];
-  }
-  const sizeDefault = sizeTokens["$true"];
-  const sizeDefaultSpecific = sizeDefault ? Object.keys(sizeTokens).find(x => x !== "$true" && sizeTokens[x]["val"] === sizeDefault["val"]) : null;
-  if (!sizeDefault || !sizeDefaultSpecific) {
-    if (process.env.NODE_ENV === "development") {
-      console.warn(`No default size is set in your tokens for the "true" key, fonts will be inconsistent.
-
-      Fix this by having consistent tokens across fonts and sizes and setting a true key for your size tokens, or
-      set true keys for all your font tokens: "size", "lineHeight", "fontStyle", etc.`);
-    }
-    return Object.keys(font.size)[3];
-  }
-  cache.set(font, sizeDefaultSpecific);
-  return sizeDefaultSpecific;
-}

package/dist/cjs/index.native.cjs

@@ -0,0 +1,69 @@
+"use strict";
+
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+	for (var name in all) __defProp(target, name, {
+		get: all[name],
+		enumerable: true
+	});
+};
+var __copyProps = (to, from, except, desc) => {
+	if (from && typeof from === "object" || typeof from === "function") {
+		for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
+			get: () => from[key],
+			enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+		});
+	}
+	return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var index_exports = {};
+__export(index_exports, {
+	SizableText: () => SizableText,
+	getFontSized: () => getFontSized
+});
+module.exports = __toCommonJS(index_exports);
+var import_size = require("@tamagui/size");
+var import_web = require("@tamagui/web");
+var getFontSized = import_web.styled.dynamic(function() {
+	var sizeTokenIn = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : true, env = arguments.length > 1 ? arguments[1] : void 0;
+	var _env_sizes, _font_lineHeight, _font_weight, _font_letterSpacing, _font_transform, _font_style, _font_color;
+	var { font, fontFamily } = env;
+	if (!font) {
+		return { fontSize: sizeTokenIn };
+	}
+	if (typeof sizeTokenIn === "number") {
+		return {
+			fontSize: sizeTokenIn,
+			fontFamily
+		};
+	}
+	var key = String(sizeTokenIn).replace(/^\$/, "");
+	var sizeToken = sizeTokenIn === true || ((_env_sizes = env.sizes) === null || _env_sizes === void 0 ? void 0 : _env_sizes[key]) != null ? (0, import_size.resolveSize)(sizeTokenIn, env).fontSizeKey : key;
+	var fontSize = font.size[sizeToken];
+	var lineHeight = (_font_lineHeight = font.lineHeight) === null || _font_lineHeight === void 0 ? void 0 : _font_lineHeight[sizeToken];
+	var fontWeight = (_font_weight = font.weight) === null || _font_weight === void 0 ? void 0 : _font_weight[sizeToken];
+	var letterSpacing = (_font_letterSpacing = font.letterSpacing) === null || _font_letterSpacing === void 0 ? void 0 : _font_letterSpacing[sizeToken];
+	var textTransform = (_font_transform = font.transform) === null || _font_transform === void 0 ? void 0 : _font_transform[sizeToken];
+	var fontStyle = (_font_style = font.style) === null || _font_style === void 0 ? void 0 : _font_style[sizeToken];
+	var color = (_font_color = font.color) === null || _font_color === void 0 ? void 0 : _font_color[sizeToken];
+	return {
+		color,
+		fontFamily,
+		fontSize,
+		fontStyle,
+		fontWeight,
+		letterSpacing,
+		lineHeight,
+		textTransform
+	};
+});
+var SizableText = (0, import_web.styled)(import_web.Text, {
+	displayName: "SizableText",
+	fontFamily: "body",
+	variants: { size: getFontSized },
+	defaultVariants: { size: true }
+});

package/dist/cjs/index.native.js

@@ -5,126 +5,67 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
-  for (var name in all) __defProp(target, name, {
-    get: all[name],
-    enumerable: true
-  });
+	for (var name in all) __defProp(target, name, {
+		get: all[name],
+		enumerable: true
+	});
 };
 var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
-      get: () => from[key],
-      enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
-    });
-  }
-  return to;
+	if (from && typeof from === "object" || typeof from === "function") {
+		for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
+			get: () => from[key],
+			enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+		});
+	}
+	return to;
 };
-var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
-  value: true
-}), mod);
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var index_exports = {};
 __export(index_exports, {
-  SizableText: () => SizableText,
-  getFontSized: () => getFontSized
+	SizableText: () => SizableText,
+	getFontSized: () => getFontSized
 });
 module.exports = __toCommonJS(index_exports);
-var import_constants = require("@tamagui/constants");
+var import_size = require("@tamagui/size");
 var import_web = require("@tamagui/web");
-function _type_of(obj) {
-  "@swc/helpers - typeof";
-
-  return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
-}
-var getFontSized = function () {
-  var sizeTokenIn = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : "$true",
-    {
-      font,
-      fontFamily,
-      props
-    } = arguments.length > 1 ? arguments[1] : void 0;
-  var _font_lineHeight, _font_weight, _font_letterSpacing, _font_transform, _font_style, _font_color;
-  if (!font) {
-    return {
-      fontSize: sizeTokenIn
-    };
-  }
-  var sizeToken = sizeTokenIn === "$true" ? getDefaultSizeToken(font) : sizeTokenIn;
-  var style = {};
-  if (typeof sizeToken === "number") {
-    style.fontSize = sizeToken;
-    if (fontFamily) style.fontFamily = fontFamily;
-    if (props.fontStyle) style.fontStyle = props.fontStyle;
-    if (props.color) style.color = props.color;
-    return style;
-  }
-  var fontSize = font.size[sizeToken];
-  var lineHeight = (_font_lineHeight = font.lineHeight) === null || _font_lineHeight === void 0 ? void 0 : _font_lineHeight[sizeToken];
-  var fontWeight = (_font_weight = font.weight) === null || _font_weight === void 0 ? void 0 : _font_weight[sizeToken];
-  var letterSpacing = (_font_letterSpacing = font.letterSpacing) === null || _font_letterSpacing === void 0 ? void 0 : _font_letterSpacing[sizeToken];
-  var textTransform = (_font_transform = font.transform) === null || _font_transform === void 0 ? void 0 : _font_transform[sizeToken];
-  var _props_fontStyle;
-  var fontStyle = (_props_fontStyle = props.fontStyle) !== null && _props_fontStyle !== void 0 ? _props_fontStyle : (_font_style = font.style) === null || _font_style === void 0 ? void 0 : _font_style[sizeToken];
-  var _props_color;
-  var color = (_props_color = props.color) !== null && _props_color !== void 0 ? _props_color : (_font_color = font.color) === null || _font_color === void 0 ? void 0 : _font_color[sizeToken];
-  if (fontStyle) style.fontStyle = fontStyle;
-  if (textTransform) style.textTransform = textTransform;
-  if (fontFamily) style.fontFamily = fontFamily;
-  if (fontWeight) style.fontWeight = fontWeight;
-  if (letterSpacing) style.letterSpacing = letterSpacing;
-  if (fontSize) style.fontSize = fontSize;
-  if (lineHeight) style.lineHeight = lineHeight;
-  if (color) style.color = color;
-  if (process.env.NODE_ENV === "development") {
-    if (props["debug"] && props["debug"] === "verbose") {
-      console.groupCollapsed("  \u{1F539} getFontSized", sizeTokenIn, sizeToken);
-      if (import_constants.isClient) {
-        console.info({
-          style,
-          props,
-          font
-        });
-      }
-      console.groupEnd();
-    }
-  }
-  return style;
-};
+var getFontSized = import_web.styled.dynamic(function() {
+	var sizeTokenIn = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : true, env = arguments.length > 1 ? arguments[1] : void 0;
+	var _env_sizes, _font_lineHeight, _font_weight, _font_letterSpacing, _font_transform, _font_style, _font_color;
+	var { font, fontFamily } = env;
+	if (!font) {
+		return { fontSize: sizeTokenIn };
+	}
+	if (typeof sizeTokenIn === "number") {
+		return {
+			fontSize: sizeTokenIn,
+			fontFamily
+		};
+	}
+	var key = String(sizeTokenIn).replace(/^\$/, "");
+	var sizeToken = sizeTokenIn === true || ((_env_sizes = env.sizes) === null || _env_sizes === void 0 ? void 0 : _env_sizes[key]) != null ? (0, import_size.resolveSize)(sizeTokenIn, env).fontSizeKey : key;
+	var fontSize = font.size[sizeToken];
+	var lineHeight = (_font_lineHeight = font.lineHeight) === null || _font_lineHeight === void 0 ? void 0 : _font_lineHeight[sizeToken];
+	var fontWeight = (_font_weight = font.weight) === null || _font_weight === void 0 ? void 0 : _font_weight[sizeToken];
+	var letterSpacing = (_font_letterSpacing = font.letterSpacing) === null || _font_letterSpacing === void 0 ? void 0 : _font_letterSpacing[sizeToken];
+	var textTransform = (_font_transform = font.transform) === null || _font_transform === void 0 ? void 0 : _font_transform[sizeToken];
+	var fontStyle = (_font_style = font.style) === null || _font_style === void 0 ? void 0 : _font_style[sizeToken];
+	var color = (_font_color = font.color) === null || _font_color === void 0 ? void 0 : _font_color[sizeToken];
+	return {
+		color,
+		fontFamily,
+		fontSize,
+		fontStyle,
+		fontWeight,
+		letterSpacing,
+		lineHeight,
+		textTransform
+	};
+});
 var SizableText = (0, import_web.styled)(import_web.Text, {
-  name: "SizableText",
-  fontFamily: "$body",
-  variants: {
-    size: {
-      "...fontSize": getFontSized
-    }
-  },
-  defaultVariants: {
-    size: "$true"
-  }
+	displayName: "SizableText",
+	fontFamily: "body",
+	variants: { size: getFontSized },
+	defaultVariants: { size: true }
 });
-var cache = /* @__PURE__ */new WeakMap();
-function getDefaultSizeToken(font) {
-  if ((typeof font === "undefined" ? "undefined" : _type_of(font)) === "object" && cache.has(font)) {
-    return cache.get(font);
-  }
-  var tokens = (0, import_web.getTokens)();
-  var sizeTokens = "$true" in font.size ? font.size : tokens === null || tokens === void 0 ? void 0 : tokens.size;
-  if (!sizeTokens) {
-    return Object.keys(font.size)[3];
-  }
-  var sizeDefault = sizeTokens["$true"];
-  var sizeDefaultSpecific = sizeDefault ? Object.keys(sizeTokens).find(function (x) {
-    return x !== "$true" && sizeTokens[x]["val"] === sizeDefault["val"];
-  }) : null;
-  if (!sizeDefault || !sizeDefaultSpecific) {
-    if (process.env.NODE_ENV === "development") {
-      console.warn(`No default size is set in your tokens for the "true" key, fonts will be inconsistent.
 
-      Fix this by having consistent tokens across fonts and sizes and setting a true key for your size tokens, or
-      set true keys for all your font tokens: "size", "lineHeight", "fontStyle", etc.`);
-    }
-    return Object.keys(font.size)[3];
-  }
-  cache.set(font, sizeDefaultSpecific);
-  return sizeDefaultSpecific;
-}
 //# sourceMappingURL=index.native.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","index_exports","__export","SizableText","getFontSized","module","exports","import_constants","require","import_web","_type_of","obj","Symbol","constructor","sizeTokenIn","arguments","length","font","fontFamily","props","_font_lineHeight","_font_weight","_font_letterSpacing","_font_transform","_font_style","_font_color","fontSize","sizeToken","getDefaultSizeToken","style","fontStyle","color","size","lineHeight","fontWeight","weight","letterSpacing","textTransform","transform","_props_fontStyle","_props_color","process","env","NODE_ENV","console","groupCollapsed","isClient","info","groupEnd","styled","Text","name","variants","defaultVariants","cache","WeakMap","has","get","tokens","getTokens","sizeTokens","Object","keys","sizeDefault","sizeDefaultSpecific","find","x"],"sources":["../../src/index.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"index.native.js","names":[],"sources":["cjs/index.native.js"],"sourcesContent":["\"use strict\";\nvar __defProp = Object.defineProperty;\nvar __getOwnPropDesc = Object.getOwnPropertyDescriptor;\nvar __getOwnPropNames = Object.getOwnPropertyNames;\nvar __hasOwnProp = Object.prototype.hasOwnProperty;\nvar __export = (target, all) => {\n  for (var name in all)\n    __defProp(target, name, { get: all[name], enumerable: true });\n};\nvar __copyProps = (to, from, except, desc) => {\n  if (from && typeof from === \"object\" || typeof from === \"function\") {\n    for (let key of __getOwnPropNames(from))\n      if (!__hasOwnProp.call(to, key) && key !== except)\n        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });\n  }\n  return to;\n};\nvar __toCommonJS = (mod) => __copyProps(__defProp({}, \"__esModule\", { value: true }), mod);\nvar index_exports = {};\n__export(index_exports, {\n  SizableText: () => SizableText,\n  getFontSized: () => getFontSized\n});\nmodule.exports = __toCommonJS(index_exports);\nvar import_size = require(\"@tamagui/size\");\nvar import_web = require(\"@tamagui/web\");\nvar getFontSized = import_web.styled.dynamic(function() {\n  var sizeTokenIn = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : true, env = arguments.length > 1 ? arguments[1] : void 0;\n  var _env_sizes, _font_lineHeight, _font_weight, _font_letterSpacing, _font_transform, _font_style, _font_color;\n  var { font, fontFamily } = env;\n  if (!font) {\n    return {\n      fontSize: sizeTokenIn\n    };\n  }\n  if (typeof sizeTokenIn === \"number\") {\n    return {\n      fontSize: sizeTokenIn,\n      fontFamily\n    };\n  }\n  var key = String(sizeTokenIn).replace(/^\\$/, \"\");\n  var sizeToken = sizeTokenIn === true || ((_env_sizes = env.sizes) === null || _env_sizes === void 0 ? void 0 : _env_sizes[key]) != null ? (0, import_size.resolveSize)(sizeTokenIn, env).fontSizeKey : key;\n  var fontSize = font.size[sizeToken];\n  var lineHeight = (_font_lineHeight = font.lineHeight) === null || _font_lineHeight === void 0 ? void 0 : _font_lineHeight[sizeToken];\n  var fontWeight = (_font_weight = font.weight) === null || _font_weight === void 0 ? void 0 : _font_weight[sizeToken];\n  var letterSpacing = (_font_letterSpacing = font.letterSpacing) === null || _font_letterSpacing === void 0 ? void 0 : _font_letterSpacing[sizeToken];\n  var textTransform = (_font_transform = font.transform) === null || _font_transform === void 0 ? void 0 : _font_transform[sizeToken];\n  var fontStyle = (_font_style = font.style) === null || _font_style === void 0 ? void 0 : _font_style[sizeToken];\n  var color = (_font_color = font.color) === null || _font_color === void 0 ? void 0 : _font_color[sizeToken];\n  return {\n    color,\n    fontFamily,\n    fontSize,\n    fontStyle,\n    fontWeight,\n    letterSpacing,\n    lineHeight,\n    textTransform\n  };\n});\nvar SizableText = (0, import_web.styled)(import_web.Text, {\n  displayName: \"SizableText\",\n  fontFamily: \"body\",\n  variants: {\n    size: getFontSized\n  },\n  defaultVariants: {\n    size: true\n  }\n});\n//# sourceMappingURL=index.js.map\n"],"mappings":";;;AACA,IAAI,YAAY,OAAO;AACvB,IAAI,mBAAmB,OAAO;AAC9B,IAAI,oBAAoB,OAAO;AAC/B,IAAI,eAAe,OAAO,UAAU;AACpC,IAAI,YAAY,QAAQ,QAAQ;CAC9B,KAAK,IAAI,QAAQ,KACf,UAAU,QAAQ,MAAM;EAAE,KAAK,IAAI;EAAO,YAAY;CAAK,CAAC;AAChE;AACA,IAAI,eAAe,IAAI,MAAM,QAAQ,SAAS;CAC5C,IAAI,QAAQ,OAAO,SAAS,YAAY,OAAO,SAAS,YAAY;EAClE,KAAK,IAAI,OAAO,kBAAkB,IAAI,GACpC,IAAI,CAAC,aAAa,KAAK,IAAI,GAAG,KAAK,QAAQ,QACzC,UAAU,IAAI,KAAK;GAAE,WAAW,KAAK;GAAM,YAAY,EAAE,OAAO,iBAAiB,MAAM,GAAG,MAAM,KAAK;EAAW,CAAC;CACvH;CACA,OAAO;AACT;AACA,IAAI,gBAAgB,QAAQ,YAAY,UAAU,CAAC,GAAG,cAAc,EAAE,OAAO,KAAK,CAAC,GAAG,GAAG;AACzF,IAAI,gBAAgB,CAAC;AACrB,SAAS,eAAe;CACtB,mBAAmB;CACnB,oBAAoB;AACtB,CAAC;AACD,OAAO,UAAU,aAAa,aAAa;AAC3C,IAAI,cAAc,QAAQ,eAAe;AACzC,IAAI,aAAa,QAAQ,cAAc;AACvC,IAAI,eAAe,WAAW,OAAO,QAAQ,WAAW;CACtD,IAAI,cAAc,UAAU,SAAS,KAAK,UAAU,OAAO,KAAK,IAAI,UAAU,KAAK,MAAM,MAAM,UAAU,SAAS,IAAI,UAAU,KAAK,KAAK;CAC1I,IAAI,YAAY,kBAAkB,cAAc,qBAAqB,iBAAiB,aAAa;CACnG,IAAI,EAAE,MAAM,eAAe;CAC3B,IAAI,CAAC,MAAM;EACT,OAAO,EACL,UAAU,YACZ;CACF;CACA,IAAI,OAAO,gBAAgB,UAAU;EACnC,OAAO;GACL,UAAU;GACV;EACF;CACF;CACA,IAAI,MAAM,OAAO,WAAW,CAAC,CAAC,QAAQ,OAAO,EAAE;CAC/C,IAAI,YAAY,gBAAgB,UAAU,aAAa,IAAI,WAAW,QAAQ,eAAe,KAAK,IAAI,KAAK,IAAI,WAAW,SAAS,QAAQ,GAAG,YAAY,YAAW,CAAE,aAAa,GAAG,CAAC,CAAC,cAAc;CACvM,IAAI,WAAW,KAAK,KAAK;CACzB,IAAI,cAAc,mBAAmB,KAAK,gBAAgB,QAAQ,qBAAqB,KAAK,IAAI,KAAK,IAAI,iBAAiB;CAC1H,IAAI,cAAc,eAAe,KAAK,YAAY,QAAQ,iBAAiB,KAAK,IAAI,KAAK,IAAI,aAAa;CAC1G,IAAI,iBAAiB,sBAAsB,KAAK,mBAAmB,QAAQ,wBAAwB,KAAK,IAAI,KAAK,IAAI,oBAAoB;CACzI,IAAI,iBAAiB,kBAAkB,KAAK,eAAe,QAAQ,oBAAoB,KAAK,IAAI,KAAK,IAAI,gBAAgB;CACzH,IAAI,aAAa,cAAc,KAAK,WAAW,QAAQ,gBAAgB,KAAK,IAAI,KAAK,IAAI,YAAY;CACrG,IAAI,SAAS,cAAc,KAAK,WAAW,QAAQ,gBAAgB,KAAK,IAAI,KAAK,IAAI,YAAY;CACjG,OAAO;EACL;EACA;EACA;EACA;EACA;EACA;EACA;EACA;CACF;AACF,CAAC;AACD,IAAI,eAAe,GAAG,WAAW,OAAM,CAAE,WAAW,MAAM;CACxD,aAAa;CACb,YAAY;CACZ,UAAU,EACR,MAAM,aACR;CACA,iBAAiB,EACf,MAAM,KACR;AACF,CAAC"}

package/dist/esm/index.js

@@ -1,89 +1,43 @@
-import { isClient } from "@tamagui/constants";
-import { getTokens, styled, Text } from "@tamagui/web";
-const getFontSized = (sizeTokenIn = "$true", {
-  font,
-  fontFamily,
-  props
-}) => {
-  if (!font) {
-    return {
-      fontSize: sizeTokenIn
-    };
-  }
-  const sizeToken = sizeTokenIn === "$true" ? getDefaultSizeToken(font) : sizeTokenIn;
-  const style = {};
-  if (typeof sizeToken === "number") {
-    style.fontSize = sizeToken;
-    if (fontFamily) style.fontFamily = fontFamily;
-    if (props.fontStyle) style.fontStyle = props.fontStyle;
-    if (props.color) style.color = props.color;
-    return style;
-  }
-  const fontSize = font.size[sizeToken];
-  const lineHeight = font.lineHeight?.[sizeToken];
-  const fontWeight = font.weight?.[sizeToken];
-  const letterSpacing = font.letterSpacing?.[sizeToken];
-  const textTransform = font.transform?.[sizeToken];
-  const fontStyle = props.fontStyle ?? font.style?.[sizeToken];
-  const color = props.color ?? font.color?.[sizeToken];
-  if (fontStyle) style.fontStyle = fontStyle;
-  if (textTransform) style.textTransform = textTransform;
-  if (fontFamily) style.fontFamily = fontFamily;
-  if (fontWeight) style.fontWeight = fontWeight;
-  if (letterSpacing) style.letterSpacing = letterSpacing;
-  if (fontSize) style.fontSize = fontSize;
-  if (lineHeight) style.lineHeight = lineHeight;
-  if (color) style.color = color;
-  if (process.env.NODE_ENV === "development") {
-    if (props["debug"] && props["debug"] === "verbose") {
-      console.groupCollapsed("  \u{1F539} getFontSized", sizeTokenIn, sizeToken);
-      if (isClient) {
-        console.info({
-          style,
-          props,
-          font
-        });
-      }
-      console.groupEnd();
-    }
-  }
-  return style;
-};
+import { resolveSize } from "@tamagui/size";
+import { Text, styled } from "@tamagui/web";
+
+const getFontSized = styled.dynamic((sizeTokenIn = true, env) => {
+	const { font, fontFamily } = env;
+	if (!font) {
+		return { fontSize: sizeTokenIn };
+	}
+	if (typeof sizeTokenIn === "number") {
+		return {
+			fontSize: sizeTokenIn,
+			fontFamily
+		};
+	}
+	const key = String(sizeTokenIn).replace(/^\$/, "");
+	const sizeToken = sizeTokenIn === true || env.sizes?.[key] != null ? resolveSize(sizeTokenIn, env).fontSizeKey : key;
+	const fontSize = font.size[sizeToken];
+	const lineHeight = font.lineHeight?.[sizeToken];
+	const fontWeight = font.weight?.[sizeToken];
+	const letterSpacing = font.letterSpacing?.[sizeToken];
+	const textTransform = font.transform?.[sizeToken];
+	const fontStyle = font.style?.[sizeToken];
+	const color = font.color?.[sizeToken];
+	return {
+		color,
+		fontFamily,
+		fontSize,
+		fontStyle,
+		fontWeight,
+		letterSpacing,
+		lineHeight,
+		textTransform
+	};
+});
 const SizableText = styled(Text, {
-  name: "SizableText",
-  fontFamily: "$body",
-  variants: {
-    size: {
-      "...fontSize": getFontSized
-    }
-  },
-  defaultVariants: {
-    size: "$true"
-  }
+	displayName: "SizableText",
+	fontFamily: "body",
+	variants: { size: getFontSized },
+	defaultVariants: { size: true }
 });
-const cache = /* @__PURE__ */new WeakMap();
-function getDefaultSizeToken(font) {
-  if (typeof font === "object" && cache.has(font)) {
-    return cache.get(font);
-  }
-  const tokens = getTokens();
-  const sizeTokens = "$true" in font.size ? font.size : tokens?.size;
-  if (!sizeTokens) {
-    return Object.keys(font.size)[3];
-  }
-  const sizeDefault = sizeTokens["$true"];
-  const sizeDefaultSpecific = sizeDefault ? Object.keys(sizeTokens).find(x => x !== "$true" && sizeTokens[x]["val"] === sizeDefault["val"]) : null;
-  if (!sizeDefault || !sizeDefaultSpecific) {
-    if (process.env.NODE_ENV === "development") {
-      console.warn(`No default size is set in your tokens for the "true" key, fonts will be inconsistent.
 
-      Fix this by having consistent tokens across fonts and sizes and setting a true key for your size tokens, or
-      set true keys for all your font tokens: "size", "lineHeight", "fontStyle", etc.`);
-    }
-    return Object.keys(font.size)[3];
-  }
-  cache.set(font, sizeDefaultSpecific);
-  return sizeDefaultSpecific;
-}
 export { SizableText, getFontSized };
 //# sourceMappingURL=index.js.map

package/dist/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["isClient","getTokens","styled","Text","getFontSized","sizeTokenIn","font","fontFamily","props","fontSize","sizeToken","getDefaultSizeToken","style","fontStyle","color","size","lineHeight","fontWeight","weight","letterSpacing","textTransform","transform","process","env","NODE_ENV","console","groupCollapsed","info","groupEnd","SizableText","name","variants","defaultVariants","cache","WeakMap","has","get","tokens","sizeTokens","Object","keys","sizeDefault","sizeDefaultSpecific","find","x","warn","set"],"sources":["../../src/index.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"index.js","names":[],"sources":["esm/index.js"],"sourcesContent":["import { resolveSize } from \"@tamagui/size\";\nimport { styled, Text } from \"@tamagui/web\";\nconst getFontSized = styled.dynamic(\n  (sizeTokenIn = true, env) => {\n    const { font, fontFamily } = env;\n    if (!font) {\n      return {\n        fontSize: sizeTokenIn\n      };\n    }\n    if (typeof sizeTokenIn === \"number\") {\n      return {\n        fontSize: sizeTokenIn,\n        fontFamily\n      };\n    }\n    const key = String(sizeTokenIn).replace(/^\\$/, \"\");\n    const sizeToken = sizeTokenIn === true || env.sizes?.[key] != null ? resolveSize(sizeTokenIn, env).fontSizeKey : key;\n    const fontSize = font.size[sizeToken];\n    const lineHeight = font.lineHeight?.[sizeToken];\n    const fontWeight = font.weight?.[sizeToken];\n    const letterSpacing = font.letterSpacing?.[sizeToken];\n    const textTransform = font.transform?.[sizeToken];\n    const fontStyle = font.style?.[sizeToken];\n    const color = font.color?.[sizeToken];\n    return {\n      color,\n      fontFamily,\n      fontSize,\n      fontStyle,\n      fontWeight,\n      letterSpacing,\n      lineHeight,\n      textTransform\n    };\n  }\n);\nconst SizableText = styled(Text, {\n  displayName: \"SizableText\",\n  fontFamily: \"body\",\n  variants: {\n    size: getFontSized\n  },\n  defaultVariants: {\n    size: true\n  }\n});\nexport {\n  SizableText,\n  getFontSized\n};\n//# sourceMappingURL=index.js.map\n"],"mappings":";;;;AAEA,MAAM,eAAe,OAAO,SACzB,cAAc,MAAM,QAAQ;CAC3B,MAAM,EAAE,MAAM,eAAe;CAC7B,IAAI,CAAC,MAAM;EACT,OAAO,EACL,UAAU,YACZ;CACF;CACA,IAAI,OAAO,gBAAgB,UAAU;EACnC,OAAO;GACL,UAAU;GACV;EACF;CACF;CACA,MAAM,MAAM,OAAO,WAAW,CAAC,CAAC,QAAQ,OAAO,EAAE;CACjD,MAAM,YAAY,gBAAgB,QAAQ,IAAI,QAAQ,QAAQ,OAAO,YAAY,aAAa,GAAG,CAAC,CAAC,cAAc;CACjH,MAAM,WAAW,KAAK,KAAK;CAC3B,MAAM,aAAa,KAAK,aAAa;CACrC,MAAM,aAAa,KAAK,SAAS;CACjC,MAAM,gBAAgB,KAAK,gBAAgB;CAC3C,MAAM,gBAAgB,KAAK,YAAY;CACvC,MAAM,YAAY,KAAK,QAAQ;CAC/B,MAAM,QAAQ,KAAK,QAAQ;CAC3B,OAAO;EACL;EACA;EACA;EACA;EACA;EACA;EACA;EACA;CACF;AACF,CACF;AACA,MAAM,cAAc,OAAO,MAAM;CAC/B,aAAa;CACb,YAAY;CACZ,UAAU,EACR,MAAM,aACR;CACA,iBAAiB,EACf,MAAM,KACR;AACF,CAAC"}

package/dist/esm/index.mjs

@@ -1,89 +1,43 @@
-import { isClient } from "@tamagui/constants";
-import { getTokens, styled, Text } from "@tamagui/web";
-const getFontSized = (sizeTokenIn = "$true", {
-  font,
-  fontFamily,
-  props
-}) => {
-  if (!font) {
-    return {
-      fontSize: sizeTokenIn
-    };
-  }
-  const sizeToken = sizeTokenIn === "$true" ? getDefaultSizeToken(font) : sizeTokenIn;
-  const style = {};
-  if (typeof sizeToken === "number") {
-    style.fontSize = sizeToken;
-    if (fontFamily) style.fontFamily = fontFamily;
-    if (props.fontStyle) style.fontStyle = props.fontStyle;
-    if (props.color) style.color = props.color;
-    return style;
-  }
-  const fontSize = font.size[sizeToken];
-  const lineHeight = font.lineHeight?.[sizeToken];
-  const fontWeight = font.weight?.[sizeToken];
-  const letterSpacing = font.letterSpacing?.[sizeToken];
-  const textTransform = font.transform?.[sizeToken];
-  const fontStyle = props.fontStyle ?? font.style?.[sizeToken];
-  const color = props.color ?? font.color?.[sizeToken];
-  if (fontStyle) style.fontStyle = fontStyle;
-  if (textTransform) style.textTransform = textTransform;
-  if (fontFamily) style.fontFamily = fontFamily;
-  if (fontWeight) style.fontWeight = fontWeight;
-  if (letterSpacing) style.letterSpacing = letterSpacing;
-  if (fontSize) style.fontSize = fontSize;
-  if (lineHeight) style.lineHeight = lineHeight;
-  if (color) style.color = color;
-  if (process.env.NODE_ENV === "development") {
-    if (props["debug"] && props["debug"] === "verbose") {
-      console.groupCollapsed("  \u{1F539} getFontSized", sizeTokenIn, sizeToken);
-      if (isClient) {
-        console.info({
-          style,
-          props,
-          font
-        });
-      }
-      console.groupEnd();
-    }
-  }
-  return style;
-};
+import { resolveSize } from "@tamagui/size";
+import { Text, styled } from "@tamagui/web";
+
+const getFontSized = styled.dynamic((sizeTokenIn = true, env) => {
+	const { font, fontFamily } = env;
+	if (!font) {
+		return { fontSize: sizeTokenIn };
+	}
+	if (typeof sizeTokenIn === "number") {
+		return {
+			fontSize: sizeTokenIn,
+			fontFamily
+		};
+	}
+	const key = String(sizeTokenIn).replace(/^\$/, "");
+	const sizeToken = sizeTokenIn === true || env.sizes?.[key] != null ? resolveSize(sizeTokenIn, env).fontSizeKey : key;
+	const fontSize = font.size[sizeToken];
+	const lineHeight = font.lineHeight?.[sizeToken];
+	const fontWeight = font.weight?.[sizeToken];
+	const letterSpacing = font.letterSpacing?.[sizeToken];
+	const textTransform = font.transform?.[sizeToken];
+	const fontStyle = font.style?.[sizeToken];
+	const color = font.color?.[sizeToken];
+	return {
+		color,
+		fontFamily,
+		fontSize,
+		fontStyle,
+		fontWeight,
+		letterSpacing,
+		lineHeight,
+		textTransform
+	};
+});
 const SizableText = styled(Text, {
-  name: "SizableText",
-  fontFamily: "$body",
-  variants: {
-    size: {
-      "...fontSize": getFontSized
-    }
-  },
-  defaultVariants: {
-    size: "$true"
-  }
+	displayName: "SizableText",
+	fontFamily: "body",
+	variants: { size: getFontSized },
+	defaultVariants: { size: true }
 });
-const cache = /* @__PURE__ */new WeakMap();
-function getDefaultSizeToken(font) {
-  if (typeof font === "object" && cache.has(font)) {
-    return cache.get(font);
-  }
-  const tokens = getTokens();
-  const sizeTokens = "$true" in font.size ? font.size : tokens?.size;
-  if (!sizeTokens) {
-    return Object.keys(font.size)[3];
-  }
-  const sizeDefault = sizeTokens["$true"];
-  const sizeDefaultSpecific = sizeDefault ? Object.keys(sizeTokens).find(x => x !== "$true" && sizeTokens[x]["val"] === sizeDefault["val"]) : null;
-  if (!sizeDefault || !sizeDefaultSpecific) {
-    if (process.env.NODE_ENV === "development") {
-      console.warn(`No default size is set in your tokens for the "true" key, fonts will be inconsistent.
 
-      Fix this by having consistent tokens across fonts and sizes and setting a true key for your size tokens, or
-      set true keys for all your font tokens: "size", "lineHeight", "fontStyle", etc.`);
-    }
-    return Object.keys(font.size)[3];
-  }
-  cache.set(font, sizeDefaultSpecific);
-  return sizeDefaultSpecific;
-}
 export { SizableText, getFontSized };
 //# sourceMappingURL=index.mjs.map

package/dist/esm/index.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["isClient","getTokens","styled","Text","getFontSized","sizeTokenIn","font","fontFamily","props","fontSize","sizeToken","getDefaultSizeToken","style","fontStyle","color","size","lineHeight","fontWeight","weight","letterSpacing","textTransform","transform","process","env","NODE_ENV","console","groupCollapsed","info","groupEnd","SizableText","name","variants","defaultVariants","cache","WeakMap","has","get","tokens","sizeTokens","Object","keys","sizeDefault","sizeDefaultSpecific","find","x","warn","set"],"sources":["../../src/index.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"index.js","names":[],"sources":["esm/index.js"],"sourcesContent":["import { resolveSize } from \"@tamagui/size\";\nimport { styled, Text } from \"@tamagui/web\";\nconst getFontSized = styled.dynamic(\n  (sizeTokenIn = true, env) => {\n    const { font, fontFamily } = env;\n    if (!font) {\n      return {\n        fontSize: sizeTokenIn\n      };\n    }\n    if (typeof sizeTokenIn === \"number\") {\n      return {\n        fontSize: sizeTokenIn,\n        fontFamily\n      };\n    }\n    const key = String(sizeTokenIn).replace(/^\\$/, \"\");\n    const sizeToken = sizeTokenIn === true || env.sizes?.[key] != null ? resolveSize(sizeTokenIn, env).fontSizeKey : key;\n    const fontSize = font.size[sizeToken];\n    const lineHeight = font.lineHeight?.[sizeToken];\n    const fontWeight = font.weight?.[sizeToken];\n    const letterSpacing = font.letterSpacing?.[sizeToken];\n    const textTransform = font.transform?.[sizeToken];\n    const fontStyle = font.style?.[sizeToken];\n    const color = font.color?.[sizeToken];\n    return {\n      color,\n      fontFamily,\n      fontSize,\n      fontStyle,\n      fontWeight,\n      letterSpacing,\n      lineHeight,\n      textTransform\n    };\n  }\n);\nconst SizableText = styled(Text, {\n  displayName: \"SizableText\",\n  fontFamily: \"body\",\n  variants: {\n    size: getFontSized\n  },\n  defaultVariants: {\n    size: true\n  }\n});\nexport {\n  SizableText,\n  getFontSized\n};\n//# sourceMappingURL=index.js.map\n"],"mappings":";;;;AAEA,MAAM,eAAe,OAAO,SACzB,cAAc,MAAM,QAAQ;CAC3B,MAAM,EAAE,MAAM,eAAe;CAC7B,IAAI,CAAC,MAAM;EACT,OAAO,EACL,UAAU,YACZ;CACF;CACA,IAAI,OAAO,gBAAgB,UAAU;EACnC,OAAO;GACL,UAAU;GACV;EACF;CACF;CACA,MAAM,MAAM,OAAO,WAAW,CAAC,CAAC,QAAQ,OAAO,EAAE;CACjD,MAAM,YAAY,gBAAgB,QAAQ,IAAI,QAAQ,QAAQ,OAAO,YAAY,aAAa,GAAG,CAAC,CAAC,cAAc;CACjH,MAAM,WAAW,KAAK,KAAK;CAC3B,MAAM,aAAa,KAAK,aAAa;CACrC,MAAM,aAAa,KAAK,SAAS;CACjC,MAAM,gBAAgB,KAAK,gBAAgB;CAC3C,MAAM,gBAAgB,KAAK,YAAY;CACvC,MAAM,YAAY,KAAK,QAAQ;CAC/B,MAAM,QAAQ,KAAK,QAAQ;CAC3B,OAAO;EACL;EACA;EACA;EACA;EACA;EACA;EACA;EACA;CACF;AACF,CACF;AACA,MAAM,cAAc,OAAO,MAAM;CAC/B,aAAa;CACb,YAAY;CACZ,UAAU,EACR,MAAM,aACR;CACA,iBAAiB,EACf,MAAM,KACR;AACF,CAAC"}

package/dist/esm/index.native.js

@@ -1,101 +1,45 @@
-import { isClient } from "@tamagui/constants";
-import { getTokens, styled, Text } from "@tamagui/web";
-function _type_of(obj) {
-  "@swc/helpers - typeof";
+import { resolveSize } from "@tamagui/size";
+import { Text, styled } from "@tamagui/web";
 
-  return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
-}
-var getFontSized = function () {
-  var sizeTokenIn = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : "$true",
-    {
-      font,
-      fontFamily,
-      props
-    } = arguments.length > 1 ? arguments[1] : void 0;
-  var _font_lineHeight, _font_weight, _font_letterSpacing, _font_transform, _font_style, _font_color;
-  if (!font) {
-    return {
-      fontSize: sizeTokenIn
-    };
-  }
-  var sizeToken = sizeTokenIn === "$true" ? getDefaultSizeToken(font) : sizeTokenIn;
-  var style = {};
-  if (typeof sizeToken === "number") {
-    style.fontSize = sizeToken;
-    if (fontFamily) style.fontFamily = fontFamily;
-    if (props.fontStyle) style.fontStyle = props.fontStyle;
-    if (props.color) style.color = props.color;
-    return style;
-  }
-  var fontSize = font.size[sizeToken];
-  var lineHeight = (_font_lineHeight = font.lineHeight) === null || _font_lineHeight === void 0 ? void 0 : _font_lineHeight[sizeToken];
-  var fontWeight = (_font_weight = font.weight) === null || _font_weight === void 0 ? void 0 : _font_weight[sizeToken];
-  var letterSpacing = (_font_letterSpacing = font.letterSpacing) === null || _font_letterSpacing === void 0 ? void 0 : _font_letterSpacing[sizeToken];
-  var textTransform = (_font_transform = font.transform) === null || _font_transform === void 0 ? void 0 : _font_transform[sizeToken];
-  var _props_fontStyle;
-  var fontStyle = (_props_fontStyle = props.fontStyle) !== null && _props_fontStyle !== void 0 ? _props_fontStyle : (_font_style = font.style) === null || _font_style === void 0 ? void 0 : _font_style[sizeToken];
-  var _props_color;
-  var color = (_props_color = props.color) !== null && _props_color !== void 0 ? _props_color : (_font_color = font.color) === null || _font_color === void 0 ? void 0 : _font_color[sizeToken];
-  if (fontStyle) style.fontStyle = fontStyle;
-  if (textTransform) style.textTransform = textTransform;
-  if (fontFamily) style.fontFamily = fontFamily;
-  if (fontWeight) style.fontWeight = fontWeight;
-  if (letterSpacing) style.letterSpacing = letterSpacing;
-  if (fontSize) style.fontSize = fontSize;
-  if (lineHeight) style.lineHeight = lineHeight;
-  if (color) style.color = color;
-  if (process.env.NODE_ENV === "development") {
-    if (props["debug"] && props["debug"] === "verbose") {
-      console.groupCollapsed("  \u{1F539} getFontSized", sizeTokenIn, sizeToken);
-      if (isClient) {
-        console.info({
-          style,
-          props,
-          font
-        });
-      }
-      console.groupEnd();
-    }
-  }
-  return style;
-};
+var getFontSized = styled.dynamic(function() {
+	var sizeTokenIn = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : true, env = arguments.length > 1 ? arguments[1] : void 0;
+	var _env_sizes, _font_lineHeight, _font_weight, _font_letterSpacing, _font_transform, _font_style, _font_color;
+	var { font, fontFamily } = env;
+	if (!font) {
+		return { fontSize: sizeTokenIn };
+	}
+	if (typeof sizeTokenIn === "number") {
+		return {
+			fontSize: sizeTokenIn,
+			fontFamily
+		};
+	}
+	var key = String(sizeTokenIn).replace(/^\$/, "");
+	var sizeToken = sizeTokenIn === true || ((_env_sizes = env.sizes) === null || _env_sizes === void 0 ? void 0 : _env_sizes[key]) != null ? resolveSize(sizeTokenIn, env).fontSizeKey : key;
+	var fontSize = font.size[sizeToken];
+	var lineHeight = (_font_lineHeight = font.lineHeight) === null || _font_lineHeight === void 0 ? void 0 : _font_lineHeight[sizeToken];
+	var fontWeight = (_font_weight = font.weight) === null || _font_weight === void 0 ? void 0 : _font_weight[sizeToken];
+	var letterSpacing = (_font_letterSpacing = font.letterSpacing) === null || _font_letterSpacing === void 0 ? void 0 : _font_letterSpacing[sizeToken];
+	var textTransform = (_font_transform = font.transform) === null || _font_transform === void 0 ? void 0 : _font_transform[sizeToken];
+	var fontStyle = (_font_style = font.style) === null || _font_style === void 0 ? void 0 : _font_style[sizeToken];
+	var color = (_font_color = font.color) === null || _font_color === void 0 ? void 0 : _font_color[sizeToken];
+	return {
+		color,
+		fontFamily,
+		fontSize,
+		fontStyle,
+		fontWeight,
+		letterSpacing,
+		lineHeight,
+		textTransform
+	};
+});
 var SizableText = styled(Text, {
-  name: "SizableText",
-  fontFamily: "$body",
-  variants: {
-    size: {
-      "...fontSize": getFontSized
-    }
-  },
-  defaultVariants: {
-    size: "$true"
-  }
+	displayName: "SizableText",
+	fontFamily: "body",
+	variants: { size: getFontSized },
+	defaultVariants: { size: true }
 });
-var cache = /* @__PURE__ */new WeakMap();
-function getDefaultSizeToken(font) {
-  if ((typeof font === "undefined" ? "undefined" : _type_of(font)) === "object" && cache.has(font)) {
-    return cache.get(font);
-  }
-  var tokens = getTokens();
-  var sizeTokens = "$true" in font.size ? font.size : tokens === null || tokens === void 0 ? void 0 : tokens.size;
-  if (!sizeTokens) {
-    return Object.keys(font.size)[3];
-  }
-  var sizeDefault = sizeTokens["$true"];
-  var sizeDefaultSpecific = sizeDefault ? Object.keys(sizeTokens).find(function (x) {
-    return x !== "$true" && sizeTokens[x]["val"] === sizeDefault["val"];
-  }) : null;
-  if (!sizeDefault || !sizeDefaultSpecific) {
-    if (process.env.NODE_ENV === "development") {
-      console.warn(`No default size is set in your tokens for the "true" key, fonts will be inconsistent.
 
-      Fix this by having consistent tokens across fonts and sizes and setting a true key for your size tokens, or
-      set true keys for all your font tokens: "size", "lineHeight", "fontStyle", etc.`);
-    }
-    return Object.keys(font.size)[3];
-  }
-  cache.set(font, sizeDefaultSpecific);
-  return sizeDefaultSpecific;
-}
 export { SizableText, getFontSized };
 //# sourceMappingURL=index.native.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["isClient","getTokens","styled","Text","_type_of","obj","Symbol","constructor","getFontSized","sizeTokenIn","arguments","length","font","fontFamily","props","_font_lineHeight","_font_weight","_font_letterSpacing","_font_transform","_font_style","_font_color","fontSize","sizeToken","getDefaultSizeToken","style","fontStyle","color","size","lineHeight","fontWeight","weight","letterSpacing","textTransform","transform","_props_fontStyle","_props_color","process","env","NODE_ENV","console","groupCollapsed","info","groupEnd","SizableText","name","variants","defaultVariants","cache","WeakMap","has","get","tokens","sizeTokens","Object","keys","sizeDefault","sizeDefaultSpecific","find","x"],"sources":["../../src/index.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,QAAA,QAAgB;AAQzB,SAASC,SAAA,EAAWC,MAAA,EAAQC,IAAA,QAAY;AAEjC,SAAMC,SAAAC,GAAiE,EAC5E;EAGA,uBAAW;;EACT,OAAAA,GAAO,WAAAC,MAAA,oBAAAD,GAAA,CAAAE,WAAA,KAAAD,MAAA,qBAAAD,GAAA;AAAA;AACK,IACZG,YAAA,YAAAA,CAAA;EACF,IAAAC,WAAA,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,iBAAAA,SAAA;IAAA;MAAAE,IAAA;MAAAC,UAAA;MAAAC;IAAA,IAAAJ,SAAA,CAAAC,MAAA,OAAAD,SAAA;EAEA,IAAAK,gBAAkB,EAAAC,YAAgB,EAAAC,mBAAU,EAAAC,eAA4B,EAAAC,WAAA,EAAAC,WAAA;EAExE,KAAAR,IAAM;IAQN,OAAI;MACFS,QAAM,EAAAZ;IACN;EACA;EACA,IAAAa,SAAU,GAAAb,WAAa,YAAc,GAAAc,mBAAA,CAAAX,IAAA,IAAAH,WAAA;EACrC,IAAAe,KAAO;EACT,WAAAF,SAAA;IAGAE,KAAM,CAAAH,QAAA,GAAWC,SAAU;IAC3B,IAAMT,UAAA,EAAAW,KAAa,CAAKX,UAAA,GAAaA,UAAS;IAC9C,IAAMC,KAAA,CAAAW,SAAa,EAAAD,KAAK,CAAAC,SAAS,GAAAX,KAAS,CAAAW,SAAA;IAC1C,IAAMX,KAAA,CAAAY,KAAA,EAAAF,KAAgB,CAAAE,KAAK,GAAAZ,KAAA,CAAAY,KAAgB;IAC3C,OAAMF,KAAA;EACN;EACA,IAAAH,QAAM,GAAQT,IAAA,CAAMe,IAAA,CAAAL,SAAc;EAElC,IAAIM,UAAW,IAAAb,gBAAkB,GAAAH,IAAA,CAAAgB,UAAA,cAAAb,gBAAA,uBAAAA,gBAAA,CAAAO,SAAA;EACjC,IAAIO,UAAA,IAAeb,YAAM,GAAAJ,IAAA,CAAAkB,MAAgB,cAAAd,YAAA,uBAAAA,YAAA,CAAAM,SAAA;EACzC,IAAIS,aAAY,IAAAd,mBAAmB,GAAAL,IAAA,CAAAmB,aAAA,cAAAd,mBAAA,uBAAAA,mBAAA,CAAAK,SAAA;EACnC,IAAIU,aAAY,IAAAd,eAAmB,GAAAN,IAAA,CAAAqB,SAAA,cAAAf,eAAA,uBAAAA,eAAA,CAAAI,SAAA;EACnC,IAAIY,gBAAe;EACnB,IAAIT,SAAU,IAAAS,gBAAiB,GAAApB,KAAA,CAAAW,SAAA,cAAAS,gBAAA,cAAAA,gBAAA,IAAAf,WAAA,GAAAP,IAAA,CAAAY,KAAA,cAAAL,WAAA,uBAAAA,WAAA,CAAAG,SAAA;EAC/B,IAAIa,YAAY;EAChB,IAAIT,KAAA,GAAO,CAAAS,YAAc,GAAArB,KAAA,CAAAY,KAAA,cAAAS,YAAA,cAAAA,YAAA,IAAAf,WAAA,GAAAR,IAAA,CAAAc,KAAA,cAAAN,WAAA,uBAAAA,WAAA,CAAAE,SAAA;EAEzB,IAAIG,SAAQ,EAAAD,KAAI,CAAAC,SAAa,GAAAA,SAAA;EAC3B,IAAAO,aAAU,EAAOR,KAAK,CAAAQ,aAAa,GAAAA,aAAiB;EAClD,IAAAnB,UAAQ,EAAAW,KAAA,CAAAX,UAAe,GAAAA,UAAA;EACvB,IAAAgB,UAAI,EAAAL,KAAU,CAAAK,UAAA,GAAAA,UAAA;EACZ,IAAAE,aAAQ,EAAKP,KAAE,CAAAO,aAAc,GAAMA,aAAA;EAAA,IACrCV,QAAA,EAAAG,KAAA,CAAAH,QAAA,GAAAA,QAAA;EACA,IAAAO,UAAQ,EAAAJ,KAAS,CAAAI,UAAA,GAAAA,UAAA;EAAA,IACnBF,KAAA,EAAAF,KAAA,CAAAE,KAAA,GAAAA,KAAA;EACF,IAAAU,OAAA,CAAAC,GAAA,CAAAC,QAAA;IAEA,IAAAxB,KAAO,aAAAA,KAAA;MACTyB,OAAA,CAAAC,cAAA,6BAAA/B,WAAA,EAAAa,SAAA;MAEa,IAAAtB,QAAA,EAAc;QACnBuC,OAAA,CAAAE,IAAA;UACNjB,KAAY;UAEZV,KAAU;UACFF;QACJ;MACF;MACF2B,OAAA,CAAAG,QAAA;IAEA;EAAiB;EAEjB,OAAAlB,KAAA;AACF,CAAC;AAED,IAAAmB,WAAc,GAAAzC,MAAA,CAAAC,IAAA;EAEdyC,IAAA,eAAS;EACP/B,UAAI,EAAO;EACTgC,QAAA,EAAO;IACTlB,IAAA;MAGA,aAAe,EAAAnB;IACf;EACA;EACEsC,eAAO,EAAO;IAChBnB,IAAA;EACA;AACA;AAC4B,IACtBoB,KAAC,GAAM,eAAiB,IAAAC,OAAW,CAAC;AAA8B,SAEpEzB,oBAAAX,IAAA;EAEJ,IAAI,CAAC,OAAAA,IAAA,KAAgB,yBAAqB,GAAAR,QAAA,CAAAQ,IAAA,mBAAAmC,KAAA,CAAAE,GAAA,CAAArC,IAAA;IACxC,OAAImC,KAAQ,CAAAG,GAAI,CAAAtC,IAAA;EACd;EAAa,IAAAuC,MAAA,GAAAlD,SAAA;EAAA,IAAAmD,UAAA,cAAAxC,IAAA,CAAAe,IAAA,GAAAf,IAAA,CAAAe,IAAA,GAAAwB,MAAA,aAAAA,MAAA,uBAAAA,MAAA,CAAAxB,IAAA;EAAA,KAAAyB,UAAA;IAIf,OAAAC,MAAA,CAAAC,IAAA,CAAA1C,IAAA,CAAAe,IAAA;EACA;EACF,IAAA4B,WAAA,GAAAH,UAAA;EAEA,IAAAI,mBAAgB,GAAAD,WAAqC,GAAAF,MAAA,CAAAC,IAAA,CAAAF,UAAA,EAAAK,IAAA,WAAAC,CAAA;IACrD,OAAOA,CAAA,gBAAAN,UAAA,CAAAM,CAAA,aAAAH,WAAA;EACT","ignoreList":[]}
+{"version":3,"file":"index.native.js","names":[],"sources":["esm/index.native.js"],"sourcesContent":["import { resolveSize } from \"@tamagui/size\";\nimport { styled, Text } from \"@tamagui/web\";\nvar getFontSized = styled.dynamic(function() {\n  var sizeTokenIn = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : true, env = arguments.length > 1 ? arguments[1] : void 0;\n  var _env_sizes, _font_lineHeight, _font_weight, _font_letterSpacing, _font_transform, _font_style, _font_color;\n  var { font, fontFamily } = env;\n  if (!font) {\n    return {\n      fontSize: sizeTokenIn\n    };\n  }\n  if (typeof sizeTokenIn === \"number\") {\n    return {\n      fontSize: sizeTokenIn,\n      fontFamily\n    };\n  }\n  var key = String(sizeTokenIn).replace(/^\\$/, \"\");\n  var sizeToken = sizeTokenIn === true || ((_env_sizes = env.sizes) === null || _env_sizes === void 0 ? void 0 : _env_sizes[key]) != null ? resolveSize(sizeTokenIn, env).fontSizeKey : key;\n  var fontSize = font.size[sizeToken];\n  var lineHeight = (_font_lineHeight = font.lineHeight) === null || _font_lineHeight === void 0 ? void 0 : _font_lineHeight[sizeToken];\n  var fontWeight = (_font_weight = font.weight) === null || _font_weight === void 0 ? void 0 : _font_weight[sizeToken];\n  var letterSpacing = (_font_letterSpacing = font.letterSpacing) === null || _font_letterSpacing === void 0 ? void 0 : _font_letterSpacing[sizeToken];\n  var textTransform = (_font_transform = font.transform) === null || _font_transform === void 0 ? void 0 : _font_transform[sizeToken];\n  var fontStyle = (_font_style = font.style) === null || _font_style === void 0 ? void 0 : _font_style[sizeToken];\n  var color = (_font_color = font.color) === null || _font_color === void 0 ? void 0 : _font_color[sizeToken];\n  return {\n    color,\n    fontFamily,\n    fontSize,\n    fontStyle,\n    fontWeight,\n    letterSpacing,\n    lineHeight,\n    textTransform\n  };\n});\nvar SizableText = styled(Text, {\n  displayName: \"SizableText\",\n  fontFamily: \"body\",\n  variants: {\n    size: getFontSized\n  },\n  defaultVariants: {\n    size: true\n  }\n});\nexport {\n  SizableText,\n  getFontSized\n};\n//# sourceMappingURL=index.js.map\n"],"mappings":";;;;AAEA,IAAI,eAAe,OAAO,QAAQ,WAAW;CAC3C,IAAI,cAAc,UAAU,SAAS,KAAK,UAAU,OAAO,KAAK,IAAI,UAAU,KAAK,MAAM,MAAM,UAAU,SAAS,IAAI,UAAU,KAAK,KAAK;CAC1I,IAAI,YAAY,kBAAkB,cAAc,qBAAqB,iBAAiB,aAAa;CACnG,IAAI,EAAE,MAAM,eAAe;CAC3B,IAAI,CAAC,MAAM;EACT,OAAO,EACL,UAAU,YACZ;CACF;CACA,IAAI,OAAO,gBAAgB,UAAU;EACnC,OAAO;GACL,UAAU;GACV;EACF;CACF;CACA,IAAI,MAAM,OAAO,WAAW,CAAC,CAAC,QAAQ,OAAO,EAAE;CAC/C,IAAI,YAAY,gBAAgB,UAAU,aAAa,IAAI,WAAW,QAAQ,eAAe,KAAK,IAAI,KAAK,IAAI,WAAW,SAAS,OAAO,YAAY,aAAa,GAAG,CAAC,CAAC,cAAc;CACtL,IAAI,WAAW,KAAK,KAAK;CACzB,IAAI,cAAc,mBAAmB,KAAK,gBAAgB,QAAQ,qBAAqB,KAAK,IAAI,KAAK,IAAI,iBAAiB;CAC1H,IAAI,cAAc,eAAe,KAAK,YAAY,QAAQ,iBAAiB,KAAK,IAAI,KAAK,IAAI,aAAa;CAC1G,IAAI,iBAAiB,sBAAsB,KAAK,mBAAmB,QAAQ,wBAAwB,KAAK,IAAI,KAAK,IAAI,oBAAoB;CACzI,IAAI,iBAAiB,kBAAkB,KAAK,eAAe,QAAQ,oBAAoB,KAAK,IAAI,KAAK,IAAI,gBAAgB;CACzH,IAAI,aAAa,cAAc,KAAK,WAAW,QAAQ,gBAAgB,KAAK,IAAI,KAAK,IAAI,YAAY;CACrG,IAAI,SAAS,cAAc,KAAK,WAAW,QAAQ,gBAAgB,KAAK,IAAI,KAAK,IAAI,YAAY;CACjG,OAAO;EACL;EACA;EACA;EACA;EACA;EACA;EACA;EACA;CACF;AACF,CAAC;AACD,IAAI,cAAc,OAAO,MAAM;CAC7B,aAAa;CACb,YAAY;CACZ,UAAU,EACR,MAAM,aACR;CACA,iBAAiB,EACf,MAAM,KACR;AACF,CAAC"}

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "@tamagui/get-font-sized",
-  "version": "2.7.7",
+  "version": "3.0.0-beta.1093.1",
+  "license": "MIT",
   "files": [
     "src",
     "types",
@@ -33,12 +34,12 @@
     "clean:build": "tamagui-build clean:build"
   },
   "dependencies": {
-    "@tamagui/constants": "2.7.7",
-    "@tamagui/web": "2.7.7"
+    "@tamagui/size": "3.0.0-beta.1093.1",
+    "@tamagui/web": "3.0.0-beta.1093.1"
   },
   "devDependencies": {
-    "@tamagui/build": "2.7.7",
-    "react": ">=19"
+    "@tamagui/build": "3.0.0-beta.1093.1",
+    "react": "19.2.3"
   },
   "peerDependencies": {
     "react": ">=19"

package/src/index.ts

@@ -1,117 +1,70 @@
-import { isClient } from '@tamagui/constants'
-import type {
-  FontSizeTokens,
-  GenericFont,
-  TextProps,
-  TextStyle,
-  VariantSpreadFunction,
-} from '@tamagui/web'
-import { getTokens, styled, Text } from '@tamagui/web'
-
-export const getFontSized: VariantSpreadFunction<TextProps, FontSizeTokens> = (
-  sizeTokenIn = '$true',
-  { font, fontFamily, props }
-) => {
-  if (!font) {
-    return {
-      fontSize: sizeTokenIn,
+import type { FontSizeTokens } from '@tamagui/web'
+import { resolveSize } from '@tamagui/size'
+import { styled, Text } from '@tamagui/web'
+
+export const getFontSized = styled.dynamic<FontSizeTokens | number | true>(
+  (sizeTokenIn = true, env) => {
+    const { font, fontFamily } = env
+    if (!font) {
+      return {
+        fontSize: sizeTokenIn,
+      }
     }
-  }
-
-  const sizeToken = sizeTokenIn === '$true' ? getDefaultSizeToken(font) : sizeTokenIn
-
-  const style: TextStyle = {}
 
-  // A raw numeric size (e.g. `fontSize={32}`) is not a token key, so the
-  // `font.size` / `font.lineHeight` maps have no entry for it and every lookup
-  // below returns undefined. Treat the number as a literal fontSize and leave
-  // lineHeight unset, otherwise a stale default token lineHeight survives and
-  // clips glyph tops on iOS (see #4028). We don't scale the lineHeight here,
-  // leaving it to the platform default for the given font size.
-  if (typeof sizeToken === 'number') {
-    style.fontSize = sizeToken
-    if (fontFamily) style.fontFamily = fontFamily
-    if (props.fontStyle) style.fontStyle = props.fontStyle
-    if (props.color) style.color = props.color
-    return style
-  }
-
-  // size related, treat them as overrides
-  const fontSize = font.size[sizeToken]
-  const lineHeight = font.lineHeight?.[sizeToken]
-  const fontWeight = font.weight?.[sizeToken]
-  const letterSpacing = font.letterSpacing?.[sizeToken]
-  const textTransform = font.transform?.[sizeToken]
-  const fontStyle = props.fontStyle ?? font.style?.[sizeToken]
-  const color = props.color ?? font.color?.[sizeToken]
+    // A raw numeric size (e.g. `fontSize={32}`) is not a token key, so the
+    // `font.size` / `font.lineHeight` maps have no entry for it and every lookup
+    // below returns undefined. Treat the number as a literal fontSize and leave
+    // lineHeight unset, otherwise a stale default token lineHeight survives and
+    // clips glyph tops on iOS (see #4028). We don't scale the lineHeight here,
+    // leaving it to the platform default for the given font size.
+    if (typeof sizeTokenIn === 'number') {
+      return {
+        fontSize: sizeTokenIn,
+        fontFamily,
+      }
+    }
 
-  if (fontStyle) style.fontStyle = fontStyle
-  if (textTransform) style.textTransform = textTransform
-  if (fontFamily) style.fontFamily = fontFamily
-  if (fontWeight) style.fontWeight = fontWeight
-  if (letterSpacing) style.letterSpacing = letterSpacing
-  if (fontSize) style.fontSize = fontSize
-  if (lineHeight) style.lineHeight = lineHeight
-  if (color) style.color = color
+    // `true` and a named size (`md`) read the size recipe's font key, so text
+    // sized "md" matches the text inside a "md" control. any other value is a
+    // font.size key already (`sm`, `2xl`, `4`).
+    const key = String(sizeTokenIn).replace(/^\$/, '')
+    const sizeToken = (
+      sizeTokenIn === true || env.sizes?.[key] != null
+        ? resolveSize(sizeTokenIn, env).fontSizeKey
+        : key
+    ) as Exclude<FontSizeTokens, true>
+
+    // size related, treat them as overrides
+    const fontSize = font.size[sizeToken]
+    const lineHeight = font.lineHeight?.[sizeToken]
+    const fontWeight = font.weight?.[sizeToken]
+    const letterSpacing = font.letterSpacing?.[sizeToken]
+    const textTransform = font.transform?.[sizeToken]
+    const fontStyle = font.style?.[sizeToken]
+    const color = font.color?.[sizeToken]
 
-  if (process.env.NODE_ENV === 'development') {
-    if (props['debug'] && props['debug'] === 'verbose') {
-      console.groupCollapsed('  🔹 getFontSized', sizeTokenIn, sizeToken)
-      if (isClient) {
-        console.info({ style, props, font })
-      }
-      console.groupEnd()
+    return {
+      color,
+      fontFamily,
+      fontSize,
+      fontStyle,
+      fontWeight,
+      letterSpacing,
+      lineHeight,
+      textTransform,
     }
   }
-
-  return style
-}
+)
 
 export const SizableText = styled(Text, {
-  name: 'SizableText',
-  fontFamily: '$body',
+  displayName: 'SizableText',
+  fontFamily: 'body',
 
   variants: {
-    size: {
-      '...fontSize': getFontSized,
-    },
+    size: getFontSized,
   } as const,
 
   defaultVariants: {
-    size: '$true',
+    size: true,
   },
 })
-
-const cache = new WeakMap<any, FontSizeTokens>()
-
-function getDefaultSizeToken(font: GenericFont) {
-  if (typeof font === 'object' && cache.has(font)) {
-    return cache.get(font)!
-  }
-
-  // use either font.size if it has true set, or fallback to tokens.size mapping to the same
-  const tokens = getTokens()
-  const sizeTokens = '$true' in font.size ? font.size : tokens?.size
-  if (!sizeTokens) {
-    return Object.keys(font.size)[3]
-  }
-  const sizeDefault = sizeTokens['$true']
-  const sizeDefaultSpecific = sizeDefault
-    ? Object.keys(sizeTokens).find(
-        (x) => x !== '$true' && sizeTokens[x]['val'] === sizeDefault['val']
-      )
-    : null
-
-  if (!sizeDefault || !sizeDefaultSpecific) {
-    if (process.env.NODE_ENV === 'development') {
-      console.warn(`No default size is set in your tokens for the "true" key, fonts will be inconsistent.
-
-      Fix this by having consistent tokens across fonts and sizes and setting a true key for your size tokens, or
-      set true keys for all your font tokens: "size", "lineHeight", "fontStyle", etc.`)
-    }
-    return Object.keys(font.size)[3]
-  }
-
-  cache.set(font, sizeDefaultSpecific as FontSizeTokens)
-  return sizeDefaultSpecific
-}

package/types/index.d.ts

@@ -1,6 +1,13 @@
-import type { FontSizeTokens, TextProps, VariantSpreadFunction } from '@tamagui/web';
-export declare const getFontSized: VariantSpreadFunction<TextProps, FontSizeTokens>;
-export declare const SizableText: import("@tamagui/web").TamaguiComponent<import("@tamagui/web").TamaDefer, import("@tamagui/web").TamaguiTextElement, import("@tamagui/web").TextNonStyleProps, import("@tamagui/web").TextStylePropsBase, {
-    size?: FontSizeTokens | undefined;
-}, import("@tamagui/web").StaticConfigPublic>;
+export declare const getFontSized: import("@tamagui/web/types/types").StyledDynamicFn<import("@tamagui/web").FontSize, Record<string, any>>;
+export declare const SizableText: 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];
+};
 //# sourceMappingURL=index.d.ts.map

package/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,cAAc,EAEd,SAAS,EAET,qBAAqB,EACtB,MAAM,cAAc,CAAA;AAGrB,eAAO,MAAM,YAAY,EAAE,qBAAqB,CAAC,SAAS,EAAE,cAAc,CAyDzE,CAAA;AAED,eAAO,MAAM,WAAW;;6CAatB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,YAAY,0GAoDxB,CAAA;AAED,eAAO,MAAM,WAAW;;;;;;;;;;CAWtB,CAAA"}