Fix theme sets not being in order of the root order

common/src/app/common/types/tokens_lib.cljc

@@ -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
+    (let [sets-order (get-sets-order this)]
-     (fn [acc cur]
+      (reduce
-       (if (theme-active? this (:group cur) (:name cur))
+       (fn [acc cur]
-         (into acc
+         (reduce
-               (->> (get cur :sets)
+          (fn [acc cur]
-                    (map #(-> (get-set this %) :tokens))))
+            (merge acc (:tokens (get-set this cur))))
-         acc))
+          acc
-     (d/ordered-map) (tree-seq d/ordered-map? vals themes)))
+          (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