From 5d17933593787f2d2f80424da2cce74801cfcf81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Moya?= Date: Wed, 16 Feb 2022 14:58:53 +0100 Subject: [PATCH] :bug: Fix touched component marker appearing when it's not needed --- CHANGES.md | 1 + common/src/app/common/pages/helpers.cljc | 3 +-- frontend/src/app/main/data/workspace/transforms.cljs | 8 +++++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 2d90ddd58..a4096d32c 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -34,6 +34,7 @@ - Fixed color palette outside viewport [Taiga #2715](https://tree.taiga.io/project/penpot/issue/2715) - Fixed missing translate string [Taiga #2780](https://tree.taiga.io/project/penpot/issue/2780) - Fixed handoff shadow type text [Taiga #2717](https://tree.taiga.io/project/penpot/issue/2717) +- Fixed components get "dirty" marker when moved [Taiga #2764](https://tree.taiga.io/project/penpot/issue/2764) ### :arrow_up: Deps updates diff --git a/common/src/app/common/pages/helpers.cljc b/common/src/app/common/pages/helpers.cljc index 224a4b716..8fef5abc8 100644 --- a/common/src/app/common/pages/helpers.cljc +++ b/common/src/app/common/pages/helpers.cljc @@ -243,8 +243,7 @@ shape (some? (:shape-ref shape)) - (recur (get objects (:parent-id shape)) - objects))) + (recur objects (get objects (:parent-id shape))))) (defn make-container [page-or-component type] diff --git a/frontend/src/app/main/data/workspace/transforms.cljs b/frontend/src/app/main/data/workspace/transforms.cljs index 93cc1fd8e..ddc4f5686 100644 --- a/frontend/src/app/main/data/workspace/transforms.cljs +++ b/frontend/src/app/main/data/workspace/transforms.cljs @@ -163,7 +163,9 @@ (let [objects (wsh/lookup-page-objects state) ids-with-children (into (vec ids) (mapcat #(cph/get-children-ids objects %)) ids) object-modifiers (get state :workspace-modifiers) - ignore-tree (get-ignore-tree object-modifiers objects ids)] + shapes (map (d/getf objects) ids) + ignore-tree (->> (map #(get-ignore-tree object-modifiers objects %) shapes) + (reduce merge {}))] (rx/of (dwu/start-undo-transaction) (dwg/move-frame-guides ids-with-children) @@ -245,7 +247,7 @@ (reduce set-child modif-tree children))) (defn- get-ignore-tree - "Retrieves a map with the flag `ignore-tree` given a tree of modifiers" + "Retrieves a map with the flag `ignore-geometry?` given a tree of modifiers" ([modif-tree objects shape] (get-ignore-tree modif-tree objects shape nil nil {})) @@ -261,7 +263,7 @@ ignore-tree (assoc ignore-tree shape-id ignore-geometry?) set-child - (fn [modif-tree child] + (fn [ignore-tree child] (get-ignore-tree modif-tree objects child root transformed-root ignore-tree))] (reduce set-child ignore-tree children))))