@tamagui/web 2.7.7 → 3.0.0-beta.643.1

package/dist/cjs/helpers/propMapper.native.js

@@ -1,381 +1,508 @@
 "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 __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var propMapper_exports = {};
 __export(propMapper_exports, {
-  getFontFamilyFromNameOrVariable: () => getFontFamilyFromNameOrVariable,
-  getTokenForKey: () => import_getTokenForKey2.getTokenForKey,
-  propMapper: () => propMapper
+	appendFlatClause: () => appendFlatClause,
+	getFontFamilyFromNameOrVariable: () => getFontFamilyFromNameOrVariable,
+	propMapper: () => propMapper
 });
 module.exports = __toCommonJS(propMapper_exports);
 var import_constants = require("@tamagui/constants");
+var import_runtime = require("@tamagui/style-grammar/runtime");
 var import_createVariable = require("../createVariable.native.js");
+var import_types = require("../types.native.js");
+var import_directStyle = require("./directStyle.native.js");
 var import_expandStyle = require("./expandStyle.native.js");
-var import_getTokenForKey = require("./getTokenForKey.native.js");
+var import_resolveVariableValue = require("./resolveVariableValue.native.js");
 var import_getVariantExtras = require("./getVariantExtras.native.js");
 var import_isObj = require("./isObj.native.js");
 var import_normalizeStyle = require("./normalizeStyle.native.js");
-var import_parseNativeStyle = require("./parseNativeStyle.native.js");
-var import_pseudoDescriptors = require("./pseudoDescriptors.native.js");
-var import_resolveCompoundTokens = require("./resolveCompoundTokens.native.js");
 var import_resolveRem = require("./resolveRem.native.js");
+var import_resolveSafeArea = require("./resolveSafeArea.native.js");
 var import_skipProps = require("./skipProps.native.js");
 var import_styleOriginalValues = require("./styleOriginalValues.native.js");
-var import_getTokenForKey2 = require("./getTokenForKey.native.js");
+__reExport(propMapper_exports, require("./tokenCategories.native.js"), module.exports);
 function _type_of(obj) {
-  "@swc/helpers - typeof";
-
-  return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
+	"@swc/helpers - typeof";
+	return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
+}
+function appendFlatClause(prev, conditionSource, value) {
+	if (prev != null && typeof prev !== "string" && typeof prev !== "number") return;
+	if (typeof value !== "string" && typeof value !== "number") return;
+	return prev == null ? `${conditionSource}:${value}` : `${prev} ${conditionSource}:${value}`;
 }
-var propMapper = function (key, value, styleState, disabled, map) {
-  if (disabled) return map(key, value);
-  (0, import_getTokenForKey.setLastFontFamilyToken)(null);
-  if (!import_constants.isAndroid) {
-    if (key === "elevationAndroid") return;
-  }
-  var {
-    conf,
-    styleProps,
-    staticConfig
-  } = styleState;
-  var {
-    variants
-  } = staticConfig;
-  if (value === "unset") {
-    var expandedKey = !styleProps.disableExpandShorthands && conf.shorthands[key] || key;
-    var expanded = styleProps.noExpand ? null : (0, import_expandStyle.expandStyle)(expandedKey, value, conf.settings.styleCompat || "web");
-    if (styleState.style) if (expanded) {
-      var _iteratorNormalCompletion = true,
-        _didIteratorError = false,
-        _iteratorError = void 0;
-      try {
-        for (var _iterator = expanded[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-          var [nkey] = _step.value;
-          delete styleState.style[nkey];
-        }
-      } catch (err) {
-        _didIteratorError = true;
-        _iteratorError = err;
-      } finally {
-        try {
-          if (!_iteratorNormalCompletion && _iterator.return != null) _iterator.return();
-        } finally {
-          if (_didIteratorError) throw _iteratorError;
-        }
-      }
-    } else delete styleState.style[expandedKey];
-    return;
-  }
-  if (!styleProps.noExpand) {
-    if (variants && key in variants) {
-      var variantValue = resolveVariants(key, value, styleProps, styleState, "");
-      if (variantValue) {
-        variantValue.forEach(function (param) {
-          var [_$key, _$value, originalValue2] = param;
-          map(_$key, _$value, originalValue2);
-        });
-        return;
-      }
-    }
-  }
-  if (!styleProps.disableExpandShorthands) {
-    if (key in conf.shorthands) key = conf.shorthands[key];
-  }
-  var originalValue = value;
-  if (value != null) {
-    if (typeof value === "string") {
-      if (value[0] === "$") value = (0, import_getTokenForKey.getTokenForKey)(key, value, styleProps, styleState);else {
-        var resolved = (0, import_resolveCompoundTokens.resolveCompoundTokens)(key, value, styleProps, styleState);
-        value = resolved !== value ? resolved : (0, import_resolveRem.isRemValue)(value) ? (0, import_resolveRem.resolveRem)(value) : value;
-      }
-    } else if ((0, import_createVariable.isVariable)(value)) value = (0, import_getTokenForKey.resolveVariableValue)(key, value, styleProps.resolveValues);else if ((0, import_resolveRem.isRemValue)(value)) value = (0, import_resolveRem.resolveRem)(value);
-  }
-  if (value != null && typeof value === "string" && (key === "backgroundImage" || key === "boxShadow" || key === "textShadow")) {
-    var parsed = (0, import_parseNativeStyle.parseNativeStyle)(key, value);
-    if (parsed) {
-      if (key === "textShadow" && Array.isArray(parsed) && Array.isArray(parsed[0])) {
-        var _iteratorNormalCompletion1 = true,
-          _didIteratorError1 = false,
-          _iteratorError1 = void 0;
-        try {
-          for (var _iterator1 = parsed[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true) {
-            var [nkey1, nvalue] = _step1.value;
-            map(nkey1, nvalue, originalValue);
-          }
-        } catch (err) {
-          _didIteratorError1 = true;
-          _iteratorError1 = err;
-        } finally {
-          try {
-            if (!_iteratorNormalCompletion1 && _iterator1.return != null) _iterator1.return();
-          } finally {
-            if (_didIteratorError1) throw _iteratorError1;
-          }
-        }
-        return;
-      }
-      value = parsed;
-    }
-  }
-  if (value != null) {
-    var fontToken = (0, import_getTokenForKey.getLastFontFamilyToken)();
-    if (key === "fontFamily" && fontToken) styleState.fontFamily = fontToken;
-    var expanded1 = styleProps.noExpand ? null : (0, import_expandStyle.expandStyle)(key, value, conf.settings.styleCompat || "web");
-    if (expanded1) {
-      var max = expanded1.length;
-      for (var i = 0; i < max; i++) {
-        var [nkey2, nvalue1, noriginalValue] = expanded1[i];
-        map(nkey2, nvalue1, noriginalValue !== null && noriginalValue !== void 0 ? noriginalValue : originalValue);
-      }
-    } else map(key, value, originalValue);
-  }
+var propMapper = function(key, value, styleState, disabled, map) {
+	if (disabled) return map(key, value);
+	if (!import_constants.isAndroid) {
+		if (key === "elevationAndroid") return;
+	}
+	var { conf, styleProps, staticConfig } = styleState;
+	var { variants } = staticConfig;
+	if (value === "unset") {
+		var expandedKey = !styleProps.disableExpandShorthands && conf.shorthands[key] || key;
+		var expanded = styleProps.noExpand ? null : (0, import_expandStyle.expandStyle)(expandedKey, value, conf.settings.styleCompat || "web");
+		if (styleState.style) if (expanded) {
+			var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+			try {
+				for (var _iterator = expanded[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+					var [nkey] = _step.value;
+					delete styleState.style[nkey];
+				}
+			} catch (err) {
+				_didIteratorError = true;
+				_iteratorError = err;
+			} finally {
+				try {
+					if (!_iteratorNormalCompletion && _iterator.return != null) _iterator.return();
+				} finally {
+					if (_didIteratorError) throw _iteratorError;
+				}
+			}
+		} else delete styleState.style[expandedKey];
+		return;
+	}
+	if (!styleProps.noExpand) {
+		if (variants && key in variants) {
+			var variantValue = resolveVariants(key, value, styleProps, styleState, "");
+			if (variantValue) {
+				var _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = void 0;
+				try {
+					for (var _iterator1 = variantValue[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true) {
+						var entry = _step1.value;
+						map(entry[0], entry[1], entry[2], entry[3]);
+					}
+				} catch (err) {
+					_didIteratorError1 = true;
+					_iteratorError1 = err;
+				} finally {
+					try {
+						if (!_iteratorNormalCompletion1 && _iterator1.return != null) _iterator1.return();
+					} finally {
+						if (_didIteratorError1) throw _iteratorError1;
+					}
+				}
+				return;
+			}
+		}
+	}
+	if (!styleProps.disableExpandShorthands) {
+		if (key in conf.shorthands) key = conf.shorthands[key];
+	}
+	var originalValue = value;
+	if (value === "safe" && (0, import_resolveSafeArea.isSafeAreaKey)(key)) {
+		var expanded1 = (0, import_resolveSafeArea.expandSafeAreaValue)(key);
+		if (expanded1) {
+			for (var i = 0; i < expanded1.length; i++) {
+				var [nkey1, nvalue] = expanded1[i];
+				map(nkey1, nvalue, originalValue);
+			}
+			return;
+		}
+	}
+	if (value != null) {
+		if (typeof value === "string") value = (0, import_resolveRem.isRemValue)(value) ? (0, import_resolveRem.resolveRem)(value) : value;
+		else if ((0, import_createVariable.isVariable)(value)) value = (0, import_resolveVariableValue.resolveVariableValue)(key, value, styleProps.resolveValues);
+		else if ((0, import_resolveRem.isRemValue)(value)) value = (0, import_resolveRem.resolveRem)(value);
+	}
+	if (value != null) {
+		if (key === "fontFamily" && typeof originalValue === "string") {
+			if (originalValue in conf.fontsParsed) styleState.fontFamily = originalValue;
+		}
+		var expanded2 = styleProps.noExpand || typeof value === "string" ? null : (0, import_expandStyle.expandStyle)(key, value, conf.settings.styleCompat || "web");
+		if (expanded2) {
+			var max = expanded2.length;
+			for (var i1 = 0; i1 < max; i1++) {
+				var [nkey2, nvalue1, noriginalValue] = expanded2[i1];
+				map(nkey2, nvalue1, noriginalValue !== null && noriginalValue !== void 0 ? noriginalValue : originalValue);
+			}
+		} else map(key, value, originalValue);
+	}
 };
-var resolveVariants = function (key, value, styleProps, styleState, parentVariantKey) {
-  var {
-    staticConfig,
-    conf,
-    debug
-  } = styleState;
-  var {
-    variants
-  } = staticConfig;
-  if (!variants) return;
-  var variantValue = getVariantDefinition(variants[key], value, conf, styleState);
-  if (process.env.NODE_ENV === "development" && debug === "verbose") {
-    console.groupCollapsed(`\u2666\uFE0F\u2666\uFE0F\u2666\uFE0F resolve variant ${key}`);
-    console.info({
-      key,
-      value,
-      variantValue,
-      variants
-    });
-    console.groupEnd();
-  }
-  if (!variantValue) {
-    if (process.env.TAMAGUI_WARN_ON_MISSING_VARIANT === "1") {
-      if (typeof value !== "boolean") {
-        var name = staticConfig.componentName || "[UnnamedComponent]";
-        console.warn(`No variant found: ${name} has variant "${key}", but no matching value "${value}"`);
-      }
-    }
-    return;
-  }
-  if (typeof variantValue === "function") {
-    variantValue = variantValue(value, (0, import_getVariantExtras.getVariantExtras)(styleState));
-    if (process.env.NODE_ENV === "development" && debug === "verbose" && false) ;
-  }
-  var fontFamilyResult;
-  if ((0, import_isObj.isObj)(variantValue)) {
-    var fontFamilyUpdate = variantValue.fontFamily || variantValue[conf.inverseShorthands.fontFamily];
-    if (fontFamilyUpdate) {
-      fontFamilyResult = getFontFamilyFromNameOrVariable(fontFamilyUpdate, conf);
-      styleState.fontFamily = fontFamilyResult;
-      if (process.env.NODE_ENV === "development" && debug === "verbose") console.info(`   updating font family`, fontFamilyResult);
-    }
-    variantValue = resolveTokensAndVariants(key, variantValue, styleProps, styleState, parentVariantKey);
-  }
-  if (variantValue) {
-    var expanded = (0, import_normalizeStyle.normalizeStyle)(variantValue, !!styleProps.noNormalize);
-    if (process.env.NODE_ENV === "development" && debug === "verbose") console.info(`   expanding styles from `, variantValue, `to`, expanded);
-    var next = Object.entries(expanded);
-    var originalValues = import_styleOriginalValues.styleOriginalValues.get(expanded);
-    if (fontFamilyResult && fontFamilyResult[0] === "$") (0, import_getTokenForKey.setLastFontFamilyToken)((0, import_createVariable.getVariableValue)(fontFamilyResult));
-    return next.map(function (param) {
-      var [_$key, _$value] = param;
-      return [_$key, _$value, originalValues === null || originalValues === void 0 ? void 0 : originalValues[_$key]];
-    });
-  }
+var resolveVariants = function(key, value, styleProps, styleState, parentVariantKey) {
+	var _styleState_staticConfig_variants;
+	var variantDefinition = (_styleState_staticConfig_variants = styleState.staticConfig.variants) === null || _styleState_staticConfig_variants === void 0 ? void 0 : _styleState_staticConfig_variants[key];
+	if (typeof value === "string" && value.indexOf(":") !== -1 && !(variantDefinition && (typeof variantDefinition === "undefined" ? "undefined" : _type_of(variantDefinition)) === "object" && value in variantDefinition)) {
+		var starts = [];
+		var ends = [];
+		var modifiers = [];
+		var pendingModifier;
+		var sawClause = false;
+		var refused = false;
+		(0, import_runtime.scanFlatValue)(value, {
+			segment(start, end, isBase) {
+				if (start === end) {
+					if (!isBase) refused = true;
+					return;
+				}
+				starts.push(start);
+				ends.push(end);
+				modifiers.push(pendingModifier);
+			},
+			chain(start, end) {
+				if (refused) return false;
+				var source = value.slice(start, end);
+				if (!(0, import_directStyle.getCondition)(styleState, source)) {
+					refused = true;
+					return false;
+				}
+				pendingModifier = source;
+				sawClause = true;
+				return true;
+			},
+			error() {
+				refused = true;
+			}
+		});
+		if (refused) return [];
+		if (sawClause) {
+			var entries;
+			for (var index = 0; index < starts.length; index++) {
+				var resolved = resolveVariantValue(key, value.slice(starts[index], ends[index]), styleProps, styleState, parentVariantKey);
+				if (!resolved) continue;
+				entries || (entries = []);
+				var modifier = modifiers[index];
+				var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+				try {
+					for (var _iterator = resolved[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+						var entry = _step.value;
+						if (modifier !== void 0) entry[3] = modifier;
+						entries.push(entry);
+					}
+				} catch (err) {
+					_didIteratorError = true;
+					_iteratorError = err;
+				} finally {
+					try {
+						if (!_iteratorNormalCompletion && _iterator.return != null) _iterator.return();
+					} finally {
+						if (_didIteratorError) throw _iteratorError;
+					}
+				}
+			}
+			return entries || [];
+		}
+	}
+	return resolveVariantValue(key, value, styleProps, styleState, parentVariantKey);
+};
+var resolveVariantValue = function(key, value, styleProps, styleState, parentVariantKey) {
+	var { staticConfig, conf, debug } = styleState;
+	var { variants } = staticConfig;
+	if (!variants) return;
+	var variant = variants[key];
+	var variantValue = getVariantDefinition(variant, value, conf, styleState);
+	if (process.env.NODE_ENV === "development" && debug === "verbose") {
+		console.groupCollapsed(`\u2666\uFE0F\u2666\uFE0F\u2666\uFE0F resolve variant ${key}`);
+		console.info({
+			key,
+			value,
+			variantValue,
+			variants
+		});
+		console.groupEnd();
+	}
+	if (!variantValue) {
+		if (process.env.TAMAGUI_WARN_ON_MISSING_VARIANT === "1") {
+			if (typeof value !== "boolean") {
+				var name = styleState.styleProps.displayName || "[UnnamedComponent]";
+				console.warn(`No variant found: ${name} has variant "${key}", but no matching value "${value}"`);
+			}
+		}
+		return;
+	}
+	if (typeof variantValue === "function") {
+		variantValue = variantValue(value, (0, import_getVariantExtras.getVariantExtras)(styleState));
+		if (process.env.NODE_ENV === "development" && debug === "verbose" && false);
+	}
+	var fontFamilyResult;
+	if ((0, import_isObj.isObj)(variantValue)) {
+		var fontFamilyUpdate = variantValue.fontFamily || variantValue[conf.inverseShorthands.fontFamily];
+		if (fontFamilyUpdate) {
+			fontFamilyResult = getFontFamilyFromNameOrVariable(fontFamilyUpdate, conf);
+			styleState.fontFamily = fontFamilyResult;
+			if (process.env.NODE_ENV === "development" && debug === "verbose") console.info(`   updating font family`, fontFamilyResult);
+		}
+		variantValue = resolveTokensAndVariants(key, variantValue, styleProps, styleState, parentVariantKey);
+	}
+	if (variantValue) {
+		var expanded = (0, import_normalizeStyle.normalizeStyle)(variantValue, !!styleProps.noNormalize);
+		if (process.env.NODE_ENV === "development" && debug === "verbose") console.info(`   expanding styles from `, variantValue, `to`, expanded);
+		var originalValues = import_styleOriginalValues.styleOriginalValues.get(expanded);
+		var next = [];
+		for (var _$key in expanded) next.push([
+			_$key,
+			expanded[_$key],
+			originalValues === null || originalValues === void 0 ? void 0 : originalValues[_$key]
+		]);
+		return next;
+	}
 };
 function getFontFamilyFromNameOrVariable(input, conf) {
-  if ((0, import_createVariable.isVariable)(input)) {
-    var val = variableToFontNameCache.get(input);
-    if (val) return val;
-    for (var key in conf.fontsParsed) {
-      var familyVariable = conf.fontsParsed[key].family;
-      if ((0, import_createVariable.isVariable)(familyVariable)) {
-        variableToFontNameCache.set(familyVariable, key);
-        if (familyVariable === input) return key;
-      }
-    }
-  } else if (typeof input === "string") {
-    if (input[0] === "$") return input;
-  }
+	if ((0, import_createVariable.isVariable)(input)) {
+		var val = variableToFontNameCache.get(input);
+		if (val) return val;
+		for (var key in conf.fontsParsed) {
+			var familyVariable = conf.fontsParsed[key].family;
+			if ((0, import_createVariable.isVariable)(familyVariable)) {
+				variableToFontNameCache.set(familyVariable, key);
+				if (familyVariable === input) return key;
+			}
+		}
+	} else if (typeof input === "string" && input in conf.fontsParsed) return input;
 }
-var variableToFontNameCache = /* @__PURE__ */new WeakMap();
-var resolveTokensAndVariants = function (key, value, styleProps, styleState, parentVariantKey) {
-  var {
-    conf,
-    staticConfig,
-    debug,
-    theme
-  } = styleState;
-  var {
-    variants
-  } = staticConfig;
-  var res = {};
-  var originalValues;
-  if (process.env.NODE_ENV === "development" && debug === "verbose") console.info(`   - resolveTokensAndVariants`, key, value);
-  for (var _key in value) {
-    var subKey = conf.shorthands[_key] || _key;
-    var val = value[_key];
-    if (!styleProps.noSkip && subKey in import_skipProps.skipProps) continue;
-    originalValues || (originalValues = {});
-    originalValues[subKey] = val;
-    if (staticConfig) {
-      var _staticConfig_context, _staticConfig_parentStaticConfig_context, _staticConfig_parentStaticConfig;
-      var contextProps = ((_staticConfig_context = staticConfig.context) === null || _staticConfig_context === void 0 ? void 0 : _staticConfig_context.props) || ((_staticConfig_parentStaticConfig = staticConfig.parentStaticConfig) === null || _staticConfig_parentStaticConfig === void 0 ? void 0 : (_staticConfig_parentStaticConfig_context = _staticConfig_parentStaticConfig.context) === null || _staticConfig_parentStaticConfig_context === void 0 ? void 0 : _staticConfig_parentStaticConfig_context.props);
-      if (contextProps && subKey in contextProps) {
-        var _styleState, _styleState1;
-        (_styleState = styleState).overriddenContextProps || (_styleState.overriddenContextProps = {});
-        styleState.overriddenContextProps[subKey] = val;
-        (_styleState1 = styleState).originalContextPropValues || (_styleState1.originalContextPropValues = {});
-        styleState.originalContextPropValues[subKey] = val;
-      }
-    }
-    if (styleProps.noExpand) res[subKey] = val;else if (variants && subKey in variants) {
-      if (parentVariantKey && parentVariantKey === key) res[subKey] = val[0] === "$" ? (0, import_getTokenForKey.getTokenForKey)(subKey, val, styleProps, styleState) : val;else {
-        var variantOut = resolveVariants(subKey, val, styleProps, styleState, key);
-        if (variantOut) {
-          var _iteratorNormalCompletion = true,
-            _didIteratorError = false,
-            _iteratorError = void 0;
-          try {
-            for (var _iterator = variantOut[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-              var [_$key, val1, originalVal] = _step.value;
-              if (val1 == null) continue;
-              if (_$key in import_pseudoDescriptors.pseudoDescriptors) {
-                var _res, _key1;
-                var _;
-                (_ = (_res = res)[_key1 = _$key]) !== null && _ !== void 0 || (_res[_key1] = {});
-                Object.assign(res[_$key], val1);
-                var subOriginalValues = import_styleOriginalValues.styleOriginalValues.get(val1);
-                if (subOriginalValues) import_styleOriginalValues.styleOriginalValues.set(res[_$key], {
-                  ...import_styleOriginalValues.styleOriginalValues.get(res[_$key]),
-                  ...subOriginalValues
-                });
-              } else {
-                res[_$key] = val1;
-                if (originalVal !== void 0) {
-                  originalValues || (originalValues = {});
-                  originalValues[_$key] = originalVal;
-                }
-              }
-            }
-          } catch (err) {
-            _didIteratorError = true;
-            _iteratorError = err;
-          } finally {
-            try {
-              if (!_iteratorNormalCompletion && _iterator.return != null) _iterator.return();
-            } finally {
-              if (_didIteratorError) throw _iteratorError;
-            }
-          }
-        }
-      }
-      continue;
-    }
-    if ((0, import_createVariable.isVariable)(val)) {
-      res[subKey] = (0, import_getTokenForKey.resolveVariableValue)(subKey, val, styleProps.resolveValues);
-      if (process.env.NODE_ENV === "development" && debug === "verbose") console.info(`variable`, subKey, res[subKey]);
-      continue;
-    }
-    if (typeof val === "string") {
-      var fVal = val[0] === "$" ? (0, import_getTokenForKey.getTokenForKey)(subKey, val, styleProps, styleState) : (0, import_resolveCompoundTokens.resolveCompoundTokens)(subKey, val, styleProps, styleState);
-      res[subKey] = fVal === val && (0, import_resolveRem.isRemValue)(val) ? (0, import_resolveRem.resolveRem)(val) : fVal;
-      continue;
-    }
-    if ((0, import_isObj.isObj)(val)) {
-      var _res1, _subKey;
-      var subObject = resolveTokensAndVariants(subKey, val, styleProps, styleState, key);
-      if (process.env.NODE_ENV === "development" && debug === "verbose") console.info(`object`, subKey, subObject);
-      var _1;
-      (_1 = (_res1 = res)[_subKey = subKey]) !== null && _1 !== void 0 || (_res1[_subKey] = {});
-      Object.assign(res[subKey], subObject);
-      var subOriginalValues1 = import_styleOriginalValues.styleOriginalValues.get(subObject);
-      if (subOriginalValues1) import_styleOriginalValues.styleOriginalValues.set(res[subKey], {
-        ...import_styleOriginalValues.styleOriginalValues.get(res[subKey]),
-        ...subOriginalValues1
-      });
-    } else res[subKey] = val;
-    if (process.env.NODE_ENV === "development") {
-      if (debug) {
-        var _res_subKey;
-        if (((_res_subKey = res[subKey]) === null || _res_subKey === void 0 ? void 0 : _res_subKey[0]) === "$") console.warn(`\u26A0\uFE0F Missing token in theme ${theme.name}:`, subKey, res[subKey], theme);
-      }
-    }
-  }
-  if (originalValues) import_styleOriginalValues.styleOriginalValues.set(res, originalValues);
-  return res;
+var variableToFontNameCache = /* @__PURE__ */ new WeakMap();
+var resolveTokensAndVariants = function(key, value, styleProps, styleState, parentVariantKey) {
+	var { conf, staticConfig, debug } = styleState;
+	var { variants } = staticConfig;
+	var res = {};
+	var originalValues;
+	if (process.env.NODE_ENV === "development" && debug === "verbose") console.info(`   - resolveTokensAndVariants`, key, value);
+	for (var _key in value) {
+		var subKey = conf.shorthands[_key] || _key;
+		var val = value[_key];
+		if (!styleProps.noSkip && subKey in import_skipProps.skipProps) continue;
+		originalValues || (originalValues = {});
+		originalValues[subKey] = val;
+		if (staticConfig) {
+			var _staticConfig_context, _staticConfig_parentStaticConfig_context, _staticConfig_parentStaticConfig, _staticConfig_parentStaticConfig1, _staticConfig_parentStaticConfig2, _staticConfig_context_propKeys, _staticConfig_context1, _staticConfig_parentStaticConfig_context_propKeys, _staticConfig_parentStaticConfig_context1, _staticConfig_parentStaticConfig3;
+			var contextProps = ((_staticConfig_context = staticConfig.context) === null || _staticConfig_context === void 0 ? void 0 : _staticConfig_context.props) || ((_staticConfig_parentStaticConfig = staticConfig.parentStaticConfig) === null || _staticConfig_parentStaticConfig === void 0 ? void 0 : (_staticConfig_parentStaticConfig_context = _staticConfig_parentStaticConfig.context) === null || _staticConfig_parentStaticConfig_context === void 0 ? void 0 : _staticConfig_parentStaticConfig_context.props);
+			var inheritedContextPropKeys = !staticConfig.context || staticConfig.context === ((_staticConfig_parentStaticConfig1 = staticConfig.parentStaticConfig) === null || _staticConfig_parentStaticConfig1 === void 0 ? void 0 : _staticConfig_parentStaticConfig1.context) ? (_staticConfig_parentStaticConfig2 = staticConfig.parentStaticConfig) === null || _staticConfig_parentStaticConfig2 === void 0 ? void 0 : _staticConfig_parentStaticConfig2.contextProps : void 0;
+			var contextPropKeys = staticConfig.contextProps || inheritedContextPropKeys;
+			if (contextProps && subKey in contextProps || (contextPropKeys === null || contextPropKeys === void 0 ? void 0 : contextPropKeys.includes(subKey)) || ((_staticConfig_context1 = staticConfig.context) === null || _staticConfig_context1 === void 0 ? void 0 : (_staticConfig_context_propKeys = _staticConfig_context1.propKeys) === null || _staticConfig_context_propKeys === void 0 ? void 0 : _staticConfig_context_propKeys.includes(subKey)) || ((_staticConfig_parentStaticConfig3 = staticConfig.parentStaticConfig) === null || _staticConfig_parentStaticConfig3 === void 0 ? void 0 : (_staticConfig_parentStaticConfig_context1 = _staticConfig_parentStaticConfig3.context) === null || _staticConfig_parentStaticConfig_context1 === void 0 ? void 0 : (_staticConfig_parentStaticConfig_context_propKeys = _staticConfig_parentStaticConfig_context1.propKeys) === null || _staticConfig_parentStaticConfig_context_propKeys === void 0 ? void 0 : _staticConfig_parentStaticConfig_context_propKeys.includes(subKey))) {
+				var _styleState, _styleState1;
+				(_styleState = styleState).overriddenContextProps || (_styleState.overriddenContextProps = {});
+				styleState.overriddenContextProps[subKey] = val;
+				(_styleState1 = styleState).originalContextPropValues || (_styleState1.originalContextPropValues = {});
+				styleState.originalContextPropValues[subKey] = val;
+			}
+		}
+		if (styleProps.noExpand) res[subKey] = val;
+		else if (variants && subKey in variants) {
+			if (parentVariantKey && parentVariantKey === key) res[subKey] = val;
+			else {
+				var variantOut = resolveVariants(subKey, val, styleProps, styleState, key);
+				if (variantOut) {
+					var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+					try {
+						for (var _iterator = variantOut[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+							var [_$key, val1, originalVal, conditionSource] = _step.value;
+							if (val1 == null) continue;
+							if (conditionSource !== void 0) {
+								var appended = appendFlatClause(res[_$key], conditionSource, val1);
+								if (appended === void 0) {
+									if (process.env.NODE_ENV === "development") console.warn(`[tamagui] conditional variant value for "${_$key}" is not string-representable; dropping the clause`);
+									continue;
+								}
+								res[_$key] = appended;
+								continue;
+							}
+							res[_$key] = val1;
+							if (originalVal !== void 0) {
+								originalValues || (originalValues = {});
+								originalValues[_$key] = originalVal;
+							}
+						}
+					} catch (err) {
+						_didIteratorError = true;
+						_iteratorError = err;
+					} finally {
+						try {
+							if (!_iteratorNormalCompletion && _iterator.return != null) _iterator.return();
+						} finally {
+							if (_didIteratorError) throw _iteratorError;
+						}
+					}
+				}
+			}
+			continue;
+		}
+		if ((0, import_createVariable.isVariable)(val)) {
+			res[subKey] = (0, import_resolveVariableValue.resolveVariableValue)(subKey, val, styleProps.resolveValues);
+			if (process.env.NODE_ENV === "development" && debug === "verbose") console.info(`variable`, subKey, res[subKey]);
+			continue;
+		}
+		if (typeof val === "string") {
+			res[subKey] = (0, import_resolveRem.isRemValue)(val) ? (0, import_resolveRem.resolveRem)(val) : val;
+			continue;
+		}
+		if ((0, import_isObj.isObj)(val)) {
+			var _res, _subKey;
+			var subObject = resolveTokensAndVariants(subKey, val, styleProps, styleState, key);
+			if (process.env.NODE_ENV === "development" && debug === "verbose") console.info(`object`, subKey, subObject);
+			var _;
+			(_ = (_res = res)[_subKey = subKey]) !== null && _ !== void 0 || (_res[_subKey] = {});
+			Object.assign(res[subKey], subObject);
+			var subOriginalValues = import_styleOriginalValues.styleOriginalValues.get(subObject);
+			if (subOriginalValues) {
+				var existing = import_styleOriginalValues.styleOriginalValues.get(res[subKey]);
+				if (existing) Object.assign(existing, subOriginalValues);
+				else import_styleOriginalValues.styleOriginalValues.set(res[subKey], { ...subOriginalValues });
+			}
+		} else res[subKey] = val;
+	}
+	if (originalValues) import_styleOriginalValues.styleOriginalValues.set(res, originalValues);
+	return res;
 };
-var tokenCats = ["size", "color", "radius", "space", "zIndex"].map(function (name) {
-  return {
-    name,
-    spreadName: `...${name}`
-  };
-});
 function getVariantDefinition(variant, value, conf, param) {
-  var {
-    theme
-  } = param;
-  if (!variant) return;
-  if (typeof variant === "function") return variant;
-  var exact = variant[value];
-  if (exact) return exact;
-  if (value != null) {
-    var {
-      tokensParsed
-    } = conf;
-    var _iteratorNormalCompletion = true,
-      _didIteratorError = false,
-      _iteratorError = void 0;
-    try {
-      for (var _iterator = tokenCats[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-        var {
-          name,
-          spreadName
-        } = _step.value;
-        if (spreadName in variant) {
-          if (name in tokensParsed && value in tokensParsed[name]) return variant[spreadName];
-          if (name === "color" && theme && typeof value === "string" && value[0] === "$") {
-            if (value.slice(1) in theme) return variant[spreadName];
-          }
-        }
-      }
-    } catch (err) {
-      _didIteratorError = true;
-      _iteratorError = err;
-    } finally {
-      try {
-        if (!_iteratorNormalCompletion && _iterator.return != null) _iterator.return();
-      } finally {
-        if (_didIteratorError) throw _iteratorError;
-      }
-    }
-    var fontSizeVariant = variant["...fontSize"];
-    if (fontSizeVariant && conf.fontSizeTokens.has(value)) return fontSizeVariant;
-  }
-  return variant[`:${typeof value === "undefined" ? "undefined" : _type_of(value)}`] || variant["..."];
+	var { theme } = param;
+	if (!variant) return;
+	if (value === void 0) return;
+	if (typeof variant === "function") return variant;
+	if (Object.prototype.hasOwnProperty.call(variant, value)) return variant[value];
+	var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+	try {
+		for (var _iterator = getCompiledVariantResolvers(variant)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+			var { key, parts } = _step.value;
+			var _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = void 0;
+			try {
+				for (var _iterator1 = parts[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true) {
+					var part = _step1.value;
+					if (matchesVariantResolver(part, value, conf, theme)) return variant[key];
+				}
+			} catch (err) {
+				_didIteratorError1 = true;
+				_iteratorError1 = err;
+			} finally {
+				try {
+					if (!_iteratorNormalCompletion1 && _iterator1.return != null) _iterator1.return();
+				} finally {
+					if (_didIteratorError1) throw _iteratorError1;
+				}
+			}
+		}
+	} catch (err) {
+		_didIteratorError = true;
+		_iteratorError = err;
+	} finally {
+		try {
+			if (!_iteratorNormalCompletion && _iterator.return != null) _iterator.return();
+		} finally {
+			if (_didIteratorError) throw _iteratorError;
+		}
+	}
 }
+var variantResolverNameSet = new Set(import_types.variantResolverNames);
+var variantResolverCache = /* @__PURE__ */ new WeakMap();
+function getCompiledVariantResolvers(variant) {
+	var cached = variantResolverCache.get(variant);
+	if (cached) return cached;
+	var compiled = [];
+	var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+	try {
+		for (var _iterator = Object.keys(variant)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+			var key = _step.value;
+			var parts = parseVariantResolverKey(key);
+			if (parts) compiled.push({
+				key,
+				parts
+			});
+		}
+	} catch (err) {
+		_didIteratorError = true;
+		_iteratorError = err;
+	} finally {
+		try {
+			if (!_iteratorNormalCompletion && _iterator.return != null) _iterator.return();
+		} finally {
+			if (_didIteratorError) throw _iteratorError;
+		}
+	}
+	variantResolverCache.set(variant, compiled);
+	return compiled;
+}
+function parseVariantResolverKey(key) {
+	if (!key) return null;
+	var parts = key.split("|").map(function(part2) {
+		return part2.trim();
+	});
+	if (!parts.length) return null;
+	var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+	try {
+		for (var _iterator = parts[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+			var part = _step.value;
+			if (!variantResolverNameSet.has(part)) return null;
+		}
+	} catch (err) {
+		_didIteratorError = true;
+		_iteratorError = err;
+	} finally {
+		try {
+			if (!_iteratorNormalCompletion && _iterator.return != null) _iterator.return();
+		} finally {
+			if (_didIteratorError) throw _iteratorError;
+		}
+	}
+	return parts;
+}
+var numberStringPattern = /[+-]?(?:(?:\d+\.?\d*)|(?:\.\d+))(?:[eE][+-]?\d+)?|[+-]?0[xX][\da-fA-F]+|[+-]?0[bB][01]+|[+-]?0[oO][0-7]+/;
+var remStringPattern = new RegExp(`^(?:${numberStringPattern.source})rem$`);
+var viewportValuePattern = new RegExp(`^(?:${numberStringPattern.source})(vw|dvw|lvw|svw|vh|dvh|lvh|svh)$`);
+function isAllowedStyleValue(category, value, conf, string, number, rem) {
+	var hasSetting = Object.prototype.hasOwnProperty.call(conf.settings, "allowedStyleValues");
+	var configured = conf.settings.allowedStyleValues;
+	var setting = configured && (typeof configured === "undefined" ? "undefined" : _type_of(configured)) === "object" ? configured[category] : configured;
+	var web = value === "unset" || value === "inherit" || string && /^var\(.*\)$/.test(value) || (category === "size" || category === "space") && (value === "max-content" || value === "min-content" || string && (viewportValuePattern.test(value) || /^(calc|min|max)\(.*\)$/.test(value)));
+	var somewhat = category === "size" || category === "space" ? value === "auto" || number || rem || string && value.endsWith("%") : number;
+	if (setting === "strict") return false;
+	if (setting === "strict-web") return web;
+	if (setting === "somewhat-strict") return somewhat;
+	if (setting === "somewhat-strict-web") return somewhat || web;
+	return number || string && (category === "size" || category === "space" || !hasSetting);
+}
+function matchesVariantResolver(resolverName, value, conf, theme) {
+	var string = typeof value === "string";
+	var number = typeof value === "number";
+	var rem = string && remStringPattern.test(value);
+	switch (resolverName) {
+		case "Size":
+		case "Space":
+		case "Radius":
+		case "ZIndex":
+			var category = resolverName === "ZIndex" ? "zIndex" : resolverName.toLowerCase();
+			return value === true || value != null && value in conf.tokensParsed[category] || (resolverName === "Space" || resolverName === "Radius" || resolverName === "ZIndex") && (0, import_createVariable.isVariable)(value) || (resolverName === "Radius" || resolverName === "ZIndex") && (number || rem) || isAllowedStyleValue(category, value, conf, string, number, rem);
+		case "Color": return value != null && value in conf.tokensParsed.color || string;
+		case "Theme": return string && !!theme && value in theme;
+		case "FontSize":
+			var _conf_fontsParsed_body_size, _conf_fontsParsed_body;
+			return value === true || !!((_conf_fontsParsed_body = conf.fontsParsed.body) === null || _conf_fontsParsed_body === void 0 ? void 0 : (_conf_fontsParsed_body_size = _conf_fontsParsed_body.size) === null || _conf_fontsParsed_body_size === void 0 ? void 0 : _conf_fontsParsed_body_size[value]) || number || rem;
+		case "FontStyle":
+			var _conf_fontsParsed_body_style, _conf_fontsParsed_body1;
+			return !!((_conf_fontsParsed_body1 = conf.fontsParsed.body) === null || _conf_fontsParsed_body1 === void 0 ? void 0 : (_conf_fontsParsed_body_style = _conf_fontsParsed_body1.style) === null || _conf_fontsParsed_body_style === void 0 ? void 0 : _conf_fontsParsed_body_style[value]) || value === "normal" || value === "italic";
+		case "FontTransform":
+			var _conf_fontsParsed_body_transform, _conf_fontsParsed_body2;
+			return !!((_conf_fontsParsed_body2 = conf.fontsParsed.body) === null || _conf_fontsParsed_body2 === void 0 ? void 0 : (_conf_fontsParsed_body_transform = _conf_fontsParsed_body2.transform) === null || _conf_fontsParsed_body_transform === void 0 ? void 0 : _conf_fontsParsed_body_transform[value]) || value === "none" || value === "capitalize" || value === "uppercase" || value === "lowercase";
+		case "FontLineHeight":
+			var _conf_fontsParsed_body_lineHeight, _conf_fontsParsed_body3;
+			return !!((_conf_fontsParsed_body3 = conf.fontsParsed.body) === null || _conf_fontsParsed_body3 === void 0 ? void 0 : (_conf_fontsParsed_body_lineHeight = _conf_fontsParsed_body3.lineHeight) === null || _conf_fontsParsed_body_lineHeight === void 0 ? void 0 : _conf_fontsParsed_body_lineHeight[value]) || number || rem;
+		case "FontLetterSpacing":
+			var _conf_fontsParsed_body_letterSpacing, _conf_fontsParsed_body4;
+			return !!((_conf_fontsParsed_body4 = conf.fontsParsed.body) === null || _conf_fontsParsed_body4 === void 0 ? void 0 : (_conf_fontsParsed_body_letterSpacing = _conf_fontsParsed_body4.letterSpacing) === null || _conf_fontsParsed_body_letterSpacing === void 0 ? void 0 : _conf_fontsParsed_body_letterSpacing[value]) || number || rem;
+		case "number":
+		case "string":
+		case "boolean": return (typeof value === "undefined" ? "undefined" : _type_of(value)) === resolverName;
+		case "any": return true;
+	}
+}
+
 //# sourceMappingURL=propMapper.native.js.map