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

🐛 Fix tokens fonts combobox to show resolved value

Browse Source
This commit is contained in:
Eva Marco 2026-06-16 09:40:41 +02:00 committed by Andrey Antukh
parent a2e69db265
commit 895c9cb8da
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
frontend/src/app/main/ui/workspace/tokens/management/forms/controls/fonts_combobox.cljs
View File

@ -167,24 +167,25 @@
:hint-message (:message error)}) :hint-message (:message error)})
props)] props)]
(mf/with-effect [resolve-stream tokens token input-name touched? token-name] (mf/with-effect [resolve-stream tokens token input-name token-name]
(let [subs (->> resolve-stream (let [subs (->> resolve-stream
(rx/debounce 300) (rx/debounce 300)
(rx/mapcat (partial resolve-value tokens token token-name)) (rx/mapcat (partial resolve-value tokens token token-name))
(rx/map (fn [result] (rx/map (fn [result]
(d/update-when result :error wte/resolve-error-assoc-message))) (d/update-when result :error wte/resolve-error-assoc-message)))
(rx/subs! (fn [{:keys [error value]}] (rx/subs! (fn [{:keys [error value]}]
(when touched? (let [touched? (get-in @form [:touched input-name])]
(if error (when touched?
(let [error' (:message error)] (if error
(if (csu/group-name-conflict-error? error' token-name) (let [error' (:message error)]
(swap! form assoc-in [:extra-errors ""] error') (if (csu/group-name-conflict-error? error' token-name)
(do (swap! form assoc-in [:extra-errors ""] error')
(swap! form assoc-in [:extra-errors input-name] error') (do
(reset! hint* {:message error' :type "error"})))) (swap! form assoc-in [:extra-errors input-name] error')
(let [message (tr "workspace.tokens.resolved-value" value)] (reset! hint* {:message error' :type "error"}))))
(swap! form update :extra-errors dissoc input-name) (let [message (tr "workspace.tokens.resolved-value" value)]
(reset! hint* {:message message :type "hint"})))))))] (swap! form update :extra-errors dissoc input-name)
(reset! hint* {:message message :type "hint"}))))))))]
(fn [] (fn []
(rx/dispose! subs)))) (rx/dispose! subs))))