@acorex/core 5.3.4 → 5.4.0

package/fesm2020/acorex-core.mjs

@@ -1,5 +1,6 @@
 import * as i0 from '@angular/core';
 import { Pipe, NgModule, Injectable, Inject } from '@angular/core';
+import tinycolor from 'tinycolor2';
 import * as i1 from '@angular/platform-browser';
 import _ from 'lodash';
 import { Subject, fromEvent } from 'rxjs';
@@ -94,24 +95,36 @@ class AXStringUtil {
 }
 
 class AXColorUtil {
-    static rgba2Hex(rgba) {
-        let rgbaVal = typeof rgba == 'string' ? rgba : `rgba(${rgba.r},${rgba.g},${rgba.b},${rgba.a ?? '1'})`;
-        const rgbaArr = rgbaVal.replace(/^rgba?\(|\s+|\)$/g, '').split(',');
-        const hex = `#${((1 << 24) + (parseInt(rgbaArr[0]) << 16) + (parseInt(rgbaArr[1]) << 8) + parseInt(rgbaArr[2])).toString(16).slice(1)}`;
-        return hex == '#aN' ? null : hex;
+    static testa(color) {
+        var _color = tinycolor(color);
+        console.log(_color);
+    }
+    static to(color, mode) {
+        const _color = tinycolor(color);
+        switch (mode) {
+            case 'rgba':
+                return _color.toRgbString();
+            case 'hsla':
+                return _color.toHslString();
+            case 'hsva':
+                return _color.toHsvString();
+            default:
+                return _color.toHexString();
+        }
+    }
+    ;
+    static toHex(color) {
+        const _color = tinycolor(color);
+        return _color.toHexString();
     }
     ;
-    static hex2Rgb(hexColor) {
-        let result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hexColor);
-        return result ? {
-            r: parseInt(result[1], 16),
-            g: parseInt(result[2], 16),
-            b: parseInt(result[3], 16)
-        } : null;
+    static toRGB(color) {
+        const _color = tinycolor(color);
+        return _color.toRgbString();
     }
     ;
     static illuminance(hexColor) {
-        let rgbColor = AXColorUtil.hex2Rgb(hexColor);
+        let rgbColor = AXColorUtil.toRGB(hexColor);
         if (!rgbColor)
             return -1;
         let r = rgbColor.r, g = rgbColor.g, b = rgbColor.b;
@@ -124,10 +137,11 @@ class AXColorUtil {
         return a[0] * 0.2126 + a[1] * 0.7152 + a[2] * 0.0722;
     }
     ;
-    static contrastToWhite(hexColor) {
-        let whiteIlluminance = 1;
-        let illuminance = AXColorUtil.illuminance(hexColor);
-        return whiteIlluminance / illuminance;
+    static contrastToWhite(color) {
+        // let whiteIlluminance = 1;
+        // let illuminance = AXColorUtil.illuminance(hexColor);
+        // return whiteIlluminance / illuminance;
+        return tinycolor.readability("#fff", color);
     }
     ;
 }