From 14afd58eac6ae90718d5f3198bbbb4748206d59e Mon Sep 17 00:00:00 2001 From: Xavier Julian Date: Mon, 26 May 2025 15:20:00 +0200 Subject: [PATCH] :bug: Display color swatch only on color type tokens --- .../tokens/components/controls/input_tokens_value.cljs | 7 +++++-- frontend/src/app/main/ui/workspace/tokens/form.cljs | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/frontend/src/app/main/ui/workspace/tokens/components/controls/input_tokens_value.cljs b/frontend/src/app/main/ui/workspace/tokens/components/controls/input_tokens_value.cljs index d06971efe..1be7646f1 100644 --- a/frontend/src/app/main/ui/workspace/tokens/components/controls/input_tokens_value.cljs +++ b/frontend/src/app/main/ui/workspace/tokens/components/controls/input_tokens_value.cljs @@ -7,6 +7,7 @@ (ns app.main.ui.workspace.tokens.components.controls.input-tokens-value (:require-macros [app.main.style :as stl]) (:require + [app.common.data :as d] [app.common.data.macros :as dm] [app.main.ui.ds.controls.utilities.input-field :refer [input-field*]] [app.main.ui.ds.controls.utilities.label :refer [label*]] @@ -19,6 +20,7 @@ [:placeholder {:optional true} :string] [:value {:optional true} [:maybe :string]] [:class {:optional true} :string] + [:is-color-token {:optional true} :boolean] [:color {:optional true} [:maybe :string]] [:display-colorpicker {:optional true} fn?] [:error {:optional true} :boolean]]) @@ -28,9 +30,10 @@ {::mf/props :obj ::mf/forward-ref true ::mf/schema schema::input-tokens-value} - [{:keys [class label placeholder error value color display-colorpicker] :rest props} ref] + [{:keys [class label is-color-token placeholder error value color display-colorpicker] :rest props} ref] (let [id (mf/use-id) input-ref (mf/use-ref) + is-color-token (d/nilv is-color-token false) swatch (mf/html [:> input-token-color-bullet* {:color color @@ -44,7 +47,7 @@ :value value :variant "comfortable" :hint-type (when error "error") - :slot-start swatch + :slot-start (when is-color-token swatch) :ref (or ref input-ref)})] [:div {:class (dm/str class " " (stl/css-case :wrapper true :input-error error))} diff --git a/frontend/src/app/main/ui/workspace/tokens/form.cljs b/frontend/src/app/main/ui/workspace/tokens/form.cljs index ee74ce5e4..4aca98502 100644 --- a/frontend/src/app/main/ui/workspace/tokens/form.cljs +++ b/frontend/src/app/main/ui/workspace/tokens/form.cljs @@ -560,7 +560,8 @@ :label (tr "workspace.tokens.token-value") :default-value (mf/ref-val value-ref) :ref value-input-ref - :color (when is-color-token color) + :is-color-token is-color-token + :color color :on-change on-update-value :error (not (nil? (:errors token-resolve-result))) :display-colorpicker on-display-colorpicker'