@tamagui/web 1.4.0 → 1.5.1

package/dist/esm/createTamagui.js

@@ -88,25 +88,26 @@ function createTamagui(configIn) {
       }
     }
     const dedupedThemes = {};
-    const existing = /* @__PURE__ */ new WeakMap();
+    const existing = /* @__PURE__ */ new Map();
     for (const themeName in themes) {
       const rawTheme = themes[themeName];
-      if (existing.has(rawTheme)) {
-        const e = existing.get(rawTheme);
+      const key = JSON.stringify(rawTheme);
+      if (existing.has(key)) {
+        const e = existing.get(key);
         themes[themeName] = e.theme;
         e.names.push(themeName);
         continue;
       }
       const theme = { ...rawTheme };
-      for (const key in theme) {
-        ensureThemeVariable(theme, key);
+      for (const key2 in theme) {
+        ensureThemeVariable(theme, key2);
       }
       themes[themeName] = theme;
       dedupedThemes[themeName] = {
         names: [themeName],
         theme
       };
-      existing.set(rawTheme, dedupedThemes[themeName]);
+      existing.set(key, dedupedThemes[themeName]);
     }
     let themeRuleSets = [];
     if (isWeb || isRSC) {

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, tokensKeysOrdered } 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\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    // already processed by createTokens()\n    tokens: configIn.tokens as any,\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 `\n._ovs-contain {overscroll-behavior:contain;}\n.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"]
+  "sourcesContent": ["import { isRSC, isWeb } from '@tamagui/constants'\n\nimport { configListeners, setConfig } from './config'\nimport { createVariables, tokensKeysOrdered } 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 Map<string, DedupedTheme>()\n\n    // first, de-dupe and parse them\n    for (const themeName in themes) {\n      const rawTheme = themes[themeName] as ThemeParsed\n      // dont force referential equality but may need something more consistent than JSON.stringify\n      const key = JSON.stringify(rawTheme)\n\n      // if existing, avoid\n      if (existing.has(key)) {\n        const e = existing.get(key)!\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\n      existing.set(key, 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    // already processed by createTokens()\n    tokens: configIn.tokens as any,\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 `\n._ovs-contain {overscroll-behavior:contain;}\n.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": "AAAA,SAAS,OAAO,aAAa;AAE7B,SAAS,iBAAiB,iBAAiB;AAC3C,SAAS,iBAAiB,yBAAyB;AACnD,SAAS,wBAAwB;AACjC;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,SAAS,qBAAqB,2BAA2B;AACzD,SAAS,sBAAsB;AAC/B,SAAS,WAAW,6BAA6B;AACjD,SAAS,eAAe;AASxB,MAAM,iBAAiB,oBAAI,QAAsB;AAE1C,SAAS,cACd,UAC0B;AA/B5B;AAgCE,MAAI,eAAe,IAAI,QAAQ,GAAG;AAChC,WAAO;AAAA,EACT;AAEA,MAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,QAAI,CAAC,SAAS,QAAQ;AACpB,YAAM,IAAI,MAAM,oBAAoB;AAAA,IACtC;AACA,QAAI,CAAC,SAAS,QAAQ;AACpB,YAAM,IAAI,MAAM,oBAAoB;AAAA,IACtC;AACA,QAAI,CAAC,SAAS,OAAO;AACnB,YAAM,IAAI,MAAM,mBAAmB;AAAA,IACrC;AAAA,EACF;AAEA,gBAAc;AACd,wBAAsB;AAEtB,QAAM,aAAa,OAAO;AAAA,IACxB,OAAO,QAAQ,SAAS,KAAM,EAAE,IAAI,CAAC,CAAC,GAAG,CAAC,MAAM;AAC9C,aAAO,CAAC,GAAG,gBAAgB,GAAG,KAAK,IAAI,CAAC;AAAA,IAC1C,CAAC;AAAA,EACH;AAEA,QAAM,eAAe,MAAM;AACzB,UAAM,MAAM,CAAC;AACb,eAAW,cAAc,YAAY;AACnC,UAAI,IAAI,YAAY,IAAI,UAAU,WAAW,UAAU,CAAC;AAAA,IAC1D;AACA,WAAO;AAAA,EACT,GAAG;AAEH,QAAM,eAAe,MAAM;AACzB,UAAM,SAAS,EAAE,GAAG,SAAS,OAAO;AACpC,UAAM,cAAwB,CAAC;AAE/B,QAAI,OAAO;AA6BT,UAASA,yBAAT,SAA+B,MAAgB,WAAW,IAAI;AAC5D,eAAO,QAAQ,aAAa,MAAM,CAAC,GAAG,IAAI,EAAE,KAAK,IAAI,KAAK,IAAI;AAAA,MAChE;AAFS,kCAAAA;AA5BT,YAAM,eAAyB,CAAC;AAChC,YAAM,mBAGF,CAAC;AAEL,iBAAW,OAAO,SAAS,QAAQ;AACjC,mBAAW,QAAQ,SAAS,OAAO,GAAG,GAAG;AACvC,gBAAM,MAAM,SAAS,OAAO,GAAG,EAAE,IAAI;AACrC,8BAAoB,GAAG;AACvB,uBAAa,KAAK,cAAc,GAAG,CAAC;AAAA,QACtC;AAAA,MACF;AAEA,iBAAW,OAAO,aAAa;AAC7B,cAAM,aAAa,YAAY,GAAG;AAClC,cAAM,CAAC,MAAM,QAAQ,IAAI,IAAI,SAAS,GAAG,IAAI,IAAI,MAAM,GAAG,IAAI,CAAC,GAAG;AAClE,cAAM,WAAW,sBAAsB,UAAU;AACjD,yBAAiB,GAAG,IAAI;AAAA,UACtB,MAAM,KAAK,MAAM,CAAC;AAAA,UAClB,cAAc;AAAA,UACd;AAAA,QACF;AAAA,MACF;AAEA,YAAM,MACJ,QAAQ,IAAI,aAAa,gBAAgB,SAAS,qBAAqB,MAAM;AAO/E,kBAAY,KAAKA,uBAAsB,YAAY,CAAC;AAGpD,UAAI,kBAAkB;AACpB,mBAAW,OAAO,kBAAkB;AAClC,gBAAM,EAAE,MAAM,cAAAC,eAAc,WAAW,UAAU,IAAI,iBAAiB,GAAG;AACzE,gBAAM,eAAe,SAAS;AAC9B,gBAAM,eAAe,iBAAiB,QAAQ,YAAY;AAC1D,gBAAM,YACJ,aAAa,YAAY,IAAI,iBAAiB,iBAAiB;AACjE,gBAAM,kBAAkBD,uBAAsBC,eAAc,SAAS;AACrE,sBAAY,KAAK,eAAe;AAAA,QAClC;AAAA,MACF;AAAA,IACF;AAOA,UAAM,gBAEF,CAAC;AACL,UAAM,WAAW,oBAAI,IAA0B;AAG/C,eAAW,aAAa,QAAQ;AAC9B,YAAM,WAAW,OAAO,SAAS;AAEjC,YAAM,MAAM,KAAK,UAAU,QAAQ;AAGnC,UAAI,SAAS,IAAI,GAAG,GAAG;AACrB,cAAM,IAAI,SAAS,IAAI,GAAG;AAC1B,eAAO,SAAS,IAAI,EAAE;AACtB,UAAE,MAAM,KAAK,SAAS;AACtB;AAAA,MACF;AAGA,YAAM,QAAQ,EAAE,GAAG,SAAS;AAE5B,iBAAWC,QAAO,OAAO;AAEvB,4BAAoB,OAAOA,IAAG;AAAA,MAChC;AACA,aAAO,SAAS,IAAI;AAGpB,oBAAc,SAAS,IAAI;AAAA,QACzB,OAAO,CAAC,SAAS;AAAA,QACjB;AAAA,MACF;AAEA,eAAS,IAAI,KAAK,cAAc,SAAS,CAAC;AAAA,IAC5C;AAGA,QAAI,gBAA0B,CAAC;AAE/B,QAAI,SAAS,OAAO;AAClB,iBAAW,aAAa,eAAe;AACrC,wBAAgB;AAAA,UACd,GAAG;AAAA,UACH,GAAG,iBAAiB;AAAA,YAClB,QAAQ;AAAA,YACR;AAAA,YACA,GAAG,cAAc,SAAS;AAAA,UAC5B,CAAC;AAAA,QACH;AAAA,MACF;AAAA,IACF;AAGA,eAAW,aAAa,QAAQ;AAC9B,aAAO,SAAS,IAAI,oBAAoB,WAAW,OAAO,SAAS,GAAG,MAAM;AAAA,IAC9E;AAEA,0BAAsB,MAAM;AAE5B,WAAO;AAAA,MACL;AAAA,MACA;AAAA,MACA;AAAA,IACF;AAAA,EACF,GAAG;AAGH,QAAM,eAAoB,OAAO;AAAA,IAC/B,OAAO,QAAQ,SAAS,MAAM,EAAE,IAAI,CAAC,CAAC,GAAG,CAAC,MAAM;AAC9C,YAAM,MAAM,OAAO,YAAY,OAAO,QAAQ,CAAC,EAAE,IAAI,CAAC,CAACC,IAAGC,EAAC,MAAM,CAAC,IAAID,MAAKC,EAAC,CAAC,CAAC;AAC9E,wBAAkB,IAAI,KAAK,kBAAkB,IAAI,CAAC,CAAC;AACnD,aAAO,CAAC,GAAG,GAAG;AAAA,IAChB,CAAC;AAAA,EACH;AAEA,QAAM,aAAa,SAAS,cAAc,CAAC;AAE3C,QAAM,SAAgC;AAAA,IACpC,eAAe,CAAC;AAAA,IAChB,YAAY,CAAC;AAAA,IACb,OAAO,CAAC;AAAA,IACR,GAAG;AAAA;AAAA,IAEH,QAAQ,SAAS;AAAA;AAAA,IAEjB,YAAY,EAAE,GAAG,WAAW;AAAA,IAC5B,mBAAmB,aACf,OAAO,YAAY,OAAO,QAAQ,UAAU,EAAE,IAAI,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,IACrE,CAAC;AAAA,IACL,QAAQ,YAAY;AAAA,IACpB;AAAA,IACA;AAAA,IACA;AAAA,IACA,QAAQ;AAAA,IACR,QAAQ,CAAC,YAAY,SAAS;AAC5B,aAAO;AAAA;AAAA;AAAA;AAAA;AAAA,EAKX,YAAY,YAAY,KAAK,SAAS;AAAA,EACtC,YAAY,cAAc,KAAK,SAAS;AAAA,EACxC,YAAY,EAAE,KAAK,SAAS;AAAA,IAC1B;AAAA;AAAA;AAAA,EAGF;AAEA,iBAAe,MAAM;AACrB,YAAU,MAAM;AAEhB,MAAI,gBAAgB,MAAM;AACxB,oBAAgB,QAAQ,CAAC,OAAO,GAAG,MAAM,CAAC;AAC1C,oBAAgB,MAAM;AAAA,EACxB;AAEA,iBAAe,IAAI,QAAQ,IAAI;AAE/B,MAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,SAAI,aAAQ,IAAI,UAAZ,mBAAmB,WAAW,YAAY;AAE5C,cAAQ,IAAI,mBAAmB,MAAM;AAAA,IACvC;AACA,QAAI,CAAC,WAAW,SAAS,GAAG;AAC1B,iBAAW,SAAS,IAAI;AAAA,IAC1B;AAAA,EACF;AAEA,SAAO;AACT;",
+  "names": ["declarationsToRuleSet", "declarations", "key", "k", "v"]
 }

package/dist/esm/createTamagui.mjs

@@ -88,25 +88,26 @@ function createTamagui(configIn) {
       }
     }
     const dedupedThemes = {};
-    const existing = /* @__PURE__ */ new WeakMap();
+    const existing = /* @__PURE__ */ new Map();
     for (const themeName in themes) {
       const rawTheme = themes[themeName];
-      if (existing.has(rawTheme)) {
-        const e = existing.get(rawTheme);
+      const key = JSON.stringify(rawTheme);
+      if (existing.has(key)) {
+        const e = existing.get(key);
         themes[themeName] = e.theme;
         e.names.push(themeName);
         continue;
       }
       const theme = { ...rawTheme };
-      for (const key in theme) {
-        ensureThemeVariable(theme, key);
+      for (const key2 in theme) {
+        ensureThemeVariable(theme, key2);
       }
       themes[themeName] = theme;
       dedupedThemes[themeName] = {
         names: [themeName],
         theme
       };
-      existing.set(rawTheme, dedupedThemes[themeName]);
+      existing.set(key, dedupedThemes[themeName]);
     }
     let themeRuleSets = [];
     if (isWeb || isRSC) {

package/dist/esm/createTamagui.mjs.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, tokensKeysOrdered } 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\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    // already processed by createTokens()\n    tokens: configIn.tokens as any,\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 `\n._ovs-contain {overscroll-behavior:contain;}\n.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"]
+  "sourcesContent": ["import { isRSC, isWeb } from '@tamagui/constants'\n\nimport { configListeners, setConfig } from './config'\nimport { createVariables, tokensKeysOrdered } 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 Map<string, DedupedTheme>()\n\n    // first, de-dupe and parse them\n    for (const themeName in themes) {\n      const rawTheme = themes[themeName] as ThemeParsed\n      // dont force referential equality but may need something more consistent than JSON.stringify\n      const key = JSON.stringify(rawTheme)\n\n      // if existing, avoid\n      if (existing.has(key)) {\n        const e = existing.get(key)!\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\n      existing.set(key, 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    // already processed by createTokens()\n    tokens: configIn.tokens as any,\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 `\n._ovs-contain {overscroll-behavior:contain;}\n.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", "key", "k", "v"]
 }

package/dist/esm/helpers/expandStyle.js

@@ -3,20 +3,11 @@ import { isWeb } from "@tamagui/constants";
 function expandStyle(key, value) {
   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;
+      return [
+        ["flexGrow", value],
+        ["flexShrink", 1],
+        ["flexBasis", "auto"]
+      ];
     }
     switch (key) {
       case "textAlignVertical": {

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

@@ -1,7 +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 '@tamagui/constants'\n\nexport function expandStyle(key: string, value: any) {\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      case 'textAlignVertical': {\n        return [['verticalAlign', value === 'center' ? 'middle' : value]]\n      }\n      case 'writingDirection': {\n        return [['direction', value]]\n      }\n    }\n  }\n\n  const longKey = EXPANSIONS[key]\n  if (longKey) {\n    return longKey.map((key) => {\n      return [key, value]\n    })\n  }\n}\n\nconst all = ['Top', 'Right', 'Bottom', 'Left']\nconst horiz = ['Right', 'Left']\nconst vert = ['Top', 'Bottom']\nconst xy = ['X', 'Y']\n\nconst EXPANSIONS: Record<string, string[]> = {\n  borderColor: ['TopColor', 'RightColor', 'BottomColor', 'LeftColor'],\n  borderRadius: [\n    'TopLeftRadius',\n    'TopRightRadius',\n    'BottomRightRadius',\n    'BottomLeftRadius',\n  ],\n  borderWidth: ['TopWidth', 'RightWidth', 'BottomWidth', 'LeftWidth'],\n  margin: all,\n  marginHorizontal: horiz,\n  marginVertical: vert,\n  overscrollBehavior: xy,\n  padding: all,\n  paddingHorizontal: horiz,\n  paddingVertical: vert,\n  ...(isWeb && {\n    // react-native only supports borderStyle\n    borderStyle: ['TopStyle', 'RightStyle', 'BottomStyle', 'LeftStyle'],\n    // react-native doesn't support X / Y\n    overflow: xy,\n  }),\n}\n\nfor (const parent in EXPANSIONS) {\n  const prefix = parent.slice(0, /[A-Z]/.exec(parent)?.index ?? parent.length)\n  EXPANSIONS[parent] = EXPANSIONS[parent].map((k) => `${prefix}${k}`)\n}\n"],
-  "mappings": "AAAA;AAKA,SAAS,aAAa;AAEf,SAAS,YAAY,KAAa,OAAY;AACnD,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,KAAK;AAAA,MACX,KAAK,qBAAqB;AACxB,eAAO,CAAC,CAAC,iBAAiB,UAAU,WAAW,WAAW,KAAK,CAAC;AAAA,MAClE;AAAA,MACA,KAAK,oBAAoB;AACvB,eAAO,CAAC,CAAC,aAAa,KAAK,CAAC;AAAA,MAC9B;AAAA,IACF;AAAA,EACF;AAEA,QAAM,UAAU,WAAW,GAAG;AAC9B,MAAI,SAAS;AACX,WAAO,QAAQ,IAAI,CAACA,SAAQ;AAC1B,aAAO,CAACA,MAAK,KAAK;AAAA,IACpB,CAAC;AAAA,EACH;AACF;AAEA,MAAM,MAAM,CAAC,OAAO,SAAS,UAAU,MAAM;AAC7C,MAAM,QAAQ,CAAC,SAAS,MAAM;AAC9B,MAAM,OAAO,CAAC,OAAO,QAAQ;AAC7B,MAAM,KAAK,CAAC,KAAK,GAAG;AAEpB,MAAM,aAAuC;AAAA,EAC3C,aAAa,CAAC,YAAY,cAAc,eAAe,WAAW;AAAA,EAClE,cAAc;AAAA,IACZ;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF;AAAA,EACA,aAAa,CAAC,YAAY,cAAc,eAAe,WAAW;AAAA,EAClE,QAAQ;AAAA,EACR,kBAAkB;AAAA,EAClB,gBAAgB;AAAA,EAChB,oBAAoB;AAAA,EACpB,SAAS;AAAA,EACT,mBAAmB;AAAA,EACnB,iBAAiB;AAAA,EACjB,GAAI,SAAS;AAAA;AAAA,IAEX,aAAa,CAAC,YAAY,cAAc,eAAe,WAAW;AAAA;AAAA,IAElE,UAAU;AAAA,EACZ;AACF;AAEA,WAAW,UAAU,YAAY;AAC/B,QAAM,SAAS,OAAO,MAAM,KAAG,aAAQ,KAAK,MAAM,MAAnB,mBAAsB,UAAS,OAAO,MAAM;AAC3E,aAAW,MAAM,IAAI,WAAW,MAAM,EAAE,IAAI,CAAC,MAAM,GAAG,SAAS,GAAG;AACpE;",
+  "sourcesContent": ["/**\n * Some parts adapted from react-native-web\n * Copyright (c) Nicolas Gallagher licensed under the MIT license.\n */\n\nimport { isWeb } from '@tamagui/constants'\n\nexport function expandStyle(key: string, value: any) {\n  if (process.env.TAMAGUI_TARGET === 'web') {\n    if (key === 'flex') {\n      return [\n        ['flexGrow', value],\n        ['flexShrink', 1],\n        ['flexBasis', 'auto'],\n      ]\n    }\n\n    // web only\n    switch (key) {\n      case 'textAlignVertical': {\n        return [['verticalAlign', value === 'center' ? 'middle' : value]]\n      }\n      case 'writingDirection': {\n        return [['direction', value]]\n      }\n    }\n  }\n\n  const longKey = EXPANSIONS[key]\n  if (longKey) {\n    return longKey.map((key) => {\n      return [key, value]\n    })\n  }\n}\n\nconst all = ['Top', 'Right', 'Bottom', 'Left']\nconst horiz = ['Right', 'Left']\nconst vert = ['Top', 'Bottom']\nconst xy = ['X', 'Y']\n\nconst EXPANSIONS: Record<string, string[]> = {\n  borderColor: ['TopColor', 'RightColor', 'BottomColor', 'LeftColor'],\n  borderRadius: [\n    'TopLeftRadius',\n    'TopRightRadius',\n    'BottomRightRadius',\n    'BottomLeftRadius',\n  ],\n  borderWidth: ['TopWidth', 'RightWidth', 'BottomWidth', 'LeftWidth'],\n  margin: all,\n  marginHorizontal: horiz,\n  marginVertical: vert,\n  overscrollBehavior: xy,\n  padding: all,\n  paddingHorizontal: horiz,\n  paddingVertical: vert,\n  ...(isWeb && {\n    // react-native only supports borderStyle\n    borderStyle: ['TopStyle', 'RightStyle', 'BottomStyle', 'LeftStyle'],\n    // react-native doesn't support X / Y\n    overflow: xy,\n  }),\n}\n\nfor (const parent in EXPANSIONS) {\n  const prefix = parent.slice(0, /[A-Z]/.exec(parent)?.index ?? parent.length)\n  EXPANSIONS[parent] = EXPANSIONS[parent].map((k) => `${prefix}${k}`)\n}\n"],
+  "mappings": "AAAA;AAKA,SAAS,aAAa;AAEf,SAAS,YAAY,KAAa,OAAY;AACnD,MAAI,QAAQ,IAAI,mBAAmB,OAAO;AACxC,QAAI,QAAQ,QAAQ;AAClB,aAAO;AAAA,QACL,CAAC,YAAY,KAAK;AAAA,QAClB,CAAC,cAAc,CAAC;AAAA,QAChB,CAAC,aAAa,MAAM;AAAA,MACtB;AAAA,IACF;AAGA,YAAQ,KAAK;AAAA,MACX,KAAK,qBAAqB;AACxB,eAAO,CAAC,CAAC,iBAAiB,UAAU,WAAW,WAAW,KAAK,CAAC;AAAA,MAClE;AAAA,MACA,KAAK,oBAAoB;AACvB,eAAO,CAAC,CAAC,aAAa,KAAK,CAAC;AAAA,MAC9B;AAAA,IACF;AAAA,EACF;AAEA,QAAM,UAAU,WAAW,GAAG;AAC9B,MAAI,SAAS;AACX,WAAO,QAAQ,IAAI,CAACA,SAAQ;AAC1B,aAAO,CAACA,MAAK,KAAK;AAAA,IACpB,CAAC;AAAA,EACH;AACF;AAEA,MAAM,MAAM,CAAC,OAAO,SAAS,UAAU,MAAM;AAC7C,MAAM,QAAQ,CAAC,SAAS,MAAM;AAC9B,MAAM,OAAO,CAAC,OAAO,QAAQ;AAC7B,MAAM,KAAK,CAAC,KAAK,GAAG;AAEpB,MAAM,aAAuC;AAAA,EAC3C,aAAa,CAAC,YAAY,cAAc,eAAe,WAAW;AAAA,EAClE,cAAc;AAAA,IACZ;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF;AAAA,EACA,aAAa,CAAC,YAAY,cAAc,eAAe,WAAW;AAAA,EAClE,QAAQ;AAAA,EACR,kBAAkB;AAAA,EAClB,gBAAgB;AAAA,EAChB,oBAAoB;AAAA,EACpB,SAAS;AAAA,EACT,mBAAmB;AAAA,EACnB,iBAAiB;AAAA,EACjB,GAAI,SAAS;AAAA;AAAA,IAEX,aAAa,CAAC,YAAY,cAAc,eAAe,WAAW;AAAA;AAAA,IAElE,UAAU;AAAA,EACZ;AACF;AAEA,WAAW,UAAU,YAAY;AAC/B,QAAM,SAAS,OAAO,MAAM,KAAG,aAAQ,KAAK,MAAM,MAAnB,mBAAsB,UAAS,OAAO,MAAM;AAC3E,aAAW,MAAM,IAAI,WAAW,MAAM,EAAE,IAAI,CAAC,MAAM,GAAG,SAAS,GAAG;AACpE;",
   "names": ["key"]
 }

package/dist/esm/helpers/expandStyle.mjs

@@ -3,20 +3,11 @@ import { isWeb } from "@tamagui/constants";
 function expandStyle(key, value) {
   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;
+      return [
+        ["flexGrow", value],
+        ["flexShrink", 1],
+        ["flexBasis", "auto"]
+      ];
     }
     switch (key) {
       case "textAlignVertical": {

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

@@ -1,7 +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 '@tamagui/constants'\n\nexport function expandStyle(key: string, value: any) {\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      case 'textAlignVertical': {\n        return [['verticalAlign', value === 'center' ? 'middle' : value]]\n      }\n      case 'writingDirection': {\n        return [['direction', value]]\n      }\n    }\n  }\n\n  const longKey = EXPANSIONS[key]\n  if (longKey) {\n    return longKey.map((key) => {\n      return [key, value]\n    })\n  }\n}\n\nconst all = ['Top', 'Right', 'Bottom', 'Left']\nconst horiz = ['Right', 'Left']\nconst vert = ['Top', 'Bottom']\nconst xy = ['X', 'Y']\n\nconst EXPANSIONS: Record<string, string[]> = {\n  borderColor: ['TopColor', 'RightColor', 'BottomColor', 'LeftColor'],\n  borderRadius: [\n    'TopLeftRadius',\n    'TopRightRadius',\n    'BottomRightRadius',\n    'BottomLeftRadius',\n  ],\n  borderWidth: ['TopWidth', 'RightWidth', 'BottomWidth', 'LeftWidth'],\n  margin: all,\n  marginHorizontal: horiz,\n  marginVertical: vert,\n  overscrollBehavior: xy,\n  padding: all,\n  paddingHorizontal: horiz,\n  paddingVertical: vert,\n  ...(isWeb && {\n    // react-native only supports borderStyle\n    borderStyle: ['TopStyle', 'RightStyle', 'BottomStyle', 'LeftStyle'],\n    // react-native doesn't support X / Y\n    overflow: xy,\n  }),\n}\n\nfor (const parent in EXPANSIONS) {\n  const prefix = parent.slice(0, /[A-Z]/.exec(parent)?.index ?? parent.length)\n  EXPANSIONS[parent] = EXPANSIONS[parent].map((k) => `${prefix}${k}`)\n}\n"],
-  "mappings": "AAAA;AAKA,SAAS,aAAa;AAEf,SAAS,YAAY,KAAa,OAAY;AACnD,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,KAAK;AAAA,MACX,KAAK,qBAAqB;AACxB,eAAO,CAAC,CAAC,iBAAiB,UAAU,WAAW,WAAW,KAAK,CAAC;AAAA,MAClE;AAAA,MACA,KAAK,oBAAoB;AACvB,eAAO,CAAC,CAAC,aAAa,KAAK,CAAC;AAAA,MAC9B;AAAA,IACF;AAAA,EACF;AAEA,QAAM,UAAU,WAAW,GAAG;AAC9B,MAAI,SAAS;AACX,WAAO,QAAQ,IAAI,CAACA,SAAQ;AAC1B,aAAO,CAACA,MAAK,KAAK;AAAA,IACpB,CAAC;AAAA,EACH;AACF;AAEA,MAAM,MAAM,CAAC,OAAO,SAAS,UAAU,MAAM;AAC7C,MAAM,QAAQ,CAAC,SAAS,MAAM;AAC9B,MAAM,OAAO,CAAC,OAAO,QAAQ;AAC7B,MAAM,KAAK,CAAC,KAAK,GAAG;AAEpB,MAAM,aAAuC;AAAA,EAC3C,aAAa,CAAC,YAAY,cAAc,eAAe,WAAW;AAAA,EAClE,cAAc;AAAA,IACZ;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF;AAAA,EACA,aAAa,CAAC,YAAY,cAAc,eAAe,WAAW;AAAA,EAClE,QAAQ;AAAA,EACR,kBAAkB;AAAA,EAClB,gBAAgB;AAAA,EAChB,oBAAoB;AAAA,EACpB,SAAS;AAAA,EACT,mBAAmB;AAAA,EACnB,iBAAiB;AAAA,EACjB,GAAI,SAAS;AAAA;AAAA,IAEX,aAAa,CAAC,YAAY,cAAc,eAAe,WAAW;AAAA;AAAA,IAElE,UAAU;AAAA,EACZ;AACF;AAEA,WAAW,UAAU,YAAY;AAC/B,QAAM,SAAS,OAAO,MAAM,KAAG,aAAQ,KAAK,MAAM,MAAnB,mBAAsB,UAAS,OAAO,MAAM;AAC3E,aAAW,MAAM,IAAI,WAAW,MAAM,EAAE,IAAI,CAAC,MAAM,GAAG,SAAS,GAAG;AACpE;",
+  "sourcesContent": ["/**\n * Some parts adapted from react-native-web\n * Copyright (c) Nicolas Gallagher licensed under the MIT license.\n */\n\nimport { isWeb } from '@tamagui/constants'\n\nexport function expandStyle(key: string, value: any) {\n  if (process.env.TAMAGUI_TARGET === 'web') {\n    if (key === 'flex') {\n      return [\n        ['flexGrow', value],\n        ['flexShrink', 1],\n        ['flexBasis', 'auto'],\n      ]\n    }\n\n    // web only\n    switch (key) {\n      case 'textAlignVertical': {\n        return [['verticalAlign', value === 'center' ? 'middle' : value]]\n      }\n      case 'writingDirection': {\n        return [['direction', value]]\n      }\n    }\n  }\n\n  const longKey = EXPANSIONS[key]\n  if (longKey) {\n    return longKey.map((key) => {\n      return [key, value]\n    })\n  }\n}\n\nconst all = ['Top', 'Right', 'Bottom', 'Left']\nconst horiz = ['Right', 'Left']\nconst vert = ['Top', 'Bottom']\nconst xy = ['X', 'Y']\n\nconst EXPANSIONS: Record<string, string[]> = {\n  borderColor: ['TopColor', 'RightColor', 'BottomColor', 'LeftColor'],\n  borderRadius: [\n    'TopLeftRadius',\n    'TopRightRadius',\n    'BottomRightRadius',\n    'BottomLeftRadius',\n  ],\n  borderWidth: ['TopWidth', 'RightWidth', 'BottomWidth', 'LeftWidth'],\n  margin: all,\n  marginHorizontal: horiz,\n  marginVertical: vert,\n  overscrollBehavior: xy,\n  padding: all,\n  paddingHorizontal: horiz,\n  paddingVertical: vert,\n  ...(isWeb && {\n    // react-native only supports borderStyle\n    borderStyle: ['TopStyle', 'RightStyle', 'BottomStyle', 'LeftStyle'],\n    // react-native doesn't support X / Y\n    overflow: xy,\n  }),\n}\n\nfor (const parent in EXPANSIONS) {\n  const prefix = parent.slice(0, /[A-Z]/.exec(parent)?.index ?? parent.length)\n  EXPANSIONS[parent] = EXPANSIONS[parent].map((k) => `${prefix}${k}`)\n}\n"],
+  "mappings": "AAAA;AAKA,SAAS,aAAa;AAEf,SAAS,YAAY,KAAa,OAAY;AACnD,MAAI,QAAQ,IAAI,mBAAmB,OAAO;AACxC,QAAI,QAAQ,QAAQ;AAClB,aAAO;AAAA,QACL,CAAC,YAAY,KAAK;AAAA,QAClB,CAAC,cAAc,CAAC;AAAA,QAChB,CAAC,aAAa,MAAM;AAAA,MACtB;AAAA,IACF;AAGA,YAAQ,KAAK;AAAA,MACX,KAAK,qBAAqB;AACxB,eAAO,CAAC,CAAC,iBAAiB,UAAU,WAAW,WAAW,KAAK,CAAC;AAAA,MAClE;AAAA,MACA,KAAK,oBAAoB;AACvB,eAAO,CAAC,CAAC,aAAa,KAAK,CAAC;AAAA,MAC9B;AAAA,IACF;AAAA,EACF;AAEA,QAAM,UAAU,WAAW,GAAG;AAC9B,MAAI,SAAS;AACX,WAAO,QAAQ,IAAI,CAACA,SAAQ;AAC1B,aAAO,CAACA,MAAK,KAAK;AAAA,IACpB,CAAC;AAAA,EACH;AACF;AAEA,MAAM,MAAM,CAAC,OAAO,SAAS,UAAU,MAAM;AAC7C,MAAM,QAAQ,CAAC,SAAS,MAAM;AAC9B,MAAM,OAAO,CAAC,OAAO,QAAQ;AAC7B,MAAM,KAAK,CAAC,KAAK,GAAG;AAEpB,MAAM,aAAuC;AAAA,EAC3C,aAAa,CAAC,YAAY,cAAc,eAAe,WAAW;AAAA,EAClE,cAAc;AAAA,IACZ;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF;AAAA,EACA,aAAa,CAAC,YAAY,cAAc,eAAe,WAAW;AAAA,EAClE,QAAQ;AAAA,EACR,kBAAkB;AAAA,EAClB,gBAAgB;AAAA,EAChB,oBAAoB;AAAA,EACpB,SAAS;AAAA,EACT,mBAAmB;AAAA,EACnB,iBAAiB;AAAA,EACjB,GAAI,SAAS;AAAA;AAAA,IAEX,aAAa,CAAC,YAAY,cAAc,eAAe,WAAW;AAAA;AAAA,IAElE,UAAU;AAAA,EACZ;AACF;AAEA,WAAW,UAAU,YAAY;AAC/B,QAAM,SAAS,OAAO,MAAM,KAAG,aAAQ,KAAK,MAAM,MAAnB,mBAAsB,UAAS,OAAO,MAAM;AAC3E,aAAW,MAAM,IAAI,WAAW,MAAM,EAAE,IAAI,CAAC,MAAM,GAAG,SAAS,GAAG;AACpE;",
   "names": ["key"]
 }

package/dist/esm/helpers/expandStyles.js

@@ -1,8 +1,6 @@
-import { isWeb } from "@tamagui/constants";
-import { normalizeCSSColor } from "@tamagui/normalize-css-color";
 import { getConfig } from "../config";
 import { expandStyle } from "./expandStyle";
-import { normalizeColor, rgba } from "./normalizeColor";
+import { normalizeShadow } from "./normalizeShadow";
 import { normalizeValueWithProperty } from "./normalizeValueWithProperty.js";
 import { pseudoDescriptors } from "./pseudoDescriptors";
 let shorthands = null;
@@ -30,11 +28,11 @@ function expandStyles(style, config = getConfig()) {
   return res;
 }
 function fixStyles(style) {
-  if (style.shadowRadius) {
+  if (style.shadowRadius || style.shadowColor || style.shadowOpacity || style.shadowOffset) {
     Object.assign(style, normalizeShadow(style));
   }
   for (const key in borderDefaults) {
-    if (style[key] && !style[borderDefaults[key]]) {
+    if (key in style && !style[borderDefaults[key]]) {
       style[borderDefaults[key]] = "solid";
     }
   }
@@ -46,42 +44,6 @@ const borderDefaults = {
   borderLeftWidth: "borderLeftStyle",
   borderRightWidth: "borderRightStyle"
 };
-function normalizeShadow({
-  shadowColor,
-  shadowOffset,
-  shadowOpacity,
-  shadowRadius
-}) {
-  const { height, width } = shadowOffset || defaultOffset;
-  const colorStr = String(shadowColor || "black");
-  return {
-    shadowOffset: {
-      width: normalizeValueWithProperty(width || 0),
-      height: normalizeValueWithProperty(height || 0)
-    },
-    shadowRadius: normalizeValueWithProperty(shadowRadius || 0),
-    ...isWeb && {
-      shadowColor: normalizeColor(colorStr, shadowOpacity)
-    },
-    ...process.env.TAMAGUI_TARGET === "native" && (() => {
-      const val = normalizeCSSColor(colorStr);
-      if (!val) {
-        if (process.env.NODE_ENV === "development") {
-          console.warn("No rgba form", colorStr);
-        }
-        return {
-          shadowColor,
-          shadowOpacity
-        };
-      }
-      const { r, g, b, a } = rgba(val);
-      return {
-        shadowColor: `rgb(${r},${g},${b})`,
-        shadowOpacity: shadowOpacity ?? a
-      };
-    })()
-  };
-}
 export {
   defaultOffset,
   expandStyles,

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/expandStyles.ts"],
-  "sourcesContent": ["import { isWeb } from '@tamagui/constants'\nimport { normalizeCSSColor } from '@tamagui/normalize-css-color'\n\nimport { getConfig } from '../config'\nimport { expandStyle } from './expandStyle'\nimport { normalizeColor, rgba } from './normalizeColor'\nimport { normalizeValueWithProperty } from './normalizeValueWithProperty.js'\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>, config = getConfig()) {\n  const res: Record<string, any> = {}\n\n  for (let key in style) {\n    shorthands = shorthands || (config ? config.shorthands : null)\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\nconst borderDefaults = {\n  borderWidth: 'borderStyle',\n  borderBottomWidth: 'borderBottomStyle',\n  borderTopWidth: 'borderTopStyle',\n  borderLeftWidth: 'borderLeftStyle',\n  borderRightWidth: 'borderRightStyle',\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    ...(process.env.TAMAGUI_TARGET === 'native' &&\n      (() => {\n        // on native fix bug - shadows behave better if turned into non-alpha rgb() + shadowOpacity\n        const val = normalizeCSSColor(colorStr)\n        if (!val) {\n          if (process.env.NODE_ENV === 'development') {\n            // eslint-disable-next-line no-console\n            console.warn('No rgba form', colorStr)\n          }\n          return {\n            shadowColor,\n            shadowOpacity,\n          }\n        }\n        const { r, g, b, a } = rgba(val)\n        return {\n          shadowColor: `rgb(${r},${g},${b})`,\n          shadowOpacity: shadowOpacity ?? a,\n        }\n      })()),\n  }\n}\n"],
-  "mappings": "AAAA,SAAS,aAAa;AACtB,SAAS,yBAAyB;AAElC,SAAS,iBAAiB;AAC1B,SAAS,mBAAmB;AAC5B,SAAS,gBAAgB,YAAY;AACrC,SAAS,kCAAkC;AAC3C,SAAS,yBAAyB;AAElC,IAAI,aAA4C;AACzC,MAAM,gBAAgB,EAAE,QAAQ,GAAG,OAAO,EAAE;AAU5C,SAAS,aAAa,OAA4B,SAAS,UAAU,GAAG;AAC7E,QAAM,MAA2B,CAAC;AAElC,WAAS,OAAO,OAAO;AACrB,iBAAa,eAAe,SAAS,OAAO,aAAa;AACzD,QAAI,YAAY;AACd,YAAM,WAAW,GAAG,KAAK;AAAA,IAC3B;AACA,QAAI,OAAO,mBAAmB;AAC5B,UAAI,GAAG,IAAI,aAAa,MAAM,GAAG,CAAC;AAClC;AAAA,IACF;AACA,UAAM,MAAM,2BAA2B,MAAM,GAAG,GAAG,GAAG;AAEtD,UAAM,MAAM,YAAY,KAAK,GAAG;AAChC,QAAI,KAAK;AACP,aAAO,OAAO,KAAK,OAAO,YAAY,GAAG,CAAC;AAAA,IAC5C,OAAO;AACL,UAAI,GAAG,IAAI;AAAA,IACb;AAAA,EACF;AAEA,YAAU,GAAG;AAEb,SAAO;AACT;AAEO,SAAS,UAAU,OAA4B;AACpD,MAAI,MAAM,cAAc;AACtB,WAAO,OAAO,OAAO,gBAAgB,KAAK,CAAC;AAAA,EAC7C;AAGA,aAAW,OAAO,gBAAgB;AAChC,QAAI,MAAM,GAAG,KAAK,CAAC,MAAM,eAAe,GAAG,CAAC,GAAG;AAC7C,YAAM,eAAe,GAAG,CAAC,IAAI;AAAA,IAC/B;AAAA,EACF;AACF;AAEA,MAAM,iBAAiB;AAAA,EACrB,aAAa;AAAA,EACb,mBAAmB;AAAA,EACnB,gBAAgB;AAAA,EAChB,iBAAiB;AAAA,EACjB,kBAAkB;AACpB;AAEA,SAAS,gBAAgB;AAAA,EACvB;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,GAAwB;AACtB,QAAM,EAAE,QAAQ,MAAM,IAAI,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,IAC1D,GAAI,SAAS;AAAA,MACX,aAAa,eAAe,UAAU,aAAa;AAAA,IACrD;AAAA,IACA,GAAI,QAAQ,IAAI,mBAAmB,aAChC,MAAM;AAEL,YAAM,MAAM,kBAAkB,QAAQ;AACtC,UAAI,CAAC,KAAK;AACR,YAAI,QAAQ,IAAI,aAAa,eAAe;AAE1C,kBAAQ,KAAK,gBAAgB,QAAQ;AAAA,QACvC;AACA,eAAO;AAAA,UACL;AAAA,UACA;AAAA,QACF;AAAA,MACF;AACA,YAAM,EAAE,GAAG,GAAG,GAAG,EAAE,IAAI,KAAK,GAAG;AAC/B,aAAO;AAAA,QACL,aAAa,OAAO,KAAK,KAAK;AAAA,QAC9B,eAAe,iBAAiB;AAAA,MAClC;AAAA,IACF,GAAG;AAAA,EACP;AACF;",
+  "sourcesContent": ["import { getConfig } from '../config'\nimport { expandStyle } from './expandStyle'\nimport { normalizeShadow } from './normalizeShadow'\nimport { normalizeValueWithProperty } from './normalizeValueWithProperty.js'\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>, config = getConfig()) {\n  const res: Record<string, any> = {}\n\n  for (let key in style) {\n    shorthands = shorthands || (config ? config.shorthands : null)\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 (\n    style.shadowRadius ||\n    style.shadowColor ||\n    style.shadowOpacity ||\n    style.shadowOffset\n  ) {\n    Object.assign(style, normalizeShadow(style))\n  }\n\n  // TODO could be native-only\n  // ensure border style set by default to solid\n  for (const key in borderDefaults) {\n    if (key in style && !style[borderDefaults[key]]) {\n      style[borderDefaults[key]] = 'solid'\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,SAAS,iBAAiB;AAC1B,SAAS,mBAAmB;AAC5B,SAAS,uBAAuB;AAChC,SAAS,kCAAkC;AAC3C,SAAS,yBAAyB;AAElC,IAAI,aAA4C;AACzC,MAAM,gBAAgB,EAAE,QAAQ,GAAG,OAAO,EAAE;AAU5C,SAAS,aAAa,OAA4B,SAAS,UAAU,GAAG;AAC7E,QAAM,MAA2B,CAAC;AAElC,WAAS,OAAO,OAAO;AACrB,iBAAa,eAAe,SAAS,OAAO,aAAa;AACzD,QAAI,YAAY;AACd,YAAM,WAAW,GAAG,KAAK;AAAA,IAC3B;AACA,QAAI,OAAO,mBAAmB;AAC5B,UAAI,GAAG,IAAI,aAAa,MAAM,GAAG,CAAC;AAClC;AAAA,IACF;AACA,UAAM,MAAM,2BAA2B,MAAM,GAAG,GAAG,GAAG;AAEtD,UAAM,MAAM,YAAY,KAAK,GAAG;AAChC,QAAI,KAAK;AACP,aAAO,OAAO,KAAK,OAAO,YAAY,GAAG,CAAC;AAAA,IAC5C,OAAO;AACL,UAAI,GAAG,IAAI;AAAA,IACb;AAAA,EACF;AAEA,YAAU,GAAG;AAEb,SAAO;AACT;AAEO,SAAS,UAAU,OAA4B;AACpD,MACE,MAAM,gBACN,MAAM,eACN,MAAM,iBACN,MAAM,cACN;AACA,WAAO,OAAO,OAAO,gBAAgB,KAAK,CAAC;AAAA,EAC7C;AAIA,aAAW,OAAO,gBAAgB;AAChC,QAAI,OAAO,SAAS,CAAC,MAAM,eAAe,GAAG,CAAC,GAAG;AAC/C,YAAM,eAAe,GAAG,CAAC,IAAI;AAAA,IAC/B;AAAA,EACF;AACF;AAEA,MAAM,iBAAiB;AAAA,EACrB,aAAa;AAAA,EACb,mBAAmB;AAAA,EACnB,gBAAgB;AAAA,EAChB,iBAAiB;AAAA,EACjB,kBAAkB;AACpB;",
   "names": []
 }

package/dist/esm/helpers/expandStyles.mjs

@@ -1,8 +1,6 @@
-import { isWeb } from "@tamagui/constants";
-import { normalizeCSSColor } from "@tamagui/normalize-css-color";
 import { getConfig } from "../config";
 import { expandStyle } from "./expandStyle";
-import { normalizeColor, rgba } from "./normalizeColor";
+import { normalizeShadow } from "./normalizeShadow";
 import { normalizeValueWithProperty } from "./normalizeValueWithProperty.js";
 import { pseudoDescriptors } from "./pseudoDescriptors";
 let shorthands = null;
@@ -30,11 +28,11 @@ function expandStyles(style, config = getConfig()) {
   return res;
 }
 function fixStyles(style) {
-  if (style.shadowRadius) {
+  if (style.shadowRadius || style.shadowColor || style.shadowOpacity || style.shadowOffset) {
     Object.assign(style, normalizeShadow(style));
   }
   for (const key in borderDefaults) {
-    if (style[key] && !style[borderDefaults[key]]) {
+    if (key in style && !style[borderDefaults[key]]) {
       style[borderDefaults[key]] = "solid";
     }
   }
@@ -46,42 +44,6 @@ const borderDefaults = {
   borderLeftWidth: "borderLeftStyle",
   borderRightWidth: "borderRightStyle"
 };
-function normalizeShadow({
-  shadowColor,
-  shadowOffset,
-  shadowOpacity,
-  shadowRadius
-}) {
-  const { height, width } = shadowOffset || defaultOffset;
-  const colorStr = String(shadowColor || "black");
-  return {
-    shadowOffset: {
-      width: normalizeValueWithProperty(width || 0),
-      height: normalizeValueWithProperty(height || 0)
-    },
-    shadowRadius: normalizeValueWithProperty(shadowRadius || 0),
-    ...isWeb && {
-      shadowColor: normalizeColor(colorStr, shadowOpacity)
-    },
-    ...process.env.TAMAGUI_TARGET === "native" && (() => {
-      const val = normalizeCSSColor(colorStr);
-      if (!val) {
-        if (process.env.NODE_ENV === "development") {
-          console.warn("No rgba form", colorStr);
-        }
-        return {
-          shadowColor,
-          shadowOpacity
-        };
-      }
-      const { r, g, b, a } = rgba(val);
-      return {
-        shadowColor: `rgb(${r},${g},${b})`,
-        shadowOpacity: shadowOpacity ?? a
-      };
-    })()
-  };
-}
 export {
   defaultOffset,
   expandStyles,

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/expandStyles.ts"],
-  "sourcesContent": ["import { isWeb } from '@tamagui/constants'\nimport { normalizeCSSColor } from '@tamagui/normalize-css-color'\n\nimport { getConfig } from '../config'\nimport { expandStyle } from './expandStyle'\nimport { normalizeColor, rgba } from './normalizeColor'\nimport { normalizeValueWithProperty } from './normalizeValueWithProperty.js'\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>, config = getConfig()) {\n  const res: Record<string, any> = {}\n\n  for (let key in style) {\n    shorthands = shorthands || (config ? config.shorthands : null)\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\nconst borderDefaults = {\n  borderWidth: 'borderStyle',\n  borderBottomWidth: 'borderBottomStyle',\n  borderTopWidth: 'borderTopStyle',\n  borderLeftWidth: 'borderLeftStyle',\n  borderRightWidth: 'borderRightStyle',\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    ...(process.env.TAMAGUI_TARGET === 'native' &&\n      (() => {\n        // on native fix bug - shadows behave better if turned into non-alpha rgb() + shadowOpacity\n        const val = normalizeCSSColor(colorStr)\n        if (!val) {\n          if (process.env.NODE_ENV === 'development') {\n            // eslint-disable-next-line no-console\n            console.warn('No rgba form', colorStr)\n          }\n          return {\n            shadowColor,\n            shadowOpacity,\n          }\n        }\n        const { r, g, b, a } = rgba(val)\n        return {\n          shadowColor: `rgb(${r},${g},${b})`,\n          shadowOpacity: shadowOpacity ?? a,\n        }\n      })()),\n  }\n}\n"],
-  "mappings": "AAAA,SAAS,aAAa;AACtB,SAAS,yBAAyB;AAElC,SAAS,iBAAiB;AAC1B,SAAS,mBAAmB;AAC5B,SAAS,gBAAgB,YAAY;AACrC,SAAS,kCAAkC;AAC3C,SAAS,yBAAyB;AAElC,IAAI,aAA4C;AACzC,MAAM,gBAAgB,EAAE,QAAQ,GAAG,OAAO,EAAE;AAU5C,SAAS,aAAa,OAA4B,SAAS,UAAU,GAAG;AAC7E,QAAM,MAA2B,CAAC;AAElC,WAAS,OAAO,OAAO;AACrB,iBAAa,eAAe,SAAS,OAAO,aAAa;AACzD,QAAI,YAAY;AACd,YAAM,WAAW,GAAG,KAAK;AAAA,IAC3B;AACA,QAAI,OAAO,mBAAmB;AAC5B,UAAI,GAAG,IAAI,aAAa,MAAM,GAAG,CAAC;AAClC;AAAA,IACF;AACA,UAAM,MAAM,2BAA2B,MAAM,GAAG,GAAG,GAAG;AAEtD,UAAM,MAAM,YAAY,KAAK,GAAG;AAChC,QAAI,KAAK;AACP,aAAO,OAAO,KAAK,OAAO,YAAY,GAAG,CAAC;AAAA,IAC5C,OAAO;AACL,UAAI,GAAG,IAAI;AAAA,IACb;AAAA,EACF;AAEA,YAAU,GAAG;AAEb,SAAO;AACT;AAEO,SAAS,UAAU,OAA4B;AACpD,MAAI,MAAM,cAAc;AACtB,WAAO,OAAO,OAAO,gBAAgB,KAAK,CAAC;AAAA,EAC7C;AAGA,aAAW,OAAO,gBAAgB;AAChC,QAAI,MAAM,GAAG,KAAK,CAAC,MAAM,eAAe,GAAG,CAAC,GAAG;AAC7C,YAAM,eAAe,GAAG,CAAC,IAAI;AAAA,IAC/B;AAAA,EACF;AACF;AAEA,MAAM,iBAAiB;AAAA,EACrB,aAAa;AAAA,EACb,mBAAmB;AAAA,EACnB,gBAAgB;AAAA,EAChB,iBAAiB;AAAA,EACjB,kBAAkB;AACpB;AAEA,SAAS,gBAAgB;AAAA,EACvB;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,GAAwB;AACtB,QAAM,EAAE,QAAQ,MAAM,IAAI,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,IAC1D,GAAI,SAAS;AAAA,MACX,aAAa,eAAe,UAAU,aAAa;AAAA,IACrD;AAAA,IACA,GAAI,QAAQ,IAAI,mBAAmB,aAChC,MAAM;AAEL,YAAM,MAAM,kBAAkB,QAAQ;AACtC,UAAI,CAAC,KAAK;AACR,YAAI,QAAQ,IAAI,aAAa,eAAe;AAE1C,kBAAQ,KAAK,gBAAgB,QAAQ;AAAA,QACvC;AACA,eAAO;AAAA,UACL;AAAA,UACA;AAAA,QACF;AAAA,MACF;AACA,YAAM,EAAE,GAAG,GAAG,GAAG,EAAE,IAAI,KAAK,GAAG;AAC/B,aAAO;AAAA,QACL,aAAa,OAAO,KAAK,KAAK;AAAA,QAC9B,eAAe,iBAAiB;AAAA,MAClC;AAAA,IACF,GAAG;AAAA,EACP;AACF;",
+  "sourcesContent": ["import { getConfig } from '../config'\nimport { expandStyle } from './expandStyle'\nimport { normalizeShadow } from './normalizeShadow'\nimport { normalizeValueWithProperty } from './normalizeValueWithProperty.js'\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>, config = getConfig()) {\n  const res: Record<string, any> = {}\n\n  for (let key in style) {\n    shorthands = shorthands || (config ? config.shorthands : null)\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 (\n    style.shadowRadius ||\n    style.shadowColor ||\n    style.shadowOpacity ||\n    style.shadowOffset\n  ) {\n    Object.assign(style, normalizeShadow(style))\n  }\n\n  // TODO could be native-only\n  // ensure border style set by default to solid\n  for (const key in borderDefaults) {\n    if (key in style && !style[borderDefaults[key]]) {\n      style[borderDefaults[key]] = 'solid'\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,SAAS,iBAAiB;AAC1B,SAAS,mBAAmB;AAC5B,SAAS,uBAAuB;AAChC,SAAS,kCAAkC;AAC3C,SAAS,yBAAyB;AAElC,IAAI,aAA4C;AACzC,MAAM,gBAAgB,EAAE,QAAQ,GAAG,OAAO,EAAE;AAU5C,SAAS,aAAa,OAA4B,SAAS,UAAU,GAAG;AAC7E,QAAM,MAA2B,CAAC;AAElC,WAAS,OAAO,OAAO;AACrB,iBAAa,eAAe,SAAS,OAAO,aAAa;AACzD,QAAI,YAAY;AACd,YAAM,WAAW,GAAG,KAAK;AAAA,IAC3B;AACA,QAAI,OAAO,mBAAmB;AAC5B,UAAI,GAAG,IAAI,aAAa,MAAM,GAAG,CAAC;AAClC;AAAA,IACF;AACA,UAAM,MAAM,2BAA2B,MAAM,GAAG,GAAG,GAAG;AAEtD,UAAM,MAAM,YAAY,KAAK,GAAG;AAChC,QAAI,KAAK;AACP,aAAO,OAAO,KAAK,OAAO,YAAY,GAAG,CAAC;AAAA,IAC5C,OAAO;AACL,UAAI,GAAG,IAAI;AAAA,IACb;AAAA,EACF;AAEA,YAAU,GAAG;AAEb,SAAO;AACT;AAEO,SAAS,UAAU,OAA4B;AACpD,MACE,MAAM,gBACN,MAAM,eACN,MAAM,iBACN,MAAM,cACN;AACA,WAAO,OAAO,OAAO,gBAAgB,KAAK,CAAC;AAAA,EAC7C;AAIA,aAAW,OAAO,gBAAgB;AAChC,QAAI,OAAO,SAAS,CAAC,MAAM,eAAe,GAAG,CAAC,GAAG;AAC/C,YAAM,eAAe,GAAG,CAAC,IAAI;AAAA,IAC/B;AAAA,EACF;AACF;AAEA,MAAM,iBAAiB;AAAA,EACrB,aAAa;AAAA,EACb,mBAAmB;AAAA,EACnB,gBAAgB;AAAA,EAChB,iBAAiB;AAAA,EACjB,kBAAkB;AACpB;",
   "names": []
 }

package/dist/esm/helpers/getSplitStyles.js

@@ -33,13 +33,11 @@ import {
   shouldInsertStyleRules,
   updateRules
 } from "./insertStyleRule";
-import { mergeTransform, mergeTransforms } from "./mergeTransform";
 import {
   normalizeValueWithProperty,
   reverseMapClassNameToValue
 } from "./normalizeValueWithProperty.js";
 import { pseudoDescriptors } from "./pseudoDescriptors";
-import { warnOnce } from "./warnOnce";
 const skipProps = {
   animation: true,
   space: true,
@@ -131,15 +129,7 @@ const getSplitStyles = (props, staticConfig, theme, state, parentSplitStyles, la
   }
   conf = conf || getConfig();
   const { shorthands } = conf;
-  const {
-    defaultVariants,
-    variants,
-    propMapper,
-    isReactNative,
-    deoptProps,
-    inlineProps,
-    inlineWhenUnflattened
-  } = staticConfig;
+  const { variants, propMapper, isReactNative, inlineProps, inlineWhenUnflattened } = staticConfig;
   const validStyleProps = staticConfig.isText ? stylePropsText : validStyles;
   const viewProps = {};
   let pseudos = null;
@@ -161,7 +151,6 @@ const getSplitStyles = (props, staticConfig, theme, state, parentSplitStyles, la
   const styleState = {
     classNames,
     conf,
-    flatTransforms,
     props,
     state,
     staticConfig,
@@ -171,11 +160,6 @@ const getSplitStyles = (props, staticConfig, theme, state, parentSplitStyles, la
     viewProps,
     languageContext
   };
-  if (process.env.NODE_ENV === "development") {
-    if (props.selectable) {
-      warnOnce("props.selectable", "selectable props deprecated, use userSelect");
-    }
-  }
   if (process.env.NODE_ENV === "development" && debug === "verbose") {
     console.groupCollapsed("getSplitStyles (looping backwards)");
     console.log({ staticConfig, shouldDoClasses, state, IS_STATIC, propKeys });
@@ -474,7 +458,7 @@ const getSplitStyles = (props, staticConfig, theme, state, parentSplitStyles, la
             if (isDisabled) {
               if (!(pkey in usedKeys) && pkey in animatableDefaults) {
                 const defaultVal = animatableDefaults[pkey];
-                mergeStyle(styleState, pkey, defaultVal, true);
+                mergeStyle(styleState, flatTransforms, pkey, defaultVal, true);
               }
               continue;
             }
@@ -485,7 +469,7 @@ const getSplitStyles = (props, staticConfig, theme, state, parentSplitStyles, la
               pseudos ||= {};
               pseudos[key] ||= {};
               pseudos[key][pkey] = val2;
-              mergeStyle(styleState, pkey, val2);
+              mergeStyle(styleState, flatTransforms, pkey, val2);
             }
             if (process.env.NODE_ENV === "development" && debug === "verbose") {
               console.log("Merged pseudo?", shouldMerge, { importance, curImportance, pkey, val: val2 });
@@ -584,7 +568,7 @@ const getSplitStyles = (props, staticConfig, theme, state, parentSplitStyles, la
         fontFamily = valInit[0] === "$" ? valInit : val;
       }
       if (key in validStyleProps) {
-        mergeStyle(styleState, key, val);
+        mergeStyle(styleState, flatTransforms, key, val);
         continue;
       }
       if (!variants || !(key in variants)) {
@@ -751,7 +735,7 @@ function getSubStyleProps(defaultProps, baseProps, specificProps) {
   }
   return cache.get(key);
 }
-function mergeStyle({ usedKeys, classNames, flatTransforms, viewProps, style }, key, val, dontSetUsed = false) {
+function mergeStyle({ usedKeys, classNames, viewProps, style }, flatTransforms, key, val, dontSetUsed = false) {
   if (!dontSetUsed) {
     usedKeys[key] ||= 1;
   }
@@ -834,6 +818,21 @@ const animatableDefaults = {
 };
 const lowercaseHyphenate = (match) => `-${match.toLowerCase()}`;
 const hyphenate = (str) => str.replace(/[A-Z]/g, lowercaseHyphenate);
+const mergeTransform = (obj, key, val, backwards = false) => {
+  obj.transform ||= [];
+  obj.transform[backwards ? "unshift" : "push"]({
+    [mapTransformKeys[key] || key]: val
+  });
+};
+const mergeTransforms = (obj, flatTransforms, backwards = false) => {
+  Object.entries(flatTransforms).forEach(([key, val]) => {
+    mergeTransform(obj, key, val, backwards);
+  });
+};
+const mapTransformKeys = {
+  x: "translateX",
+  y: "translateY"
+};
 export {
   PROP_SPLIT,
   getSplitStyles,