3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-05-01 22:56:26 +02:00
Code Issues Projects Releases Packages Wiki Activity

🐛 Fix references between separate sets

Browse source
This commit is contained in:
Florian Schroedl 2024-11-21 15:38:53 +01:00
parent 805432faec
commit e7b07715a4
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
frontend/src/app/main/ui/workspace/tokens/sidebar.cljs
View file

@ -260,8 +260,12 @@
active-theme-tokens (sd/use-active-theme-sets-tokens) active-theme-tokens (sd/use-active-theme-sets-tokens)
tokens (sd/use-resolved-workspace-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] [:& token-context-menu]
[:& title-bar {:all-clickable true [:& title-bar {:all-clickable true

6
frontend/src/app/main/ui/workspace/tokens/style_dictionary.cljs
View file

@ -252,8 +252,10 @@
@tokens-state)) @tokens-state))
(defn use-resolved-workspace-tokens [] (defn use-resolved-workspace-tokens []
(-> (mf/deref refs/workspace-selected-token-set-tokens) (let [active-theme-tokens (mf/deref refs/workspace-active-theme-sets-tokens)
(use-resolved-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 [] (defn use-active-theme-sets-tokens []
(-> (mf/deref refs/workspace-active-theme-sets-tokens) (-> (mf/deref refs/workspace-active-theme-sets-tokens)