From 08721127a374c7857660144ff76712a533c0f9cd Mon Sep 17 00:00:00 2001 From: Krishna zade <114551368+Krishcode264@users.noreply.github.com> Date: Fri, 19 Jun 2026 15:02:14 +0530 Subject: [PATCH] :bug: Fix incorrect color count in color libraries dropdown (#10281) * :bug: Fix incorrect color count in color libraries dropdown * :paperclip: Add minor formatting changes Signed-off-by: Andrey Antukh --------- Signed-off-by: Andrey Antukh Co-authored-by: Andrey Antukh --- .../ui/workspace/color_palette_ctx_menu.cljs | 43 +++++++++++-------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/frontend/src/app/main/ui/workspace/color_palette_ctx_menu.cljs b/frontend/src/app/main/ui/workspace/color_palette_ctx_menu.cljs index 1497690e41..cf6e143f9b 100644 --- a/frontend/src/app/main/ui/workspace/color_palette_ctx_menu.cljs +++ b/frontend/src/app/main/ui/workspace/color_palette_ctx_menu.cljs @@ -22,32 +22,41 @@ (defn- extract-colors [{:keys [data] :as file}] - (let [colors (into [] xf:sample-colors (:colors data))] + (let [all-colors (:colors data) + colors (into [] xf:sample-colors all-colors)] (-> file (assoc :colors colors) + (assoc :total-colors (count all-colors)) (dissoc :data)))) (mf/defc color-palette-ctx-menu* [{:keys [show on-close on-select selected]}] (let [recent-colors (mf/deref refs/recent-colors) libraries (mf/deref refs/libraries) - file-id (mf/use-ctx ctx/current-file-id) - local-colors (mf/with-memo [libraries file-id] - (let [colors (dm/get-in libraries [file-id :data :colors])] - (into [] xf:sample-colors colors))) - libraries (mf/with-memo [libraries file-id] - (->> (dissoc libraries file-id) - (vals) - (mapv extract-colors))) + local-colors + (mf/with-memo [libraries file-id] + (let [colors (dm/get-in libraries [file-id :data :colors])] + (into [] xf:sample-colors colors))) - recent-colors (mf/with-memo [recent-colors] - (->> (reverse recent-colors) - (take 7) - (map-indexed (fn [index color] - (assoc color ::id (dm/str index)))) - (vec)))] + local-colors-count + (mf/with-memo [libraries file-id] + (count (dm/get-in libraries [file-id :data :colors]))) + + libraries + (mf/with-memo [libraries file-id] + (->> (dissoc libraries file-id) + (vals) + (mapv extract-colors))) + + recent-colors + (mf/with-memo [recent-colors] + (->> (reverse recent-colors) + (take 7) + (map-indexed (fn [index color] + (assoc color ::id (dm/str index)))) + (vec)))] [:& dropdown {:show show :on-close on-close} [:ul {:class (stl/css :palette-menu)} @@ -63,7 +72,7 @@ [:span {:class (stl/css :lib-name)} (dm/str (:name library))] [:span {:class (stl/css :lib-num)} - (dm/str "(" (count colors) ")")]] + (dm/str "(" (:total-colors library) ")")]] (when (= selected id) [:span {:class (stl/css :icon-wrapper)} deprecated-icon/tick])] @@ -87,7 +96,7 @@ [:span {:class (stl/css :lib-name)} (dm/str (tr "workspace.libraries.colors.file-library"))] [:span {:class (stl/css :lib-num)} - (dm/str "(" (count local-colors) ")")]] + (dm/str "(" local-colors-count ")")]] (when (= selected :file) [:span {:class (stl/css :icon-wrapper)}