jingrow/charts
1
0
Fork 0
Code Pull Requests Activity

Merge pull request #275 from Thunderbottom/color-check-fix

Browse Source 
fix: improve regex to check if string is hex or rgb
This commit is contained in:
Shivam Mishra 2020-04-07 16:16:02 +05:30 committed by GitHub
commit e95f0aadaa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/js/utils/colors.js
View File

@ -36,8 +36,10 @@ export function lightenDarkenColor(color, amt) {
} }
export function isValidColor(string) { export function isValidColor(string) {
// https://stackoverflow.com/a/8027444/6495043 // https://stackoverflow.com/a/32685393
return /(^#[0-9A-F]{6}$)|(^#[0-9A-F]{3}$)/i.test(string); let HEX_RE = /(^\s*)(#)((?:[A-Fa-f0-9]{3}){1,2})$/i
let RGB_RE = /(^\s*)(rgb|hsl)(a?)[(]\s*([\d.]+\s*%?)\s*,\s*([\d.]+\s*%?)\s*,\s*([\d.]+\s*%?)\s*(?:,\s*([\d.]+)\s*)?[)]$/i
return HEX_RE.test(string) || RGB_RE.test(string);
} }
export const getColor = (color) => { export const getColor = (color) => {