Skip to content

Update HWB color format to comply with React Native 0.79.0 #90

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

Merged
merged 2 commits into from
May 21, 2025
Merged

Update HWB color format to comply with React Native 0.79.0 #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c2ca0b
fix: update regex patterns for HWB color format to support additional…
alabsi91 Apr 9, 2025
2adc481
fix: update HWB conversion tests to use correct expected values
alabsi91 Apr 15, 2025
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
20 changes: 10 additions & 10 deletions __tests__/colorConversion.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,9 +423,9 @@ describe('HEX to HWB Conversion', () => {
for (let i = 0; i < colors.length; i++) {
const { hex, hwb } = colors[i];
for (let r = 0; r < hex.length; r++) {
test(`converts ${hex[r]} to ${hwb[0]}`, () => {
test(`converts ${hex[r]} to ${hwb[2]}`, () => {
const color = colorKit.HWB(hex[r]).string();
expect(color).toBe(hwb[0]);
expect(color).toBe(hwb[2]);
});
}
}
Expand All @@ -435,9 +435,9 @@ describe('RGB to HWB Conversion', () => {
for (let i = 0; i < colors.length; i++) {
const { rgb, hwb } = colors[i];
for (let r = 0; r < rgb.length; r++) {
test(`converts ${rgb[r]} to ${hwb[0]}`, () => {
test(`converts ${rgb[r]} to ${hwb[2]}`, () => {
const color = colorKit.HWB(rgb[r]).string();
expect(color).toBe(hwb[0]);
expect(color).toBe(hwb[2]);
});
}
}
Expand All @@ -447,9 +447,9 @@ describe('HSL to HWB Conversion', () => {
for (let i = 0; i < colors.length; i++) {
const { hsl, hwb } = colors[i];
for (let r = 0; r < hsl.length; r++) {
test(`converts ${hsl[r]} to ${hwb[0]}`, () => {
test(`converts ${hsl[r]} to ${hwb[2]}`, () => {
const color = colorKit.HWB(hsl[r]).string();
expect(color).toBe(hwb[0]);
expect(color).toBe(hwb[2]);
});
}
}
Expand All @@ -459,9 +459,9 @@ describe('HSV to HWB Conversion', () => {
for (let i = 0; i < colors.length; i++) {
const { hsv, hwb } = colors[i];
for (let r = 0; r < hsv.length; r++) {
test(`converts ${hsv[r]} to ${hwb[0]}`, () => {
test(`converts ${hsv[r]} to ${hwb[2]}`, () => {
const color = colorKit.HWB(hsv[r]).string();
expect(color).toBe(hwb[0]);
expect(color).toBe(hwb[2]);
});
}
}
Expand All @@ -471,9 +471,9 @@ describe('HWB to HWB Conversion', () => {
for (let i = 0; i < colors.length; i++) {
const { hwb } = colors[i];
for (let r = 0; r < hwb.length; r++) {
test(`converts ${hwb[r]} to ${hwb[0]}`, () => {
test(`converts ${hwb[r]} to ${hwb[2]}`, () => {
const color = colorKit.HWB(hwb[r]).string();
expect(color).toBe(hwb[0]);
expect(color).toBe(hwb[2]);
});
}
}
Expand Down
9 changes: 5 additions & 4 deletions src/colorKit/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,7 @@ export const colorKitUI = () => {

hwb: [
/^hwb\s*\(\s*(\d{1,3})(?:deg)?\s*,\s*([\d.]+)%\s*,\s*([\d.]+)%\s*\)$/i,
/^hwb\s*\(\s*(\d{1,3})\s+([\d.]+)%\s+([\d.]+)%\s+\/\s*(\d|\d\.\d+)\s*\)$/i,
/^hwb\s*\(\s*(\d{1,3})(?:deg)?\s+([\d.]+)%\s+([\d.]+)%\s*\)$/i,
],
hwba: [
Expand Down Expand Up @@ -812,13 +813,13 @@ export const colorKitUI = () => {

// auto
if (typeof forceAlpha === 'undefined') {
if (typeof a === 'number' && a !== 1) return `hwba(${h}, ${w}%, ${b}%, ${a})`;
return `hwb(${h}, ${w}%, ${b}%)`;
if (typeof a === 'number' && a !== 1) return `hwb(${h} ${w}% ${b}% / ${a})`;
return `hwb(${h} ${w}% ${b}%)`;
}

if (forceAlpha) return `hwba(${h}, ${w}%, ${b}%, ${a ?? 1})`;
if (forceAlpha) return `hwb(${h} ${w}% ${b}% / ${a ?? 1})`;

return `hwb(${h}, ${w}%, ${b}%)`;
return `hwb(${h} ${w}% ${b}%)`;
},
array: (roundValues = true) => {
if (roundValues) {
Expand Down