From 1f5903fa16149027223ce2db060fea209832cfeb Mon Sep 17 00:00:00 2001 From: Eva Marco Date: Wed, 8 Jan 2025 14:28:20 +0100 Subject: [PATCH 1/2] :bug: Fix partially applied token on Border radius --- frontend/src/app/main/ui/workspace/tokens/changes.cljs | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/src/app/main/ui/workspace/tokens/changes.cljs b/frontend/src/app/main/ui/workspace/tokens/changes.cljs index a6219c87a4..c2898972d1 100644 --- a/frontend/src/app/main/ui/workspace/tokens/changes.cljs +++ b/frontend/src/app/main/ui/workspace/tokens/changes.cljs @@ -104,6 +104,7 @@ (when (ctsr/can-get-border-radius? shape) (ctsr/set-radius-to-single-corner shape (first attributes) value))) {:reg-objects? true + :ignore-touched true :attrs ctt/border-radius-keys})) (defn update-opacity [value shape-ids] From 97c35a8f9b6e33cf5012809c5ff55c517331e313 Mon Sep 17 00:00:00 2001 From: Eva Marco Date: Wed, 8 Jan 2025 14:28:33 +0100 Subject: [PATCH 2/2] :bug: Fix token pill on multiselect --- frontend/src/app/main/ui/workspace/tokens/sidebar.cljs | 4 ++-- frontend/src/app/main/ui/workspace/tokens/token_pill.cljs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/src/app/main/ui/workspace/tokens/sidebar.cljs b/frontend/src/app/main/ui/workspace/tokens/sidebar.cljs index edf8eca75e..740b24e4a9 100644 --- a/frontend/src/app/main/ui/workspace/tokens/sidebar.cljs +++ b/frontend/src/app/main/ui/workspace/tokens/sidebar.cljs @@ -136,8 +136,8 @@ {:key (:name token) :token token :theme-token theme-token - :half-applied (and applied (not full-applied)) - ;; Multiple selected shapes behavior should be reviewed after MVP + :half-applied (or (and applied multiple-selection) + (and applied (not full-applied))) :full-applied (if multiple-selection false applied) diff --git a/frontend/src/app/main/ui/workspace/tokens/token_pill.cljs b/frontend/src/app/main/ui/workspace/tokens/token_pill.cljs index d84f6fa643..92217edf2c 100644 --- a/frontend/src/app/main/ui/workspace/tokens/token_pill.cljs +++ b/frontend/src/app/main/ui/workspace/tokens/token_pill.cljs @@ -30,7 +30,7 @@ :else "token-status-non-applied")] [:button {:class (stl/css-case :token-pill true - :token-pill-applied full-applied + :token-pill-applied (or half-applied full-applied) :token-pill-invalid errors? :token-pill-invalid-applied (and full-applied errors?)) :type "button"