@tamagui/theme-base 1.0.0-beta.153 → 1.0.0-beta.16

package/dist/cjs/colorUtils.js

@@ -57,4 +57,9 @@ const getAlphaFloat = /* @__PURE__ */ __name((a, alpha = 1) => {
   }
   return alpha;
 }, "getAlphaFloat");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  hexToRGBA,
+  setColorAlpha
+});
 //# sourceMappingURL=colorUtils.js.map

package/dist/cjs/themes.js

@@ -79,7 +79,10 @@ __name(createThemesFrom, "createThemesFrom");
 const createTheme = /* @__PURE__ */ __name((str = 1, {
   backgrounds,
   isLight = true,
+  isBase = false,
   colors = [...backgrounds].reverse(),
+  borderColors = isLight ? colors : backgrounds,
+  backgroundStronger,
   offsets: offsetsProp
 }) => {
   const offsets = {
@@ -95,29 +98,45 @@ const createTheme = /* @__PURE__ */ __name((str = 1, {
     return arr[Math.max(0, Math.min(index + (offsets[name][str] || 0), arr.length - 1))];
   }, "get");
   const colorTranslucent = (0, import_colorUtils.setColorAlpha)((0, import_core.getVariableValue)(get(colors, 0 + str, "color")), 0.5);
-  return {
+  let theme = {
     background: get(backgrounds, str),
-    backgroundStronger: get(backgrounds, str + strongerDir),
+    backgroundStronger: backgroundStronger || get(backgrounds, str + strongerDir),
     backgroundSoft: get(backgrounds, str + 3),
-    backgroundHover: get(backgrounds, str + lighterDir),
+    backgroundHover: get(backgrounds, str + strongerDir),
     backgroundPress: get(backgrounds, str + darkerDir * 1),
     backgroundFocus: get(backgrounds, str + darkerDir * 2),
     backgroundTransparent: import_tokens.color.grayA1,
-    borderColor: isLight ? get(colors, 8 - str, "borderColor") : get(backgrounds, 2 + str, "borderColor"),
-    borderColorHover: isLight ? get(colors, 6 - str, "borderColor") : get(backgrounds, 3 + str, "borderColor"),
-    borderColorPress: isLight ? get(colors, 5 - str, "borderColor") : get(backgrounds, 1 + str, "borderColor"),
-    borderColorFocus: isLight ? get(colors, 4 - str, "borderColor") : get(backgrounds, 3 + str, "borderColor"),
     color: get(colors, 0 + str, "color"),
     colorHover: get(colors, 1 + str, "color"),
     colorPress: get(colors, 2 + str, "color"),
     colorFocus: get(colors, 3 + str, "color"),
     colorTranslucent,
     colorMid: colors[Math.floor(colors.length / 2)],
-    shadowColor: isLight ? import_tokens.color.grayA3 : import_tokens.color.grayA8,
+    shadowColor: isLight ? import_tokens.color.grayA2 : import_tokens.color.grayA8,
     shadowColorHover: darkColors[!isLight ? 1 : 8],
     shadowColorPress: darkColors[!isLight ? 1 : 8],
-    shadowColorFocus: darkColors[!isLight ? 1 : 8]
+    shadowColorFocus: darkColors[!isLight ? 1 : 8],
+    borderColor: null,
+    borderColorHover: null,
+    borderColorPress: null,
+    borderColorFocus: null
   };
+  if (isBase) {
+    Object.assign(theme, {
+      borderColor: isLight ? get(colors, 8 - str, "borderColor") : get(backgrounds, 2 + str, "borderColor"),
+      borderColorHover: isLight ? get(colors, 6 - str, "borderColor") : get(backgrounds, 3 + str, "borderColor"),
+      borderColorPress: isLight ? get(colors, 5 - str, "borderColor") : get(backgrounds, 1 + str, "borderColor"),
+      borderColorFocus: isLight ? get(colors, 4 - str, "borderColor") : get(backgrounds, 3 + str, "borderColor")
+    });
+  } else {
+    Object.assign(theme, {
+      borderColor: get(borderColors, 1 + strongerDir, "borderColor"),
+      borderColorHover: get(borderColors, 2 + strongerDir, "borderColor"),
+      borderColorPress: get(borderColors, 3 + strongerDir, "borderColor"),
+      borderColorFocus: get(borderColors, 4 + strongerDir, "borderColor")
+    });
+  }
+  return theme;
 }, "createTheme");
 const colorSchemes = [
   { name: "blue", colors: Colors.blue, darkColors: Colors.blueDark },
@@ -166,26 +185,32 @@ const darkGradient = [
 ];
 const lightThemes = createThemesFrom("light", createTheme, {
   backgrounds: lightGradient,
+  backgroundStronger: "#fcfcfc",
+  borderColors: lightGradient.slice(2),
   isLight: true
 });
 const darkThemes = createThemesFrom("dark", createTheme, {
   backgrounds: darkGradient,
-  colors: lightGradient,
+  colors: lightGradient.slice(2),
+  backgroundStronger: "#111",
+  isBase: true,
   isLight: false,
   shift: 1,
   offsets: {
-    color: [0, 6, 7, 7, 7, 7]
+    color: [0, 4, 5, 5, 5, 5]
   }
 });
 const baseThemes = __spreadProps(__spreadValues(__spreadProps(__spreadValues({}, lightThemes), {
   light: __spreadValues(__spreadValues({}, import_colors.allLightColors), lightThemes.light),
   light_active: makeActiveTheme(lightThemes.light),
   light_Card: lightThemes.light,
+  light_DrawerFrame: lightThemes.light_alt1,
   light_Button: lightThemes.light_alt1
 }), darkThemes), {
   dark: __spreadValues(__spreadValues({}, import_colors.allDarkColors), darkThemes.dark),
   dark_active: makeActiveTheme(darkThemes.dark),
   dark_Card: darkThemes.dark_alt1,
+  dark_DrawerFrame: darkThemes.dark_alt2,
   dark_Button: darkThemes.dark_alt1
 });
 function makeActiveTheme(theme) {
@@ -198,23 +223,31 @@ function makeActiveTheme(theme) {
 }
 __name(makeActiveTheme, "makeActiveTheme");
 const colorThemeEntries = colorSchemes.flatMap(({ name, colors, darkColors }) => {
-  const [altLightThemes, altDarkThemes] = [colors, darkColors].map((colors2, i) => {
+  const [altLightThemes, altDarkThemes] = [
+    { colors: darkColors, backgrounds: colors },
+    { colors, backgrounds: darkColors }
+  ].map((props, i) => {
     const isLight = i === 0;
+    const [backgrounds, colors2] = [
+      Object.values(props.backgrounds),
+      Object.values(props.colors).slice(isLight ? 2 : 2)
+    ];
     const scheme = isLight ? "light" : "dark";
     const shift = isLight ? 0 : 1;
-    let backgrounds = Object.values(colors2);
     if (!isLight) {
       const [_, h, sp, lp] = backgrounds[0].match(/hsl\(([0-9\.]+), ([0-9\.]+)\%, ([0-9\.]+)\%\)/);
       backgrounds.unshift(`hsl(${h}, ${sp}%, ${parseFloat(lp) / 2}%)`);
     }
     const themeWithAlts = createThemesFrom(name, createTheme, {
+      colors: colors2,
       backgrounds,
+      borderColors: backgrounds,
       isLight,
       shift,
       isBase: false,
       offsets: {
-        background: isLight ? [1, 1, 1, 0, 0, 0] : null,
-        borderColor: isLight ? [0, 1, 1, 2, 2, -2] : null,
+        background: isLight ? [1, 1, 1, 1, 1, 1] : null,
+        borderColor: isLight ? [2, 2, 2, 3, 2] : null,
         color: isLight ? [0, 0, -1, -2, -3, -3, -4] : [-1, -1, -1, -1, -1, -1]
       }
     });
@@ -225,32 +258,22 @@ const colorThemeEntries = colorSchemes.flatMap(({ name, colors, darkColors }) =>
   return [
     ...altLightThemes,
     [`${lightButtonTheme[0]}_Button`, altLightThemes[2][1]],
+    [`${lightButtonTheme[0]}_Card`, altLightThemes[2][1]],
+    [`${lightButtonTheme[0]}_DrawerFrame`, altLightThemes[2][1]],
     ...altDarkThemes,
-    [`${darkButtonTheme[0]}_Button`, altDarkThemes[2][1]]
+    [`${darkButtonTheme[0]}_Button`, altDarkThemes[2][1]],
+    [`${darkButtonTheme[0]}_Card`, altDarkThemes[2][1]],
+    [`${darkButtonTheme[0]}_DrawerFrame`, altDarkThemes[2][1]]
   ];
 });
-const transparent = {
-  background: "transparent",
-  backgroundSoft: "transparent",
-  backgroundHover: "transparent",
-  backgroundPress: "transparent",
-  backgroundFocus: "transparent",
-  backgroundTransparent: "transparent",
-  shadowColor: "transparent",
-  shadowColorHover: "transparent",
-  shadowColorPress: "transparent",
-  shadowColorFocus: "transparent"
-};
-const dark_outline = __spreadValues(__spreadProps(__spreadValues({}, baseThemes.dark), {
-  borderColor: "#fff"
-}), transparent);
-const light_outline = __spreadValues(__spreadProps(__spreadValues({}, baseThemes.light), {
-  borderColor: "#000"
-}), transparent);
 const colorThemes = Object.fromEntries(colorThemeEntries);
-const allThemes = __spreadProps(__spreadValues(__spreadValues({}, baseThemes), colorThemes), {
-  dark_outline,
-  light_outline
-});
+const allThemes = __spreadValues(__spreadValues({}, baseThemes), colorThemes);
 const themes = allThemes;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  colorSchemes,
+  darkGradient,
+  lightGradient,
+  themes
+});
 //# sourceMappingURL=themes.js.map

package/dist/cjs/themes.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/themes.tsx"],
-  "sourcesContent": ["import * as Colors from '@tamagui/colors'\nimport { allDarkColors, allLightColors } from '@tamagui/colors'\nimport { Variable, getVariableValue } from '@tamagui/core'\n\nimport { setColorAlpha } from './colorUtils'\nimport { color } from './tokens'\n\ntype ThemeCreatorProps = {\n  shift?: number\n  backgrounds: (string | Variable)[]\n  colors?: (string | Variable)[]\n  offsets?: {\n    color?: number[] | null\n    background?: number[] | null\n    borderColor?: number[] | null\n  }\n  isLight?: boolean\n  isBase?: boolean\n}\n\n// helpers\n\nconst alternates = [1, 2, 3, 4] as const\ntype AltKeys = 1 | 2 | 3 | 4 // one less for dark_darker\ntype AltName<Name extends string, Keys extends string | number> = `${Name}_alt${Keys}`\ntype ThemeCreator<A = any> = (str: number, props: ThemeCreatorProps) => A\n\nfunction createThemesFrom<Name extends string, GetTheme extends ThemeCreator = ThemeCreator>(\n  name: Name,\n  getTheme: GetTheme,\n  props: ThemeCreatorProps\n): {\n  [key in `${Name}_alt${AltKeys}` | `${Name}` | `${Name}_darker`]: GetTheme extends ThemeCreator<\n    infer Theme\n  >\n    ? Theme\n    : never\n} {\n  const { shift = 0 } = props\n  const theme = getTheme(0 + shift, props)\n  let themeEntries: any[] = [[name, theme]]\n  const altThemes: any[] = alternates.map((alt) => [\n    `${name}_alt${alt}`,\n    getTheme(alt + shift, props),\n  ])\n  const altButtonThemes: any[] = alternates.map((_, i) => {\n    const [bName, bTheme] = [altThemes[i][0], (altThemes[i + 1] || altThemes[i])[1]]\n    return [`${bName}_Button` as any, bTheme]\n  })\n  // add these after alts since we rely on positioning\n  const darkerTheme = getTheme(Math.max(0, shift + (props.isLight ? 1 : -1)), props)\n  const activeTheme = makeActiveTheme(theme)\n  themeEntries = [\n    ...themeEntries,\n    ...altThemes,\n    ...altButtonThemes,\n    [`${name}_Button`, altThemes[0][1]],\n    [`${name}_darker`, darkerTheme],\n    [`${name}_active`, activeTheme],\n  ]\n  const themes = Object.fromEntries(themeEntries)\n  // if (props.isLight) {\n  //   console.log('themes', themes)\n  // }\n  return themes as any\n}\n\nconst createTheme = (\n  str = 1,\n  {\n    backgrounds,\n    isLight = true,\n    // isBase = false,\n    colors = [...backgrounds].reverse(),\n    offsets: offsetsProp,\n  }: ThemeCreatorProps\n) => {\n  const offsets = {\n    borderColor: offsetsProp?.borderColor ?? offsetsProp?.background ?? [0, 0, 0, 0],\n    background: offsetsProp?.background ?? [0, 0, 0, 0],\n    color: offsetsProp?.color ?? [0, 0, 0, 0],\n  }\n  const darkColors = isLight ? colors : backgrounds\n  const lighterDir = isLight ? -1 : 1\n  const darkerDir = -lighterDir\n  const strongerDir = isLight ? darkerDir : lighterDir\n  const get = (arr: any[], index: number, name = 'background') => {\n    return arr[Math.max(0, Math.min(index + (offsets[name][str] || 0), arr.length - 1))]\n  }\n\n  const colorTranslucent = setColorAlpha(getVariableValue(get(colors, 0 + str, 'color')), 0.5)\n\n  return {\n    background: get(backgrounds, str),\n    backgroundStronger: get(backgrounds, str + strongerDir),\n    backgroundSoft: get(backgrounds, str + 3),\n    backgroundHover: get(backgrounds, str + lighterDir),\n    backgroundPress: get(backgrounds, str + darkerDir * 1),\n    backgroundFocus: get(backgrounds, str + darkerDir * 2),\n    backgroundTransparent: color.grayA1,\n    borderColor: isLight\n      ? get(colors, 8 - str, 'borderColor')\n      : get(backgrounds, 2 + str, 'borderColor'),\n    borderColorHover: isLight\n      ? get(colors, 6 - str, 'borderColor')\n      : get(backgrounds, 3 + str, 'borderColor'),\n    borderColorPress: isLight\n      ? get(colors, 5 - str, 'borderColor')\n      : get(backgrounds, 1 + str, 'borderColor'),\n    borderColorFocus: isLight\n      ? get(colors, 4 - str, 'borderColor')\n      : get(backgrounds, 3 + str, 'borderColor'),\n    // colorStronger: get(colors, str + strongerDir),\n    color: get(colors, 0 + str, 'color'),\n    colorHover: get(colors, 1 + str, 'color'),\n    colorPress: get(colors, 2 + str, 'color'),\n    colorFocus: get(colors, 3 + str, 'color'),\n    colorTranslucent,\n    colorMid: colors[Math.floor(colors.length / 2)],\n    shadowColor: isLight ? color.grayA3 : color.grayA8,\n    shadowColorHover: darkColors[!isLight ? 1 : 8],\n    shadowColorPress: darkColors[!isLight ? 1 : 8],\n    shadowColorFocus: darkColors[!isLight ? 1 : 8],\n  }\n}\n\nexport const colorSchemes = [\n  { name: 'blue', colors: Colors.blue, darkColors: Colors.blueDark },\n  { name: 'gray', colors: Colors.gray, darkColors: Colors.grayDark },\n  { name: 'green', colors: Colors.green, darkColors: Colors.greenDark },\n  { name: 'indigo', colors: Colors.indigo, darkColors: Colors.indigoDark },\n  { name: 'orange', colors: Colors.orange, darkColors: Colors.orangeDark },\n  { name: 'pink', colors: Colors.pink, darkColors: Colors.pinkDark },\n  { name: 'purple', colors: Colors.purple, darkColors: Colors.purpleDark },\n  { name: 'red', colors: Colors.red, darkColors: Colors.redDark },\n  { name: 'violet', colors: Colors.violet, darkColors: Colors.violetDark },\n  { name: 'yellow', colors: Colors.yellow, darkColors: Colors.yellowDark },\n  { name: 'teal', colors: Colors.teal, darkColors: Colors.tealDark },\n  { name: 'lime', colors: Colors.lime, darkColors: Colors.limeDark },\n  { name: 'brown', colors: Colors.brown, darkColors: Colors.brownDark },\n] as const\n\nexport type ColorNames = typeof colorSchemes[number]['name']\n\nexport const lightGradient = [\n  '#fff',\n  '#f4f4f4',\n  color.gray1,\n  color.gray2,\n  color.gray3,\n  color.gray4,\n  color.gray5,\n  color.gray6,\n  color.gray7,\n  color.gray8,\n  color.gray9,\n  color.gray10,\n  color.gray11,\n  color.gray12,\n]\n\nexport const darkGradient = [\n  '#111111',\n  '#151515',\n  '#191919',\n  '#232323',\n  '#282828',\n  '#323232',\n  '#383838',\n  '#424242',\n  '#494949',\n  '#545454',\n  '#626262',\n  '#777777',\n]\n\nconst lightThemes = createThemesFrom('light', createTheme, {\n  backgrounds: lightGradient,\n  isLight: true,\n})\n\nconst darkThemes = createThemesFrom('dark', createTheme, {\n  backgrounds: darkGradient,\n  colors: lightGradient,\n  isLight: false,\n  shift: 1,\n  offsets: {\n    color: [0, 6, 7, 7, 7, 7],\n  },\n})\n\nconst baseThemes = {\n  // light\n  ...lightThemes,\n  light: {\n    ...allLightColors,\n    ...lightThemes.light,\n  },\n  light_active: makeActiveTheme(lightThemes.light),\n  light_Card: lightThemes.light,\n  light_Button: lightThemes.light_alt1,\n\n  // dark\n  ...darkThemes,\n  dark: {\n    ...allDarkColors,\n    ...darkThemes.dark,\n  },\n  dark_active: makeActiveTheme(darkThemes.dark),\n  dark_Card: darkThemes.dark_alt1,\n  dark_Button: darkThemes.dark_alt1,\n}\n\nfunction makeActiveTheme(theme: any) {\n  const res = { ...theme }\n  res.backgroundHover = res.background\n  res.colorHover = res.color\n  res.backgroundPress = res.background\n  res.colorPress = res.color\n  return res\n}\n\ntype ColorThemeNames =\n  | ColorNames\n  | AltName<`light_${ColorNames}`, AltKeys>\n  | AltName<`dark_${ColorNames}`, AltKeys>\n\nconst colorThemeEntries = colorSchemes.flatMap(({ name, colors, darkColors }) => {\n  const [altLightThemes, altDarkThemes] = [colors, darkColors].map((colors, i) => {\n    const isLight = i === 0\n    const scheme = isLight ? 'light' : 'dark'\n    const shift = isLight ? 0 : 1\n\n    let backgrounds = Object.values(colors) as any[]\n    if (!isLight) {\n      const [_, h, sp, lp] = backgrounds[0].match(/hsl\\(([0-9\\.]+), ([0-9\\.]+)\\%, ([0-9\\.]+)\\%\\)/)\n      backgrounds.unshift(`hsl(${h}, ${sp}%, ${parseFloat(lp) / 2}%)`)\n    }\n\n    const themeWithAlts = createThemesFrom(name, createTheme, {\n      backgrounds,\n      isLight,\n      shift,\n      isBase: false,\n      offsets: {\n        background: isLight ? [1, 1, 1, 0, 0, 0] : null,\n        borderColor: isLight ? [0, 1, 1, 2, 2, -2] : null,\n        color: isLight ? [0, 0, -1, -2, -3, -3, -4] : [-1, -1, -1, -1, -1, -1],\n      },\n    })\n    return Object.entries(themeWithAlts).map(([k, v]) => [`${scheme}_${k}`, v])\n  })\n  const lightButtonTheme = altLightThemes[0]\n  const darkButtonTheme = altDarkThemes[0]\n  return [\n    ...altLightThemes,\n    [`${lightButtonTheme[0]}_Button`, altLightThemes[2][1]],\n    ...altDarkThemes,\n    [`${darkButtonTheme[0]}_Button`, altDarkThemes[2][1]],\n  ]\n})\n\nconst transparent = {\n  background: 'transparent',\n  backgroundSoft: 'transparent',\n  backgroundHover: 'transparent',\n  backgroundPress: 'transparent',\n  backgroundFocus: 'transparent',\n  backgroundTransparent: 'transparent',\n  shadowColor: 'transparent',\n  shadowColorHover: 'transparent',\n  shadowColorPress: 'transparent',\n  shadowColorFocus: 'transparent',\n}\n\ntype MyThemeBase = typeof baseThemes['light_alt1']\n\n// @ts-ignore\nconst dark_outline: MyThemeBase = {\n  ...baseThemes.dark,\n  borderColor: '#fff',\n  ...transparent,\n}\n\n// @ts-ignore\nconst light_outline: MyThemeBase = {\n  ...baseThemes.light,\n  borderColor: '#000',\n  ...transparent,\n}\n\nconst colorThemes: {\n  [key in ColorThemeNames]: MyThemeBase\n} = Object.fromEntries(colorThemeEntries) as any\n\nconst allThemes = {\n  ...baseThemes,\n  ...colorThemes,\n  dark_outline,\n  light_outline,\n} as const\n\nexport const themes: {\n  [key in keyof typeof allThemes]: typeof baseThemes['light']\n} = allThemes as any\n\n// TODO\n// export function createThemes(props: {\n//   colors?:\n//     | 'amber'\n//     | 'blue'\n//     | 'bronze'\n//     | 'brown'\n//     | 'crimson'\n//     | 'cyan'\n//     | 'gold'\n//     | 'grass'\n//     | 'gray'\n//     | 'green'\n//     | 'indigo'\n//     | 'lime'\n//     | 'mint'\n//     | 'olive'\n//     | 'orange'\n//     | 'pink'\n//     | 'plum'\n//     | 'purple'\n//     | 'mauve'\n//     | 'red'\n//     | 'sage'\n//     | 'sand'\n//     | 'sky'\n//     | 'slate'\n//     | 'teal'\n//     | 'tomato'\n//     | 'violet'\n//     | 'yellow'\n//   alternates?: number\n// }) {}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import * as Colors from '@tamagui/colors'\nimport { allDarkColors, allLightColors } from '@tamagui/colors'\nimport { Variable, getVariableValue } from '@tamagui/core'\n\nimport { setColorAlpha } from './colorUtils'\nimport { color } from './tokens'\n\n// spaghetti ahead\n\ntype ThemeCreatorProps = {\n  shift?: number\n  backgrounds: (string | Variable)[]\n  backgroundStronger?: string | Variable\n  borderColors?: (string | Variable)[]\n  colors?: (string | Variable)[]\n  offsets?: {\n    color?: number[] | null\n    background?: number[] | null\n    borderColor?: number[] | null\n  }\n  isLight?: boolean\n  isBase?: boolean\n}\n\n// helpers\n\nconst alternates = [1, 2, 3, 4] as const\ntype AltKeys = 1 | 2 | 3 | 4 // one less for dark_darker\ntype AltName<Name extends string, Keys extends string | number> = `${Name}_alt${Keys}`\ntype ThemeCreator<A = any> = (str: number, props: ThemeCreatorProps) => A\n\nfunction createThemesFrom<Name extends string, GetTheme extends ThemeCreator = ThemeCreator>(\n  name: Name,\n  getTheme: GetTheme,\n  props: ThemeCreatorProps\n): {\n  [key in `${Name}_alt${AltKeys}` | `${Name}` | `${Name}_darker`]: GetTheme extends ThemeCreator<\n    infer Theme\n  >\n    ? Theme\n    : never\n} {\n  const { shift = 0 } = props\n  const theme = getTheme(0 + shift, props)\n  let themeEntries: any[] = [[name, theme]]\n  const altThemes: any[] = alternates.map((alt) => [\n    `${name}_alt${alt}`,\n    getTheme(alt + shift, props),\n  ])\n  const altButtonThemes: any[] = alternates.map((_, i) => {\n    const [bName, bTheme] = [altThemes[i][0], (altThemes[i + 1] || altThemes[i])[1]]\n    return [`${bName}_Button` as any, bTheme]\n  })\n  // add these after alts since we rely on positioning\n  const darkerTheme = getTheme(Math.max(0, shift + (props.isLight ? 1 : -1)), props)\n  const activeTheme = makeActiveTheme(theme)\n  themeEntries = [\n    ...themeEntries,\n    ...altThemes,\n    ...altButtonThemes,\n    [`${name}_Button`, altThemes[0][1]],\n    [`${name}_darker`, darkerTheme],\n    [`${name}_active`, activeTheme],\n  ]\n  const themes = Object.fromEntries(themeEntries)\n  // if (props.isLight) {\n  //   console.log('themes', themes)\n  // }\n  return themes as any\n}\n\nconst createTheme = (\n  str = 1,\n  {\n    backgrounds,\n    isLight = true,\n    isBase = false,\n    colors = [...backgrounds].reverse(),\n    borderColors = isLight ? colors : backgrounds,\n    backgroundStronger,\n    offsets: offsetsProp,\n  }: ThemeCreatorProps\n) => {\n  const offsets = {\n    borderColor: offsetsProp?.borderColor ?? offsetsProp?.background ?? [0, 0, 0, 0],\n    background: offsetsProp?.background ?? [0, 0, 0, 0],\n    color: offsetsProp?.color ?? [0, 0, 0, 0],\n  }\n  const darkColors = isLight ? colors : backgrounds\n  const lighterDir = isLight ? -1 : 1\n  const darkerDir = -lighterDir\n  const strongerDir = isLight ? darkerDir : lighterDir\n  const get = (arr: any[], index: number, name = 'background') => {\n    return arr[Math.max(0, Math.min(index + (offsets[name][str] || 0), arr.length - 1))]\n  }\n\n  const colorTranslucent = setColorAlpha(getVariableValue(get(colors, 0 + str, 'color')), 0.5)\n\n  let theme = {\n    background: get(backgrounds, str),\n    backgroundStronger: backgroundStronger || get(backgrounds, str + strongerDir),\n    backgroundSoft: get(backgrounds, str + 3),\n    backgroundHover: get(backgrounds, str + strongerDir),\n    backgroundPress: get(backgrounds, str + darkerDir * 1),\n    backgroundFocus: get(backgrounds, str + darkerDir * 2),\n    backgroundTransparent: color.grayA1,\n    color: get(colors, 0 + str, 'color'),\n    colorHover: get(colors, 1 + str, 'color'),\n    colorPress: get(colors, 2 + str, 'color'),\n    colorFocus: get(colors, 3 + str, 'color'),\n    colorTranslucent,\n    colorMid: colors[Math.floor(colors.length / 2)],\n    shadowColor: isLight ? color.grayA2 : color.grayA8,\n    shadowColorHover: darkColors[!isLight ? 1 : 8],\n    shadowColorPress: darkColors[!isLight ? 1 : 8],\n    shadowColorFocus: darkColors[!isLight ? 1 : 8],\n    borderColor: null as any as string | Variable,\n    borderColorHover: null as any as string | Variable,\n    borderColorPress: null as any as string | Variable,\n    borderColorFocus: null as any as string | Variable,\n  }\n\n  if (isBase) {\n    Object.assign(theme, {\n      borderColor: isLight\n        ? get(colors, 8 - str, 'borderColor')\n        : get(backgrounds, 2 + str, 'borderColor'),\n      borderColorHover: isLight\n        ? get(colors, 6 - str, 'borderColor')\n        : get(backgrounds, 3 + str, 'borderColor'),\n      borderColorPress: isLight\n        ? get(colors, 5 - str, 'borderColor')\n        : get(backgrounds, 1 + str, 'borderColor'),\n      borderColorFocus: isLight\n        ? get(colors, 4 - str, 'borderColor')\n        : get(backgrounds, 3 + str, 'borderColor'),\n    })\n  } else {\n    Object.assign(theme, {\n      borderColor: get(borderColors, 1 + strongerDir, 'borderColor'),\n      borderColorHover: get(borderColors, 2 + strongerDir, 'borderColor'),\n      borderColorPress: get(borderColors, 3 + strongerDir, 'borderColor'),\n      borderColorFocus: get(borderColors, 4 + strongerDir, 'borderColor'),\n    })\n  }\n\n  return theme\n}\n\nexport const colorSchemes = [\n  { name: 'blue', colors: Colors.blue, darkColors: Colors.blueDark },\n  { name: 'gray', colors: Colors.gray, darkColors: Colors.grayDark },\n  { name: 'green', colors: Colors.green, darkColors: Colors.greenDark },\n  { name: 'indigo', colors: Colors.indigo, darkColors: Colors.indigoDark },\n  { name: 'orange', colors: Colors.orange, darkColors: Colors.orangeDark },\n  { name: 'pink', colors: Colors.pink, darkColors: Colors.pinkDark },\n  { name: 'purple', colors: Colors.purple, darkColors: Colors.purpleDark },\n  { name: 'red', colors: Colors.red, darkColors: Colors.redDark },\n  { name: 'violet', colors: Colors.violet, darkColors: Colors.violetDark },\n  { name: 'yellow', colors: Colors.yellow, darkColors: Colors.yellowDark },\n  { name: 'teal', colors: Colors.teal, darkColors: Colors.tealDark },\n  { name: 'lime', colors: Colors.lime, darkColors: Colors.limeDark },\n  { name: 'brown', colors: Colors.brown, darkColors: Colors.brownDark },\n] as const\n\nexport type ColorNames = typeof colorSchemes[number]['name']\n\nexport const lightGradient = [\n  '#fff',\n  '#f4f4f4',\n  color.gray1,\n  color.gray2,\n  color.gray3,\n  color.gray4,\n  color.gray5,\n  color.gray6,\n  color.gray7,\n  color.gray8,\n  color.gray9,\n  color.gray10,\n  color.gray11,\n  color.gray12,\n]\n\nexport const darkGradient = [\n  '#111111',\n  '#151515',\n  '#191919',\n  '#232323',\n  '#282828',\n  '#323232',\n  '#383838',\n  '#424242',\n  '#494949',\n  '#545454',\n  '#626262',\n  '#777777',\n]\n\nconst lightThemes = createThemesFrom('light', createTheme, {\n  backgrounds: lightGradient,\n  // isBase: true,\n  backgroundStronger: '#fcfcfc',\n  borderColors: lightGradient.slice(2),\n  isLight: true,\n})\n\nconst darkThemes = createThemesFrom('dark', createTheme, {\n  backgrounds: darkGradient,\n  colors: lightGradient.slice(2),\n  backgroundStronger: '#111',\n  isBase: true,\n  isLight: false,\n  shift: 1,\n  offsets: {\n    color: [0, 4, 5, 5, 5, 5],\n  },\n})\n\nconst baseThemes = {\n  // light\n  ...lightThemes,\n  light: {\n    ...allLightColors,\n    ...lightThemes.light,\n  },\n  light_active: makeActiveTheme(lightThemes.light),\n  light_Card: lightThemes.light,\n  light_DrawerFrame: lightThemes.light_alt1,\n  light_Button: lightThemes.light_alt1,\n\n  // dark\n  ...darkThemes,\n  dark: {\n    ...allDarkColors,\n    ...darkThemes.dark,\n  },\n  dark_active: makeActiveTheme(darkThemes.dark),\n  dark_Card: darkThemes.dark_alt1,\n  dark_DrawerFrame: darkThemes.dark_alt2,\n  dark_Button: darkThemes.dark_alt1,\n}\n\nfunction makeActiveTheme(theme: any) {\n  const res = { ...theme }\n  res.backgroundHover = res.background\n  res.colorHover = res.color\n  res.backgroundPress = res.background\n  res.colorPress = res.color\n  return res\n}\n\ntype ColorThemeNames =\n  | ColorNames\n  | AltName<`light_${ColorNames}`, AltKeys>\n  | AltName<`dark_${ColorNames}`, AltKeys>\n\nconst colorThemeEntries = colorSchemes.flatMap(({ name, colors, darkColors }) => {\n  const [altLightThemes, altDarkThemes] = [\n    { colors: darkColors, backgrounds: colors },\n    { colors, backgrounds: darkColors },\n  ].map((props, i) => {\n    const isLight = i === 0\n    const [backgrounds, colors] = [\n      Object.values(props.backgrounds),\n      Object.values(props.colors).slice(isLight ? 2 : 2),\n    ] as const\n\n    const scheme = isLight ? 'light' : 'dark'\n    const shift = isLight ? 0 : 1\n\n    if (!isLight) {\n      const [_, h, sp, lp] = backgrounds[0].match(/hsl\\(([0-9\\.]+), ([0-9\\.]+)\\%, ([0-9\\.]+)\\%\\)/)!\n      backgrounds.unshift(`hsl(${h}, ${sp}%, ${parseFloat(lp) / 2}%)`)\n    }\n\n    const themeWithAlts = createThemesFrom(name, createTheme, {\n      colors,\n      backgrounds,\n      borderColors: backgrounds,\n      isLight,\n      shift,\n      isBase: false,\n      offsets: {\n        background: isLight ? [1, 1, 1, 1, 1, 1] : null,\n        borderColor: isLight ? [2, 2, 2, 3, 2] : null,\n        color: isLight ? [0, 0, -1, -2, -3, -3, -4] : [-1, -1, -1, -1, -1, -1],\n      },\n    })\n\n    return Object.entries(themeWithAlts).map(([k, v]) => [`${scheme}_${k}`, v])\n  })\n  const lightButtonTheme = altLightThemes[0]\n  const darkButtonTheme = altDarkThemes[0]\n  return [\n    ...altLightThemes,\n    [`${lightButtonTheme[0]}_Button`, altLightThemes[2][1]],\n    [`${lightButtonTheme[0]}_Card`, altLightThemes[2][1]],\n    [`${lightButtonTheme[0]}_DrawerFrame`, altLightThemes[2][1]],\n    ...altDarkThemes,\n    [`${darkButtonTheme[0]}_Button`, altDarkThemes[2][1]],\n    [`${darkButtonTheme[0]}_Card`, altDarkThemes[2][1]],\n    [`${darkButtonTheme[0]}_DrawerFrame`, altDarkThemes[2][1]],\n  ]\n})\n\ntype MyThemeBase = typeof baseThemes['light_alt1']\n\nconst colorThemes: {\n  [key in ColorThemeNames]: MyThemeBase\n} = Object.fromEntries(colorThemeEntries) as any\n\nconst allThemes = {\n  ...baseThemes,\n  ...colorThemes,\n} as const\n\nexport const themes: {\n  [key in keyof typeof allThemes]: typeof baseThemes['light']\n} = allThemes as any\n\n// TODO\n// export function createThemes(props: {\n//   colors?:\n//     | 'amber'\n//     | 'blue'\n//     | 'bronze'\n//     | 'brown'\n//     | 'crimson'\n//     | 'cyan'\n//     | 'gold'\n//     | 'grass'\n//     | 'gray'\n//     | 'green'\n//     | 'indigo'\n//     | 'lime'\n//     | 'mint'\n//     | 'olive'\n//     | 'orange'\n//     | 'pink'\n//     | 'plum'\n//     | 'purple'\n//     | 'mauve'\n//     | 'red'\n//     | 'sage'\n//     | 'sand'\n//     | 'sky'\n//     | 'slate'\n//     | 'teal'\n//     | 'tomato'\n//     | 'violet'\n//     | 'yellow'\n//   alternates?: number\n// }) {}\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/cjs/tokens.js

@@ -16,6 +16,7 @@ var __spreadValues = (a, b) => {
     }
   return a;
 };
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -32,30 +33,20 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var tokens_exports = {};
 __export(tokens_exports, {
   color: () => color,
+  getSizeAt: () => getSizeAt,
   radius: () => radius,
   size: () => size,
+  sizeKeys: () => sizeKeys,
   space: () => space,
   zIndex: () => zIndex
 });
 module.exports = __toCommonJS(tokens_exports);
 var import_colors = require("@tamagui/colors");
-const size = {
-  true: 20,
-  0: 0,
-  "0.5": 2,
-  1: 6,
-  2: 10,
-  3: 15,
-  4: 20,
-  5: 25,
-  6: 30,
-  7: 40,
-  8: 50,
-  9: 65,
-  10: 75,
-  11: 85,
-  12: 100
-};
+const sizeKeys = ["true", "0", "0.25", "0.5", "1", "1.5", "2", "2.5", "3", "3.5", "4", "4.5", "5", "5.5", "6", "6.5", "7", "7.5", "8", "9", "10", "11", "12", "13", "14"];
+const getSizeAt = /* @__PURE__ */ __name((index) => index === 0 ? 0 : Math.round(Math.pow(1.6, index)) + Math.floor(3 * index), "getSizeAt");
+const size = Object.fromEntries(sizeKeys.map((key) => {
+  return [key, getSizeAt(key === "true" ? 4 : +key)];
+}));
 const space = __spreadValues(__spreadValues({}, size), Object.fromEntries(Object.entries(size).map(([k, v]) => [`-${k}`, -v])));
 const zIndex = {
   0: 0,
@@ -78,4 +69,14 @@ const radius = {
   8: 20,
   9: 30
 };
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  color,
+  getSizeAt,
+  radius,
+  size,
+  sizeKeys,
+  space,
+  zIndex
+});
 //# sourceMappingURL=tokens.js.map

package/dist/cjs/tokens.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/tokens.tsx"],
-  "sourcesContent": ["import { allLightColors, darkColorsPostfixed } from '@tamagui/colors'\n\nexport const size = {\n  true: 20, // for space boolean true\n  0: 0,\n  '0.5': 2,\n  1: 6,\n  2: 10,\n  3: 15,\n  4: 20,\n  5: 25,\n  6: 30,\n  7: 40,\n  8: 50,\n  9: 65,\n  10: 75,\n  11: 85,\n  12: 100,\n} as const\n\ntype Sizes = typeof size\ntype SizeKeys = keyof Sizes\n\nexport const space: {\n  [Key in `-${SizeKeys}` | SizeKeys]: Key extends keyof Sizes ? Sizes[Key] : number\n} = {\n  ...size,\n  ...Object.fromEntries(Object.entries(size).map(([k, v]) => [`-${k}`, -v])),\n} as any\n\nexport const zIndex = {\n  0: 0,\n  1: 100,\n  2: 200,\n  3: 300,\n  4: 400,\n  5: 500,\n}\n\nexport const color = {\n  ...allLightColors,\n  ...darkColorsPostfixed,\n}\n\nexport const radius = {\n  0: 0,\n  1: 3,\n  2: 5,\n  3: 7,\n  4: 9,\n  5: 10,\n  6: 12,\n  7: 16,\n  8: 20,\n  9: 30,\n}\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oBAAoD;AAE7C,MAAM,OAAO;AAAA,EAClB,MAAM;AAAA,EACN,GAAG;AAAA,EACH,OAAO;AAAA,EACP,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AACN;AAKO,MAAM,QAET,kCACC,OACA,OAAO,YAAY,OAAO,QAAQ,IAAI,EAAE,IAAI,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC;AAGpE,MAAM,SAAS;AAAA,EACpB,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AACL;AAEO,MAAM,QAAQ,kCAChB,+BACA;AAGE,MAAM,SAAS;AAAA,EACpB,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AACL;",
+  "sourcesContent": ["import { allLightColors, darkColorsPostfixed } from '@tamagui/colors'\n\n// acknowledge you need more granularity at the smaller sizes with .5s\n// prettier-ignore\nexport const sizeKeys = ['true', '0', '0.25', '0.5', '1', '1.5', '2', '2.5', '3', '3.5', '4', '4.5', '5', '5.5', '6', '6.5', '7', '7.5', '8', '9', '10', '11', '12', '13', '14'] as const\n\n// slightly more than double every 2 indices apart\nexport const getSizeAt = (index: number) =>\n  index === 0 ? 0 : Math.round(Math.pow(1.6, index)) + Math.floor(3 * index)\n\nexport const size: {\n  [key in typeof sizeKeys[any]]: number\n} = Object.fromEntries(\n  sizeKeys.map((key) => {\n    return [key, getSizeAt(key === 'true' ? 4 : +key)]\n  })\n) as any\n\ntype Sizes = typeof size\ntype SizeKeys = keyof Sizes\n\nexport const space: {\n  [Key in `-${SizeKeys}` | SizeKeys]: Key extends keyof Sizes ? Sizes[Key] : number\n} = {\n  ...size,\n  ...Object.fromEntries(Object.entries(size).map(([k, v]) => [`-${k}`, -v])),\n} as any\n\nexport const zIndex = {\n  0: 0,\n  1: 100,\n  2: 200,\n  3: 300,\n  4: 400,\n  5: 500,\n}\n\nexport const color = {\n  ...allLightColors,\n  ...darkColorsPostfixed,\n}\n\nexport const radius = {\n  0: 0,\n  1: 3,\n  2: 5,\n  3: 7,\n  4: 9,\n  5: 10,\n  6: 12,\n  7: 16,\n  8: 20,\n  9: 30,\n}\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oBAAoD;AAI7C,MAAM,WAAW,CAAC,QAAQ,KAAK,QAAQ,OAAO,KAAK,OAAO,KAAK,OAAO,KAAK,OAAO,KAAK,OAAO,KAAK,OAAO,KAAK,OAAO,KAAK,OAAO,KAAK,KAAK,MAAM,MAAM,MAAM,MAAM,IAAI;AAGxK,MAAM,YAAY,wBAAC,UACxB,UAAU,IAAI,IAAI,KAAK,MAAM,KAAK,IAAI,KAAK,KAAK,CAAC,IAAI,KAAK,MAAM,IAAI,KAAK,GADlD;AAGlB,MAAM,OAET,OAAO,YACT,SAAS,IAAI,CAAC,QAAQ;AACpB,SAAO,CAAC,KAAK,UAAU,QAAQ,SAAS,IAAI,CAAC,GAAG,CAAC;AACnD,CAAC,CACH;AAKO,MAAM,QAET,kCACC,OACA,OAAO,YAAY,OAAO,QAAQ,IAAI,EAAE,IAAI,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC;AAGpE,MAAM,SAAS;AAAA,EACpB,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AACL;AAEO,MAAM,QAAQ,kCAChB,+BACA;AAGE,MAAM,SAAS;AAAA,EACpB,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AACL;",
   "names": []
 }

package/dist/esm/themes.js

@@ -35,7 +35,10 @@ __name(createThemesFrom, "createThemesFrom");
 const createTheme = /* @__PURE__ */ __name((str = 1, {
   backgrounds,
   isLight = true,
+  isBase = false,
   colors = [...backgrounds].reverse(),
+  borderColors = isLight ? colors : backgrounds,
+  backgroundStronger,
   offsets: offsetsProp
 }) => {
   var _a, _b, _c, _d;
@@ -52,29 +55,45 @@ const createTheme = /* @__PURE__ */ __name((str = 1, {
     return arr[Math.max(0, Math.min(index + (offsets[name][str] || 0), arr.length - 1))];
   }, "get");
   const colorTranslucent = setColorAlpha(getVariableValue(get(colors, 0 + str, "color")), 0.5);
-  return {
+  let theme = {
     background: get(backgrounds, str),
-    backgroundStronger: get(backgrounds, str + strongerDir),
+    backgroundStronger: backgroundStronger || get(backgrounds, str + strongerDir),
     backgroundSoft: get(backgrounds, str + 3),
-    backgroundHover: get(backgrounds, str + lighterDir),
+    backgroundHover: get(backgrounds, str + strongerDir),
     backgroundPress: get(backgrounds, str + darkerDir * 1),
     backgroundFocus: get(backgrounds, str + darkerDir * 2),
     backgroundTransparent: color.grayA1,
-    borderColor: isLight ? get(colors, 8 - str, "borderColor") : get(backgrounds, 2 + str, "borderColor"),
-    borderColorHover: isLight ? get(colors, 6 - str, "borderColor") : get(backgrounds, 3 + str, "borderColor"),
-    borderColorPress: isLight ? get(colors, 5 - str, "borderColor") : get(backgrounds, 1 + str, "borderColor"),
-    borderColorFocus: isLight ? get(colors, 4 - str, "borderColor") : get(backgrounds, 3 + str, "borderColor"),
     color: get(colors, 0 + str, "color"),
     colorHover: get(colors, 1 + str, "color"),
     colorPress: get(colors, 2 + str, "color"),
     colorFocus: get(colors, 3 + str, "color"),
     colorTranslucent,
     colorMid: colors[Math.floor(colors.length / 2)],
-    shadowColor: isLight ? color.grayA3 : color.grayA8,
+    shadowColor: isLight ? color.grayA2 : color.grayA8,
     shadowColorHover: darkColors[!isLight ? 1 : 8],
     shadowColorPress: darkColors[!isLight ? 1 : 8],
-    shadowColorFocus: darkColors[!isLight ? 1 : 8]
+    shadowColorFocus: darkColors[!isLight ? 1 : 8],
+    borderColor: null,
+    borderColorHover: null,
+    borderColorPress: null,
+    borderColorFocus: null
   };
+  if (isBase) {
+    Object.assign(theme, {
+      borderColor: isLight ? get(colors, 8 - str, "borderColor") : get(backgrounds, 2 + str, "borderColor"),
+      borderColorHover: isLight ? get(colors, 6 - str, "borderColor") : get(backgrounds, 3 + str, "borderColor"),
+      borderColorPress: isLight ? get(colors, 5 - str, "borderColor") : get(backgrounds, 1 + str, "borderColor"),
+      borderColorFocus: isLight ? get(colors, 4 - str, "borderColor") : get(backgrounds, 3 + str, "borderColor")
+    });
+  } else {
+    Object.assign(theme, {
+      borderColor: get(borderColors, 1 + strongerDir, "borderColor"),
+      borderColorHover: get(borderColors, 2 + strongerDir, "borderColor"),
+      borderColorPress: get(borderColors, 3 + strongerDir, "borderColor"),
+      borderColorFocus: get(borderColors, 4 + strongerDir, "borderColor")
+    });
+  }
+  return theme;
 }, "createTheme");
 const colorSchemes = [
   { name: "blue", colors: Colors.blue, darkColors: Colors.blueDark },
@@ -123,15 +142,19 @@ const darkGradient = [
 ];
 const lightThemes = createThemesFrom("light", createTheme, {
   backgrounds: lightGradient,
+  backgroundStronger: "#fcfcfc",
+  borderColors: lightGradient.slice(2),
   isLight: true
 });
 const darkThemes = createThemesFrom("dark", createTheme, {
   backgrounds: darkGradient,
-  colors: lightGradient,
+  colors: lightGradient.slice(2),
+  backgroundStronger: "#111",
+  isBase: true,
   isLight: false,
   shift: 1,
   offsets: {
-    color: [0, 6, 7, 7, 7, 7]
+    color: [0, 4, 5, 5, 5, 5]
   }
 });
 const baseThemes = {
@@ -142,6 +165,7 @@ const baseThemes = {
   },
   light_active: makeActiveTheme(lightThemes.light),
   light_Card: lightThemes.light,
+  light_DrawerFrame: lightThemes.light_alt1,
   light_Button: lightThemes.light_alt1,
   ...darkThemes,
   dark: {
@@ -150,6 +174,7 @@ const baseThemes = {
   },
   dark_active: makeActiveTheme(darkThemes.dark),
   dark_Card: darkThemes.dark_alt1,
+  dark_DrawerFrame: darkThemes.dark_alt2,
   dark_Button: darkThemes.dark_alt1
 };
 function makeActiveTheme(theme) {
@@ -162,23 +187,31 @@ function makeActiveTheme(theme) {
 }
 __name(makeActiveTheme, "makeActiveTheme");
 const colorThemeEntries = colorSchemes.flatMap(({ name, colors, darkColors }) => {
-  const [altLightThemes, altDarkThemes] = [colors, darkColors].map((colors2, i) => {
+  const [altLightThemes, altDarkThemes] = [
+    { colors: darkColors, backgrounds: colors },
+    { colors, backgrounds: darkColors }
+  ].map((props, i) => {
     const isLight = i === 0;
+    const [backgrounds, colors2] = [
+      Object.values(props.backgrounds),
+      Object.values(props.colors).slice(isLight ? 2 : 2)
+    ];
     const scheme = isLight ? "light" : "dark";
     const shift = isLight ? 0 : 1;
-    let backgrounds = Object.values(colors2);
     if (!isLight) {
       const [_, h, sp, lp] = backgrounds[0].match(/hsl\(([0-9\.]+), ([0-9\.]+)\%, ([0-9\.]+)\%\)/);
       backgrounds.unshift(`hsl(${h}, ${sp}%, ${parseFloat(lp) / 2}%)`);
     }
     const themeWithAlts = createThemesFrom(name, createTheme, {
+      colors: colors2,
       backgrounds,
+      borderColors: backgrounds,
       isLight,
       shift,
       isBase: false,
       offsets: {
-        background: isLight ? [1, 1, 1, 0, 0, 0] : null,
-        borderColor: isLight ? [0, 1, 1, 2, 2, -2] : null,
+        background: isLight ? [1, 1, 1, 1, 1, 1] : null,
+        borderColor: isLight ? [2, 2, 2, 3, 2] : null,
         color: isLight ? [0, 0, -1, -2, -3, -3, -4] : [-1, -1, -1, -1, -1, -1]
       }
     });
@@ -189,38 +222,18 @@ const colorThemeEntries = colorSchemes.flatMap(({ name, colors, darkColors }) =>
   return [
     ...altLightThemes,
     [`${lightButtonTheme[0]}_Button`, altLightThemes[2][1]],
+    [`${lightButtonTheme[0]}_Card`, altLightThemes[2][1]],
+    [`${lightButtonTheme[0]}_DrawerFrame`, altLightThemes[2][1]],
     ...altDarkThemes,
-    [`${darkButtonTheme[0]}_Button`, altDarkThemes[2][1]]
+    [`${darkButtonTheme[0]}_Button`, altDarkThemes[2][1]],
+    [`${darkButtonTheme[0]}_Card`, altDarkThemes[2][1]],
+    [`${darkButtonTheme[0]}_DrawerFrame`, altDarkThemes[2][1]]
   ];
 });
-const transparent = {
-  background: "transparent",
-  backgroundSoft: "transparent",
-  backgroundHover: "transparent",
-  backgroundPress: "transparent",
-  backgroundFocus: "transparent",
-  backgroundTransparent: "transparent",
-  shadowColor: "transparent",
-  shadowColorHover: "transparent",
-  shadowColorPress: "transparent",
-  shadowColorFocus: "transparent"
-};
-const dark_outline = {
-  ...baseThemes.dark,
-  borderColor: "#fff",
-  ...transparent
-};
-const light_outline = {
-  ...baseThemes.light,
-  borderColor: "#000",
-  ...transparent
-};
 const colorThemes = Object.fromEntries(colorThemeEntries);
 const allThemes = {
   ...baseThemes,
-  ...colorThemes,
-  dark_outline,
-  light_outline
+  ...colorThemes
 };
 const themes = allThemes;
 export {