From 0d29ace04601d1c01d30bc29dde6bcb4e292686d Mon Sep 17 00:00:00 2001 From: Xavier Julian Date: Tue, 28 Apr 2026 10:16:47 +0200 Subject: [PATCH] :recycle: Restore component structure --- .../management/forms/controls/combobox.cljs | 31 +++++++------------ 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/frontend/src/app/main/ui/workspace/tokens/management/forms/controls/combobox.cljs b/frontend/src/app/main/ui/workspace/tokens/management/forms/controls/combobox.cljs index a5c4b002bf..137551c260 100644 --- a/frontend/src/app/main/ui/workspace/tokens/management/forms/controls/combobox.cljs +++ b/frontend/src/app/main/ui/workspace/tokens/management/forms/controls/combobox.cljs @@ -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}]