@tamagui/text 3.0.0-beta.831.1 → 3.0.0-beta.889.1

package/dist/cjs/SizableText.cjs

@@ -23,20 +23,31 @@ __export(SizableText_exports, { SizableText: () => SizableText });
 module.exports = __toCommonJS(SizableText_exports);
 var import_get_font_sized = require("@tamagui/get-font-sized");
 var import_web = require("@tamagui/web");
-const SizableText = (0, import_web.styled)(import_web.Text, {
+const SizableTextFrame = (0, import_web.styled)(import_web.Text, {
 	displayName: "SizableText",
 	fontFamily: "body",
 	color: "color",
 	size: true,
 	variants: { size: import_get_font_sized.getFontSized }
 });
-SizableText.staticConfig.inlineProps = /* @__PURE__ */ new Set([...SizableText.staticConfig.inlineProps || [], "maxFontSizeMultiplier"]);
-SizableText.staticConfig.variants.fontFamily = { any: (val, extras) => {
-	if (val === "inherit") {
+const SizableText = SizableTextFrame.resolve((props, env) => {
+	if (props.fontFamily === "inherit") {
 		return { fontFamily: "inherit" };
 	}
-	const sizeProp = extras.props["size"];
-	const fontSizeProp = extras.props["fontSize"];
-	const size = sizeProp === true && fontSizeProp ? fontSizeProp : extras.props["size"] ?? true;
-	return (0, import_get_font_sized.getFontSized)(size, extras);
-} };
+	if (props.fontFamily === void 0) {
+		return {};
+	}
+	const size = props.size === true && props.fontSize ? props.fontSize : props.size ?? true;
+	const sized = (0, import_get_font_sized.getFontSized)(size, env);
+	return {
+		color: sized?.color,
+		fontFamily: sized?.fontFamily,
+		fontSize: sized?.fontSize,
+		fontStyle: sized?.fontStyle,
+		fontWeight: sized?.fontWeight,
+		letterSpacing: sized?.letterSpacing,
+		lineHeight: sized?.lineHeight,
+		textTransform: sized?.textTransform
+	};
+});
+SizableText.staticConfig.inlineProps = /* @__PURE__ */ new Set([...SizableText.staticConfig.inlineProps || [], "maxFontSizeMultiplier"]);

package/dist/cjs/SizableText.native.cjs

@@ -25,21 +25,32 @@ __export(SizableText_exports, { SizableText: () => SizableText });
 module.exports = __toCommonJS(SizableText_exports);
 var import_get_font_sized = require("@tamagui/get-font-sized");
 var import_web = require("@tamagui/web");
-var SizableText = (0, import_web.styled)(import_web.Text, {
+var SizableTextFrame = (0, import_web.styled)(import_web.Text, {
 	displayName: "SizableText",
 	fontFamily: "body",
 	color: "color",
 	size: true,
 	variants: { size: import_get_font_sized.getFontSized }
 });
-SizableText.staticConfig.inlineProps = /* @__PURE__ */ new Set([...SizableText.staticConfig.inlineProps || [], "maxFontSizeMultiplier"]);
-SizableText.staticConfig.variants.fontFamily = { any: function(val, extras) {
-	if (val === "inherit") {
+var SizableText = SizableTextFrame.resolve(function(props, env) {
+	if (props.fontFamily === "inherit") {
 		return { fontFamily: "inherit" };
 	}
-	var sizeProp = extras.props["size"];
-	var fontSizeProp = extras.props["fontSize"];
-	var _extras_props_size;
-	var size = sizeProp === true && fontSizeProp ? fontSizeProp : (_extras_props_size = extras.props["size"]) !== null && _extras_props_size !== void 0 ? _extras_props_size : true;
-	return (0, import_get_font_sized.getFontSized)(size, extras);
-} };
+	if (props.fontFamily === void 0) {
+		return {};
+	}
+	var _props_size;
+	var size = props.size === true && props.fontSize ? props.fontSize : (_props_size = props.size) !== null && _props_size !== void 0 ? _props_size : true;
+	var sized = (0, import_get_font_sized.getFontSized)(size, env);
+	return {
+		color: sized === null || sized === void 0 ? void 0 : sized.color,
+		fontFamily: sized === null || sized === void 0 ? void 0 : sized.fontFamily,
+		fontSize: sized === null || sized === void 0 ? void 0 : sized.fontSize,
+		fontStyle: sized === null || sized === void 0 ? void 0 : sized.fontStyle,
+		fontWeight: sized === null || sized === void 0 ? void 0 : sized.fontWeight,
+		letterSpacing: sized === null || sized === void 0 ? void 0 : sized.letterSpacing,
+		lineHeight: sized === null || sized === void 0 ? void 0 : sized.lineHeight,
+		textTransform: sized === null || sized === void 0 ? void 0 : sized.textTransform
+	};
+});
+SizableText.staticConfig.inlineProps = /* @__PURE__ */ new Set([...SizableText.staticConfig.inlineProps || [], "maxFontSizeMultiplier"]);

package/dist/cjs/SizableText.native.js

@@ -25,23 +25,34 @@ __export(SizableText_exports, { SizableText: () => SizableText });
 module.exports = __toCommonJS(SizableText_exports);
 var import_get_font_sized = require("@tamagui/get-font-sized");
 var import_web = require("@tamagui/web");
-var SizableText = (0, import_web.styled)(import_web.Text, {
+var SizableTextFrame = (0, import_web.styled)(import_web.Text, {
 	displayName: "SizableText",
 	fontFamily: "body",
 	color: "color",
 	size: true,
 	variants: { size: import_get_font_sized.getFontSized }
 });
-SizableText.staticConfig.inlineProps = /* @__PURE__ */ new Set([...SizableText.staticConfig.inlineProps || [], "maxFontSizeMultiplier"]);
-SizableText.staticConfig.variants.fontFamily = { any: function(val, extras) {
-	if (val === "inherit") {
+var SizableText = SizableTextFrame.resolve(function(props, env) {
+	if (props.fontFamily === "inherit") {
 		return { fontFamily: "inherit" };
 	}
-	var sizeProp = extras.props["size"];
-	var fontSizeProp = extras.props["fontSize"];
-	var _extras_props_size;
-	var size = sizeProp === true && fontSizeProp ? fontSizeProp : (_extras_props_size = extras.props["size"]) !== null && _extras_props_size !== void 0 ? _extras_props_size : true;
-	return (0, import_get_font_sized.getFontSized)(size, extras);
-} };
+	if (props.fontFamily === void 0) {
+		return {};
+	}
+	var _props_size;
+	var size = props.size === true && props.fontSize ? props.fontSize : (_props_size = props.size) !== null && _props_size !== void 0 ? _props_size : true;
+	var sized = (0, import_get_font_sized.getFontSized)(size, env);
+	return {
+		color: sized === null || sized === void 0 ? void 0 : sized.color,
+		fontFamily: sized === null || sized === void 0 ? void 0 : sized.fontFamily,
+		fontSize: sized === null || sized === void 0 ? void 0 : sized.fontSize,
+		fontStyle: sized === null || sized === void 0 ? void 0 : sized.fontStyle,
+		fontWeight: sized === null || sized === void 0 ? void 0 : sized.fontWeight,
+		letterSpacing: sized === null || sized === void 0 ? void 0 : sized.letterSpacing,
+		lineHeight: sized === null || sized === void 0 ? void 0 : sized.lineHeight,
+		textTransform: sized === null || sized === void 0 ? void 0 : sized.textTransform
+	};
+});
+SizableText.staticConfig.inlineProps = /* @__PURE__ */ new Set([...SizableText.staticConfig.inlineProps || [], "maxFontSizeMultiplier"]);
 
 //# sourceMappingURL=SizableText.native.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"SizableText.native.js","names":[],"sources":["cjs/SizableText.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 SizableText_exports = {};\n__export(SizableText_exports, {\n  SizableText: () => SizableText\n});\nmodule.exports = __toCommonJS(SizableText_exports);\nvar import_get_font_sized = require(\"@tamagui/get-font-sized\");\nvar import_web = require(\"@tamagui/web\");\nvar SizableText = (0, import_web.styled)(import_web.Text, {\n  displayName: \"SizableText\",\n  fontFamily: \"body\",\n  color: \"color\",\n  size: true,\n  variants: {\n    size: import_get_font_sized.getFontSized\n  }\n});\nSizableText.staticConfig.inlineProps = /* @__PURE__ */ new Set([\n  ...SizableText.staticConfig.inlineProps || [],\n  \"maxFontSizeMultiplier\"\n]);\nSizableText.staticConfig.variants.fontFamily = {\n  any: function(val, extras) {\n    if (val === \"inherit\") {\n      return {\n        fontFamily: \"inherit\"\n      };\n    }\n    var sizeProp = extras.props[\"size\"];\n    var fontSizeProp = extras.props[\"fontSize\"];\n    var _extras_props_size;\n    var size = sizeProp === true && fontSizeProp ? fontSizeProp : (_extras_props_size = extras.props[\"size\"]) !== null && _extras_props_size !== void 0 ? _extras_props_size : true;\n    return (0, import_get_font_sized.getFontSized)(size, extras);\n  }\n};\n//# sourceMappingURL=SizableText.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,sBAAsB,CAAC;AAC3B,SAAS,qBAAqB,EAC5B,mBAAmB,YACrB,CAAC;AACD,OAAO,UAAU,aAAa,mBAAmB;AACjD,IAAI,wBAAwB,QAAQ,yBAAyB;AAC7D,IAAI,aAAa,QAAQ,cAAc;AACvC,IAAI,eAAe,GAAG,WAAW,OAAM,CAAE,WAAW,MAAM;CACxD,aAAa;CACb,YAAY;CACZ,OAAO;CACP,MAAM;CACN,UAAU,EACR,MAAM,sBAAsB,aAC9B;AACF,CAAC;AACD,YAAY,aAAa,8BAA8B,IAAI,IAAI,CAC7D,GAAG,YAAY,aAAa,eAAe,CAAC,GAC5C,uBACF,CAAC;AACD,YAAY,aAAa,SAAS,aAAa,EAC7C,KAAK,SAAS,KAAK,QAAQ;CACzB,IAAI,QAAQ,WAAW;EACrB,OAAO,EACL,YAAY,UACd;CACF;CACA,IAAI,WAAW,OAAO,MAAM;CAC5B,IAAI,eAAe,OAAO,MAAM;CAChC,IAAI;CACJ,IAAI,OAAO,aAAa,QAAQ,eAAe,gBAAgB,qBAAqB,OAAO,MAAM,aAAa,QAAQ,uBAAuB,KAAK,IAAI,qBAAqB;CAC3K,QAAQ,GAAG,sBAAsB,aAAY,CAAE,MAAM,MAAM;AAC7D,EACF"}
+{"version":3,"file":"SizableText.native.js","names":[],"sources":["cjs/SizableText.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 SizableText_exports = {};\n__export(SizableText_exports, {\n  SizableText: () => SizableText\n});\nmodule.exports = __toCommonJS(SizableText_exports);\nvar import_get_font_sized = require(\"@tamagui/get-font-sized\");\nvar import_web = require(\"@tamagui/web\");\nvar SizableTextFrame = (0, import_web.styled)(import_web.Text, {\n  displayName: \"SizableText\",\n  fontFamily: \"body\",\n  color: \"color\",\n  size: true,\n  variants: {\n    size: import_get_font_sized.getFontSized\n  }\n});\nvar SizableText = SizableTextFrame.resolve(function(props, env) {\n  if (props.fontFamily === \"inherit\") {\n    return {\n      fontFamily: \"inherit\"\n    };\n  }\n  if (props.fontFamily === void 0) {\n    return {};\n  }\n  var _props_size;\n  var size = props.size === true && props.fontSize ? props.fontSize : (_props_size = props.size) !== null && _props_size !== void 0 ? _props_size : true;\n  var sized = (0, import_get_font_sized.getFontSized)(size, env);\n  return {\n    color: sized === null || sized === void 0 ? void 0 : sized.color,\n    fontFamily: sized === null || sized === void 0 ? void 0 : sized.fontFamily,\n    fontSize: sized === null || sized === void 0 ? void 0 : sized.fontSize,\n    fontStyle: sized === null || sized === void 0 ? void 0 : sized.fontStyle,\n    fontWeight: sized === null || sized === void 0 ? void 0 : sized.fontWeight,\n    letterSpacing: sized === null || sized === void 0 ? void 0 : sized.letterSpacing,\n    lineHeight: sized === null || sized === void 0 ? void 0 : sized.lineHeight,\n    textTransform: sized === null || sized === void 0 ? void 0 : sized.textTransform\n  };\n});\nSizableText.staticConfig.inlineProps = /* @__PURE__ */ new Set([\n  ...SizableText.staticConfig.inlineProps || [],\n  \"maxFontSizeMultiplier\"\n]);\n//# sourceMappingURL=SizableText.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,sBAAsB,CAAC;AAC3B,SAAS,qBAAqB,EAC5B,mBAAmB,YACrB,CAAC;AACD,OAAO,UAAU,aAAa,mBAAmB;AACjD,IAAI,wBAAwB,QAAQ,yBAAyB;AAC7D,IAAI,aAAa,QAAQ,cAAc;AACvC,IAAI,oBAAoB,GAAG,WAAW,OAAM,CAAE,WAAW,MAAM;CAC7D,aAAa;CACb,YAAY;CACZ,OAAO;CACP,MAAM;CACN,UAAU,EACR,MAAM,sBAAsB,aAC9B;AACF,CAAC;AACD,IAAI,cAAc,iBAAiB,QAAQ,SAAS,OAAO,KAAK;CAC9D,IAAI,MAAM,eAAe,WAAW;EAClC,OAAO,EACL,YAAY,UACd;CACF;CACA,IAAI,MAAM,eAAe,KAAK,GAAG;EAC/B,OAAO,CAAC;CACV;CACA,IAAI;CACJ,IAAI,OAAO,MAAM,SAAS,QAAQ,MAAM,WAAW,MAAM,YAAY,cAAc,MAAM,UAAU,QAAQ,gBAAgB,KAAK,IAAI,cAAc;CAClJ,IAAI,SAAS,GAAG,sBAAsB,aAAY,CAAE,MAAM,GAAG;CAC7D,OAAO;EACL,OAAO,UAAU,QAAQ,UAAU,KAAK,IAAI,KAAK,IAAI,MAAM;EAC3D,YAAY,UAAU,QAAQ,UAAU,KAAK,IAAI,KAAK,IAAI,MAAM;EAChE,UAAU,UAAU,QAAQ,UAAU,KAAK,IAAI,KAAK,IAAI,MAAM;EAC9D,WAAW,UAAU,QAAQ,UAAU,KAAK,IAAI,KAAK,IAAI,MAAM;EAC/D,YAAY,UAAU,QAAQ,UAAU,KAAK,IAAI,KAAK,IAAI,MAAM;EAChE,eAAe,UAAU,QAAQ,UAAU,KAAK,IAAI,KAAK,IAAI,MAAM;EACnE,YAAY,UAAU,QAAQ,UAAU,KAAK,IAAI,KAAK,IAAI,MAAM;EAChE,eAAe,UAAU,QAAQ,UAAU,KAAK,IAAI,KAAK,IAAI,MAAM;CACrE;AACF,CAAC;AACD,YAAY,aAAa,8BAA8B,IAAI,IAAI,CAC7D,GAAG,YAAY,aAAa,eAAe,CAAC,GAC5C,uBACF,CAAC"}

package/dist/esm/SizableText.mjs

@@ -1,23 +1,34 @@
 import { getFontSized } from "@tamagui/get-font-sized";
 import { Text, styled } from "@tamagui/web";
 
-const SizableText = styled(Text, {
+const SizableTextFrame = styled(Text, {
 	displayName: "SizableText",
 	fontFamily: "body",
 	color: "color",
 	size: true,
 	variants: { size: getFontSized }
 });
-SizableText.staticConfig.inlineProps = /* @__PURE__ */ new Set([...SizableText.staticConfig.inlineProps || [], "maxFontSizeMultiplier"]);
-SizableText.staticConfig.variants.fontFamily = { any: (val, extras) => {
-	if (val === "inherit") {
+const SizableText = SizableTextFrame.resolve((props, env) => {
+	if (props.fontFamily === "inherit") {
 		return { fontFamily: "inherit" };
 	}
-	const sizeProp = extras.props["size"];
-	const fontSizeProp = extras.props["fontSize"];
-	const size = sizeProp === true && fontSizeProp ? fontSizeProp : extras.props["size"] ?? true;
-	return getFontSized(size, extras);
-} };
+	if (props.fontFamily === void 0) {
+		return {};
+	}
+	const size = props.size === true && props.fontSize ? props.fontSize : props.size ?? true;
+	const sized = getFontSized(size, env);
+	return {
+		color: sized?.color,
+		fontFamily: sized?.fontFamily,
+		fontSize: sized?.fontSize,
+		fontStyle: sized?.fontStyle,
+		fontWeight: sized?.fontWeight,
+		letterSpacing: sized?.letterSpacing,
+		lineHeight: sized?.lineHeight,
+		textTransform: sized?.textTransform
+	};
+});
+SizableText.staticConfig.inlineProps = /* @__PURE__ */ new Set([...SizableText.staticConfig.inlineProps || [], "maxFontSizeMultiplier"]);
 
 export { SizableText };
 //# sourceMappingURL=SizableText.mjs.map

package/dist/esm/SizableText.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"SizableText.js","names":[],"sources":["esm/SizableText.js"],"sourcesContent":["import { getFontSized } from \"@tamagui/get-font-sized\";\nimport { Text, styled } from \"@tamagui/web\";\nconst SizableText = styled(Text, {\n  displayName: \"SizableText\",\n  fontFamily: \"body\",\n  color: \"color\",\n  size: true,\n  variants: {\n    size: getFontSized\n  }\n});\nSizableText.staticConfig.inlineProps = /* @__PURE__ */ new Set([\n  ...SizableText.staticConfig.inlineProps || [],\n  \"maxFontSizeMultiplier\"\n]);\nSizableText.staticConfig.variants.fontFamily = {\n  any: (val, extras) => {\n    if (val === \"inherit\") {\n      return { fontFamily: \"inherit\" };\n    }\n    const sizeProp = extras.props[\"size\"];\n    const fontSizeProp = extras.props[\"fontSize\"];\n    const size = sizeProp === true && fontSizeProp ? fontSizeProp : extras.props[\"size\"] ?? true;\n    return getFontSized(size, extras);\n  }\n};\nexport {\n  SizableText\n};\n//# sourceMappingURL=SizableText.js.map\n"],"mappings":";;;;AAEA,MAAM,cAAc,OAAO,MAAM;CAC/B,aAAa;CACb,YAAY;CACZ,OAAO;CACP,MAAM;CACN,UAAU,EACR,MAAM,aACR;AACF,CAAC;AACD,YAAY,aAAa,8BAA8B,IAAI,IAAI,CAC7D,GAAG,YAAY,aAAa,eAAe,CAAC,GAC5C,uBACF,CAAC;AACD,YAAY,aAAa,SAAS,aAAa,EAC7C,MAAM,KAAK,WAAW;CACpB,IAAI,QAAQ,WAAW;EACrB,OAAO,EAAE,YAAY,UAAU;CACjC;CACA,MAAM,WAAW,OAAO,MAAM;CAC9B,MAAM,eAAe,OAAO,MAAM;CAClC,MAAM,OAAO,aAAa,QAAQ,eAAe,eAAe,OAAO,MAAM,WAAW;CACxF,OAAO,aAAa,MAAM,MAAM;AAClC,EACF"}
+{"version":3,"file":"SizableText.js","names":[],"sources":["esm/SizableText.js"],"sourcesContent":["import { getFontSized } from \"@tamagui/get-font-sized\";\nimport { Text, styled } from \"@tamagui/web\";\nconst SizableTextFrame = styled(Text, {\n  displayName: \"SizableText\",\n  fontFamily: \"body\",\n  color: \"color\",\n  size: true,\n  variants: {\n    size: getFontSized\n  }\n});\nconst SizableText = SizableTextFrame.resolve((props, env) => {\n  if (props.fontFamily === \"inherit\") {\n    return { fontFamily: \"inherit\" };\n  }\n  if (props.fontFamily === void 0) {\n    return {};\n  }\n  const size = props.size === true && props.fontSize ? props.fontSize : props.size ?? true;\n  const sized = getFontSized(size, env);\n  return {\n    color: sized?.color,\n    fontFamily: sized?.fontFamily,\n    fontSize: sized?.fontSize,\n    fontStyle: sized?.fontStyle,\n    fontWeight: sized?.fontWeight,\n    letterSpacing: sized?.letterSpacing,\n    lineHeight: sized?.lineHeight,\n    textTransform: sized?.textTransform\n  };\n});\nSizableText.staticConfig.inlineProps = /* @__PURE__ */ new Set([\n  ...SizableText.staticConfig.inlineProps || [],\n  \"maxFontSizeMultiplier\"\n]);\nexport {\n  SizableText\n};\n//# sourceMappingURL=SizableText.js.map\n"],"mappings":";;;;AAEA,MAAM,mBAAmB,OAAO,MAAM;CACpC,aAAa;CACb,YAAY;CACZ,OAAO;CACP,MAAM;CACN,UAAU,EACR,MAAM,aACR;AACF,CAAC;AACD,MAAM,cAAc,iBAAiB,SAAS,OAAO,QAAQ;CAC3D,IAAI,MAAM,eAAe,WAAW;EAClC,OAAO,EAAE,YAAY,UAAU;CACjC;CACA,IAAI,MAAM,eAAe,KAAK,GAAG;EAC/B,OAAO,CAAC;CACV;CACA,MAAM,OAAO,MAAM,SAAS,QAAQ,MAAM,WAAW,MAAM,WAAW,MAAM,QAAQ;CACpF,MAAM,QAAQ,aAAa,MAAM,GAAG;CACpC,OAAO;EACL,OAAO,OAAO;EACd,YAAY,OAAO;EACnB,UAAU,OAAO;EACjB,WAAW,OAAO;EAClB,YAAY,OAAO;EACnB,eAAe,OAAO;EACtB,YAAY,OAAO;EACnB,eAAe,OAAO;CACxB;AACF,CAAC;AACD,YAAY,aAAa,8BAA8B,IAAI,IAAI,CAC7D,GAAG,YAAY,aAAa,eAAe,CAAC,GAC5C,uBACF,CAAC"}

package/dist/esm/SizableText.native.js

@@ -1,24 +1,35 @@
 import { getFontSized } from "@tamagui/get-font-sized";
 import { Text, styled } from "@tamagui/web";
 
-var SizableText = styled(Text, {
+var SizableTextFrame = styled(Text, {
 	displayName: "SizableText",
 	fontFamily: "body",
 	color: "color",
 	size: true,
 	variants: { size: getFontSized }
 });
-SizableText.staticConfig.inlineProps = /* @__PURE__ */ new Set([...SizableText.staticConfig.inlineProps || [], "maxFontSizeMultiplier"]);
-SizableText.staticConfig.variants.fontFamily = { any: function(val, extras) {
-	if (val === "inherit") {
+var SizableText = SizableTextFrame.resolve(function(props, env) {
+	if (props.fontFamily === "inherit") {
 		return { fontFamily: "inherit" };
 	}
-	var sizeProp = extras.props["size"];
-	var fontSizeProp = extras.props["fontSize"];
-	var _extras_props_size;
-	var size = sizeProp === true && fontSizeProp ? fontSizeProp : (_extras_props_size = extras.props["size"]) !== null && _extras_props_size !== void 0 ? _extras_props_size : true;
-	return getFontSized(size, extras);
-} };
+	if (props.fontFamily === void 0) {
+		return {};
+	}
+	var _props_size;
+	var size = props.size === true && props.fontSize ? props.fontSize : (_props_size = props.size) !== null && _props_size !== void 0 ? _props_size : true;
+	var sized = getFontSized(size, env);
+	return {
+		color: sized === null || sized === void 0 ? void 0 : sized.color,
+		fontFamily: sized === null || sized === void 0 ? void 0 : sized.fontFamily,
+		fontSize: sized === null || sized === void 0 ? void 0 : sized.fontSize,
+		fontStyle: sized === null || sized === void 0 ? void 0 : sized.fontStyle,
+		fontWeight: sized === null || sized === void 0 ? void 0 : sized.fontWeight,
+		letterSpacing: sized === null || sized === void 0 ? void 0 : sized.letterSpacing,
+		lineHeight: sized === null || sized === void 0 ? void 0 : sized.lineHeight,
+		textTransform: sized === null || sized === void 0 ? void 0 : sized.textTransform
+	};
+});
+SizableText.staticConfig.inlineProps = /* @__PURE__ */ new Set([...SizableText.staticConfig.inlineProps || [], "maxFontSizeMultiplier"]);
 
 export { SizableText };
 //# sourceMappingURL=SizableText.native.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"SizableText.native.js","names":[],"sources":["esm/SizableText.native.js"],"sourcesContent":["import { getFontSized } from \"@tamagui/get-font-sized\";\nimport { Text, styled } from \"@tamagui/web\";\nvar SizableText = styled(Text, {\n  displayName: \"SizableText\",\n  fontFamily: \"body\",\n  color: \"color\",\n  size: true,\n  variants: {\n    size: getFontSized\n  }\n});\nSizableText.staticConfig.inlineProps = /* @__PURE__ */ new Set([\n  ...SizableText.staticConfig.inlineProps || [],\n  \"maxFontSizeMultiplier\"\n]);\nSizableText.staticConfig.variants.fontFamily = {\n  any: function(val, extras) {\n    if (val === \"inherit\") {\n      return {\n        fontFamily: \"inherit\"\n      };\n    }\n    var sizeProp = extras.props[\"size\"];\n    var fontSizeProp = extras.props[\"fontSize\"];\n    var _extras_props_size;\n    var size = sizeProp === true && fontSizeProp ? fontSizeProp : (_extras_props_size = extras.props[\"size\"]) !== null && _extras_props_size !== void 0 ? _extras_props_size : true;\n    return getFontSized(size, extras);\n  }\n};\nexport {\n  SizableText\n};\n//# sourceMappingURL=SizableText.js.map\n"],"mappings":";;;;AAEA,IAAI,cAAc,OAAO,MAAM;CAC7B,aAAa;CACb,YAAY;CACZ,OAAO;CACP,MAAM;CACN,UAAU,EACR,MAAM,aACR;AACF,CAAC;AACD,YAAY,aAAa,8BAA8B,IAAI,IAAI,CAC7D,GAAG,YAAY,aAAa,eAAe,CAAC,GAC5C,uBACF,CAAC;AACD,YAAY,aAAa,SAAS,aAAa,EAC7C,KAAK,SAAS,KAAK,QAAQ;CACzB,IAAI,QAAQ,WAAW;EACrB,OAAO,EACL,YAAY,UACd;CACF;CACA,IAAI,WAAW,OAAO,MAAM;CAC5B,IAAI,eAAe,OAAO,MAAM;CAChC,IAAI;CACJ,IAAI,OAAO,aAAa,QAAQ,eAAe,gBAAgB,qBAAqB,OAAO,MAAM,aAAa,QAAQ,uBAAuB,KAAK,IAAI,qBAAqB;CAC3K,OAAO,aAAa,MAAM,MAAM;AAClC,EACF"}
+{"version":3,"file":"SizableText.native.js","names":[],"sources":["esm/SizableText.native.js"],"sourcesContent":["import { getFontSized } from \"@tamagui/get-font-sized\";\nimport { Text, styled } from \"@tamagui/web\";\nvar SizableTextFrame = styled(Text, {\n  displayName: \"SizableText\",\n  fontFamily: \"body\",\n  color: \"color\",\n  size: true,\n  variants: {\n    size: getFontSized\n  }\n});\nvar SizableText = SizableTextFrame.resolve(function(props, env) {\n  if (props.fontFamily === \"inherit\") {\n    return {\n      fontFamily: \"inherit\"\n    };\n  }\n  if (props.fontFamily === void 0) {\n    return {};\n  }\n  var _props_size;\n  var size = props.size === true && props.fontSize ? props.fontSize : (_props_size = props.size) !== null && _props_size !== void 0 ? _props_size : true;\n  var sized = getFontSized(size, env);\n  return {\n    color: sized === null || sized === void 0 ? void 0 : sized.color,\n    fontFamily: sized === null || sized === void 0 ? void 0 : sized.fontFamily,\n    fontSize: sized === null || sized === void 0 ? void 0 : sized.fontSize,\n    fontStyle: sized === null || sized === void 0 ? void 0 : sized.fontStyle,\n    fontWeight: sized === null || sized === void 0 ? void 0 : sized.fontWeight,\n    letterSpacing: sized === null || sized === void 0 ? void 0 : sized.letterSpacing,\n    lineHeight: sized === null || sized === void 0 ? void 0 : sized.lineHeight,\n    textTransform: sized === null || sized === void 0 ? void 0 : sized.textTransform\n  };\n});\nSizableText.staticConfig.inlineProps = /* @__PURE__ */ new Set([\n  ...SizableText.staticConfig.inlineProps || [],\n  \"maxFontSizeMultiplier\"\n]);\nexport {\n  SizableText\n};\n//# sourceMappingURL=SizableText.js.map\n"],"mappings":";;;;AAEA,IAAI,mBAAmB,OAAO,MAAM;CAClC,aAAa;CACb,YAAY;CACZ,OAAO;CACP,MAAM;CACN,UAAU,EACR,MAAM,aACR;AACF,CAAC;AACD,IAAI,cAAc,iBAAiB,QAAQ,SAAS,OAAO,KAAK;CAC9D,IAAI,MAAM,eAAe,WAAW;EAClC,OAAO,EACL,YAAY,UACd;CACF;CACA,IAAI,MAAM,eAAe,KAAK,GAAG;EAC/B,OAAO,CAAC;CACV;CACA,IAAI;CACJ,IAAI,OAAO,MAAM,SAAS,QAAQ,MAAM,WAAW,MAAM,YAAY,cAAc,MAAM,UAAU,QAAQ,gBAAgB,KAAK,IAAI,cAAc;CAClJ,IAAI,QAAQ,aAAa,MAAM,GAAG;CAClC,OAAO;EACL,OAAO,UAAU,QAAQ,UAAU,KAAK,IAAI,KAAK,IAAI,MAAM;EAC3D,YAAY,UAAU,QAAQ,UAAU,KAAK,IAAI,KAAK,IAAI,MAAM;EAChE,UAAU,UAAU,QAAQ,UAAU,KAAK,IAAI,KAAK,IAAI,MAAM;EAC9D,WAAW,UAAU,QAAQ,UAAU,KAAK,IAAI,KAAK,IAAI,MAAM;EAC/D,YAAY,UAAU,QAAQ,UAAU,KAAK,IAAI,KAAK,IAAI,MAAM;EAChE,eAAe,UAAU,QAAQ,UAAU,KAAK,IAAI,KAAK,IAAI,MAAM;EACnE,YAAY,UAAU,QAAQ,UAAU,KAAK,IAAI,KAAK,IAAI,MAAM;EAChE,eAAe,UAAU,QAAQ,UAAU,KAAK,IAAI,KAAK,IAAI,MAAM;CACrE;AACF,CAAC;AACD,YAAY,aAAa,8BAA8B,IAAI,IAAI,CAC7D,GAAG,YAAY,aAAa,eAAe,CAAC,GAC5C,uBACF,CAAC"}

package/dist/jsx/SizableText.mjs

@@ -1,23 +1,34 @@
 import { getFontSized } from "@tamagui/get-font-sized";
 import { Text, styled } from "@tamagui/web";
 
-const SizableText = styled(Text, {
+const SizableTextFrame = styled(Text, {
 	displayName: "SizableText",
 	fontFamily: "body",
 	color: "color",
 	size: true,
 	variants: { size: getFontSized }
 });
-SizableText.staticConfig.inlineProps = /* @__PURE__ */ new Set([...SizableText.staticConfig.inlineProps || [], "maxFontSizeMultiplier"]);
-SizableText.staticConfig.variants.fontFamily = { any: (val, extras) => {
-	if (val === "inherit") {
+const SizableText = SizableTextFrame.resolve((props, env) => {
+	if (props.fontFamily === "inherit") {
 		return { fontFamily: "inherit" };
 	}
-	const sizeProp = extras.props["size"];
-	const fontSizeProp = extras.props["fontSize"];
-	const size = sizeProp === true && fontSizeProp ? fontSizeProp : extras.props["size"] ?? true;
-	return getFontSized(size, extras);
-} };
+	if (props.fontFamily === void 0) {
+		return {};
+	}
+	const size = props.size === true && props.fontSize ? props.fontSize : props.size ?? true;
+	const sized = getFontSized(size, env);
+	return {
+		color: sized?.color,
+		fontFamily: sized?.fontFamily,
+		fontSize: sized?.fontSize,
+		fontStyle: sized?.fontStyle,
+		fontWeight: sized?.fontWeight,
+		letterSpacing: sized?.letterSpacing,
+		lineHeight: sized?.lineHeight,
+		textTransform: sized?.textTransform
+	};
+});
+SizableText.staticConfig.inlineProps = /* @__PURE__ */ new Set([...SizableText.staticConfig.inlineProps || [], "maxFontSizeMultiplier"]);
 
 export { SizableText };
 //# sourceMappingURL=SizableText.mjs.map

package/dist/jsx/SizableText.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"SizableText.js","names":[],"sources":["jsx/SizableText.js"],"sourcesContent":["import { getFontSized } from \"@tamagui/get-font-sized\";\nimport { Text, styled } from \"@tamagui/web\";\nconst SizableText = styled(Text, {\n  displayName: \"SizableText\",\n  fontFamily: \"body\",\n  color: \"color\",\n  size: true,\n  variants: {\n    size: getFontSized\n  }\n});\nSizableText.staticConfig.inlineProps = /* @__PURE__ */ new Set([\n  ...SizableText.staticConfig.inlineProps || [],\n  \"maxFontSizeMultiplier\"\n]);\nSizableText.staticConfig.variants.fontFamily = {\n  any: (val, extras) => {\n    if (val === \"inherit\") {\n      return { fontFamily: \"inherit\" };\n    }\n    const sizeProp = extras.props[\"size\"];\n    const fontSizeProp = extras.props[\"fontSize\"];\n    const size = sizeProp === true && fontSizeProp ? fontSizeProp : extras.props[\"size\"] ?? true;\n    return getFontSized(size, extras);\n  }\n};\nexport {\n  SizableText\n};\n//# sourceMappingURL=SizableText.js.map\n"],"mappings":";;;;AAEA,MAAM,cAAc,OAAO,MAAM;CAC/B,aAAa;CACb,YAAY;CACZ,OAAO;CACP,MAAM;CACN,UAAU,EACR,MAAM,aACR;AACF,CAAC;AACD,YAAY,aAAa,8BAA8B,IAAI,IAAI,CAC7D,GAAG,YAAY,aAAa,eAAe,CAAC,GAC5C,uBACF,CAAC;AACD,YAAY,aAAa,SAAS,aAAa,EAC7C,MAAM,KAAK,WAAW;CACpB,IAAI,QAAQ,WAAW;EACrB,OAAO,EAAE,YAAY,UAAU;CACjC;CACA,MAAM,WAAW,OAAO,MAAM;CAC9B,MAAM,eAAe,OAAO,MAAM;CAClC,MAAM,OAAO,aAAa,QAAQ,eAAe,eAAe,OAAO,MAAM,WAAW;CACxF,OAAO,aAAa,MAAM,MAAM;AAClC,EACF"}
+{"version":3,"file":"SizableText.js","names":[],"sources":["jsx/SizableText.js"],"sourcesContent":["import { getFontSized } from \"@tamagui/get-font-sized\";\nimport { Text, styled } from \"@tamagui/web\";\nconst SizableTextFrame = styled(Text, {\n  displayName: \"SizableText\",\n  fontFamily: \"body\",\n  color: \"color\",\n  size: true,\n  variants: {\n    size: getFontSized\n  }\n});\nconst SizableText = SizableTextFrame.resolve((props, env) => {\n  if (props.fontFamily === \"inherit\") {\n    return { fontFamily: \"inherit\" };\n  }\n  if (props.fontFamily === void 0) {\n    return {};\n  }\n  const size = props.size === true && props.fontSize ? props.fontSize : props.size ?? true;\n  const sized = getFontSized(size, env);\n  return {\n    color: sized?.color,\n    fontFamily: sized?.fontFamily,\n    fontSize: sized?.fontSize,\n    fontStyle: sized?.fontStyle,\n    fontWeight: sized?.fontWeight,\n    letterSpacing: sized?.letterSpacing,\n    lineHeight: sized?.lineHeight,\n    textTransform: sized?.textTransform\n  };\n});\nSizableText.staticConfig.inlineProps = /* @__PURE__ */ new Set([\n  ...SizableText.staticConfig.inlineProps || [],\n  \"maxFontSizeMultiplier\"\n]);\nexport {\n  SizableText\n};\n//# sourceMappingURL=SizableText.js.map\n"],"mappings":";;;;AAEA,MAAM,mBAAmB,OAAO,MAAM;CACpC,aAAa;CACb,YAAY;CACZ,OAAO;CACP,MAAM;CACN,UAAU,EACR,MAAM,aACR;AACF,CAAC;AACD,MAAM,cAAc,iBAAiB,SAAS,OAAO,QAAQ;CAC3D,IAAI,MAAM,eAAe,WAAW;EAClC,OAAO,EAAE,YAAY,UAAU;CACjC;CACA,IAAI,MAAM,eAAe,KAAK,GAAG;EAC/B,OAAO,CAAC;CACV;CACA,MAAM,OAAO,MAAM,SAAS,QAAQ,MAAM,WAAW,MAAM,WAAW,MAAM,QAAQ;CACpF,MAAM,QAAQ,aAAa,MAAM,GAAG;CACpC,OAAO;EACL,OAAO,OAAO;EACd,YAAY,OAAO;EACnB,UAAU,OAAO;EACjB,WAAW,OAAO;EAClB,YAAY,OAAO;EACnB,eAAe,OAAO;EACtB,YAAY,OAAO;EACnB,eAAe,OAAO;CACxB;AACF,CAAC;AACD,YAAY,aAAa,8BAA8B,IAAI,IAAI,CAC7D,GAAG,YAAY,aAAa,eAAe,CAAC,GAC5C,uBACF,CAAC"}

package/dist/jsx/SizableText.native.cjs

@@ -25,21 +25,32 @@ __export(SizableText_exports, { SizableText: () => SizableText });
 module.exports = __toCommonJS(SizableText_exports);
 var import_get_font_sized = require("@tamagui/get-font-sized");
 var import_web = require("@tamagui/web");
-var SizableText = (0, import_web.styled)(import_web.Text, {
+var SizableTextFrame = (0, import_web.styled)(import_web.Text, {
 	displayName: "SizableText",
 	fontFamily: "body",
 	color: "color",
 	size: true,
 	variants: { size: import_get_font_sized.getFontSized }
 });
-SizableText.staticConfig.inlineProps = /* @__PURE__ */ new Set([...SizableText.staticConfig.inlineProps || [], "maxFontSizeMultiplier"]);
-SizableText.staticConfig.variants.fontFamily = { any: function(val, extras) {
-	if (val === "inherit") {
+var SizableText = SizableTextFrame.resolve(function(props, env) {
+	if (props.fontFamily === "inherit") {
 		return { fontFamily: "inherit" };
 	}
-	var sizeProp = extras.props["size"];
-	var fontSizeProp = extras.props["fontSize"];
-	var _extras_props_size;
-	var size = sizeProp === true && fontSizeProp ? fontSizeProp : (_extras_props_size = extras.props["size"]) !== null && _extras_props_size !== void 0 ? _extras_props_size : true;
-	return (0, import_get_font_sized.getFontSized)(size, extras);
-} };
+	if (props.fontFamily === void 0) {
+		return {};
+	}
+	var _props_size;
+	var size = props.size === true && props.fontSize ? props.fontSize : (_props_size = props.size) !== null && _props_size !== void 0 ? _props_size : true;
+	var sized = (0, import_get_font_sized.getFontSized)(size, env);
+	return {
+		color: sized === null || sized === void 0 ? void 0 : sized.color,
+		fontFamily: sized === null || sized === void 0 ? void 0 : sized.fontFamily,
+		fontSize: sized === null || sized === void 0 ? void 0 : sized.fontSize,
+		fontStyle: sized === null || sized === void 0 ? void 0 : sized.fontStyle,
+		fontWeight: sized === null || sized === void 0 ? void 0 : sized.fontWeight,
+		letterSpacing: sized === null || sized === void 0 ? void 0 : sized.letterSpacing,
+		lineHeight: sized === null || sized === void 0 ? void 0 : sized.lineHeight,
+		textTransform: sized === null || sized === void 0 ? void 0 : sized.textTransform
+	};
+});
+SizableText.staticConfig.inlineProps = /* @__PURE__ */ new Set([...SizableText.staticConfig.inlineProps || [], "maxFontSizeMultiplier"]);

package/dist/jsx/SizableText.native.js

@@ -25,23 +25,34 @@ __export(SizableText_exports, { SizableText: () => SizableText });
 module.exports = __toCommonJS(SizableText_exports);
 var import_get_font_sized = require("@tamagui/get-font-sized");
 var import_web = require("@tamagui/web");
-var SizableText = (0, import_web.styled)(import_web.Text, {
+var SizableTextFrame = (0, import_web.styled)(import_web.Text, {
 	displayName: "SizableText",
 	fontFamily: "body",
 	color: "color",
 	size: true,
 	variants: { size: import_get_font_sized.getFontSized }
 });
-SizableText.staticConfig.inlineProps = /* @__PURE__ */ new Set([...SizableText.staticConfig.inlineProps || [], "maxFontSizeMultiplier"]);
-SizableText.staticConfig.variants.fontFamily = { any: function(val, extras) {
-	if (val === "inherit") {
+var SizableText = SizableTextFrame.resolve(function(props, env) {
+	if (props.fontFamily === "inherit") {
 		return { fontFamily: "inherit" };
 	}
-	var sizeProp = extras.props["size"];
-	var fontSizeProp = extras.props["fontSize"];
-	var _extras_props_size;
-	var size = sizeProp === true && fontSizeProp ? fontSizeProp : (_extras_props_size = extras.props["size"]) !== null && _extras_props_size !== void 0 ? _extras_props_size : true;
-	return (0, import_get_font_sized.getFontSized)(size, extras);
-} };
+	if (props.fontFamily === void 0) {
+		return {};
+	}
+	var _props_size;
+	var size = props.size === true && props.fontSize ? props.fontSize : (_props_size = props.size) !== null && _props_size !== void 0 ? _props_size : true;
+	var sized = (0, import_get_font_sized.getFontSized)(size, env);
+	return {
+		color: sized === null || sized === void 0 ? void 0 : sized.color,
+		fontFamily: sized === null || sized === void 0 ? void 0 : sized.fontFamily,
+		fontSize: sized === null || sized === void 0 ? void 0 : sized.fontSize,
+		fontStyle: sized === null || sized === void 0 ? void 0 : sized.fontStyle,
+		fontWeight: sized === null || sized === void 0 ? void 0 : sized.fontWeight,
+		letterSpacing: sized === null || sized === void 0 ? void 0 : sized.letterSpacing,
+		lineHeight: sized === null || sized === void 0 ? void 0 : sized.lineHeight,
+		textTransform: sized === null || sized === void 0 ? void 0 : sized.textTransform
+	};
+});
+SizableText.staticConfig.inlineProps = /* @__PURE__ */ new Set([...SizableText.staticConfig.inlineProps || [], "maxFontSizeMultiplier"]);
 
 //# sourceMappingURL=SizableText.native.js.map

package/dist/jsx/SizableText.native.js.map

@@ -1 +1 @@
-{"version":3,"file":"SizableText.native.js","names":[],"sources":["jsx/SizableText.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 SizableText_exports = {};\n__export(SizableText_exports, {\n  SizableText: () => SizableText\n});\nmodule.exports = __toCommonJS(SizableText_exports);\nvar import_get_font_sized = require(\"@tamagui/get-font-sized\");\nvar import_web = require(\"@tamagui/web\");\nvar SizableText = (0, import_web.styled)(import_web.Text, {\n  displayName: \"SizableText\",\n  fontFamily: \"body\",\n  color: \"color\",\n  size: true,\n  variants: {\n    size: import_get_font_sized.getFontSized\n  }\n});\nSizableText.staticConfig.inlineProps = /* @__PURE__ */ new Set([\n  ...SizableText.staticConfig.inlineProps || [],\n  \"maxFontSizeMultiplier\"\n]);\nSizableText.staticConfig.variants.fontFamily = {\n  any: function(val, extras) {\n    if (val === \"inherit\") {\n      return {\n        fontFamily: \"inherit\"\n      };\n    }\n    var sizeProp = extras.props[\"size\"];\n    var fontSizeProp = extras.props[\"fontSize\"];\n    var _extras_props_size;\n    var size = sizeProp === true && fontSizeProp ? fontSizeProp : (_extras_props_size = extras.props[\"size\"]) !== null && _extras_props_size !== void 0 ? _extras_props_size : true;\n    return (0, import_get_font_sized.getFontSized)(size, extras);\n  }\n};\n//# sourceMappingURL=SizableText.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,sBAAsB,CAAC;AAC3B,SAAS,qBAAqB,EAC5B,mBAAmB,YACrB,CAAC;AACD,OAAO,UAAU,aAAa,mBAAmB;AACjD,IAAI,wBAAwB,QAAQ,yBAAyB;AAC7D,IAAI,aAAa,QAAQ,cAAc;AACvC,IAAI,eAAe,GAAG,WAAW,OAAM,CAAE,WAAW,MAAM;CACxD,aAAa;CACb,YAAY;CACZ,OAAO;CACP,MAAM;CACN,UAAU,EACR,MAAM,sBAAsB,aAC9B;AACF,CAAC;AACD,YAAY,aAAa,8BAA8B,IAAI,IAAI,CAC7D,GAAG,YAAY,aAAa,eAAe,CAAC,GAC5C,uBACF,CAAC;AACD,YAAY,aAAa,SAAS,aAAa,EAC7C,KAAK,SAAS,KAAK,QAAQ;CACzB,IAAI,QAAQ,WAAW;EACrB,OAAO,EACL,YAAY,UACd;CACF;CACA,IAAI,WAAW,OAAO,MAAM;CAC5B,IAAI,eAAe,OAAO,MAAM;CAChC,IAAI;CACJ,IAAI,OAAO,aAAa,QAAQ,eAAe,gBAAgB,qBAAqB,OAAO,MAAM,aAAa,QAAQ,uBAAuB,KAAK,IAAI,qBAAqB;CAC3K,QAAQ,GAAG,sBAAsB,aAAY,CAAE,MAAM,MAAM;AAC7D,EACF"}
+{"version":3,"file":"SizableText.native.js","names":[],"sources":["jsx/SizableText.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 SizableText_exports = {};\n__export(SizableText_exports, {\n  SizableText: () => SizableText\n});\nmodule.exports = __toCommonJS(SizableText_exports);\nvar import_get_font_sized = require(\"@tamagui/get-font-sized\");\nvar import_web = require(\"@tamagui/web\");\nvar SizableTextFrame = (0, import_web.styled)(import_web.Text, {\n  displayName: \"SizableText\",\n  fontFamily: \"body\",\n  color: \"color\",\n  size: true,\n  variants: {\n    size: import_get_font_sized.getFontSized\n  }\n});\nvar SizableText = SizableTextFrame.resolve(function(props, env) {\n  if (props.fontFamily === \"inherit\") {\n    return {\n      fontFamily: \"inherit\"\n    };\n  }\n  if (props.fontFamily === void 0) {\n    return {};\n  }\n  var _props_size;\n  var size = props.size === true && props.fontSize ? props.fontSize : (_props_size = props.size) !== null && _props_size !== void 0 ? _props_size : true;\n  var sized = (0, import_get_font_sized.getFontSized)(size, env);\n  return {\n    color: sized === null || sized === void 0 ? void 0 : sized.color,\n    fontFamily: sized === null || sized === void 0 ? void 0 : sized.fontFamily,\n    fontSize: sized === null || sized === void 0 ? void 0 : sized.fontSize,\n    fontStyle: sized === null || sized === void 0 ? void 0 : sized.fontStyle,\n    fontWeight: sized === null || sized === void 0 ? void 0 : sized.fontWeight,\n    letterSpacing: sized === null || sized === void 0 ? void 0 : sized.letterSpacing,\n    lineHeight: sized === null || sized === void 0 ? void 0 : sized.lineHeight,\n    textTransform: sized === null || sized === void 0 ? void 0 : sized.textTransform\n  };\n});\nSizableText.staticConfig.inlineProps = /* @__PURE__ */ new Set([\n  ...SizableText.staticConfig.inlineProps || [],\n  \"maxFontSizeMultiplier\"\n]);\n//# sourceMappingURL=SizableText.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,sBAAsB,CAAC;AAC3B,SAAS,qBAAqB,EAC5B,mBAAmB,YACrB,CAAC;AACD,OAAO,UAAU,aAAa,mBAAmB;AACjD,IAAI,wBAAwB,QAAQ,yBAAyB;AAC7D,IAAI,aAAa,QAAQ,cAAc;AACvC,IAAI,oBAAoB,GAAG,WAAW,OAAM,CAAE,WAAW,MAAM;CAC7D,aAAa;CACb,YAAY;CACZ,OAAO;CACP,MAAM;CACN,UAAU,EACR,MAAM,sBAAsB,aAC9B;AACF,CAAC;AACD,IAAI,cAAc,iBAAiB,QAAQ,SAAS,OAAO,KAAK;CAC9D,IAAI,MAAM,eAAe,WAAW;EAClC,OAAO,EACL,YAAY,UACd;CACF;CACA,IAAI,MAAM,eAAe,KAAK,GAAG;EAC/B,OAAO,CAAC;CACV;CACA,IAAI;CACJ,IAAI,OAAO,MAAM,SAAS,QAAQ,MAAM,WAAW,MAAM,YAAY,cAAc,MAAM,UAAU,QAAQ,gBAAgB,KAAK,IAAI,cAAc;CAClJ,IAAI,SAAS,GAAG,sBAAsB,aAAY,CAAE,MAAM,GAAG;CAC7D,OAAO;EACL,OAAO,UAAU,QAAQ,UAAU,KAAK,IAAI,KAAK,IAAI,MAAM;EAC3D,YAAY,UAAU,QAAQ,UAAU,KAAK,IAAI,KAAK,IAAI,MAAM;EAChE,UAAU,UAAU,QAAQ,UAAU,KAAK,IAAI,KAAK,IAAI,MAAM;EAC9D,WAAW,UAAU,QAAQ,UAAU,KAAK,IAAI,KAAK,IAAI,MAAM;EAC/D,YAAY,UAAU,QAAQ,UAAU,KAAK,IAAI,KAAK,IAAI,MAAM;EAChE,eAAe,UAAU,QAAQ,UAAU,KAAK,IAAI,KAAK,IAAI,MAAM;EACnE,YAAY,UAAU,QAAQ,UAAU,KAAK,IAAI,KAAK,IAAI,MAAM;EAChE,eAAe,UAAU,QAAQ,UAAU,KAAK,IAAI,KAAK,IAAI,MAAM;CACrE;AACF,CAAC;AACD,YAAY,aAAa,8BAA8B,IAAI,IAAI,CAC7D,GAAG,YAAY,aAAa,eAAe,CAAC,GAC5C,uBACF,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/text",
-  "version": "3.0.0-beta.831.1",
+  "version": "3.0.0-beta.889.1",
   "gitHead": "a49cc7ea6b93ba384e77a4880ae48ac4a5635c14",
   "source": "src/index.tsx",
   "files": [
@@ -35,12 +35,12 @@
     "clean:build": "tamagui-build clean:build"
   },
   "dependencies": {
-    "@tamagui/get-font-sized": "3.0.0-beta.831.1",
-    "@tamagui/helpers-tamagui": "3.0.0-beta.831.1",
-    "@tamagui/web": "3.0.0-beta.831.1"
+    "@tamagui/get-font-sized": "3.0.0-beta.889.1",
+    "@tamagui/helpers-tamagui": "3.0.0-beta.889.1",
+    "@tamagui/web": "3.0.0-beta.889.1"
   },
   "devDependencies": {
-    "@tamagui/build": "3.0.0-beta.831.1",
+    "@tamagui/build": "3.0.0-beta.889.1",
     "react": "19.2.3"
   },
   "peerDependencies": {

package/src/SizableText.tsx

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

package/types/SizableText.d.ts

@@ -1,14 +1,6 @@
 import type { GetProps } from '@tamagui/web';
-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<{
+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?: 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];
-};
+}, import("@tamagui/web").StaticConfigPublic>;
 export type SizableTextProps = GetProps<typeof SizableText>;
 //# sourceMappingURL=SizableText.d.ts.map

package/types/SizableText.d.ts.map

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

package/types/types.d.ts

@@ -1,34 +1,34 @@
 import { type Shorthands, type TextStyle, type TextStylePropsBase, type WithShorthands } from '@tamagui/web';
 import type { SizableTextProps } from './SizableText';
 export declare const textParentProps: {
-    readonly whiteSpace?: boolean | undefined;
-    readonly wordWrap?: boolean | undefined;
-    readonly textOverflow?: boolean | undefined;
-    readonly WebkitBoxOrient?: boolean | undefined;
-    readonly textDecorationDistance?: boolean | undefined;
-    readonly WebkitLineClamp?: boolean | undefined;
-    readonly color: boolean;
-    readonly textDecorationColor: boolean;
-    readonly textShadowColor: boolean;
-    readonly fontFamily: boolean;
-    readonly fontStyle: boolean;
-    readonly fontVariant: boolean;
-    readonly textTransform: boolean;
-    readonly textAlign: boolean;
-    readonly textDecorationLine: boolean;
-    readonly textDecorationStyle: boolean;
-    readonly userSelect: boolean;
-    readonly writingDirection: boolean;
-    readonly fontSize: boolean;
-    readonly fontWeight: boolean;
-    readonly letterSpacing: boolean;
-    readonly lineHeight: boolean;
-    readonly textShadow: boolean;
-    readonly textShadowOffset: boolean;
-    readonly textShadowRadius: boolean;
-    readonly textDecoration: boolean;
-    readonly font: boolean;
-    readonly verticalAlign: boolean;
+    readonly WebkitBoxOrient: true;
+    readonly WebkitLineClamp: true;
+    readonly color: true;
+    readonly font: true;
+    readonly fontFamily: true;
+    readonly fontSize: true;
+    readonly fontStyle: true;
+    readonly fontVariant: true;
+    readonly fontWeight: true;
+    readonly letterSpacing: true;
+    readonly lineHeight: true;
+    readonly textAlign: true;
+    readonly textDecoration: true;
+    readonly textDecorationColor: true;
+    readonly textDecorationDistance: true;
+    readonly textDecorationLine: true;
+    readonly textDecorationStyle: true;
+    readonly textOverflow: true;
+    readonly textShadow: true;
+    readonly textShadowColor: true;
+    readonly textShadowOffset: true;
+    readonly textShadowRadius: true;
+    readonly textTransform: true;
+    readonly userSelect: true;
+    readonly verticalAlign: true;
+    readonly whiteSpace: true;
+    readonly wordWrap: true;
+    readonly writingDirection: true;
     readonly ellipsis: true;
     readonly maxFontSizeMultiplier: true;
     readonly noTextWrap: true;