github/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-07-23 14:38:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

🐛 Fix comments

Browse Source
This commit is contained in:
Eva Marco 2026-05-29 11:01:16 +02:00 committed by Elena Torró
parent ba39600192
commit 237fa568e8
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/src/app/main/ui/workspace/tokens/management/forms/controls/color_input.cljs
View File

@ -457,8 +457,8 @@
(some? error)
(let [error' (:message error)]
(if (csu/group-name-conflict-error? error token-name)
(swap! form assoc-in [:extra-errors ""] {:message error})
(if (csu/group-name-conflict-error? error' token-name)
(swap! form assoc-in [:extra-errors ""] {:message error'})
(do
(swap! form assoc-in [:extra-errors :value value-subfield index input-name] {:message error'})
(swap! form assoc-in [:data :value value-subfield index :color-result] "")

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

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