github/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-09-10 14:09:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

🐛 Fixes resolved values being prefilled for existing referenced composite token

Browse Source
This commit is contained in:
Florian Schroedl 2025-09-26 11:24:42 +02:00 committed by Andrés Moya
parent ab80021fb1
commit 3da02e2b6b
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
frontend/src/app/main/ui/workspace/tokens/management/create/form.cljs
View File

@ -929,16 +929,18 @@ custom-input-token-value-props: Custom props passed to the custom-input-token-va
(mf/defc typography-value-inputs* (mf/defc typography-value-inputs*
[{:keys [default-value on-blur on-update-value token-resolve-result]}] [{:keys [default-value on-blur on-update-value token-resolve-result]}]
(let [typography-inputs (mf/use-memo typography-inputs) (let [composite-token? (not (ctt/typography-composite-token-reference? (:value token-resolve-result)))
typography-inputs (mf/use-memo typography-inputs)
errors-by-key (sd/collect-typography-errors token-resolve-result)] errors-by-key (sd/collect-typography-errors token-resolve-result)]
[:div {:class (stl/css :nested-input-row)} [:div {:class (stl/css :nested-input-row)}
(for [[k {:keys [label placeholder icon]}] typography-inputs] (for [[k {:keys [label placeholder icon]}] typography-inputs]
(let [value (get default-value k) (let [value (get default-value k)
token-resolve-result token-resolve-result
(-> {:resolved-value (let [v (get-in token-resolve-result [:resolved-value k])] (when composite-token?
(when-not (str/empty? v) v)) (-> {:resolved-value (let [v (get-in token-resolve-result [:resolved-value k])]
:errors (get errors-by-key k)} (when-not (str/empty? v) v))
(d/without-nils)) :errors (get errors-by-key k)}
(d/without-nils)))
input-ref (mf/use-ref) input-ref (mf/use-ref)