3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-05-22 10:26:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

♻️ Unify move shape on workspace and relocate on layers panel

Browse source
This commit is contained in:
Pablo Alba 2024-05-27 17:33:55 +02:00 • committed by Andrés Moya
parent 2982dde7df
commit 018464aedf
9 changed files with 317 additions and 527 deletions
Download patch file Download diff file Expand all files Collapse all files

15
frontend/src/app/main/data/workspace.cljs
View file

@ -856,15 +856,14 @@
ids (filter #(not (cfh/is-parent? objects parent-id %)) ids)
all-parents (into #{parent-id} (map #(cfh/get-parent-id objects %)) ids)
parents (if ignore-parents? #{parent-id} all-parents)
changes (cls/generate-relocate-shapes (pcb/empty-changes it)
objects
parents
parent-id
page-id
to-index
ids)
changes (cls/generate-relocate (pcb/empty-changes it)
objects
parent-id
page-id
to-index
ids
:ignore-parents? ignore-parents?)
undo-id (js/Symbol)]
(rx/of (dwu/start-undo-transaction undo-id)

33
frontend/src/app/main/data/workspace/transforms.cljs
View file

@ -832,6 +832,30 @@
:ignore-constraints false
:ignore-snap-pixel true}))))))
(defn- cleanup-invalid-moving-shapes [ids objects frame-id]
(let [lookup (d/getf objects)
frame (get objects frame-id)
layout? (:layout frame)
shapes (->> ids
set
(cfh/clean-loops objects)
(keep lookup)
;;remove shapes inside copies, because we can't change the structure of copies
(remove #(ctk/in-component-copy? (get objects (:parent-id %))))
;; remove absolute shapes that won't change parent
(remove #(and (ctl/position-absolute? %) (= frame-id (:parent-id %)))))
shapes
(cond->> shapes
(not layout?)
(remove #(= (:frame-id %) frame-id))
layout?
(remove #(and (= (:frame-id %) frame-id)
(not= (:parent-id %) frame-id))))]
(map :id shapes)))
(defn move-shapes-to-frame
[ids frame-id drop-index cell]
(ptk/reify ::move-shapes-to-frame
@ -839,7 +863,14 @@
(watch [it state _]
(let [page-id (:current-page-id state)
objects (wsh/lookup-page-objects state page-id)
changes (cls/generate-move-shapes-to-frame (pcb/empty-changes it) ids frame-id page-id objects drop-index cell)]
ids (cleanup-invalid-moving-shapes ids objects frame-id)
changes (cls/generate-relocate (pcb/empty-changes it)
objects
frame-id
page-id
drop-index
ids
:cell cell)]
(when (and (some? frame-id) (d/not-empty? changes))
(rx/of (dch/commit-changes changes)