From 2e277a39ca4b4dd7319ee46768a18a3d83315ed7 Mon Sep 17 00:00:00 2001 From: Pablo Alba Date: Thu, 14 Aug 2025 08:14:06 +0200 Subject: [PATCH] :bug: Fix flick on design tab after variant switch (#7116) --- .../src/app/main/data/workspace/libraries.cljs | 16 ++++++---------- frontend/src/app/main/ui/ds/controls/select.cljs | 1 + 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/frontend/src/app/main/data/workspace/libraries.cljs b/frontend/src/app/main/data/workspace/libraries.cljs index c61dbb2570..8b30647710 100644 --- a/frontend/src/app/main/data/workspace/libraries.cljs +++ b/frontend/src/app/main/data/workspace/libraries.cljs @@ -987,16 +987,12 @@ all-parents (-> all-parents (into parents-of-swapped) (conj (:id new-shape)))] - - (rx/merge - (rx/of - (dwu/start-undo-transaction undo-id) - (dch/commit-changes changes) - (ptk/data-event :layout/update {:ids all-parents :undo-group undo-group}) - (dwu/commit-undo-transaction undo-id) - (dws/deselect-all)) - (->> (rx/of (dws/select-shape (:id new-shape) false)) - (rx/delay 1))))))) + (rx/of + (dwu/start-undo-transaction undo-id) + (dch/commit-changes changes) + (ptk/data-event :layout/update {:ids all-parents :undo-group undo-group}) + (dwu/commit-undo-transaction undo-id) + (dws/select-shape (:id new-shape) false)))))) (defn component-multi-swap "Swaps several components with another one" diff --git a/frontend/src/app/main/ui/ds/controls/select.cljs b/frontend/src/app/main/ui/ds/controls/select.cljs index f271789fae..f324e605ef 100644 --- a/frontend/src/app/main/ui/ds/controls/select.cljs +++ b/frontend/src/app/main/ui/ds/controls/select.cljs @@ -102,6 +102,7 @@ (mf/use-fn (mf/deps on-change) (fn [event] + (dom/stop-propagation event) (let [node (dom/get-current-target event) id (dom/get-data node "id")] (reset! selected-id* id)