Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-03-15 17:21:17 -05:00
Code Issues Activity

Fix group deletion mechanism.

Browse source
This commit is contained in:
Andrey Antukh 2016-01-20 21:45:22 +02:00
parent a4d3136707
commit 2124aba21f
1 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/uxbox/data/workspace.cljs
View file

@ -156,18 +156,23 @@
(defn delete-shape
"Remove the shape using its id."
[sid]
(reify
rs/UpdateEvent
(-apply-update [_ state]
(let [pageid (get-in state [:shapes-by-id sid :page])
shapes (as-> state $
(get-in $ [:pages-by-id pageid :shapes])
(remove #(= % sid) $)
(into [] $))]
[id]
(letfn [(dissoc-shape [state {:keys [id] :as shape}]
(if (= (:type shape) :builtin/group)
(let [state (update-in state [:shapes-by-id] dissoc id)]
(->> (map #(get-in state [:shapes-by-id %]) (:items shape))
(reduce dissoc-shape state)))
(update-in state [:shapes-by-id] dissoc id)))]
(reify
rs/UpdateEvent
(-apply-update [_ state]
(let [shape (get-in state [:shapes-by-id id])
pageid (:page shape)
shapes (get-in state [:pages-by-id pageid :shapes])
shapes (into [] (remove #(= % id) shapes))]
(as-> state $
(assoc-in $ [:pages-by-id pageid :shapes] shapes)
(update-in $ [:shapes-by-id] dissoc sid))))))
(dissoc-shape $ shape)))))))
(defn move-shape
"Mark a shape selected for drawing in the canvas."