From 2ca28721f76849ab2e185701ec95b9458aa61326 Mon Sep 17 00:00:00 2001 From: Pablo Alba Date: Tue, 22 Aug 2023 08:31:28 +0200 Subject: [PATCH] :bug: Fix instanciate an object set it in the top frame of a tree --- common/src/app/common/types/container.cljc | 3 ++- common/src/app/common/types/shape_tree.cljc | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/common/src/app/common/types/container.cljc b/common/src/app/common/types/container.cljc index 603d7b90c9..4d71bbac33 100644 --- a/common/src/app/common/types/container.cljc +++ b/common/src/app/common/types/container.cljc @@ -241,7 +241,8 @@ frame-id (or force-frame-id (ctst/frame-id-by-position objects (gpt/add orig-pos delta) - {:skip-components? true})) + {:skip-components? true + :bottom-frames? true})) frame-ids-map (volatile! {}) update-new-shape diff --git a/common/src/app/common/types/shape_tree.cljc b/common/src/app/common/types/shape_tree.cljc index 98995347e8..b4bf4c08ab 100644 --- a/common/src/app/common/types/shape_tree.cljc +++ b/common/src/app/common/types/shape_tree.cljc @@ -237,9 +237,11 @@ ([objects position] (frame-id-by-position objects position nil)) ([objects position options] (assert (gpt/point? position)) - (let [top-frame + (let [sort-with-options (fn [objects ids] + (sort-z-index objects ids options)) + top-frame (->> (get-frames-ids objects options) - (sort-z-index objects) + (sort-with-options objects) (d/seek #(and position (gsh/has-point? (get objects %) position))))] (or top-frame uuid/zero))))