Skip to content

fix(normalize-color): require full-string match for rgb/hsl/hwb #58496

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
scs0209 wants to merge 1 commit into
base: main
Choose a base branch
from
+16 −7
Open

fix(normalize-color): require full-string match for rgb/hsl/hwb #58496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions packages/normalize-color/__tests__/normalizeColor-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,13 @@ it('refuses non-spec compliant colors', () => {
expect(normalizeColor('#00gg00')).toBe(null);
expect(normalizeColor('rgb(1, 2, 3,)')).toBe(null);
expect(normalizeColor('rgb(1, 2, 3')).toBe(null);
// Functional forms must match the whole string (hex already did).
expect(normalizeColor('xxrgb(1, 2, 3)yy')).toBe(null);
expect(normalizeColor('rgb(1, 2, 3)yy')).toBe(null);
expect(normalizeColor('xxrgb(1, 2, 3)')).toBe(null);
expect(normalizeColor('rgba(1,2,3,0.5)extra')).toBe(null);
expect(normalizeColor('prefixhsl(0, 0%, 0%)')).toBe(null);
expect(normalizeColor('hwb(0 0% 0%)suffix')).toBe(null);

// Used to be accepted by normalizeColor
expect(normalizeColor('abc')).toBe(null);
Expand Down
16 changes: 9 additions & 7 deletions packages/normalize-color/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,23 +276,25 @@ function getMatchers() {
'|' +
callWithSlashSeparator(NUMBER, NUMBER, NUMBER, NUMBER);

// Anchor functional forms the same way as hex* so leading/trailing
// junk (e.g. "xxrgb(1, 2, 3)yy") cannot partially match.
cachedMatchers = {
rgb: new RegExp('rgb(' + rgbRegexPattern + ')'),
rgba: new RegExp('rgba(' + rgbRegexPattern + ')'),
hsl: new RegExp('hsl' + call(NUMBER, PERCENTAGE, PERCENTAGE)),
rgb: new RegExp('^rgb(' + rgbRegexPattern + ')$'),
rgba: new RegExp('^rgba(' + rgbRegexPattern + ')$'),
hsl: new RegExp('^hsl' + call(NUMBER, PERCENTAGE, PERCENTAGE) + '$'),
hsla: new RegExp(
'hsla(' +
'^hsla(' +
commaSeparatedCall(NUMBER, PERCENTAGE, PERCENTAGE, NUMBER) +
'|' +
callWithSlashSeparator(NUMBER, PERCENTAGE, PERCENTAGE, NUMBER) +
')',
')$',
),
hwb: new RegExp(
'hwb(' +
'^hwb(' +
callModern(NUMBER, PERCENTAGE, PERCENTAGE) +
'|' +
callWithSlashSeparator(NUMBER, PERCENTAGE, PERCENTAGE, NUMBER) +
')',
')$',
),
hex3: /^#([0-9a-fA-F]{1})([0-9a-fA-F]{1})([0-9a-fA-F]{1})$/,
hex4: /^#([0-9a-fA-F]{1})([0-9a-fA-F]{1})([0-9a-fA-F]{1})([0-9a-fA-F]{1})$/,
Expand Down
Loading