@tamagui/core 1.0.1-beta.93 → 1.0.1-beta.96

package/dist/esm/helpers/createPropMapper.js

@@ -1,7 +1,8 @@
 import { getConfig } from "../conf";
 import { isWeb } from "../constants/platform";
 import { isVariable } from "../createVariable";
-import { expandStyle, expandStyles } from "./generateAtomicStyles";
+import { expandStyle } from "./expandStyle";
+import { expandStyles } from "./expandStyles";
 import { getVariantExtras } from "./getVariantExtras";
 import { isObj } from "./isObj";
 import { mergeProps } from "./mergeProps";
@@ -22,10 +23,6 @@ const createPropMapper = (staticConfig) => {
     const fontFamily = props.fontFamily || defaultProps.fontFamily || "$body";
     const variantValue = resolveVariants(key, value, props, defaultProps, theme, variants, fontFamily, conf, returnVariablesAs, staticConfig, "", avoidDefaultProps);
     if (variantValue) {
-      if (process.env.NODE_ENV === "development") {
-        if (debug)
-          console.log("propMapped", key, value, "with", propsIn, "to", variantValue);
-      }
       return variantValue;
     }
     let shouldReturn = value !== void 0 && value !== null;
@@ -50,7 +47,7 @@ const resolveVariants = (key, value, props, defaultProps, theme, variants, fontF
   var _a;
   const variant = variants && variants[key];
   if (variant && value !== void 0) {
-    let variantValue = getVariantDefinition(variant, key, value);
+    let variantValue = getVariantDefinition(variant, key, value, conf);
     if (variantValue) {
       if (typeof variantValue === "function") {
         const fn = variantValue;
@@ -109,17 +106,28 @@ const resolveTokensAndVariants = (key, value, props, defaultProps, theme, varian
   }
   return res;
 };
-function getVariantDefinition(variant, key, value) {
+function getVariantDefinition(variant, key, value, conf) {
   if (typeof variant === "function") {
     return variant;
   }
-  for (const cat in tokenCategories) {
-    if (key in tokenCategories[cat]) {
-      const spreadVariant = variant[`...${cat}`];
-      if (spreadVariant) {
-        return spreadVariant;
-      }
-    }
+  if (variant[value]) {
+    return variant[value];
+  }
+  const { tokensParsed } = conf;
+  if (variant["...size"] && value in tokensParsed.size) {
+    return variant["...size"];
+  }
+  if (variant["...color"] && value in tokensParsed.color) {
+    return variant["...color"];
+  }
+  if (variant["...radius"] && value in tokensParsed.radius) {
+    return variant["...radius"];
+  }
+  if (variant["...space"] && value in tokensParsed.space) {
+    return variant["...space"];
+  }
+  if (variant["...zIndex"] && value in tokensParsed.zIndex) {
+    return variant["...zIndex"];
   }
   let fn;
   if (typeof value === "number") {
@@ -129,7 +137,6 @@ function getVariantDefinition(variant, key, value) {
   } else if (value === true || value === false) {
     fn = variant[":boolean"];
   }
-  fn = fn || variant[value];
   return fn || variant["..."] || variant["...size"];
 }
 const fontShorthand = {

package/dist/esm/helpers/createPropMapper.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/createPropMapper.ts"],
-  "sourcesContent": ["import { getConfig } from '../conf'\nimport { isWeb } from '../constants/platform'\nimport { Variable, isVariable } from '../createVariable'\nimport {\n  DebugProp,\n  GenericVariantDefinitions,\n  PropMapper,\n  SplitStyleState,\n  StaticConfig,\n  TamaguiInternalConfig,\n  VariantSpreadFunction,\n} from '../types'\nimport { expandStyle, expandStyles } from './generateAtomicStyles'\nimport { getVariantExtras } from './getVariantExtras'\nimport { isObj } from './isObj'\nimport { mergeProps } from './mergeProps'\n\nexport type ResolveVariableTypes = 'auto' | 'value' | 'variable' | 'both' | 'non-color-value'\n\nexport const getReturnVariablesAs = (props: any, state: Partial<SplitStyleState>) => {\n  return !!props.animation || state.resolveVariablesAs === 'value'\n    ? isWeb\n      ? 'non-color-value'\n      : 'value'\n    : 'auto'\n}\n\nexport const createPropMapper = (staticConfig: Partial<StaticConfig>) => {\n  const variants = staticConfig.variants || {}\n\n  // temp remove classnames\n  const defaultProps = mergeProps(staticConfig.defaultProps || {}, {}, true)[0]\n\n  const mapper: PropMapper = (\n    key,\n    value,\n    theme,\n    propsIn,\n    state,\n    avoidDefaultProps = false,\n    debug\n  ) => {\n    const conf = getConfig()\n    if (!conf) {\n      console.trace('no conf! err')\n      return\n    }\n\n    const props = state.fallbackProps || propsIn\n    const returnVariablesAs = getReturnVariablesAs(props, state)\n\n    // handled here because we need to resolve this off tokens, its the only one-off like this\n    const fontFamily = props.fontFamily || defaultProps.fontFamily || '$body'\n\n    const variantValue = resolveVariants(\n      key,\n      value,\n      props,\n      defaultProps,\n      theme,\n      variants,\n      fontFamily,\n      conf,\n      returnVariablesAs,\n      staticConfig,\n      '',\n      avoidDefaultProps\n    )\n    if (variantValue) {\n      if (process.env.NODE_ENV === 'development') {\n        if (debug) console.log('propMapped', key, value, 'with', propsIn, 'to', variantValue)\n      }\n      return variantValue\n    }\n\n    let shouldReturn = value !== undefined && value !== null\n\n    // handle shorthands\n    if (conf.shorthands[key]) {\n      shouldReturn = true\n      key = conf.shorthands[key]\n    }\n\n    if (value) {\n      if (value[0] === '$') {\n        // prettier-ignore\n        value = getToken(key, value, conf, theme, fontFamily, returnVariablesAs, debug)\n      } else if (isVariable(value)) {\n        value = getVariableValue(key, value, returnVariablesAs)\n      }\n    }\n\n    if (shouldReturn) {\n      return expandStyle(key, value) || [[key, value]]\n    }\n  }\n\n  return mapper\n}\n\ntype StyleResolver = (\n  key: string,\n  value: any,\n  props: Record<string, any>,\n  defaultProps: any,\n  theme: any,\n  variants: GenericVariantDefinitions,\n  fontFamily: string,\n  conf: TamaguiInternalConfig,\n  returnVariablesAs: 'auto' | 'value' | 'non-color-value',\n  staticConfig: Partial<StaticConfig>,\n  parentVariantKey: string,\n  avoidDefaultProps?: boolean,\n  debug?: DebugProp\n) => any\n\nconst resolveVariants: StyleResolver = (\n  key,\n  value,\n  props,\n  defaultProps,\n  theme,\n  variants,\n  fontFamily,\n  conf,\n  returnVariablesAs,\n  staticConfig,\n  parentVariantKey,\n  avoidDefaultProps = false,\n  debug\n) => {\n  const variant = variants && variants[key]\n  if (variant && value !== undefined) {\n    let variantValue = getVariantDefinition(variant, key, value)\n\n    if (variantValue) {\n      if (typeof variantValue === 'function') {\n        const fn = variantValue as VariantSpreadFunction<any>\n        variantValue = fn(value, getVariantExtras(props, theme, defaultProps, avoidDefaultProps))\n      }\n\n      if (isObj(variantValue)) {\n        variantValue = resolveTokensAndVariants(\n          key,\n          variantValue,\n          props,\n          defaultProps,\n          theme,\n          variants,\n          fontFamily,\n          conf,\n          returnVariablesAs,\n          staticConfig,\n          parentVariantKey,\n          avoidDefaultProps,\n          debug\n        )\n      }\n\n      if (variantValue) {\n        return Object.entries(expandStyles(variantValue))\n      }\n    } else {\n      // variant at key exists, but no matching variant value, return nothing\n      if (process.env.NODE_ENV === 'development') {\n        if (staticConfig.validStyles?.[key]) {\n          return null\n        }\n        if (value === false) {\n          // don't warn on missing false values, common to only use true\n          return null\n        }\n        const name = staticConfig.componentName || '[UnnamedComponent]'\n        console.warn(\n          `No variant found: ${name} has variant \"${key}\", but no matching value \"${value}\"`\n        )\n      }\n      return null\n    }\n  }\n}\n\nconst resolveTokensAndVariants: StyleResolver = (\n  key, // we dont use key assume value is object instead\n  value,\n  props,\n  defaultProps,\n  theme,\n  variants,\n  fontFamily,\n  conf,\n  returnVariablesAs,\n  staticConfig,\n  parentVariantKey,\n  avoidDefaultProps,\n  debug\n) => {\n  let res = {}\n  for (const rKey in value) {\n    const fKey = conf.shorthands[rKey] || rKey\n    const val = value[rKey]\n    if (isVariable(val)) {\n      res[fKey] = !isWeb || returnVariablesAs === 'value' ? val.val : val.variable\n    } else if (variants[fKey]) {\n      // avoids infinite loop if variant is matching a style prop\n      // eg: { variants: { flex: { true: { flex: 2 } } } }\n      if (parentVariantKey === key) {\n        res[fKey] = val\n      } else {\n        Object.assign(\n          res,\n          Object.fromEntries(\n            resolveVariants(\n              fKey,\n              val,\n              props,\n              defaultProps,\n              theme,\n              variants,\n              fontFamily,\n              conf,\n              returnVariablesAs,\n              staticConfig,\n              key,\n              avoidDefaultProps,\n              debug\n            )\n          )\n        )\n      }\n    } else if (typeof val === 'string') {\n      const fVal =\n        val[0] === '$'\n          ? getToken(fKey, val, conf, theme, fontFamily, returnVariablesAs, debug)\n          : val\n      res[fKey] = fVal\n    } else {\n      if (isObj(val)) {\n        // sub-objects: media queries, pseudos, shadowOffset\n        res[fKey] = resolveTokensAndVariants(\n          fKey,\n          val,\n          props,\n          defaultProps,\n          theme,\n          variants,\n          fontFamily,\n          conf,\n          returnVariablesAs,\n          staticConfig,\n          key,\n          avoidDefaultProps,\n          debug\n        )\n      } else {\n        // nullish values cant be tokens, need no extra parsing\n        res[fKey] = value[fKey]\n      }\n    }\n    if (process.env.NODE_ENV === 'development') {\n      if (res[fKey]?.[0] === '$') {\n        console.warn(`\u26A0\uFE0F Missing token in theme ${theme.name}:`, fKey, res[fKey])\n      }\n    }\n  }\n  return res\n}\n\n// goes through specificity finding best matching variant function\nfunction getVariantDefinition(variant: any, key: string, value: any) {\n  if (typeof variant === 'function') {\n    return variant\n  }\n  for (const cat in tokenCategories) {\n    if (key in tokenCategories[cat]) {\n      const spreadVariant = variant[`...${cat}`]\n      if (spreadVariant) {\n        return spreadVariant\n      }\n    }\n  }\n  let fn: any\n  if (typeof value === 'number') {\n    fn = variant[':number']\n  } else if (typeof value === 'string') {\n    fn = variant[':string']\n  } else if (value === true || value === false) {\n    fn = variant[':boolean']\n  }\n  fn = fn || variant[value]\n  // fallback to size ultimately - could do token level detection\n  return fn || variant['...'] || variant['...size']\n}\n\nconst fontShorthand = {\n  fontSize: 'size',\n  fontWeight: 'weight',\n}\n\nconst getToken = (\n  key: string,\n  value: string,\n  { tokensParsed, fontsParsed }: TamaguiInternalConfig,\n  theme: any,\n  fontFamily: string | undefined = '$body',\n  resolveAs?: ResolveVariableTypes,\n  debug?: DebugProp\n) => {\n  let valOrVar: any\n  let hasSet = false\n  if (theme[value]) {\n    valOrVar = theme[value]\n    hasSet = true\n  } else {\n    switch (key) {\n      case 'fontFamily':\n        valOrVar = fontsParsed[value]?.family || value\n        hasSet = true\n        break\n      case 'fontSize':\n      case 'lineHeight':\n      case 'letterSpacing':\n      case 'fontWeight':\n        valOrVar = fontsParsed[fontFamily]?.[fontShorthand[key] || key]?.[value] || value\n        hasSet = true\n        break\n    }\n    for (const cat in tokenCategories) {\n      if (key in tokenCategories[cat]) {\n        const res = tokensParsed[cat][value]\n        if (res) {\n          valOrVar = res\n          hasSet = true\n        }\n      }\n    }\n    if (!hasSet) {\n      const spaceVar = tokensParsed.space[value]\n      if (spaceVar) {\n        valOrVar = spaceVar\n        hasSet = true\n      }\n    }\n  }\n  if (hasSet) {\n    return getVariableValue(key, valOrVar, resolveAs)\n  }\n  if (process.env.NODE_ENV === 'development') {\n    if (value && value[0] === '$') {\n      console.warn(\n        `\u26A0\uFE0F You've passed the value \"${value}\" to the style property \"${key}\", but there's no theme or token with the key \"${value}\". Using theme \"${theme.name}\".\n\nSet the debug prop to true to see more detailed debug information.`\n      )\n      if (debug) {\n        if (typeof window !== 'undefined') {\n          console.log('Looked in:')\n          console.log('Theme:', theme)\n          console.log('Tokens:', tokensParsed)\n          console.log('Fonts:', fontsParsed)\n        }\n      }\n      return null\n    }\n  }\n  return value\n}\n\nfunction getVariableValue(\n  key: string,\n  valOrVar: Variable | any,\n  resolveAs: ResolveVariableTypes = 'auto'\n) {\n  if (isVariable(valOrVar)) {\n    if (resolveAs === 'variable') {\n      return valOrVar\n    }\n    if (resolveAs === 'non-color-value') {\n      if (isWeb) {\n        if (key in tokenCategories.color) {\n          return valOrVar.variable\n        }\n      }\n      return valOrVar.val\n    }\n    if (!isWeb || resolveAs === 'value') {\n      return valOrVar.val\n    }\n    return valOrVar.variable\n  }\n  return valOrVar\n}\n\n// just specificy the least costly, all else go to `space` (most keys - we can exclude)\nconst tokenCategories = {\n  radius: {\n    borderRadius: true,\n    borderTopLeftRadius: true,\n    borderTopRightRadius: true,\n    borderBottomLeftRadius: true,\n    borderBottomRightRadius: true,\n  },\n  size: {\n    width: true,\n    height: true,\n    minWidth: true,\n    minHeight: true,\n    maxWidth: true,\n    maxHeight: true,\n  },\n  color: {\n    color: true,\n    backgroundColor: true,\n    borderColor: true,\n    borderBottomColor: true,\n    borderTopColor: true,\n    borderLeftColor: true,\n    borderRightColor: true,\n  },\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import { getConfig } from '../conf'\nimport { isWeb } from '../constants/platform'\nimport { Variable, isVariable } from '../createVariable'\nimport {\n  DebugProp,\n  GenericVariantDefinitions,\n  PropMapper,\n  SplitStyleState,\n  StaticConfigParsed,\n  TamaguiInternalConfig,\n  VariantSpreadFunction,\n} from '../types'\nimport { expandStyle } from './expandStyle'\nimport { expandStyles } from './expandStyles'\nimport { getVariantExtras } from './getVariantExtras'\nimport { isObj } from './isObj'\nimport { mergeProps } from './mergeProps'\n\nexport type ResolveVariableTypes = 'auto' | 'value' | 'variable' | 'both' | 'non-color-value'\n\nexport const getReturnVariablesAs = (props: any, state: Partial<SplitStyleState>) => {\n  return !!props.animation || state.resolveVariablesAs === 'value'\n    ? isWeb\n      ? 'non-color-value'\n      : 'value'\n    : 'auto'\n}\n\nexport const createPropMapper = (staticConfig: StaticConfigParsed) => {\n  const variants = staticConfig.variants || {}\n\n  // temp remove classnames\n  const defaultProps = mergeProps(staticConfig.defaultProps || {}, {}, true)[0]\n\n  const mapper: PropMapper = (\n    key,\n    value,\n    theme,\n    propsIn,\n    state,\n    avoidDefaultProps = false,\n    debug\n  ) => {\n    const conf = getConfig()\n    if (!conf) {\n      console.trace('no conf! err')\n      return\n    }\n\n    const props = state.fallbackProps || propsIn\n    const returnVariablesAs = getReturnVariablesAs(props, state)\n\n    // handled here because we need to resolve this off tokens, its the only one-off like this\n    const fontFamily = props.fontFamily || defaultProps.fontFamily || '$body'\n\n    const variantValue = resolveVariants(\n      key,\n      value,\n      props,\n      defaultProps,\n      theme,\n      variants,\n      fontFamily,\n      conf,\n      returnVariablesAs,\n      staticConfig,\n      '',\n      avoidDefaultProps\n    )\n\n    if (variantValue) {\n      return variantValue\n    }\n\n    let shouldReturn = value !== undefined && value !== null\n\n    // handle shorthands\n    if (conf.shorthands[key]) {\n      shouldReturn = true\n      key = conf.shorthands[key]\n    }\n\n    if (value) {\n      if (value[0] === '$') {\n        // prettier-ignore\n        value = getToken(key, value, conf, theme, fontFamily, returnVariablesAs, debug)\n      } else if (isVariable(value)) {\n        value = getVariableValue(key, value, returnVariablesAs)\n      }\n    }\n\n    if (shouldReturn) {\n      return expandStyle(key, value) || [[key, value]]\n    }\n  }\n\n  return mapper\n}\n\ntype StyleResolver = (\n  key: string,\n  value: any,\n  props: Record<string, any>,\n  defaultProps: any,\n  theme: any,\n  variants: GenericVariantDefinitions,\n  fontFamily: string,\n  conf: TamaguiInternalConfig,\n  returnVariablesAs: 'auto' | 'value' | 'non-color-value',\n  staticConfig: StaticConfigParsed,\n  parentVariantKey: string,\n  avoidDefaultProps?: boolean,\n  debug?: DebugProp\n) => any\n\nconst resolveVariants: StyleResolver = (\n  key,\n  value,\n  props,\n  defaultProps,\n  theme,\n  variants,\n  fontFamily,\n  conf,\n  returnVariablesAs,\n  staticConfig,\n  parentVariantKey,\n  avoidDefaultProps = false,\n  debug\n) => {\n  const variant = variants && variants[key]\n  if (variant && value !== undefined) {\n    let variantValue = getVariantDefinition(variant, key, value, conf)\n\n    if (variantValue) {\n      if (typeof variantValue === 'function') {\n        const fn = variantValue as VariantSpreadFunction<any>\n        variantValue = fn(value, getVariantExtras(props, theme, defaultProps, avoidDefaultProps))\n      }\n\n      if (isObj(variantValue)) {\n        variantValue = resolveTokensAndVariants(\n          key,\n          variantValue,\n          props,\n          defaultProps,\n          theme,\n          variants,\n          fontFamily,\n          conf,\n          returnVariablesAs,\n          staticConfig,\n          parentVariantKey,\n          avoidDefaultProps,\n          debug\n        )\n      }\n\n      if (variantValue) {\n        return Object.entries(expandStyles(variantValue))\n      }\n    } else {\n      // variant at key exists, but no matching variant value, return nothing\n      if (process.env.NODE_ENV === 'development') {\n        if (staticConfig.validStyles?.[key]) {\n          return null\n        }\n        if (value === false) {\n          // don't warn on missing false values, common to only use true\n          return null\n        }\n        const name = staticConfig.componentName || '[UnnamedComponent]'\n        console.warn(\n          `No variant found: ${name} has variant \"${key}\", but no matching value \"${value}\"`\n        )\n      }\n      return null\n    }\n  }\n}\n\nconst resolveTokensAndVariants: StyleResolver = (\n  key, // we dont use key assume value is object instead\n  value,\n  props,\n  defaultProps,\n  theme,\n  variants,\n  fontFamily,\n  conf,\n  returnVariablesAs,\n  staticConfig,\n  parentVariantKey,\n  avoidDefaultProps,\n  debug\n) => {\n  let res = {}\n  for (const rKey in value) {\n    const fKey = conf.shorthands[rKey] || rKey\n    const val = value[rKey]\n    if (isVariable(val)) {\n      res[fKey] = !isWeb || returnVariablesAs === 'value' ? val.val : val.variable\n    } else if (variants[fKey]) {\n      // avoids infinite loop if variant is matching a style prop\n      // eg: { variants: { flex: { true: { flex: 2 } } } }\n      if (parentVariantKey === key) {\n        res[fKey] = val\n      } else {\n        Object.assign(\n          res,\n          Object.fromEntries(\n            resolveVariants(\n              fKey,\n              val,\n              props,\n              defaultProps,\n              theme,\n              variants,\n              fontFamily,\n              conf,\n              returnVariablesAs,\n              staticConfig,\n              key,\n              avoidDefaultProps,\n              debug\n            )\n          )\n        )\n      }\n    } else if (typeof val === 'string') {\n      const fVal =\n        val[0] === '$'\n          ? getToken(fKey, val, conf, theme, fontFamily, returnVariablesAs, debug)\n          : val\n      res[fKey] = fVal\n    } else {\n      if (isObj(val)) {\n        // sub-objects: media queries, pseudos, shadowOffset\n        res[fKey] = resolveTokensAndVariants(\n          fKey,\n          val,\n          props,\n          defaultProps,\n          theme,\n          variants,\n          fontFamily,\n          conf,\n          returnVariablesAs,\n          staticConfig,\n          key,\n          avoidDefaultProps,\n          debug\n        )\n      } else {\n        // nullish values cant be tokens, need no extra parsing\n        res[fKey] = value[fKey]\n      }\n    }\n    if (process.env.NODE_ENV === 'development') {\n      if (res[fKey]?.[0] === '$') {\n        console.warn(`\u26A0\uFE0F Missing token in theme ${theme.name}:`, fKey, res[fKey])\n      }\n    }\n  }\n  return res\n}\n\n// goes through specificity finding best matching variant function\nfunction getVariantDefinition(variant: any, key: string, value: any, conf: TamaguiInternalConfig) {\n  if (typeof variant === 'function') {\n    return variant\n  }\n  if (variant[value]) {\n    return variant[value]\n  }\n  const { tokensParsed } = conf\n  if (variant['...size'] && value in tokensParsed.size) {\n    return variant['...size']\n  }\n  if (variant['...color'] && value in tokensParsed.color) {\n    return variant['...color']\n  }\n  if (variant['...radius'] && value in tokensParsed.radius) {\n    return variant['...radius']\n  }\n  if (variant['...space'] && value in tokensParsed.space) {\n    return variant['...space']\n  }\n  if (variant['...zIndex'] && value in tokensParsed.zIndex) {\n    return variant['...zIndex']\n  }\n  let fn: any\n  if (typeof value === 'number') {\n    fn = variant[':number']\n  } else if (typeof value === 'string') {\n    fn = variant[':string']\n  } else if (value === true || value === false) {\n    fn = variant[':boolean']\n  }\n  // fallback to catch all or size\n  return fn || variant['...'] || variant['...size']\n}\n\nconst fontShorthand = {\n  fontSize: 'size',\n  fontWeight: 'weight',\n}\n\nconst getToken = (\n  key: string,\n  value: string,\n  { tokensParsed, fontsParsed }: TamaguiInternalConfig,\n  theme: any,\n  fontFamily: string | undefined = '$body',\n  resolveAs?: ResolveVariableTypes,\n  debug?: DebugProp\n) => {\n  let valOrVar: any\n  let hasSet = false\n  if (theme[value]) {\n    valOrVar = theme[value]\n    hasSet = true\n  } else {\n    switch (key) {\n      case 'fontFamily':\n        valOrVar = fontsParsed[value]?.family || value\n        hasSet = true\n        break\n      case 'fontSize':\n      case 'lineHeight':\n      case 'letterSpacing':\n      case 'fontWeight':\n        valOrVar = fontsParsed[fontFamily]?.[fontShorthand[key] || key]?.[value] || value\n        hasSet = true\n        break\n    }\n    for (const cat in tokenCategories) {\n      if (key in tokenCategories[cat]) {\n        const res = tokensParsed[cat][value]\n        if (res) {\n          valOrVar = res\n          hasSet = true\n        }\n      }\n    }\n    if (!hasSet) {\n      const spaceVar = tokensParsed.space[value]\n      if (spaceVar) {\n        valOrVar = spaceVar\n        hasSet = true\n      }\n    }\n  }\n  if (hasSet) {\n    return getVariableValue(key, valOrVar, resolveAs)\n  }\n  if (process.env.NODE_ENV === 'development') {\n    if (value && value[0] === '$') {\n      console.warn(\n        `\u26A0\uFE0F You've passed the value \"${value}\" to the style property \"${key}\", but there's no theme or token with the key \"${value}\". Using theme \"${theme.name}\".\n\nSet the debug prop to true to see more detailed debug information.`\n      )\n      if (debug) {\n        if (typeof window !== 'undefined') {\n          console.log('Looked in:')\n          console.log('Theme:', theme)\n          console.log('Tokens:', tokensParsed)\n          console.log('Fonts:', fontsParsed)\n        }\n      }\n      return null\n    }\n  }\n  return value\n}\n\nfunction getVariableValue(\n  key: string,\n  valOrVar: Variable | any,\n  resolveAs: ResolveVariableTypes = 'auto'\n) {\n  if (isVariable(valOrVar)) {\n    if (resolveAs === 'variable') {\n      return valOrVar\n    }\n    if (resolveAs === 'non-color-value') {\n      if (isWeb) {\n        if (key in tokenCategories.color) {\n          return valOrVar.variable\n        }\n      }\n      return valOrVar.val\n    }\n    if (!isWeb || resolveAs === 'value') {\n      return valOrVar.val\n    }\n    return valOrVar.variable\n  }\n  return valOrVar\n}\n\n// just specificy the least costly, all else go to `space` (most keys - we can exclude)\nconst tokenCategories = {\n  radius: {\n    borderRadius: true,\n    borderTopLeftRadius: true,\n    borderTopRightRadius: true,\n    borderBottomLeftRadius: true,\n    borderBottomRightRadius: true,\n  },\n  size: {\n    width: true,\n    height: true,\n    minWidth: true,\n    minHeight: true,\n    maxWidth: true,\n    maxHeight: true,\n  },\n  color: {\n    color: true,\n    backgroundColor: true,\n    borderColor: true,\n    borderBottomColor: true,\n    borderTopColor: true,\n    borderLeftColor: true,\n    borderRightColor: true,\n  },\n}\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/esm/helpers/expandStyle.js

@@ -0,0 +1,99 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+import { isWeb } from "../constants/platform";
+function expandStyle(key, value) {
+  if (key === "transform") {
+    return;
+  }
+  if (process.env.TAMAGUI_TARGET === "web") {
+    if (key === "flex") {
+      if (value <= -1) {
+        return [
+          ["flexGrow", 0],
+          ["flexShrink", 1],
+          ["flexBasis", "auto"]
+        ];
+      }
+      if (value >= 0) {
+        return [
+          ["flexGrow", value],
+          ["flexShrink", 1]
+        ];
+      }
+      return;
+    }
+    switch (key) {
+      case "elevation":
+      case "overlayColor":
+      case "resizeMode":
+      case "tintColor": {
+        break;
+      }
+      case "aspectRatio": {
+        return [[key, value.toString()]];
+      }
+      case "backgroundClip": {
+        if (value === "text") {
+          return [
+            ["backgroundClip", value],
+            ["WebkitBackgroundClip", value]
+          ];
+        }
+        break;
+      }
+      case "textAlignVertical": {
+        return [["verticalAlign", value === "center" ? "middle" : value]];
+      }
+      case "textDecorationLine": {
+        return [["textDecorationLine", value]];
+      }
+      case "writingDirection": {
+        return [["direction", value]];
+      }
+    }
+  }
+  const longKey = STYLE_SHORT_FORM_EXPANSIONS[key];
+  if (longKey) {
+    return longKey.map((key2) => {
+      return [key2, value];
+    });
+  }
+}
+const STYLE_SHORT_FORM_EXPANSIONS = __spreadValues({
+  borderColor: ["borderTopColor", "borderRightColor", "borderBottomColor", "borderLeftColor"],
+  borderRadius: [
+    "borderTopLeftRadius",
+    "borderTopRightRadius",
+    "borderBottomRightRadius",
+    "borderBottomLeftRadius"
+  ],
+  borderStyle: ["borderTopStyle", "borderRightStyle", "borderBottomStyle", "borderLeftStyle"],
+  borderWidth: ["borderTopWidth", "borderRightWidth", "borderBottomWidth", "borderLeftWidth"],
+  margin: ["marginTop", "marginRight", "marginBottom", "marginLeft"],
+  marginHorizontal: ["marginRight", "marginLeft"],
+  marginVertical: ["marginTop", "marginBottom"],
+  overscrollBehavior: ["overscrollBehaviorX", "overscrollBehaviorY"],
+  padding: ["paddingTop", "paddingRight", "paddingBottom", "paddingLeft"],
+  paddingHorizontal: ["paddingRight", "paddingLeft"],
+  paddingVertical: ["paddingTop", "paddingBottom"]
+}, isWeb && {
+  overflow: ["overflowX", "overflowY"]
+});
+export {
+  expandStyle
+};
+//# sourceMappingURL=expandStyle.js.map

package/dist/esm/helpers/expandStyle.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/helpers/expandStyle.ts"],
+  "sourcesContent": ["/**\n * Some parts adapted from react-native-web\n * Copyright (c) Nicolas Gallagher licensed under the MIT license.\n */\n\nimport { isWeb } from '../constants/platform'\n\nexport function expandStyle(key: string, value: any) {\n  if (key === 'transform') {\n    return\n  }\n\n  if (process.env.TAMAGUI_TARGET === 'web') {\n    if (key === 'flex') {\n      // The 'flex' property value in React Native must be a positive integer,\n      // 0, or -1.\n      if (value <= -1) {\n        return [\n          ['flexGrow', 0],\n          ['flexShrink', 1],\n          ['flexBasis', 'auto'],\n        ]\n      }\n      // normalizing to better align with native\n      // see spec for flex shorthand https://developer.mozilla.org/en-US/docs/Web/CSS/flex\n      if (value >= 0) {\n        return [\n          ['flexGrow', value],\n          ['flexShrink', 1],\n        ]\n      }\n      return\n    }\n\n    // web only\n    switch (key) {\n      // Ignore some React Native styles\n      case 'elevation':\n      case 'overlayColor':\n      case 'resizeMode':\n      case 'tintColor': {\n        break\n      }\n\n      case 'aspectRatio': {\n        return [[key, value.toString()]]\n      }\n\n      // TODO: remove once this issue is fixed\n      // https://github.com/rofrischmann/inline-style-prefixer/issues/159\n      case 'backgroundClip': {\n        if (value === 'text') {\n          return [\n            ['backgroundClip', value],\n            ['WebkitBackgroundClip', value],\n          ]\n        }\n        break\n      }\n\n      case 'textAlignVertical': {\n        return [['verticalAlign', value === 'center' ? 'middle' : value]]\n      }\n\n      case 'textDecorationLine': {\n        return [['textDecorationLine', value]]\n      }\n\n      case 'writingDirection': {\n        return [['direction', value]]\n      }\n    }\n  }\n\n  const longKey = STYLE_SHORT_FORM_EXPANSIONS[key]\n  if (longKey) {\n    return longKey.map((key) => {\n      return [key, value]\n    })\n  }\n}\n\nconst STYLE_SHORT_FORM_EXPANSIONS: Record<string, string[]> = {\n  borderColor: ['borderTopColor', 'borderRightColor', 'borderBottomColor', 'borderLeftColor'],\n  borderRadius: [\n    'borderTopLeftRadius',\n    'borderTopRightRadius',\n    'borderBottomRightRadius',\n    'borderBottomLeftRadius',\n  ],\n  borderStyle: ['borderTopStyle', 'borderRightStyle', 'borderBottomStyle', 'borderLeftStyle'],\n  borderWidth: ['borderTopWidth', 'borderRightWidth', 'borderBottomWidth', 'borderLeftWidth'],\n  margin: ['marginTop', 'marginRight', 'marginBottom', 'marginLeft'],\n  marginHorizontal: ['marginRight', 'marginLeft'],\n  marginVertical: ['marginTop', 'marginBottom'],\n  overscrollBehavior: ['overscrollBehaviorX', 'overscrollBehaviorY'],\n  padding: ['paddingTop', 'paddingRight', 'paddingBottom', 'paddingLeft'],\n  paddingHorizontal: ['paddingRight', 'paddingLeft'],\n  paddingVertical: ['paddingTop', 'paddingBottom'],\n  ...(isWeb && {\n    // react-native doesn't support X / Y\n    overflow: ['overflowX', 'overflowY'],\n  }),\n}\n"],
+  "mappings": ";;;;;;;;;;;;;;;;AAKA;AAEO,qBAAqB,KAAa,OAAY;AACnD,MAAI,QAAQ,aAAa;AACvB;AAAA,EACF;AAEA,MAAI,QAAQ,IAAI,mBAAmB,OAAO;AACxC,QAAI,QAAQ,QAAQ;AAGlB,UAAI,SAAS,IAAI;AACf,eAAO;AAAA,UACL,CAAC,YAAY,CAAC;AAAA,UACd,CAAC,cAAc,CAAC;AAAA,UAChB,CAAC,aAAa,MAAM;AAAA,QACtB;AAAA,MACF;AAGA,UAAI,SAAS,GAAG;AACd,eAAO;AAAA,UACL,CAAC,YAAY,KAAK;AAAA,UAClB,CAAC,cAAc,CAAC;AAAA,QAClB;AAAA,MACF;AACA;AAAA,IACF;AAGA,YAAQ;AAAA,WAED;AAAA,WACA;AAAA,WACA;AAAA,WACA,aAAa;AAChB;AAAA,MACF;AAAA,WAEK,eAAe;AAClB,eAAO,CAAC,CAAC,KAAK,MAAM,SAAS,CAAC,CAAC;AAAA,MACjC;AAAA,WAIK,kBAAkB;AACrB,YAAI,UAAU,QAAQ;AACpB,iBAAO;AAAA,YACL,CAAC,kBAAkB,KAAK;AAAA,YACxB,CAAC,wBAAwB,KAAK;AAAA,UAChC;AAAA,QACF;AACA;AAAA,MACF;AAAA,WAEK,qBAAqB;AACxB,eAAO,CAAC,CAAC,iBAAiB,UAAU,WAAW,WAAW,KAAK,CAAC;AAAA,MAClE;AAAA,WAEK,sBAAsB;AACzB,eAAO,CAAC,CAAC,sBAAsB,KAAK,CAAC;AAAA,MACvC;AAAA,WAEK,oBAAoB;AACvB,eAAO,CAAC,CAAC,aAAa,KAAK,CAAC;AAAA,MAC9B;AAAA;AAAA,EAEJ;AAEA,QAAM,UAAU,4BAA4B;AAC5C,MAAI,SAAS;AACX,WAAO,QAAQ,IAAI,CAAC,SAAQ;AAC1B,aAAO,CAAC,MAAK,KAAK;AAAA,IACpB,CAAC;AAAA,EACH;AACF;AAEA,MAAM,8BAAwD;AAAA,EAC5D,aAAa,CAAC,kBAAkB,oBAAoB,qBAAqB,iBAAiB;AAAA,EAC1F,cAAc;AAAA,IACZ;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF;AAAA,EACA,aAAa,CAAC,kBAAkB,oBAAoB,qBAAqB,iBAAiB;AAAA,EAC1F,aAAa,CAAC,kBAAkB,oBAAoB,qBAAqB,iBAAiB;AAAA,EAC1F,QAAQ,CAAC,aAAa,eAAe,gBAAgB,YAAY;AAAA,EACjE,kBAAkB,CAAC,eAAe,YAAY;AAAA,EAC9C,gBAAgB,CAAC,aAAa,cAAc;AAAA,EAC5C,oBAAoB,CAAC,uBAAuB,qBAAqB;AAAA,EACjE,SAAS,CAAC,cAAc,gBAAgB,iBAAiB,aAAa;AAAA,EACtE,mBAAmB,CAAC,gBAAgB,aAAa;AAAA,EACjD,iBAAiB,CAAC,cAAc,eAAe;AAAA,GAC3C,SAAS;AAAA,EAEX,UAAU,CAAC,aAAa,WAAW;AACrC;",
+  "names": []
+}

package/dist/esm/helpers/expandStyles.js

@@ -0,0 +1,103 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+import { getConfig } from "../conf";
+import { isWeb } from "../constants/platform";
+import { expandStyle } from "./expandStyle";
+import { colorToRGBA, normalizeColor } from "./normalizeColor";
+import { normalizeValueWithProperty } from "./normalizeValueWithProperty";
+import { pseudoDescriptors } from "./pseudoDescriptors";
+let shorthands = null;
+const defaultOffset = { height: 0, width: 0 };
+function expandStyles(style) {
+  const res = {};
+  for (let key in style) {
+    shorthands = shorthands || getConfig().shorthands;
+    if (shorthands) {
+      key = shorthands[key] || key;
+    }
+    if (key in pseudoDescriptors) {
+      res[key] = expandStyles(style[key]);
+      continue;
+    }
+    const val = normalizeValueWithProperty(style[key], key);
+    const out = expandStyle(key, val);
+    if (out) {
+      Object.assign(res, Object.fromEntries(out));
+    } else {
+      res[key] = val;
+    }
+  }
+  fixStyles(res);
+  return res;
+}
+function fixStyles(style) {
+  if (style.shadowRadius) {
+    Object.assign(style, normalizeShadow(style));
+  }
+  for (const key in borderDefaults) {
+    if (style[key] && !style[borderDefaults[key]]) {
+      style[borderDefaults[key]] = "solid";
+    }
+  }
+}
+function normalizeShadow({
+  shadowColor,
+  shadowOffset,
+  shadowOpacity,
+  shadowRadius
+}) {
+  const { height, width } = shadowOffset || defaultOffset;
+  const colorStr = String(shadowColor || "black");
+  return __spreadValues(__spreadValues({
+    shadowOffset: {
+      width: normalizeValueWithProperty(width || 0),
+      height: normalizeValueWithProperty(height || 0)
+    },
+    shadowRadius: normalizeValueWithProperty(shadowRadius || 0)
+  }, isWeb && {
+    shadowColor: normalizeColor(colorStr, shadowOpacity)
+  }), !isWeb && (() => {
+    const rgba = colorToRGBA(colorStr);
+    if (!rgba) {
+      if (process.env.NODE_ENV === "development") {
+        console.warn("No rgba form", colorStr);
+      }
+      return {
+        shadowColor,
+        shadowOpacity
+      };
+    }
+    const [r, g, b, a] = rgba;
+    return {
+      shadowColor: `rgb(${r},${g},${b})`,
+      shadowOpacity: shadowOpacity ?? a
+    };
+  })());
+}
+const borderDefaults = {
+  borderWidth: "borderStyle",
+  borderBottomWidth: "borderBottomStyle",
+  borderTopWidth: "borderTopStyle",
+  borderLeftWidth: "borderLeftStyle",
+  borderRightWidth: "borderRightStyle"
+};
+export {
+  defaultOffset,
+  expandStyles,
+  fixStyles
+};
+//# sourceMappingURL=expandStyles.js.map

package/dist/esm/helpers/expandStyles.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/helpers/expandStyles.ts"],
+  "sourcesContent": ["import { getConfig } from '../conf'\nimport { isWeb } from '../constants/platform'\nimport { expandStyle } from './expandStyle'\nimport { colorToRGBA, normalizeColor } from './normalizeColor'\nimport { normalizeValueWithProperty } from './normalizeValueWithProperty'\nimport { pseudoDescriptors } from './pseudoDescriptors'\n\nlet shorthands: Record<string, string> | null = null\nexport const defaultOffset = { height: 0, width: 0 }\n\n/**\n * This is what you want to run before Object.assign() a style onto another.\n * It does the following:\n *   1. Turns user shorthands into longhands, ie px = paddingHorizontal\n *   2. Normalizes various inconsistent styles to be more consistent\n *   3. Expands react-native shorthands, ie paddingHorizontal => paddingLeft, paddingRight\n */\n\nexport function expandStyles(style: Record<string, any>) {\n  const res: Record<string, any> = {}\n\n  for (let key in style) {\n    shorthands = shorthands || getConfig().shorthands\n    if (shorthands) {\n      key = shorthands[key] || key\n    }\n    if (key in pseudoDescriptors) {\n      res[key] = expandStyles(style[key])\n      continue\n    }\n    const val = normalizeValueWithProperty(style[key], key)\n    // expand react-native shorthands\n    const out = expandStyle(key, val)\n    if (out) {\n      Object.assign(res, Object.fromEntries(out))\n    } else {\n      res[key] = val\n    }\n  }\n\n  fixStyles(res)\n\n  return res\n}\n\nexport function fixStyles(style: Record<string, any>) {\n  if (style.shadowRadius) {\n    Object.assign(style, normalizeShadow(style))\n  }\n\n  // ensure border style set by default to solid\n  for (const key in borderDefaults) {\n    if (style[key] && !style[borderDefaults[key]]) {\n      style[borderDefaults[key]] = 'solid'\n    }\n  }\n}\n\nfunction normalizeShadow({\n  shadowColor,\n  shadowOffset,\n  shadowOpacity,\n  shadowRadius,\n}: Record<string, any>) {\n  const { height, width } = shadowOffset || defaultOffset\n  const colorStr = String(shadowColor || 'black')\n  return {\n    shadowOffset: {\n      width: normalizeValueWithProperty(width || 0),\n      height: normalizeValueWithProperty(height || 0),\n    },\n    shadowRadius: normalizeValueWithProperty(shadowRadius || 0),\n    ...(isWeb && {\n      shadowColor: normalizeColor(colorStr, shadowOpacity),\n    }),\n    ...(!isWeb &&\n      (() => {\n        // on native fix bug - shadows behave better if turned into non-alpha rgb() + shadowOpacity\n        const rgba = colorToRGBA(colorStr)\n        if (!rgba) {\n          if (process.env.NODE_ENV === 'development') {\n            console.warn('No rgba form', colorStr)\n          }\n          return {\n            shadowColor,\n            shadowOpacity,\n          }\n        }\n        const [r, g, b, a] = rgba\n        return {\n          shadowColor: `rgb(${r},${g},${b})`,\n          shadowOpacity: shadowOpacity ?? a,\n        }\n      })()),\n  }\n}\n\nconst borderDefaults = {\n  borderWidth: 'borderStyle',\n  borderBottomWidth: 'borderBottomStyle',\n  borderTopWidth: 'borderTopStyle',\n  borderLeftWidth: 'borderLeftStyle',\n  borderRightWidth: 'borderRightStyle',\n}\n"],
+  "mappings": ";;;;;;;;;;;;;;;;AAAA;AACA;AACA;AACA;AACA;AACA;AAEA,IAAI,aAA4C;AACzC,MAAM,gBAAgB,EAAE,QAAQ,GAAG,OAAO,EAAE;AAU5C,sBAAsB,OAA4B;AACvD,QAAM,MAA2B,CAAC;AAElC,WAAS,OAAO,OAAO;AACrB,iBAAa,cAAc,UAAU,EAAE;AACvC,QAAI,YAAY;AACd,YAAM,WAAW,QAAQ;AAAA,IAC3B;AACA,QAAI,OAAO,mBAAmB;AAC5B,UAAI,OAAO,aAAa,MAAM,IAAI;AAClC;AAAA,IACF;AACA,UAAM,MAAM,2BAA2B,MAAM,MAAM,GAAG;AAEtD,UAAM,MAAM,YAAY,KAAK,GAAG;AAChC,QAAI,KAAK;AACP,aAAO,OAAO,KAAK,OAAO,YAAY,GAAG,CAAC;AAAA,IAC5C,OAAO;AACL,UAAI,OAAO;AAAA,IACb;AAAA,EACF;AAEA,YAAU,GAAG;AAEb,SAAO;AACT;AAEO,mBAAmB,OAA4B;AACpD,MAAI,MAAM,cAAc;AACtB,WAAO,OAAO,OAAO,gBAAgB,KAAK,CAAC;AAAA,EAC7C;AAGA,aAAW,OAAO,gBAAgB;AAChC,QAAI,MAAM,QAAQ,CAAC,MAAM,eAAe,OAAO;AAC7C,YAAM,eAAe,QAAQ;AAAA,IAC/B;AAAA,EACF;AACF;AAEA,yBAAyB;AAAA,EACvB;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,GACsB;AACtB,QAAM,EAAE,QAAQ,UAAU,gBAAgB;AAC1C,QAAM,WAAW,OAAO,eAAe,OAAO;AAC9C,SAAO;AAAA,IACL,cAAc;AAAA,MACZ,OAAO,2BAA2B,SAAS,CAAC;AAAA,MAC5C,QAAQ,2BAA2B,UAAU,CAAC;AAAA,IAChD;AAAA,IACA,cAAc,2BAA2B,gBAAgB,CAAC;AAAA,KACtD,SAAS;AAAA,IACX,aAAa,eAAe,UAAU,aAAa;AAAA,EACrD,IACI,CAAC,SACF,OAAM;AAEL,UAAM,OAAO,YAAY,QAAQ;AACjC,QAAI,CAAC,MAAM;AACT,UAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,gBAAQ,KAAK,gBAAgB,QAAQ;AAAA,MACvC;AACA,aAAO;AAAA,QACL;AAAA,QACA;AAAA,MACF;AAAA,IACF;AACA,UAAM,CAAC,GAAG,GAAG,GAAG,KAAK;AACrB,WAAO;AAAA,MACL,aAAa,OAAO,KAAK,KAAK;AAAA,MAC9B,eAAe,iBAAiB;AAAA,IAClC;AAAA,EACF,GAAG;AAET;AAEA,MAAM,iBAAiB;AAAA,EACrB,aAAa;AAAA,EACb,mBAAmB;AAAA,EACnB,gBAAgB;AAAA,EAChB,iBAAiB;AAAA,EACjB,kBAAkB;AACpB;",
+  "names": []
+}

package/dist/esm/helpers/extendStaticConfig.js

@@ -52,11 +52,13 @@ function extendStaticConfig(config, parent) {
   }));
 }
 const parseStaticConfig = (config) => {
-  return __spreadProps(__spreadValues({
+  const parsed = __spreadProps(__spreadValues({
     defaultProps: {}
   }, config), {
-    parsed: true,
-    propMapper: createPropMapper(config)
+    parsed: true
+  });
+  return __spreadProps(__spreadValues({}, parsed), {
+    propMapper: createPropMapper(parsed)
   });
 };
 export {

package/dist/esm/helpers/extendStaticConfig.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/extendStaticConfig.ts"],
-  "sourcesContent": ["import { stylePropsView } from '@tamagui/helpers'\n\nimport { StaticConfig, StaticConfigParsed, StylableComponent } from '../types'\nimport { createPropMapper } from './createPropMapper'\nimport { mergeProps } from './mergeProps'\n\nexport function extendStaticConfig(config: Partial<StaticConfig>, parent?: StylableComponent) {\n  if (!parent || !('staticConfig' in parent)) {\n    return parseStaticConfig(config)\n  }\n\n  const parentStaticConf = parent.staticConfig as StaticConfig\n  const variants = {\n    ...parentStaticConf.variants,\n  }\n\n  // merge variants... can we type this?\n  if (config.variants) {\n    for (const key in config.variants) {\n      if (variants[key]) {\n        variants[key] = {\n          ...variants[key],\n          ...config.variants[key],\n        }\n      } else {\n        variants[key] = config.variants[key]\n      }\n    }\n  }\n\n  // include our own\n  const parentNames = [...(parentStaticConf.parentNames || [])]\n  if (parentStaticConf.componentName) {\n    parentNames.push(parentStaticConf.componentName)\n  }\n\n  return parseStaticConfig({\n    ...parentStaticConf,\n    ...config,\n    variants,\n    parentNames,\n    isZStack: config.isZStack || parentStaticConf.isZStack,\n    isText: config.isText || parentStaticConf.isText || false,\n    isInput: config.isInput || parentStaticConf.isInput || false,\n    neverFlatten: config.neverFlatten || parentStaticConf.neverFlatten,\n    ensureOverriddenProp: config.ensureOverriddenProp ?? parentStaticConf.ensureOverriddenProp,\n    validStyles: config.validStyles\n      ? {\n          ...parentStaticConf.validStyles,\n          ...config.validStyles,\n        }\n      : parentStaticConf.validStyles || stylePropsView,\n    defaultProps: mergeProps(\n      {\n        ...parentStaticConf.defaultProps,\n        ...parentStaticConf.defaultVariants,\n      },\n      {\n        ...config.defaultProps,\n        ...config.defaultVariants,\n      }\n    )[0],\n  })\n}\n\nexport const parseStaticConfig = (config: Partial<StaticConfig>): StaticConfigParsed => {\n  return {\n    defaultProps: {},\n    ...config,\n    parsed: true,\n    propMapper: createPropMapper(config),\n  }\n}\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;AAAA;AAGA;AACA;AAEO,4BAA4B,QAA+B,QAA4B;AAC5F,MAAI,CAAC,UAAU,CAAE,mBAAkB,SAAS;AAC1C,WAAO,kBAAkB,MAAM;AAAA,EACjC;AAEA,QAAM,mBAAmB,OAAO;AAChC,QAAM,WAAW,mBACZ,iBAAiB;AAItB,MAAI,OAAO,UAAU;AACnB,eAAW,OAAO,OAAO,UAAU;AACjC,UAAI,SAAS,MAAM;AACjB,iBAAS,OAAO,kCACX,SAAS,OACT,OAAO,SAAS;AAAA,MAEvB,OAAO;AACL,iBAAS,OAAO,OAAO,SAAS;AAAA,MAClC;AAAA,IACF;AAAA,EACF;AAGA,QAAM,cAAc,CAAC,GAAI,iBAAiB,eAAe,CAAC,CAAE;AAC5D,MAAI,iBAAiB,eAAe;AAClC,gBAAY,KAAK,iBAAiB,aAAa;AAAA,EACjD;AAEA,SAAO,kBAAkB,gDACpB,mBACA,SAFoB;AAAA,IAGvB;AAAA,IACA;AAAA,IACA,UAAU,OAAO,YAAY,iBAAiB;AAAA,IAC9C,QAAQ,OAAO,UAAU,iBAAiB,UAAU;AAAA,IACpD,SAAS,OAAO,WAAW,iBAAiB,WAAW;AAAA,IACvD,cAAc,OAAO,gBAAgB,iBAAiB;AAAA,IACtD,sBAAsB,OAAO,wBAAwB,iBAAiB;AAAA,IACtE,aAAa,OAAO,cAChB,kCACK,iBAAiB,cACjB,OAAO,eAEZ,iBAAiB,eAAe;AAAA,IACpC,cAAc,WACZ,kCACK,iBAAiB,eACjB,iBAAiB,kBAEtB,kCACK,OAAO,eACP,OAAO,gBAEd,EAAE;AAAA,EACJ,EAAC;AACH;AAEO,MAAM,oBAAoB,CAAC,WAAsD;AACtF,SAAO;AAAA,IACL,cAAc,CAAC;AAAA,KACZ,SAFE;AAAA,IAGL,QAAQ;AAAA,IACR,YAAY,iBAAiB,MAAM;AAAA,EACrC;AACF;",
+  "sourcesContent": ["import { stylePropsView } from '@tamagui/helpers'\n\nimport { StaticConfig, StaticConfigParsed, StylableComponent } from '../types'\nimport { createPropMapper } from './createPropMapper'\nimport { mergeProps } from './mergeProps'\n\nexport function extendStaticConfig(config: Partial<StaticConfig>, parent?: StylableComponent) {\n  if (!parent || !('staticConfig' in parent)) {\n    return parseStaticConfig(config)\n  }\n\n  const parentStaticConf = parent.staticConfig as StaticConfig\n  const variants = {\n    ...parentStaticConf.variants,\n  }\n\n  // merge variants... can we type this?\n  if (config.variants) {\n    for (const key in config.variants) {\n      if (variants[key]) {\n        variants[key] = {\n          ...variants[key],\n          ...config.variants[key],\n        }\n      } else {\n        variants[key] = config.variants[key]\n      }\n    }\n  }\n\n  // include our own\n  const parentNames = [...(parentStaticConf.parentNames || [])]\n  if (parentStaticConf.componentName) {\n    parentNames.push(parentStaticConf.componentName)\n  }\n\n  return parseStaticConfig({\n    ...parentStaticConf,\n    ...config,\n    variants,\n    parentNames,\n    isZStack: config.isZStack || parentStaticConf.isZStack,\n    isText: config.isText || parentStaticConf.isText || false,\n    isInput: config.isInput || parentStaticConf.isInput || false,\n    neverFlatten: config.neverFlatten || parentStaticConf.neverFlatten,\n    ensureOverriddenProp: config.ensureOverriddenProp ?? parentStaticConf.ensureOverriddenProp,\n    validStyles: config.validStyles\n      ? {\n          ...parentStaticConf.validStyles,\n          ...config.validStyles,\n        }\n      : parentStaticConf.validStyles || stylePropsView,\n    defaultProps: mergeProps(\n      {\n        ...parentStaticConf.defaultProps,\n        ...parentStaticConf.defaultVariants,\n      },\n      {\n        ...config.defaultProps,\n        ...config.defaultVariants,\n      }\n    )[0],\n  })\n}\n\nexport const parseStaticConfig = (config: Partial<StaticConfig>): StaticConfigParsed => {\n  const parsed = {\n    defaultProps: {},\n    ...config,\n    parsed: true,\n  } as const\n  return {\n    ...parsed,\n    propMapper: createPropMapper(parsed as StaticConfigParsed),\n  }\n}\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;AAAA;AAGA;AACA;AAEO,4BAA4B,QAA+B,QAA4B;AAC5F,MAAI,CAAC,UAAU,CAAE,mBAAkB,SAAS;AAC1C,WAAO,kBAAkB,MAAM;AAAA,EACjC;AAEA,QAAM,mBAAmB,OAAO;AAChC,QAAM,WAAW,mBACZ,iBAAiB;AAItB,MAAI,OAAO,UAAU;AACnB,eAAW,OAAO,OAAO,UAAU;AACjC,UAAI,SAAS,MAAM;AACjB,iBAAS,OAAO,kCACX,SAAS,OACT,OAAO,SAAS;AAAA,MAEvB,OAAO;AACL,iBAAS,OAAO,OAAO,SAAS;AAAA,MAClC;AAAA,IACF;AAAA,EACF;AAGA,QAAM,cAAc,CAAC,GAAI,iBAAiB,eAAe,CAAC,CAAE;AAC5D,MAAI,iBAAiB,eAAe;AAClC,gBAAY,KAAK,iBAAiB,aAAa;AAAA,EACjD;AAEA,SAAO,kBAAkB,gDACpB,mBACA,SAFoB;AAAA,IAGvB;AAAA,IACA;AAAA,IACA,UAAU,OAAO,YAAY,iBAAiB;AAAA,IAC9C,QAAQ,OAAO,UAAU,iBAAiB,UAAU;AAAA,IACpD,SAAS,OAAO,WAAW,iBAAiB,WAAW;AAAA,IACvD,cAAc,OAAO,gBAAgB,iBAAiB;AAAA,IACtD,sBAAsB,OAAO,wBAAwB,iBAAiB;AAAA,IACtE,aAAa,OAAO,cAChB,kCACK,iBAAiB,cACjB,OAAO,eAEZ,iBAAiB,eAAe;AAAA,IACpC,cAAc,WACZ,kCACK,iBAAiB,eACjB,iBAAiB,kBAEtB,kCACK,OAAO,eACP,OAAO,gBAEd,EAAE;AAAA,EACJ,EAAC;AACH;AAEO,MAAM,oBAAoB,CAAC,WAAsD;AACtF,QAAM,SAAS;AAAA,IACb,cAAc,CAAC;AAAA,KACZ,SAFU;AAAA,IAGb,QAAQ;AAAA,EACV;AACA,SAAO,iCACF,SADE;AAAA,IAEL,YAAY,iBAAiB,MAA4B;AAAA,EAC3D;AACF;",
   "names": []
 }

package/dist/esm/helpers/getFont.js

@@ -0,0 +1,38 @@
+import { getVariableValue } from "../createVariable";
+const getFont = (val = "$4", { fonts, theme, props }) => {
+  var _a, _b, _c;
+  const family = getVariableValue(props.fontFamily) || "$body";
+  const font = fonts[family] || fonts["$body"];
+  if (!font) {
+    console.warn("\u26A0\uFE0F no font found", { family, fontTokens: Object.keys(fonts), val });
+    return {};
+  }
+  const fontFamily = font.family;
+  const fontSize = props.fontSize || font.size[val];
+  const lineHeight = props.lineHeight || font.lineHeight[val];
+  const fontWeight = props.fontWeight || font.weight[val];
+  const letterSpacing = props.letterSpacing || font.letterSpacing[val];
+  const fontStyle = props.fontStyle || ((_a = font.style) == null ? void 0 : _a[val]);
+  const textTransform = props.textTransform || ((_b = font.transform) == null ? void 0 : _b[val]);
+  const color = props.color || ((_c = font.color) == null ? void 0 : _c[val]) || theme.color;
+  const style = {
+    color,
+    fontStyle,
+    textTransform,
+    fontFamily,
+    fontWeight,
+    letterSpacing,
+    fontSize,
+    lineHeight
+  };
+  if (process.env.NODE_ENV === "development") {
+    if (props["debug"]) {
+      console.log("getFont", val, style, "from props", props);
+    }
+  }
+  return style;
+};
+export {
+  getFont
+};
+//# sourceMappingURL=getFont.js.map

package/dist/esm/helpers/getFont.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/helpers/getFont.tsx"],
+  "sourcesContent": ["import { getVariableValue } from '../createVariable'\nimport { FontSizeTokens, TextProps, VariantSpreadFunction } from '../types'\n\nexport const getFont: VariantSpreadFunction<TextProps, FontSizeTokens> = (\n  val = '$4',\n  { fonts, theme, props }\n) => {\n  const family = getVariableValue(props.fontFamily) || '$body'\n  const font = fonts[family] || fonts['$body']\n  if (!font) {\n    console.warn('\u26A0\uFE0F no font found', { family, fontTokens: Object.keys(fonts), val })\n    return {} as any\n  }\n  const fontFamily = font.family\n  const fontSize = props.fontSize || font.size[val]\n  const lineHeight = props.lineHeight || font.lineHeight[val]\n  const fontWeight = props.fontWeight || font.weight[val]\n  const letterSpacing = props.letterSpacing || font.letterSpacing[val]\n  const fontStyle = props.fontStyle || font.style?.[val]\n  const textTransform = props.textTransform || font.transform?.[val]\n  const color = props.color || font.color?.[val] || theme.color\n  const style = {\n    color,\n    fontStyle,\n    textTransform,\n    fontFamily,\n    fontWeight,\n    letterSpacing,\n    fontSize,\n    lineHeight,\n  }\n  if (process.env.NODE_ENV === 'development') {\n    if (props['debug']) {\n      console.log('getFont', val, style, 'from props', props)\n    }\n  }\n  return style\n}\n"],
+  "mappings": "AAAA;AAGO,MAAM,UAA4D,CACvE,MAAM,MACN,EAAE,OAAO,OAAO,YACb;AANL;AAOE,QAAM,SAAS,iBAAiB,MAAM,UAAU,KAAK;AACrD,QAAM,OAAO,MAAM,WAAW,MAAM;AACpC,MAAI,CAAC,MAAM;AACT,YAAQ,KAAK,8BAAoB,EAAE,QAAQ,YAAY,OAAO,KAAK,KAAK,GAAG,IAAI,CAAC;AAChF,WAAO,CAAC;AAAA,EACV;AACA,QAAM,aAAa,KAAK;AACxB,QAAM,WAAW,MAAM,YAAY,KAAK,KAAK;AAC7C,QAAM,aAAa,MAAM,cAAc,KAAK,WAAW;AACvD,QAAM,aAAa,MAAM,cAAc,KAAK,OAAO;AACnD,QAAM,gBAAgB,MAAM,iBAAiB,KAAK,cAAc;AAChE,QAAM,YAAY,MAAM,aAAa,YAAK,UAAL,mBAAa;AAClD,QAAM,gBAAgB,MAAM,iBAAiB,YAAK,cAAL,mBAAiB;AAC9D,QAAM,QAAQ,MAAM,SAAS,YAAK,UAAL,mBAAa,SAAQ,MAAM;AACxD,QAAM,QAAQ;AAAA,IACZ;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF;AACA,MAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,QAAI,MAAM,UAAU;AAClB,cAAQ,IAAI,WAAW,KAAK,OAAO,cAAc,KAAK;AAAA,IACxD;AAAA,EACF;AACA,SAAO;AACT;",
+  "names": []
+}

package/dist/esm/helpers/getSplitStyles.js

@@ -20,8 +20,8 @@ import { getConfig } from "../conf";
 import { isClient, isWeb, useIsomorphicLayoutEffect } from "../constants/platform";
 import { mediaQueryConfig, mediaState } from "../hooks/useMedia";
 import { createMediaStyle } from "./createMediaStyle";
-import { fixNativeShadow } from "./fixNativeShadow";
-import { getAtomicStyle, getStylesAtomic } from "./getStylesAtomic";
+import { fixStyles } from "./expandStyles";
+import { getAtomicStyle, getStylesAtomic, styleToCSS } from "./getStylesAtomic";
 import {
   insertStyleRule,
   insertedTransforms,
@@ -29,6 +29,7 @@ import {
   updateInsertedCache
 } from "./insertStyleRule";
 import { mergeTransform } from "./mergeTransform";
+import { normalizeValueWithProperty } from "./normalizeValueWithProperty";
 import { pseudoDescriptors } from "./pseudoDescriptors";
 const skipProps = __spreadValues({
   animation: true,
@@ -118,9 +119,6 @@ const getSplitStyles = (props, staticConfig, theme, state, defaultClassNames, de
   }
   const propKeys = Object.keys(props);
   const shouldDoClasses = (isWeb || process.env.IS_STATIC === "is_static") && !state.noClassNames;
-  if (process.env.NODE_ENV === "development" && debug === "verbose") {
-    console.log("propKeys", propKeys, props);
-  }
   const len = propKeys.length;
   for (let i = len - 1; i >= 0; i--) {
     const keyInit = propKeys[i];
@@ -198,13 +196,13 @@ const getSplitStyles = (props, staticConfig, theme, state, defaultClassNames, de
     }
     let isMedia = keyInit[0] === "$";
     let isPseudo = validPseudoKeys[keyInit];
+    let isMediaOrPseudo = isMedia || isPseudo;
     if (!isMedia && !isPseudo && !((_a = staticConfig.variants) == null ? void 0 : _a[keyInit]) && !validStyleProps[keyInit] && !conf.shorthands[keyInit]) {
       usedKeys.add(keyInit);
       viewProps[keyInit] = valInit;
       continue;
     }
     const expanded = isMedia || isPseudo ? [[keyInit, valInit]] : staticConfig.propMapper(keyInit, valInit, theme, props, state, void 0, debug);
-    let isMediaOrPseudo = isMedia || isPseudo;
     if (process.env.NODE_ENV === "development" && debug === "verbose") {
       console.log("  \xBB getSplitStyles", keyInit, valInit, expanded);
     }
@@ -232,7 +230,7 @@ const getSplitStyles = (props, staticConfig, theme, state, defaultClassNames, de
           continue;
         }
         pseudos[key] = pseudos[key] || {};
-        pseudos[key] = getSubStyle(val, staticConfig, theme, props, state, true);
+        pseudos[key] = getSubStyle(val, staticConfig, theme, props, state, conf, true);
         if (shouldDoClasses) {
           const pseudoStyles = getAtomicStyle(pseudos[key], pseudoDescriptors[key]);
           for (const style2 of pseudoStyles) {
@@ -256,7 +254,7 @@ const getSplitStyles = (props, staticConfig, theme, state, defaultClassNames, de
           }
           continue;
         }
-        const mediaStyle = getSubStyle(val, staticConfig, theme, props, state);
+        const mediaStyle = getSubStyle(val, staticConfig, theme, props, state, conf);
         if (process.env.NODE_ENV === "development" && debug === "verbose") {
           console.log("  \xBB getSplitStyles mediaStyle", { mediaKey, mediaStyle, props, shouldDoClasses });
         }
@@ -293,7 +291,7 @@ const getSplitStyles = (props, staticConfig, theme, state, defaultClassNames, de
         } else if (key in stylePropsTransform) {
           mergeTransform(style, key, val, true);
         } else {
-          style[key] = val;
+          style[key] = normalizeValueWithProperty(val, key);
         }
         continue;
       }
@@ -305,6 +303,10 @@ const getSplitStyles = (props, staticConfig, theme, state, defaultClassNames, de
       }
     }
   }
+  fixStyles(style);
+  if (isWeb) {
+    styleToCSS(style);
+  }
   if (defaultClassNames) {
     classNames = __spreadValues(__spreadValues({}, defaultClassNames), classNames);
   }
@@ -324,7 +326,9 @@ const getSplitStyles = (props, staticConfig, theme, state, defaultClassNames, de
     if (transforms) {
       for (const namespace in transforms) {
         if (!transforms[namespace]) {
-          console.warn("Error no transform");
+          if (process.env.NODE_ENV === "development") {
+            console.warn("Error no transform", transforms, namespace);
+          }
           continue;
         }
         const [hash, val] = transforms[namespace];
@@ -353,6 +357,25 @@ const getSplitStyles = (props, staticConfig, theme, state, defaultClassNames, de
     rulesToInsert
   };
 };
+const getSubStyle = (styleIn, staticConfig, theme, props, state, conf2, avoidDefaultProps) => {
+  const styleOut = {};
+  for (let key in styleIn) {
+    const val = styleIn[key];
+    key = conf2.shorthands[key] || key;
+    const expanded = staticConfig.propMapper(key, val, theme, props, state, avoidDefaultProps);
+    if (!expanded)
+      continue;
+    for (const [skey, sval] of expanded) {
+      if (skey in stylePropsTransform) {
+        mergeTransform(styleOut, skey, sval);
+      } else {
+        styleOut[skey] = normalizeValueWithProperty(sval, key);
+      }
+    }
+  }
+  fixStyles(styleOut);
+  return styleOut;
+};
 const insertSplitStyles = (...args) => {
   const res = getSplitStyles(...args);
   if (res.rulesToInsert) {
@@ -375,34 +398,11 @@ const useSplitStyles = (...args) => {
   }, [res.rulesToInsert]);
   return res;
 };
-const getSubStyle = (styleIn, staticConfig, theme, props, state, avoidDefaultProps) => {
-  const styleOut = {};
-  for (const key in styleIn) {
-    const val = styleIn[key];
-    const expanded = staticConfig.propMapper(key, val, theme, props, state, avoidDefaultProps);
-    if (!expanded)
-      continue;
-    for (const [skey, sval] of expanded) {
-      if (skey in stylePropsTransform) {
-        mergeTransform(styleOut, skey, sval);
-      } else {
-        styleOut[skey] = sval;
-      }
-    }
-  }
-  return styleOut;
-};
-function normalizeStyleObject(style) {
-  if (!isWeb) {
-    fixNativeShadow(style);
-  }
-}
 export {
   PROP_SPLIT,
   getSplitStyles,
   getSubStyle,
   insertSplitStyles,
-  normalizeStyleObject,
   pseudoCNInverse,
   useSplitStyles
 };