From 0cf4d4636a2be97f477418a4be7a2d6caa8cb9ae Mon Sep 17 00:00:00 2001
From: Eva Marco <eva.marco@kaleidos.net>
Date: Tue, 28 Jan 2025 12:24:41 +0100
Subject: [PATCH] :bug: Fix set X position from dimensions token (#5685)

---
 .../app/main/data/workspace/transforms.cljs   | 39 ++++++++++---------
 .../app/main/ui/workspace/tokens/changes.cljs |  2 +-
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/frontend/src/app/main/data/workspace/transforms.cljs b/frontend/src/app/main/data/workspace/transforms.cljs
index b8376fad1..a611d5f7d 100644
--- a/frontend/src/app/main/data/workspace/transforms.cljs
+++ b/frontend/src/app/main/data/workspace/transforms.cljs
@@ -787,30 +787,31 @@
 
 (defn update-position
   "Move shapes to a new position"
-  [id position]
-  (dm/assert! (uuid? id))
+  ([id position] (update-position id position nil))
+  ([id position opts]
+   (dm/assert! (uuid? id))
 
-  (ptk/reify ::update-position
-    ptk/WatchEvent
-    (watch [_ state _]
-      (let [page-id    (:current-page-id state)
-            objects    (dsh/lookup-page-objects state page-id)
-            shape      (get objects id)
+   (ptk/reify ::update-position
+     ptk/WatchEvent
+     (watch [_ state _]
+       (let [page-id    (:current-page-id state)
+             objects    (dsh/lookup-page-objects state page-id)
+             shape      (get objects id)
+             ;; FIXME: performance rect
+             bbox       (-> shape :points grc/points->rect)
 
-            ;; FIXME: performance rect
-            bbox       (-> shape :points grc/points->rect)
+             cpos       (gpt/point (:x bbox) (:y bbox))
+             pos        (gpt/point (or (:x position) (:x bbox))
+                                   (or (:y position) (:y bbox)))
 
-            cpos       (gpt/point (:x bbox) (:y bbox))
-            pos        (gpt/point (or (:x position) (:x bbox))
-                                  (or (:y position) (:y bbox)))
+             delta      (gpt/subtract pos cpos)
 
-            delta      (gpt/subtract pos cpos)
+             modif-tree (dwm/create-modif-tree [id] (ctm/move-modifiers delta))]
 
-            modif-tree (dwm/create-modif-tree [id] (ctm/move-modifiers delta))]
-
-        (rx/of (dwm/apply-modifiers {:modifiers modif-tree
-                                     :ignore-constraints false
-                                     :ignore-snap-pixel true}))))))
+         (rx/of (dwm/apply-modifiers {:modifiers modif-tree
+                                      :ignore-constraints false
+                                      :ignore-touched (:ignore-touched opts)
+                                      :ignore-snap-pixel true})))))))
 
 (defn position-shapes
   [shapes]
diff --git a/frontend/src/app/main/ui/workspace/tokens/changes.cljs b/frontend/src/app/main/ui/workspace/tokens/changes.cljs
index f9ca01093..b2238b034 100644
--- a/frontend/src/app/main/ui/workspace/tokens/changes.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/changes.cljs
@@ -206,7 +206,7 @@
     ptk/WatchEvent
     (watch [_ _ _]
       (rx/concat
-       (map #(dwt/update-position % (zipmap attributes (repeat value))) shape-ids)))))
+       (map #(dwt/update-position % (zipmap attributes (repeat value)) {:ignore-touched true}) shape-ids)))))
 
 (defn update-layout-sizing-limits [value shape-ids attributes]
   (ptk/reify ::update-layout-sizing-limits