Skip to content
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

Jump to bottom

feat: color prop can accept rgb colors #586

Merged
merged 2 commits into from
Jun 24, 2024
Merged

feat: color prop can accept rgb colors #586

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
9a6634f
HashLoader can accept rgb colors
Apr 9, 2024
7b462b9
Merge branch 'main' into bugfix/hashloader-rgb-color
davidhu2000 Jun 24, 2024
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: 20 additions & 0 deletions src/helpers/colors.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,26 @@ describe("calculateRgba", () => {
expect(typeof calculateRgba).toEqual("function");
});

it("returns the same passed in rgb value with custom opacity in old syntax", () => {
expect(calculateRgba("rgb(255, 255, 255, 0.5)", 1)).toEqual("rgba(255, 255, 255, 0.5)");
expect(calculateRgba("rgba(255, 255, 255, 0.5)", 1)).toEqual("rgba(255, 255, 255, 0.5)");
});

it("returns the same passed in rgb value with custom opacity in new syntax", () => {
expect(calculateRgba("rgb(255 255 255 / 0.5)", 1)).toEqual("rgba(255 255 255 / 0.5)");
expect(calculateRgba("rgba(255 255 255 / 0.5)", 1)).toEqual("rgba(255 255 255 / 0.5)");
});

it("adds passed in opacity to the rgb values in old syntax", () => {
expect(calculateRgba("rgb(255, 255, 255)", 0.5)).toEqual("rgba(255, 255, 255, 0.5)");
expect(calculateRgba("rgba(255, 255, 255)", 0.5)).toEqual("rgba(255, 255, 255, 0.5)");
});

it("adds passed in opacity to the rgb values in new syntax", () => {
expect(calculateRgba("rgb(255 255 255)", 0.5)).toEqual("rgba(255 255 255 / 0.5)");
expect(calculateRgba("rgba(255 255 255)", 0.5)).toEqual("rgba(255 255 255 / 0.5)");
});

it("converts hash values to rgb", () => {
expect(calculateRgba("#ffffff", 1)).toEqual("rgba(255, 255, 255, 1)");
});
Expand Down
29 changes: 28 additions & 1 deletion src/helpers/colors.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,37 @@ enum BasicColors {
black = "#000000",
gray = "#808080",
silver = "#C0C0C0",
white = "#FFFFFF"
white = "#FFFFFF",
}

const handleRgbColorString = (color: string, opacity: number): string => {
// rgb(a)(255 255 255 / 80%)
if (color.includes("/")) {
return color.replace("rgb(", "rgba(");
}

const rgbValues = color.substring(color.startsWith("rgba(") ? 5 : 4, color.length - 1).trim();
const splittedByCommas = rgbValues.split(",");

// rgb(a)(255, 255, 255, 0.8)
if (splittedByCommas.length === 4) {
return color.replace("rgb(", "rgba(");
}

// rgb(a)(255, 255, 255)
if (splittedByCommas.length === 3) {
return `rgba(${rgbValues}, ${opacity})`;
}

// rgb(a)(255 255 255)
return `rgba(${rgbValues} / ${opacity})`;
};

export const calculateRgba = (color: string, opacity: number): string => {
if (color.startsWith("rgb")) {
return handleRgbColorString(color, opacity);
}

if (Object.keys(BasicColors).includes(color)) {
color = BasicColors[color as keyof typeof BasicColors];
}
Expand Down
Loading