mirror of
https://github.com/penpot/penpot.git
synced 2025-05-17 23:16:11 +02:00
🐛 Fix data inconsistency on wrong deletion ordering.
This commit is contained in:
parent
b3747ee0e7
commit
d506c9b562
1 changed files with 2 additions and 5 deletions
|
@ -1253,15 +1253,12 @@
|
||||||
|
|
||||||
(defn- delete-shapes
|
(defn- delete-shapes
|
||||||
[ids]
|
[ids]
|
||||||
(us/assert ::set-of-uuid ids)
|
(us/assert (s/coll-of ::us/uuid) ids)
|
||||||
(ptk/reify ::delete-shapes
|
(ptk/reify ::delete-shapes
|
||||||
ptk/WatchEvent
|
ptk/WatchEvent
|
||||||
(watch [_ state stream]
|
(watch [_ state stream]
|
||||||
(let [objects (get-in state [:workspace-data :objects])
|
(let [objects (get-in state [:workspace-data :objects])
|
||||||
session-id (:session-id state)
|
session-id (:session-id state)
|
||||||
|
|
||||||
ids (seq ids)
|
|
||||||
|
|
||||||
rchanges (mapv #(array-map :type :del-obj :id %) ids)
|
rchanges (mapv #(array-map :type :del-obj :id %) ids)
|
||||||
uchanges (mapv (fn [id]
|
uchanges (mapv (fn [id]
|
||||||
(let [obj (get objects id)
|
(let [obj (get objects id)
|
||||||
|
@ -1282,7 +1279,7 @@
|
||||||
(watch [_ state stream]
|
(watch [_ state stream]
|
||||||
(let [objects (get-in state [:workspace-data :objects])
|
(let [objects (get-in state [:workspace-data :objects])
|
||||||
obj (get objects id)
|
obj (get objects id)
|
||||||
ids (d/concat #{} (:shapes obj) [(:id obj)])]
|
ids (d/concat [] (:shapes obj) [(:id obj)])]
|
||||||
(rx/of (delete-shapes ids))))))
|
(rx/of (delete-shapes ids))))))
|
||||||
|
|
||||||
(def delete-selected
|
(def delete-selected
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue