From 666313c2c3031b34b0bad2fd95b4c6bd8ad4c7d6 Mon Sep 17 00:00:00 2001
From: Xaviju <xavier.julian@kaleidos.net>
Date: Thu, 9 Apr 2026 12:37:29 +0200
Subject: [PATCH] :bug: Close expanded tree when switching or creating sets
 (#8920)

---
 .../src/app/main/data/workspace/tokens/library_edit.cljs   | 7 +++++++
 frontend/src/app/main/ui/workspace/tokens/sets.cljs        | 5 +++--
 .../src/app/main/ui/workspace/tokens/sets/helpers.cljs     | 4 +++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/frontend/src/app/main/data/workspace/tokens/library_edit.cljs b/frontend/src/app/main/data/workspace/tokens/library_edit.cljs
index 2fe57d491f..595ec4a86d 100644
--- a/frontend/src/app/main/data/workspace/tokens/library_edit.cljs
+++ b/frontend/src/app/main/data/workspace/tokens/library_edit.cljs
@@ -96,6 +96,13 @@
                      (close-token-type types type)
                      (open-token-type types type)))))))
 
+(defn clear-tokens-types
+  []
+  (ptk/reify ::clear-tokens-types
+    ptk/UpdateEvent
+    (update [_ state]
+      (assoc-in state [:workspace-tokens :unfolded-token-types] []))))
+
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; TOKENS TREE - Toggle tree nodes
diff --git a/frontend/src/app/main/ui/workspace/tokens/sets.cljs b/frontend/src/app/main/ui/workspace/tokens/sets.cljs
index fd35710a74..49938e462b 100644
--- a/frontend/src/app/main/ui/workspace/tokens/sets.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/sets.cljs
@@ -16,8 +16,9 @@
    [rumext.v2 :as mf]))
 
 (defn- on-select-token-set-click [id]
-  (st/emit! (dwtl/clear-tokens-paths))
-  (st/emit! (dwtl/set-selected-token-set-id id)))
+  (st/emit! (dwtl/clear-tokens-paths)
+            (dwtl/clear-tokens-types)
+            (dwtl/set-selected-token-set-id id)))
 
 (defn- on-toggle-token-set-click [name]
   (st/emit! (dwtl/toggle-token-set name)))
diff --git a/frontend/src/app/main/ui/workspace/tokens/sets/helpers.cljs b/frontend/src/app/main/ui/workspace/tokens/sets/helpers.cljs
index e7b9bf98c6..825e31571c 100644
--- a/frontend/src/app/main/ui/workspace/tokens/sets/helpers.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/sets/helpers.cljs
@@ -41,7 +41,9 @@
               (dwtl/clear-token-set-creation))
     (if (empty? errors)
       (let [token-set (ctob/make-token-set :name name)]
-        (st/emit! (dwtl/create-token-set token-set)))
+        (st/emit! (dwtl/create-token-set token-set)
+                  (dwtl/clear-tokens-paths)
+                  (dwtl/clear-tokens-types)))
       (st/emit! (ntf/show {:content (tr "errors.token-set-already-exists")
                            :type :toast
                            :level :error