@tamagui/core 1.0.2 → 1.0.4

package/dist/esm/createTamagui.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/createTamagui.ts"],
-  "sourcesContent": ["import { isRSC, isWeb } from '@tamagui/constants'\n\nimport { configListeners, setConfig } from './config'\nimport { createVariables } from './createVariables'\nimport { getThemeCSSRules } from './helpers/getThemeCSSRules'\nimport {\n  getAllRules,\n  listenForSheetChanges,\n  scanAllSheets,\n} from './helpers/insertStyleRule'\nimport {\n  registerCSSVariable,\n  tokensValueToVariable,\n  variableToCSS,\n} from './helpers/registerCSSVariable'\nimport { ensureThemeVariable, proxyThemeToParents } from './helpers/themes'\nimport { configureMedia } from './hooks/useMedia'\nimport { parseFont, registerFontVariables } from './insertFont'\nimport { Tamagui } from './Tamagui'\nimport {\n  CreateTamaguiProps,\n  InferTamaguiConfig,\n  TamaguiInternalConfig,\n  ThemeParsed,\n} from './types'\n\n// config is re-run by the @tamagui/static, dont double validate\nconst createdConfigs = new WeakMap<any, boolean>()\n\nexport function createTamagui<Conf extends CreateTamaguiProps>(\n  configIn: Conf\n): InferTamaguiConfig<Conf> {\n  if (createdConfigs.has(configIn)) {\n    return configIn as any\n  }\n\n  if (process.env.NODE_ENV === 'development') {\n    if (!configIn.tokens) {\n      throw new Error('Must define tokens')\n    }\n    if (!configIn.themes) {\n      throw new Error('Must define themes')\n    }\n    if (!configIn.fonts) {\n      throw new Error('Must define fonts')\n    }\n  }\n\n  scanAllSheets()\n  listenForSheetChanges()\n\n  const fontTokens = Object.fromEntries(\n    Object.entries(configIn.fonts!).map(([k, v]) => {\n      return [k, createVariables(v, 'f', true)]\n    })\n  )\n\n  const fontsParsed = (() => {\n    const res = {} as typeof fontTokens\n    for (const familyName in fontTokens) {\n      res[`$${familyName}`] = parseFont(fontTokens[familyName])\n    }\n    return res!\n  })()\n\n  const themeConfig = (() => {\n    const themes = { ...configIn.themes }\n    const cssRuleSets: string[] = []\n\n    if (isWeb) {\n      const declarations: string[] = []\n      const fontDeclarations: Record<\n        string,\n        { name: string; declarations: string[]; language?: string }\n      > = {}\n\n      for (const key in configIn.tokens) {\n        for (const skey in configIn.tokens[key]) {\n          const val = configIn.tokens[key][skey]\n          registerCSSVariable(val)\n          declarations.push(variableToCSS(val))\n        }\n      }\n\n      for (const key in fontsParsed) {\n        const fontParsed = fontsParsed[key]\n        const [name, language] = key.includes('_') ? key.split('_') : [key]\n        const fontVars = registerFontVariables(fontParsed)\n        fontDeclarations[key] = {\n          name: name.slice(1),\n          declarations: fontVars,\n          language,\n        }\n      }\n\n      const sep =\n        process.env.NODE_ENV === 'development' ? configIn.cssStyleSeparator || ' ' : ''\n\n      function declarationsToRuleSet(decs: string[], selector = '') {\n        return `:root${selector} {${sep}${[...decs].join(`;${sep}`)}${sep}}`\n      }\n\n      // non-font\n      cssRuleSets.push(declarationsToRuleSet(declarations))\n\n      // fonts\n      if (fontDeclarations) {\n        for (const key in fontDeclarations) {\n          const { name, declarations, language = 'default' } = fontDeclarations[key]\n          const fontSelector = `.font_${name}`\n          const langSelector = `:root .t_lang-${name}-${language} ${fontSelector}`\n          const selectors =\n            language === 'default' ? ` ${fontSelector}, ${langSelector}` : langSelector\n          const specificRuleSet = declarationsToRuleSet(declarations, selectors)\n          cssRuleSets.push(specificRuleSet)\n        }\n      }\n    }\n\n    // dedupe themes to avoid duplicate CSS generation\n    type DedupedTheme = {\n      names: string[]\n      theme: ThemeParsed\n    }\n    const dedupedThemes: {\n      [key: string]: DedupedTheme\n    } = {}\n    const existing = new WeakMap<ThemeParsed, DedupedTheme>()\n\n    // first, de-dupe and parse them\n    for (const themeName in themes) {\n      const rawTheme = themes[themeName] as ThemeParsed\n\n      // if existing, avoid\n      if (existing.has(rawTheme)) {\n        const e = existing.get(rawTheme)!\n        themes[themeName] = e.theme\n        e.names.push(themeName)\n        continue\n      }\n\n      // ensure each theme object unique for dedupe\n      const theme = { ...rawTheme }\n      // parse into variables\n      for (const key in theme) {\n        // make sure properly names theme variables\n        ensureThemeVariable(theme, key)\n      }\n      themes[themeName] = theme\n\n      // set deduped\n      dedupedThemes[themeName] = {\n        names: [themeName],\n        theme,\n      }\n      existing.set(rawTheme, dedupedThemes[themeName])\n    }\n\n    // then, generate CSS from de-duped\n    let themeRuleSets: string[] = []\n\n    if (isWeb || isRSC) {\n      for (const themeName in dedupedThemes) {\n        themeRuleSets = [\n          ...themeRuleSets,\n          ...getThemeCSSRules({\n            config: configIn,\n            themeName,\n            ...dedupedThemes[themeName],\n          }),\n        ]\n      }\n    }\n\n    // proxy upwards to get parent variables (themes are subset going down)\n    for (const themeName in themes) {\n      themes[themeName] = proxyThemeToParents(themeName, themes[themeName], themes)\n    }\n\n    tokensValueToVariable.clear()\n\n    return {\n      themes,\n      cssRuleSets,\n      themeRuleSets,\n    }\n  })()\n\n  // faster $lookups\n  const tokensParsed: any = Object.fromEntries(\n    Object.entries(configIn.tokens).map(([k, v]) => [\n      k,\n      Object.fromEntries(Object.entries(v).map(([k, v]) => [`$${k}`, v])),\n    ])\n  )\n\n  const shorthands = configIn.shorthands || {}\n\n  const config: TamaguiInternalConfig = {\n    fontLanguages: [],\n    animations: {} as any,\n    media: {},\n    ...configIn,\n    // vite made this into a function if it wasn't set\n    shorthands: { ...shorthands },\n    inverseShorthands: shorthands\n      ? Object.fromEntries(Object.entries(shorthands).map(([k, v]) => [v, k]))\n      : {},\n    themes: themeConfig.themes as any,\n    fontsParsed,\n    themeConfig,\n    tokensParsed,\n    parsed: true,\n    getCSS: (separator = '\\n') => {\n      return `.t_unmounted .t_will-mount {opacity:0;visibility:hidden;}\n.is_Text .is_Text {display:inline-flex;}\n._dsp_contents {display:contents;}\n${themeConfig.cssRuleSets.join(separator)}\n${themeConfig.themeRuleSets.join(separator)}\n${getAllRules().join(separator)}`\n    },\n    // const tokens = [...getToken(tokens.size[0])]\n    // .spacer-sm + ._dsp_contents._dsp-sm-hidden { margin-left: -var(--${}) }\n  }\n\n  configureMedia(config)\n  setConfig(config)\n\n  if (configListeners.size) {\n    configListeners.forEach((cb) => cb(config))\n    configListeners.clear()\n  }\n\n  createdConfigs.set(config, true)\n\n  if (process.env.NODE_ENV === 'development') {\n    if (process.env.DEBUG?.startsWith('tamagui')) {\n      // eslint-disable-next-line no-console\n      console.log('Tamagui config:', config)\n    }\n    if (!globalThis['Tamagui']) {\n      globalThis['Tamagui'] = Tamagui\n    }\n  }\n\n  return config as any\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import { isRSC, isWeb } from '@tamagui/constants'\n\nimport { configListeners, setConfig } from './config'\nimport { createVariables, tokensKeysOrdered } from './createVariables'\nimport { startClearStyleCacheInterval } from './helpers/getStylesAtomic'\nimport { getThemeCSSRules } from './helpers/getThemeCSSRules'\nimport {\n  getAllRules,\n  listenForSheetChanges,\n  scanAllSheets,\n} from './helpers/insertStyleRule'\nimport {\n  registerCSSVariable,\n  tokensValueToVariable,\n  variableToCSS,\n} from './helpers/registerCSSVariable'\nimport { ensureThemeVariable, proxyThemeToParents } from './helpers/themes'\nimport { configureMedia } from './hooks/useMedia'\nimport { parseFont, registerFontVariables } from './insertFont'\nimport { Tamagui } from './Tamagui'\nimport {\n  CreateTamaguiProps,\n  InferTamaguiConfig,\n  TamaguiInternalConfig,\n  ThemeParsed,\n} from './types'\n\n// config is re-run by the @tamagui/static, dont double validate\nconst createdConfigs = new WeakMap<any, boolean>()\n\nexport function createTamagui<Conf extends CreateTamaguiProps>(\n  configIn: Conf\n): InferTamaguiConfig<Conf> {\n  if (createdConfigs.has(configIn)) {\n    return configIn as any\n  }\n\n  if (process.env.NODE_ENV === 'development') {\n    if (!configIn.tokens) {\n      throw new Error('Must define tokens')\n    }\n    if (!configIn.themes) {\n      throw new Error('Must define themes')\n    }\n    if (!configIn.fonts) {\n      throw new Error('Must define fonts')\n    }\n  }\n\n  scanAllSheets()\n  listenForSheetChanges()\n  startClearStyleCacheInterval()\n\n  const fontTokens = Object.fromEntries(\n    Object.entries(configIn.fonts!).map(([k, v]) => {\n      return [k, createVariables(v, 'f', true)]\n    })\n  )\n\n  const fontsParsed = (() => {\n    const res = {} as typeof fontTokens\n    for (const familyName in fontTokens) {\n      res[`$${familyName}`] = parseFont(fontTokens[familyName])\n    }\n    return res!\n  })()\n\n  const themeConfig = (() => {\n    const themes = { ...configIn.themes }\n    const cssRuleSets: string[] = []\n\n    if (isWeb) {\n      const declarations: string[] = []\n      const fontDeclarations: Record<\n        string,\n        { name: string; declarations: string[]; language?: string }\n      > = {}\n\n      for (const key in configIn.tokens) {\n        for (const skey in configIn.tokens[key]) {\n          const val = configIn.tokens[key][skey]\n          registerCSSVariable(val)\n          declarations.push(variableToCSS(val))\n        }\n      }\n\n      for (const key in fontsParsed) {\n        const fontParsed = fontsParsed[key]\n        const [name, language] = key.includes('_') ? key.split('_') : [key]\n        const fontVars = registerFontVariables(fontParsed)\n        fontDeclarations[key] = {\n          name: name.slice(1),\n          declarations: fontVars,\n          language,\n        }\n      }\n\n      const sep =\n        process.env.NODE_ENV === 'development' ? configIn.cssStyleSeparator || ' ' : ''\n\n      function declarationsToRuleSet(decs: string[], selector = '') {\n        return `:root${selector} {${sep}${[...decs].join(`;${sep}`)}${sep}}`\n      }\n\n      // non-font\n      cssRuleSets.push(declarationsToRuleSet(declarations))\n\n      // fonts\n      if (fontDeclarations) {\n        for (const key in fontDeclarations) {\n          const { name, declarations, language = 'default' } = fontDeclarations[key]\n          const fontSelector = `.font_${name}`\n          const langSelector = `:root .t_lang-${name}-${language} ${fontSelector}`\n          const selectors =\n            language === 'default' ? ` ${fontSelector}, ${langSelector}` : langSelector\n          const specificRuleSet = declarationsToRuleSet(declarations, selectors)\n          cssRuleSets.push(specificRuleSet)\n        }\n      }\n    }\n\n    // dedupe themes to avoid duplicate CSS generation\n    type DedupedTheme = {\n      names: string[]\n      theme: ThemeParsed\n    }\n    const dedupedThemes: {\n      [key: string]: DedupedTheme\n    } = {}\n    const existing = new WeakMap<ThemeParsed, DedupedTheme>()\n\n    // first, de-dupe and parse them\n    for (const themeName in themes) {\n      const rawTheme = themes[themeName] as ThemeParsed\n\n      // if existing, avoid\n      if (existing.has(rawTheme)) {\n        const e = existing.get(rawTheme)!\n        themes[themeName] = e.theme\n        e.names.push(themeName)\n        continue\n      }\n\n      // ensure each theme object unique for dedupe\n      const theme = { ...rawTheme }\n      // parse into variables\n      for (const key in theme) {\n        // make sure properly names theme variables\n        ensureThemeVariable(theme, key)\n      }\n      themes[themeName] = theme\n\n      // set deduped\n      dedupedThemes[themeName] = {\n        names: [themeName],\n        theme,\n      }\n      existing.set(rawTheme, dedupedThemes[themeName])\n    }\n\n    // then, generate CSS from de-duped\n    let themeRuleSets: string[] = []\n\n    if (isWeb || isRSC) {\n      for (const themeName in dedupedThemes) {\n        themeRuleSets = [\n          ...themeRuleSets,\n          ...getThemeCSSRules({\n            config: configIn,\n            themeName,\n            ...dedupedThemes[themeName],\n          }),\n        ]\n      }\n    }\n\n    // proxy upwards to get parent variables (themes are subset going down)\n    for (const themeName in themes) {\n      themes[themeName] = proxyThemeToParents(themeName, themes[themeName], themes)\n    }\n\n    tokensValueToVariable.clear()\n\n    return {\n      themes,\n      cssRuleSets,\n      themeRuleSets,\n    }\n  })()\n\n  // faster $lookups\n  const tokensParsed: any = Object.fromEntries(\n    Object.entries(configIn.tokens).map(([k, v]) => {\n      const val = Object.fromEntries(Object.entries(v).map(([k, v]) => [`$${k}`, v]))\n      tokensKeysOrdered.set(val, tokensKeysOrdered.get(v))\n      return [k, val]\n    })\n  )\n\n  const shorthands = configIn.shorthands || {}\n\n  const config: TamaguiInternalConfig = {\n    fontLanguages: [],\n    animations: {} as any,\n    media: {},\n    ...configIn,\n    // vite made this into a function if it wasn't set\n    shorthands: { ...shorthands },\n    inverseShorthands: shorthands\n      ? Object.fromEntries(Object.entries(shorthands).map(([k, v]) => [v, k]))\n      : {},\n    themes: themeConfig.themes as any,\n    fontsParsed,\n    themeConfig,\n    tokensParsed,\n    parsed: true,\n    getCSS: (separator = '\\n') => {\n      return `.t_unmounted .t_will-mount {opacity:0;visibility:hidden;}\n.is_Text .is_Text {display:inline-flex;}\n._dsp_contents {display:contents;}\n${themeConfig.cssRuleSets.join(separator)}\n${themeConfig.themeRuleSets.join(separator)}\n${getAllRules().join(separator)}`\n    },\n    // const tokens = [...getToken(tokens.size[0])]\n    // .spacer-sm + ._dsp_contents._dsp-sm-hidden { margin-left: -var(--${}) }\n  }\n\n  configureMedia(config)\n  setConfig(config)\n\n  if (configListeners.size) {\n    configListeners.forEach((cb) => cb(config))\n    configListeners.clear()\n  }\n\n  createdConfigs.set(config, true)\n\n  if (process.env.NODE_ENV === 'development') {\n    if (process.env.DEBUG?.startsWith('tamagui')) {\n      // eslint-disable-next-line no-console\n      console.log('Tamagui config:', config)\n    }\n    if (!globalThis['Tamagui']) {\n      globalThis['Tamagui'] = Tamagui\n    }\n  }\n\n  return config as any\n}\n"],
+  "mappings": "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",
   "names": ["declarationsToRuleSet", "declarations", "k", "v"]
 }

package/dist/esm/createVariable.js

@@ -19,7 +19,6 @@ function variableToString(vrble, getValue = false) {
     if (!getValue && isWeb && vrble.variable) {
       return vrble.variable;
     }
-    setDidGetVariableValue(true);
     return `${vrble.val}`;
   }
   return `${vrble || ""}`;
@@ -28,6 +27,7 @@ function isVariable(v) {
   return v && typeof v === "object" && IS_VAR in v;
 }
 function getVariable(nameOrVariable) {
+  setDidGetVariableValue(true);
   if (isVariable(nameOrVariable)) {
     return variableToString(nameOrVariable);
   }

package/dist/esm/createVariable.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/createVariable.ts"],
-  "sourcesContent": ["import { isWeb } from '@tamagui/constants'\nimport { simpleHash } from '@tamagui/helpers'\n\nimport { getConfig } from './config'\n\n/**\n * Should rename this to Token\n * Moving to objects for React Server Components support\n */\n\nconst IS_VAR = 'isVar'\n\ntype VariableIn<A = any> = {\n  val: A\n  name: string\n  key: string\n}\n\nexport type Variable<A = any> = VariableIn<A> & {\n  [IS_VAR]?: true\n  variable?: string\n}\n\nexport const createVariable = <A extends string | number = any>(props: VariableIn<A>) => {\n  if (isVariable(props)) return props\n  const { key, name, val } = props\n  return {\n    [IS_VAR]: true,\n    key,\n    name: simpleHash(name, 40),\n    val,\n    variable: isWeb ? createCSSVariable(name) : '',\n  }\n}\n\nexport function variableToString(vrble?: any, getValue = false) {\n  if (isVariable(vrble)) {\n    if (!getValue && isWeb && vrble.variable) {\n      return vrble.variable\n    }\n    setDidGetVariableValue(true)\n    return `${vrble.val}`\n  }\n  return `${vrble || ''}`\n}\n\nexport function isVariable(v: Variable | any): v is Variable {\n  return v && typeof v === 'object' && IS_VAR in v\n}\n\nexport function getVariable(nameOrVariable: Variable | string) {\n  if (isVariable(nameOrVariable)) {\n    return variableToString(nameOrVariable)\n  }\n  const tokens = getConfig().tokensParsed\n  return variableToString(tokens[nameOrVariable] ?? nameOrVariable)\n}\n\nlet accessed = false\nexport const setDidGetVariableValue = (val: boolean) => (accessed = val)\nexport const didGetVariableValue = () => accessed\n\nexport function getVariableValue(v: Variable | any) {\n  if (isVariable(v)) {\n    setDidGetVariableValue(true)\n    return v.val\n  }\n  return v\n}\n\nexport function getVariableName(v: Variable | any) {\n  if (isVariable(v)) return v.name\n  return v\n}\n\nexport function getVariableVariable(v: Variable | any) {\n  if (isVariable(v)) return v.variable\n  return v\n}\n\n// bugfix { space: { 0.5: 10 } } was generating var(--space-0.5) (invalid CSS):\nexport const createCSSVariable = (nameProp: string, includeVar = true) => {\n  if (process.env.NODE_ENV === 'development') {\n    if (!nameProp || typeof nameProp !== 'string') {\n      throw new Error(`createCSSVariable expected string: ${nameProp}`)\n    }\n  }\n  const name = simpleHash(nameProp, 60)\n  return includeVar ? `var(--${name})` : name\n}\n"],
-  "mappings": "AAAA,SAAS,aAAa;AACtB,SAAS,kBAAkB;AAE3B,SAAS,iBAAiB;AAO1B,MAAM,SAAS;AAaR,MAAM,iBAAiB,CAAkC,UAAyB;AACvF,MAAI,WAAW,KAAK;AAAG,WAAO;AAC9B,QAAM,EAAE,KAAK,MAAM,IAAI,IAAI;AAC3B,SAAO;AAAA,IACL,CAAC,SAAS;AAAA,IACV;AAAA,IACA,MAAM,WAAW,MAAM,EAAE;AAAA,IACzB;AAAA,IACA,UAAU,QAAQ,kBAAkB,IAAI,IAAI;AAAA,EAC9C;AACF;AAEO,SAAS,iBAAiB,OAAa,WAAW,OAAO;AAC9D,MAAI,WAAW,KAAK,GAAG;AACrB,QAAI,CAAC,YAAY,SAAS,MAAM,UAAU;AACxC,aAAO,MAAM;AAAA,IACf;AACA,2BAAuB,IAAI;AAC3B,WAAO,GAAG,MAAM;AAAA,EAClB;AACA,SAAO,GAAG,SAAS;AACrB;AAEO,SAAS,WAAW,GAAkC;AAC3D,SAAO,KAAK,OAAO,MAAM,YAAY,UAAU;AACjD;AAEO,SAAS,YAAY,gBAAmC;AAC7D,MAAI,WAAW,cAAc,GAAG;AAC9B,WAAO,iBAAiB,cAAc;AAAA,EACxC;AACA,QAAM,SAAS,UAAU,EAAE;AAC3B,SAAO,iBAAiB,OAAO,mBAAmB,cAAc;AAClE;AAEA,IAAI,WAAW;AACR,MAAM,yBAAyB,CAAC,QAAkB,WAAW;AAC7D,MAAM,sBAAsB,MAAM;AAElC,SAAS,iBAAiB,GAAmB;AAClD,MAAI,WAAW,CAAC,GAAG;AACjB,2BAAuB,IAAI;AAC3B,WAAO,EAAE;AAAA,EACX;AACA,SAAO;AACT;AAEO,SAAS,gBAAgB,GAAmB;AACjD,MAAI,WAAW,CAAC;AAAG,WAAO,EAAE;AAC5B,SAAO;AACT;AAEO,SAAS,oBAAoB,GAAmB;AACrD,MAAI,WAAW,CAAC;AAAG,WAAO,EAAE;AAC5B,SAAO;AACT;AAGO,MAAM,oBAAoB,CAAC,UAAkB,aAAa,SAAS;AACxE,MAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,QAAI,CAAC,YAAY,OAAO,aAAa,UAAU;AAC7C,YAAM,IAAI,MAAM,sCAAsC,UAAU;AAAA,IAClE;AAAA,EACF;AACA,QAAM,OAAO,WAAW,UAAU,EAAE;AACpC,SAAO,aAAa,SAAS,UAAU;AACzC;",
+  "sourcesContent": ["import { isWeb } from '@tamagui/constants'\nimport { simpleHash } from '@tamagui/helpers'\n\nimport { getConfig } from './config'\n\n/**\n * Should rename this to Token\n * Moving to objects for React Server Components support\n */\n\nconst IS_VAR = 'isVar'\n\ntype VariableIn<A = any> = {\n  val: A\n  name: string\n  key: string\n}\n\nexport type Variable<A = any> = VariableIn<A> & {\n  [IS_VAR]?: true\n  variable?: string\n}\n\nexport const createVariable = <A extends string | number = any>(props: VariableIn<A>) => {\n  if (isVariable(props)) return props\n  const { key, name, val } = props\n  return {\n    [IS_VAR]: true,\n    key,\n    name: simpleHash(name, 40),\n    val,\n    variable: isWeb ? createCSSVariable(name) : '',\n  }\n}\n\n// could do weakmap cache\nexport function variableToString(vrble?: any, getValue = false) {\n  if (isVariable(vrble)) {\n    if (!getValue && isWeb && vrble.variable) {\n      return vrble.variable\n    }\n    return `${vrble.val}`\n  }\n  return `${vrble || ''}`\n}\n\nexport function isVariable(v: Variable | any): v is Variable {\n  return v && typeof v === 'object' && IS_VAR in v\n}\n\nexport function getVariable(nameOrVariable: Variable | string) {\n  setDidGetVariableValue(true)\n  if (isVariable(nameOrVariable)) {\n    return variableToString(nameOrVariable)\n  }\n  const tokens = getConfig().tokensParsed\n  return variableToString(tokens[nameOrVariable] ?? nameOrVariable)\n}\n\nlet accessed = false\nexport const setDidGetVariableValue = (val: boolean) => (accessed = val)\nexport const didGetVariableValue = () => accessed\n\nexport function getVariableValue(v: Variable | any) {\n  if (isVariable(v)) {\n    setDidGetVariableValue(true)\n    return v.val\n  }\n  return v\n}\n\nexport function getVariableName(v: Variable | any) {\n  if (isVariable(v)) return v.name\n  return v\n}\n\nexport function getVariableVariable(v: Variable | any) {\n  if (isVariable(v)) return v.variable\n  return v\n}\n\n// bugfix { space: { 0.5: 10 } } was generating var(--space-0.5) (invalid CSS):\nexport const createCSSVariable = (nameProp: string, includeVar = true) => {\n  if (process.env.NODE_ENV === 'development') {\n    if (!nameProp || typeof nameProp !== 'string') {\n      throw new Error(`createCSSVariable expected string: ${nameProp}`)\n    }\n  }\n  const name = simpleHash(nameProp, 60)\n  return includeVar ? `var(--${name})` : name\n}\n"],
+  "mappings": "AAAA,SAAS,aAAa;AACtB,SAAS,kBAAkB;AAE3B,SAAS,iBAAiB;AAO1B,MAAM,SAAS;AAaR,MAAM,iBAAiB,CAAkC,UAAyB;AACvF,MAAI,WAAW,KAAK;AAAG,WAAO;AAC9B,QAAM,EAAE,KAAK,MAAM,IAAI,IAAI;AAC3B,SAAO;AAAA,IACL,CAAC,SAAS;AAAA,IACV;AAAA,IACA,MAAM,WAAW,MAAM,EAAE;AAAA,IACzB;AAAA,IACA,UAAU,QAAQ,kBAAkB,IAAI,IAAI;AAAA,EAC9C;AACF;AAGO,SAAS,iBAAiB,OAAa,WAAW,OAAO;AAC9D,MAAI,WAAW,KAAK,GAAG;AACrB,QAAI,CAAC,YAAY,SAAS,MAAM,UAAU;AACxC,aAAO,MAAM;AAAA,IACf;AACA,WAAO,GAAG,MAAM;AAAA,EAClB;AACA,SAAO,GAAG,SAAS;AACrB;AAEO,SAAS,WAAW,GAAkC;AAC3D,SAAO,KAAK,OAAO,MAAM,YAAY,UAAU;AACjD;AAEO,SAAS,YAAY,gBAAmC;AAC7D,yBAAuB,IAAI;AAC3B,MAAI,WAAW,cAAc,GAAG;AAC9B,WAAO,iBAAiB,cAAc;AAAA,EACxC;AACA,QAAM,SAAS,UAAU,EAAE;AAC3B,SAAO,iBAAiB,OAAO,mBAAmB,cAAc;AAClE;AAEA,IAAI,WAAW;AACR,MAAM,yBAAyB,CAAC,QAAkB,WAAW;AAC7D,MAAM,sBAAsB,MAAM;AAElC,SAAS,iBAAiB,GAAmB;AAClD,MAAI,WAAW,CAAC,GAAG;AACjB,2BAAuB,IAAI;AAC3B,WAAO,EAAE;AAAA,EACX;AACA,SAAO;AACT;AAEO,SAAS,gBAAgB,GAAmB;AACjD,MAAI,WAAW,CAAC;AAAG,WAAO,EAAE;AAC5B,SAAO;AACT;AAEO,SAAS,oBAAoB,GAAmB;AACrD,MAAI,WAAW,CAAC;AAAG,WAAO,EAAE;AAC5B,SAAO;AACT;AAGO,MAAM,oBAAoB,CAAC,UAAkB,aAAa,SAAS;AACxE,MAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,QAAI,CAAC,YAAY,OAAO,aAAa,UAAU;AAC7C,YAAM,IAAI,MAAM,sCAAsC,UAAU;AAAA,IAClE;AAAA,EACF;AACA,QAAM,OAAO,WAAW,UAAU,EAAE;AACpC,SAAO,aAAa,SAAS,UAAU;AACzC;",
   "names": []
 }

package/dist/esm/createVariables.js

@@ -1,11 +1,15 @@
 import { simpleHash } from "@tamagui/helpers";
 import { createVariable, isVariable } from "./createVariable";
+const tokensKeysOrdered = /* @__PURE__ */ new WeakMap();
 const createVariables = (tokens, parentPath = "", isFont = false) => {
   const res = {};
   let i = 0;
-  for (const key in tokens) {
+  for (let key in tokens) {
     i++;
     const val = tokens[key];
+    if (key[0] === "$") {
+      key = key.slice(1);
+    }
     if (isVariable(val)) {
       res[key] = val;
       continue;
@@ -19,9 +23,13 @@ const createVariables = (tokens, parentPath = "", isFont = false) => {
     }
     res[key] = isVariable(val) ? val : createVariable({ val, name, key: niceKey });
   }
+  if (parentPath === "size" || parentPath === "space") {
+    tokensKeysOrdered.set(res, Object.keys(tokens));
+  }
   return res;
 };
 export {
-  createVariables
+  createVariables,
+  tokensKeysOrdered
 };
 //# sourceMappingURL=createVariables.js.map

package/dist/esm/createVariables.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/createVariables.ts"],
-  "sourcesContent": ["import { simpleHash } from '@tamagui/helpers'\n\nimport { Variable, createVariable, isVariable } from './createVariable'\n\ntype DeepTokenObject<Val extends string | number = any> = {\n  [key: string]: Val | DeepTokenObject<Val>\n}\n\nexport type DeepVariableObject<A extends DeepTokenObject> = {\n  [Key in keyof A]: A[Key] extends string | number\n    ? Variable<A[Key]>\n    : A[Key] extends DeepTokenObject\n    ? DeepVariableObject<A[Key]>\n    : never\n}\n\nexport const createVariables = <A extends DeepTokenObject>(\n  tokens: A,\n  parentPath = '',\n  isFont = false\n): DeepVariableObject<A> => {\n  const res: any = {}\n  let i = 0\n  for (const key in tokens) {\n    i++\n    const val = tokens[key]\n    if (isVariable(val)) {\n      res[key] = val\n      continue\n    }\n    const niceKey = simpleHash(key)\n    let name = isFont ? niceKey.slice(0, 2) : i\n    name = parentPath ? `${parentPath}-${name}` : niceKey\n    if (val && typeof val === 'object') {\n      // recurse\n      res[key] = createVariables(tokens[key] as any, name)\n      continue\n    }\n    res[key] = isVariable(val) ? val : createVariable({ val, name, key: niceKey })\n  }\n  return res\n}\n"],
-  "mappings": "AAAA,SAAS,kBAAkB;AAE3B,SAAmB,gBAAgB,kBAAkB;AAc9C,MAAM,kBAAkB,CAC7B,QACA,aAAa,IACb,SAAS,UACiB;AAC1B,QAAM,MAAW,CAAC;AAClB,MAAI,IAAI;AACR,aAAW,OAAO,QAAQ;AACxB;AACA,UAAM,MAAM,OAAO;AACnB,QAAI,WAAW,GAAG,GAAG;AACnB,UAAI,OAAO;AACX;AAAA,IACF;AACA,UAAM,UAAU,WAAW,GAAG;AAC9B,QAAI,OAAO,SAAS,QAAQ,MAAM,GAAG,CAAC,IAAI;AAC1C,WAAO,aAAa,GAAG,cAAc,SAAS;AAC9C,QAAI,OAAO,OAAO,QAAQ,UAAU;AAElC,UAAI,OAAO,gBAAgB,OAAO,MAAa,IAAI;AACnD;AAAA,IACF;AACA,QAAI,OAAO,WAAW,GAAG,IAAI,MAAM,eAAe,EAAE,KAAK,MAAM,KAAK,QAAQ,CAAC;AAAA,EAC/E;AACA,SAAO;AACT;",
+  "sourcesContent": ["import { simpleHash } from '@tamagui/helpers'\n\nimport { Variable, createVariable, isVariable } from './createVariable'\n\ntype DeepTokenObject<Val extends string | number = any> = {\n  [key: string]: Val | DeepTokenObject<Val>\n}\n\nexport type DeepVariableObject<A extends DeepTokenObject> = {\n  [Key in keyof A]: A[Key] extends string | number\n    ? Variable<A[Key]>\n    : A[Key] extends DeepTokenObject\n    ? DeepVariableObject<A[Key]>\n    : never\n}\n\nexport const tokensKeysOrdered = new WeakMap()\n\nexport const createVariables = <A extends DeepTokenObject>(\n  tokens: A,\n  parentPath = '',\n  isFont = false\n): DeepVariableObject<A> => {\n  const res: any = {}\n  let i = 0\n  for (let key in tokens) {\n    i++\n    const val = tokens[key]\n    // always remove $ prefix\n    if (key[0] === '$') {\n      // @ts-ignore\n      key = key.slice(1)\n    }\n    if (isVariable(val)) {\n      res[key] = val\n      continue\n    }\n    const niceKey = simpleHash(key)\n    let name = isFont ? niceKey.slice(0, 2) : i\n    name = parentPath ? `${parentPath}-${name}` : niceKey\n    if (val && typeof val === 'object') {\n      // recurse\n      res[key] = createVariables(tokens[key] as any, name)\n      continue\n    }\n    res[key] = isVariable(val) ? val : createVariable({ val, name, key: niceKey })\n  }\n\n  // ordering for relative sizing for now just size/space\n  if (parentPath === 'size' || parentPath === 'space') {\n    tokensKeysOrdered.set(res, Object.keys(tokens))\n  }\n\n  return res\n}\n"],
+  "mappings": "AAAA,SAAS,kBAAkB;AAE3B,SAAmB,gBAAgB,kBAAkB;AAc9C,MAAM,oBAAoB,oBAAI,QAAQ;AAEtC,MAAM,kBAAkB,CAC7B,QACA,aAAa,IACb,SAAS,UACiB;AAC1B,QAAM,MAAW,CAAC;AAClB,MAAI,IAAI;AACR,WAAS,OAAO,QAAQ;AACtB;AACA,UAAM,MAAM,OAAO;AAEnB,QAAI,IAAI,OAAO,KAAK;AAElB,YAAM,IAAI,MAAM,CAAC;AAAA,IACnB;AACA,QAAI,WAAW,GAAG,GAAG;AACnB,UAAI,OAAO;AACX;AAAA,IACF;AACA,UAAM,UAAU,WAAW,GAAG;AAC9B,QAAI,OAAO,SAAS,QAAQ,MAAM,GAAG,CAAC,IAAI;AAC1C,WAAO,aAAa,GAAG,cAAc,SAAS;AAC9C,QAAI,OAAO,OAAO,QAAQ,UAAU;AAElC,UAAI,OAAO,gBAAgB,OAAO,MAAa,IAAI;AACnD;AAAA,IACF;AACA,QAAI,OAAO,WAAW,GAAG,IAAI,MAAM,eAAe,EAAE,KAAK,MAAM,KAAK,QAAQ,CAAC;AAAA,EAC/E;AAGA,MAAI,eAAe,UAAU,eAAe,SAAS;AACnD,sBAAkB,IAAI,KAAK,OAAO,KAAK,MAAM,CAAC;AAAA,EAChD;AAEA,SAAO;AACT;",
   "names": []
 }

package/dist/esm/helpers/ThemeManager.js

@@ -1,4 +1,4 @@
-import { getThemes } from "../config";
+import { getThemes, getTokens } from "../config";
 import { THEME_CLASSNAME_PREFIX, THEME_NAME_SEPARATOR } from "../constants/constants";
 import { getThemeUnwrapped } from "../hooks/getThemeUnwrapped";
 const emptyState = { name: "" };
@@ -16,8 +16,13 @@ class ThemeManager {
       this.updateState(props, false);
       return;
     }
-    if (!parentManager)
+    if (!parentManager) {
+      if (process.env.NODE_ENV !== "production") {
+        console.trace();
+        throw new Error(`No parent manager given`);
+      }
       throw `\u274C`;
+    }
     this.themeListeners = parentManager.themeListeners;
     if (hasNoThemeUpdatingProps(props)) {
       return parentManager;
@@ -79,6 +84,8 @@ class ThemeManager {
     return this.#allKeys;
   }
   getValue(key, state) {
+    if (!key)
+      return;
     let theme = (state || this.state).theme;
     let manager = this;
     while (theme && manager) {
@@ -88,9 +95,12 @@ class ThemeManager {
       manager = manager.parentManager;
       theme = manager == null ? void 0 : manager.state.theme;
     }
+    const tokens = getTokens();
+    if (key in tokens.color) {
+      return tokens.color[key];
+    }
   }
   notify() {
-    console.log("notify", this.themeListeners.size, this.themeListeners);
     this.themeListeners.forEach((cb) => cb(this.state.name, this));
   }
   onChangeTheme(cb) {

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/ThemeManager.tsx"],
-  "sourcesContent": ["import { getThemes } from '../config'\nimport { THEME_CLASSNAME_PREFIX, THEME_NAME_SEPARATOR } from '../constants/constants'\nimport { getThemeUnwrapped } from '../hooks/getThemeUnwrapped'\nimport { ThemeParsed, ThemeProps } from '../types'\n\ntype ThemeListener = (name: string | null, themeManager: ThemeManager) => void\n\nexport type SetActiveThemeProps = {\n  className?: string\n  parentManager?: ThemeManager | null\n  name?: string | null\n  theme?: any\n  reset?: boolean\n}\n\nexport type ThemeManagerState = {\n  name: string\n  theme?: ThemeParsed | null\n  className?: string\n  parentName?: string\n}\n\nconst emptyState: ThemeManagerState = { name: '' }\n\nexport function hasNoThemeUpdatingProps(props: ThemeProps) {\n  return !(props.name || props.componentName || props.inverse || props.reset)\n}\n\nexport class ThemeManager {\n  themeListeners = new Set<ThemeListener>()\n  parentManager: ThemeManager | null = null\n  state: ThemeManagerState = emptyState\n\n  constructor(\n    public props: ThemeProps = {},\n    parentManager?: ThemeManager | 'root' | null | undefined\n  ) {\n    if (parentManager === 'root') {\n      this.updateState(props, false)\n      return\n    }\n    if (!parentManager) throw `\u274C`\n    // copy over listeners\n    this.themeListeners = parentManager.themeListeners\n\n    // no change no props\n    if (hasNoThemeUpdatingProps(props)) {\n      return parentManager\n    }\n    if (parentManager) {\n      this.parentManager = parentManager\n    }\n    const updatedState = this.getStateIfChanged(props)\n    if (updatedState) {\n      this.state = updatedState\n      return\n    }\n    return parentManager || this\n  }\n\n  updateState(\n    props: ThemeProps & { forceTheme?: ThemeParsed } = this.props || {},\n    notify = true\n  ) {\n    const shouldFlush = (() => {\n      if (props.forceTheme) {\n        this.state.theme = props.forceTheme\n        this.state.name = props.name || ''\n        return true\n      }\n      const nextState = this.getStateIfChanged(props)\n      if (nextState) {\n        this.state = nextState\n        return true\n      }\n    })()\n    if (shouldFlush) {\n      // reset any derived state\n      this.#allKeys = null\n      notify && this.notify()\n      return this.state\n    }\n  }\n\n  getStateIfChanged(\n    props = this.props,\n    state: ThemeManagerState | null = this.state,\n    parentManager = this.parentManager\n  ) {\n    const _ = this.getState(props, parentManager)\n    // is removing\n    if (state && state !== emptyState && !_) {\n      return parentManager?.state\n    }\n    if (this.getStateShouldChange(_, state)) {\n      return _\n    }\n  }\n\n  getStateShouldChange(\n    nextState: ThemeManagerState | null,\n    state: ThemeManagerState | null = this.state\n  ) {\n    if (!nextState?.theme || nextState.theme === state?.theme) {\n      return false\n    }\n    return true\n  }\n\n  getState(props = this.props, parentManager = this.parentManager) {\n    return (\n      getState(props, parentManager) ||\n      (process.env.TAMAGUI_TARGET === 'native' ? parentManager?.state || null : null)\n    )\n  }\n\n  #allKeys: Set<string> | null = null\n  get allKeys() {\n    this.#allKeys ??= new Set([\n      ...(this.parentManager?.allKeys || []),\n      ...Object.keys(this.state.theme || {}),\n    ])\n    return this.#allKeys\n  }\n\n  // gets value going up to parents\n  getValue(key: string, state?: ThemeManagerState) {\n    let theme = (state || this.state).theme\n    let manager = this as ThemeManager | null\n    while (theme && manager) {\n      if (key in theme) {\n        return theme[key]\n      }\n      manager = manager.parentManager\n      theme = manager?.state.theme\n    }\n  }\n\n  notify() {\n    console.log('notify', this.themeListeners.size, this.themeListeners)\n    this.themeListeners.forEach((cb) => cb(this.state.name, this))\n  }\n\n  onChangeTheme(cb: ThemeListener) {\n    this.themeListeners.add(cb)\n    return () => {\n      this.themeListeners.delete(cb)\n    }\n  }\n}\n\nfunction getNextThemeClassName(name: string, isInverting = false) {\n  const next = `${THEME_CLASSNAME_PREFIX}${name}`\n  if (isInverting) {\n    return next\n  }\n  return next.replace('light_', '').replace('dark_', '')\n}\n\nconst cache = new WeakMap<ThemeProps, [ThemeManager, ThemeManagerState | null]>()\n\nfunction getState(\n  props: ThemeProps,\n  parentManager?: ThemeManager | null\n): ThemeManagerState | null {\n  const cached = cache.get(props)\n  if (cached && cached[0] === parentManager) {\n    return cached[1]\n  }\n\n  const themes = getThemes()\n\n  if (props.name && props.reset) {\n    throw new Error('Cannot reset + set new name')\n  }\n  if (props.reset && !parentManager?.parentManager) {\n    throw new Error('Cannot reset no grandparent exists')\n  }\n\n  let result: ThemeManagerState | null = null\n\n  const nextName = props.reset\n    ? parentManager?.parentManager?.state?.name || ''\n    : props.name || ''\n  const { componentName } = props\n  const parentName = parentManager?.state?.name || ''\n\n  // components look for most specific, fallback upwards\n  const base = parentName.split(THEME_NAME_SEPARATOR)\n  const lastSegment = base[base.length - 1]\n  const isParentAComponentTheme =\n    parentName && lastSegment[0].toUpperCase() === lastSegment[0]\n  if (isParentAComponentTheme) {\n    base.pop() // always remove componentName they can't nest\n  }\n  const parentBaseTheme = isParentAComponentTheme\n    ? base.slice(0, base.length).join(THEME_NAME_SEPARATOR)\n    : parentName\n  const max = base.length\n  const min =\n    componentName && !nextName\n      ? max // component name only don't search upwards\n      : 0\n\n  // prettier-ignore\n  // eslint-disable-next-line no-console\n  if (process.env.NODE_ENV === 'development' && props.debug === 'verbose') [ console.groupCollapsed('ThemeManager.getState()', props, { parentName,   parentBaseTheme,   base,   min,   max,   isParentAComponentTheme }), console.trace(), console.groupEnd() ]\n\n  for (let i = max; i >= min; i--) {\n    let prefix = base.slice(0, i).join(THEME_NAME_SEPARATOR)\n    if (props.inverse) {\n      prefix = inverseThemeName(prefix)\n    }\n    const potentials: string[] = []\n    if (prefix && prefix !== parentBaseTheme) {\n      potentials.push(prefix)\n    }\n    if (nextName) {\n      potentials.unshift(prefix ? `${prefix}_${nextName}` : nextName)\n    }\n    if (i === 1) {\n      const lastSegment = potentials.findIndex((x) => !x.includes('_'))\n      if (lastSegment > 0) {\n        potentials.splice(lastSegment, 0, nextName) // last try prefer our new name to parent\n      }\n    }\n    if (componentName) {\n      // components only look for component themes\n      if (nextName) {\n        potentials.push(\n          `${prefix.slice(\n            0,\n            prefix.indexOf(THEME_NAME_SEPARATOR)\n          )}_${nextName}_${componentName}`\n        )\n      }\n      potentials.push(`${prefix}_${componentName}`)\n      if (nextName) {\n        potentials.unshift(`${prefix}_${nextName}_${componentName}`)\n      }\n    }\n\n    const found = potentials.find((t) => t in themes)\n\n    // eslint-disable-next-line no-console\n    if (process.env.NODE_ENV === 'development' && props.debug === 'verbose')\n      console.log('getState found', found, 'from', potentials, 'parentName', parentName)\n\n    if (found) {\n      // optimization return null if not changed\n      if (found === parentName) {\n        break\n      }\n      result = {\n        name: found,\n        theme: getThemeUnwrapped(themes[found]),\n        className: getNextThemeClassName(found, props.inverse),\n        parentName,\n      }\n      break\n    }\n  }\n\n  if (parentManager) {\n    cache.set(props, [parentManager, result])\n  }\n\n  return result\n}\n\nconst inverseThemeName = (themeName: string) => {\n  return themeName.startsWith('light')\n    ? themeName.replace(/^light/, 'dark')\n    : themeName.replace(/^dark/, 'light')\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import { getThemes, getTokens } from '../config'\nimport { THEME_CLASSNAME_PREFIX, THEME_NAME_SEPARATOR } from '../constants/constants'\nimport { getThemeUnwrapped } from '../hooks/getThemeUnwrapped'\nimport { ThemeParsed, ThemeProps } from '../types'\n\ntype ThemeListener = (name: string | null, themeManager: ThemeManager) => void\n\nexport type SetActiveThemeProps = {\n  className?: string\n  parentManager?: ThemeManager | null\n  name?: string | null\n  theme?: any\n  reset?: boolean\n}\n\nexport type ThemeManagerState = {\n  name: string\n  theme?: ThemeParsed | null\n  className?: string\n  parentName?: string\n}\n\nconst emptyState: ThemeManagerState = { name: '' }\n\nexport function hasNoThemeUpdatingProps(props: ThemeProps) {\n  return !(props.name || props.componentName || props.inverse || props.reset)\n}\n\nexport class ThemeManager {\n  themeListeners = new Set<ThemeListener>()\n  parentManager: ThemeManager | null = null\n  state: ThemeManagerState = emptyState\n\n  constructor(\n    public props: ThemeProps = {},\n    parentManager?: ThemeManager | 'root' | null | undefined\n  ) {\n    if (parentManager === 'root') {\n      this.updateState(props, false)\n      return\n    }\n    if (!parentManager) {\n      if (process.env.NODE_ENV !== 'production') {\n        console.trace()\n        throw new Error(`No parent manager given`)\n      }\n      throw `\u274C`\n    }\n    // copy over listeners\n    this.themeListeners = parentManager.themeListeners\n\n    // no change no props\n    if (hasNoThemeUpdatingProps(props)) {\n      return parentManager\n    }\n    if (parentManager) {\n      this.parentManager = parentManager\n    }\n    const updatedState = this.getStateIfChanged(props)\n    if (updatedState) {\n      this.state = updatedState\n      return\n    }\n    return parentManager || this\n  }\n\n  updateState(\n    props: ThemeProps & { forceTheme?: ThemeParsed } = this.props || {},\n    notify = true\n  ) {\n    const shouldFlush = (() => {\n      if (props.forceTheme) {\n        this.state.theme = props.forceTheme\n        this.state.name = props.name || ''\n        return true\n      }\n      const nextState = this.getStateIfChanged(props)\n      if (nextState) {\n        this.state = nextState\n        return true\n      }\n    })()\n    if (shouldFlush) {\n      // reset any derived state\n      this.#allKeys = null\n      notify && this.notify()\n      return this.state\n    }\n  }\n\n  getStateIfChanged(\n    props = this.props,\n    state: ThemeManagerState | null = this.state,\n    parentManager = this.parentManager\n  ) {\n    const _ = this.getState(props, parentManager)\n    // is removing\n    if (state && state !== emptyState && !_) {\n      return parentManager?.state\n    }\n    if (this.getStateShouldChange(_, state)) {\n      return _\n    }\n  }\n\n  getStateShouldChange(\n    nextState: ThemeManagerState | null,\n    state: ThemeManagerState | null = this.state\n  ) {\n    if (!nextState?.theme || nextState.theme === state?.theme) {\n      return false\n    }\n    return true\n  }\n\n  getState(props = this.props, parentManager = this.parentManager) {\n    return (\n      getState(props, parentManager) ||\n      (process.env.TAMAGUI_TARGET === 'native' ? parentManager?.state || null : null)\n    )\n  }\n\n  #allKeys: Set<string> | null = null\n  get allKeys() {\n    this.#allKeys ??= new Set([\n      ...(this.parentManager?.allKeys || []),\n      ...Object.keys(this.state.theme || {}),\n    ])\n    return this.#allKeys\n  }\n\n  // gets value going up to parents\n  getValue(key: string, state?: ThemeManagerState) {\n    if (!key) return\n    let theme = (state || this.state).theme\n    let manager = this as ThemeManager | null\n    while (theme && manager) {\n      if (key in theme) {\n        return theme[key]\n      }\n      manager = manager.parentManager\n      theme = manager?.state.theme\n    }\n    const tokens = getTokens()\n    if (key in tokens.color) {\n      return tokens.color[key]\n    }\n  }\n\n  notify() {\n    this.themeListeners.forEach((cb) => cb(this.state.name, this))\n  }\n\n  onChangeTheme(cb: ThemeListener) {\n    this.themeListeners.add(cb)\n    return () => {\n      this.themeListeners.delete(cb)\n    }\n  }\n}\n\nfunction getNextThemeClassName(name: string, isInverting = false) {\n  const next = `${THEME_CLASSNAME_PREFIX}${name}`\n  if (isInverting) {\n    return next\n  }\n  return next.replace('light_', '').replace('dark_', '')\n}\n\nconst cache = new WeakMap<ThemeProps, [ThemeManager, ThemeManagerState | null]>()\n\nfunction getState(\n  props: ThemeProps,\n  parentManager?: ThemeManager | null\n): ThemeManagerState | null {\n  const cached = cache.get(props)\n  if (cached && cached[0] === parentManager) {\n    return cached[1]\n  }\n\n  const themes = getThemes()\n\n  if (props.name && props.reset) {\n    throw new Error('Cannot reset + set new name')\n  }\n  if (props.reset && !parentManager?.parentManager) {\n    throw new Error('Cannot reset no grandparent exists')\n  }\n\n  let result: ThemeManagerState | null = null\n\n  const nextName = props.reset\n    ? parentManager?.parentManager?.state?.name || ''\n    : props.name || ''\n  const { componentName } = props\n  const parentName = parentManager?.state?.name || ''\n\n  // components look for most specific, fallback upwards\n  const base = parentName.split(THEME_NAME_SEPARATOR)\n  const lastSegment = base[base.length - 1]\n  const isParentAComponentTheme =\n    parentName && lastSegment[0].toUpperCase() === lastSegment[0]\n  if (isParentAComponentTheme) {\n    base.pop() // always remove componentName they can't nest\n  }\n  const parentBaseTheme = isParentAComponentTheme\n    ? base.slice(0, base.length).join(THEME_NAME_SEPARATOR)\n    : parentName\n  const max = base.length\n  const min =\n    componentName && !nextName\n      ? max // component name only don't search upwards\n      : 0\n\n  // prettier-ignore\n  // eslint-disable-next-line no-console\n  if (process.env.NODE_ENV === 'development' && props.debug === 'verbose') [ console.groupCollapsed('ThemeManager.getState()', props, { parentName,   parentBaseTheme,   base,   min,   max,   isParentAComponentTheme }), console.trace(), console.groupEnd() ]\n\n  for (let i = max; i >= min; i--) {\n    let prefix = base.slice(0, i).join(THEME_NAME_SEPARATOR)\n    if (props.inverse) {\n      prefix = inverseThemeName(prefix)\n    }\n    const potentials: string[] = []\n    if (prefix && prefix !== parentBaseTheme) {\n      potentials.push(prefix)\n    }\n    if (nextName) {\n      potentials.unshift(prefix ? `${prefix}_${nextName}` : nextName)\n    }\n    if (i === 1) {\n      const lastSegment = potentials.findIndex((x) => !x.includes('_'))\n      if (lastSegment > 0) {\n        potentials.splice(lastSegment, 0, nextName) // last try prefer our new name to parent\n      }\n    }\n    if (componentName) {\n      // components only look for component themes\n      if (nextName) {\n        potentials.push(\n          `${prefix.slice(\n            0,\n            prefix.indexOf(THEME_NAME_SEPARATOR)\n          )}_${nextName}_${componentName}`\n        )\n      }\n      potentials.push(`${prefix}_${componentName}`)\n      if (nextName) {\n        potentials.unshift(`${prefix}_${nextName}_${componentName}`)\n      }\n    }\n\n    const found = potentials.find((t) => t in themes)\n\n    // eslint-disable-next-line no-console\n    if (process.env.NODE_ENV === 'development' && props.debug === 'verbose')\n      console.log('getState found', found, 'from', potentials, 'parentName', parentName)\n\n    if (found) {\n      // optimization return null if not changed\n      if (found === parentName) {\n        break\n      }\n      result = {\n        name: found,\n        theme: getThemeUnwrapped(themes[found]),\n        className: getNextThemeClassName(found, props.inverse),\n        parentName,\n      }\n      break\n    }\n  }\n\n  if (parentManager) {\n    cache.set(props, [parentManager, result])\n  }\n\n  return result\n}\n\nconst inverseThemeName = (themeName: string) => {\n  return themeName.startsWith('light')\n    ? themeName.replace(/^light/, 'dark')\n    : themeName.replace(/^dark/, 'light')\n}\n"],
+  "mappings": "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",
   "names": ["lastSegment"]
 }

package/dist/esm/helpers/getSize.js

@@ -2,15 +2,19 @@ import { getTokens } from "../config";
 const getSize = (size, shift = 0, bounds = [0]) => {
   return stepTokenUpOrDown(getTokens(true).size, size, shift, bounds);
 };
+const cache = /* @__PURE__ */ new WeakMap();
 const stepTokenUpOrDown = (tokens, current, shift = 0, bounds = [0]) => {
-  const sizeNames = Object.keys(tokens);
-  const currentKeyNum = (typeof current === "string" ? current.replace("$", "") : current) || "4";
-  const nextKeyName = `$${+currentKeyNum + shift}`;
+  if (!cache.has(tokens)) {
+    cache.set(tokens, Object.keys(tokens));
+  }
+  const sizeNames = cache.get(tokens);
+  const currentKey = current || "$true";
   const min = bounds[0] ?? 0;
   const max = bounds[1] ?? sizeNames.length - 1;
-  const index = Math.min(max, Math.max(min, sizeNames.indexOf(nextKeyName)));
+  const currentIndex = sizeNames.indexOf(currentKey);
+  const index = Math.min(max, Math.max(min, currentIndex + shift));
   const key = sizeNames[index];
-  return tokens[key] || tokens["$4"];
+  return tokens[key] || tokens["$true"];
 };
 export {
   getSize,

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/getSize.ts"],
-  "sourcesContent": ["import { getTokens } from '../config'\nimport { SizeTokens, SpaceTokens } from '../types'\n\nexport const getSize = (size?: SizeTokens | undefined, shift = 0, bounds = [0]) => {\n  return stepTokenUpOrDown(getTokens(true).size, size, shift, bounds)\n}\n\nexport const stepTokenUpOrDown = (\n  tokens: Object,\n  current?: SizeTokens | SpaceTokens | string,\n  shift = 0,\n  bounds = [0]\n) => {\n  const sizeNames = Object.keys(tokens)\n  const currentKeyNum =\n    (typeof current === 'string' ? current.replace('$', '') : current) || '4'\n  const nextKeyName = `$${+currentKeyNum + shift}`\n  const min = bounds[0] ?? 0\n  const max = bounds[1] ?? sizeNames.length - 1\n  const index = Math.min(max, Math.max(min, sizeNames.indexOf(nextKeyName)))\n  const key = sizeNames[index]\n  return tokens[key] || tokens['$4']\n}\n"],
-  "mappings": "AAAA,SAAS,iBAAiB;AAGnB,MAAM,UAAU,CAAC,MAA+B,QAAQ,GAAG,SAAS,CAAC,CAAC,MAAM;AACjF,SAAO,kBAAkB,UAAU,IAAI,EAAE,MAAM,MAAM,OAAO,MAAM;AACpE;AAEO,MAAM,oBAAoB,CAC/B,QACA,SACA,QAAQ,GACR,SAAS,CAAC,CAAC,MACR;AACH,QAAM,YAAY,OAAO,KAAK,MAAM;AACpC,QAAM,iBACH,OAAO,YAAY,WAAW,QAAQ,QAAQ,KAAK,EAAE,IAAI,YAAY;AACxE,QAAM,cAAc,IAAI,CAAC,gBAAgB;AACzC,QAAM,MAAM,OAAO,MAAM;AACzB,QAAM,MAAM,OAAO,MAAM,UAAU,SAAS;AAC5C,QAAM,QAAQ,KAAK,IAAI,KAAK,KAAK,IAAI,KAAK,UAAU,QAAQ,WAAW,CAAC,CAAC;AACzE,QAAM,MAAM,UAAU;AACtB,SAAO,OAAO,QAAQ,OAAO;AAC/B;",
+  "sourcesContent": ["import { getTokens } from '../config'\nimport { SizeTokens, SpaceTokens } from '../types'\n\nexport const getSize = (size?: SizeTokens | undefined, shift = 0, bounds = [0]) => {\n  return stepTokenUpOrDown(getTokens(true).size, size, shift, bounds)\n}\n\nconst cache = new WeakMap()\n\nexport const stepTokenUpOrDown = (\n  tokens: Object,\n  current?: SizeTokens | SpaceTokens | string,\n  shift = 0,\n  bounds = [0]\n) => {\n  if (!cache.has(tokens)) {\n    cache.set(tokens, Object.keys(tokens))\n  }\n  const sizeNames = cache.get(tokens)!\n  const currentKey = current || '$true'\n  const min = bounds[0] ?? 0\n  const max = bounds[1] ?? sizeNames.length - 1\n  const currentIndex = sizeNames.indexOf(currentKey)\n  const index = Math.min(max, Math.max(min, currentIndex + shift))\n  const key = sizeNames[index]\n  return tokens[key] || tokens['$true']\n}\n"],
+  "mappings": "AAAA,SAAS,iBAAiB;AAGnB,MAAM,UAAU,CAAC,MAA+B,QAAQ,GAAG,SAAS,CAAC,CAAC,MAAM;AACjF,SAAO,kBAAkB,UAAU,IAAI,EAAE,MAAM,MAAM,OAAO,MAAM;AACpE;AAEA,MAAM,QAAQ,oBAAI,QAAQ;AAEnB,MAAM,oBAAoB,CAC/B,QACA,SACA,QAAQ,GACR,SAAS,CAAC,CAAC,MACR;AACH,MAAI,CAAC,MAAM,IAAI,MAAM,GAAG;AACtB,UAAM,IAAI,QAAQ,OAAO,KAAK,MAAM,CAAC;AAAA,EACvC;AACA,QAAM,YAAY,MAAM,IAAI,MAAM;AAClC,QAAM,aAAa,WAAW;AAC9B,QAAM,MAAM,OAAO,MAAM;AACzB,QAAM,MAAM,OAAO,MAAM,UAAU,SAAS;AAC5C,QAAM,eAAe,UAAU,QAAQ,UAAU;AACjD,QAAM,QAAQ,KAAK,IAAI,KAAK,KAAK,IAAI,KAAK,eAAe,KAAK,CAAC;AAC/D,QAAM,MAAM,UAAU;AACtB,SAAO,OAAO,QAAQ,OAAO;AAC/B;",
   "names": []
 }

package/dist/esm/helpers/getSplitStyles.js

@@ -129,6 +129,9 @@ const getSplitStyles = (props, staticConfig, theme, state, parentSplitStyles, la
   if (cache.has(props)) {
     return cache.get(props);
   }
+  if (props.debug) {
+    console.log("props", props);
+  }
   conf = conf || getConfig();
   const { shorthands } = conf;
   const {
@@ -142,14 +145,13 @@ const getSplitStyles = (props, staticConfig, theme, state, parentSplitStyles, la
   } = staticConfig;
   const validStyleProps = staticConfig.isText ? stylePropsText : validStyles;
   const viewProps = {};
-  const pseudos = {};
+  let pseudos = null;
   let psuedosUsed = null;
-  const medias = {};
   const mediaState = state.mediaState || globalMediaState;
   const usedKeys = {};
   const propKeys = Object.keys(props);
   let space = props.space;
-  let hasMedia = space ? "space" : false;
+  let hasMedia = false;
   const shouldDoClasses = staticConfig.acceptsClassName && (isWeb || IS_STATIC) && !state.noClassNames;
   let style = {};
   const flatTransforms = {};
@@ -426,6 +428,7 @@ const getSplitStyles = (props, staticConfig, theme, state, parentSplitStyles, la
           continue;
         }
         if (!shouldDoClasses || IS_STATIC) {
+          pseudos ||= {};
           pseudos[key] ||= {};
           Object.assign(pseudos[key], pseudoStyleObject);
         }
@@ -467,6 +470,7 @@ const getSplitStyles = (props, staticConfig, theme, state, parentSplitStyles, la
             const curImportance = psuedosUsed[importance] || 0;
             if (importance >= curImportance) {
               psuedosUsed[pkey] = importance;
+              pseudos ||= {};
               pseudos[key] ||= {};
               pseudos[key][pkey] = val2;
               if (process.env.NODE_ENV === "development" && debug === "verbose")
@@ -489,23 +493,33 @@ const getSplitStyles = (props, staticConfig, theme, state, parentSplitStyles, la
         );
         const mediaKeyShort = key.slice(1);
         if (process.env.NODE_ENV === "development" && debug === "verbose") {
-          console.log(`  \u{1F4FA} ${key}`, mediaState[mediaKeyShort], {
-            key,
-            mediaStyle,
-            props,
-            shouldDoClasses,
-            mediaState: { ...mediaState }
-          });
+          console.log(`  \u{1F4FA} ${key}`, { key, mediaStyle, props, shouldDoClasses });
         }
         if ("space" in mediaStyle) {
-          hasMedia = "space";
+          if (!Array.isArray(hasMedia)) {
+            hasMedia = [];
+          }
+          hasMedia.push(mediaKeyShort);
         }
         if (shouldDoClasses) {
           if ("space" in mediaStyle) {
-            const val2 = valInit.space;
             delete mediaStyle["space"];
-            if (mediaState[mediaKeyShort] && getMediaImportanceIfMoreImportant(mediaKeyShort, "space", usedKeys)) {
-              space = val2;
+            if (mediaState[mediaKeyShort]) {
+              const val2 = valInit.space;
+              const importance = getMediaImportanceIfMoreImportant(
+                mediaKeyShort,
+                "space",
+                usedKeys
+              );
+              if (importance) {
+                space = val2;
+                usedKeys["space"] = importance;
+                if (process.env.NODE_ENV === "development" && debug === "verbose") {
+                  console.log(
+                    `Found more important space for current media ${mediaKeyShort}: ${val2} (importance: ${importance})`
+                  );
+                }
+              }
             }
           }
           const mediaStyles = getStylesAtomic(mediaStyle);
@@ -641,7 +655,6 @@ const getSplitStyles = (props, staticConfig, theme, state, parentSplitStyles, la
     fontFamily,
     viewProps,
     style,
-    medias,
     pseudos,
     classNames,
     rulesToInsert
@@ -652,15 +665,7 @@ const getSplitStyles = (props, staticConfig, theme, state, parentSplitStyles, la
   if (process.env.NODE_ENV === "development" && debug === "verbose") {
     if (isDevTools) {
       console.groupCollapsed("  \u{1F539} styles =>");
-      const logs = {
-        transforms,
-        viewProps,
-        state,
-        rulesToInsert,
-        parentSplitStyles,
-        flatTransforms,
-        result
-      };
+      const logs = { transforms, viewProps, state, rulesToInsert, parentSplitStyles, flatTransforms, result };
       for (const key in { ...result, ...logs }) {
         console.log(key, logs[key]);
       }
@@ -674,31 +679,20 @@ function mergeClassName(transforms, classNames, key, val, isMediaOrPseudo = fals
   if (process.env.TAMAGUI_TARGET === "web") {
     if (!val)
       return;
-    if (val.startsWith("_transform-")) {
-      const namespace = isMediaOrPseudo ? key : "transform";
+    if (val[0] === "_" && val.startsWith("_transform-")) {
+      const ns = isMediaOrPseudo ? key : "transform";
       let transform = insertedTransforms[val];
-      if (isClient) {
-        if (!transform) {
-          console.warn(`got a new ting`);
-          scanAllSheets();
-          transform = insertedTransforms[val];
-          if (process.env.NODE_ENV === "development") {
-            if (!transform) {
-              console.warn("no transform found", { insertedTransforms, val });
-            }
-          }
-        }
-        if (!transform) {
-          if (isWeb && val[0] !== "_") {
-            transform = val;
-          }
+      if (isClient && !transform) {
+        scanAllSheets();
+        transform = insertedTransforms[val];
+        if (!transform && isWeb && val[0] !== "_") {
+          transform = val;
         }
       }
-      transforms[namespace] = transforms[namespace] || ["", ""];
-      const identifier = val.replace("_transform", "");
-      transforms[namespace][0] += identifier;
+      transforms[ns] ||= ["", ""];
+      transforms[ns][0] += val.replace("_transform", "");
       if (transform) {
-        transforms[namespace][1] += transform;
+        transforms[ns][1] += transform;
       }
     } else {
       classNames[key] = val;