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

Merge remote-tracking branch 'origin/staging' into develop

Browse source
This commit is contained in:
Andrey Antukh 2023-07-24 13:26:17 +02:00
commit d268ff2952
7 changed files with 92 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

6
frontend/src/app/main/data/workspace/changes.cljs
View file

@ -51,7 +51,7 @@
(defn update-shapes
([ids update-fn] (update-shapes ids update-fn nil))
([ids update-fn {:keys [reg-objects? save-undo? stack-undo? attrs ignore-tree page-id ignore-remote? ignore-touched]
([ids update-fn {:keys [reg-objects? save-undo? stack-undo? attrs ignore-tree page-id ignore-remote? ignore-touched undo-group]
:or {reg-objects? false save-undo? true stack-undo? false ignore-remote? false ignore-touched false}}]
(dm/assert! (sm/coll-of-uuid? ids))
(dm/assert! (fn? update-fn))
@ -78,7 +78,9 @@
(-> (pcb/empty-changes it page-id)
(pcb/set-save-undo? save-undo?)
(pcb/set-stack-undo? stack-undo?)
(pcb/with-objects objects))
(pcb/with-objects objects)
(cond-> undo-group
(pcb/set-undo-group undo-group)))
ids)
changes (pcb/reorder-grid-children changes ids)
changes (add-undo-group changes state)]