@tamagui/helpers-icon 2.7.7 → 3.0.0-beta.643.1

package/dist/cjs/IconProps.cjs

@@ -1,18 +1,17 @@
+
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 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 IconProps_exports = {};
-module.exports = __toCommonJS(IconProps_exports);
+module.exports = __toCommonJS(IconProps_exports);

package/dist/cjs/IconProps.native.cjs

@@ -0,0 +1,19 @@
+"use strict";
+
+
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+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 IconProps_exports = {};
+module.exports = __toCommonJS(IconProps_exports);

package/dist/cjs/IconProps.native.js

@@ -1,21 +1,21 @@
 "use strict";
 
+
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 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 IconProps_exports = {};
 module.exports = __toCommonJS(IconProps_exports);
+
 //# sourceMappingURL=IconProps.native.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","IconProps_exports"],"sources":["../../src/IconProps.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,iBAAA","ignoreList":[]}
+{"version":3,"file":"IconProps.native.js","names":[],"sources":["cjs/IconProps.native.js"],"sourcesContent":["\"use strict\";\nvar __defProp = Object.defineProperty;\nvar __getOwnPropDesc = Object.getOwnPropertyDescriptor;\nvar __getOwnPropNames = Object.getOwnPropertyNames;\nvar __hasOwnProp = Object.prototype.hasOwnProperty;\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 IconProps_exports = {};\nmodule.exports = __toCommonJS(IconProps_exports);\n//# sourceMappingURL=IconProps.js.map\n"],"mappings":";;;;AACA,IAAI,YAAY,OAAO;AACvB,IAAI,mBAAmB,OAAO;AAC9B,IAAI,oBAAoB,OAAO;AAC/B,IAAI,eAAe,OAAO,UAAU;AACpC,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,oBAAoB,CAAC;AACzB,OAAO,UAAU,aAAa,iBAAiB"}

package/dist/cjs/index.cjs

@@ -1,21 +1,20 @@
+
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 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 __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
-var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
-  value: true
-}), mod);
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var index_exports = {};
 module.exports = __toCommonJS(index_exports);
 __reExport(index_exports, require("./IconProps.cjs"), module.exports);
-__reExport(index_exports, require("./themed.cjs"), module.exports);
+__reExport(index_exports, require("./themed.cjs"), module.exports);

package/dist/cjs/index.native.cjs

@@ -0,0 +1,22 @@
+"use strict";
+
+
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+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 __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var index_exports = {};
+module.exports = __toCommonJS(index_exports);
+__reExport(index_exports, require("./IconProps.native.js"), module.exports);
+__reExport(index_exports, require("./themed.native.js"), module.exports);

package/dist/cjs/index.native.js

@@ -1,24 +1,24 @@
 "use strict";
 
+
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 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 __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
-var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
-  value: true
-}), mod);
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var index_exports = {};
 module.exports = __toCommonJS(index_exports);
 __reExport(index_exports, require("./IconProps.native.js"), module.exports);
 __reExport(index_exports, require("./themed.native.js"), module.exports);
+
 //# sourceMappingURL=index.native.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","index_exports","module","exports","__reExport","require"],"sources":["../../src/index.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,aAAA;AAAAC,MAAA,CAAAC,OAAA,GAAAP,YAAc,CAAAK,aAAA;AACdG,UAAA,CAAAH,aAAA,EAAcI,OAAA,wBADd,GAAAH,MAAA,CAAAC,OAAA","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 __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 __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, \"default\"), secondTarget && __copyProps(secondTarget, mod, \"default\"));\nvar __toCommonJS = (mod) => __copyProps(__defProp({}, \"__esModule\", { value: true }), mod);\nvar index_exports = {};\nmodule.exports = __toCommonJS(index_exports);\n__reExport(index_exports, require(\"./IconProps\"), module.exports);\n__reExport(index_exports, require(\"./themed\"), module.exports);\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,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,cAAc,QAAQ,KAAK,kBAAkB,YAAY,QAAQ,KAAK,SAAS,GAAG,gBAAgB,YAAY,cAAc,KAAK,SAAS;AAC9I,IAAI,gBAAgB,QAAQ,YAAY,UAAU,CAAC,GAAG,cAAc,EAAE,OAAO,KAAK,CAAC,GAAG,GAAG;AACzF,IAAI,gBAAgB,CAAC;AACrB,OAAO,UAAU,aAAa,aAAa;AAC3C,WAAW,eAAe,QAAQ,uBAAa,GAAG,OAAO,OAAO;AAChE,WAAW,eAAe,QAAQ,oBAAU,GAAG,OAAO,OAAO"}

package/dist/cjs/themed.cjs

@@ -1,81 +1,74 @@
+
 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
-  });
+	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 themed_exports = {};
-__export(themed_exports, {
-  SizableContext: () => import_sizable_context.SizableContext,
-  themed: () => themed
-});
+__export(themed_exports, { themed: () => themed });
 module.exports = __toCommonJS(themed_exports);
 var import_core = require("@tamagui/core");
-var import_sizable_context = require("@tamagui/sizable-context");
+var import_font_size = require("@tamagui/font-size");
+var import_size = require("@tamagui/size");
 var import_jsx_runtime = require("react/jsx-runtime");
-function needsFullStyleResolution(props) {
-  for (const key in props) {
-    if (key[0] === "$") return true;
-  }
-  return false;
-}
 function themed(Component, optsIn = {}) {
-  const opts = {
-    defaultThemeColor: process.env.DEFAULT_ICON_THEME_COLOR || "$color",
-    defaultStrokeWidth: 2,
-    fallbackColor: "#000",
-    resolveValues: process.env.TAMAGUI_ICON_COLOR_RESOLVE || "auto",
-    ...optsIn
-  };
-  const IconWrapper = propsIn => {
-    const styledContext = import_sizable_context.SizableContext.useStyledContext();
-    const needsMedia = needsFullStyleResolution(propsIn);
-    const [props, style, theme] = (0, import_core.usePropsAndStyle)(propsIn, {
-      ...opts,
-      forComponent: import_core.Text,
-      resolveValues: opts.resolveValues,
-      noMedia: !needsMedia
-    });
-    const defaultColor = opts.defaultThemeColor;
-    const colorIn = style.color || (defaultColor ? theme[defaultColor] : void 0) || (!props.disableTheme ? theme.color : null) || opts.fallbackColor;
-    const color = (0, import_core.getVariable)(colorIn);
-    const size = typeof props.size === "string" ? (0, import_core.getTokenValue)(props.size, "size") : props.size || (styledContext.size === "$true" ? void 0 : styledContext.size);
-    const strokeWidth = typeof props.strokeWidth === "string" ? (0, import_core.getTokenValue)(props.strokeWidth, "size") : props.strokeWidth ?? `${opts.defaultStrokeWidth}`;
-    const finalProps = {
-      ...props,
-      color,
-      size,
-      strokeWidth,
-      style
-    };
-    return /* @__PURE__ */(0, import_jsx_runtime.jsx)(Component, {
-      ...finalProps
-    });
-  };
-  const wrapped = propsIn => {
-    return /* @__PURE__ */(0, import_jsx_runtime.jsx)(IconWrapper, {
-      ...propsIn
-    });
-  };
-  wrapped["staticConfig"] = {
-    isHOC: true,
-    acceptsClassName: true
-  };
-  return wrapped;
-}
+	const opts = {
+		defaultThemeColor: process.env.DEFAULT_ICON_THEME_COLOR || "color",
+		defaultStrokeWidth: 2,
+		fallbackColor: "#000",
+		resolveValues: process.env.TAMAGUI_ICON_COLOR_RESOLVE || "auto",
+		...optsIn
+	};
+	const IconWrapper = (propsIn) => {
+		const styledContext = import_size.SizeContext.useStyledContext();
+		const theme = (0, import_core.useTheme)();
+		const { size: sizeProp, strokeWidth: strokeWidthProp, color: colorProp, fill: fillProp, stroke: strokeProp, disableTheme, style, testID, ...rest } = propsIn;
+		const resolveSvgColor = (val) => {
+			if (typeof val !== "string") return val;
+			const themed2 = theme?.[val];
+			if (themed2 != null) return (0, import_core.getVariable)(themed2);
+			return (0, import_core.getVariable)(val, "color");
+		};
+		const fillResolved = resolveSvgColor(fillProp);
+		const strokeResolved = resolveSvgColor(strokeProp);
+		const colorResolved = resolveSvgColor(colorProp);
+		const colorIn = strokeResolved || colorResolved || (opts.defaultThemeColor ? theme[opts.defaultThemeColor] : void 0) || (!disableTheme ? theme.color : null) || opts.fallbackColor;
+		const color = (0, import_core.getVariable)(colorIn);
+		const size = typeof sizeProp === "number" ? sizeProp : typeof sizeProp === "string" ? (0, import_font_size.getFontSize)(sizeProp) : styledContext.size != null ? (0, import_font_size.getFontSize)(styledContext.size) : void 0;
+		const strokeWidth = typeof strokeWidthProp === "string" ? (0, import_core.getTokenValue)(strokeWidthProp, "size") : strokeWidthProp ?? `${opts.defaultStrokeWidth}`;
+		const finalProps = {
+			...rest,
+			color,
+			size,
+			strokeWidth,
+			...fillResolved !== void 0 ? { fill: fillResolved } : null,
+			...strokeResolved !== void 0 ? { stroke: strokeResolved } : null,
+			...style ? { style } : null,
+			...testID != null ? import_core.isWeb ? { "data-testid": testID } : { testID } : null
+		};
+		return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Component, { ...finalProps });
+	};
+	const wrapped = (propsIn) => {
+		return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(IconWrapper, { ...propsIn });
+	};
+	wrapped["staticConfig"] = {
+		isHOC: true,
+		acceptsClassName: true
+	};
+	return wrapped;
+}

package/dist/cjs/themed.native.cjs

@@ -0,0 +1,77 @@
+"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 themed_exports = {};
+__export(themed_exports, { themed: () => themed });
+module.exports = __toCommonJS(themed_exports);
+var import_jsx_runtime = require("react/jsx-runtime");
+var import_core = require("@tamagui/core");
+var import_font_size = require("@tamagui/font-size");
+var import_size = require("@tamagui/size");
+function themed(Component) {
+	var optsIn = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
+	var opts = {
+		defaultThemeColor: process.env.DEFAULT_ICON_THEME_COLOR || "color",
+		defaultStrokeWidth: 2,
+		fallbackColor: "#000",
+		resolveValues: process.env.TAMAGUI_ICON_COLOR_RESOLVE || "auto",
+		...optsIn
+	};
+	var IconWrapper = function(propsIn) {
+		var styledContext = import_size.SizeContext.useStyledContext();
+		var theme = (0, import_core.useTheme)();
+		var { size: sizeProp, strokeWidth: strokeWidthProp, color: colorProp, fill: fillProp, stroke: strokeProp, disableTheme, style, testID, ...rest } = propsIn;
+		var resolveSvgColor = function(val) {
+			if (typeof val !== "string") return val;
+			var themed2 = theme === null || theme === void 0 ? void 0 : theme[val];
+			if (themed2 != null) return (0, import_core.getVariable)(themed2);
+			return (0, import_core.getVariable)(val, "color");
+		};
+		var fillResolved = resolveSvgColor(fillProp);
+		var strokeResolved = resolveSvgColor(strokeProp);
+		var colorResolved = resolveSvgColor(colorProp);
+		var colorIn = strokeResolved || colorResolved || (opts.defaultThemeColor ? theme[opts.defaultThemeColor] : void 0) || (!disableTheme ? theme.color : null) || opts.fallbackColor;
+		var color = (0, import_core.getVariable)(colorIn);
+		var size = typeof sizeProp === "number" ? sizeProp : typeof sizeProp === "string" ? (0, import_font_size.getFontSize)(sizeProp) : styledContext.size != null ? (0, import_font_size.getFontSize)(styledContext.size) : void 0;
+		var strokeWidth = typeof strokeWidthProp === "string" ? (0, import_core.getTokenValue)(strokeWidthProp, "size") : strokeWidthProp !== null && strokeWidthProp !== void 0 ? strokeWidthProp : `${opts.defaultStrokeWidth}`;
+		var finalProps = {
+			...rest,
+			color,
+			size,
+			strokeWidth,
+			...fillResolved !== void 0 ? { fill: fillResolved } : null,
+			...strokeResolved !== void 0 ? { stroke: strokeResolved } : null,
+			...style ? { style } : null,
+			...testID != null ? import_core.isWeb ? { "data-testid": testID } : { testID } : null
+		};
+		return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Component, { ...finalProps });
+	};
+	var wrapped = function(propsIn) {
+		return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(IconWrapper, { ...propsIn });
+	};
+	wrapped["staticConfig"] = {
+		isHOC: true,
+		acceptsClassName: true
+	};
+	return wrapped;
+}

package/dist/cjs/themed.native.js

@@ -1,86 +1,79 @@
 "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
-  });
+	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 themed_exports = {};
-__export(themed_exports, {
-  SizableContext: () => import_sizable_context.SizableContext,
-  themed: () => themed
-});
+__export(themed_exports, { themed: () => themed });
 module.exports = __toCommonJS(themed_exports);
 var import_jsx_runtime = require("react/jsx-runtime");
 var import_core = require("@tamagui/core");
-var import_sizable_context = require("@tamagui/sizable-context");
-function needsFullStyleResolution(props) {
-  for (var key in props) {
-    if (key[0] === "$") return true;
-  }
-  return false;
-}
+var import_font_size = require("@tamagui/font-size");
+var import_size = require("@tamagui/size");
 function themed(Component) {
-  var optsIn = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
-  var opts = {
-    defaultThemeColor: process.env.DEFAULT_ICON_THEME_COLOR || "$color",
-    defaultStrokeWidth: 2,
-    fallbackColor: "#000",
-    resolveValues: process.env.TAMAGUI_ICON_COLOR_RESOLVE || "auto",
-    ...optsIn
-  };
-  var IconWrapper = function (propsIn) {
-    var styledContext = import_sizable_context.SizableContext.useStyledContext();
-    var needsMedia = needsFullStyleResolution(propsIn);
-    var [props, style, theme] = (0, import_core.usePropsAndStyle)(propsIn, {
-      ...opts,
-      forComponent: import_core.Text,
-      resolveValues: opts.resolveValues,
-      noMedia: !needsMedia
-    });
-    var defaultColor = opts.defaultThemeColor;
-    var colorIn = style.color || (defaultColor ? theme[defaultColor] : void 0) || (!props.disableTheme ? theme.color : null) || opts.fallbackColor;
-    var color = (0, import_core.getVariable)(colorIn);
-    var size = typeof props.size === "string" ? (0, import_core.getTokenValue)(props.size, "size") : props.size || (styledContext.size === "$true" ? void 0 : styledContext.size);
-    var _props_strokeWidth;
-    var strokeWidth = typeof props.strokeWidth === "string" ? (0, import_core.getTokenValue)(props.strokeWidth, "size") : (_props_strokeWidth = props.strokeWidth) !== null && _props_strokeWidth !== void 0 ? _props_strokeWidth : `${opts.defaultStrokeWidth}`;
-    var finalProps = {
-      ...props,
-      color,
-      size,
-      strokeWidth,
-      style
-    };
-    return /* @__PURE__ */(0, import_jsx_runtime.jsx)(Component, {
-      ...finalProps
-    });
-  };
-  var wrapped = function (propsIn) {
-    return /* @__PURE__ */(0, import_jsx_runtime.jsx)(IconWrapper, {
-      ...propsIn
-    });
-  };
-  wrapped["staticConfig"] = {
-    isHOC: true,
-    acceptsClassName: true
-  };
-  return wrapped;
+	var optsIn = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
+	var opts = {
+		defaultThemeColor: process.env.DEFAULT_ICON_THEME_COLOR || "color",
+		defaultStrokeWidth: 2,
+		fallbackColor: "#000",
+		resolveValues: process.env.TAMAGUI_ICON_COLOR_RESOLVE || "auto",
+		...optsIn
+	};
+	var IconWrapper = function(propsIn) {
+		var styledContext = import_size.SizeContext.useStyledContext();
+		var theme = (0, import_core.useTheme)();
+		var { size: sizeProp, strokeWidth: strokeWidthProp, color: colorProp, fill: fillProp, stroke: strokeProp, disableTheme, style, testID, ...rest } = propsIn;
+		var resolveSvgColor = function(val) {
+			if (typeof val !== "string") return val;
+			var themed2 = theme === null || theme === void 0 ? void 0 : theme[val];
+			if (themed2 != null) return (0, import_core.getVariable)(themed2);
+			return (0, import_core.getVariable)(val, "color");
+		};
+		var fillResolved = resolveSvgColor(fillProp);
+		var strokeResolved = resolveSvgColor(strokeProp);
+		var colorResolved = resolveSvgColor(colorProp);
+		var colorIn = strokeResolved || colorResolved || (opts.defaultThemeColor ? theme[opts.defaultThemeColor] : void 0) || (!disableTheme ? theme.color : null) || opts.fallbackColor;
+		var color = (0, import_core.getVariable)(colorIn);
+		var size = typeof sizeProp === "number" ? sizeProp : typeof sizeProp === "string" ? (0, import_font_size.getFontSize)(sizeProp) : styledContext.size != null ? (0, import_font_size.getFontSize)(styledContext.size) : void 0;
+		var strokeWidth = typeof strokeWidthProp === "string" ? (0, import_core.getTokenValue)(strokeWidthProp, "size") : strokeWidthProp !== null && strokeWidthProp !== void 0 ? strokeWidthProp : `${opts.defaultStrokeWidth}`;
+		var finalProps = {
+			...rest,
+			color,
+			size,
+			strokeWidth,
+			...fillResolved !== void 0 ? { fill: fillResolved } : null,
+			...strokeResolved !== void 0 ? { stroke: strokeResolved } : null,
+			...style ? { style } : null,
+			...testID != null ? import_core.isWeb ? { "data-testid": testID } : { testID } : null
+		};
+		return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Component, { ...finalProps });
+	};
+	var wrapped = function(propsIn) {
+		return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(IconWrapper, { ...propsIn });
+	};
+	wrapped["staticConfig"] = {
+		isHOC: true,
+		acceptsClassName: true
+	};
+	return wrapped;
 }
+
 //# sourceMappingURL=themed.native.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","themed_exports","__export","SizableContext","import_sizable_context","themed","module","exports","import_jsx_runtime","require","import_core","needsFullStyleResolution","props","key","Component","optsIn","arguments","length","opts","defaultThemeColor","process","env","DEFAULT_ICON_THEME_COLOR","defaultStrokeWidth","fallbackColor","resolveValues","TAMAGUI_ICON_COLOR_RESOLVE","IconWrapper","propsIn","styledContext","useStyledContext","needsMedia","style","theme","usePropsAndStyle","forComponent","Text","noMedia","defaultColor","colorIn","color","disableTheme","getVariable","size","getTokenValue","_props_strokeWidth","strokeWidth","finalProps","jsx","wrapped"],"sources":["../../src/themed.tsx"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,cAAA;AAAAC,QAAA,CAAAD,cAAA;EAAAE,cAAA,EAAAA,CAAA,KAAAC,sBAAA,CAAAD,cAAA;EAAAE,MAAA,EAAAA,CAAA,KAAAA;AAAA;AAAAC,MAAA,CAAAC,OAAA,GAAAX,YAMO,CAAAK,cAAA;AACP,IAAAO,kBAAA,GAAAC,OAA+B;AAuEpB,IAAAC,WAAA,GAAAD,OAAA;AAvDX,IAAAL,sBAAS,GAAAK,OAAyB,2BAA2B;AAC3D,SAAAE,wBAAyBA,CAAAC,KAAA;EACvB,SAAIC,GAAK,IAAAD,KAAW;IACtB,IAAAC,GAAA;EACA;EACF;AAEO;AACL,SAAMR,MAAgBA,CAAAS,SAAA;EAAA,IACpBC,MAAA,GAAAC,SAAmB,CAAAC,MAAQ,IAAI,IAAAD,SAAA,iBAA4BA,SAAA;EAAA,IAC3DE,IAAA;IACAC,iBAAe,EAAAC,OAAA,CAAAC,GAAA,CAAAC,wBAAA;IACfC,kBAAgB;IAChBC,aAAG;IACLC,aAAA,EAAAL,OAAA,CAAAC,GAAA,CAAAK,0BAAA;IAEA,GAAAX;EACE;EACA,IAAAY,WAAM,YAAAA,CAAaC,OAAA;IAEnB,IAAAC,aAAc,GAAAzB,sBAAgB,CAAAD,cAAA,CAAA2B,gBAA0B;IAAA,IACtDC,UAAG,GAAApB,wBAAA,CAAAiB,OAAA;IAAA,IACH,CAAAhB,KAAA,EAAAoB,KAAc,EAAAC,KAAA,QAAAvB,WAAA,CAAAwB,gBAAA,EAAAN,OAAA;MACd,GAAAV,IAAA;MACAiB,YAAU,EAAAzB,WAAA,CAAA0B,IAAA;MACXX,aAAA,EAAAP,IAAA,CAAAO,aAAA;MAEDY,OAAM,GAAAN;IAEN;IAMA,IAAAO,YAAM,GAAQpB,IAAA,CAAAC,iBAAA;IAEd,IAAAoB,OAAM,GACJP,KAAA,CAAOQ,KAAA,KAAMF,YAAS,GAAAL,KAClB,CAAAK,YAAA,gBAAc,CAAA1B,KAAM,CAAA6B,YAAmB,GACvCR,KAAM,CAAAO,KAAA,GAAS,SAAAtB,IAAc,CAAAM,aAAS;IAE5C,IAAAgB,KAAM,OAAA9B,WACG,CAAAgC,WAAM,EAAAH,OAAA,CAAgB;IAI/B,IAAAI,IAAM,UAAA/B,KAAa,CAAA+B,IAAA,oBAAAjC,WAAA,CAAAkC,aAAA,EAAAhC,KAAA,CAAA+B,IAAA,YAAA/B,KAAA,CAAA+B,IAAA,KAAAd,aAAA,CAAAc,IAAA,wBAAAd,aAAA,CAAAc,IAAA;IAAA,IACjBE,kBAAG;IAAA,IACHC,WAAA,UAAAlC,KAAA,CAAAkC,WAAA,oBAAApC,WAAA,CAAAkC,aAAA,EAAAhC,KAAA,CAAAkC,WAAA,aAAAD,kBAAA,GAAAjC,KAAA,CAAAkC,WAAA,cAAAD,kBAAA,cAAAA,kBAAA,MAAA3B,IAAA,CAAAK,kBAAA;IAAA,IACAwB,UAAA;MACA,GAAAnC,KAAA;MACA4B,KAAA;MACFG,IAAA;MAEAG,WAAO;MACTd;IAEA;IACE,OAAO,mBAAAxB,kBAAA,CAAAwC,GAAA,EAAClC,SAAA;MACV,GAAAiC;IAGA;EAA0B;EACjB,IACPE,OAAA,YAAAA,CAAkBrB,OAAA;IACpB,0BAAApB,kBAAA,CAAAwC,GAAA,EAAArB,WAAA;MAEA,GAAOC;IACT","ignoreList":[]}
+{"version":3,"file":"themed.native.js","names":[],"sources":["cjs/themed.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 themed_exports = {};\n__export(themed_exports, {\n  themed: () => themed\n});\nmodule.exports = __toCommonJS(themed_exports);\nvar import_jsx_runtime = require(\"react/jsx-runtime\");\nvar import_core = require(\"@tamagui/core\");\nvar import_font_size = require(\"@tamagui/font-size\");\nvar import_size = require(\"@tamagui/size\");\nfunction themed(Component) {\n  var optsIn = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};\n  var opts = {\n    defaultThemeColor: process.env.DEFAULT_ICON_THEME_COLOR || \"color\",\n    defaultStrokeWidth: 2,\n    fallbackColor: \"#000\",\n    resolveValues: process.env.TAMAGUI_ICON_COLOR_RESOLVE || \"auto\",\n    ...optsIn\n  };\n  var IconWrapper = function(propsIn) {\n    var styledContext = import_size.SizeContext.useStyledContext();\n    var theme = (0, import_core.useTheme)();\n    var { size: sizeProp, strokeWidth: strokeWidthProp, color: colorProp, fill: fillProp, stroke: strokeProp, disableTheme, style, testID, ...rest } = propsIn;\n    var resolveSvgColor = function(val) {\n      if (typeof val !== \"string\") return val;\n      var themed2 = theme === null || theme === void 0 ? void 0 : theme[val];\n      if (themed2 != null) return (0, import_core.getVariable)(themed2);\n      return (0, import_core.getVariable)(val, \"color\");\n    };\n    var fillResolved = resolveSvgColor(fillProp);\n    var strokeResolved = resolveSvgColor(strokeProp);\n    var colorResolved = resolveSvgColor(colorProp);\n    var colorIn = strokeResolved || colorResolved || (opts.defaultThemeColor ? theme[opts.defaultThemeColor] : void 0) || (!disableTheme ? theme.color : null) || opts.fallbackColor;\n    var color = (0, import_core.getVariable)(colorIn);\n    var size = typeof sizeProp === \"number\" ? sizeProp : typeof sizeProp === \"string\" ? (0, import_font_size.getFontSize)(sizeProp) : styledContext.size != null ? (0, import_font_size.getFontSize)(styledContext.size) : void 0;\n    var strokeWidth = typeof strokeWidthProp === \"string\" ? (0, import_core.getTokenValue)(strokeWidthProp, \"size\") : strokeWidthProp !== null && strokeWidthProp !== void 0 ? strokeWidthProp : `${opts.defaultStrokeWidth}`;\n    var finalProps = {\n      ...rest,\n      color,\n      size,\n      strokeWidth,\n      ...fillResolved !== void 0 ? {\n        fill: fillResolved\n      } : null,\n      ...strokeResolved !== void 0 ? {\n        stroke: strokeResolved\n      } : null,\n      ...style ? {\n        style\n      } : null,\n      // tamagui web maps testID -> data-testid; native keeps testID for react-native-svg\n      ...testID != null ? import_core.isWeb ? {\n        \"data-testid\": testID\n      } : {\n        testID\n      } : null\n    };\n    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Component, {\n      ...finalProps\n    });\n  };\n  var wrapped = function(propsIn) {\n    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(IconWrapper, {\n      ...propsIn\n    });\n  };\n  wrapped[\"staticConfig\"] = {\n    isHOC: true,\n    acceptsClassName: true\n  };\n  return wrapped;\n}\n//# sourceMappingURL=themed.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,iBAAiB,CAAC;AACtB,SAAS,gBAAgB,EACvB,cAAc,OAChB,CAAC;AACD,OAAO,UAAU,aAAa,cAAc;AAC5C,IAAI,qBAAqB,QAAQ,mBAAmB;AACpD,IAAI,cAAc,QAAQ,eAAe;AACzC,IAAI,mBAAmB,QAAQ,oBAAoB;AACnD,IAAI,cAAc,QAAQ,eAAe;AACzC,SAAS,OAAO,WAAW;CACzB,IAAI,SAAS,UAAU,SAAS,KAAK,UAAU,OAAO,KAAK,IAAI,UAAU,KAAK,CAAC;CAC/E,IAAI,OAAO;EACT,mBAAmB,QAAQ,IAAI,4BAA4B;EAC3D,oBAAoB;EACpB,eAAe;EACf,eAAe,QAAQ,IAAI,8BAA8B;EACzD,GAAG;CACL;CACA,IAAI,cAAc,SAAS,SAAS;EAClC,IAAI,gBAAgB,YAAY,YAAY,iBAAiB;EAC7D,IAAI,SAAS,GAAG,YAAY,UAAU;EACtC,IAAI,EAAE,MAAM,UAAU,aAAa,iBAAiB,OAAO,WAAW,MAAM,UAAU,QAAQ,YAAY,cAAc,OAAO,QAAQ,GAAG,SAAS;EACnJ,IAAI,kBAAkB,SAAS,KAAK;GAClC,IAAI,OAAO,QAAQ,UAAU,OAAO;GACpC,IAAI,UAAU,UAAU,QAAQ,UAAU,KAAK,IAAI,KAAK,IAAI,MAAM;GAClE,IAAI,WAAW,MAAM,QAAQ,GAAG,YAAY,aAAa,OAAO;GAChE,QAAQ,GAAG,YAAY,aAAa,KAAK,OAAO;EAClD;EACA,IAAI,eAAe,gBAAgB,QAAQ;EAC3C,IAAI,iBAAiB,gBAAgB,UAAU;EAC/C,IAAI,gBAAgB,gBAAgB,SAAS;EAC7C,IAAI,UAAU,kBAAkB,kBAAkB,KAAK,oBAAoB,MAAM,KAAK,qBAAqB,KAAK,OAAO,CAAC,eAAe,MAAM,QAAQ,SAAS,KAAK;EACnK,IAAI,SAAS,GAAG,YAAY,aAAa,OAAO;EAChD,IAAI,OAAO,OAAO,aAAa,WAAW,WAAW,OAAO,aAAa,YAAY,GAAG,iBAAiB,aAAa,QAAQ,IAAI,cAAc,QAAQ,QAAQ,GAAG,iBAAiB,aAAa,cAAc,IAAI,IAAI,KAAK;EAC5N,IAAI,cAAc,OAAO,oBAAoB,YAAY,GAAG,YAAY,eAAe,iBAAiB,MAAM,IAAI,oBAAoB,QAAQ,oBAAoB,KAAK,IAAI,kBAAkB,GAAG,KAAK;EACrM,IAAI,aAAa;GACf,GAAG;GACH;GACA;GACA;GACA,GAAG,iBAAiB,KAAK,IAAI,EAC3B,MAAM,aACR,IAAI;GACJ,GAAG,mBAAmB,KAAK,IAAI,EAC7B,QAAQ,eACV,IAAI;GACJ,GAAG,QAAQ,EACT,MACF,IAAI;GAEJ,GAAG,UAAU,OAAO,YAAY,QAAQ,EACtC,eAAe,OACjB,IAAI,EACF,OACF,IAAI;EACN;EACA,OAAuB,iBAAC,GAAG,mBAAmB,KAAK,WAAW,EAC5D,GAAG,WACL,CAAC;CACH;CACA,IAAI,UAAU,SAAS,SAAS;EAC9B,OAAuB,iBAAC,GAAG,mBAAmB,KAAK,aAAa,EAC9D,GAAG,QACL,CAAC;CACH;CACA,QAAQ,kBAAkB;EACxB,OAAO;EACP,kBAAkB;CACpB;CACA,OAAO;AACT"}

package/dist/esm/IconProps.mjs

@@ -1,2 +0,0 @@
-
-//# sourceMappingURL=IconProps.mjs.map

package/dist/esm/IconProps.native.js

@@ -1,2 +0,0 @@
-
-//# sourceMappingURL=IconProps.native.js.map

package/dist/esm/index.js

@@ -1,3 +1,3 @@
-export * from "./IconProps.mjs";
-export * from "./themed.mjs";
-//# sourceMappingURL=index.js.map
+export * from "./IconProps.mjs"
+
+export * from "./themed.mjs"

package/dist/esm/index.mjs

@@ -1,3 +1,3 @@
-export * from "./IconProps.mjs";
-export * from "./themed.mjs";
-//# sourceMappingURL=index.mjs.map
+export * from "./IconProps.mjs"
+
+export * from "./themed.mjs"

package/dist/esm/index.native.js

@@ -1,3 +1,3 @@
-export * from "./IconProps.native.js";
-export * from "./themed.native.js";
-//# sourceMappingURL=index.native.js.map
+export * from "./IconProps.native.js"
+
+export * from "./themed.native.js"

package/dist/esm/themed.mjs

@@ -1,55 +1,54 @@
-import { getTokenValue, getVariable, Text, usePropsAndStyle } from "@tamagui/core";
-import { SizableContext } from "@tamagui/sizable-context";
+import { getTokenValue, getVariable, isWeb, useTheme } from "@tamagui/core";
+import { getFontSize } from "@tamagui/font-size";
+import { SizeContext } from "@tamagui/size";
 import { jsx } from "react/jsx-runtime";
-function needsFullStyleResolution(props) {
-  for (const key in props) {
-    if (key[0] === "$") return true;
-  }
-  return false;
-}
+
 function themed(Component, optsIn = {}) {
-  const opts = {
-    defaultThemeColor: process.env.DEFAULT_ICON_THEME_COLOR || "$color",
-    defaultStrokeWidth: 2,
-    fallbackColor: "#000",
-    resolveValues: process.env.TAMAGUI_ICON_COLOR_RESOLVE || "auto",
-    ...optsIn
-  };
-  const IconWrapper = propsIn => {
-    const styledContext = SizableContext.useStyledContext();
-    const needsMedia = needsFullStyleResolution(propsIn);
-    const [props, style, theme] = usePropsAndStyle(propsIn, {
-      ...opts,
-      forComponent: Text,
-      resolveValues: opts.resolveValues,
-      noMedia: !needsMedia
-    });
-    const defaultColor = opts.defaultThemeColor;
-    const colorIn = style.color || (defaultColor ? theme[defaultColor] : void 0) || (!props.disableTheme ? theme.color : null) || opts.fallbackColor;
-    const color = getVariable(colorIn);
-    const size = typeof props.size === "string" ? getTokenValue(props.size, "size") : props.size || (styledContext.size === "$true" ? void 0 : styledContext.size);
-    const strokeWidth = typeof props.strokeWidth === "string" ? getTokenValue(props.strokeWidth, "size") : props.strokeWidth ?? `${opts.defaultStrokeWidth}`;
-    const finalProps = {
-      ...props,
-      color,
-      size,
-      strokeWidth,
-      style
-    };
-    return /* @__PURE__ */jsx(Component, {
-      ...finalProps
-    });
-  };
-  const wrapped = propsIn => {
-    return /* @__PURE__ */jsx(IconWrapper, {
-      ...propsIn
-    });
-  };
-  wrapped["staticConfig"] = {
-    isHOC: true,
-    acceptsClassName: true
-  };
-  return wrapped;
+	const opts = {
+		defaultThemeColor: process.env.DEFAULT_ICON_THEME_COLOR || "color",
+		defaultStrokeWidth: 2,
+		fallbackColor: "#000",
+		resolveValues: process.env.TAMAGUI_ICON_COLOR_RESOLVE || "auto",
+		...optsIn
+	};
+	const IconWrapper = (propsIn) => {
+		const styledContext = SizeContext.useStyledContext();
+		const theme = useTheme();
+		const { size: sizeProp, strokeWidth: strokeWidthProp, color: colorProp, fill: fillProp, stroke: strokeProp, disableTheme, style, testID, ...rest } = propsIn;
+		const resolveSvgColor = (val) => {
+			if (typeof val !== "string") return val;
+			const themed2 = theme?.[val];
+			if (themed2 != null) return getVariable(themed2);
+			return getVariable(val, "color");
+		};
+		const fillResolved = resolveSvgColor(fillProp);
+		const strokeResolved = resolveSvgColor(strokeProp);
+		const colorResolved = resolveSvgColor(colorProp);
+		const colorIn = strokeResolved || colorResolved || (opts.defaultThemeColor ? theme[opts.defaultThemeColor] : void 0) || (!disableTheme ? theme.color : null) || opts.fallbackColor;
+		const color = getVariable(colorIn);
+		const size = typeof sizeProp === "number" ? sizeProp : typeof sizeProp === "string" ? getFontSize(sizeProp) : styledContext.size != null ? getFontSize(styledContext.size) : void 0;
+		const strokeWidth = typeof strokeWidthProp === "string" ? getTokenValue(strokeWidthProp, "size") : strokeWidthProp ?? `${opts.defaultStrokeWidth}`;
+		const finalProps = {
+			...rest,
+			color,
+			size,
+			strokeWidth,
+			...fillResolved !== void 0 ? { fill: fillResolved } : null,
+			...strokeResolved !== void 0 ? { stroke: strokeResolved } : null,
+			...style ? { style } : null,
+			...testID != null ? isWeb ? { "data-testid": testID } : { testID } : null
+		};
+		return /* @__PURE__ */ jsx(Component, { ...finalProps });
+	};
+	const wrapped = (propsIn) => {
+		return /* @__PURE__ */ jsx(IconWrapper, { ...propsIn });
+	};
+	wrapped["staticConfig"] = {
+		isHOC: true,
+		acceptsClassName: true
+	};
+	return wrapped;
 }
-export { SizableContext, themed };
+
+export { themed };
 //# sourceMappingURL=themed.mjs.map

package/dist/esm/themed.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["getTokenValue","getVariable","Text","usePropsAndStyle","SizableContext","jsx","needsFullStyleResolution","props","key","themed","Component","optsIn","opts","defaultThemeColor","process","env","DEFAULT_ICON_THEME_COLOR","defaultStrokeWidth","fallbackColor","resolveValues","TAMAGUI_ICON_COLOR_RESOLVE","IconWrapper","propsIn","styledContext","useStyledContext","needsMedia","style","theme","forComponent","noMedia","defaultColor","colorIn","color","disableTheme","size","strokeWidth","finalProps","wrapped","isHOC","acceptsClassName"],"sources":["../../src/themed.tsx"],"sourcesContent":[null],"mappings":"AAAA,SACEA,aAAA,EACAC,WAAA,EACAC,IAAA,EACAC,gBAAA,QAEK;AACP,SAASC,cAAA,QAAsB;AAuEpB,SAAAC,GAAA;AAvDX,SAASC,yBAAyBC,KAAA,EAA2B;EAC3D,WAAWC,GAAA,IAAOD,KAAA,EAAO;IACvB,IAAIC,GAAA,CAAI,CAAC,MAAM,KAAK,OAAO;EAC7B;EACA,OAAO;AACT;AAEO,SAASC,OAAOC,SAAA,EAA0BC,MAAA,GAAkB,CAAC,GAAG;EACrE,MAAMC,IAAA,GAAgB;IACpBC,iBAAA,EAAmBC,OAAA,CAAQC,GAAA,CAAIC,wBAAA,IAA4B;IAC3DC,kBAAA,EAAoB;IACpBC,aAAA,EAAe;IACfC,aAAA,EAAgBL,OAAA,CAAQC,GAAA,CAAIK,0BAAA,IAAsC;IAClE,GAAGT;EACL;EAEA,MAAMU,WAAA,GAAeC,OAAA,IAAuB;IAC1C,MAAMC,aAAA,GAAgBnB,cAAA,CAAeoB,gBAAA,CAAiB;IACtD,MAAMC,UAAA,GAAanB,wBAAA,CAAyBgB,OAAO;IAEnD,MAAM,CAACf,KAAA,EAAOmB,KAAA,EAAOC,KAAK,IAAIxB,gBAAA,CAAiBmB,OAAA,EAAS;MACtD,GAAGV,IAAA;MACHgB,YAAA,EAAc1B,IAAA;MACdiB,aAAA,EAAeP,IAAA,CAAKO,aAAA;MACpBU,OAAA,EAAS,CAACJ;IACZ,CAAC;IAED,MAAMK,YAAA,GAAelB,IAAA,CAAKC,iBAAA;IAE1B,MAAMkB,OAAA,GACJL,KAAA,CAAMM,KAAA,KACLF,YAAA,GAAeH,KAAA,CAAMG,YAAsB,IAAI,YAC/C,CAACvB,KAAA,CAAM0B,YAAA,GAAeN,KAAA,CAAMK,KAAA,GAAQ,SACrCpB,IAAA,CAAKM,aAAA;IAEP,MAAMc,KAAA,GAAQ/B,WAAA,CAAY8B,OAAO;IAEjC,MAAMG,IAAA,GACJ,OAAO3B,KAAA,CAAM2B,IAAA,KAAS,WAClBlC,aAAA,CAAcO,KAAA,CAAM2B,IAAA,EAAa,MAAM,IACvC3B,KAAA,CAAM2B,IAAA,KAASX,aAAA,CAAcW,IAAA,KAAS,UAAU,SAAYX,aAAA,CAAcW,IAAA;IAEhF,MAAMC,WAAA,GACJ,OAAO5B,KAAA,CAAM4B,WAAA,KAAgB,WACzBnC,aAAA,CAAcO,KAAA,CAAM4B,WAAA,EAAoB,MAAM,IAC7C5B,KAAA,CAAM4B,WAAA,IAAe,GAAGvB,IAAA,CAAKK,kBAAkB;IAEtD,MAAMmB,UAAA,GAAa;MACjB,GAAG7B,KAAA;MACHyB,KAAA;MACAE,IAAA;MACAC,WAAA;MACAT;IACF;IAEA,OAAO,eAAArB,GAAA,CAACK,SAAA;MAAW,GAAG0B;IAAA,CAAY;EACpC;EAEA,MAAMC,OAAA,GAAWf,OAAA,IAAuB;IACtC,OAAO,eAAAjB,GAAA,CAACgB,WAAA;MAAa,GAAGC;IAAA,CAAS;EACnC;EAGAe,OAAA,CAAQ,cAAc,IAAI;IACxBC,KAAA,EAAO;IACPC,gBAAA,EAAkB;EACpB;EAEA,OAAOF,OAAA;AACT","ignoreList":[]}
+{"version":3,"file":"themed.js","names":[],"sources":["esm/themed.js"],"sourcesContent":["import {\n  getTokenValue,\n  getVariable,\n  isWeb,\n  useTheme\n} from \"@tamagui/core\";\nimport { getFontSize } from \"@tamagui/font-size\";\nimport { SizeContext } from \"@tamagui/size\";\nimport { jsx } from \"react/jsx-runtime\";\nfunction themed(Component, optsIn = {}) {\n  const opts = {\n    defaultThemeColor: process.env.DEFAULT_ICON_THEME_COLOR || \"color\",\n    defaultStrokeWidth: 2,\n    fallbackColor: \"#000\",\n    resolveValues: process.env.TAMAGUI_ICON_COLOR_RESOLVE || \"auto\",\n    ...optsIn\n  };\n  const IconWrapper = (propsIn) => {\n    const styledContext = SizeContext.useStyledContext();\n    const theme = useTheme();\n    const {\n      size: sizeProp,\n      strokeWidth: strokeWidthProp,\n      color: colorProp,\n      fill: fillProp,\n      stroke: strokeProp,\n      disableTheme,\n      style,\n      testID,\n      ...rest\n    } = propsIn;\n    const resolveSvgColor = (val) => {\n      if (typeof val !== \"string\") return val;\n      const themed2 = theme?.[val];\n      if (themed2 != null) return getVariable(themed2);\n      return getVariable(val, \"color\");\n    };\n    const fillResolved = resolveSvgColor(fillProp);\n    const strokeResolved = resolveSvgColor(strokeProp);\n    const colorResolved = resolveSvgColor(colorProp);\n    const colorIn = strokeResolved || colorResolved || (opts.defaultThemeColor ? theme[opts.defaultThemeColor] : void 0) || (!disableTheme ? theme.color : null) || opts.fallbackColor;\n    const color = getVariable(colorIn);\n    const size = typeof sizeProp === \"number\" ? sizeProp : typeof sizeProp === \"string\" ? getFontSize(sizeProp) : styledContext.size != null ? getFontSize(styledContext.size) : void 0;\n    const strokeWidth = typeof strokeWidthProp === \"string\" ? getTokenValue(strokeWidthProp, \"size\") : strokeWidthProp ?? `${opts.defaultStrokeWidth}`;\n    const finalProps = {\n      ...rest,\n      color,\n      size,\n      strokeWidth,\n      ...fillResolved !== void 0 ? { fill: fillResolved } : null,\n      ...strokeResolved !== void 0 ? { stroke: strokeResolved } : null,\n      ...style ? { style } : null,\n      // tamagui web maps testID -> data-testid; native keeps testID for react-native-svg\n      ...testID != null ? isWeb ? { \"data-testid\": testID } : { testID } : null\n    };\n    return /* @__PURE__ */ jsx(Component, { ...finalProps });\n  };\n  const wrapped = (propsIn) => {\n    return /* @__PURE__ */ jsx(IconWrapper, { ...propsIn });\n  };\n  wrapped[\"staticConfig\"] = {\n    isHOC: true,\n    acceptsClassName: true\n  };\n  return wrapped;\n}\nexport {\n  themed\n};\n//# sourceMappingURL=themed.js.map\n"],"mappings":";;;;;;AASA,SAAS,OAAO,WAAW,SAAS,CAAC,GAAG;CACtC,MAAM,OAAO;EACX,mBAAmB,QAAQ,IAAI,4BAA4B;EAC3D,oBAAoB;EACpB,eAAe;EACf,eAAe,QAAQ,IAAI,8BAA8B;EACzD,GAAG;CACL;CACA,MAAM,eAAe,YAAY;EAC/B,MAAM,gBAAgB,YAAY,iBAAiB;EACnD,MAAM,QAAQ,SAAS;EACvB,MAAM,EACJ,MAAM,UACN,aAAa,iBACb,OAAO,WACP,MAAM,UACN,QAAQ,YACR,cACA,OACA,QACA,GAAG,SACD;EACJ,MAAM,mBAAmB,QAAQ;GAC/B,IAAI,OAAO,QAAQ,UAAU,OAAO;GACpC,MAAM,UAAU,QAAQ;GACxB,IAAI,WAAW,MAAM,OAAO,YAAY,OAAO;GAC/C,OAAO,YAAY,KAAK,OAAO;EACjC;EACA,MAAM,eAAe,gBAAgB,QAAQ;EAC7C,MAAM,iBAAiB,gBAAgB,UAAU;EACjD,MAAM,gBAAgB,gBAAgB,SAAS;EAC/C,MAAM,UAAU,kBAAkB,kBAAkB,KAAK,oBAAoB,MAAM,KAAK,qBAAqB,KAAK,OAAO,CAAC,eAAe,MAAM,QAAQ,SAAS,KAAK;EACrK,MAAM,QAAQ,YAAY,OAAO;EACjC,MAAM,OAAO,OAAO,aAAa,WAAW,WAAW,OAAO,aAAa,WAAW,YAAY,QAAQ,IAAI,cAAc,QAAQ,OAAO,YAAY,cAAc,IAAI,IAAI,KAAK;EAClL,MAAM,cAAc,OAAO,oBAAoB,WAAW,cAAc,iBAAiB,MAAM,IAAI,mBAAmB,GAAG,KAAK;EAC9H,MAAM,aAAa;GACjB,GAAG;GACH;GACA;GACA;GACA,GAAG,iBAAiB,KAAK,IAAI,EAAE,MAAM,aAAa,IAAI;GACtD,GAAG,mBAAmB,KAAK,IAAI,EAAE,QAAQ,eAAe,IAAI;GAC5D,GAAG,QAAQ,EAAE,MAAM,IAAI;GAEvB,GAAG,UAAU,OAAO,QAAQ,EAAE,eAAe,OAAO,IAAI,EAAE,OAAO,IAAI;EACvE;EACA,OAAuB,oBAAI,WAAW,EAAE,GAAG,WAAW,CAAC;CACzD;CACA,MAAM,WAAW,YAAY;EAC3B,OAAuB,oBAAI,aAAa,EAAE,GAAG,QAAQ,CAAC;CACxD;CACA,QAAQ,kBAAkB;EACxB,OAAO;EACP,kBAAkB;CACpB;CACA,OAAO;AACT"}

package/dist/esm/themed.native.js

@@ -1,57 +1,55 @@
-import { jsx as _jsx } from "react/jsx-runtime";
-import { getTokenValue, getVariable, Text, usePropsAndStyle } from "@tamagui/core";
-import { SizableContext } from "@tamagui/sizable-context";
-function needsFullStyleResolution(props) {
-  for (var key in props) {
-    if (key[0] === "$") return true;
-  }
-  return false;
-}
+import { jsx } from "react/jsx-runtime";
+import { getTokenValue, getVariable, isWeb, useTheme } from "@tamagui/core";
+import { getFontSize } from "@tamagui/font-size";
+import { SizeContext } from "@tamagui/size";
+
 function themed(Component) {
-  var optsIn = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
-  var opts = {
-    defaultThemeColor: process.env.DEFAULT_ICON_THEME_COLOR || "$color",
-    defaultStrokeWidth: 2,
-    fallbackColor: "#000",
-    resolveValues: process.env.TAMAGUI_ICON_COLOR_RESOLVE || "auto",
-    ...optsIn
-  };
-  var IconWrapper = function (propsIn) {
-    var styledContext = SizableContext.useStyledContext();
-    var needsMedia = needsFullStyleResolution(propsIn);
-    var [props, style, theme] = usePropsAndStyle(propsIn, {
-      ...opts,
-      forComponent: Text,
-      resolveValues: opts.resolveValues,
-      noMedia: !needsMedia
-    });
-    var defaultColor = opts.defaultThemeColor;
-    var colorIn = style.color || (defaultColor ? theme[defaultColor] : void 0) || (!props.disableTheme ? theme.color : null) || opts.fallbackColor;
-    var color = getVariable(colorIn);
-    var size = typeof props.size === "string" ? getTokenValue(props.size, "size") : props.size || (styledContext.size === "$true" ? void 0 : styledContext.size);
-    var _props_strokeWidth;
-    var strokeWidth = typeof props.strokeWidth === "string" ? getTokenValue(props.strokeWidth, "size") : (_props_strokeWidth = props.strokeWidth) !== null && _props_strokeWidth !== void 0 ? _props_strokeWidth : `${opts.defaultStrokeWidth}`;
-    var finalProps = {
-      ...props,
-      color,
-      size,
-      strokeWidth,
-      style
-    };
-    return /* @__PURE__ */_jsx(Component, {
-      ...finalProps
-    });
-  };
-  var wrapped = function (propsIn) {
-    return /* @__PURE__ */_jsx(IconWrapper, {
-      ...propsIn
-    });
-  };
-  wrapped["staticConfig"] = {
-    isHOC: true,
-    acceptsClassName: true
-  };
-  return wrapped;
+	var optsIn = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
+	var opts = {
+		defaultThemeColor: process.env.DEFAULT_ICON_THEME_COLOR || "color",
+		defaultStrokeWidth: 2,
+		fallbackColor: "#000",
+		resolveValues: process.env.TAMAGUI_ICON_COLOR_RESOLVE || "auto",
+		...optsIn
+	};
+	var IconWrapper = function(propsIn) {
+		var styledContext = SizeContext.useStyledContext();
+		var theme = useTheme();
+		var { size: sizeProp, strokeWidth: strokeWidthProp, color: colorProp, fill: fillProp, stroke: strokeProp, disableTheme, style, testID, ...rest } = propsIn;
+		var resolveSvgColor = function(val) {
+			if (typeof val !== "string") return val;
+			var themed2 = theme === null || theme === void 0 ? void 0 : theme[val];
+			if (themed2 != null) return getVariable(themed2);
+			return getVariable(val, "color");
+		};
+		var fillResolved = resolveSvgColor(fillProp);
+		var strokeResolved = resolveSvgColor(strokeProp);
+		var colorResolved = resolveSvgColor(colorProp);
+		var colorIn = strokeResolved || colorResolved || (opts.defaultThemeColor ? theme[opts.defaultThemeColor] : void 0) || (!disableTheme ? theme.color : null) || opts.fallbackColor;
+		var color = getVariable(colorIn);
+		var size = typeof sizeProp === "number" ? sizeProp : typeof sizeProp === "string" ? getFontSize(sizeProp) : styledContext.size != null ? getFontSize(styledContext.size) : void 0;
+		var strokeWidth = typeof strokeWidthProp === "string" ? getTokenValue(strokeWidthProp, "size") : strokeWidthProp !== null && strokeWidthProp !== void 0 ? strokeWidthProp : `${opts.defaultStrokeWidth}`;
+		var finalProps = {
+			...rest,
+			color,
+			size,
+			strokeWidth,
+			...fillResolved !== void 0 ? { fill: fillResolved } : null,
+			...strokeResolved !== void 0 ? { stroke: strokeResolved } : null,
+			...style ? { style } : null,
+			...testID != null ? isWeb ? { "data-testid": testID } : { testID } : null
+		};
+		return /* @__PURE__ */ jsx(Component, { ...finalProps });
+	};
+	var wrapped = function(propsIn) {
+		return /* @__PURE__ */ jsx(IconWrapper, { ...propsIn });
+	};
+	wrapped["staticConfig"] = {
+		isHOC: true,
+		acceptsClassName: true
+	};
+	return wrapped;
 }
-export { SizableContext, themed };
+
+export { themed };
 //# sourceMappingURL=themed.native.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["jsx","_jsx","getTokenValue","getVariable","Text","usePropsAndStyle","SizableContext","needsFullStyleResolution","props","key","themed","Component","optsIn","arguments","length","opts","defaultThemeColor","process","env","DEFAULT_ICON_THEME_COLOR","defaultStrokeWidth","fallbackColor","resolveValues","TAMAGUI_ICON_COLOR_RESOLVE","IconWrapper","propsIn","styledContext","useStyledContext","needsMedia","style","theme","forComponent","noMedia","defaultColor","colorIn","color","disableTheme","size","_props_strokeWidth","strokeWidth","finalProps","wrapped","isHOC","acceptsClassName"],"sources":["../../src/themed.tsx"],"sourcesContent":[null],"mappings":"AAAA,SAAAA,GAAA,IAAAC,IAAA;AAAA,SACEC,aAAA,EAAAC,WAAA,EAAAC,IAAA,EAAAC,gBAAA;AAAA,SACAC,cAAA;AAAA,SACAC,yBAAAC,KAAA;EACA,SAAAC,GAAA,IAAAD,KAAA;IAAA,IAEKC,GAAA;EACP;EAuEW;AAvDX;AACE,SAAAC,MAAWA,CAAAC,SAAO,EAAO;EACvB,IAAAC,MAAQ,GAACC,SAAW,CAAAC,MAAO,QAAAD,SAAA,iBAAAA,SAAA;EAC7B,IAAAE,IAAA;IACAC,iBAAO,EAAAC,OAAA,CAAAC,GAAA,CAAAC,wBAAA;IACTC,kBAAA;IAEOC,aAAgB;IACrBC,aAAsB,EAAAL,OAAA,CAAAC,GAAA,CAAAK,0BAAA;IACpB,GAAAX;EAA2D;EACvC,IACpBY,WAAA,GAAe,SAAAA,CAAAC,OAAA;IACf,IAAAC,aAAgB,GAAApB,cAAY,CAAAqB,gBAAA;IAC5B,IAAGC,UAAA,GAAArB,wBAAA,CAAAkB,OAAA;IACL,KAAAjB,KAAA,EAAAqB,KAAA,EAAAC,KAAA,IAAAzB,gBAAA,CAAAoB,OAAA;MAEA,GAAMV,IAAA;MACJgB,YAAM,EAAA3B,IAAA;MACNkB,aAAM,EAAAP,IAAa,CAAAO,aAAA;MAEnBU,OAAO,GAAAJ;IAAiD,EACtD;IAAG,IACHK,YAAc,GAAAlB,IAAA,CAAAC,iBAAA;IAAA,IACdkB,OAAA,GAAAL,KAAe,CAAAM,KAAK,KAAAF,YAAA,GAAAH,KAAA,CAAAG,YAAA,iBAAAzB,KAAA,CAAA4B,YAAA,GAAAN,KAAA,CAAAK,KAAA,YAAApB,IAAA,CAAAM,aAAA;IAAA,IACpBc,KAAA,GAAUhC,WAAA,CAAA+B,OAAA;IACZ,IAACG,IAAA,UAAA7B,KAAA,CAAA6B,IAAA,gBAAAnC,aAAA,CAAAM,KAAA,CAAA6B,IAAA,YAAA7B,KAAA,CAAA6B,IAAA,KAAAX,aAAA,CAAAW,IAAA,wBAAAX,aAAA,CAAAW,IAAA;IAED,IAAAC,kBAAqB;IAErB,IAAAC,WAAM,GACJ,OAAM/B,KAAA,CAAA+B,WACL,KAAe,QAAM,GAAArC,aAA0B,CAAAM,KAAA,CAAA+B,WACxC,aAAAD,kBAA6B,GAAA9B,KACrC,CAAA+B,WAAK,cAAAD,kBAAA,cAAAA,kBAAA,MAAAvB,IAAA,CAAAK,kBAAA;IAEP,IAAAoB,UAAc;MAEd,GAAAhC,KAAM;MAKN2B,KAAM;MAKNE,IAAM;MACJE,WAAG;MACHV;IAAA;IACA,OACA,eAAA5B,IAAA,CAAAU,SAAA;MACA,GAAA6B;IACF;EAEA;EACF,IAAAC,OAAA,YAAAA,CAAAhB,OAAA;IAEA,OAAM,eAAWxB,IAAuB,CAAAuB,WAAA;MACtC,GAAAC;IACF;EAGA;EAA0BgB,OACxB,eAAO;IACPC,KAAA;IACFC,gBAAA;EAEA;EACF,OAAAF,OAAA","ignoreList":[]}
+{"version":3,"file":"themed.native.js","names":[],"sources":["esm/themed.native.js"],"sourcesContent":["import { jsx as _jsx } from \"react/jsx-runtime\";\nimport { getTokenValue, getVariable, isWeb, useTheme } from \"@tamagui/core\";\nimport { getFontSize } from \"@tamagui/font-size\";\nimport { SizeContext } from \"@tamagui/size\";\nfunction themed(Component) {\n  var optsIn = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};\n  var opts = {\n    defaultThemeColor: process.env.DEFAULT_ICON_THEME_COLOR || \"color\",\n    defaultStrokeWidth: 2,\n    fallbackColor: \"#000\",\n    resolveValues: process.env.TAMAGUI_ICON_COLOR_RESOLVE || \"auto\",\n    ...optsIn\n  };\n  var IconWrapper = function(propsIn) {\n    var styledContext = SizeContext.useStyledContext();\n    var theme = useTheme();\n    var { size: sizeProp, strokeWidth: strokeWidthProp, color: colorProp, fill: fillProp, stroke: strokeProp, disableTheme, style, testID, ...rest } = propsIn;\n    var resolveSvgColor = function(val) {\n      if (typeof val !== \"string\") return val;\n      var themed2 = theme === null || theme === void 0 ? void 0 : theme[val];\n      if (themed2 != null) return getVariable(themed2);\n      return getVariable(val, \"color\");\n    };\n    var fillResolved = resolveSvgColor(fillProp);\n    var strokeResolved = resolveSvgColor(strokeProp);\n    var colorResolved = resolveSvgColor(colorProp);\n    var colorIn = strokeResolved || colorResolved || (opts.defaultThemeColor ? theme[opts.defaultThemeColor] : void 0) || (!disableTheme ? theme.color : null) || opts.fallbackColor;\n    var color = getVariable(colorIn);\n    var size = typeof sizeProp === \"number\" ? sizeProp : typeof sizeProp === \"string\" ? getFontSize(sizeProp) : styledContext.size != null ? getFontSize(styledContext.size) : void 0;\n    var strokeWidth = typeof strokeWidthProp === \"string\" ? getTokenValue(strokeWidthProp, \"size\") : strokeWidthProp !== null && strokeWidthProp !== void 0 ? strokeWidthProp : `${opts.defaultStrokeWidth}`;\n    var finalProps = {\n      ...rest,\n      color,\n      size,\n      strokeWidth,\n      ...fillResolved !== void 0 ? {\n        fill: fillResolved\n      } : null,\n      ...strokeResolved !== void 0 ? {\n        stroke: strokeResolved\n      } : null,\n      ...style ? {\n        style\n      } : null,\n      // tamagui web maps testID -> data-testid; native keeps testID for react-native-svg\n      ...testID != null ? isWeb ? {\n        \"data-testid\": testID\n      } : {\n        testID\n      } : null\n    };\n    return /* @__PURE__ */ _jsx(Component, {\n      ...finalProps\n    });\n  };\n  var wrapped = function(propsIn) {\n    return /* @__PURE__ */ _jsx(IconWrapper, {\n      ...propsIn\n    });\n  };\n  wrapped[\"staticConfig\"] = {\n    isHOC: true,\n    acceptsClassName: true\n  };\n  return wrapped;\n}\nexport {\n  themed\n};\n//# sourceMappingURL=themed.js.map\n"],"mappings":";;;;;;AAIA,SAAS,OAAO,WAAW;CACzB,IAAI,SAAS,UAAU,SAAS,KAAK,UAAU,OAAO,KAAK,IAAI,UAAU,KAAK,CAAC;CAC/E,IAAI,OAAO;EACT,mBAAmB,QAAQ,IAAI,4BAA4B;EAC3D,oBAAoB;EACpB,eAAe;EACf,eAAe,QAAQ,IAAI,8BAA8B;EACzD,GAAG;CACL;CACA,IAAI,cAAc,SAAS,SAAS;EAClC,IAAI,gBAAgB,YAAY,iBAAiB;EACjD,IAAI,QAAQ,SAAS;EACrB,IAAI,EAAE,MAAM,UAAU,aAAa,iBAAiB,OAAO,WAAW,MAAM,UAAU,QAAQ,YAAY,cAAc,OAAO,QAAQ,GAAG,SAAS;EACnJ,IAAI,kBAAkB,SAAS,KAAK;GAClC,IAAI,OAAO,QAAQ,UAAU,OAAO;GACpC,IAAI,UAAU,UAAU,QAAQ,UAAU,KAAK,IAAI,KAAK,IAAI,MAAM;GAClE,IAAI,WAAW,MAAM,OAAO,YAAY,OAAO;GAC/C,OAAO,YAAY,KAAK,OAAO;EACjC;EACA,IAAI,eAAe,gBAAgB,QAAQ;EAC3C,IAAI,iBAAiB,gBAAgB,UAAU;EAC/C,IAAI,gBAAgB,gBAAgB,SAAS;EAC7C,IAAI,UAAU,kBAAkB,kBAAkB,KAAK,oBAAoB,MAAM,KAAK,qBAAqB,KAAK,OAAO,CAAC,eAAe,MAAM,QAAQ,SAAS,KAAK;EACnK,IAAI,QAAQ,YAAY,OAAO;EAC/B,IAAI,OAAO,OAAO,aAAa,WAAW,WAAW,OAAO,aAAa,WAAW,YAAY,QAAQ,IAAI,cAAc,QAAQ,OAAO,YAAY,cAAc,IAAI,IAAI,KAAK;EAChL,IAAI,cAAc,OAAO,oBAAoB,WAAW,cAAc,iBAAiB,MAAM,IAAI,oBAAoB,QAAQ,oBAAoB,KAAK,IAAI,kBAAkB,GAAG,KAAK;EACpL,IAAI,aAAa;GACf,GAAG;GACH;GACA;GACA;GACA,GAAG,iBAAiB,KAAK,IAAI,EAC3B,MAAM,aACR,IAAI;GACJ,GAAG,mBAAmB,KAAK,IAAI,EAC7B,QAAQ,eACV,IAAI;GACJ,GAAG,QAAQ,EACT,MACF,IAAI;GAEJ,GAAG,UAAU,OAAO,QAAQ,EAC1B,eAAe,OACjB,IAAI,EACF,OACF,IAAI;EACN;EACA,OAAuB,oBAAK,WAAW,EACrC,GAAG,WACL,CAAC;CACH;CACA,IAAI,UAAU,SAAS,SAAS;EAC9B,OAAuB,oBAAK,aAAa,EACvC,GAAG,QACL,CAAC;CACH;CACA,QAAQ,kBAAkB;EACxB,OAAO;EACP,kBAAkB;CACpB;CACA,OAAO;AACT"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/helpers-icon",
-  "version": "2.7.7",
+  "version": "3.0.0-beta.643.1",
   "description": "Utilities for icon packages",
   "license": "MIT",
   "source": "src/index.ts",
@@ -33,13 +33,14 @@
     "clean:build": "tamagui-build clean:build"
   },
   "dependencies": {
-    "@tamagui/core": "2.7.7",
-    "@tamagui/sizable-context": "2.7.7"
+    "@tamagui/core": "3.0.0-beta.643.1",
+    "@tamagui/font-size": "3.0.0-beta.643.1",
+    "@tamagui/size": "3.0.0-beta.643.1"
   },
   "devDependencies": {
-    "@tamagui/build": "2.7.7",
+    "@tamagui/build": "3.0.0-beta.643.1",
     "react": ">=19",
-    "react-native-svg": "15.15.3"
+    "react-native-svg": "15.15.4"
   },
   "peerDependencies": {
     "react": ">=19"

package/src/themed.tsx

@@ -1,17 +1,17 @@
 import {
   getTokenValue,
   getVariable,
-  Text,
-  usePropsAndStyle,
+  isWeb,
+  useTheme,
+  type FontSizeTokens,
   type ResolveVariableAs,
 } from '@tamagui/core'
-import { SizableContext } from '@tamagui/sizable-context'
+import { getFontSize } from '@tamagui/font-size'
+import { SizeContext } from '@tamagui/size'
 
 import type { FC } from 'react'
 import type { IconProps } from './IconProps'
 
-export { SizableContext }
-
 type Options = {
   noClass?: boolean
   defaultThemeColor?: string
@@ -20,17 +20,9 @@ type Options = {
   resolveValues?: ResolveVariableAs
 }
 
-// check if props contain media queries ($sm, $md, etc) or other complex tamagui features
-function needsFullStyleResolution(props: IconProps): boolean {
-  for (const key in props) {
-    if (key[0] === '$') return true
-  }
-  return false
-}
-
 export function themed(Component: FC<IconProps>, optsIn: Options = {}) {
   const opts: Options = {
-    defaultThemeColor: process.env.DEFAULT_ICON_THEME_COLOR || '$color',
+    defaultThemeColor: process.env.DEFAULT_ICON_THEME_COLOR || 'color',
     defaultStrokeWidth: 2,
     fallbackColor: '#000',
     resolveValues: (process.env.TAMAGUI_ICON_COLOR_RESOLVE as any) || 'auto',
@@ -38,42 +30,69 @@ export function themed(Component: FC<IconProps>, optsIn: Options = {}) {
   }
 
   const IconWrapper = (propsIn: IconProps) => {
-    const styledContext = SizableContext.useStyledContext()
-    const needsMedia = needsFullStyleResolution(propsIn)
-
-    const [props, style, theme] = usePropsAndStyle(propsIn, {
-      ...opts,
-      forComponent: Text,
-      resolveValues: opts.resolveValues,
-      noMedia: !needsMedia,
-    })
+    const styledContext = SizeContext.useStyledContext()
+    const theme = useTheme()
+
+    const {
+      size: sizeProp,
+      strokeWidth: strokeWidthProp,
+      color: colorProp,
+      fill: fillProp,
+      stroke: strokeProp,
+      disableTheme,
+      style,
+      testID,
+      ...rest
+    } = propsIn as any
+
+    // Resolve theme and color tokens config-first; literal colors pass through.
+    const resolveSvgColor = (val: unknown) => {
+      if (typeof val !== 'string') return val
+      const themed = (theme as any)?.[val]
+      if (themed != null) return getVariable(themed)
+      return getVariable(val, 'color' as any)
+    }
 
-    const defaultColor = opts.defaultThemeColor
+    const fillResolved = resolveSvgColor(fillProp)
+    const strokeResolved = resolveSvgColor(strokeProp)
+    const colorResolved = resolveSvgColor(colorProp)
 
     const colorIn =
-      style.color ||
-      (defaultColor ? theme[defaultColor as string] : undefined) ||
-      (!props.disableTheme ? theme.color : null) ||
+      strokeResolved ||
+      colorResolved ||
+      (opts.defaultThemeColor ? (theme as any)[opts.defaultThemeColor] : undefined) ||
+      (!disableTheme ? theme.color : null) ||
       opts.fallbackColor
 
     const color = getVariable(colorIn)
 
+    // v3: icon sizes resolve via the current font's size scale (font.size[token]),
+    // so icons visually align with text at each size. raw numbers stay literal.
+    // context size (for example from Button/ListItem) resolves the same way.
     const size =
-      typeof props.size === 'string'
-        ? getTokenValue(props.size as any, 'size')
-        : props.size || (styledContext.size === '$true' ? undefined : styledContext.size)
+      typeof sizeProp === 'number'
+        ? sizeProp
+        : typeof sizeProp === 'string'
+          ? getFontSize(sizeProp as FontSizeTokens)
+          : styledContext.size != null
+            ? getFontSize(styledContext.size as FontSizeTokens)
+            : undefined
 
     const strokeWidth =
-      typeof props.strokeWidth === 'string'
-        ? getTokenValue(props.strokeWidth as any, 'size')
-        : (props.strokeWidth ?? `${opts.defaultStrokeWidth}`)
+      typeof strokeWidthProp === 'string'
+        ? getTokenValue(strokeWidthProp as any, 'size')
+        : (strokeWidthProp ?? `${opts.defaultStrokeWidth}`)
 
     const finalProps = {
-      ...props,
+      ...rest,
       color,
       size,
       strokeWidth,
-      style: style as any,
+      ...(fillResolved !== undefined ? { fill: fillResolved } : null),
+      ...(strokeResolved !== undefined ? { stroke: strokeResolved } : null),
+      ...(style ? { style } : null),
+      // tamagui web maps testID -> data-testid; native keeps testID for react-native-svg
+      ...(testID != null ? (isWeb ? { 'data-testid': testID } : { testID }) : null),
     }
 
     return <Component {...finalProps} />

package/types/themed.d.ts

@@ -1,8 +1,6 @@
 import { type ResolveVariableAs } from '@tamagui/core';
-import { SizableContext } from '@tamagui/sizable-context';
 import type { FC } from 'react';
 import type { IconProps } from './IconProps';
-export { SizableContext };
 type Options = {
     noClass?: boolean;
     defaultThemeColor?: string;
@@ -11,10 +9,11 @@ type Options = {
     resolveValues?: ResolveVariableAs;
 };
 export declare function themed(Component: FC<IconProps>, optsIn?: Options): {
-    (propsIn: IconProps): import("react/jsx-runtime").JSX.Element;
+    (propsIn: IconProps): import("react").JSX.Element;
     staticConfig: {
         isHOC: boolean;
         acceptsClassName: boolean;
     };
 };
+export {};
 //# sourceMappingURL=themed.d.ts.map

package/types/themed.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"themed.d.ts","sourceRoot":"","sources":["../src/themed.tsx"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,iBAAiB,EACvB,MAAM,eAAe,CAAA;AACtB,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAA;AAEzD,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,OAAO,CAAA;AAC/B,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAE5C,OAAO,EAAE,cAAc,EAAE,CAAA;AAEzB,KAAK,OAAO,GAAG;IACb,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,aAAa,CAAC,EAAE,iBAAiB,CAAA;CAClC,CAAA;AAUD,wBAAgB,MAAM,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,EAAE,MAAM,GAAE,OAAY;cAmDzC,SAAS;;;;;EAWpC"}
+{"version":3,"file":"themed.d.ts","sourceRoot":"","sources":["../src/themed.tsx"],"names":[],"mappings":"AAAA,OAAO,EAML,KAAK,iBAAiB,EACvB,MAAM,eAAe,CAAA;AAItB,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,OAAO,CAAA;AAC/B,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAE5C,KAAK,OAAO,GAAG;IACb,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,aAAa,CAAC,EAAE,iBAAiB,CAAA;CAClC,CAAA;AAED,wBAAgB,MAAM,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,EAAE,MAAM,GAAE,OAAY;cA8EzC,SAAS;;;;;EAWpC"}

package/dist/esm/IconProps.mjs.map

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

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

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

package/dist/esm/index.js.map

@@ -1 +0,0 @@
-{"version":3,"names":[],"sources":["../../src/index.ts"],"sourcesContent":[null],"mappings":"AAAA,cAAc;AACd,cAAc","ignoreList":[]}

package/dist/esm/index.mjs.map

@@ -1 +0,0 @@
-{"version":3,"names":[],"sources":["../../src/index.ts"],"sourcesContent":[null],"mappings":"AAAA,cAAc;AACd,cAAc","ignoreList":[]}

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

@@ -1 +0,0 @@
-{"version":3,"names":[],"sources":["../../src/index.ts"],"sourcesContent":[null],"mappings":"AAAA,cAAc;AACd,cAAc","ignoreList":[]}