From b4b5aaafe4e096aa83160f062227a7093dafb9d8 Mon Sep 17 00:00:00 2001 From: Pablo Alba Date: Mon, 11 Sep 2023 17:24:02 +0200 Subject: [PATCH] :bug: Fix preview of moving a copy of a flex component into its main --- frontend/src/app/main/data/workspace/transforms.cljs | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/frontend/src/app/main/data/workspace/transforms.cljs b/frontend/src/app/main/data/workspace/transforms.cljs index fe20e3fd8..71a62d861 100644 --- a/frontend/src/app/main/data/workspace/transforms.cljs +++ b/frontend/src/app/main/data/workspace/transforms.cljs @@ -511,11 +511,15 @@ [(assoc move-vector :x 0) :x] :else - [move-vector nil])] + [move-vector nil]) - (-> (dwm/create-modif-tree ids (ctm/move-modifiers move-vector)) - (dwm/build-change-frame-modifiers objects selected target-frame drop-index cell-data) - (dwm/set-modifiers false false {:snap-ignore-axis snap-ignore-axis})))))) + nesting-loop? (some #(cph/components-nesting-loop? objects (:id %) target-frame) shapes)] + + (cond-> (dwm/create-modif-tree ids (ctm/move-modifiers move-vector)) + (not nesting-loop?) + (dwm/build-change-frame-modifiers objects selected target-frame drop-index cell-data) + :always + (dwm/set-modifiers false false {:snap-ignore-axis snap-ignore-axis})))))) (->> move-stream (rx/with-latest-from ms/mouse-position-alt)