From 83a02ad6e6dee44ad6965072823d68e8c8734a81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9s=20Moya?= <andres.moya@kaleidos.net>
Date: Mon, 30 Mar 2020 11:20:09 +0200
Subject: [PATCH] :tada: Copy and paste to cursor position

---
 frontend/src/uxbox/main/data/workspace.cljs | 38 +++++++++++++--------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/frontend/src/uxbox/main/data/workspace.cljs b/frontend/src/uxbox/main/data/workspace.cljs
index 6ee707b35..8b1daf4d8 100644
--- a/frontend/src/uxbox/main/data/workspace.cljs
+++ b/frontend/src/uxbox/main/data/workspace.cljs
@@ -2051,43 +2051,51 @@
 
 (defn- paste-impl
   [{:keys [selected objects] :as data}]
-  (letfn [(prepare-change [id]
+  (letfn [(prepare-change [delta id]
             (let [obj (get objects id)]
-              ;; (prn "prepare-change" id obj)
               (if (= :frame (:type obj))
-                (prepare-frame-change obj)
-                (prepare-shape-change obj uuid/zero))))
+                (prepare-frame-change obj delta)
+                (prepare-shape-change obj delta uuid/zero))))
 
-          (prepare-shape-change [obj frame-id]
-            (let [id (uuid/next)]
+          (prepare-shape-change [obj delta frame-id]
+            (let [id (uuid/next)
+                  renamed-obj (assoc obj :id id :frame-id frame-id)
+                  moved-obj (geom/move renamed-obj delta)]
               {:type :add-obj
                :id id
                :frame-id frame-id
-               :obj (assoc obj :id id :frame-id frame-id)}))
+               :obj moved-obj}))
 
-          (prepare-frame-change [obj]
+          (prepare-frame-change [obj delta]
             (let [frame-id (uuid/next)
                   sch (->> (map #(get objects %) (:shapes obj))
-                           (map #(prepare-shape-change % frame-id)))
+                           (map #(prepare-shape-change % delta frame-id)))
+                  renamed-frame (-> obj
+                                    (assoc :id frame-id)
+                                    (assoc :frame-id uuid/zero)
+                                    (assoc :shapes (mapv :id sch)))
+                  moved-frame (geom/move renamed-frame delta)
                   fch {:type :add-obj
                        :id frame-id
                        :frame-id uuid/zero
-                       :obj (-> obj
-                                (assoc :id frame-id)
-                                (assoc :frame-id uuid/zero)
-                                (assoc :shapes (mapv :id sch)))}]
+                       :obj moved-frame}]
               (d/concat [fch] sch)))]
 
   (ptk/reify ::paste-impl
     ptk/WatchEvent
     (watch [_ state stream]
-      (let [rchanges (->> (map prepare-change selected)
+      (let [selected-objs (map #(get objects %) selected)
+            orig-pos (geom/selection-rect selected-objs)
+            mouse-pos @ms/mouse-position
+            delta {:x (- (:x mouse-pos) (:x orig-pos))
+                   :y (- (:y mouse-pos) (:y orig-pos))}
+
+            rchanges (->> (map (partial prepare-change delta) selected)
                           (flatten))
             uchanges (map (fn [ch]
                             {:type :del-obj
                              :id (:id ch)})
                           rchanges)]
-        (cljs.pprint/pprint rchanges)
         (rx/of (commit-changes (vec rchanges)
                                (vec (reverse uchanges))
                                {:commit-local? true})))))))