Skip to content

Match functional colors against the whole string in normalize-colors #59103

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
YevheniiKotyrlo wants to merge 1 commit into
base: main
Choose a base branch
from
+30 −7
Open

Match functional colors against the whole string in normalize-colors #59103

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
9 changes: 9 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 @@ -53,6 +53,15 @@ it('refuses non-spec compliant colors', () => {
expect(normalizeColor('rgb(1%, 2%, 3%)')).toBe(null);
});

it('refuses a string that only contains a functional color', () => {
expect(normalizeColor('xxrgb(1, 2, 3)yy')).toBe(null);
expect(normalizeColor('rgba(1, 2, 3, 0.5) extra')).toBe(null);
expect(normalizeColor('0 0 0 1px rgba(124, 58, 237, 1)')).toBe(null);
expect(normalizeColor('drop-shadow(0 0 4px hsl(0, 100%, 50%))')).toBe(null);
expect(normalizeColor('hsla(0, 100%, 50%, 1);')).toBe(null);
expect(normalizeColor('x hwb(0 0% 0%)')).toBe(null);
});

it('handles hex6 properly', () => {
expect(normalizeColor('#000000')).toBe(0x000000ff);
expect(normalizeColor('#ffffff')).toBe(0xffffffff);
Expand Down
14 changes: 7 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 @@ -277,22 +277,22 @@ function getMatchers() {
callWithSlashSeparator(NUMBER, NUMBER, NUMBER, NUMBER);

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
14 changes: 14 additions & 0 deletions packages/react-native/Libraries/Animated/__tests__/Interpolation-itest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,6 +333,20 @@ describe('Interpolation', () => {
expect(interpolation(1)).toBe('translate(20px, 10px)');
});

it('should keep the rest of a string range that contains a color', () => {
const interpolation = createInterpolation({
inputRange: [0, 1],
outputRange: [
'inset 0 0 0 1px rgba(124, 58, 237, 1)',
'inset 0 0 0 3px rgba(124, 58, 237, 0.5)',
],
});

expect(interpolation(0)).toBe('inset 0 0 0 1px rgba(124, 58, 237, 1)');
expect(interpolation(0.5)).toBe('inset 0 0 0 2px rgba(124, 58, 237, 0.75)');
expect(interpolation(1)).toBe('inset 0 0 0 3px rgba(124, 58, 237, 0.5)');
});

it('should crash when chaining an interpolation that returns a string', () => {
const interpolation = createInterpolation({
inputRange: [0, 1],
Expand Down
Loading