Skip to content

Commit 43eee1f

Browse files
ricokahlerRico Kahler
and
Rico Kahler
authored
fix: hsla parsing with an alpha value of 0 (#464)
* fix: hsla parsing with an alpha value of 0 * test: add test explictly for hsla with zero alpha Co-authored-by: Rico Kahler <[email protected]>
1 parent 61265ab commit 43eee1f

File tree

3 files changed

+47
-16
lines changed

3 files changed

+47
-16
lines changed

src/parseToRgba.test.ts

+20
Original file line numberDiff line numberDiff line change
@@ -328,6 +328,26 @@ describe('parseToRgb', () => {
328328
`);
329329
});
330330

331+
it('parses should parse an hsla color with an alpha value of zero', () => {
332+
expect(parseToRgba('hsla(210,0.5%,0.5%,0)')).toMatchInlineSnapshot(`
333+
[
334+
1,
335+
1,
336+
1,
337+
0,
338+
]
339+
`);
340+
expect(parseToRgba('hsla( 210 , 0.5% , 0.5% , 0.01 )'))
341+
.toMatchInlineSnapshot(`
342+
[
343+
1,
344+
1,
345+
1,
346+
0.01,
347+
]
348+
`);
349+
});
350+
331351
it('throws an error if an invalid color string is provided', () => {
332352
expect(() => {
333353
parseToRgba('(174,67,255)');

src/parseToRgba.ts

+23-16
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,12 @@ function parseToRgba(color: string): [number, number, number, number] {
4545
const [h, s, l, a] = Array.from(hslaMatch).slice(1).map(parseFloat);
4646
if (guard(0, 100, s) !== s) throw new ColorError(color);
4747
if (guard(0, 100, l) !== l) throw new ColorError(color);
48-
return [...hslToRgb(h, s, l), a || 1] as [number, number, number, number];
48+
return [...hslToRgb(h, s, l), Number.isNaN(a) ? 1 : a] as [
49+
number,
50+
number,
51+
number,
52+
number
53+
];
4954
}
5055

5156
throw new ColorError(color);
@@ -67,22 +72,23 @@ function hash(str: string) {
6772

6873
const colorToInt = (x: string) => parseInt(x.replace(/_/g, ''), 36);
6974

70-
const compressedColorMap = '1q29ehhb 1n09sgk7 1kl1ekf_ _yl4zsno 16z9eiv3 1p29lhp8 _bd9zg04 17u0____ _iw9zhe5 _to73___ _r45e31e _7l6g016 _jh8ouiv _zn3qba8 1jy4zshs 11u87k0u 1ro9yvyo 1aj3xael 1gz9zjz0 _3w8l4xo 1bf1ekf_ _ke3v___ _4rrkb__ 13j776yz _646mbhl _nrjr4__ _le6mbhl 1n37ehkb _m75f91n _qj3bzfz 1939yygw 11i5z6x8 _1k5f8xs 1509441m 15t5lwgf _ae2th1n _tg1ugcv 1lp1ugcv 16e14up_ _h55rw7n _ny9yavn _7a11xb_ 1ih442g9 _pv442g9 1mv16xof 14e6y7tu 1oo9zkds 17d1cisi _4v9y70f _y98m8kc 1019pq0v 12o9zda8 _348j4f4 1et50i2o _8epa8__ _ts6senj 1o350i2o 1mi9eiuo 1259yrp0 1ln80gnw _632xcoy 1cn9zldc _f29edu4 1n490c8q _9f9ziet 1b94vk74 _m49zkct 1kz6s73a 1eu9dtog _q58s1rz 1dy9sjiq __u89jo3 _aj5nkwg _ld89jo3 13h9z6wx _qa9z2ii _l119xgq _bs5arju 1hj4nwk9 1qt4nwk9 1ge6wau6 14j9zlcw 11p1edc_ _ms1zcxe _439shk6 _jt9y70f _754zsow 1la40eju _oq5p___ _x279qkz 1fa5r3rv _yd2d9ip _424tcku _8y1di2_ _zi2uabw _yy7rn9h 12yz980_ __39ljp6 1b59zg0x _n39zfzp 1fy9zest _b33k___ _hp9wq92 1il50hz4 _io472ub _lj9z3eo 19z9ykg0 _8t8iu3a 12b9bl4a 1ak5yw0o _896v4ku _tb8k8lv _s59zi6t _c09ze0p 1lg80oqn 1id9z8wb _238nba5 1kq6wgdi _154zssg _tn3zk49 _da9y6tc 1sg7cv4f _r12jvtt 1gq5fmkz 1cs9rvci _lp9jn1c _xw1tdnb 13f9zje6 16f6973h _vo7ir40 _bt5arjf _rc45e4t _hr4e100 10v4e100 _hc9zke2 _w91egv_ _sj2r1kk 13c87yx8 _vqpds__ _ni8ggk8 _tj9yqfb 1ia2j4r4 _7x9b10u 1fc9ld4j 1eq9zldr _5j9lhpx _ez9zl6o _md61fzm'
71-
.split(' ')
72-
.reduce((acc, next) => {
73-
const key = colorToInt(next.substring(0, 3));
74-
const hex = colorToInt(next.substring(3)).toString(16);
75+
const compressedColorMap =
76+
'1q29ehhb 1n09sgk7 1kl1ekf_ _yl4zsno 16z9eiv3 1p29lhp8 _bd9zg04 17u0____ _iw9zhe5 _to73___ _r45e31e _7l6g016 _jh8ouiv _zn3qba8 1jy4zshs 11u87k0u 1ro9yvyo 1aj3xael 1gz9zjz0 _3w8l4xo 1bf1ekf_ _ke3v___ _4rrkb__ 13j776yz _646mbhl _nrjr4__ _le6mbhl 1n37ehkb _m75f91n _qj3bzfz 1939yygw 11i5z6x8 _1k5f8xs 1509441m 15t5lwgf _ae2th1n _tg1ugcv 1lp1ugcv 16e14up_ _h55rw7n _ny9yavn _7a11xb_ 1ih442g9 _pv442g9 1mv16xof 14e6y7tu 1oo9zkds 17d1cisi _4v9y70f _y98m8kc 1019pq0v 12o9zda8 _348j4f4 1et50i2o _8epa8__ _ts6senj 1o350i2o 1mi9eiuo 1259yrp0 1ln80gnw _632xcoy 1cn9zldc _f29edu4 1n490c8q _9f9ziet 1b94vk74 _m49zkct 1kz6s73a 1eu9dtog _q58s1rz 1dy9sjiq __u89jo3 _aj5nkwg _ld89jo3 13h9z6wx _qa9z2ii _l119xgq _bs5arju 1hj4nwk9 1qt4nwk9 1ge6wau6 14j9zlcw 11p1edc_ _ms1zcxe _439shk6 _jt9y70f _754zsow 1la40eju _oq5p___ _x279qkz 1fa5r3rv _yd2d9ip _424tcku _8y1di2_ _zi2uabw _yy7rn9h 12yz980_ __39ljp6 1b59zg0x _n39zfzp 1fy9zest _b33k___ _hp9wq92 1il50hz4 _io472ub _lj9z3eo 19z9ykg0 _8t8iu3a 12b9bl4a 1ak5yw0o _896v4ku _tb8k8lv _s59zi6t _c09ze0p 1lg80oqn 1id9z8wb _238nba5 1kq6wgdi _154zssg _tn3zk49 _da9y6tc 1sg7cv4f _r12jvtt 1gq5fmkz 1cs9rvci _lp9jn1c _xw1tdnb 13f9zje6 16f6973h _vo7ir40 _bt5arjf _rc45e4t _hr4e100 10v4e100 _hc9zke2 _w91egv_ _sj2r1kk 13c87yx8 _vqpds__ _ni8ggk8 _tj9yqfb 1ia2j4r4 _7x9b10u 1fc9ld4j 1eq9zldr _5j9lhpx _ez9zl6o _md61fzm'
77+
.split(' ')
78+
.reduce((acc, next) => {
79+
const key = colorToInt(next.substring(0, 3));
80+
const hex = colorToInt(next.substring(3)).toString(16);
7581

76-
// NOTE: padStart could be used here but it breaks Node 6 compat
77-
// https://github.com/ricokahler/color2k/issues/351
78-
let prefix = '';
79-
for (let i = 0; i < 6 - hex.length; i++) {
80-
prefix += '0';
81-
}
82+
// NOTE: padStart could be used here but it breaks Node 6 compat
83+
// https://github.com/ricokahler/color2k/issues/351
84+
let prefix = '';
85+
for (let i = 0; i < 6 - hex.length; i++) {
86+
prefix += '0';
87+
}
8288

83-
acc[key] = `${prefix}${hex}`;
84-
return acc;
85-
}, {} as { [key: string]: string });
89+
acc[key] = `${prefix}${hex}`;
90+
return acc;
91+
}, {} as { [key: string]: string });
8692

8793
/**
8894
* Checks if a string is a CSS named color and returns its equivalent hex value, otherwise returns the original color.
@@ -108,7 +114,8 @@ const rgbaRegex = new RegExp(
108114
)}(?:,\\s*([\\d.]+))?\\s*\\)$`,
109115
'i'
110116
);
111-
const hslaRegex = /^hsla?\(\s*([\d.]+)\s*,\s*([\d.]+)%\s*,\s*([\d.]+)%(?:\s*,\s*([\d.]+))?\s*\)$/i;
117+
const hslaRegex =
118+
/^hsla?\(\s*([\d.]+)\s*,\s*([\d.]+)%\s*,\s*([\d.]+)%(?:\s*,\s*([\d.]+))?\s*\)$/i;
112119
const namedColorRegex = /^[a-z]+$/i;
113120

114121
const roundColor = (color: number): number => {

src/toHex.test.ts

+4
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,7 @@ test('https://github.com/ricokahler/color2k/issues/235', () => {
2525

2626
expect(toHex('#03dac5')).toMatchInlineSnapshot(`"#03dac5"`);
2727
});
28+
29+
test('https://github.com/ricokahler/color2k/issues/463', () => {
30+
expect(toHex('hsla(15, 50%, 50%, 0)')).toMatchInlineSnapshot(`"#bf604000"`);
31+
});

0 commit comments

Comments
 (0)