pacem-less 0.51.4-cauchy → 0.51.4-cramer

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.51.4-cauchy",
+  "version": "0.51.4-cramer",
   "name": "pacem-less",
   "homepage": "https://js.pacem.it",
   "repository": {

package/themebuilder.js

@@ -38,6 +38,10 @@ const argv = yargs
     .option('maxcontrast', {
     type: 'number',
     description: 'The maximum WCAG contrast (1 to 21) default-to-background (default 15).',
+})
+    .option('contrast', {
+    type: 'number',
+    description: 'The minimim WCAG contrast (1 to 21) solid color-to-background (default 4.5).',
 })
     .help()
     .argv;
@@ -86,6 +90,7 @@ const palette = Object.assign({
 }, readFile(argv.src) ?? {});
 const WCAG_MINIMUM_CONTRAST = argv.mincontrast ?? 1.5;
 const WCAG_NORMAL_TEXT_CONTRAST = 4.5;
+const WCAG_NORMAL_COLOR_CONTRAST = argv.contrast ?? WCAG_NORMAL_TEXT_CONTRAST;
 const WCAG_SAFE_CONTRAST = 7;
 const WCAG_MAX_CONTRAST = argv.maxcontrast ?? 15;
 const WCAG_DISABLED_CONTRAST = 1.6;
@@ -185,7 +190,7 @@ function colorModuleDisabled(clr) {
     console.log('disabled container yields ' + Pacem.Colors.stringify(container) + ', which should contrast ' + containerTargetContrast + ' with ' + Pacem.Colors.stringify(containerBenchmarkColor));
     const containerContrast = contrastColor(container, baseContrast, preferBaseWithLighterColor);
     const active = luminanceColor(actualColor, Pacem.Colors.luminance(actualColor) + luminanceBackActiveOffset);
-    const activeContrast = contrastColor(active, baseContrast);
+    const activeContrast = contrastColor(active, baseContrast, preferContrastWithLighterColor);
     const containerActive = luminanceColor(container, Pacem.Colors.luminance(container) + luminanceBackActiveOffset);
     const containerActiveContrast = contrastColor(containerActive, baseContrast);
     const emphasis = Pacem.Colors.lighten(actualColor, .1);
@@ -206,22 +211,22 @@ function colorModule(clr, name, arg2) {
     const forcedContrast = (arg2 && typeof arg2 === 'number') ? arg2 : null;
     const baseContrast = forcedContrast ?? WCAG_SAFE_CONTRAST;
     const contrastClr = arg2 && typeof arg2 === 'object' ? arg2 : null;
-    const isColorRight = isColorLight(clr) === darkTheme;
+    const isColorRight = isColorLight(clr) === darkTheme && Pacem.Colors.contrastRatio(clr, backgroundModule.base) >= WCAG_NORMAL_COLOR_CONTRAST;
     const referenceColor = isColorRight ? clr
-        : contrastColor(clr, backgroundModule.base, WCAG_NORMAL_TEXT_CONTRAST, darkTheme);
+        : contrastColor(clr, backgroundModule.base, WCAG_NORMAL_COLOR_CONTRAST, darkTheme);
     let actualColor = contrastClr ? clr : referenceColor;
     if (isDesaturated) {
         actualColor = desaturateColor(actualColor);
     }
     const luminanceBackActiveOffset = darkTheme ? .1 : -.06;
     const contrastForeActive = forcedContrast ?? WCAG_SAFE_CONTRAST;
-    const contrast = contrastClr ?? contrastColor(actualColor, baseContrast);
+    const contrast = contrastClr ?? contrastColor(actualColor, baseContrast, !darkTheme);
     const containerTargetContrast = WCAG_MINIMUM_CONTRAST;
     const containerBenchmarkColor = backgroundModule.base;
     const container = contrastColor(actualColor, containerBenchmarkColor, containerTargetContrast, !darkTheme);
     const containerContrast = contrastColor(container, WCAG_NORMAL_TEXT_CONTRAST);
     const active = luminanceColor(actualColor, Pacem.Colors.luminance(actualColor) + luminanceBackActiveOffset);
-    const activeContrast = contrastColor(active, contrastForeActive);
+    const activeContrast = contrastColor(active, contrastForeActive, !darkTheme);
     const containerActive = luminanceColor(container, Pacem.Colors.luminance(container) + luminanceBackActiveOffset);
     const containerActiveContrast = contrastColor(containerActive, contrastForeActive);
     const emphasis = isDesaturated ? Pacem.Colors.lighten(actualColor, .1) : Pacem.Colors.saturate(actualColor, 1.2);
@@ -267,7 +272,7 @@ const rootColor = 'root' in palette ? Pacem.Colors.parse(palette['root']) : Pace
 rootModule = colorModuleBackground(rootColor, 'root');
 pushLessVariables('root', rootModule);
 if ('default' in palette) {
-    const defaultColor = contrastColor(desaturateColor(Pacem.Colors.parse(palette['default'])), rootModule.base, WCAG_MAX_CONTRAST, darkTheme);
+    const defaultColor = contrastColor(Pacem.Colors.parse(palette['default']), rootModule.base, WCAG_MAX_CONTRAST, darkTheme);
     const defaultModule = colorModule(defaultColor, 'default');
     pushLessVariables('default', defaultModule);
 }