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

♻️ Refactor delete-shapes event.

Browse source 
Properly handle parent deletion + performance.
This commit is contained in:
Andrey Antukh 2021-06-10 13:01:28 +02:00 • committed by Alonso Torres
parent 6988ae83c9
commit 371c78b1d3
1 changed files with 112 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

177
frontend/src/app/main/data/workspace/common.cljs
View file

@ -341,26 +341,18 @@
:undo-changes uchanges :undo-changes uchanges
:origin it})))))) :origin it}))))))
(s/def ::set-of-uuid
(s/every ::us/uuid :kind set?))
(defn delete-shapes (defn delete-shapes
[ids] [ids]
(us/assert (s/coll-of ::us/uuid) ids) (us/assert ::set-of-uuid ids)
(ptk/reify ::delete-shapes (ptk/reify ::delete-shapes
ptk/WatchEvent ptk/WatchEvent
(watch [it state stream] (watch [it state stream]
(let [page-id (:current-page-id state) (let [page-id (:current-page-id state)
objects (wsh/lookup-page-objects state page-id) objects (wsh/lookup-page-objects state page-id)
get-empty-parents
(fn [parents]
(->> parents
(map (fn [id]
(let [obj (get objects id)]
(when (and (= :group (:type obj))
(= 1 (count (:shapes obj))))
obj))))
(take-while (complement nil?))
(map :id)))
groups-to-unmask groups-to-unmask
(reduce (fn [group-ids id] (reduce (fn [group-ids id]
;; When the shape to delete is the mask of a masked group, ;; When the shape to delete is the mask of a masked group,
@ -381,51 +373,39 @@
(some ids (map :destination interactions)))) (some ids (map :destination interactions))))
(vals objects)) (vals objects))
rchanges empty-parents-xform
(d/concat (comp
(map (fn [id] (get objects id)))
(map (fn [{:keys [shapes type] :as obj}]
(when (and (= :group type)
(zero? (count (remove #(contains? ids %) shapes))))
obj)))
(take-while some?)
(map :id))
all-parents
(reduce (fn [res id] (reduce (fn [res id]
(let [children (cp/get-children id objects) (into res (cp/get-parents id objects)))
parents (cp/get-parents id objects) (d/ordered-set)
del-change #(array-map
:type :del-obj
:page-id page-id
:id %)]
(d/concat res
(map del-change (reverse children))
[(del-change id)]
(map del-change (get-empty-parents parents))
[{:type :reg-objects
:page-id page-id
:shapes (vec parents)}])))
[]
ids) ids)
(map #(array-map
:type :mod-obj
:page-id page-id
:id %
:operations [{:type :set
:attr :masked-group?
:val false}])
groups-to-unmask)
(map #(array-map
:type :mod-obj
:page-id page-id
:id (:id %)
:operations [{:type :set
:attr :interactions
:val (vec (remove (fn [interaction]
(contains? ids (:destination interaction)))
(:interactions %)))}])
interacting-shapes))
all-children
uchanges
(d/concat
(reduce (fn [res id] (reduce (fn [res id]
(let [children (cp/get-children id objects) (into res (cp/get-children id objects)))
parents (cp/get-parents id objects) (d/ordered-set)
parent (get objects (first parents)) ids)
add-change (fn [id]
empty-parents
(into (d/ordered-set) empty-parents-xform all-parents)
mk-del-obj-xf
(map (fn [id]
{:type :del-obj
:page-id page-id
:id id}))
mk-add-obj-xf
(map (fn [id]
(let [item (get objects id)] (let [item (get objects id)]
{:type :add-obj {:type :add-obj
:id (:id item) :id (:id item)
@ -433,38 +413,77 @@
:index (cp/position-on-parent id objects) :index (cp/position-on-parent id objects)
:frame-id (:frame-id item) :frame-id (:frame-id item)
:parent-id (:parent-id item) :parent-id (:parent-id item)
:obj item}))] :obj item})))
(d/concat res
(map add-change (reverse (get-empty-parents parents))) mk-mod-touched-xf
[(add-change id)] (map (fn [id]
(map add-change children) (let [parent (get objects id)]
[{:type :reg-objects {:type :mod-obj
:page-id page-id
:shapes (vec parents)}]
(when (some? parent)
[{:type :mod-obj
:page-id page-id :page-id page-id
:id (:id parent) :id (:id parent)
:operations [{:type :set-touched :operations [{:type :set-touched
:touched (:touched parent)}]}])))) :touched (:touched parent)}]})))
[]
ids) mk-mod-int-del-xf
(map #(array-map (map (fn [obj]
:type :mod-obj {:type :mod-obj
:page-id page-id :page-id page-id
:id % :id (:id obj)
:operations [{:type :set
:attr :masked-group?
:val true}])
groups-to-unmask)
(map #(array-map
:type :mod-obj
:page-id page-id
:id (:id %)
:operations [{:type :set :operations [{:type :set
:attr :interactions :attr :interactions
:val (:interactions %)}]) :val (vec (remove (fn [interaction]
interacting-shapes))] (contains? ids (:destination interaction)))
(:interactions obj)))}]}))
mk-mod-int-add-xf
(map (fn [obj]
{:type :mod-obj
:page-id page-id
:id (:id obj)
:operations [{:type :set
:attr :interactions
:val (:interactions obj)}]}))
mk-mod-unmask-xf
(map (fn [id]
{:type :mod-obj
:page-id page-id
:id id
:operations [{:type :set
:attr :masked-group?
:val false}]}))
mk-mod-mask-xf
(map (fn [id]
{:type :mod-obj
:page-id page-id
:id id
:operations [{:type :set
:attr :masked-group?
:val true}]}))
rchanges
(-> []
(into mk-del-obj-xf all-children)
(into mk-del-obj-xf ids)
(into mk-del-obj-xf empty-parents)
(conj {:type :reg-objects
:page-id page-id
:shapes (vec all-parents)})
(into mk-mod-unmask-xf groups-to-unmask)
(into mk-mod-int-del-xf interacting-shapes))
uchanges
(-> []
(into mk-add-obj-xf (reverse empty-parents))
(into mk-add-obj-xf (reverse ids))
(into mk-add-obj-xf (reverse all-children))
(conj {:type :reg-objects
:page-id page-id
:shapes (vec all-parents)})
(into mk-mod-touched-xf (reverse all-parents))
(into mk-mod-mask-xf groups-to-unmask)
(into mk-mod-int-add-xf interacting-shapes))
]
;; (println "================ rchanges") ;; (println "================ rchanges")
;; (cljs.pprint/pprint rchanges) ;; (cljs.pprint/pprint rchanges)