@acorex/core 5.3.4 → 5.4.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/config/ax-preset.js +16 -0
- package/esm2020/lib/utils/color-util.mjs +32 -18
- package/fesm2015/acorex-core.mjs +31 -18
- package/fesm2015/acorex-core.mjs.map +1 -1
- package/fesm2020/acorex-core.mjs +31 -17
- package/fesm2020/acorex-core.mjs.map +1 -1
- package/lib/utils/color-util.d.ts +6 -12
- package/package.json +3 -2
package/config/ax-preset.js
CHANGED
|
@@ -133,8 +133,24 @@ module.exports = withAnimations({
|
|
|
133
133
|
},
|
|
134
134
|
|
|
135
135
|
},
|
|
136
|
+
width: {
|
|
137
|
+
'base': 'calc((var(--ax-base-size) * var(--ax-base-ratio)))'
|
|
138
|
+
},
|
|
139
|
+
minWidth: {
|
|
140
|
+
'base': 'calc((var(--ax-base-size) * var(--ax-base-ratio)))'
|
|
141
|
+
},
|
|
136
142
|
maxWidth: {
|
|
137
143
|
'8xl': '90rem',
|
|
144
|
+
'base': 'calc((var(--ax-base-size) * var(--ax-base-ratio)))'
|
|
145
|
+
},
|
|
146
|
+
height: {
|
|
147
|
+
'base': 'calc((var(--ax-base-size) * var(--ax-base-ratio)))'
|
|
148
|
+
},
|
|
149
|
+
minHeight: {
|
|
150
|
+
'base': 'calc((var(--ax-base-size) * var(--ax-base-ratio)))'
|
|
151
|
+
},
|
|
152
|
+
maxHeight: {
|
|
153
|
+
'base': 'calc((var(--ax-base-size) * var(--ax-base-ratio)))'
|
|
138
154
|
},
|
|
139
155
|
keyframes: {
|
|
140
156
|
fadeIn: {
|
|
@@ -1,22 +1,35 @@
|
|
|
1
|
+
import tinycolor from 'tinycolor2';
|
|
1
2
|
export class AXColorUtil {
|
|
2
|
-
static
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
3
|
+
static testa(color) {
|
|
4
|
+
var _color = tinycolor(color);
|
|
5
|
+
console.log(_color);
|
|
6
|
+
}
|
|
7
|
+
static to(color, mode) {
|
|
8
|
+
const _color = tinycolor(color);
|
|
9
|
+
switch (mode) {
|
|
10
|
+
case 'rgba':
|
|
11
|
+
return _color.toRgbString();
|
|
12
|
+
case 'hsla':
|
|
13
|
+
return _color.toHslString();
|
|
14
|
+
case 'hsva':
|
|
15
|
+
return _color.toHsvString();
|
|
16
|
+
default:
|
|
17
|
+
return _color.toHexString();
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
;
|
|
21
|
+
static toHex(color) {
|
|
22
|
+
const _color = tinycolor(color);
|
|
23
|
+
return _color.toHexString();
|
|
7
24
|
}
|
|
8
25
|
;
|
|
9
|
-
static
|
|
10
|
-
|
|
11
|
-
return
|
|
12
|
-
r: parseInt(result[1], 16),
|
|
13
|
-
g: parseInt(result[2], 16),
|
|
14
|
-
b: parseInt(result[3], 16)
|
|
15
|
-
} : null;
|
|
26
|
+
static toRGB(color) {
|
|
27
|
+
const _color = tinycolor(color);
|
|
28
|
+
return _color.toRgbString();
|
|
16
29
|
}
|
|
17
30
|
;
|
|
18
31
|
static illuminance(hexColor) {
|
|
19
|
-
let rgbColor = AXColorUtil.
|
|
32
|
+
let rgbColor = AXColorUtil.toRGB(hexColor);
|
|
20
33
|
if (!rgbColor)
|
|
21
34
|
return -1;
|
|
22
35
|
let r = rgbColor.r, g = rgbColor.g, b = rgbColor.b;
|
|
@@ -29,11 +42,12 @@ export class AXColorUtil {
|
|
|
29
42
|
return a[0] * 0.2126 + a[1] * 0.7152 + a[2] * 0.0722;
|
|
30
43
|
}
|
|
31
44
|
;
|
|
32
|
-
static contrastToWhite(
|
|
33
|
-
let whiteIlluminance = 1;
|
|
34
|
-
let illuminance = AXColorUtil.illuminance(hexColor);
|
|
35
|
-
return whiteIlluminance / illuminance;
|
|
45
|
+
static contrastToWhite(color) {
|
|
46
|
+
// let whiteIlluminance = 1;
|
|
47
|
+
// let illuminance = AXColorUtil.illuminance(hexColor);
|
|
48
|
+
// return whiteIlluminance / illuminance;
|
|
49
|
+
return tinycolor.readability("#fff", color);
|
|
36
50
|
}
|
|
37
51
|
;
|
|
38
52
|
}
|
|
39
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
53
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29sb3ItdXRpbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL2Fjb3JleC9jb3JlL3NyYy9saWIvdXRpbHMvY29sb3ItdXRpbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLFNBQVMsTUFBTSxZQUFZLENBQUE7QUFDbEMsTUFBTSxPQUFPLFdBQVc7SUFFcEIsTUFBTSxDQUFDLEtBQUssQ0FBQyxLQUFhO1FBQ3RCLElBQUksTUFBTSxHQUFHLFNBQVMsQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUM5QixPQUFPLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBRXhCLENBQUM7SUFFRCxNQUFNLENBQUMsRUFBRSxDQUFDLEtBQWEsRUFBRSxJQUFpQjtRQUN0QyxNQUFNLE1BQU0sR0FBRyxTQUFTLENBQUMsS0FBSyxDQUFDLENBQUE7UUFDL0IsUUFBUSxJQUFJLEVBQUU7WUFDVixLQUFLLE1BQU07Z0JBQ1AsT0FBTyxNQUFNLENBQUMsV0FBVyxFQUFFLENBQUM7WUFDaEMsS0FBSyxNQUFNO2dCQUNQLE9BQU8sTUFBTSxDQUFDLFdBQVcsRUFBRSxDQUFDO1lBQ2hDLEtBQUssTUFBTTtnQkFDUCxPQUFPLE1BQU0sQ0FBQyxXQUFXLEVBQUUsQ0FBQztZQUNoQztnQkFDSSxPQUFPLE1BQU0sQ0FBQyxXQUFXLEVBQUUsQ0FBQztTQUNuQztJQUdMLENBQUM7SUFBQSxDQUFDO0lBR0YsTUFBTSxDQUFDLEtBQUssQ0FBQyxLQUFhO1FBQ3RCLE1BQU0sTUFBTSxHQUFHLFNBQVMsQ0FBQyxLQUFLLENBQUMsQ0FBQTtRQUMvQixPQUFPLE1BQU0sQ0FBQyxXQUFXLEVBQUUsQ0FBQTtJQUMvQixDQUFDO0lBQUEsQ0FBQztJQUVGLE1BQU0sQ0FBQyxLQUFLLENBQUMsS0FBYTtRQUN0QixNQUFNLE1BQU0sR0FBRyxTQUFTLENBQUMsS0FBSyxDQUFDLENBQUE7UUFDL0IsT0FBTyxNQUFNLENBQUMsV0FBVyxFQUFFLENBQUE7SUFDL0IsQ0FBQztJQUFBLENBQUM7SUFFRixNQUFNLENBQUMsV0FBVyxDQUFDLFFBQWdCO1FBQy9CLElBQUksUUFBUSxHQUFHLFdBQVcsQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLENBQUM7UUFDM0MsSUFBSSxDQUFDLFFBQVE7WUFDVCxPQUFPLENBQUMsQ0FBQyxDQUFDO1FBQ2QsSUFBSSxDQUFDLEdBQUcsUUFBUSxDQUFDLENBQUMsRUFBRSxDQUFDLEdBQUcsUUFBUSxDQUFDLENBQUMsRUFBRSxDQUFDLEdBQUcsUUFBUSxDQUFDLENBQUMsQ0FBQztRQUNuRCxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUMsRUFBRSxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFO1lBQ3RCLENBQUMsSUFBSSxHQUFHLENBQUM7WUFDVCxPQUFPLENBQUMsQ0FBQyxJQUFJLE9BQU8sQ0FBQyxDQUFDLENBQUM7Z0JBQ25CLENBQUMsR0FBRyxLQUFLLENBQUMsQ0FBQztnQkFDWCxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLEdBQUcsS0FBSyxDQUFDLEdBQUcsS0FBSyxDQUFDLEVBQUUsR0FBRyxDQUFDLENBQUM7UUFDN0MsQ0FBQyxDQUFDLENBQUM7UUFDSCxPQUFPLENBQUMsQ0FBQyxDQUFDLENBQUMsR0FBRyxNQUFNLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxHQUFHLE1BQU0sR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLEdBQUcsTUFBTSxDQUFDO0lBQ3pELENBQUM7SUFBQSxDQUFDO0lBRUYsTUFBTSxDQUFDLGVBQWUsQ0FBQyxLQUFhO1FBQ2hDLDRCQUE0QjtRQUM1Qix1REFBdUQ7UUFDdkQseUNBQXlDO1FBQ3pDLE9BQU8sU0FBUyxDQUFDLFdBQVcsQ0FBQyxNQUFNLEVBQUUsS0FBSyxDQUFDLENBQUM7SUFDaEQsQ0FBQztJQUFBLENBQUM7Q0FJTCIsInNvdXJjZXNDb250ZW50IjpbImV4cG9ydCB0eXBlIEFYQ29sb3JNb2RlID0gJ3JnYmEnIHwgJ2hleCcgfCAnaHNsYScgfCAnaHN2YSc7XG5cbmltcG9ydCB0aW55Y29sb3IgZnJvbSAndGlueWNvbG9yMidcbmV4cG9ydCBjbGFzcyBBWENvbG9yVXRpbCB7XG5cbiAgICBzdGF0aWMgdGVzdGEoY29sb3I6IHN0cmluZykge1xuICAgICAgICB2YXIgX2NvbG9yID0gdGlueWNvbG9yKGNvbG9yKTtcbiAgICAgICAgY29uc29sZS5sb2coX2NvbG9yKTtcblxuICAgIH1cblxuICAgIHN0YXRpYyB0byhjb2xvcjogc3RyaW5nLCBtb2RlOiBBWENvbG9yTW9kZSk6IHN0cmluZyB7XG4gICAgICAgIGNvbnN0IF9jb2xvciA9IHRpbnljb2xvcihjb2xvcilcbiAgICAgICAgc3dpdGNoIChtb2RlKSB7XG4gICAgICAgICAgICBjYXNlICdyZ2JhJzpcbiAgICAgICAgICAgICAgICByZXR1cm4gX2NvbG9yLnRvUmdiU3RyaW5nKCk7XG4gICAgICAgICAgICBjYXNlICdoc2xhJzpcbiAgICAgICAgICAgICAgICByZXR1cm4gX2NvbG9yLnRvSHNsU3RyaW5nKCk7XG4gICAgICAgICAgICBjYXNlICdoc3ZhJzpcbiAgICAgICAgICAgICAgICByZXR1cm4gX2NvbG9yLnRvSHN2U3RyaW5nKCk7XG4gICAgICAgICAgICBkZWZhdWx0OlxuICAgICAgICAgICAgICAgIHJldHVybiBfY29sb3IudG9IZXhTdHJpbmcoKTtcbiAgICAgICAgfVxuXG5cbiAgICB9O1xuXG5cbiAgICBzdGF0aWMgdG9IZXgoY29sb3I6IHN0cmluZykge1xuICAgICAgICBjb25zdCBfY29sb3IgPSB0aW55Y29sb3IoY29sb3IpXG4gICAgICAgIHJldHVybiBfY29sb3IudG9IZXhTdHJpbmcoKVxuICAgIH07XG5cbiAgICBzdGF0aWMgdG9SR0IoY29sb3I6IHN0cmluZykge1xuICAgICAgICBjb25zdCBfY29sb3IgPSB0aW55Y29sb3IoY29sb3IpXG4gICAgICAgIHJldHVybiBfY29sb3IudG9SZ2JTdHJpbmcoKVxuICAgIH07XG5cbiAgICBzdGF0aWMgaWxsdW1pbmFuY2UoaGV4Q29sb3I6IHN0cmluZykge1xuICAgICAgICBsZXQgcmdiQ29sb3IgPSBBWENvbG9yVXRpbC50b1JHQihoZXhDb2xvcik7XG4gICAgICAgIGlmICghcmdiQ29sb3IpXG4gICAgICAgICAgICByZXR1cm4gLTE7XG4gICAgICAgIGxldCByID0gcmdiQ29sb3IuciwgZyA9IHJnYkNvbG9yLmcsIGIgPSByZ2JDb2xvci5iO1xuICAgICAgICBsZXQgYSA9IFtyLCBnLCBiXS5tYXAodiA9PiB7XG4gICAgICAgICAgICB2IC89IDI1NTtcbiAgICAgICAgICAgIHJldHVybiAodiA8PSAwLjAzOTI4KSA/XG4gICAgICAgICAgICAgICAgdiAvIDEyLjkyIDpcbiAgICAgICAgICAgICAgICBNYXRoLnBvdygoKHYgKyAwLjA1NSkgLyAxLjA1NSksIDIuNCk7XG4gICAgICAgIH0pO1xuICAgICAgICByZXR1cm4gYVswXSAqIDAuMjEyNiArIGFbMV0gKiAwLjcxNTIgKyBhWzJdICogMC4wNzIyO1xuICAgIH07XG5cbiAgICBzdGF0aWMgY29udHJhc3RUb1doaXRlKGNvbG9yOiBzdHJpbmcpIHtcbiAgICAgICAgLy8gbGV0IHdoaXRlSWxsdW1pbmFuY2UgPSAxO1xuICAgICAgICAvLyBsZXQgaWxsdW1pbmFuY2UgPSBBWENvbG9yVXRpbC5pbGx1bWluYW5jZShoZXhDb2xvcik7XG4gICAgICAgIC8vIHJldHVybiB3aGl0ZUlsbHVtaW5hbmNlIC8gaWxsdW1pbmFuY2U7XG4gICAgICAgIHJldHVybiB0aW55Y29sb3IucmVhZGFiaWxpdHkoXCIjZmZmXCIsIGNvbG9yKTtcbiAgICB9O1xuXG5cblxufSJdfQ==
|
package/fesm2015/acorex-core.mjs
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import * as i0 from '@angular/core';
|
|
2
2
|
import { Pipe, NgModule, Injectable, Inject } from '@angular/core';
|
|
3
|
+
import tinycolor from 'tinycolor2';
|
|
3
4
|
import * as i1 from '@angular/platform-browser';
|
|
4
5
|
import _ from 'lodash';
|
|
5
6
|
import { Subject, fromEvent } from 'rxjs';
|
|
@@ -94,25 +95,36 @@ class AXStringUtil {
|
|
|
94
95
|
}
|
|
95
96
|
|
|
96
97
|
class AXColorUtil {
|
|
97
|
-
static
|
|
98
|
-
var
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
98
|
+
static testa(color) {
|
|
99
|
+
var _color = tinycolor(color);
|
|
100
|
+
console.log(_color);
|
|
101
|
+
}
|
|
102
|
+
static to(color, mode) {
|
|
103
|
+
const _color = tinycolor(color);
|
|
104
|
+
switch (mode) {
|
|
105
|
+
case 'rgba':
|
|
106
|
+
return _color.toRgbString();
|
|
107
|
+
case 'hsla':
|
|
108
|
+
return _color.toHslString();
|
|
109
|
+
case 'hsva':
|
|
110
|
+
return _color.toHsvString();
|
|
111
|
+
default:
|
|
112
|
+
return _color.toHexString();
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
;
|
|
116
|
+
static toHex(color) {
|
|
117
|
+
const _color = tinycolor(color);
|
|
118
|
+
return _color.toHexString();
|
|
103
119
|
}
|
|
104
120
|
;
|
|
105
|
-
static
|
|
106
|
-
|
|
107
|
-
return
|
|
108
|
-
r: parseInt(result[1], 16),
|
|
109
|
-
g: parseInt(result[2], 16),
|
|
110
|
-
b: parseInt(result[3], 16)
|
|
111
|
-
} : null;
|
|
121
|
+
static toRGB(color) {
|
|
122
|
+
const _color = tinycolor(color);
|
|
123
|
+
return _color.toRgbString();
|
|
112
124
|
}
|
|
113
125
|
;
|
|
114
126
|
static illuminance(hexColor) {
|
|
115
|
-
let rgbColor = AXColorUtil.
|
|
127
|
+
let rgbColor = AXColorUtil.toRGB(hexColor);
|
|
116
128
|
if (!rgbColor)
|
|
117
129
|
return -1;
|
|
118
130
|
let r = rgbColor.r, g = rgbColor.g, b = rgbColor.b;
|
|
@@ -125,10 +137,11 @@ class AXColorUtil {
|
|
|
125
137
|
return a[0] * 0.2126 + a[1] * 0.7152 + a[2] * 0.0722;
|
|
126
138
|
}
|
|
127
139
|
;
|
|
128
|
-
static contrastToWhite(
|
|
129
|
-
let whiteIlluminance = 1;
|
|
130
|
-
let illuminance = AXColorUtil.illuminance(hexColor);
|
|
131
|
-
return whiteIlluminance / illuminance;
|
|
140
|
+
static contrastToWhite(color) {
|
|
141
|
+
// let whiteIlluminance = 1;
|
|
142
|
+
// let illuminance = AXColorUtil.illuminance(hexColor);
|
|
143
|
+
// return whiteIlluminance / illuminance;
|
|
144
|
+
return tinycolor.readability("#fff", color);
|
|
132
145
|
}
|
|
133
146
|
;
|
|
134
147
|
}
|