Merge pull request #399 from WarrenMoore/dev

sandeep-vedam · web-flow · commit dfd0dd013b55 · 2023-09-27T18:24:55.000+05:30
allow Colors to take ARGB values
diff --git a/src/Colors/index.js b/src/Colors/index.js
@@ -79,7 +79,7 @@ const normalizeColorToARGB = color => {
   if (!targetColor) {
     targetColor = color
   }
-  const check = /^#([0-9A-F]{3}|[0-9A-F]{6})$/i
+  const check = /^#([0-9A-F]{3}|[0-9A-F]{6}|[0-9A-F]{8})$/i
   if (isString(targetColor) && check.test(targetColor)) {
     let hex = check.exec(targetColor)[1]
     if (hex.length === 3) {
@@ -90,7 +90,7 @@ const normalizeColorToARGB = color => {
         })
         .join('')
     }
-    targetColor = `0xff${hex}` * 1
+    targetColor = (hex.length === 8 ? `0x${hex}` : `0xff${hex}`) * 1
   }
   if (!normalizedColors[color]) {
     normalizedColors[color] = targetColor

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ const normalizeColorToARGB = color => {`
`79`	`79`	`if (!targetColor) {`
`80`	`80`	`targetColor = color`
`81`	`81`	`}`
`82`		`- const check = /^#([0-9A-F]{3}\|[0-9A-F]{6})$/i`
	`82`	`+ const check = /^#([0-9A-F]{3}\|[0-9A-F]{6}\|[0-9A-F]{8})$/i`
`83`	`83`	`if (isString(targetColor) && check.test(targetColor)) {`
`84`	`84`	`let hex = check.exec(targetColor)[1]`
`85`	`85`	`if (hex.length === 3) {`
`@@ -90,7 +90,7 @@ const normalizeColorToARGB = color => {`
`90`	`90`	`})`
`91`	`91`	`.join('')`
`92`	`92`	`}`
`93`		- targetColor = `0xff${hex}` * 1
	`93`	+ targetColor = (hex.length === 8 ? `0x${hex}` : `0xff${hex}`) * 1
`94`	`94`	`}`
`95`	`95`	`if (!normalizedColors[color]) {`
`96`	`96`	`normalizedColors[color] = targetColor`