Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-01-06 14:50:20 -05:00
Code Issues Activity

Fix theme sets not being in order of the root order

Browse source
This commit is contained in:
Florian Schroedl 2024-09-30 16:26:26 +02:00
parent c5173d2df8
commit 4b39b6970a
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
common/src/app/common/types/tokens_lib.cljc
View file

@ -227,6 +227,7 @@
(set-count [_] "get the total number if sets in the library")
(get-set-tree [_] "get a nested tree of all sets in the library")
(get-sets [_] "get an ordered sequence of all sets in the library")
(get-sets-order [_] "get an ordered sequence of all sets in the library")
(get-set [_ set-name] "get one set looking for name")
(get-set-group [_ set-group-path] "get the attributes of a set group"))
@ -463,6 +464,9 @@
(->> (tree-seq d/ordered-map? vals sets)
(filter (partial instance? TokenSet))))
(get-sets-order [this]
(map :name (get-sets this)))
(set-count [this]
(count (get-sets this)))
@ -616,14 +620,16 @@
(get-active-themes this)))
(get-active-themes-set-tokens [this]
(reduce
(fn [acc cur]
(if (theme-active? this (:group cur) (:name cur))
(into acc
(->> (get cur :sets)
(map #(-> (get-set this %) :tokens))))
acc))
(d/ordered-map) (tree-seq d/ordered-map? vals themes)))
(let [sets-order (get-sets-order this)]
(reduce
(fn [acc cur]
(reduce
(fn [acc cur]
(merge acc (:tokens (get-set this cur))))
acc
(let [ref-set (set (:sets cur))]
(filter #(contains? ref-set %) sets-order))))
(d/ordered-map) (get-active-themes this))))
(update-set-name [_ old-set-name new-set-name]
(TokensLib. sets