@acorex/core 5.3.4 → 5.6.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,59 @@ 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.toRgb();
+            case 'hsla':
+                return _color.toHsl();
+            case 'hsva':
+                return _color.toHsv();
+            default:
+                return _color.toHex();
+        }
+    }
+    ;
+    static toString(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 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 mix(baseColor, hex, percentage) {
+        return tinycolor.mix(baseColor, hex, percentage);
+    }
+    static multiply(rgb1, rgb2) {
+        rgb1.b = Math.floor(rgb1.b * rgb2.b / 255);
+        rgb1.g = Math.floor(rgb1.g * rgb2.g / 255);
+        rgb1.r = Math.floor(rgb1.r * rgb2.r / 255);
+        return tinycolor('rgb ' + rgb1.r + ' ' + rgb1.g + ' ' + rgb1.b);
+    }
+    static toHexSting(color) {
+        const _color = tinycolor(color);
+        return _color.toHexString();
+    }
+    ;
+    static toRGBString(color) {
+        const _color = tinycolor(color);
+        return _color.toRgbString();
     }
     ;
     static illuminance(hexColor) {
-        let rgbColor = AXColorUtil.hex2Rgb(hexColor);
+        let rgbColor = AXColorUtil.toRGBString(hexColor);
         if (!rgbColor)
             return -1;
         let r = rgbColor.r, g = rgbColor.g, b = rgbColor.b;
@@ -124,12 +160,19 @@ 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);
     }
     ;
+    static lighten(hex, percentage) {
+        return tinycolor(hex).lighten(percentage);
+    }
+    static darken(hex, percentage) {
+        return tinycolor(hex).darken(percentage);
+    }
 }
 
 class AXSafePipe {
@@ -1171,8 +1214,9 @@ class AXTranslator {
     static use(lang) {
         AXTranslator.lang = lang;
     }
-    static get(key, lang, params) {
-        lang = lang || AXTranslator.lang;
+    static get(key, arg1, arg2) {
+        const lang = arg1 && typeof arg1 == 'string' ? arg1 : AXTranslator.lang;
+        const params = arg1 && typeof arg1 == 'object' ? arg1 : arg2;
         let result = _.get(AXTranslator[`__data__${lang}`], key, key);
         const vars = typeof (result) == 'string' ? result?.match(this._varsRegx) : [];
         if (vars?.length) {
@@ -1195,8 +1239,8 @@ AXTranslator._varsRegx = /((\$\{[a-zA-Z_0-9\.]+\})+)/gm;
 AXTranslator._varNameRegx = /[a-zA-Z_0-9\.]+/gm;
 
 class AXTranslatorPipe {
-    transform(value, lang) {
-        return AXTranslator.get(value, lang);
+    transform(value, arg1, arg2) {
+        return AXTranslator.get(value, arg1, arg2);
     }
 }
 AXTranslatorPipe.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.9", ngImport: i0, type: AXTranslatorPipe, deps: [], target: i0.ɵɵFactoryTarget.Pipe });