From 0d9db14293034c40b870e92511273255bfbc7bfa Mon Sep 17 00:00:00 2001 From: Eva Marco Date: Fri, 10 Jan 2025 14:01:01 +0100 Subject: [PATCH] :bug: Fix regresion on icon* id because of token merge --- frontend/src/app/main/ui/ds/notifications/toast.cljs | 2 +- .../src/app/main/ui/workspace/sidebar/assets/common.cljs | 2 +- frontend/src/app/main/ui/workspace/sidebar/versions.cljs | 6 +++--- frontend/src/app/main/ui/workspace/tokens/context_menu.cljs | 4 ++-- frontend/src/app/main/ui/workspace/tokens/sets.cljs | 2 +- frontend/src/app/main/ui/workspace/tokens/sidebar.cljs | 5 ++--- frontend/src/app/main/ui/workspace/tokens/token_pill.cljs | 4 ++-- 7 files changed, 12 insertions(+), 13 deletions(-) diff --git a/frontend/src/app/main/ui/ds/notifications/toast.cljs b/frontend/src/app/main/ui/ds/notifications/toast.cljs index 29968c09d..7d794cb74 100644 --- a/frontend/src/app/main/ui/ds/notifications/toast.cljs +++ b/frontend/src/app/main/ui/ds/notifications/toast.cljs @@ -38,7 +38,7 @@ props (mf/spread-props props {:class class})] [:> "aside" props [:* - [:> i/icon* {:id icon-id :class (stl/css :icon)}] + [:> i/icon* {:icon-id icon-id :class (stl/css :icon)}] children ;; TODO: this should be a buttom from the DS, but this variant is not designed yet. ;; https://tree.taiga.io/project/penpot/task/8492 diff --git a/frontend/src/app/main/ui/workspace/sidebar/assets/common.cljs b/frontend/src/app/main/ui/workspace/sidebar/assets/common.cljs index 353ef6b59..5fd0ab404 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/assets/common.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/assets/common.cljs @@ -150,7 +150,7 @@ (mf/html [:span {:class (stl/css :title-name)} [:span {:class (stl/css :section-icon)} - [:> icon* {:id (or icon (section-icon section)) :size "s"}]] + [:> icon* {:icon-id (or icon (section-icon section)) :size "s"}]] [:span {:class (stl/css :section-name)} title] diff --git a/frontend/src/app/main/ui/workspace/sidebar/versions.cljs b/frontend/src/app/main/ui/workspace/sidebar/versions.cljs index 8d893e55e..d60e59011 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/versions.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/versions.cljs @@ -192,9 +192,9 @@ [:button {:class (stl/css :version-entry-snapshots) :aria-label (tr "workspace.versions.expand-snapshot") :on-click handle-toggle-expand} - [:> i/icon* {:id i/clock :class (stl/css :icon-clock)}] + [:> i/icon* {:icon-id i/clock :class (stl/css :icon-clock)}] (tr "workspace.versions.autosaved.entry" (count (:snapshots entry))) - [:> i/icon* {:id i/arrow :class (stl/css :icon-arrow)}]] + [:> i/icon* {:icon-id i/arrow :class (stl/css :icon-arrow)}]] [:ul {:class (stl/css :version-snapshot-list)} (for [[idx snapshot] (d/enumerate (:snapshots entry))] @@ -358,7 +358,7 @@ (if (empty? data) [:div {:class (stl/css :versions-entry-empty)} - [:div {:class (stl/css :versions-entry-empty-icon)} [:> i/icon* {:id i/history}]] + [:div {:class (stl/css :versions-entry-empty-icon)} [:> i/icon* {:icon-id i/history}]] [:div {:class (stl/css :versions-entry-empty-msg)} (tr "workspace.versions.empty")]] [:ul {:class (stl/css :versions-entries)} diff --git a/frontend/src/app/main/ui/workspace/tokens/context_menu.cljs b/frontend/src/app/main/ui/workspace/tokens/context_menu.cljs index 6f350c593..9755ede9a 100644 --- a/frontend/src/app/main/ui/workspace/tokens/context_menu.cljs +++ b/frontend/src/app/main/ui/workspace/tokens/context_menu.cljs @@ -298,7 +298,7 @@ :on-pointer-enter on-pointer-enter :on-pointer-leave on-pointer-leave} (when selected? - [:> icon* {:id "tick" :size "s" :class (stl/css :icon-wrapper)}]) + [:> icon* {:icon-id "tick" :size "s" :class (stl/css :icon-wrapper)}]) [:span {:class (stl/css-case :item-text true :item-with-icon-space (and (not selected?) @@ -306,7 +306,7 @@ title] (when children [:* - [:> icon* {:id "arrow" :size "s"}] + [:> icon* {:icon-d "arrow" :size "s"}] [:ul {:class (stl/css :token-context-submenu) :data-direction submenu-direction :ref submenu-ref diff --git a/frontend/src/app/main/ui/workspace/tokens/sets.cljs b/frontend/src/app/main/ui/workspace/tokens/sets.cljs index 8baaa0555..c36c4f4b8 100644 --- a/frontend/src/app/main/ui/workspace/tokens/sets.cljs +++ b/frontend/src/app/main/ui/workspace/tokens/sets.cljs @@ -88,7 +88,7 @@ {:aria-label aria-label :class (stl/css :check-icon) :size "s" - :id (if mixed? ic/remove ic/tick)}])])) + :icon-id (if mixed? ic/remove ic/tick)}])])) (mf/defc sets-tree-set-group [{:keys [label tree-depth tree-path active? selected? collapsed? editing? on-toggle on-edit on-edit-reset on-edit-submit]}] diff --git a/frontend/src/app/main/ui/workspace/tokens/sidebar.cljs b/frontend/src/app/main/ui/workspace/tokens/sidebar.cljs index b516fc806..740b24e4a 100644 --- a/frontend/src/app/main/ui/workspace/tokens/sidebar.cljs +++ b/frontend/src/app/main/ui/workspace/tokens/sidebar.cljs @@ -46,9 +46,8 @@ ;; Components ------------------------------------------------------------------ -(mf/defc token-section-icon - {::mf/wrap-props false} - [{:keys [type]}] +(defn token-section-icon + [type] (case type :border-radius "corner-radius" :color "drop" 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 92217edf2..f3dfd028e 100644 --- a/frontend/src/app/main/ui/workspace/tokens/token_pill.cljs +++ b/frontend/src/app/main/ui/workspace/tokens/token_pill.cljs @@ -49,11 +49,11 @@ :mini true}] errors? [:> icon* - {:id "broken-link" + {:icon-id "broken-link" :class (stl/css :token-pill-icon)}] :else [:> token-status-icon* - {:id token-status-id + {:icon-id token-status-id :class (stl/css :token-pill-icon)}]) name])) \ No newline at end of file