Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-02-01 11:59:17 -05:00
Code Issues Activity

Fix not possible naming token to same token name in other set

Browse source
This commit is contained in:
Florian Schroedl 2024-08-22 11:02:01 +02:00
parent 8343a9f3b5
commit 37a3fbcec2
1 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
frontend/src/app/main/ui/workspace/tokens/form.cljs
View file

@ -144,16 +144,17 @@ Token names should only contain letters and digits separated by . characters.")}
(mf/defc form (mf/defc form
{::mf/wrap-props false} {::mf/wrap-props false}
[{:keys [token token-type] :as _args}] [{:keys [token token-type] :as _args}]
(let [tokens (mf/deref refs/workspace-active-theme-sets-tokens) (let [selected-set-tokens (mf/deref refs/workspace-selected-token-set-tokens)
resolved-tokens (sd/use-resolved-tokens tokens {:names-map? true active-theme-tokens (mf/deref refs/workspace-active-theme-sets-tokens)
resolved-tokens (sd/use-resolved-tokens active-theme-tokens {:names-map? true
:cache-atom form-token-cache-atom}) :cache-atom form-token-cache-atom})
token-path (mf/use-memo token-path (mf/use-memo
(mf/deps (:name token)) (mf/deps (:name token))
#(wtt/token-name->path (:name token))) #(wtt/token-name->path (:name token)))
tokens-tree (mf/use-memo selected-set-tokens-tree (mf/use-memo
(mf/deps token-path resolved-tokens) (mf/deps token-path selected-set-tokens)
(fn [] (fn []
(-> (wtt/token-names-tree resolved-tokens) (-> (wtt/token-names-tree selected-set-tokens)
;; Allow setting editing token to it's own path ;; Allow setting editing token to it's own path
(d/dissoc-in token-path)))) (d/dissoc-in token-path))))
@ -161,10 +162,10 @@ Token names should only contain letters and digits separated by . characters.")}
name-ref (mf/use-var (:name token)) name-ref (mf/use-var (:name token))
name-errors (mf/use-state nil) name-errors (mf/use-state nil)
validate-name (mf/use-callback validate-name (mf/use-callback
(mf/deps tokens-tree) (mf/deps selected-set-tokens-tree)
(fn [value] (fn [value]
(let [schema (token-name-schema {:token token (let [schema (token-name-schema {:token token
:tokens-tree tokens-tree})] :tokens-tree selected-set-tokens-tree})]
(m/explain schema (finalize-name value))))) (m/explain schema (finalize-name value)))))
on-update-name-debounced (mf/use-callback on-update-name-debounced (mf/use-callback
(debounce (fn [e] (debounce (fn [e]
@ -190,7 +191,7 @@ Token names should only contain letters and digits separated by . characters.")}
(= token-or-err :error/token-missing-reference) token-or-err (= token-or-err :error/token-missing-reference) token-or-err
(:resolved-value token-or-err) (:resolved-value token-or-err))] (:resolved-value token-or-err) (:resolved-value token-or-err))]
(reset! token-resolve-result v)))) (reset! token-resolve-result v))))
on-update-value-debounced (use-debonced-resolve-callback name-ref token tokens set-resolve-value) on-update-value-debounced (use-debonced-resolve-callback name-ref token active-theme-tokens set-resolve-value)
on-update-value (mf/use-callback on-update-value (mf/use-callback
(mf/deps on-update-value-debounced) (mf/deps on-update-value-debounced)
(fn [e] (fn [e]