Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-02-13 18:48:37 -05:00
Code Issues Activity

Merge pull request #172 from uxbox/fix_copy_paste_groups

Browse source 
Fixes copy/paste with groups
This commit is contained in:
Hirunatan 2020-04-10 15:05:41 +02:00 • committed by GitHub
commit c1c661c2a9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 40 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
frontend/src/uxbox/main/data/workspace.cljs
View file

@ -2193,28 +2193,52 @@
frame-id (if frame-id frame-id (if frame-id
frame-id frame-id
(calculate-frame-overlap objects moved-obj)) (calculate-frame-overlap objects moved-obj))
reframed-obj (assoc moved-obj :frame-id frame-id)]
{:type :add-obj prepare-child
:id id (fn [child-id]
:frame-id frame-id (prepare-shape-change objects (get objects child-id) delta frame-id))
:obj reframed-obj}))
children-changes (mapcat prepare-child (:shapes obj))
is-child? (set (:shapes obj))
children-uuids (->> children-changes
(filter #(and (= :add-obj (:type %)) (is-child? (:old-id %))))
(map #(:id %)))
move-change (when (not (empty? (:shapes obj)))
[{:type :mov-objects
:parent-id id
:shapes (vec children-uuids)}])
reframed-obj (-> moved-obj
(assoc :frame-id frame-id)
(dissoc :shapes))]
(into [{:type :add-obj
:id id
:old-id (:id obj)
:frame-id frame-id
:obj (dissoc reframed-obj :shapes)}]
(concat children-changes move-change))))
(prepare-frame-change [objects obj delta] (prepare-frame-change [objects obj delta]
(let [frame-id (uuid/next) (let [frame-id (uuid/next)
frame-name (impl-generate-unique-name objects (:name obj)) frame-name (impl-generate-unique-name objects (:name obj))
sch (->> (map #(get objects %) (:shapes obj)) sch (->> (map #(get objects %) (:shapes obj))
(map #(prepare-shape-change objects % delta frame-id))) (mapcat #(prepare-shape-change objects % delta frame-id)))
is-child? (set (:shapes obj))
children-uuids (->> sch
(filter #(and (= :add-obj (:type %)) (is-child? (:old-id %))))
(map #(:id %)))
renamed-frame (-> obj renamed-frame (-> obj
(assoc :id frame-id) (assoc :id frame-id)
(assoc :name frame-name) (assoc :name frame-name)
(assoc :frame-id uuid/zero) (assoc :frame-id uuid/zero)
(assoc :shapes (mapv :id sch))) (assoc :shapes (vec children-uuids)))
moved-frame (geom/move renamed-frame delta) moved-frame (geom/move renamed-frame delta)
fch {:type :add-obj fch {:type :add-obj
:id frame-id :id frame-id
:frame-id uuid/zero :frame-id uuid/zero
:obj moved-frame}] :obj moved-frame}]
(d/concat [fch] sch)))] (into [fch] sch)))]
(ptk/reify ::paste-impl (ptk/reify ::paste-impl
ptk/WatchEvent ptk/WatchEvent
@ -2229,11 +2253,11 @@
uchanges (map (fn [ch] uchanges (map (fn [ch]
{:type :del-obj {:type :del-obj
:id (:id ch)}) :id (:id ch)})
rchanges)] (filter #(= :add-obj (:type %)) rchanges))]
(rx/of (commit-changes (vec rchanges) (rx/of (commit-changes (vec rchanges)
(vec (reverse uchanges)) (vec (reverse uchanges))
{:commit-local? true}) {:commit-local? true})
(select-pasted-objs rchanges))))))) (select-pasted-objs selected rchanges)))))))
(def paste (def paste
(ptk/reify ::paste (ptk/reify ::paste
@ -2250,12 +2274,15 @@
(rx/empty))))))) (rx/empty)))))))
(defn select-pasted-objs (defn select-pasted-objs
[rchanges] [selected rchanges]
(ptk/reify ::select-pasted-objs (ptk/reify ::select-pasted-objs
ptk/UpdateEvent ptk/UpdateEvent
(update [_ state] (update [_ state]
(assoc-in state [:workspace-local :selected] (let [new-selected (->> rchanges
(into #{} (map #(get-in % [:obj :id])) rchanges))))) (filter #(selected (:old-id %)))
(map #(get-in % [:obj :id]))
(into #{}))]
(assoc-in state [:workspace-local :selected] new-selected)))))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Page Changes Reactions ;; Page Changes Reactions