@tamagui/web 2.0.0-rc.9 → 2.0.0

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

@@ -5,394 +5,352 @@ 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: !0
-    });
-  },
-  __copyProps = (to, from, except, desc) => {
-    if (from && typeof from == "object" || typeof from == "function") for (let key of __getOwnPropNames(from)) !__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, {
+  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;
-  };
+  }
+  return to;
+};
 var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
-  value: !0
+  value: true
 }), mod);
 var propMapper_exports = {};
 __export(propMapper_exports, {
   getFontFamilyFromNameOrVariable: () => getFontFamilyFromNameOrVariable,
-  getTokenForKey: () => getTokenForKey,
+  getTokenForKey: () => import_getTokenForKey2.getTokenForKey,
   propMapper: () => propMapper
 });
 module.exports = __toCommonJS(propMapper_exports);
-var import_constants = require("@tamagui/constants"),
-  import_helpers = require("@tamagui/helpers"),
-  import_config = require("../config.native.js"),
-  import_createVariable = require("../createVariable.native.js"),
-  import_expandStyle = require("./expandStyle.native.js"),
-  import_getVariantExtras = require("./getVariantExtras.native.js"),
-  import_isObj = require("./isObj.native.js"),
-  import_normalizeStyle = require("./normalizeStyle.native.js"),
-  import_parseNativeStyle = require("./parseNativeStyle.native.js"),
-  import_pseudoDescriptors = require("./pseudoDescriptors.native.js"),
-  import_resolveRem = require("./resolveRem.native.js"),
-  import_skipProps = require("./skipProps.native.js");
+var import_constants = require("@tamagui/constants");
+var import_createVariable = require("../createVariable.native.js");
+var import_expandStyle = require("./expandStyle.native.js");
+var import_getTokenForKey = require("./getTokenForKey.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_skipProps = require("./skipProps.native.js");
+var import_styleOriginalValues = require("./styleOriginalValues.native.js");
+var import_getTokenForKey2 = require("./getTokenForKey.native.js");
 function _type_of(obj) {
   "@swc/helpers - typeof";
 
-  return obj && typeof Symbol < "u" && obj.constructor === Symbol ? "symbol" : typeof obj;
+  return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
 }
 var propMapper = function (key, value, styleState, disabled, map) {
-    if (disabled) return map(key, value);
-    if (lastFontFamilyToken = null, !(!import_constants.isAndroid && key === "elevationAndroid")) {
-      var {
-          conf,
-          styleProps,
-          staticConfig
-        } = styleState,
-        {
-          variants
-        } = staticConfig;
-      if (!styleProps.noExpand && variants && key in variants) {
-        var variantValue = resolveVariants(key, value, styleProps, styleState, "");
-        if (variantValue) {
-          variantValue.forEach(function (param) {
-            var [_$key, _$value] = param;
-            return map(_$key, _$value);
-          });
-          return;
-        }
-      }
-      styleProps.disableExpandShorthands || key in conf.shorthands && (key = conf.shorthands[key]);
-      var originalValue = value;
-      if (value != null) if (typeof value == "string" && value[0] === "$") value = getTokenForKey(key, value, styleProps, styleState);else if ((key === "boxShadow" || key === "textShadow" || key === "filter" || key === "backgroundImage" || key === "border" || key === "outline") && typeof value == "string" && value.includes("$")) {
-        if (key === "backgroundImage" || key === "boxShadow" || key === "textShadow") {
-          var tokenMap = /* @__PURE__ */new Map(),
-            placeholderIdx = 0,
-            withPlaceholders = value.replace(/(\$[\w.-]+)/g, function (t) {
-              var r = getTokenForKey("size", t, styleProps, styleState);
-              if (r == null && (r = getTokenForKey("color", t, styleProps, styleState)), r == null) return t;
-              if (typeof r != "string" && typeof r != "number") {
-                var placeholder = `__tk${placeholderIdx++}__`;
-                return tokenMap.set(placeholder, r), placeholder;
-              }
-              return String(r);
-            }),
-            parsed = (0, import_parseNativeStyle.parseNativeStyle)(key, withPlaceholders, tokenMap);
-          parsed ? value = parsed : value = value.replace(/(\$[\w.-]+)/g, function (t) {
-            var r = getTokenForKey("size", t, styleProps, styleState);
-            return r == null && (r = getTokenForKey("color", t, styleProps, styleState)), r != null ? String(r) : t;
-          });
-        } else value = value.replace(/(\$[\w.-]+)/g, function (t) {
-          var r = getTokenForKey("size", t, styleProps, styleState);
-          return r == null && (r = getTokenForKey("color", t, styleProps, styleState)), r != null ? String(r) : t;
+  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 (!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);
         });
-      } else (0, import_createVariable.isVariable)(value) ? value = resolveVariableValue(key, value, styleProps.resolveValues) : (0, import_resolveRem.isRemValue)(value) && (value = (0, import_resolveRem.resolveRem)(value));
-      if (value != null && typeof value == "string" && (key === "backgroundImage" || key === "boxShadow" || key === "textShadow")) {
-        var parsed1 = (0, import_parseNativeStyle.parseNativeStyle)(key, value);
-        if (parsed1) {
-          if (key === "textShadow" && Array.isArray(parsed1) && Array.isArray(parsed1[0])) {
-            var _iteratorNormalCompletion = !0,
-              _didIteratorError = !1,
-              _iteratorError = void 0;
-            try {
-              for (var _iterator = parsed1[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0) {
-                var [nkey, nvalue] = _step.value;
-                map(nkey, nvalue, originalValue);
-              }
-            } catch (err) {
-              _didIteratorError = !0, _iteratorError = err;
-            } finally {
-              try {
-                !_iteratorNormalCompletion && _iterator.return != null && _iterator.return();
-              } finally {
-                if (_didIteratorError) throw _iteratorError;
-              }
-            }
-            return;
-          }
-          value = parsed1;
-        }
-      }
-      if (value != null) {
-        key === "fontFamily" && lastFontFamilyToken && (styleState.fontFamily = lastFontFamilyToken);
-        var expanded = styleProps.noExpand ? null : (0, import_expandStyle.expandStyle)(key, value);
-        if (expanded) for (var max = expanded.length, i = 0; i < max; i++) {
-          var [nkey1, nvalue1] = expanded[i];
-          map(nkey1, nvalue1, originalValue);
-        } else map(key, value, originalValue);
+        return;
       }
     }
-  },
-  resolveVariants = function (key, value, styleProps, styleState, parentVariantKey) {
-    var {
-        staticConfig,
-        conf,
-        debug
-      } = styleState,
-      {
-        variants
-      } = staticConfig;
-    if (variants) {
-      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()), !variantValue) {
-        if (process.env.TAMAGUI_WARN_ON_MISSING_VARIANT === "1" && typeof value != "boolean") {
-          var name = staticConfig.componentName || "[UnnamedComponent]";
-          console.warn(`No variant found: ${name} has variant "${key}", but no matching value "${value}"`);
+  }
+  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 _iteratorNormalCompletion = true,
+          _didIteratorError = false,
+          _iteratorError = void 0;
+        try {
+          for (var _iterator = parsed[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+            var [nkey, nvalue] = _step.value;
+            map(nkey, nvalue, originalValue);
+          }
+        } catch (err) {
+          _didIteratorError = true;
+          _iteratorError = err;
+        } finally {
+          try {
+            if (!_iteratorNormalCompletion && _iterator.return != null) _iterator.return();
+          } finally {
+            if (_didIteratorError) throw _iteratorError;
+          }
         }
         return;
       }
-      if (typeof variantValue == "function") {
-        var fn = variantValue,
-          extras = (0, import_getVariantExtras.getVariantExtras)(styleState);
-        variantValue = fn(value, extras), process.env.NODE_ENV;
-      }
-      var fontFamilyResult;
-      if ((0, import_isObj.isObj)(variantValue)) {
-        var fontFamilyUpdate = variantValue.fontFamily || variantValue[conf.inverseShorthands.fontFamily];
-        fontFamilyUpdate && (fontFamilyResult = getFontFamilyFromNameOrVariable(fontFamilyUpdate, conf), styleState.fontFamily = fontFamilyResult, process.env.NODE_ENV === "development" && debug === "verbose" && console.info("   updating font family", fontFamilyResult)), variantValue = resolveTokensAndVariants(key, variantValue, styleProps, styleState, parentVariantKey);
+      value = parsed;
+    }
+  }
+  if (value != null) {
+    var fontToken = (0, import_getTokenForKey.getLastFontFamilyToken)();
+    if (key === "fontFamily" && fontToken) styleState.fontFamily = fontToken;
+    var expanded = styleProps.noExpand ? null : (0, import_expandStyle.expandStyle)(key, value, conf.settings.styleCompat || "web");
+    if (expanded) {
+      var max = expanded.length;
+      for (var i = 0; i < max; i++) {
+        var [nkey1, nvalue1, noriginalValue] = expanded[i];
+        map(nkey1, nvalue1, noriginalValue !== null && noriginalValue !== void 0 ? noriginalValue : originalValue);
       }
-      if (variantValue) {
-        var expanded = (0, import_normalizeStyle.normalizeStyle)(variantValue, !!styleProps.noNormalize);
-        process.env.NODE_ENV === "development" && debug === "verbose" && console.info("   expanding styles from ", variantValue, "to", expanded);
-        var next = Object.entries(expanded);
-        return fontFamilyResult && fontFamilyResult[0] === "$" && (lastFontFamilyToken = (0, import_createVariable.getVariableValue)(fontFamilyResult)), next;
+    } 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]];
+    });
+  }
+};
 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), familyVariable === input)) return key;
+      if ((0, import_createVariable.isVariable)(familyVariable)) {
+        variableToFontNameCache.set(familyVariable, key);
+        if (familyVariable === input) return key;
+      }
     }
-  } else if (typeof input == "string" && input[0] === "$") return input;
+  } else if (typeof input === "string") {
+    if (input[0] === "$") return input;
+  }
 }
-var variableToFontNameCache = /* @__PURE__ */new WeakMap(),
-  resolveTokensAndVariants = function (key, value, styleProps, styleState, parentVariantKey) {
-    var {
-        conf,
-        staticConfig,
-        debug,
-        theme
-      } = styleState,
-      {
-        variants
-      } = staticConfig,
-      res = {};
-    process.env.NODE_ENV === "development" && debug === "verbose" && console.info("   - resolveTokensAndVariants", key, value);
-    for (var _key in value) {
-      var subKey = conf.shorthands[_key] || _key,
-        val = value[_key];
-      if (!(!styleProps.noSkip && subKey in import_skipProps.skipProps)) {
-        if (staticConfig) {
-          var _staticConfig_context,
-            _staticConfig_parentStaticConfig_context,
-            _staticConfig_parentStaticConfig,
-            contextProps = ((_staticConfig_context = staticConfig.context) === null || _staticConfig_context === void 0 ? void 0 : _staticConfig_context.props) || ((_staticConfig_parentStaticConfig = staticConfig.parentStaticConfig) === null || _staticConfig_parentStaticConfig === 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] =
-          // SYNC WITH *1
-          val[0] === "$" ? getTokenForKey(subKey, val, styleProps, styleState) : val;else {
-            var variantOut = resolveVariants(subKey, val, styleProps, styleState, key);
-            if (variantOut) {
-              var _iteratorNormalCompletion = !0,
-                _didIteratorError = !1,
-                _iteratorError = void 0;
-              try {
-                for (var _iterator = variantOut[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0) {
-                  var [_$key, val1] = _step.value;
-                  if (val1 != null) if (_$key in import_pseudoDescriptors.pseudoDescriptors) {
-                    var _res, _key1, _;
-                    (_ = (_res = res)[_key1 = _$key]) !== null && _ !== void 0 || (_res[_key1] = {}), Object.assign(res[_$key], val1);
-                  } else res[_$key] = val1;
-                }
-              } catch (err) {
-                _didIteratorError = !0, _iteratorError = err;
-              } finally {
-                try {
-                  !_iteratorNormalCompletion && _iterator.return != null && _iterator.return();
-                } finally {
-                  if (_didIteratorError) throw _iteratorError;
+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] = resolveVariableValue(subKey, val, styleProps.resolveValues), process.env.NODE_ENV === "development" && debug === "verbose" && console.info("variable", subKey, res[subKey]);
-          continue;
-        }
-        if (typeof val == "string") {
-          var fVal = val[0] === "$" ? getTokenForKey(subKey, val, styleProps, styleState) : (0, import_resolveRem.isRemValue)(val) ? (0, import_resolveRem.resolveRem)(val) : val;
-          res[subKey] = fVal;
-          continue;
-        }
-        if ((0, import_isObj.isObj)(val)) {
-          var _res1,
-            _subKey,
-            subObject = resolveTokensAndVariants(subKey, val, styleProps, styleState, key);
-          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);
-        } else res[subKey] = val;
-        if (process.env.NODE_ENV === "development" && debug) {
-          var _res_subKey;
-          ((_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);
         }
       }
+      continue;
     }
-    return res;
-  },
-  tokenCats = ["size", "color", "radius", "space", "zIndex"].map(function (name) {
-    return {
-      name,
-      spreadName: `...${name}`
-    };
-  });
+    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 tokenCats = ["size", "color", "radius", "space", "zIndex"].map(function (name) {
+  return {
+    name,
+    spreadName: `...${name}`
+  };
+});
 function getVariantDefinition(variant, value, conf, param) {
   var {
     theme
   } = param;
-  if (variant) {
-    if (typeof variant == "function") return variant;
-    var exact = variant[value];
-    if (exact) return exact;
-    if (value != null) {
-      var {
-          tokensParsed
-        } = conf,
-        _iteratorNormalCompletion = !0,
-        _didIteratorError = !1,
-        _iteratorError = void 0;
-      try {
-        for (var _iterator = tokenCats[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0) {
-          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] === "$") {
-              var themeKey = value.slice(1);
-              if (themeKey in theme) return variant[spreadName];
-            }
-          }
-        }
-      } catch (err) {
-        _didIteratorError = !0, _iteratorError = err;
-      } finally {
-        try {
-          !_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 > "u" ? "undefined" : _type_of(value)}`] || variant["..."];
-  }
-}
-var fontShorthand = {
-    fontSize: "size",
-    fontWeight: "weight"
-  },
-  lastFontFamilyToken = null,
-  didLogMissingToken = !1,
-  getTokenForKey = function (key, value, styleProps, styleState) {
-    var _staticConfig_accept,
-      resolveAs = styleProps.resolveValues || "none";
-    if (resolveAs === "none") return value;
+  if (!variant) return;
+  if (typeof variant === "function") return variant;
+  var exact = variant[value];
+  if (exact) return exact;
+  if (value != null) {
     var {
-        theme,
-        conf = (0, import_config.getConfig)(),
-        context,
-        fontFamily,
-        staticConfig
-      } = styleState,
-      themeValue = theme ? theme[value] || theme[value.slice(1)] : void 0,
-      tokensParsed = conf.tokensParsed,
-      valOrVar,
-      hasSet = !1,
-      customTokenAccept = staticConfig == null || (_staticConfig_accept = staticConfig.accept) === null || _staticConfig_accept === void 0 ? void 0 : _staticConfig_accept[key];
-    if (customTokenAccept) {
-      var val = themeValue ?? tokensParsed[customTokenAccept][value];
-      val != null && (resolveAs = "value", valOrVar = val, hasSet = !0);
-    }
-    if (themeValue) {
-      if (resolveAs === "except-theme") return value;
-      valOrVar = themeValue, process.env.NODE_ENV === "development" && styleState.debug === "verbose" && (globalThis.tamaguiAvoidTracking = !0, console.info(` - resolving ${key} to theme value ${value} resolveAs ${resolveAs}`, valOrVar), globalThis.tamaguiAvoidTracking = !1), hasSet = !0;
-    } else {
-      if (value in conf.specificTokens) hasSet = !0, valOrVar = conf.specificTokens[value];else {
-        switch (key) {
-          case "fontFamily":
-            {
-              var _fontsParsed_value,
-                fontsParsed = context?.language ? (0, import_getVariantExtras.getFontsForLanguage)(conf.fontsParsed, context.language) : conf.fontsParsed;
-              valOrVar = ((_fontsParsed_value = fontsParsed[value]) === null || _fontsParsed_value === void 0 ? void 0 : _fontsParsed_value.family) || value, lastFontFamilyToken = value, hasSet = !0;
-              break;
-            }
-          case "fontSize":
-          case "lineHeight":
-          case "letterSpacing":
-          case "fontWeight":
-            {
-              var fam = fontFamily || conf.defaultFontToken;
-              if (fam) {
-                var _font_,
-                  fontsParsed1 = context?.language ? (0, import_getVariantExtras.getFontsForLanguage)(conf.fontsParsed, context.language) : conf.fontsParsed,
-                  font = fontsParsed1[fam] || fontsParsed1[conf.defaultFontToken];
-                valOrVar = (font == null || (_font_ = font[fontShorthand[key] || key]) === null || _font_ === void 0 ? void 0 : _font_[value]) || value, hasSet = !0;
-              }
-              break;
-            }
-        }
-        for (var cat in import_helpers.tokenCategories) if (key in import_helpers.tokenCategories[cat]) {
-          var _tokensParsed_cat,
-            res = (_tokensParsed_cat = tokensParsed[cat]) === null || _tokensParsed_cat === void 0 ? void 0 : _tokensParsed_cat[value];
-          res != null ? (valOrVar = res, hasSet = !0) : process.env.NODE_ENV === "development" && process.env.TAMAGUI_DISABLE_MISSING_TOKEN_LOG !== "1" && (didLogMissingToken || (didLogMissingToken = !0, console.groupCollapsed(`[tamagui] Warning: missing token ${key} in category ${cat} - ${value} (open for details)`), console.info(`Note: this could just be due to you not setting all the theme tokens Tamagui expects, which is harmless, but
-                    it also often can be because you have a duplicated Tamagui in your bundle, which can cause tricky bugs.`), console.info(`To see if you have duplicated dependencies, in Chrome DevTools hit CMD+P and type TamaguiProvider.
-                    If you see both a .cjs and a .mjs entry, it's duplicated.`), console.info("You can debug that issue by opening the .mjs and .cjs files and setting a breakpoint at the top of each."), console.info("We only log this warning one time as it's sometimes harmless, to disable this log entirely set process.env.TAMAGUI_DISABLE_MISSING_TOKEN_LOG=1."), console.groupEnd()));
+      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];
+          }
         }
       }
-      if (!hasSet) {
-        var spaceVar = tokensParsed.space[value];
-        spaceVar != null && (valOrVar = spaceVar, hasSet = !0);
+    } catch (err) {
+      _didIteratorError = true;
+      _iteratorError = err;
+    } finally {
+      try {
+        if (!_iteratorNormalCompletion && _iterator.return != null) _iterator.return();
+      } finally {
+        if (_didIteratorError) throw _iteratorError;
       }
     }
-    if (hasSet) {
-      var out = resolveVariableValue(key, valOrVar, resolveAs);
-      return process.env.NODE_ENV === "development" && styleState.debug === "verbose" && (globalThis.tamaguiAvoidTracking = !0, console.info("resolved", resolveAs, valOrVar, out), globalThis.tamaguiAvoidTracking = !1), out;
-    }
-    process.env.NODE_ENV === "development" && styleState.debug === "verbose" && console.warn(`Warning: no token found for ${key}, omitting`);
-  };
-function resolveVariableValue(key, valOrVar, resolveValues) {
-  if (resolveValues === "none") return valOrVar;
-  if ((0, import_createVariable.isVariable)(valOrVar)) {
-    if (resolveValues === "value") return valOrVar.val;
-    var get = valOrVar?.get;
-    if (key !== "shadowColor" && typeof get == "function") {
-      var resolveDynamicFor = resolveValues === "web" ? "web" : void 0;
-      return get(resolveDynamicFor);
-    }
-    return valOrVar.val;
+    var fontSizeVariant = variant["...fontSize"];
+    if (fontSizeVariant && conf.fontSizeTokens.has(value)) return fontSizeVariant;
   }
-  return valOrVar;
+  return variant[`:${typeof value === "undefined" ? "undefined" : _type_of(value)}`] || variant["..."];
 }
 //# sourceMappingURL=propMapper.native.js.map