Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-01-21 22:22:43 -05:00
Code Issues Activity

Merge pull request #104 from tokens-studio/fix-sizing-dimensions-mixup

Browse source 
Fix sizing/dimensions token mixup
This commit is contained in:
Florian Schrödl 2024-05-15 17:14:41 +02:00 • committed by GitHub
commit 3e7a422136
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
common/src/app/common/types/token.cljc
View file

@ -73,7 +73,7 @@
(def stroke-width-keys (schema-keys ::stroke-width)) (def stroke-width-keys (schema-keys ::stroke-width))
(sm/def! ::dimensions (sm/def! ::sizing
[:map [:map
[:width {:optional true} ::sm/uuid] [:width {:optional true} ::sm/uuid]
[:height {:optional true} ::sm/uuid] [:height {:optional true} ::sm/uuid]
@ -82,7 +82,7 @@
[:min-width {:optional true} ::sm/uuid] [:min-width {:optional true} ::sm/uuid]
[:max-width {:optional true} ::sm/uuid]]) [:max-width {:optional true} ::sm/uuid]])
(def dimensions-keys (schema-keys ::dimensions)) (def sizing-keys (schema-keys ::sizing))
(sm/def! ::opacity (sm/def! ::opacity
[:map [:map
@ -104,11 +104,20 @@
(def spacing-keys (schema-keys ::spacing)) (def spacing-keys (schema-keys ::spacing))
(sm/def! ::dimensions
(merge-schemas ::sizing
::spacing
::stroke-width
::border-radius))
(def dimensions-keys (schema-keys ::dimensions))
(sm/def! ::tokens (sm/def! ::tokens
[:map {:title "Applied Tokens"}]) [:map {:title "Applied Tokens"}])
(sm/def! ::applied-tokens (sm/def! ::applied-tokens
(merge-schemas ::tokens (merge-schemas ::tokens
::border-radius ::border-radius
::dimensions ::sizing
::spacing)) ::spacing
::dimensions))

2
frontend/src/app/main/ui/workspace/tokens/core.cljs
View file

@ -113,6 +113,8 @@
:type :box-shadow}]}}] :type :box-shadow}]}}]
[:sizing [:sizing
{:title "Sizing" {:title "Sizing"
:attributes ctt/sizing-keys
:on-update-shape update-shape-dimensions
:modal {:key :tokens/sizing :modal {:key :tokens/sizing
:fields [{:label "Sizing" :fields [{:label "Sizing"
:key :sizing}]}}] :key :sizing}]}}]