@descope/web-components-ui 1.0.274 → 1.0.275

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@descope/web-components-ui",
-  "version": "1.0.274",
+  "version": "1.0.275",
   "description": "",
   "main": "dist/cjs/index.cjs.js",
   "module": "dist/index.esm.js",

package/src/helpers/themeHelpers/colorsHelpers.js

@@ -1,26 +1,92 @@
 import Color from 'color';
 
-// TODO: fix generated colors strategy
-const genDark = (c, percentage = 0.5) => c.darken(percentage).hex();
-const genLight = (c, percentage = 0.5) => c.lighten(percentage).hex();
-const genContrast = (c, percentage = 0.9) => {
+const colorGaps = {
+  darkLight: 0.4,
+  highlight: 0.8,
+  contrast: 1,
+  edgeColor: {
+    darkLight: 0.25,
+    highlight: 0.1,
+  },
+};
+
+const darken = (c, percentage) => c.darken(percentage).hex();
+
+const contrast = (c) => {
   const isDark = c.isDark();
   return c
-    .mix(Color(isDark ? 'white' : 'black'), percentage)
+    .mix(Color(isDark ? 'white' : 'black'), colorGaps.contrast)
     .saturate(1)
     .hex();
 };
 
-export const genColor = (color) => {
+const lighten = (c, percentage) => {
+  const isDark = c.lightness() < 0.5;
+
+  if (isDark) {
+    return c.lightness(percentage * 100).hex();
+  }
+
+  return c.lighten(percentage).hex();
+};
+
+const isNearBlack = (color) => color.luminosity() < 0.01;
+const isNearWhite = (color) => color.luminosity() > 0.99;
+
+const generateDarkColor = (color, theme) => {
+  if (color.dark) return color.dark;
+
+  if (theme === 'dark') {
+    return isNearWhite(color)
+      ? darken(color, colorGaps.edgeColor.darkLight)
+      : lighten(color, colorGaps.darkLight);
+  }
+
+  return isNearBlack(color)
+    ? lighten(color, colorGaps.edgeColor.darkLight)
+    : darken(color, colorGaps.darkLight);
+};
+
+const generateLightColor = (color, theme) => {
+  if (color.light) return color.light;
+
+  if (theme === 'dark') {
+    return isNearBlack(color)
+      ? lighten(color, colorGaps.edgeColor.darkLight)
+      : darken(color, colorGaps.darkLight);
+  }
+
+  return isNearWhite(color)
+    ? darken(color, colorGaps.edgeColor.darkLight)
+    : lighten(color, colorGaps.darkLight);
+};
+
+const generateHighlightColor = (color, theme) => {
+  if (color.highlight) return color.highlight;
+
+  if (theme === 'dark') {
+    return isNearBlack(color)
+      ? lighten(color, colorGaps.edgeColor.highlight)
+      : darken(color, colorGaps.highlight);
+  }
+
+  return isNearWhite(color)
+    ? darken(color, colorGaps.edgeColor.highlight)
+    : lighten(color, colorGaps.highlight);
+};
+
+export const genColor = (color, theme) => {
   const mainColor = new Color(color.main || color);
 
-  return {
+  const res = {
     main: mainColor.hex(),
-    dark: color.dark || genDark(mainColor),
-    light: color.light || genLight(mainColor),
-    highlight: color.highlight || genLight(mainColor),
-    contrast: color.contrast || genContrast(mainColor),
+    dark: generateDarkColor(mainColor, theme),
+    light: generateLightColor(mainColor, theme),
+    highlight: generateHighlightColor(mainColor, theme),
+    contrast: color.contrast || contrast(mainColor),
   };
+
+  return res;
 };
 
 export const genColors = (colors) => {

package/src/theme/globals.js

@@ -1,12 +1,11 @@
 import { getThemeRefs, getThemeVars } from '../helpers/themeHelpers';
-import { genColors } from '../helpers/themeHelpers/colorsHelpers';
 
 const direction = 'ltr';
 
-export const colors = genColors({
+export const colors = {
   surface: {
-    main: '#ffffff',
     dark: '#636c74',
+    main: '#ffffff',
     light: '#cfd3d7',
     highlight: '#f4f5f6',
     contrast: '#181a1c',
@@ -19,8 +18,8 @@ export const colors = genColors({
     contrast: '#ffffff',
   },
   secondary: {
-    main: '#802ed6',
     dark: '#6410bc',
+    main: '#802ed6',
     light: '#be89f5',
     highlight: '#ede7f6',
     contrast: '#ffffff',
@@ -39,7 +38,7 @@ export const colors = genColors({
     highlight: '#fef1f1',
     contrast: '#ffffff',
   },
-});
+};
 
 const fonts = {
   font1: {