github/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-05-04 07:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

♻️ Restore component structure

Browse Source
This commit is contained in:
Xavier Julian 2026-04-28 10:16:47 +02:00
parent 9f651f898d
commit 0d29ace046
1 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
frontend/src/app/main/ui/workspace/tokens/management/forms/controls/combobox.cljs
View File

@ -38,10 +38,6 @@
(and (string? token-name)
(re-matches cto/token-name-validation-regex token-name))
valid-token-ref?
(or (str/blank? value)
(re-matches cto/token-ref-validation-regex value))
token
{:value value
:name (if (or (not valid-token-name?) (str/blank? token-name))
@ -53,21 +49,18 @@
(dissoc (:name prev-token))
(update (:name token) #(ctob/make-token (merge % prev-token token))))]
(if-not valid-token-ref?
(rx/of {:error {:error/fn #(str (tr "workspace.tokens.invalid-value" %))
:error/value value}})
(->> (if (contains? cf/flags :tokenscript)
(rx/of (ts/resolve-tokens tokens))
(sd/resolve-tokens-interactive tokens))
(rx/mapcat
(fn [resolved-tokens]
(let [{:keys [errors resolved-value] :as resolved-token} (get resolved-tokens (:name token))
resolved-value (if (contains? cf/flags :tokenscript)
(ts/tokenscript-symbols->penpot-unit resolved-value)
resolved-value)]
(if resolved-value
(rx/of {:value resolved-value})
(rx/of {:error (first errors)})))))))))
(->> (if (contains? cf/flags :tokenscript)
(rx/of (ts/resolve-tokens tokens))
(sd/resolve-tokens-interactive tokens))
(rx/mapcat
(fn [resolved-tokens]
(let [{:keys [errors resolved-value] :as resolved-token} (get resolved-tokens (:name token))
resolved-value (if (contains? cf/flags :tokenscript)
(ts/tokenscript-symbols->penpot-unit resolved-value)
resolved-value)]
(if resolved-value
(rx/of {:value resolved-value})
(rx/of {:error (first errors)}))))))))
(mf/defc value-combobox*
[{:keys [name tokens token token-type empty-to-end ref] :rest props}]