From c53856b5a91c2e1cdb7fd64f7bab65ed2d980f9d Mon Sep 17 00:00:00 2001
From: Elena Torro <elenatorro@gmail.com>
Date: Tue, 19 May 2026 12:45:14 +0200
Subject: [PATCH] :bug: Clean modifiers when needed

---
 .../src/app/main/data/workspace/modifiers.cljs | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/frontend/src/app/main/data/workspace/modifiers.cljs b/frontend/src/app/main/data/workspace/modifiers.cljs
index 9c5323ba66..f767cc9409 100644
--- a/frontend/src/app/main/data/workspace/modifiers.cljs
+++ b/frontend/src/app/main/data/workspace/modifiers.cljs
@@ -40,6 +40,10 @@
 (def ^:private xf:without-uuid-zero
   (remove #(= % uuid/zero)))
 
+;; Lets set-wasm-modifiers call clean-modifiers only on the
+;; non-translation→translation transition instead of every frame.
+(def ^:private wasm-structure-modifiers-active? (volatile! false))
+
 ;; Tracks whether the WASM renderer is currently in "interactive
 ;; transform" mode (a drag / resize / rotate gesture in progress).
 ;; Paired with `set-modifiers-start` / `set-modifiers-end` so the
@@ -305,6 +309,7 @@
         ;; skip shadows / blur).
         (ensure-interactive-transform-end!)
         (wasm.api/clean-modifiers)
+        (vreset! wasm-structure-modifiers-active? false)
         (set-wasm-props! (dsh/lookup-page-objects state) (:wasm-props state) [])))
 
     ptk/UpdateEvent
@@ -682,12 +687,19 @@
       (let [snap-pixel?  (and (not ignore-snap-pixel) (contains? (:workspace-layout state) :snap-pixel-grid))
             translation? (every? #(ctm/only-move? (:modifiers %)) (vals modif-tree))]
 
-        ;; Only geometry (transform matrix) changes during drag.
-        (when-not translation?
+        (if translation?
+          ;; Pure translation: no structure changes needed. If structure
+          ;; modifiers were active from a previous non-translation frame
+          ;; (e.g. shape hovered over a frame then dragged back out),
+          ;; clear them now so the shape is not clipped by the old frame.
+          (when @wasm-structure-modifiers-active?
+            (wasm.api/clean-modifiers)
+            (vreset! wasm-structure-modifiers-active? false))
           (let [objects (dsh/lookup-page-objects state)]
             (set-wasm-props! objects (:prev-wasm-props state) (:wasm-props state))
             (wasm.api/clean-modifiers)
-            (wasm.api/set-structure-modifiers (parse-structure-modifiers modif-tree))))
+            (wasm.api/set-structure-modifiers (parse-structure-modifiers modif-tree))
+            (vreset! wasm-structure-modifiers-active? true)))
         (let [geometry-entries (parse-geometry-modifiers modif-tree)
               root-modifiers   (into [] (map (fn [[id data]] [id (:transform data)])) geometry-entries)
               modifiers