3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-05-22 09:56:11 +02:00
Code Issues Projects Releases Packages Wiki Activity

✨ Simplify implementation of d/name

Browse source
This commit is contained in:
Andrey Antukh 2024-03-05 17:07:41 +01:00
parent cac785f3e1
commit afd373ffee
2 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

21
common/src/app/common/data.cljc
View file

@ -716,20 +716,19 @@
(defn name (defn name
"Improved version of name that won't fail if the input is not a keyword" "Improved version of name that won't fail if the input is not a keyword"
([maybe-keyword] (name maybe-keyword nil)) [maybe-keyword]
([maybe-keyword default-value] (cond
(cond (nil? maybe-keyword)
(keyword? maybe-keyword) nil
(c/name maybe-keyword)
(string? maybe-keyword) (keyword? maybe-keyword)
maybe-keyword (c/name maybe-keyword)
(nil? maybe-keyword) default-value (string? maybe-keyword)
maybe-keyword
:else :else
(or default-value (str maybe-keyword)))
(str maybe-keyword)))))
(defn prefix-keyword (defn prefix-keyword
"Given a keyword and a prefix will return a new keyword with the prefix attached "Given a keyword and a prefix will return a new keyword with the prefix attached

4
frontend/src/app/main/ui/workspace/sidebar/options/menus/constraints.cljs
View file

@ -209,12 +209,12 @@
[:div {:class (stl/css :contraints-selects)} [:div {:class (stl/css :contraints-selects)}
[:div {:class (stl/css :horizontal-select)} [:div {:class (stl/css :horizontal-select)}
[:& select [:& select
{:default-value (d/name constraints-h "scale") {:default-value (d/nilv (d/name constraints-h) "scale")
:options options-h :options options-h
:on-change on-constraint-h-select-changed}]] :on-change on-constraint-h-select-changed}]]
[:div {:class (stl/css :vertical-select)} [:div {:class (stl/css :vertical-select)}
[:& select [:& select
{:default-value (d/name constraints-v "scale") {:default-value (d/nilv (d/name constraints-v) "scale")
:options options-v :options options-v
:on-change on-constraint-v-select-changed}]] :on-change on-constraint-v-select-changed}]]
(when first-level? (when first-level?