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

Simplify token application

Browse source
This commit is contained in:
Florian Schroedl 2024-05-16 09:55:57 +02:00
parent 0d154679e9
commit 48c85d7200
2 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
frontend/src/app/main/data/tokens.cljs
View file

@ -59,10 +59,21 @@
(let [token (token-from-attributes token-id attributes)] (let [token (token-from-attributes token-id attributes)]
(toggle-or-apply-token shape token))) (toggle-or-apply-token shape token)))
(defn apply-token-to-shape [{:keys [shape _token-id _attributes] :as props}] (defn apply-token-to-shape
(let [applied-tokens (apply-token-id-to-attributes props)] "When the passed `:token` is non-nil apply it to the `:applied-tokens` on a shape."
[{:keys [shape token attributes] :as props}]
(let [applied-tokens (apply-token-id-to-attributes {:shape shape
:token-id (:id token)
:attributes attributes})]
(update shape :applied-tokens #(merge % applied-tokens)))) (update shape :applied-tokens #(merge % applied-tokens))))
(defn maybe-apply-token-to-shape
"When the passed `:token` is non-nil apply it to the `:applied-tokens` on a shape."
[{:keys [shape token _attributes] :as props}]
(if token
(apply-token-to-shape props)
shape))
(defn update-token-from-attributes (defn update-token-from-attributes
[{:keys [token-id shape-id attributes]}] [{:keys [token-id shape-id attributes]}]
(ptk/reify ::update-token-from-attributes (ptk/reify ::update-token-from-attributes

10
frontend/src/app/main/ui/workspace/sidebar/options/menus/measures.cljs
View file

@ -296,11 +296,11 @@
token-value (some-> token wtc/resolve-token-value)] token-value (some-> token wtc/resolve-token-value)]
(st/emit! (st/emit!
(change-radius (fn [shape] (change-radius (fn [shape]
(cond-> shape (-> (dt/maybe-apply-token-to-shape
token-value (#(dt/apply-token-to-shape {:token-id (:id token) {:token-id token
:shape % :shape shape
:attributes (wtc/token-attributes :border-radius)})) :attributes (wtc/token-attributes :border-radius)})
:always (ctsr/set-radius-1 (or token-value value))))))))) (ctsr/set-radius-1 (or token-value value)))))))))
on-radius-multi-change on-radius-multi-change
(mf/use-fn (mf/use-fn