mirror of
https://github.com/penpot/penpot.git
synced 2025-04-05 19:41:27 -05:00
✨ Simplify implementation of d/name
This commit is contained in:
parent
cac785f3e1
commit
afd373ffee
2 changed files with 12 additions and 13 deletions
|
@ -716,20 +716,19 @@
|
|||
|
||||
(defn name
|
||||
"Improved version of name that won't fail if the input is not a keyword"
|
||||
([maybe-keyword] (name maybe-keyword nil))
|
||||
([maybe-keyword default-value]
|
||||
(cond
|
||||
(keyword? maybe-keyword)
|
||||
(c/name maybe-keyword)
|
||||
[maybe-keyword]
|
||||
(cond
|
||||
(nil? maybe-keyword)
|
||||
nil
|
||||
|
||||
(string? maybe-keyword)
|
||||
maybe-keyword
|
||||
(keyword? maybe-keyword)
|
||||
(c/name maybe-keyword)
|
||||
|
||||
(nil? maybe-keyword) default-value
|
||||
(string? maybe-keyword)
|
||||
maybe-keyword
|
||||
|
||||
:else
|
||||
(or default-value
|
||||
(str maybe-keyword)))))
|
||||
:else
|
||||
(str maybe-keyword)))
|
||||
|
||||
(defn prefix-keyword
|
||||
"Given a keyword and a prefix will return a new keyword with the prefix attached
|
||||
|
|
|
@ -209,12 +209,12 @@
|
|||
[:div {:class (stl/css :contraints-selects)}
|
||||
[:div {:class (stl/css :horizontal-select)}
|
||||
[:& select
|
||||
{:default-value (d/name constraints-h "scale")
|
||||
{:default-value (d/nilv (d/name constraints-h) "scale")
|
||||
:options options-h
|
||||
:on-change on-constraint-h-select-changed}]]
|
||||
[:div {:class (stl/css :vertical-select)}
|
||||
[:& select
|
||||
{:default-value (d/name constraints-v "scale")
|
||||
{:default-value (d/nilv (d/name constraints-v) "scale")
|
||||
:options options-v
|
||||
:on-change on-constraint-v-select-changed}]]
|
||||
(when first-level?
|
||||
|
|
Loading…
Add table
Reference in a new issue