From 27d0f0a7bc0ed972e87525cec39b40dbe7ad58d5 Mon Sep 17 00:00:00 2001 From: Florian Schroedl Date: Thu, 28 Nov 2024 09:16:38 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fix=20collapse=20button=20trigge?= =?UTF-8?q?ring=20rename?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/app/main/ui/workspace/tokens/sets.cljs | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/frontend/src/app/main/ui/workspace/tokens/sets.cljs b/frontend/src/app/main/ui/workspace/tokens/sets.cljs index af794ffbe0..2653076448 100644 --- a/frontend/src/app/main/ui/workspace/tokens/sets.cljs +++ b/frontend/src/app/main/ui/workspace/tokens/sets.cljs @@ -80,8 +80,7 @@ :class (stl/css-case :set-item-container true :set-item-group true :selected-set selected?) - :on-context-menu on-context-menu - :on-double-click #(on-edit tree-path)} + :on-context-menu on-context-menu} [:> icon-button* {:class (stl/css :set-item-group-collapse-button) :on-click (fn [event] @@ -96,7 +95,9 @@ :on-cancel on-edit-reset :on-create on-edit-reset :on-submit #(on-edit-submit)}] - [:div {:class (stl/css :set-name)} label])])) + [:div {:class (stl/css :set-name) + :on-double-click #(on-edit tree-path)} + label])])) (mf/defc sets-tree-set [{:keys [set label tree-depth tree-path selected? on-select active? on-toggle editing? on-edit on-edit-reset on-edit-submit]}] @@ -131,7 +132,6 @@ :class (stl/css-case :set-item-container true :selected-set selected?) :on-click on-click - :on-double-click #(on-edit tree-path) :on-context-menu on-context-menu :aria-checked active?'} [:> icon* @@ -145,9 +145,13 @@ :on-create on-edit-reset :on-submit #(on-edit-submit set-name (ctob/update-name set %))}] [:* - [:div {:class (stl/css :set-name)} label] - [:button {:on-click on-click - :type "button" + [:div {:class (stl/css :set-name) + :on-double-click #(on-edit tree-path)} + label] + [:button {:type "button" + :on-click (fn [event] + (dom/stop-propagation event) + (on-toggle set-name)) :class (stl/css-case :checkbox-style true :checkbox-checked-style active?')} (when active?'