From 3caa9d780ae132dc9abc6fb0b09597bfe6c76c95 Mon Sep 17 00:00:00 2001 From: Florian Schroedl Date: Fri, 17 May 2024 11:37:36 +0200 Subject: [PATCH] Show checkmark icon for applied tokens --- .../main/ui/workspace/sidebar/options/menus/measures.cljs | 5 +++-- .../src/app/main/ui/workspace/tokens/editable_select.cljs | 4 ++-- .../src/app/main/ui/workspace/tokens/editable_select.scss | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/menus/measures.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/menus/measures.cljs index 6674298c1..1b862b22d 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/measures.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/measures.cljs @@ -100,9 +100,10 @@ tokens (mf/deref refs/workspace-tokens) border-radius-tokens (mf/use-memo (mf/deps tokens) #(wtc/tokens-name-map-for-type :border-radius tokens)) - border-radius-options (mf/use-memo (mf/deps border-radius-tokens) + border-radius-options (mf/use-memo (mf/deps shape border-radius-tokens) #(map (fn [[_k {:keys [name] :as item}]] - (assoc item :label name)) + (cond-> (assoc item :label name) + (wtc/token-applied? item shape (wtc/token-attributes :border-radius)) (assoc :selected? true))) border-radius-tokens)) flex-child? (->> selection-parents (some ctl/flex-layout?)) diff --git a/frontend/src/app/main/ui/workspace/tokens/editable_select.cljs b/frontend/src/app/main/ui/workspace/tokens/editable_select.cljs index afdb1810a..65264f703 100644 --- a/frontend/src/app/main/ui/workspace/tokens/editable_select.cljs +++ b/frontend/src/app/main/ui/workspace/tokens/editable_select.cljs @@ -47,11 +47,11 @@ (cond (= :separator item) [:li {:class (stl/css :separator) :key (dm/str element-id "-" index)}] - :else (let [{:keys [value label]} item] + :else (let [{:keys [value label selected?]} item] [:li {:key (str element-id "-" index) :class (stl/css-case :dropdown-element true - :is-selected false #_(= (dm/str value) current-value)) + :is-selected selected?) :data-label label :on-click on-select} [:span {:class (stl/css :label)} label] diff --git a/frontend/src/app/main/ui/workspace/tokens/editable_select.scss b/frontend/src/app/main/ui/workspace/tokens/editable_select.scss index 650968571..bfc2a0c9e 100644 --- a/frontend/src/app/main/ui/workspace/tokens/editable_select.scss +++ b/frontend/src/app/main/ui/workspace/tokens/editable_select.scss @@ -74,6 +74,7 @@ .check-icon { @include flexCenter; + translate: -$s-4 0; svg { @extend .button-icon-small; visibility: hidden;