@descope/web-components-ui 1.0.275 → 1.0.276

package/package.json

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

package/src/helpers/themeHelpers/colorsHelpers.js

@@ -1,92 +1,26 @@
 import Color from 'color';
 
-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) => {
+// 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 isDark = c.isDark();
   return c
-    .mix(Color(isDark ? 'white' : 'black'), colorGaps.contrast)
+    .mix(Color(isDark ? 'white' : 'black'), percentage)
     .saturate(1)
     .hex();
 };
 
-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) => {
+export const genColor = (color) => {
   const mainColor = new Color(color.main || color);
 
-  const res = {
+  return {
     main: mainColor.hex(),
-    dark: generateDarkColor(mainColor, theme),
-    light: generateLightColor(mainColor, theme),
-    highlight: generateHighlightColor(mainColor, theme),
-    contrast: color.contrast || contrast(mainColor),
+    dark: color.dark || genDark(mainColor),
+    light: color.light || genLight(mainColor),
+    highlight: color.highlight || genLight(mainColor),
+    contrast: color.contrast || genContrast(mainColor),
   };
-
-  return res;
 };
 
 export const genColors = (colors) => {

package/src/theme/globals.js

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