@tamagui/theme-builder 1.79.8 → 1.79.10

package/dist/esm/buildThemeSuiteScales.js

@@ -1,54 +1,13 @@
-import { hsla, parseToHsla, toHex } from "color2k";
-function getColorForegroundBackground(color, isDarkMode = !1) {
-  const [h, s, l] = parseToHsla(color), isColorLight = l > 0.5, oppositeLightness = l > 0.5 ? 1 - l : 0.5 + l, oppositeLightnessColor = toHex(hsla(h, s, oppositeLightness, 1)), foreground = isDarkMode ? color : oppositeLightnessColor;
-  return {
-    foreground,
-    foregroundLightness: foreground === color ? l : oppositeLightness,
-    background: foreground === color ? oppositeLightnessColor : color,
-    backgroundLightness: foreground !== color ? l : oppositeLightness
-  };
+function getScalePreset(a) {
+  return scaleTypes[a];
 }
-const getThemeSuiteScale = (theme, accent) => {
-  const baseColor = accent && theme.accent || theme.color, scale = accent && theme.accentScale || theme.scale;
-  let base = scaleTypes[scale];
-  if (!baseColor)
-    return base;
-  const [h, s, l] = parseToHsla(baseColor);
-  if (scale === "automatic") {
-    let getScale = function(bgL, fgL) {
-      const stepSize = (fgL - bgL) / scaleLen;
-      return arr.map((_, i) => bgL + i * stepSize);
-    };
-    const lightColors = getColorForegroundBackground(baseColor, !1), darkColors = getColorForegroundBackground(baseColor, !0), scaleLen = 12, arr = new Array(scaleLen).fill(0);
-    return {
-      ...base,
-      lumScale: {
-        light: getScale(lightColors.backgroundLightness, lightColors.foregroundLightness),
-        dark: getScale(darkColors.backgroundLightness, darkColors.foregroundLightness)
-      }
-    };
-  }
-  return {
-    ...base,
-    lumScale: {
-      light: adjustScale(theme, base.lumScale.light, l, !0),
-      dark: adjustScale(theme, base.lumScale.dark, 1 - l)
-    },
-    ...base.satScale && {
-      satScale: {
-        light: adjustScale(theme, base.satScale.light, s, !0),
-        dark: adjustScale(theme, base.satScale.dark, s)
-      }
-    }
-  };
+const fullSatScale = {
+  light: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1],
+  dark: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]
 }, scaleTypes = {
-  automatic: {
-    createdFrom: "automatic",
-    name: "Automatic",
-    lumScale: {
-      light: [],
-      dark: []
-    }
+  custom: {
+    name: "Custom",
+    createdFrom: "custom"
   },
   radix: {
     name: "Radius",
@@ -120,6 +79,10 @@ const getThemeSuiteScale = (theme, accent) => {
         0.56,
         0.61
       ]
+    },
+    satScale: {
+      light: [0.65, 0.55, 0.4, 0.4, 0.35, 0.35, 0.35, 0.35, 0.4, 0.4, 0.3, 0.2],
+      dark: [0.65, 0.55, 0.4, 0.4, 0.35, 0.35, 0.35, 0.35, 0.4, 0.4, 0.3, 0.2]
     }
   },
   "radius-bright": {
@@ -128,6 +91,10 @@ const getThemeSuiteScale = (theme, accent) => {
     lumScale: {
       light: [1, 0.954, 0.94, 0.9, 0.85, 0.804, 0.747, 0.659, 0.541, 0.453, 0.27, 0.086],
       dark: [0, 0.1, 0.16, 0.2, 0.24, 0.36, 0.42, 0.46, 0.5, 0.54, 0.84, 0.97]
+    },
+    satScale: {
+      light: [0.65, 0.55, 0.4, 0.4, 0.35, 0.35, 0.35, 0.35, 0.4, 0.4, 0.3, 0.2],
+      dark: [0.65, 0.55, 0.4, 0.4, 0.35, 0.35, 0.35, 0.35, 0.4, 0.4, 0.3, 0.2]
     }
   },
   "radius-bold": {
@@ -136,6 +103,10 @@ const getThemeSuiteScale = (theme, accent) => {
     lumScale: {
       light: [1, 0.9, 0.885, 0.82, 0.77, 0.54, 0.32, 0.25, 0.16, 0.12, 0.075, 0],
       dark: [0, 0.13, 0.2, 0.24, 0.3, 0.34, 0.45, 0.55, 0.65, 0.885, 0.9, 1]
+    },
+    satScale: {
+      light: [0.65, 0.55, 0.4, 0.4, 0.35, 0.35, 0.35, 0.35, 0.4, 0.4, 0.3, 0.2],
+      dark: [0.65, 0.55, 0.4, 0.4, 0.35, 0.35, 0.35, 0.35, 0.4, 0.4, 0.3, 0.2]
     }
   },
   linear: {
@@ -144,6 +115,10 @@ const getThemeSuiteScale = (theme, accent) => {
     lumScale: {
       light: [1, 0.925, 0.9, 0.85, 0.75, 0.6, 0.4, 0.3, 0.25, 0.15, 0.125, 0],
       dark: [0, 0.075, 0.125, 0.15, 0.25, 0.4, 0.6, 0.75, 0.85, 0.9, 0.925, 1]
+    },
+    satScale: {
+      light: [0.65, 0.55, 0.4, 0.4, 0.35, 0.35, 0.35, 0.35, 0.4, 0.4, 0.3, 0.2],
+      dark: [0.65, 0.55, 0.4, 0.4, 0.35, 0.35, 0.35, 0.35, 0.4, 0.4, 0.3, 0.2]
     }
   },
   neon: {
@@ -178,6 +153,10 @@ const getThemeSuiteScale = (theme, accent) => {
         0.61,
         0.93
       ]
+    },
+    satScale: {
+      light: [0.65, 0.55, 0.4, 0.4, 0.35, 0.35, 0.35, 0.35, 0.4, 0.4, 0.3, 0.2],
+      dark: [0.65, 0.55, 0.4, 0.4, 0.35, 0.35, 0.35, 0.35, 0.4, 0.4, 0.3, 0.2]
     }
   },
   "neon-bright": {
@@ -186,6 +165,10 @@ const getThemeSuiteScale = (theme, accent) => {
     lumScale: {
       light: [0.45, 0.475, 0.5, 0.525, 0.55, 0.575, 0.6, 0.625, 0.65, 0.2, 0.1, 0],
       dark: [0.45, 0.475, 0.5, 0.525, 0.55, 0.575, 0.6, 0.625, 0.65, 0.2, 0.1, 0]
+    },
+    satScale: {
+      light: [0.65, 0.55, 0.4, 0.4, 0.35, 0.35, 0.35, 0.35, 0.4, 0.4, 0.3, 0.2],
+      dark: [0.65, 0.55, 0.4, 0.4, 0.35, 0.35, 0.35, 0.35, 0.4, 0.4, 0.3, 0.2]
     }
   },
   "neon-c": {
@@ -195,10 +178,7 @@ const getThemeSuiteScale = (theme, accent) => {
       light: [0.45, 0.475, 0.5, 0.525, 0.55, 0.575, 0.6, 0.625, 0.65, 0.2, 0.1, 0],
       dark: [0.45, 0.475, 0.5, 0.525, 0.55, 0.575, 0.6, 0.625, 0.65, 0.2, 0.1, 0]
     },
-    satScale: {
-      light: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1],
-      dark: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]
-    }
+    satScale: fullSatScale
   },
   pastel: {
     name: "Pastel",
@@ -250,13 +230,9 @@ const getThemeSuiteScale = (theme, accent) => {
       dark: [0.6, 0.5, 0.4, 0.35, 0.3, 0.3, 0.3, 0.3, 0.4, 0.35, 0.25, 0.15]
     }
   }
-}, adjustScale = (theme, scale, userVal, isLight = !1) => {
-  const scaleMin = scale.reduce((acc, cur) => Math.min(cur, acc), 1 / 0), scaleMax = scale.reduce((acc, cur) => Math.max(cur, acc), 0);
-  return scaleMin === scaleMax ? scale.map(() => userVal) : scale.map((val, i) => userVal > 0.5 ? val + (userVal - 0.5) * (1 - val) : val * (1 / (1.5 - userVal)));
 };
 export {
-  getColorForegroundBackground,
-  getThemeSuiteScale,
+  getScalePreset,
   scaleTypes
 };
 //# sourceMappingURL=buildThemeSuiteScales.js.map

package/dist/esm/buildThemeSuiteScales.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/buildThemeSuiteScales.ts"],
-  "mappings": "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",
+  "mappings": "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",
   "names": []
 }

package/dist/esm/buildThemeSuiteScales.native.js

@@ -1,55 +1,13 @@
-import { hsla, parseToHsla, toHex } from "color2k";
-function getColorForegroundBackground(color, isDarkMode = !1) {
-  const [h, s, l] = parseToHsla(color), isColorLight = l > 0.5, oppositeLightness = l > 0.5 ? 1 - l : 0.5 + l, oppositeLightnessColor = toHex(hsla(h, s, oppositeLightness, 1)), foreground = isDarkMode ? color : oppositeLightnessColor;
-  return {
-    foreground,
-    foregroundLightness: foreground === color ? l : oppositeLightness,
-    background: foreground === color ? oppositeLightnessColor : color,
-    backgroundLightness: foreground !== color ? l : oppositeLightness
-  };
+function getScalePreset(a) {
+  return scaleTypes[a];
 }
-const getThemeSuiteScale = (theme, accent) => {
-  const baseColor = accent && theme.accent || theme.color, scale = accent && theme.accentScale || theme.scale;
-  let base = scaleTypes[scale];
-  if (!baseColor)
-    return base;
-  const [h, s, l] = parseToHsla(baseColor);
-  if (scale === "automatic") {
-    let getScale2 = function(bgL, fgL) {
-      const stepSize = (fgL - bgL) / scaleLen;
-      return arr.map((_, i) => bgL + i * stepSize);
-    };
-    var getScale = getScale2;
-    const lightColors = getColorForegroundBackground(baseColor, !1), darkColors = getColorForegroundBackground(baseColor, !0), scaleLen = 12, arr = new Array(scaleLen).fill(0);
-    return {
-      ...base,
-      lumScale: {
-        light: getScale2(lightColors.backgroundLightness, lightColors.foregroundLightness),
-        dark: getScale2(darkColors.backgroundLightness, darkColors.foregroundLightness)
-      }
-    };
-  }
-  return {
-    ...base,
-    lumScale: {
-      light: adjustScale(theme, base.lumScale.light, l, !0),
-      dark: adjustScale(theme, base.lumScale.dark, 1 - l)
-    },
-    ...base.satScale && {
-      satScale: {
-        light: adjustScale(theme, base.satScale.light, s, !0),
-        dark: adjustScale(theme, base.satScale.dark, s)
-      }
-    }
-  };
+const fullSatScale = {
+  light: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1],
+  dark: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]
 }, scaleTypes = {
-  automatic: {
-    createdFrom: "automatic",
-    name: "Automatic",
-    lumScale: {
-      light: [],
-      dark: []
-    }
+  custom: {
+    name: "Custom",
+    createdFrom: "custom"
   },
   radix: {
     name: "Radius",
@@ -121,6 +79,10 @@ const getThemeSuiteScale = (theme, accent) => {
         0.56,
         0.61
       ]
+    },
+    satScale: {
+      light: [0.65, 0.55, 0.4, 0.4, 0.35, 0.35, 0.35, 0.35, 0.4, 0.4, 0.3, 0.2],
+      dark: [0.65, 0.55, 0.4, 0.4, 0.35, 0.35, 0.35, 0.35, 0.4, 0.4, 0.3, 0.2]
     }
   },
   "radius-bright": {
@@ -129,6 +91,10 @@ const getThemeSuiteScale = (theme, accent) => {
     lumScale: {
       light: [1, 0.954, 0.94, 0.9, 0.85, 0.804, 0.747, 0.659, 0.541, 0.453, 0.27, 0.086],
       dark: [0, 0.1, 0.16, 0.2, 0.24, 0.36, 0.42, 0.46, 0.5, 0.54, 0.84, 0.97]
+    },
+    satScale: {
+      light: [0.65, 0.55, 0.4, 0.4, 0.35, 0.35, 0.35, 0.35, 0.4, 0.4, 0.3, 0.2],
+      dark: [0.65, 0.55, 0.4, 0.4, 0.35, 0.35, 0.35, 0.35, 0.4, 0.4, 0.3, 0.2]
     }
   },
   "radius-bold": {
@@ -137,6 +103,10 @@ const getThemeSuiteScale = (theme, accent) => {
     lumScale: {
       light: [1, 0.9, 0.885, 0.82, 0.77, 0.54, 0.32, 0.25, 0.16, 0.12, 0.075, 0],
       dark: [0, 0.13, 0.2, 0.24, 0.3, 0.34, 0.45, 0.55, 0.65, 0.885, 0.9, 1]
+    },
+    satScale: {
+      light: [0.65, 0.55, 0.4, 0.4, 0.35, 0.35, 0.35, 0.35, 0.4, 0.4, 0.3, 0.2],
+      dark: [0.65, 0.55, 0.4, 0.4, 0.35, 0.35, 0.35, 0.35, 0.4, 0.4, 0.3, 0.2]
     }
   },
   linear: {
@@ -145,6 +115,10 @@ const getThemeSuiteScale = (theme, accent) => {
     lumScale: {
       light: [1, 0.925, 0.9, 0.85, 0.75, 0.6, 0.4, 0.3, 0.25, 0.15, 0.125, 0],
       dark: [0, 0.075, 0.125, 0.15, 0.25, 0.4, 0.6, 0.75, 0.85, 0.9, 0.925, 1]
+    },
+    satScale: {
+      light: [0.65, 0.55, 0.4, 0.4, 0.35, 0.35, 0.35, 0.35, 0.4, 0.4, 0.3, 0.2],
+      dark: [0.65, 0.55, 0.4, 0.4, 0.35, 0.35, 0.35, 0.35, 0.4, 0.4, 0.3, 0.2]
     }
   },
   neon: {
@@ -179,6 +153,10 @@ const getThemeSuiteScale = (theme, accent) => {
         0.61,
         0.93
       ]
+    },
+    satScale: {
+      light: [0.65, 0.55, 0.4, 0.4, 0.35, 0.35, 0.35, 0.35, 0.4, 0.4, 0.3, 0.2],
+      dark: [0.65, 0.55, 0.4, 0.4, 0.35, 0.35, 0.35, 0.35, 0.4, 0.4, 0.3, 0.2]
     }
   },
   "neon-bright": {
@@ -187,6 +165,10 @@ const getThemeSuiteScale = (theme, accent) => {
     lumScale: {
       light: [0.45, 0.475, 0.5, 0.525, 0.55, 0.575, 0.6, 0.625, 0.65, 0.2, 0.1, 0],
       dark: [0.45, 0.475, 0.5, 0.525, 0.55, 0.575, 0.6, 0.625, 0.65, 0.2, 0.1, 0]
+    },
+    satScale: {
+      light: [0.65, 0.55, 0.4, 0.4, 0.35, 0.35, 0.35, 0.35, 0.4, 0.4, 0.3, 0.2],
+      dark: [0.65, 0.55, 0.4, 0.4, 0.35, 0.35, 0.35, 0.35, 0.4, 0.4, 0.3, 0.2]
     }
   },
   "neon-c": {
@@ -196,10 +178,7 @@ const getThemeSuiteScale = (theme, accent) => {
       light: [0.45, 0.475, 0.5, 0.525, 0.55, 0.575, 0.6, 0.625, 0.65, 0.2, 0.1, 0],
       dark: [0.45, 0.475, 0.5, 0.525, 0.55, 0.575, 0.6, 0.625, 0.65, 0.2, 0.1, 0]
     },
-    satScale: {
-      light: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1],
-      dark: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]
-    }
+    satScale: fullSatScale
   },
   pastel: {
     name: "Pastel",
@@ -251,13 +230,9 @@ const getThemeSuiteScale = (theme, accent) => {
       dark: [0.6, 0.5, 0.4, 0.35, 0.3, 0.3, 0.3, 0.3, 0.4, 0.35, 0.25, 0.15]
     }
   }
-}, adjustScale = (theme, scale, userVal, isLight = !1) => {
-  const scaleMin = scale.reduce((acc, cur) => Math.min(cur, acc), 1 / 0), scaleMax = scale.reduce((acc, cur) => Math.max(cur, acc), 0);
-  return scaleMin === scaleMax ? scale.map(() => userVal) : scale.map((val, i) => userVal > 0.5 ? val + (userVal - 0.5) * (1 - val) : val * (1 / (1.5 - userVal)));
 };
 export {
-  getColorForegroundBackground,
-  getThemeSuiteScale,
+  getScalePreset,
   scaleTypes
 };
 //# sourceMappingURL=buildThemeSuiteScales.js.map

package/dist/esm/buildThemeSuiteScales.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/buildThemeSuiteScales.ts"],
-  "mappings": "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",
-  "names": ["getScale"]
+  "mappings": "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",
+  "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/theme-builder",
-  "version": "1.79.8",
+  "version": "1.79.10",
   "source": "src/index.ts",
   "types": "./types/index.d.ts",
   "main": "dist/cjs",
@@ -27,11 +27,11 @@
     }
   },
   "dependencies": {
-    "@tamagui/create-theme": "1.79.8",
+    "@tamagui/create-theme": "1.79.10",
     "color2k": "^2.0.2"
   },
   "devDependencies": {
-    "@tamagui/build": "1.79.8"
+    "@tamagui/build": "1.79.10"
   },
   "publishConfig": {
     "access": "public"

package/src/buildThemeSuite.ts

@@ -11,6 +11,21 @@ import { getThemeSuitePalettes } from './buildThemeSuitePalettes'
 import { createThemeBuilder } from './ThemeBuilder'
 import { BuildThemeMask, BuildThemeSuiteProps } from './types'
 
+// its offset by some transparent values etc
+const basePaletteOffset = 5
+const namedTemplateSlots = {
+  background: basePaletteOffset,
+  subtleBackground: basePaletteOffset + 1,
+  uiBackground: basePaletteOffset + 2,
+  hoverUIBackround: basePaletteOffset + 3,
+  activeUIBackround: basePaletteOffset + 4,
+  subtleBorder: basePaletteOffset + 5,
+  strongBorder: basePaletteOffset + 6,
+  hoverBorder: basePaletteOffset + 7,
+  strongBackground: basePaletteOffset + 8,
+  hoverStrongBackground: basePaletteOffset + 9,
+}
+
 export function buildThemeSuite({ baseTheme, subThemes }: BuildThemeSuiteProps) {
   const theme = baseTheme
 
@@ -25,7 +40,7 @@ export function buildThemeSuite({ baseTheme, subThemes }: BuildThemeSuiteProps)
   )
 
   // base palletes need to add in sub theme palettes if customized
-  const palettes = getThemeSuitePalettes(theme as any)
+  const palettes = getThemeSuitePalettes(theme)
 
   const max = palettes.dark.length - 1
   const min = 1
@@ -149,6 +164,13 @@ export function buildThemeSuite({ baseTheme, subThemes }: BuildThemeSuiteProps)
 
     return {
       base: template,
+      active: {
+        ...template,
+        background: namedTemplateSlots.strongBackground,
+        backgroundHover: namedTemplateSlots.hoverStrongBackground,
+        backgroundPress: namedTemplateSlots.hoverBorder,
+        backgroundFocus: namedTemplateSlots.strongBackground,
+      },
       accentLight: template,
       accentDark: template,
     }
@@ -180,13 +202,13 @@ export function buildThemeSuite({ baseTheme, subThemes }: BuildThemeSuiteProps)
     const componentTheme = [
       {
         parent: 'light_accent',
-        template: 'accentLight',
+        template: 'active',
         palette: 'lightAccent',
       },
 
       {
         parent: 'dark_accent',
-        template: 'accentDark',
+        template: 'active',
         palette: 'darkAccent',
       },
 

package/src/buildThemeSuitePalettes.ts

@@ -1,6 +1,5 @@
 import { hsla, parseToHsla, toHex } from 'color2k'
 
-import { getThemeSuiteScale } from './buildThemeSuiteScales'
 import { BuildTheme, BuildThemeSuitePalettes } from './types'
 
 /**
@@ -18,27 +17,69 @@ const generateColorPalette = ({
   scheme: 'light' | 'dark'
   forAccent?: boolean
 }) => {
-  // const { color, scale, accent, accentColor, accentScale } = theme
+  const baseTheme = forAccent ? theme.accent || theme : theme
 
-  const color = forAccent ? theme.accent || theme.color : theme.color
-  const scale = forAccent ? theme.accentScale || theme.scale : theme.scale
-
-  const { lumScale, satScale } = getThemeSuiteScale(theme, forAccent)
-  const [hue, sat, lum] = parseToHsla(color)
+  const { hue, lumScale, satScale, strategy } = baseTheme
   const isDark = scheme === 'dark'
 
-  const lumValues = isDark ? lumScale.dark : lumScale.light
+  let palette: string[]
+
+  if (strategy?.type === 'automatic') {
+    const hslas = {
+      background: parseToHsla(strategy.background),
+      foreground: parseToHsla(strategy.foreground),
+    }
+
+    palette = [
+      // backgrounds
+      ...new Array(10).fill(0).map((_, i) => {
+        const [h, s, l] = hslas.background
+
+        if (isDark) {
+          const str = 9 - i
+          const minLum = 0.05
+          const by = (l - minLum) / 10
+
+          return hsla(
+            h,
+            s,
+            // go to dark or light
+            l - by * str,
+            1
+          )
+        } else {
+          const str = 9 - i
+          const maxLum = 0.95
+          const by = (maxLum - l) / 10
+          return hsla(h, s, l + by * str, 1)
+        }
+      }),
+      // colors
+      ...new Array(2).fill(0).map((_, i) => {
+        const [h, s, l] = hslas.foreground
+        return hsla(
+          h,
+          s,
+          // go to dark or light
+          l - (i === 0 ? 0.1 : 0),
+          1
+        )
+      }),
+    ]
+  } else {
+    const lumValues = isDark ? lumScale.dark : lumScale.light
+    palette = lumValues.map((lum, idx) => {
+      const sat = satScale[scheme][idx]
 
-  let palette: string[] = lumValues.map((lum, idx) => {
-    if (sat > 0) {
-      if (satScale) {
-        return hsla(hue, satScale[scheme][idx], lum, 1)
+      if (theme.hueColor && idx >= 10) {
+        return hsla(theme.hueColor, sat, lum, 1)
       }
+
       return hsla(hue, sat, lum, 1)
-    }
-    return hsla(0, 0, lum, 1)
-  })
+    })
+  }
 
+  // add transparent values
   const [background] = palette
   const foreground = palette[palette.length - 1]
 
@@ -55,28 +96,27 @@ const generateColorPalette = ({
   const reverseForeground = [...transparentValues[1]].reverse()
   palette = [...transparentValues[0], ...palette, ...reverseForeground]
 
-  if (theme.accent) {
-    const baseAccent = forAccent ? theme.color : theme.accent
-    const accentHsla = parseToHsla(baseAccent)
-    const accentLum = accentHsla[2]
-    const isAccentLight = accentLum > 0.5
+  // if (theme.accent) {
+  //   const accentHsla = parseToHsla(theme.accent)
+  //   const accentLum = accentHsla[2]
+  //   const isAccentLight = accentLum > 0.5
 
-    const oppositeLightnessAccent = isAccentLight
-      ? toHex(hsla(accentHsla[0], accentHsla[1], 1 - accentLum, 1))
-      : theme.accent
+  //   const oppositeLightnessAccent = isAccentLight
+  //     ? toHex(hsla(accentHsla[0], accentHsla[1], 1 - accentLum, 1))
+  //     : theme.accent
 
-    const fg = isAccentLight && !isDark ? oppositeLightnessAccent : baseAccent
-    const bg = fg === baseAccent ? oppositeLightnessAccent : baseAccent
+  //   const fg = isAccentLight && !isDark ? oppositeLightnessAccent : theme.accent
+  //   const bg = fg === theme.accent ? oppositeLightnessAccent : theme.accent
 
-    // unshift bg
-    palette.unshift(bg)
-    // push color
-    palette.push(fg)
-  } else {
-    // were keeping the palettes the same length with or without accent to avoid headache
-    palette.unshift('rgba(0,0,0,0)')
-    palette.push('rgba(0,0,0,0)')
-  }
+  //   // unshift bg
+  //   palette.unshift(bg)
+  //   // push color
+  //   palette.push(fg)
+  // } else {
+  // were keeping the palettes the same length with or without accent to avoid headache
+  palette.unshift('rgba(0,0,0,0)')
+  palette.push('rgba(0,0,0,0)')
+  // }
 
   return palette
 }