mirror
/
penpot
mirror of https://github.com/penpot/penpot.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

🐛 Fix problem with color inputs

This commit is contained in:
alonso.torres 2023-11-14 16:32:13 +01:00
parent 89a09091db
commit 78332257aa
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/src/app/common/colors.cljc
View File

@ -183,7 +183,7 @@
"yellowgreen" "#9acd32"}) "yellowgreen" "#9acd32"})
(def ^:private hex-color-re (def ^:private hex-color-re
#"\#[0-9a-fA-F]{3,6}") #"\#([0-9a-fA-F]{6}|[0-9a-fA-F]{3})")
(def ^:private rgb-color-re (def ^:private rgb-color-re
#"(?:|rgb)\((\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\)") #"(?:|rgb)\((\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\)")
@ -431,7 +431,8 @@
(defn parse (defn parse
[color] [color]
(when (string? color) (when (string? color)
(if (valid-hex-color? color) (if (or (valid-hex-color? color)
(valid-hex-color? (dm/str "#" color)))
(normalize-hex color) (normalize-hex color)
(or (some-> (parse-rgb color) (rgb->hex)) (or (some-> (parse-rgb color) (rgb->hex))
(get names (str/lower color)))))) (get names (str/lower color))))))

1
common/test/common_tests/colors_test.cljc
View File

@ -17,6 +17,7 @@
(t/is (false? (colors/valid-hex-color? "#"))) (t/is (false? (colors/valid-hex-color? "#")))
(t/is (false? (colors/valid-hex-color? "#qqqqqq"))) (t/is (false? (colors/valid-hex-color? "#qqqqqq")))
(t/is (true? (colors/valid-hex-color? "#aaa"))) (t/is (true? (colors/valid-hex-color? "#aaa")))
(t/is (false? (colors/valid-hex-color? "#aaaa")))
(t/is (true? (colors/valid-hex-color? "#fabada"))) (t/is (true? (colors/valid-hex-color? "#fabada")))
) )