From e7b07715a4e925e812eeb7d3785d14b47bf3c841 Mon Sep 17 00:00:00 2001 From: Florian Schroedl Date: Thu, 21 Nov 2024 15:38:53 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fix=20references=20between=20sep?= =?UTF-8?q?arate=20sets?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/app/main/ui/workspace/tokens/sidebar.cljs | 8 ++++++-- .../app/main/ui/workspace/tokens/style_dictionary.cljs | 6 ++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/frontend/src/app/main/ui/workspace/tokens/sidebar.cljs b/frontend/src/app/main/ui/workspace/tokens/sidebar.cljs index 5f54a90479..71f06b614b 100644 --- a/frontend/src/app/main/ui/workspace/tokens/sidebar.cljs +++ b/frontend/src/app/main/ui/workspace/tokens/sidebar.cljs @@ -260,8 +260,12 @@ active-theme-tokens (sd/use-active-theme-sets-tokens) tokens (sd/use-resolved-workspace-tokens) - token-groups (mf/with-memo [tokens] - (sorted-token-groups tokens))] + + selected-token-set-tokens (mf/deref refs/workspace-selected-token-set-tokens) + + token-groups (mf/with-memo [tokens selected-token-set-tokens] + (-> (select-keys tokens (keys selected-token-set-tokens)) + (sorted-token-groups)))] [:* [:& token-context-menu] [:& title-bar {:all-clickable true diff --git a/frontend/src/app/main/ui/workspace/tokens/style_dictionary.cljs b/frontend/src/app/main/ui/workspace/tokens/style_dictionary.cljs index e2c77d007c..25da4fbbbb 100644 --- a/frontend/src/app/main/ui/workspace/tokens/style_dictionary.cljs +++ b/frontend/src/app/main/ui/workspace/tokens/style_dictionary.cljs @@ -252,8 +252,10 @@ @tokens-state)) (defn use-resolved-workspace-tokens [] - (-> (mf/deref refs/workspace-selected-token-set-tokens) - (use-resolved-tokens))) + (let [active-theme-tokens (mf/deref refs/workspace-active-theme-sets-tokens) + selected-token-set-tokens (mf/deref refs/workspace-selected-token-set-tokens) + prefer-selected-token-set-tokens (merge active-theme-tokens selected-token-set-tokens)] + (use-resolved-tokens prefer-selected-token-set-tokens))) (defn use-active-theme-sets-tokens [] (-> (mf/deref refs/workspace-active-theme-sets-tokens)